lokdialog: Window* -> VclPtr<Window>, and a small simplification.feature/lok_dialog-backport

Change-Id: I853e2d6ec2e55c78894a9942aa201763a57fe195
author: Jan Holesovsky <kendy@collabora.com> 2017-12-04 17:55:21 +0100
committer: Jan Holesovsky <kendy@collabora.com> 2017-12-04 18:00:09 +0100
commit: f53d4e656a6a72936309b641c778b6d47c25ffae (patch)
tree: 39b46c7cda431bc6faa071ee69f0830d5bcd7642 /oox
parent: c9d1df376a949a2edf7d0cea7c695b9ff213d8f0 (diff)
0 files changed, 0 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/GNUmakefile b/GNUmakefile
new file mode 100644
index 000000000000..018b21e3f1ac
--- /dev/null
+++ b/GNUmakefile
@@ -0,0 +1,37 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(foreach repo,$(gb_REPOS),$(eval $(call gb_Module_make_global_targets,$(wildcard $(repo)/Module_*.mk))))
+
+# vim: set noet sw=4 ts=4:
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/MathMLDTD/math.dtd b/MathMLDTD/math.dtd
new file mode 100644
index 000000000000..0349e3031acf
--- /dev/null
+++ b/MathMLDTD/math.dtd
@@ -0,0 +1,957 @@
+<!-- Copyright 1997-1999  World Wide Web Consortium,    -->
+<!-- (Massachusetts Institute of Technology,            -->
+<!--  Institut National de Recherche en Informatique et en Automatique, -->
+<!--  Keio University). All Rights Reserved.            -->
+<!-- http://www.w3.org/Consortium/Legal/                -->
+
+<!-- Modified DTD for MathML 1.01                       -->
+<!--                                                    -->
+<!-- Original DTD:                                      -->
+<!--    http://www.w3.org/1999/07/REC-MathML-19990707/mmlents.zip  -->
+<!--                                                    -->
+<!-- modified 20. June 2001:                            -->
+<!-- 1) added "math:" namespace prefix                  -->
+<!-- 2) removed entity include files                    -->
+<!-- 3) added copyright notice above to comply with     -->
+<!--    W3C IPR Software Notice                         -->
+<!-- 4) added this comment block                        -->
+<!-- Modifications are intended to ease validation      -->
+<!-- of MathML files written by StarMath 6.0            -->
+
+
+<!-- Content model for content and presentation        -->
+<!--  and browser interface tags in MathML              -->
+<!-- initial draft 9.May.1997          syntax = XML     -->
+<!-- author = s.buswell sb@stilo.demon.co.uk            -->
+<!--                                                    -->
+<!-- revised 14.May.1997 by Robert Miner                -->
+<!-- revised 29.June.1997 and 2.July.1997 by s.buswell  -->
+<!--                                                    -->
+<!-- revised 15.December.1997  by s.buswell             -->
+<!-- revised 8.February.1998   by s.buswell             -->
+<!-- revised 4.april.1998      by s.buswell             -->
+<!-- 21.February.1999 entities and small revisions by d.carlisle    -->
+<!--                                                    -->
+<!-- W3C Recommendation      7 April 1998                               -->
+<!-- *************************************************  -->
+
+<!-- general attribute definitions for class & style & id & other -->
+<!-- : attributes shared by all mathml elements        -->
+
+<!ENTITY % att-globalatts      'math:class CDATA #IMPLIED
+                                 math:style CDATA #IMPLIED
+                                 math:id    ID    #IMPLIED
+                                 math:other CDATA #IMPLIED'  >
+
+<!-- *************************************************  -->
+<!-- Presentation element set                           -->
+
+<!-- presentation attribute definitions -->
+
+<!ENTITY % att-fontsize        'math:fontsize CDATA #IMPLIED'             >
+<!ENTITY % att-fontweight      'math:fontweight (normal | bold) #IMPLIED'  >
+<!ENTITY % att-fontstyle       'math:fontstyle (normal | italic) #IMPLIED' >
+<!ENTITY % att-fontfamily      'math:fontfamily CDATA   #IMPLIED'         >
+<!ENTITY % att-color           'math:color CDATA   #IMPLIED'              >
+
+<!ENTITY % att-fontinfo      '%att-fontsize;
+                             %att-fontweight;
+                             %att-fontstyle;
+                             %att-fontfamily;
+                             %att-color;'  >
+
+<!ENTITY % att-form        'math:form (prefix | infix | postfix) #IMPLIED' >
+<!ENTITY % att-fence       'math:fence (true | false ) #IMPLIED'    >
+<!ENTITY % att-separator   'math:separator (true | false ) #IMPLIED'    >
+<!ENTITY % att-lspace      'math:lspace CDATA  #IMPLIED'       >
+<!ENTITY % att-rspace      'math:rspace CDATA  #IMPLIED'       >
+<!ENTITY % att-stretchy    'math:stretchy (true | false ) #IMPLIED'     >
+<!ENTITY % att-symmetric   'math:symmetric (true | false ) #IMPLIED'    >
+<!ENTITY % att-maxsize     'math:maxsize CDATA #IMPLIED'       >
+<!ENTITY % att-minsize     'math:minsize CDATA #IMPLIED'       >
+<!ENTITY % att-largeop           'math:largeop (true | false ) #IMPLIED' >
+<!ENTITY % att-movablelimits     'math:movablelimits (true | false )
+#IMPLIED' >
+<!ENTITY % att-accent               'math:accent (true | false)  #IMPLIED'>
+
+<!ENTITY % att-opinfo '%att-form;
+                        %att-fence;
+                        %att-separator;
+                        %att-lspace;
+                        %att-rspace;
+                        %att-stretchy;
+                        %att-symmetric;
+                        %att-maxsize;
+                        %att-minsize;
+                        %att-largeop;
+                        %att-movablelimits;
+                        %att-accent;'         >
+
+<!ENTITY % att-width             'math:width CDATA #IMPLIED'   >
+<!ENTITY % att-height            'math:height CDATA #IMPLIED' >
+<!ENTITY % att-depth             'math:depth CDATA #IMPLIED'   >
+
+<!ENTITY % att-sizeinfo          '%att-width;
+                                  %att-height;
+                                  %att-depth;'          >
+
+<!ENTITY % att-lquote              'math:lquote CDATA #IMPLIED'   >
+<!ENTITY % att-rquote              'math:rquote CDATA #IMPLIED'   >
+
+<!ENTITY % att-linethickness        'math:linethickness CDATA #IMPLIED' >
+
+<!ENTITY % att-scriptlevel          'math:scriptlevel CDATA #IMPLIED'>
+<!ENTITY % att-displaystyle         'math:displaystyle (true | false)
+#IMPLIED'>
+<!ENTITY % att-scriptsizemultiplier 'math:scriptsizemultiplier CDATA
+#IMPLIED'  >
+<!ENTITY % att-scriptminsize        'math:scriptminsize CDATA #IMPLIED'>
+<!ENTITY % att-background           'math:background CDATA #IMPLIED' >
+
+<!ENTITY % att-open                 'math:open CDATA #IMPLIED' >
+<!ENTITY % att-close                'math:close CDATA #IMPLIED' >
+<!ENTITY % att-separators           'math:separators CDATA #IMPLIED' >
+
+<!ENTITY % att-subscriptshift       'math:subscriptshift CDATA #IMPLIED'>
+<!ENTITY % att-superscriptshift     'math:superscriptshift CDATA #IMPLIED'    >
+
+<!ENTITY % att-accentunder          'math:accentunder (true | false)
+#IMPLIED'>
+
+<!ENTITY % att-align                'math:align CDATA #IMPLIED'           >
+<!ENTITY % att-rowalign             'math:rowalign CDATA #IMPLIED'    >
+<!ENTITY % att-columnalign          'math:columnalign CDATA #IMPLIED'   >
+<!ENTITY % att-groupalign           'math:groupalign CDATA #IMPLIED'    >
+<!ENTITY % att-alignmentscope       'math:alignmentscope CDATA #IMPLIED'  >
+
+<!ENTITY % att-rowspacing           'math:rowspacing CDATA #IMPLIED'      >
+<!ENTITY % att-columnspacing        'math:columnspacing CDATA #IMPLIED'   >
+<!ENTITY % att-rowlines             'math:rowlines CDATA #IMPLIED'           >
+<!ENTITY % att-columnlines          'math:columnlines CDATA #IMPLIED'         >
+<!ENTITY % att-frame                'math:frame (none | solid | dashed)
+#IMPLIED'  >
+<!ENTITY % att-framespacing         'math:framespacing CDATA #IMPLIED'       >
+<!ENTITY % att-equalrows            'math:equalrows CDATA #IMPLIED'         >
+<!ENTITY % att-equalcolumns         'math:equalcolumns CDATA #IMPLIED'     >
+
+<!ENTITY % att-tableinfo           '%att-align;
+                                   %att-rowalign;
+                                   %att-columnalign;
+                                   %att-groupalign;
+                                   %att-alignmentscope;
+                                   %att-rowspacing;
+                                   %att-columnspacing;
+                                   %att-rowlines;
+                                   %att-columnlines;
+                                   %att-frame;
+                                   %att-framespacing;
+                                   %att-equalrows;
+                                   %att-equalcolumns;
+                                   %att-displaystyle;'        >
+
+<!ENTITY % att-rowspan              'math:rowspan CDATA #IMPLIED'         >
+<!ENTITY % att-columnspan           'math:columnspan CDATA #IMPLIED'      >
+
+<!ENTITY % att-edge                  'math:edge (left | right)  #IMPLIED ' >
+
+<!ENTITY % att-actiontype            'math:actiontype CDATA #IMPLIED' >
+<!ENTITY % att-selection             'math:selection CDATA #IMPLIED ' >
+
+<!-- presentation token schemata with content-->
+
+<!ENTITY % ptoken "math:mi | math:mn | math:mo | math:mtext | math:ms" >
+
+<!ATTLIST math:mi        %att-fontinfo;
+                    %att-globalatts;    >
+
+<!ATTLIST math:mn        %att-fontinfo;
+                    %att-globalatts;    >
+
+<!ATTLIST math:mo        %att-fontinfo;
+                    %att-opinfo;
+                    %att-globalatts;     >
+
+<!ATTLIST math:mtext     %att-fontinfo;
+                    %att-globalatts;     >
+
+<!ATTLIST math:ms        %att-fontinfo;
+                    %att-lquote;
+                    %att-rquote;
+                    %att-globalatts;          >
+
+<!-- empty presentation token schemata -->
+
+<!ENTITY % petoken  "math:mspace" >
+<!ELEMENT math:mspace     EMPTY  >
+
+<!ATTLIST math:mspace    %att-sizeinfo;
+                    %att-globalatts;       >
+
+<!-- presentation general layout schemata -->
+
+<!ENTITY % pgenschema "math:mrow|math:mfrac|math:msqrt|math:mroot|
+                    math:mstyle|math:merror|math:mpadded| math:mphantom|math:mfenced" >
+
+<!ATTLIST math:mrow      %att-globalatts;   >
+
+<!ATTLIST math:mfrac     %att-linethickness;
+                    %att-globalatts; >
+
+<!ATTLIST math:msqrt     %att-globalatts;   >
+
+<!ATTLIST math:mroot     %att-globalatts;   >
+
+<!ATTLIST math:mstyle    %att-fontinfo;
+                    %att-opinfo;
+                    %att-lquote;
+                    %att-rquote;
+                    %att-linethickness;
+                    %att-scriptlevel;
+                    %att-scriptsizemultiplier;
+                    %att-scriptminsize;
+                                        %att-background;
+                                        %att-open;
+                                        %att-close;
+                                        %att-separators;
+                    %att-subscriptshift;
+                    %att-superscriptshift;
+                    %att-accentunder;
+                    %att-tableinfo;
+                    %att-rowspan;
+                    %att-columnspan;
+                                        %att-edge;
+                                        %att-actiontype;
+                                        %att-selection;
+                    %att-globalatts;          >
+
+<!ATTLIST math:merror    %att-globalatts;   >
+
+<!ATTLIST math:mpadded   %att-sizeinfo;
+                    %att-lspace;
+                    %att-globalatts;     >
+
+<!ATTLIST math:mphantom  %att-globalatts;     >
+
+<!ATTLIST math:mfenced   %att-open;
+                    %att-close;
+                    %att-separators;
+                    %att-globalatts;     >
+
+<!-- presentation  layout schemata : scripts and limits -->
+
+<!ENTITY % pscrschema  "math:msub|math:msup|math:msubsup|
+                    math:munder|math:mover|math:munderover|math:mmultiscripts" >
+
+<!ATTLIST math:msub      %att-subscriptshift;
+                    %att-globalatts;     >
+
+<!ATTLIST math:msup      %att-superscriptshift;
+                    %att-globalatts;          >
+
+<!ATTLIST math:msubsup   %att-subscriptshift;
+                    %att-superscriptshift;
+                    %att-globalatts;          >
+
+<!ATTLIST math:munder    %att-accentunder;
+                    %att-globalatts;          >
+
+<!ATTLIST math:mover     %att-accent;
+                    %att-globalatts;           >
+
+<!ATTLIST math:munderover %att-accent;
+                     %att-accentunder;
+                     %att-globalatts;      >
+
+<!ATTLIST math:mmultiscripts
+                    %att-subscriptshift;
+                    %att-superscriptshift;
+                    %att-globalatts;          >
+
+<!-- presentation layout schemata: script empty elements -->
+
+<!ENTITY % pscreschema "math:mprescripts|math:none" >
+
+<!ELEMENT math:mprescripts    EMPTY          >
+<!ATTLIST math:mprescripts   %att-globalatts;      >
+
+<!ELEMENT math:none          EMPTY          >
+<!ATTLIST math:none          %att-globalatts;      >
+
+<!-- presentation layout schemata: tables -->
+
+<!ENTITY % ptabschema "math:mtable|math:mtr|math:mtd" >
+
+<!ATTLIST math:mtable    %att-tableinfo;
+                    %att-globalatts;      >
+
+<!ATTLIST math:mtr       %att-rowalign;
+                    %att-columnalign;
+                    %att-groupalign;
+                    %att-globalatts; >
+
+<!ATTLIST math:mtd       %att-rowalign;
+                    %att-columnalign;
+                    %att-groupalign;
+                    %att-rowspan;
+                    %att-columnspan;
+                    %att-globalatts;   >
+
+<!ENTITY % plschema  "%pgenschema;|%pscrschema;|%ptabschema;" >
+
+<!-- empty presentation layout schemata -->
+
+<!ENTITY % peschema "math:maligngroup | math:malignmark" >
+
+<!ELEMENT  math:malignmark  EMPTY          >
+
+<!ATTLIST math:malignmark    %att-edge;
+                        %att-globalatts;      >
+
+<!ELEMENT math:maligngroup    EMPTY          >
+<!ATTLIST math:maligngroup   %att-groupalign;
+                        %att-globalatts;      >
+
+<!-- presentation action schemata -->
+
+<!ENTITY % pactions "math:maction" >
+<!ATTLIST math:maction   %att-actiontype;
+                    %att-selection;
+                    %att-globalatts;     >
+
+<!-- Presentation entity for substitution into content tag constructs -->
+<!-- excludes elements which are not valid as expressions             -->
+
+<!ENTITY % PresInCont    "%ptoken; | %petoken; |
+                          %plschema; | %peschema; | %pactions;">
+
+<!-- Presentation entity - all presentation constructs -->
+
+<!ENTITY % Presentation  "%ptoken; | %petoken; | %pscreschema; |
+                          %plschema; | %peschema; | %pactions;">
+
+<!-- *************************************************  -->
+<!-- Content element set                                -->
+<!-- attribute definitions                              -->
+
+<!ENTITY % att-base              'math:base CDATA "10"'           >
+<!ENTITY % att-closure           'math:closure CDATA "closed"'    >
+<!ENTITY % att-definition        'math:definitionURL CDATA ""'    >
+<!ENTITY % att-encoding          'math:encoding CDATA ""'         >
+<!ENTITY % att-nargs             'math:nargs CDATA "1"'           >
+<!ENTITY % att-occurence         'math:occurence CDATA "function-model"'  >
+<!ENTITY % att-order             'math:order CDATA "numeric"'         >
+<!ENTITY % att-scope             'math:scope CDATA "local"'         >
+<!ENTITY % att-type              'math:type CDATA #IMPLIED'         >
+
+<!-- content leaf token elements -->
+
+<!ENTITY % ctoken "math:ci | math:cn" >
+
+<!ATTLIST math:ci   %att-type;
+               %att-globalatts;     >
+
+<!ATTLIST math:cn   %att-type;
+               %att-base;
+               %att-globalatts;     >
+
+<!-- content elements - specials -->
+
+<!ENTITY % cspecial "math:apply | math:reln | math:lambda" >
+
+<!ATTLIST math:apply   %att-globalatts;     >
+
+<!ATTLIST math:reln    %att-globalatts;     >
+
+<!ATTLIST math:lambda  %att-globalatts;     >
+
+<!-- content elements - others -->
+
+<!ENTITY % cother "math:condition | math:declare | math:sep" >
+
+<!ATTLIST math:condition       %att-globalatts;     >
+
+<!ATTLIST math:declare         %att-type;
+                          %att-scope;
+                          %att-nargs;
+                          %att-occurence;
+                          %att-definition;
+                          %att-globalatts;     >
+
+<!ELEMENT math:sep       EMPTY >
+<!ATTLIST math:sep       %att-globalatts;     >
+
+<!-- content elements - semantic mapping -->
+
+<!ENTITY % csemantics "math:semantics | math:annotation | math:annotation-xml" >
+
+<!ATTLIST math:semantics         %att-definition;
+                            %att-globalatts;     >
+
+<!ATTLIST math:annotation        %att-encoding;
+                            %att-globalatts;     >
+
+<!ATTLIST math:annotation-xml    %att-encoding;
+                            %att-globalatts;     >
+
+<!-- content elements - constructors -->
+
+<!ENTITY % cconstructor "math:interval | math:list | math:matrix | math:matrixrow | math:set |
+math:vector" >
+
+<!ATTLIST math:interval     %att-closure;
+                       %att-globalatts;     >
+
+<!ATTLIST math:set          %att-globalatts;     >
+
+<!ATTLIST math:list         %att-order;
+                       %att-globalatts;     >
+
+<!ATTLIST math:vector       %att-globalatts;     >
+
+<!ATTLIST math:matrix       %att-globalatts;     >
+
+<!ATTLIST math:matrixrow    %att-globalatts;     >
+
+<!-- content elements - operators -->
+
+<!ENTITY % cfuncop1ary "math:inverse | math:ident " >
+
+<!ELEMENT math:inverse          EMPTY       >
+<!ATTLIST math:inverse     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % cfuncopnary "math:fn |  math:compose" >
+
+<!ATTLIST math:fn     %att-definition;
+                 %att-globalatts;     >
+
+<!ELEMENT math:ident       EMPTY       >
+<!ATTLIST math:ident       %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:compose     EMPTY       >
+<!ATTLIST math:compose     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % carithop1ary "math:abs | math:conjugate | math:exp | math:factorial" >
+
+<!ELEMENT math:exp         EMPTY       >
+<!ATTLIST math:exp         %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:abs         EMPTY       >
+<!ATTLIST math:abs         %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:conjugate   EMPTY       >
+<!ATTLIST math:conjugate   %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:factorial   EMPTY       >
+<!ATTLIST math:factorial   %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % carithop1or2ary "math:minus" >
+
+<!ELEMENT math:minus       EMPTY       >
+<!ATTLIST math:minus       %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % carithop2ary "math:quotient | math:divide | math:power | math:rem" >
+
+<!ELEMENT math:quotient       EMPTY       >
+<!ATTLIST math:quotient       %att-definition;
+                         %att-globalatts;     >
+
+<!ELEMENT math:divide       EMPTY       >
+<!ATTLIST math:divide       %att-definition;
+                       %att-globalatts;     >
+
+<!ELEMENT math:power          EMPTY       >
+<!ATTLIST math:power       %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:rem          EMPTY       >
+<!ATTLIST math:rem        %att-definition;
+                     %att-globalatts;     >
+
+<!ENTITY % carithopnary "math:plus | math:times | math:max | math:min | math:gcd" >
+
+<!ELEMENT math:plus          EMPTY       >
+<!ATTLIST math:plus        %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:max          EMPTY       >
+<!ATTLIST math:max         %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:min          EMPTY       >
+<!ATTLIST math:min         %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:times          EMPTY       >
+<!ATTLIST math:times     %att-definition;
+                    %att-globalatts;     >
+
+<!ELEMENT math:gcd          EMPTY       >
+<!ATTLIST math:gcd     %att-definition;
+                  %att-globalatts;     >
+
+<!ENTITY % carithoproot "math:root" >
+
+<!ELEMENT math:root          EMPTY       >
+<!ATTLIST math:root     %att-definition;
+                   %att-globalatts;     >
+
+<!ENTITY % clogicopquant "math:exists | math:forall" >
+
+<!ELEMENT math:exists          EMPTY       >
+<!ATTLIST math:exists     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:forall          EMPTY       >
+<!ATTLIST math:forall     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % clogicopnary "math:and | math:or | math:xor" >
+
+<!ELEMENT math:and          EMPTY       >
+<!ATTLIST math:and     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:or          EMPTY       >
+<!ATTLIST math:or     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:xor          EMPTY       >
+<!ATTLIST math:xor     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % clogicop1ary "math:not" >
+
+<!ELEMENT math:not          EMPTY       >
+<!ATTLIST math:not     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % clogicop2ary "math:implies" >
+
+<!ELEMENT math:implies          EMPTY       >
+<!ATTLIST math:implies     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % ccalcop "math:log | math:int | math:diff | math:partialdiff" >
+
+<!ELEMENT math:log          EMPTY       >
+<!ATTLIST math:log     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:int          EMPTY       >
+<!ATTLIST math:int     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:diff          EMPTY       >
+<!ATTLIST math:diff     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:partialdiff          EMPTY       >
+<!ATTLIST math:partialdiff     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % ccalcop1ary "math:ln" >
+
+<!ELEMENT math:ln          EMPTY       >
+<!ATTLIST math:ln     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % csetop2ary "math:setdiff" >
+
+<!ELEMENT math:setdiff          EMPTY       >
+<!ATTLIST math:setdiff     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % csetopnary "math:union | math:intersect" >
+
+<!ELEMENT math:union          EMPTY       >
+<!ATTLIST math:union     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:intersect          EMPTY       >
+<!ATTLIST math:intersect     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % cseqop "math:sum | math:product | math:limit" >
+
+<!ELEMENT math:sum          EMPTY       >
+<!ATTLIST math:sum     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:product          EMPTY       >
+<!ATTLIST math:product     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:limit          EMPTY       >
+<!ATTLIST math:limit     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % ctrigop "math:sin | math:cos | math:tan | math:sec | math:csc | math:cot | math:sinh
+                | math:cosh | math:tanh | math:sech | math:csch | math:coth
+                | math:arcsin | math:arccos | math:arctan" >
+
+<!ELEMENT math:sin          EMPTY       >
+<!ATTLIST math:sin     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:cos          EMPTY       >
+<!ATTLIST math:cos     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:tan          EMPTY       >
+<!ATTLIST math:tan     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:sec          EMPTY       >
+<!ATTLIST math:sec     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:csc          EMPTY       >
+<!ATTLIST math:csc     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:cot          EMPTY       >
+<!ATTLIST math:cot     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:sinh          EMPTY       >
+<!ATTLIST math:sinh     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:cosh          EMPTY       >
+<!ATTLIST math:cosh     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:tanh          EMPTY       >
+<!ATTLIST math:tanh     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:sech          EMPTY       >
+<!ATTLIST math:sech     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:csch          EMPTY       >
+<!ATTLIST math:csch     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:coth          EMPTY       >
+<!ATTLIST math:coth     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:arcsin          EMPTY       >
+<!ATTLIST math:arcsin     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:arccos          EMPTY       >
+<!ATTLIST math:arccos     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:arctan          EMPTY       >
+<!ATTLIST math:arctan     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % cstatopnary "math:mean | math:sdev | math:variance | math:median | math:mode" >
+
+<!ELEMENT math:mean          EMPTY       >
+<!ATTLIST math:mean     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:sdev          EMPTY       >
+<!ATTLIST math:sdev     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:variance          EMPTY       >
+<!ATTLIST math:variance     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:median          EMPTY       >
+<!ATTLIST math:median     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:mode          EMPTY       >
+<!ATTLIST math:mode     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % cstatopmoment "math:moment" >
+
+<!ELEMENT math:moment          EMPTY       >
+<!ATTLIST math:moment     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % clalgop1ary "math:determinant | math:transpose" >
+
+<!ELEMENT math:determinant          EMPTY       >
+<!ATTLIST math:determinant     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:transpose          EMPTY       >
+<!ATTLIST math:transpose     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % clalgopnary "math:selector" >
+
+<!ELEMENT math:selector          EMPTY       >
+<!ATTLIST math:selector     %att-definition;
+                      %att-globalatts;     >
+
+<!-- content elements -  relations  -->
+
+<!ENTITY % cgenrel2ary "math:neq" >
+
+<!ELEMENT math:neq          EMPTY       >
+<!ATTLIST math:neq     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % cgenrelnary "math:eq | math:leq | math:lt | math:geq | math:gt" >
+
+<!ELEMENT math:eq          EMPTY       >
+<!ATTLIST math:eq     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:gt          EMPTY       >
+<!ATTLIST math:gt     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:lt          EMPTY       >
+<!ATTLIST math:lt     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:geq          EMPTY       >
+<!ATTLIST math:geq     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:leq          EMPTY       >
+<!ATTLIST math:leq     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % csetrel2ary "math:in | math:notin | math:notsubset | math:notprsubset" >
+
+<!ELEMENT math:in          EMPTY       >
+<!ATTLIST math:in     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:notin          EMPTY       >
+<!ATTLIST math:notin     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:notsubset          EMPTY       >
+<!ATTLIST math:notsubset     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:notprsubset          EMPTY       >
+<!ATTLIST math:notprsubset     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % csetrelnary "math:subset | math:prsubset" >
+
+<!ELEMENT math:subset          EMPTY       >
+<!ATTLIST math:subset     %att-definition;
+                      %att-globalatts;     >
+
+<!ELEMENT math:prsubset          EMPTY       >
+<!ATTLIST math:prsubset     %att-definition;
+                      %att-globalatts;     >
+
+<!ENTITY % cseqrel2ary "math:tendsto" >
+
+<!ELEMENT math:tendsto          EMPTY       >
+<!ATTLIST math:tendsto     %att-definition;
+                      %att-type;
+                      %att-globalatts;     >
+
+<!-- content elements -  quantifiers  -->
+
+<!ENTITY % cquantifier "math:lowlimit | math:uplimit | math:bvar | math:degree | math:logbase" >
+
+<!ATTLIST math:lowlimit  %att-globalatts;     >
+
+<!ATTLIST math:uplimit  %att-globalatts;     >
+
+<!ATTLIST math:bvar     %att-globalatts;     >
+
+<!ATTLIST math:degree   %att-globalatts;     >
+
+<!ATTLIST math:logbase  %att-globalatts;     >
+
+<!-- operator groups -->
+
+<!ENTITY % cop1ary "%cfuncop1ary; | %carithop1ary; | %clogicop1ary;
+                    | %ccalcop1ary; | %ctrigop; | %clalgop1ary; " >
+
+<!ENTITY % cop2ary "%carithop2ary; | %clogicop2ary;| %csetop2ary; " >
+
+<!ENTITY % copnary "%cfuncopnary; | %carithopnary; | %clogicopnary;
+                    | %csetopnary; | %cstatopnary;  | %clalgopnary; " >
+
+<!ENTITY % copmisc "%carithoproot; | %carithop1or2ary; | %ccalcop;
+                    | %cseqop; | %cstatopmoment; | %clogicopquant;" >
+
+<!-- relation groups -->
+
+<!ENTITY % crel2ary "%cgenrel2ary;  | %csetrel2ary; | %cseqrel2ary;   " >
+
+<!ENTITY % crelnary "%cgenrelnary; | %csetrelnary;" >
+
+<!-- content constructs - all -->
+
+<!ENTITY % Content "%ctoken; | %cspecial;  | %cother;  | %csemantics;
+                    |%cconstructor; | %cquantifier;
+                    |%cop1ary; |%cop2ary; |%copnary; |%copmisc;
+                    |%crel2ary; |%crelnary;" >
+
+<!-- content constructs for substitution in presentation structures -->
+
+<!ENTITY % ContInPres "math:ci | math:cn  | math:apply  | math:fn | math:lambda | math:reln
+                    | math:interval | math:list | math:matrix |math:matrixrow
+                    | math:set | math:vector | math:semantics" > <!--dpc-->
+
+<!-- *************************************************  -->
+
+<!-- recursive definition for content of expressions             -->
+<!-- include presentation tag constructs at lowest level         -->
+<!-- so presentation layout schemata hold presentation or Content -->
+<!-- include Content tag constructs at lowest level              -->
+<!-- so Content tokens hold PCDATA or Presentation at leaf level -->
+<!-- (for permitted substitutable elements in context)           -->
+
+<!ENTITY % ContentExpression   "(%Content; | %PresInCont;)* "     >
+<!ENTITY % PresExpression      "(%Presentation; | %ContInPres;)* "     >
+<!ENTITY % MathExpression      "(%PresInCont; | %ContInPres;)* "     >
+
+<!--  content token elements (may hold embedded presentation constructs)
+-->
+
+<!ELEMENT math:ci       (#PCDATA | %PresInCont;)*   >
+<!ELEMENT math:cn       (#PCDATA | math:sep | %PresInCont;)*   >
+
+<!--  content special elements    -->
+
+<!ELEMENT math:apply      (%ContentExpression;)   >
+<!ELEMENT math:reln       (%ContentExpression;)   >
+<!ELEMENT math:lambda     (%ContentExpression;)   >
+
+<!--  content other elements    -->
+
+<!ELEMENT math:condition      (%ContentExpression;)   >
+<!ELEMENT math:declare        (%ContentExpression;)   >
+
+<!--  content semantics elements    -->
+
+<!ELEMENT math:semantics              (%ContentExpression;)   >
+<!ELEMENT math:annotation             (#PCDATA)                >
+<!ELEMENT math:annotation-xml         (%ContentExpression;)   >
+
+<!--  content constructor elements    -->
+
+<!ELEMENT math:interval       (%ContentExpression;)   >
+<!ELEMENT math:set            (%ContentExpression;)   >
+<!ELEMENT math:list           (%ContentExpression;)   >
+<!ELEMENT math:vector         (%ContentExpression;)   >
+<!ELEMENT math:matrix         (%ContentExpression;)   >
+<!ELEMENT math:matrixrow      (%ContentExpression;)   >
+
+<!--  content operator element (user-defined)    -->
+
+<!ELEMENT math:fn       (%ContentExpression;)   >
+
+<!--  content quantifier elements    -->
+
+<!ELEMENT math:lowlimit       (%ContentExpression;)   >
+<!ELEMENT math:uplimit        (%ContentExpression;)   >
+<!ELEMENT math:bvar           (%ContentExpression;)   >
+<!ELEMENT math:degree         (%ContentExpression;)   >
+<!ELEMENT math:logbase        (%ContentExpression;)   >
+
+<!-- *************************************************  -->
+<!-- presentation layout schema contain tokens, layout and content
+schema  -->
+
+<!ELEMENT math:mstyle          (%PresExpression;)                      >
+<!ELEMENT math:merror          (%PresExpression;)                      >
+<!ELEMENT math:mphantom        (%PresExpression;)                      >
+<!ELEMENT math:mrow            (%PresExpression;)                      >
+<!ELEMENT math:mfrac           (%PresExpression;)                      >
+<!ELEMENT math:msqrt           (%PresExpression;)                      >
+<!ELEMENT math:mroot           (%PresExpression;)                      >
+<!ELEMENT math:msub            (%PresExpression;)                      >
+<!ELEMENT math:msup            (%PresExpression;)                      >
+<!ELEMENT math:msubsup         (%PresExpression;)                      >
+<!ELEMENT math:mmultiscripts   (%PresExpression;)                      >
+<!ELEMENT math:munder          (%PresExpression;)                      >
+<!ELEMENT math:mover           (%PresExpression;)                      >
+<!ELEMENT math:munderover      (%PresExpression;)                      >
+<!ELEMENT math:mtable          (%PresExpression;)                      >
+<!ELEMENT math:mtr             (%PresExpression;)                      >
+<!ELEMENT math:mtd             (%PresExpression;)                      >
+<!ELEMENT math:maction         (%PresExpression;)                      >
+<!ELEMENT math:mfenced         (%PresExpression;)                      >
+<!ELEMENT math:mpadded         (%PresExpression;)                      >
+
+<!-- presentation tokens contain PCDATA or malignmark constructs -->
+
+<!ELEMENT math:mi     (#PCDATA | math:malignmark )*        >
+<!ELEMENT math:mn     (#PCDATA | math:malignmark )*        >
+<!ELEMENT math:mo     (#PCDATA | math:malignmark )*        >
+<!ELEMENT math:mtext  (#PCDATA | math:malignmark )*        >
+<!ELEMENT math:ms     (#PCDATA | math:malignmark )*        >
+
+<!-- *************************************************  -->
+<!-- browser interface definition -->
+
+<!-- attributes for top level math element -->
+
+<!ENTITY  %     att-macros      'math:macros CDATA #IMPLIED' >
+<!ENTITY  %     att-mode        'math:mode   CDATA #IMPLIED' >
+
+<!ENTITY  %     att-topinfo    '%att-globalatts;
+                                %att-macros;
+                                %att-mode;'     >
+
+<!-- attributes for browser interface element element -->
+
+<!ENTITY  %     att-name        'math:name CDATA #IMPLIED' >
+<!ENTITY  %     att-baseline    'math:baseline CDATA #IMPLIED' >
+<!ENTITY  %     att-overflow    'math:overflow
+(scroll|elide|truncate|scale) "scroll"' >
+<!ENTITY  %     att-altimg      'math:altimg CDATA #IMPLIED' >
+<!ENTITY  %     att-alttext     'math:alttext CDATA #IMPLIED' >
+
+<!ENTITY  %     att-browif      '%att-type;
+                                %att-name;
+                                %att-height;
+                                %att-width;
+                                %att-baseline;
+                                %att-overflow;
+                                %att-altimg;
+                                %att-alttext; '     >
+
+<!-- the top level math  element      -->
+<!-- math  contains MathML encoded mathematics -->
+<!-- math has the browser info attributes iff it is the
+    browser interface element also -->
+
+<!ELEMENT math:math       (%MathExpression;)    >
+
+<!ATTLIST  math:math         %att-topinfo;
+                        %att-browif;   >
+
+
+<!-- ENTITY sets -->
+
+<!-- ... removed ... -->
+
+
+<!-- MathML new characters -->
+
+<!-- ... removed ... -->
+
+<!-- end of ENTITY sets -->
+<!-- end of DTD fragment -->
+<!-- *************************************************  -->
diff --git a/MathMLDTD/prj/build.lst b/MathMLDTD/prj/build.lst
new file mode 100644
index 000000000000..98f9bc77da80
--- /dev/null
+++ b/MathMLDTD/prj/build.lst
@@ -0,0 +1,3 @@
+md	MathMLDTD	:	solenv NULL
+md	MathMLDTD							usr1	-	all	md_mkout NULL
+md	MathMLDTD\prj						get		-	all	md_prj NULL
diff --git a/MathMLDTD/prj/d.lst b/MathMLDTD/prj/d.lst
new file mode 100644
index 000000000000..40d4a6a44f05
--- /dev/null
+++ b/MathMLDTD/prj/d.lst
@@ -0,0 +1,2 @@
+..\math.dtd %_DEST%\bin%_EXT%\math.dtd
+..\w3c_ipr_software_notice.html %_DEST%\bin%_EXT%\w3c_ipr_software_notice.html
diff --git a/MathMLDTD/w3c_ipr_software_notice.html b/MathMLDTD/w3c_ipr_software_notice.html
new file mode 100644
index 000000000000..3a4ed535c1a7
--- /dev/null
+++ b/MathMLDTD/w3c_ipr_software_notice.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+
+<!-- W3C IPR SOFTWARE NOTICE               -->
+<!-- downloaded from:                      -->
+<!--    http://www.w3.org/Consortium/Legal/copyright-software-19980720 -->
+<!--                                       -->
+<!-- Changed: 24. July 2001                -->
+<!-- 1) removed link to stylesheet         -->
+<!-- 2) removed "webmaster" link           -->
+<!-- 3) changed site-relative URLs to absolute URLs -->
+<!-- 4) added this comment block           -->
+<!-- Changes are intended to allow proper  -->
+<!-- off-line viewing of the license.      -->
+
+<html>
+<head>
+<meta name="generator" content="HTML Tidy, see www.w3.org">
+<meta http-equiv="Content-Type" content=
+"text/html; charset=iso-8859-1">
+<title>W3C IPR SOFTWARE NOTICE</title>
+</head>
+<body text="#000000" bgcolor="#FFFFFF">
+<h1>W3C<sup>&reg;</sup> SOFTWARE NOTICE AND LICENSE</h1>
+
+<h3>Copyright &copy; 1994-2001 <a href="http://www.w3.org/">World
+Wide Web Consortium</a>, (<a href=
+"http://www.lcs.mit.edu/">Massachusetts Institute of
+Technology</a>, <a href="http://www.inria.fr/">Institut National de
+Recherche en Informatique et en Automatique</a>, <a href=
+"http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/</h3>
+
+<p>This W3C work (including software, documents, or other related
+items) is being provided by the copyright holders under the
+following license. By obtaining, using and/or copying this work,
+you (the licensee) agree that you have read, understood, and will
+comply with the following terms and conditions:</p>
+
+<p>Permission to use, copy, modify, and distribute this software
+and its documentation, with or without modification,&nbsp; for any
+purpose and without fee or royalty is hereby granted, provided that
+you include the following on ALL copies of the software and
+documentation or portions thereof, including modifications, that
+you make:</p>
+
+<ol>
+<li>The full text of this NOTICE in a location viewable to users of
+the redistributed or derivative work.</li>
+
+<li>Any pre-existing intellectual property disclaimers, notices, or
+terms and conditions. If none exist, a short notice of the
+following form (hypertext is preferred, text is permitted) should
+be used within the body of any redistributed or derivative code:
+"Copyright &copy; [$date-of-software] <a href="http://www.w3.org/">
+World Wide Web Consortium</a>, (<a href=
+"http://www.lcs.mit.edu/">Massachusetts Institute of
+Technology</a>, <a href="http://www.inria.fr/">Institut National de
+Recherche en Informatique et en Automatique</a>, <a href=
+"http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/"</li>
+
+<li>Notice of any changes or modifications to the W3C files,
+including the date changes were made. (We recommend you provide
+URIs to the location from which the code is derived.)</li>
+</ol>
+
+<p>THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND
+COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
+USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
+PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
+
+<p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
+SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
+SOFTWARE OR DOCUMENTATION.</p>
+
+<p>The name and trademarks of copyright holders may NOT be used in
+advertising or publicity pertaining to the software without
+specific, written prior permission. Title to copyright in this
+software and any associated documentation will at all times remain
+with copyright holders.</p>
+
+<p>____________________________________</p>
+
+<p>This formulation of W3C's notice and license became active on
+August 14 1998 so as to improve compatibility with GPL. This
+version ensures that W3C software licensing terms are no more
+restrictive than GPL and consequently W3C software may be
+distributed in GPL packages. See the <a href=
+"http://www.w3.org/Consortium/Legal/copyright-software-19980519.html">older formulation</a> for the
+policy prior to this date. Please see our <a href="http://www.w3.org/Consortium/Legal/IPR-FAQ.html">
+Copyright FAQ</a> for common questions about using materials from
+our site, including specific terms and conditions for packages like
+libwww, Amaya, and Jigsaw. Other questions about this notice can be
+directed to <a href="mailto:site-policy@w3.org">
+site-policy@w3.org</a>.<br>
+&nbsp;</p>
+
+<p>&nbsp;</p>
+
+</body>
+</html>
+
diff --git a/Module_ooo.mk b/Module_ooo.mk
new file mode 100644
index 000000000000..f35cc58c0eaa
--- /dev/null
+++ b/Module_ooo.mk
@@ -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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,ooo))
+
+$(eval $(call gb_Module_add_moduledirs,ooo,\
+    comphelper \
+        editeng \
+    framework \
+    padmin \
+    sfx2 \
+    sot \
+    svl \
+    svtools \
+    svx \
+    sw \
+    toolkit \
+    tools \
+    unoxml \
+    xmloff \
+    vbahelper \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/Repository.mk b/Repository.mk
new file mode 100644
index 000000000000..9259250a8b84
--- /dev/null
+++ b/Repository.mk
@@ -0,0 +1,141 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.	If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Helper_register_repository,SRCDIR))
+
+
+$(eval $(call gb_Helper_register_executables,NONE, \
+    bmp \
+    bmpsum \
+    g2g \
+    mkunroll \
+    rscdep \
+    so_checksum \
+    sspretty \
+))
+
+$(eval $(call gb_Helper_register_executables,OOO, \
+    spadmin.bin \
+))
+
+$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+    avmedia \
+    basegfx \
+    cui \
+    drawinglayer \
+    editeng \
+    eggtray \
+    fwe \
+    fwi \
+    fwk \
+    fwl \
+    fwm \
+    i18npaper \
+    lng \
+    msfilter \
+    msword \
+    qstart_gtk \
+    sax \
+    sb \
+    sfx \
+    sot \
+    spa \
+    svl \
+    svt \
+    svx \
+    svxcore \
+    sw \
+    swd \
+    swui \
+    textconversiondlgs \
+    tk \
+    tl \
+    utl \
+    unordf \
+    unoxml \
+    vbahelper \
+    vcl \
+    xcr \
+    xo \
+    xof \
+))
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+    xml2 \
+))
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+    cppunit \
+    icuuc \
+    rdf \
+    xslt \
+))
+
+
+$(eval $(call gb_Helper_register_libraries,RTLIBS, \
+    comphelper \
+    i18nisolang1 \
+    i18nutil \
+    ucbhelper \
+    vos3 \
+))
+
+$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
+    cppuhelper \
+    salhelper \
+))
+
+$(eval $(call gb_Helper_register_libraries,STLLIBS, \
+    stl \
+))
+
+$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+    fsstorage \
+    hatchwindowfactory \
+    passwordcontainer \
+    productregistration \
+    vbaswobj \
+    msforms \
+))
+
+
+$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
+    cppu \
+    jvmfwk \
+    sal \
+))
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+    jpeglib \
+    ooopathutils \
+    salcpprt \
+    vclmain \
+    zlib \
+    vclmain \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
new file mode 100644
index 000000000000..10e06091b845
--- /dev/null
+++ b/RepositoryFixes.mk
@@ -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.
+#
+#*************************************************************************
+
+# fixes for all the libraries that are named with too much creativity and do
+# not follow any of the established nameschemes
+
+ifeq ($(OS),LINUX)
+gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+
+ifeq ($(USE_SYSTEM_STL),YES)
+gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
+gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
+endif
+
+endif
+
+
+ifeq ($(OS),MACOSX)
+gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+
+ifeq ($(USE_SYSTEM_STL),YES)
+gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.dylib,$(gb_Library_FILENAMES))
+gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
+endif
+
+endif
+
+
+ifeq ($(OS),WNT)
+ifneq ($(USE_MINGW),)
+gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:libcppunit.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
+ifeq ($(gb_PRODUCT),$(true))
+gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
+else
+gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
+endif
+gb_Library_NOILIBFILENAMES:=\
+    icuuc \
+    sot \
+    uwinapi \
+
+gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
+gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
+
+gb_Library_ILIBFILENAMES:=\
+    unicows \
+    uuid \
+
+gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
+
+gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst cppunit:cppunit%,cppunit:cygcppunit-1-12-1%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
+
+ifeq ($(USE_SYSTEM_STL),YES)
+gb_Library_FILENAMES := $(patsubst stl:%,stl:$(gb_Library_IARCSYSPRE)stdc++_s$(gb_Library_IARCSYSPRE),$(gb_Library_FILENAMES))
+gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
+endif
+
+else
+gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
+ifeq ($(gb_PRODUCT),$(true))
+gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
+else
+gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
+endif
+gb_Library_NOILIBFILENAMES:=\
+    advapi32 \
+    gdi32 \
+    gnu_getopt \
+    icuuc \
+    kernel32 \
+    msvcrt \
+    mpr \
+    oldnames \
+    ole32 \
+    oleaut32 \
+    shell32 \
+    sot \
+    unicows \
+    user32 \
+    uuid \
+    uwinapi \
+
+gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
+gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
+ifneq ($(gb_PRODUCT),$(true))
+gb_Library_FILENAMES := $(patsubst msvcrt:msvcrt%,msvcrt:msvcrtd%,$(gb_Library_FILENAMES))
+endif
+
+gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
+
+endif
+
+endif
+
+ifeq ($(OS),SOLARIS)
+gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+#$(info libnames: $(gb_Library_FILENAMES))
+
+endif
+
+# we do not require a known rule for these, when using system libs
+
+ifeq ($(USE_SYSTEM_STL),YES)
+gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
+endif
+
+ifeq ($(SYSTEM_LIBXML),YES)
+gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS))
+endif
+
+ifeq ($(SYSTEM_LIBXSLT),YES)
+gb_Library_TARGETS := $(filter-out xslt,$(gb_Library_TARGETS))
+endif
+
+ifeq ($(SYSTEM_REDLAND),YES)
+gb_Library_TARGETS := $(filter-out rdf,$(gb_Library_TARGETS))
+endif
+
+ifeq ($(SYSTEM_ICU),YES)
+gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx
new file mode 100644
index 000000000000..34563ec3441d
--- /dev/null
+++ b/UnoControls/inc/basecontainercontrol.hxx
@@ -0,0 +1,567 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX
+#define _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX
+
+//____________________________________________________________________________________________________________
+//  includes of other projects
+//____________________________________________________________________________________________________________
+
+#include <com/sun/star/lang/XServiceName.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/container/XContainer.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
+#include <com/sun/star/container/XNameReplace.hpp>
+#include <com/sun/star/container/XContainerListener.hpp>
+#include <com/sun/star/container/XSet.hpp>
+#include <com/sun/star/container/ContainerEvent.hpp>
+#include <com/sun/star/container/XIndexReplace.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <tools/list.hxx>
+
+//____________________________________________________________________________________________________________
+//  includes of my own project
+//____________________________________________________________________________________________________________
+#include "basecontrol.hxx"
+
+//____________________________________________________________________________________________________________
+//  "namespaces"
+//____________________________________________________________________________________________________________
+
+namespace unocontrols{
+
+#define UNO3_REFERENCE                              ::com::sun::star::uno::Reference
+#define UNO3_XCONTROL                               ::com::sun::star::awt::XControl
+#define UNO3_OUSTRING                               ::rtl::OUString
+#define UNO3_XCONTROLMODEL                          ::com::sun::star::awt::XControlModel
+#define UNO3_XCONTROLCONTAINER                      ::com::sun::star::awt::XControlContainer
+#define UNO3_XMULTISERVICEFACTORY                   ::com::sun::star::lang::XMultiServiceFactory
+#define UNO3_TYPE                                   ::com::sun::star::uno::Type
+#define UNO3_RUNTIMEEXCEPTION                       ::com::sun::star::uno::RuntimeException
+#define UNO3_XTOOLKIT                               ::com::sun::star::awt::XToolkit
+#define UNO3_XWINDOWPEER                            ::com::sun::star::awt::XWindowPeer
+#define UNO3_EVENTOBJECT                            ::com::sun::star::lang::EventObject
+#define UNO3_SEQUENCE                               ::com::sun::star::uno::Sequence
+#define UNO3_XCONTAINERLISTENER                     ::com::sun::star::container::XContainerListener
+#define UNO3_ANY                                    ::com::sun::star::uno::Any
+#define UNO3_XTABCONTROLLER                         ::com::sun::star::awt::XTabController
+#define UNO3_WINDOWDESCRIPTOR                       ::com::sun::star::awt::WindowDescriptor
+#define UNO3_XGRAPHICS                              ::com::sun::star::awt::XGraphics
+#define UNO3_OMULTITYPEINTERFACECONTAINERHELPER     ::cppu::OMultiTypeInterfaceContainerHelper
+#define UNO3_ILLEGALARGUMENTEXCEPTION               ::com::sun::star::lang::IllegalArgumentException
+
+//____________________________________________________________________________________________________________
+//  structs, types, forwards
+//____________________________________________________________________________________________________________
+
+struct IMPL_ControlInfo
+{
+    UNO3_REFERENCE< UNO3_XCONTROL >     xControl    ;
+    UNO3_OUSTRING                       sName       ;
+};
+
+// makro define a list-class for struct IMPL_ControlInfo!
+class IMPL_ControlInfoList ;
+DECLARE_LIST( IMPL_ControlInfoList, IMPL_ControlInfo* )
+
+//____________________________________________________________________________________________________________
+//  classes
+//____________________________________________________________________________________________________________
+
+class BaseContainerControl  : public UNO3_XCONTROLMODEL
+                            , public UNO3_XCONTROLCONTAINER
+                            , public BaseControl
+{
+
+//____________________________________________________________________________________________________________
+//  public methods
+//____________________________________________________________________________________________________________
+
+public:
+
+    //________________________________________________________________________________________________________
+    //  construct/destruct
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+       BaseContainerControl( const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >& xFactory );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual ~BaseContainerControl();
+
+    //________________________________________________________________________________________________________
+    //  XInterface
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      give answer, if interface is supported
+        @descr      The interfaces are searched by type.
+
+        @seealso    XInterface
+
+        @param      "rType" is the type of searched interface.
+
+        @return     Any     information about found interface
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XTypeProvider
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      get information about supported interfaces
+        @descr      -
+
+        @seealso    XTypeProvider
+
+        @param      -
+
+        @return     Sequence of types of all supported interfaces
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XAggregation
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XControl
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL createPeer(   const   UNO3_REFERENCE< UNO3_XTOOLKIT >&    xToolkit    ,
+                                        const   UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParent     ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XComponent
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL dispose() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XEventListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL disposing( const UNO3_EVENTOBJECT& rEvent ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XControlContainer
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addControl(   const   UNO3_OUSTRING&                      sName       ,
+                                        const   UNO3_REFERENCE< UNO3_XCONTROL >&    xControl    ) throw( UNO3_RUNTIMEEXCEPTION  );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addContainerListener( const UNO3_REFERENCE< UNO3_XCONTAINERLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeControl( const UNO3_REFERENCE< UNO3_XCONTROL >& xControl ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeContainerListener( const UNO3_REFERENCE< UNO3_XCONTAINERLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setStatusText( const UNO3_OUSTRING& sStatusText ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_REFERENCE< UNO3_XCONTROL > SAL_CALL getControl( const UNO3_OUSTRING& sName) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XCONTROL > > SAL_CALL getControls() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XUnoControlContainer
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addTabController( const UNO3_REFERENCE< UNO3_XTABCONTROLLER >& xTabController ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeTabController( const UNO3_REFERENCE< UNO3_XTABCONTROLLER >& xTabController ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setTabControllers( const UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XTABCONTROLLER > >& xTabControllers ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XTABCONTROLLER > > SAL_CALL getTabControllers() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XWindow
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( UNO3_RUNTIMEEXCEPTION );
+
+//____________________________________________________________________________________________________________
+//  protected methods
+//____________________________________________________________________________________________________________
+
+protected:
+    using OComponentHelper::disposing;
+    /**_______________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual UNO3_WINDOWDESCRIPTOR* impl_getWindowDescriptor( const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParentPeer );
+
+    /**_______________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void impl_paint(        sal_Int32                           nX          ,
+                                    sal_Int32                           nY          ,
+                            const   UNO3_REFERENCE< UNO3_XGRAPHICS >&   xGraphics   );
+
+//____________________________________________________________________________________________________________
+//  private methods
+//____________________________________________________________________________________________________________
+
+private:
+
+    /**_______________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    void impl_activateTabControllers();
+
+    /**_______________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    void impl_cleanMemory();
+
+//____________________________________________________________________________________________________________
+//  private variables
+//____________________________________________________________________________________________________________
+
+private:
+
+    IMPL_ControlInfoList*                                   m_pControlInfoList      ;   /// list of pointer of "struct IMPL_ControlInfo" to hold child-controls
+    UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XTABCONTROLLER > >  m_xTabControllerList    ;   /// list of references of XTabController to hold tab-order in this container
+    UNO3_OMULTITYPEINTERFACECONTAINERHELPER                 m_aListeners            ;
+
+};  // class BaseContainerControl
+
+}   // namespace unocontrols
+
+#endif  // ifndef _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
new file mode 100644
index 000000000000..050fd10fa2cc
--- /dev/null
+++ b/UnoControls/inc/basecontrol.hxx
@@ -0,0 +1,1231 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _UNOCONTROLS_BASECONTROL_CTRL_HXX
+#define _UNOCONTROLS_BASECONTROL_CTRL_HXX
+
+//____________________________________________________________________________________________________________
+//  includes of other projects
+//____________________________________________________________________________________________________________
+
+#include <com/sun/star/awt/XKeyListener.hpp>
+#include <com/sun/star/awt/XPaintListener.hpp>
+#include <com/sun/star/awt/KeyEvent.hpp>
+#include <com/sun/star/awt/KeyModifier.hpp>
+#include <com/sun/star/awt/XMouseMotionListener.hpp>
+#include <com/sun/star/awt/FocusEvent.hpp>
+#include <com/sun/star/awt/XWindowListener.hpp>
+#include <com/sun/star/awt/XActivateListener.hpp>
+#include <com/sun/star/awt/MouseEvent.hpp>
+#include <com/sun/star/awt/XTopWindowListener.hpp>
+#include <com/sun/star/awt/PaintEvent.hpp>
+#include <com/sun/star/awt/InputEvent.hpp>
+#include <com/sun/star/awt/KeyGroup.hpp>
+#include <com/sun/star/awt/Key.hpp>
+#include <com/sun/star/awt/WindowEvent.hpp>
+#include <com/sun/star/awt/XMouseListener.hpp>
+#include <com/sun/star/awt/KeyFunction.hpp>
+#include <com/sun/star/awt/FocusChangeReason.hpp>
+#include <com/sun/star/awt/MouseButton.hpp>
+#include <com/sun/star/awt/XFocusListener.hpp>
+#include <com/sun/star/awt/XFileDialog.hpp>
+#include <com/sun/star/awt/XTextComponent.hpp>
+#include <com/sun/star/awt/XListBox.hpp>
+#include <com/sun/star/awt/XProgressMonitor.hpp>
+#include <com/sun/star/awt/TextAlign.hpp>
+#include <com/sun/star/awt/XScrollBar.hpp>
+#include <com/sun/star/awt/XVclContainerPeer.hpp>
+#include <com/sun/star/awt/XTabControllerModel.hpp>
+#include <com/sun/star/awt/XMessageBox.hpp>
+#include <com/sun/star/awt/XTextEditField.hpp>
+#include <com/sun/star/awt/Style.hpp>
+#include <com/sun/star/awt/XTimeField.hpp>
+#include <com/sun/star/awt/XVclWindowPeer.hpp>
+#include <com/sun/star/awt/XControlModel.hpp>
+#include <com/sun/star/awt/XSpinField.hpp>
+#include <com/sun/star/awt/XUnoControlContainer.hpp>
+#include <com/sun/star/awt/XTextLayoutConstrains.hpp>
+#include <com/sun/star/awt/XNumericField.hpp>
+#include <com/sun/star/awt/XButton.hpp>
+#include <com/sun/star/awt/XTextArea.hpp>
+#include <com/sun/star/awt/XImageButton.hpp>
+#include <com/sun/star/awt/XFixedText.hpp>
+#include <com/sun/star/awt/XControlContainer.hpp>
+#include <com/sun/star/awt/XDialog.hpp>
+#include <com/sun/star/awt/ScrollBarOrientation.hpp>
+#include <com/sun/star/awt/XRadioButton.hpp>
+#include <com/sun/star/awt/XCurrencyField.hpp>
+#include <com/sun/star/awt/XPatternField.hpp>
+#include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
+#include <com/sun/star/awt/XTabController.hpp>
+#include <com/sun/star/awt/XVclContainer.hpp>
+#include <com/sun/star/awt/XDateField.hpp>
+#include <com/sun/star/awt/XComboBox.hpp>
+#include <com/sun/star/awt/XControl.hpp>
+#include <com/sun/star/awt/XCheckBox.hpp>
+#include <com/sun/star/awt/MessageBoxCommand.hpp>
+#include <com/sun/star/awt/XLayoutConstrains.hpp>
+#include <com/sun/star/awt/XProgressBar.hpp>
+#include <com/sun/star/awt/XTopWindow.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/awt/PosSize.hpp>
+#include <com/sun/star/awt/XView.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <osl/mutex.hxx>
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/component.hxx>
+
+//____________________________________________________________________________________________________________
+//  includes of my project
+//____________________________________________________________________________________________________________
+#include "multiplexer.hxx"
+
+//____________________________________________________________________________________________________________
+//  "namespaces"
+//____________________________________________________________________________________________________________
+
+namespace unocontrols{
+
+#define UNO3_ANY                                    ::com::sun::star::uno::Any
+#define UNO3_EVENTOBJECT                            ::com::sun::star::lang::EventObject
+#define UNO3_MUTEX                                  ::osl::Mutex
+#define UNO3_OCOMPONENTHELPER                       ::cppu::OComponentHelper
+#define UNO3_OUSTRING                               ::rtl::OUString
+#define UNO3_PAINTEVENT                             ::com::sun::star::awt::PaintEvent
+#define UNO3_RECTANGLE                              ::com::sun::star::awt::Rectangle
+#define UNO3_REFERENCE                              ::com::sun::star::uno::Reference
+#define UNO3_RUNTIMEEXCEPTION                       ::com::sun::star::uno::RuntimeException
+#define UNO3_SEQUENCE                               ::com::sun::star::uno::Sequence
+#define UNO3_SIZE                                   ::com::sun::star::awt::Size
+#define UNO3_TYPE                                   ::com::sun::star::uno::Type
+#define UNO3_WINDOWDESCRIPTOR                       ::com::sun::star::awt::WindowDescriptor
+#define UNO3_XCONTROL                               ::com::sun::star::awt::XControl
+#define UNO3_XCONTROLMODEL                          ::com::sun::star::awt::XControlModel
+#define UNO3_XEVENTLISTENER                         ::com::sun::star::lang::XEventListener
+#define UNO3_XFOCUSLISTENER                         ::com::sun::star::awt::XFocusListener
+#define UNO3_XGRAPHICS                              ::com::sun::star::awt::XGraphics
+#define UNO3_XKEYLISTENER                           ::com::sun::star::awt::XKeyListener
+#define UNO3_XMOUSELISTENER                         ::com::sun::star::awt::XMouseListener
+#define UNO3_XMOUSEMOTIONLISTENER                   ::com::sun::star::awt::XMouseMotionListener
+#define UNO3_XMULTISERVICEFACTORY                   ::com::sun::star::lang::XMultiServiceFactory
+#define UNO3_XPAINTLISTENER                         ::com::sun::star::awt::XPaintListener
+#define UNO3_XSERVICEINFO                           ::com::sun::star::lang::XServiceInfo
+#define UNO3_XTOOLKIT                               ::com::sun::star::awt::XToolkit
+#define UNO3_XVIEW                                  ::com::sun::star::awt::XView
+#define UNO3_XWINDOW                                ::com::sun::star::awt::XWindow
+#define UNO3_XWINDOWLISTENER                        ::com::sun::star::awt::XWindowListener
+#define UNO3_XWINDOWPEER                            ::com::sun::star::awt::XWindowPeer
+#define UNO3_XINTERFACE                             ::com::sun::star::uno::XInterface
+
+//____________________________________________________________________________________________________________
+//  macros
+//____________________________________________________________________________________________________________
+
+#define TRGB_COLORDATA(TRANSPARENCE,RED,GREEN,BLUE) \
+        ((sal_Int32)(((sal_uInt32)((sal_uInt8)(BLUE))))|(((sal_uInt32)((sal_uInt8)(GREEN)))<<8)|(((sal_uInt32)((sal_uInt8)(RED)))<<16)|(((sal_uInt32)((sal_uInt8)(TRANSPARENCE)))<<24))
+
+//____________________________________________________________________________________________________________
+//  structs
+//____________________________________________________________________________________________________________
+
+struct IMPL_MutexContainer
+{
+    // Is necassery to initialize "BaseControl" and make this class thread-safe.
+    UNO3_MUTEX m_aMutex ;
+};
+
+//____________________________________________________________________________________________________________
+//  classes
+//____________________________________________________________________________________________________________
+
+class BaseControl   : public UNO3_XSERVICEINFO
+                    , public UNO3_XPAINTLISTENER
+                    , public UNO3_XWINDOWLISTENER
+                    , public UNO3_XVIEW
+                    , public UNO3_XWINDOW
+                    , public UNO3_XCONTROL
+                    , public IMPL_MutexContainer
+                    , public UNO3_OCOMPONENTHELPER
+{
+//____________________________________________________________________________________________________________
+//  public methods
+//____________________________________________________________________________________________________________
+
+public:
+
+    //________________________________________________________________________________________________________
+    //  construct/destruct
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    BaseControl( const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >& xFactory );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual ~BaseControl();
+
+    //________________________________________________________________________________________________________
+    //  XInterface
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      give answer, if interface is supported
+        @descr      The interfaces are searched by type.
+
+        @seealso    XInterface
+
+        @param      "rType" is the type of searched interface.
+
+        @return     Any     information about found interface
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      increment refcount
+        @descr      -
+
+        @seealso    XInterface
+        @seealso    release()
+
+        @param      -
+
+        @return     -
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual void SAL_CALL acquire() throw();
+
+    /**_______________________________________________________________________________________________________
+        @short      decrement refcount
+        @descr      -
+
+        @seealso    XInterface
+        @seealso    acquire()
+
+        @param      -
+
+        @return     -
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual void SAL_CALL release() throw();
+
+    //________________________________________________________________________________________________________
+    //  XTypeProvider
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      get information about supported interfaces
+        @descr      -
+
+        @seealso    XTypeProvider
+
+        @param      -
+
+        @return     Sequence of types of all supported interfaces
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      get implementation id
+        @descr      This ID is neccessary for UNO-caching. If there no ID, cache is disabled.
+                    Another way, cache is enabled.
+
+        @seealso    XTypeProvider
+
+        @param      -
+
+        @return     ID as Sequence of byte
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual UNO3_SEQUENCE< sal_Int8 > SAL_CALL getImplementationId() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XAggregation
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setDelegator( const UNO3_REFERENCE< UNO3_XINTERFACE >& xDelegator ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XServiceInfo
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual sal_Bool SAL_CALL supportsService( const UNO3_OUSTRING& sServiceName ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_OUSTRING SAL_CALL getImplementationName() throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_SEQUENCE< UNO3_OUSTRING > SAL_CALL getSupportedServiceNames() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XComponent
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL dispose() throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addEventListener( const UNO3_REFERENCE< UNO3_XEVENTLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeEventListener( const UNO3_REFERENCE< UNO3_XEVENTLISTENER >& xListener   ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XControl
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL createPeer( const UNO3_REFERENCE< UNO3_XTOOLKIT >& xToolkit, const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParent ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setContext( const UNO3_REFERENCE< UNO3_XINTERFACE >& xContext ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION ) = 0 ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_REFERENCE< UNO3_XINTERFACE > SAL_CALL getContext() throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION ) = 0;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_REFERENCE< UNO3_XWINDOWPEER > SAL_CALL getPeer() throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_REFERENCE< UNO3_XVIEW > SAL_CALL getView() throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual sal_Bool SAL_CALL isDesignMode() throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual sal_Bool SAL_CALL isTransparent() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XWindow
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setPosSize(   sal_Int32   nX      ,
+                                        sal_Int32   nY      ,
+                                        sal_Int32   nWidth  ,
+                                        sal_Int32   nHeight ,
+                                        sal_Int16   nFlags  ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setFocus() throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_RECTANGLE SAL_CALL getPosSize() throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addWindowListener( const UNO3_REFERENCE< UNO3_XWINDOWLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addFocusListener( const UNO3_REFERENCE< UNO3_XFOCUSLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addKeyListener( const UNO3_REFERENCE< UNO3_XKEYLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addMouseListener( const UNO3_REFERENCE< UNO3_XMOUSELISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addMouseMotionListener( const UNO3_REFERENCE< UNO3_XMOUSEMOTIONLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addPaintListener( const UNO3_REFERENCE< UNO3_XPAINTLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeWindowListener( const UNO3_REFERENCE< UNO3_XWINDOWLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeFocusListener( const UNO3_REFERENCE< UNO3_XFOCUSLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeKeyListener( const UNO3_REFERENCE< UNO3_XKEYLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeMouseListener( const UNO3_REFERENCE< UNO3_XMOUSELISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeMouseMotionListener( const UNO3_REFERENCE< UNO3_XMOUSEMOTIONLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removePaintListener( const UNO3_REFERENCE< UNO3_XPAINTLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XView
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL draw( sal_Int32   nX  ,
+                                sal_Int32   nY  ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual sal_Bool SAL_CALL setGraphics( const UNO3_REFERENCE< UNO3_XGRAPHICS >& xDevice ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setZoom(  float   fZoomX  ,
+                                    float   fZoomY  ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_REFERENCE< UNO3_XGRAPHICS > SAL_CALL getGraphics() throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_SIZE SAL_CALL getSize() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  UNO3_XEVENTLISTENER
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL disposing( const UNO3_EVENTOBJECT& rSource    ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XPaintListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowPaint( const UNO3_PAINTEVENT& rEvent ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XWindowListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowResized( const UNO3_WINDOWEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL windowMoved( const UNO3_WINDOWEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL windowShown( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION );
+    virtual void SAL_CALL windowHidden( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  impl but public method to register service
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    static const UNO3_SEQUENCE< UNO3_OUSTRING > impl_getStaticSupportedServiceNames();
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    static const UNO3_OUSTRING impl_getStaticImplementationName();
+
+//____________________________________________________________________________________________________________
+//  protected methods
+//____________________________________________________________________________________________________________
+
+protected:
+    using OComponentHelper::disposing;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY > impl_getMultiServiceFactory();
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    const UNO3_REFERENCE< UNO3_XWINDOW > impl_getPeerWindow();
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    const UNO3_REFERENCE< UNO3_XGRAPHICS > impl_getGraphicsPeer();
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    const sal_Int32& impl_getWidth();
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    const sal_Int32& impl_getHeight();
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_WINDOWDESCRIPTOR* impl_getWindowDescriptor( const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParentPeer );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void impl_paint(        sal_Int32               nX          ,
+                                    sal_Int32               nY          ,
+                            const   UNO3_REFERENCE< UNO3_XGRAPHICS >&   xGraphics   );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void impl_recalcLayout( const UNO3_WINDOWEVENT& aEvent );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    UNO3_REFERENCE< UNO3_XINTERFACE > impl_getDelegator();
+
+//____________________________________________________________________________________________________________
+//  private methods
+//____________________________________________________________________________________________________________
+
+private:
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    void impl_releasePeer();
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    OMRCListenerMultiplexerHelper* impl_getMultiplexer();
+
+//____________________________________________________________________________________________________________
+//  private variables
+//____________________________________________________________________________________________________________
+
+private:
+
+    UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >     m_xFactory              ;
+    UNO3_REFERENCE< UNO3_XINTERFACE >               m_xDelegator            ;
+    OMRCListenerMultiplexerHelper*                  m_pMultiplexer          ;   // multiplex events
+    UNO3_REFERENCE< UNO3_XINTERFACE >               m_xMultiplexer          ;
+    UNO3_REFERENCE< UNO3_XINTERFACE >               m_xContext              ;
+    UNO3_REFERENCE< UNO3_XWINDOWPEER >              m_xPeer                 ;
+    UNO3_REFERENCE< UNO3_XWINDOW >                  m_xPeerWindow           ;
+    UNO3_REFERENCE< UNO3_XGRAPHICS >                m_xGraphicsView         ;   // graphics for ::com::sun::star::awt::XView-operations
+    UNO3_REFERENCE< UNO3_XGRAPHICS >                m_xGraphicsPeer         ;   // graphics for painting on a peer
+    sal_Int32                                       m_nX                    ;   // Position ...
+    sal_Int32                                       m_nY                    ;
+    sal_Int32                                       m_nWidth                ;   // ... and size of window
+    sal_Int32                                       m_nHeight               ;
+    sal_Bool                                        m_bVisible              ;   // Some state flags
+    sal_Bool                                        m_bInDesignMode         ;
+    sal_Bool                                        m_bEnable               ;
+
+};  // class BaseControl
+
+}   // namespace unocontrols
+
+#endif  // ifndef _UNOCONTROLS_BASECONTROL_CTRL_HXX
diff --git a/UnoControls/inc/definesunocontrols.hxx b/UnoControls/inc/definesunocontrols.hxx
new file mode 100644
index 000000000000..cf072736c4b5
--- /dev/null
+++ b/UnoControls/inc/definesunocontrols.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 _UNOCONTROLS_DEFINES_CTRL_HXX
+#define _UNOCONTROLS_DEFINES_CTRL_HXX
+
+//-------------------------------------------------------------------------------------------------------------------
+// includes
+#include <limits.h> // defines for min/max of INT
+
+namespace unocontrols{
+
+//-------------------------------------------------------------------------------------------------------------------
+// global defines for all UnoControls
+//-------------------------------------------------------------------------------------------------------------------
+#define UNOCONTROLS_TRGB_COLORDATA( t,r,g,b )               ((INT32)(((UINT32)((UINT8)(b))))|(((UINT32)((UINT8)(g)))<<8)|(((UINT32)((UINT8)(r)))<<16)|(((UINT32)((UINT8)(t)))<<24))
+//-------------------------------------------------------------------------------------------------------------------
+
+// defines for BaseControl
+#ifdef _UNOCONTROLS_BASECONTROL_CTRL_HXX
+    #define BASECONTROL_IDLCLASSNAME                        "BaseControl"
+    #define BASECONTROL_DEFAULT_PMULTIPLEXER                NULL
+    #define BASECONTROL_DEFAULT_X                           0
+    #define BASECONTROL_DEFAULT_Y                           0
+    #define BASECONTROL_DEFAULT_WIDTH                       100
+    #define BASECONTROL_DEFAULT_HEIGHT                      100
+    #define BASECONTROL_DEFAULT_VISIBLE                     FALSE
+    #define BASECONTROL_DEFAULT_INDESIGNMODE                FALSE
+    #define BASECONTROL_DEFAULT_ENABLE                      TRUE
+    #define BASECONTROL_SERVICE_VCLTOOLKIT                  "com.sun.star.awt.VclToolkit"
+#endif
+//-------------------------------------------------------------------------------------------------------------------
+
+//-------------------------------------------------------------------------------------------------------------------
+// defines for BaseContainerControl
+#ifdef _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX
+    #define BASECONTAINERCONTROL_IDLCLASSNAME               "BaseContainerControl"
+#endif
+//-------------------------------------------------------------------------------------------------------------------
+
+//-------------------------------------------------------------------------------------------------------------------
+// defines for ProgressBar
+#ifdef _UNOCONTROLS_PROGRESSBAR_CTRL_HXX
+    #define PROGRESSBAR_IDLCLASSNAME                        "XProgressbar"
+    #define PROGRESSBAR_SERVICENAME                         "com.sun.star.awt.XProgressBar"
+    #define PROGRESSBAR_IMPLEMENTATIONNAME                  "stardiv.UnoControls.ProgressBar"
+    #define PROGRESSBAR_FREEBORDER                          2
+    #define PROGRESSBAR_DEFAULT_HORIZONTAL                  TRUE
+    #define PROGRESSBAR_DEFAULT_BLOCKDIMENSION              Size(1,1)
+    #define PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR             UNOCONTROLS_TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )    // lightgray
+    #define PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR             UNOCONTROLS_TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x80 )    // blue
+    #define PROGRESSBAR_DEFAULT_MINRANGE                    INT_MIN
+    #define PROGRESSBAR_DEFAULT_MAXRANGE                    INT_MAX
+    #define PROGRESSBAR_DEFAULT_BLOCKVALUE                  1
+    #define PROGRESSBAR_DEFAULT_VALUE                       PROGRESSBAR_DEFAULT_MINRANGE
+    #define PROGRESSBAR_LINECOLOR_BRIGHT                    UNOCONTROLS_TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )    // white
+    #define PROGRESSBAR_LINECOLOR_SHADOW                    UNOCONTROLS_TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )    // black
+#endif
+//-------------------------------------------------------------------------------------------------------------------
+
+//-------------------------------------------------------------------------------------------------------------------
+// defines for FrameControl
+#ifdef _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
+    #define FRAMECONTROL_IDLCLASSNAME                       "FrameControl"
+    #define FRAMECONTROL_SERVICENAME                        "com.sun.star.frame.FrameControl"
+    #define FRAMECONTROL_IMPLEMENTATIONNAME                 "stardiv.UnoControls.FrameControl"
+    #define FRAMECONTROL_DEFAULT_COMPONENTURL               "private:factory/swriter"
+    #define FRAMECONTROL_PROPERTYNAME_LOADERARGUMENTS       "LoaderArguments"
+    #define FRAMECONTROL_PROPERTYNAME_COMPONENTURL          "ComponentURL"
+    #define FRAMECONTROL_PROPERTYNAME_FRAME                 "Frame"
+    #define FRAMECONTROL_PROPERTYNAME_IDLCLASSES            "IDLClasses"
+    #define FRAMECONTROL_ERRORTEXT_VOSENSHURE               "This is an invalid property handle."
+    #define FRAMECONTROL_PROPERTY_COUNT                     4                                                       // you must count the propertys
+    #define FRAMECONTROL_PROPERTY_COMPONENTURL              0                                                       // Id must be the index into the array
+    #define FRAMECONTROL_PROPERTY_FRAME                     1
+    #define FRAMECONTROL_PROPERTY_IDLCLASSES                2
+    #define FRAMECONTROL_PROPERTY_LOADERARGUMENTS           3
+#endif
+//-------------------------------------------------------------------------------------------------------------------
+
+//-------------------------------------------------------------------------------------------------------------------
+// defines for ProgressMonitor
+#ifdef _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX
+    #define PROGRESSMONITOR_IDLCLASSNAME                    "XProgressMonitor"
+    #define PROGRESSMONITOR_SERVICENAME                     "com.sun.star.awt.XProgressMonitor"
+    #define PROGRESSMONITOR_IMPLEMENTATIONNAME              "stardiv.UnoControls.ProgressMonitor"
+    #define PROGRESSMONITOR_FREEBORDER                      10                                                      // border around and between the controls
+    #define PROGRESSMONITOR_WIDTH_RELATION                  4                                                       // reserve 1/4 for button width and rest for progressbar width
+    #define PROGRESSMONITOR_HEIGHT_RELATION                 5                                                       // reserve 1/5 for button and progressbar heigth and rest for text height
+    #define PROGRESSMONITOR_FIXEDTEXT_SERVICENAME           "com.sun.star.awt.UnoControlFixedText"
+    #define PROGRESSMONITOR_BUTTON_SERVICENAME              "com.sun.star.awt.UnoControlButton"
+    #define PROGRESSMONITOR_FIXEDTEXT_MODELNAME             "com.sun.star.awt.UnoControlFixedTextModel"
+    #define PROGRESSMONITOR_BUTTON_MODELNAME                "com.sun.star.awt.UnoControlButtonModel"
+    #define PROGRESSMONITOR_CONTROLNAME_TEXT                "Text"                                                  // identifier the control in container
+    #define PROGRESSMONITOR_CONTROLNAME_BUTTON              "Button"                                                //              -||-
+    #define PROGRESSMONITOR_CONTROLNAME_PROGRESSBAR         "ProgressBar"                                           //              -||-
+    #define PROGRESSMONITOR_DEFAULT_BUTTONLABEL             "Abbrechen"
+    #define PROGRESSMONITOR_DEFAULT_TOPIC                   "\0"
+    #define PROGRESSMONITOR_DEFAULT_TEXT                    "\0"
+    #define PROGRESSMONITOR_BACKGROUNDCOLOR                 UNOCONTROLS_TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )    // lighgray
+    #define PROGRESSMONITOR_LINECOLOR_BRIGHT                UNOCONTROLS_TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )    // white
+    #define PROGRESSMONITOR_LINECOLOR_SHADOW                UNOCONTROLS_TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )    // black
+    #define PROGRESSMONITOR_HEIGHT_PROGRESSBAR              15
+    #define PROGRESSMONITOR_DEFAULT_WIDTH                   350
+    #define PROGRESSMONITOR_DEFAULT_HEIGHT                  100
+#endif
+//-------------------------------------------------------------------------------------------------------------------
+
+}   // namespace unocontrols
+
+#endif  // #ifndef _UNOCONTROLS_DEFINES_CTRL_HXX
diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx
new file mode 100644
index 000000000000..b22513e5f16c
--- /dev/null
+++ b/UnoControls/inc/multiplexer.hxx
@@ -0,0 +1,771 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _UNOCONTROLS_MULTIPLEXER_HXX
+#define _UNOCONTROLS_MULTIPLEXER_HXX
+
+//____________________________________________________________________________________________________________
+//  includes of other projects
+//____________________________________________________________________________________________________________
+
+#include <com/sun/star/awt/XKeyListener.hpp>
+#include <com/sun/star/awt/XPaintListener.hpp>
+#include <com/sun/star/awt/KeyEvent.hpp>
+#include <com/sun/star/awt/KeyModifier.hpp>
+#include <com/sun/star/awt/XMouseMotionListener.hpp>
+#include <com/sun/star/awt/FocusEvent.hpp>
+#include <com/sun/star/awt/XWindowListener.hpp>
+#include <com/sun/star/awt/XActivateListener.hpp>
+#include <com/sun/star/awt/MouseEvent.hpp>
+#include <com/sun/star/awt/XTopWindowListener.hpp>
+#include <com/sun/star/awt/PaintEvent.hpp>
+#include <com/sun/star/awt/InputEvent.hpp>
+#include <com/sun/star/awt/KeyGroup.hpp>
+#include <com/sun/star/awt/Key.hpp>
+#include <com/sun/star/awt/WindowEvent.hpp>
+#include <com/sun/star/awt/XMouseListener.hpp>
+#include <com/sun/star/awt/KeyFunction.hpp>
+#include <com/sun/star/awt/FocusChangeReason.hpp>
+#include <com/sun/star/awt/MouseButton.hpp>
+#include <com/sun/star/awt/XFocusListener.hpp>
+#include <com/sun/star/awt/XTopWindow.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/awt/PosSize.hpp>
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/interfacecontainer.hxx>
+//____________________________________________________________________________________________________________
+//  includes of my own project
+//____________________________________________________________________________________________________________
+
+//____________________________________________________________________________________________________________
+//  "namespaces"
+//____________________________________________________________________________________________________________
+
+namespace unocontrols{
+
+#define UNO3_OWEAKOBJECT                            ::cppu::OWeakObject
+#define UNO3_XWINDOW                                ::com::sun::star::awt::XWindow
+#define UNO3_REFERENCE                              ::com::sun::star::uno::Reference
+#define UNO3_WEAKREFERENCE                          ::com::sun::star::uno::WeakReference
+#define UNO3_MUTEX                                  ::osl::Mutex
+#define UNO3_XWINDOWLISTENER                        ::com::sun::star::awt::XWindowListener
+#define UNO3_XKEYLISTENER                           ::com::sun::star::awt::XKeyListener
+#define UNO3_XMOUSELISTENER                         ::com::sun::star::awt::XMouseListener
+#define UNO3_XMOUSEMOTIONLISTENER                   ::com::sun::star::awt::XMouseMotionListener
+#define UNO3_XPAINTLISTENER                         ::com::sun::star::awt::XPaintListener
+#define UNO3_XTOPWINDOWLISTENER                     ::com::sun::star::awt::XTopWindowListener
+#define UNO3_XFOCUSLISTENER                         ::com::sun::star::awt::XFocusListener
+#define UNO3_ANY                                    ::com::sun::star::uno::Any
+#define UNO3_TYPE                                   ::com::sun::star::uno::Type
+#define UNO3_RUNTIMEEXCEPTION                       ::com::sun::star::uno::RuntimeException
+#define UNO3_XINTERFACE                             ::com::sun::star::uno::XInterface
+#define UNO3_EVENTOBJECT                            ::com::sun::star::lang::EventObject
+#define UNO3_FOCUSEVENT                             ::com::sun::star::awt::FocusEvent
+#define UNO3_WINDOWEVENT                            ::com::sun::star::awt::WindowEvent
+#define UNO3_KEYEVENT                               ::com::sun::star::awt::KeyEvent
+#define UNO3_MOUSEEVENT                             ::com::sun::star::awt::MouseEvent
+#define UNO3_PAINTEVENT                             ::com::sun::star::awt::PaintEvent
+#define UNO3_OMULTITYPEINTERFACECONTAINERHELPER     ::cppu::OMultiTypeInterfaceContainerHelper
+
+//____________________________________________________________________________________________________________
+//  class
+//____________________________________________________________________________________________________________
+
+class OMRCListenerMultiplexerHelper : public UNO3_XFOCUSLISTENER
+                                    , public UNO3_XWINDOWLISTENER
+                                    , public UNO3_XKEYLISTENER
+                                    , public UNO3_XMOUSELISTENER
+                                    , public UNO3_XMOUSEMOTIONLISTENER
+                                    , public UNO3_XPAINTLISTENER
+                                    , public UNO3_XTOPWINDOWLISTENER
+                                    , public UNO3_OWEAKOBJECT
+{
+
+//____________________________________________________________________________________________________________
+//  public methods
+//____________________________________________________________________________________________________________
+
+public:
+
+    //________________________________________________________________________________________________________
+    //  construct/destruct
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      constructor
+        @descr      Create a Multiplexer of XWindowEvents.
+
+        @seealso    -
+
+        @param      rControl    The control. All listeners think that this is the original broadcaster.
+        @param      rPeer       The peer from which the original events are dispatched. Null is allowed.
+
+        @return     -
+
+        @onerror    -
+    */
+
+    OMRCListenerMultiplexerHelper(  const   UNO3_REFERENCE< UNO3_XWINDOW >& xControl    ,
+                                    const   UNO3_REFERENCE< UNO3_XWINDOW >& xPeer       );
+
+    /**_______________________________________________________________________________________________________
+        @short      copy-constructor
+        @descr
+
+        @seealso    -
+
+        @param      rCopyInstance   C++-Reference to instance to make copy from.
+
+        @return     -
+
+        @onerror    -
+    */
+
+    OMRCListenerMultiplexerHelper( const OMRCListenerMultiplexerHelper& aCopyInstance );
+
+    /**_______________________________________________________________________________________________________
+        @short      destructor
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    ~OMRCListenerMultiplexerHelper();
+
+    //________________________________________________________________________________________________________
+    //  XInterface
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      give answer, if interface is supported
+        @descr      The interfaces are searched by type.
+
+        @seealso    XInterface
+
+        @param      "rType" is the type of searched interface.
+
+        @return     Any     information about found interface
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      increment refcount
+        @descr      -
+
+        @seealso    XInterface
+        @seealso    release()
+
+        @param      -
+
+        @return     -
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual void SAL_CALL acquire() throw();
+
+    /**_______________________________________________________________________________________________________
+        @short      decrement refcount
+        @descr      -
+
+        @seealso    XInterface
+        @seealso    acquire()
+
+        @param      -
+
+        @return     -
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual void SAL_CALL release() throw();
+
+    //________________________________________________________________________________________________________
+    //  operator
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    operator UNO3_REFERENCE< UNO3_XINTERFACE >() const;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    OMRCListenerMultiplexerHelper& operator= ( const OMRCListenerMultiplexerHelper& aCopyInstance );
+
+    //________________________________________________________________________________________________________
+    //  container methods
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      Remove all listeners from the previous set peer and add the needed listeners to rPeer.
+        @descr      -
+
+        @seealso    -
+
+        @param      rPeer       The peer from which the original events are dispatched. Null is allowed.
+
+        @return     -
+
+        @onerror    -
+    */
+
+    void setPeer( const UNO3_REFERENCE< UNO3_XWINDOW >& xPeer );
+
+    /**_______________________________________________________________________________________________________
+        @short      Remove all listeners and send a disposing message.
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    void disposeAndClear();
+
+    /**_______________________________________________________________________________________________________
+        @short      Add the specified listener to the source.
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    void advise(    const   UNO3_TYPE&                          aType       ,
+                    const   UNO3_REFERENCE< UNO3_XINTERFACE >&  xListener   );
+
+    /**_______________________________________________________________________________________________________
+        @short      Remove the specified listener from the source.
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    void unadvise(  const   UNO3_TYPE&                          aType       ,
+                    const   UNO3_REFERENCE< UNO3_XINTERFACE >&  xListener   );
+
+    //________________________________________________________________________________________________________
+    //  XEventListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL disposing(const UNO3_EVENTOBJECT& aSource) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    //________________________________________________________________________________________________________
+    //  XFocusListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL focusGained(const UNO3_FOCUSEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL focusLost(const UNO3_FOCUSEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    //________________________________________________________________________________________________________
+    //  XWindowListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowResized(const UNO3_WINDOWEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowMoved(const UNO3_WINDOWEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowShown(const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowHidden(const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    //________________________________________________________________________________________________________
+    //  XKeyListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL keyPressed( const UNO3_KEYEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL keyReleased( const UNO3_KEYEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    //________________________________________________________________________________________________________
+    //  XMouseListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL mousePressed(const UNO3_MOUSEEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL mouseReleased(const UNO3_MOUSEEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL mouseEntered(const UNO3_MOUSEEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL mouseExited(const UNO3_MOUSEEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    //________________________________________________________________________________________________________
+    //  XMouseMotionListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL mouseDragged(const UNO3_MOUSEEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL mouseMoved(const UNO3_MOUSEEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    //________________________________________________________________________________________________________
+    //  XPaintListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowPaint(const UNO3_PAINTEVENT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    //________________________________________________________________________________________________________
+    //  XTopWindowListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowOpened( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowClosing( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowClosed( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowMinimized( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowNormalized( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowActivated( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowDeactivated( const UNO3_EVENTOBJECT& aEvent ) throw( UNO3_RUNTIMEEXCEPTION ) ;
+
+//____________________________________________________________________________________________________________
+//  protected methods
+//____________________________________________________________________________________________________________
+
+protected:
+
+    /**_______________________________________________________________________________________________________
+        @short      Remove the listener from the peer.
+        @descr      -
+
+        @seealso    -
+
+        @param      xPeer   The peer from which the listener is removed.
+        @param      rType   The listener type, which specify the type of the listener.
+
+        @return     -
+
+        @onerror    -
+    */
+
+    void impl_adviseToPeer( const   UNO3_REFERENCE< UNO3_XWINDOW >& xPeer   ,
+                            const   UNO3_TYPE&                      aType   );
+
+    /**_______________________________________________________________________________________________________
+        @short      Add the listener to the peer.
+        @descr      -
+
+        @seealso    -
+
+        @param      xPeer   The peer to which the listener is added.
+        @param      rType   The listener type, which specify the type of the listener.
+
+        @return     -
+
+        @onerror    -
+    */
+
+    void impl_unadviseFromPeer( const   UNO3_REFERENCE< UNO3_XWINDOW >& xPeer   ,
+                                const   UNO3_TYPE&                      aType   );
+
+//____________________________________________________________________________________________________________
+//  private variables
+//____________________________________________________________________________________________________________
+
+private:
+
+    UNO3_MUTEX                                  m_aMutex            ;
+    UNO3_REFERENCE< UNO3_XWINDOW >              m_xPeer             ;   /// The source of the events. Normally this is the peer object.
+    UNO3_WEAKREFERENCE< UNO3_XWINDOW >          m_xControl          ;
+    UNO3_OMULTITYPEINTERFACECONTAINERHELPER     m_aListenerHolder   ;
+
+};  // class OMRCListenerMultiplexerHelper
+
+}   // namespace unocontrols
+
+#endif  // ifndef _UNOCONTROLS_MULTIPLEXER_HXX
diff --git a/UnoControls/prj/build.lst b/UnoControls/prj/build.lst
new file mode 100644
index 000000000000..775cb902f5ca
--- /dev/null
+++ b/UnoControls/prj/build.lst
@@ -0,0 +1,5 @@
+us	UnoControls	: LIBXSLT:libxslt cppuhelper offuh tools NULL
+us	UnoControls								usr1	-	all	us_mkout NULL
+us	UnoControls\source\base					nmake	-	all	us_base NULL
+us	UnoControls\source\controls				nmake	-	all	us_ctrls NULL
+us	UnoControls\util						nmake	-	all	us_util us_base us_ctrls NULL
diff --git a/UnoControls/prj/d.lst b/UnoControls/prj/d.lst
new file mode 100644
index 000000000000..370fc0c9fc46
--- /dev/null
+++ b/UnoControls/prj/d.lst
@@ -0,0 +1,6 @@
+..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
+..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
+..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
+..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
+..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+..\%__SRC%\misc\ctl.component %_DEST%\xml%_EXT%\ctl.component
diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
new file mode 100644
index 000000000000..68ed6287c2b4
--- /dev/null
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -0,0 +1,642 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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
+//____________________________________________________________________________________________________________
+
+#include "basecontainercontrol.hxx"
+
+//____________________________________________________________________________________________________________
+//  includes of other projects
+//____________________________________________________________________________________________________________
+#include <cppuhelper/typeprovider.hxx>
+
+//____________________________________________________________________________________________________________
+//  includes of my own project
+//____________________________________________________________________________________________________________
+
+//____________________________________________________________________________________________________________
+//  namespaces
+//____________________________________________________________________________________________________________
+
+using namespace ::cppu                      ;
+using namespace ::osl                       ;
+using namespace ::rtl                       ;
+using namespace ::com::sun::star::uno       ;
+using namespace ::com::sun::star::lang      ;
+using namespace ::com::sun::star::awt       ;
+using namespace ::com::sun::star::container ;
+
+namespace unocontrols{
+
+//____________________________________________________________________________________________________________
+//  construct/destruct
+//____________________________________________________________________________________________________________
+
+BaseContainerControl::BaseContainerControl( const Reference< XMultiServiceFactory >& xFactory )
+    : BaseControl   ( xFactory  )
+    , m_aListeners  ( m_aMutex  )
+{
+    // initialize info list for controls
+    m_pControlInfoList = new IMPL_ControlInfoList ;
+}
+
+BaseContainerControl::~BaseContainerControl()
+{
+    impl_cleanMemory();
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( RuntimeException )
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    Any aReturn ;
+    Reference< XInterface > xDel = BaseControl::impl_getDelegator();
+    if ( xDel.is() == sal_True )
+    {
+        // If an delegator exist, forward question to his queryInterface.
+        // Delegator will ask his own queryAggregation!
+        aReturn = xDel->queryInterface( rType );
+    }
+    else
+    {
+        // If an delegator unknown, forward question to own queryAggregation.
+        aReturn = queryAggregation( rType );
+    }
+
+    return aReturn ;
+}
+
+//____________________________________________________________________________________________________________
+//  XTypeProvider
+//____________________________________________________________________________________________________________
+
+Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( 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 OTypeCollection* pTypeCollection = NULL ;
+
+    if ( pTypeCollection == NULL )
+    {
+        // Ready for multithreading; get global mutex for first call of this method only! see before
+        MutexGuard aGuard( 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 OTypeCollection aTypeCollection  (   ::getCppuType(( const Reference< XControlModel      >*)NULL )   ,
+                                                          ::getCppuType(( const Reference< XControlContainer    >*)NULL )   ,
+                                                        BaseControl::getTypes()
+                                                    );
+            // ... and set his address to static pointer!
+            pTypeCollection = &aTypeCollection ;
+        }
+    }
+
+    return pTypeCollection->getTypes();
+}
+
+//____________________________________________________________________________________________________________
+//  XAggregation
+//____________________________________________________________________________________________________________
+
+Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw( RuntimeException )
+{
+    // Ask for my own supported interfaces ...
+    // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
+    Any aReturn ( ::cppu::queryInterface(   aType                                       ,
+                                               static_cast< XControlModel*      > ( this )  ,
+                                               static_cast< XControlContainer*  > ( this )
+                                        )
+                );
+
+    // If searched interface supported by this class ...
+    if ( aReturn.hasValue() == sal_True )
+    {
+        // ... return this information.
+        return aReturn ;
+    }
+    else
+    {
+        // Else; ... ask baseclass for interfaces!
+        return BaseControl::queryAggregation( aType );
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseContainerControl::createPeer( const   Reference< XToolkit >&      xToolkit    ,
+                                                const   Reference< XWindowPeer >&   xParent     ) throw( RuntimeException )
+{
+    if ( getPeer().is() == sal_False )
+    {
+        // create own peer
+        BaseControl::createPeer( xToolkit, xParent );
+
+        // create peers at all childs
+        Sequence< Reference< XControl > >   seqControlList  = getControls();
+        sal_uInt32                          nControls       = seqControlList.getLength();
+
+        for ( sal_uInt32 n=0; n<nControls; n++ )
+        {
+            seqControlList.getArray()[n]->createPeer( xToolkit, getPeer() );
+        }
+
+        // activate new tab order
+        impl_activateTabControllers();
+
+/*
+        Reference< XVclContainerPeer > xC;
+        mxPeer->queryInterface( ::getCppuType((const Reference< XVclContainerPeer >*)0), xC );
+        xC->enableDialogControl( sal_True );
+*/
+
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& ) throw( RuntimeException )
+{
+    // This object has NO model.
+    return sal_False ;
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( RuntimeException )
+{
+    // This object has NO model.
+    // return (XControlModel*)this ;
+    return Reference< XControlModel >();
+}
+
+//____________________________________________________________________________________________________________
+//  XComponent
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException )
+{
+    // Zuerst der Welt mitteilen, da� der Container wegfliegt. Dieses ist um einiges
+    // schneller wenn die Welt sowohl an den Controls als auch am Container horcht
+
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+
+    // remove listeners
+    EventObject aObject ;
+
+    aObject.Source = Reference< XComponent > ( (XControlContainer*)this, UNO_QUERY );
+    m_aListeners.disposeAndClear( aObject );
+
+    // remove controls
+    Sequence< Reference< XControl > >   seqCtrls    =   getControls();
+    Reference< XControl > *             pCtrls      =   seqCtrls.getArray();
+    sal_uInt32                          nCtrls      =   seqCtrls.getLength();
+    sal_uInt32                          nMaxCount   =   m_pControlInfoList->Count();
+    sal_uInt32                          nCount      =   0;
+
+    for ( nCount = 0; nCount < nMaxCount; ++nCount )
+    {
+        delete m_pControlInfoList->GetObject( 0 );
+    }
+    m_pControlInfoList->Clear();
+
+
+    for ( nCount = 0; nCount < nCtrls; ++nCount )
+    {
+        pCtrls [ nCount ] -> removeEventListener    ( static_cast< XEventListener* >( static_cast< XWindowListener* >( this ) ) ) ;
+        pCtrls [ nCount ] -> dispose                (       ) ;
+    }
+
+    // call baseclass
+    BaseControl::dispose();
+}
+
+//____________________________________________________________________________________________________________
+//  XEventListener
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw( RuntimeException )
+{
+    Reference< XControl > xControl( rEvent.Source, UNO_QUERY );
+
+    // "removeControl" remove only, when control is an active control
+    removeControl( xControl );
+}
+
+//____________________________________________________________________________________________________________
+//  XControlContainer
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Reference< XControl > & rControl ) throw( RuntimeException )
+{
+    if ( !rControl.is () )
+        return;
+
+    // take memory for new item
+    IMPL_ControlInfo* pNewControl = new IMPL_ControlInfo ;
+
+    if (pNewControl!=(IMPL_ControlInfo*)0)
+    {
+        // Ready for multithreading
+        MutexGuard aGuard (m_aMutex) ;
+
+        // set control
+        pNewControl->sName      = rName     ;
+        pNewControl->xControl   = rControl  ;
+
+        // and insert in list
+        m_pControlInfoList->Insert ( pNewControl, LIST_APPEND ) ;
+
+        // initialize new control
+        pNewControl->xControl->setContext       ( (OWeakObject*)this    ) ;
+        pNewControl->xControl->addEventListener ( static_cast< XEventListener* >( static_cast< XWindowListener* >( this ) ) ) ;
+
+        // when container has a peer ...
+        if (getPeer().is())
+        {
+            // .. then create a peer on child
+            pNewControl->xControl->createPeer ( getPeer()->getToolkit(), getPeer() ) ;
+            impl_activateTabControllers () ;
+        }
+
+        // Send message to all listener
+        OInterfaceContainerHelper* pInterfaceContainer = m_aListeners.getContainer( ::getCppuType((const Reference< XContainerListener >*)0) ) ;
+
+        if (pInterfaceContainer)
+        {
+            // Build event
+            ContainerEvent  aEvent ;
+
+            aEvent.Source   = *this     ;
+            aEvent.Element <<= rControl ;
+
+            // Get all listener
+            OInterfaceIteratorHelper    aIterator (*pInterfaceContainer) ;
+
+            // Send event
+            while ( aIterator.hasMoreElements() )
+            {
+                ((XContainerListener*)aIterator.next())->elementInserted (aEvent) ;
+            }
+        }
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XControlContainer
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseContainerControl::addContainerListener ( const Reference< XContainerListener > & rListener ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard ( m_aMutex ) ;
+
+    m_aListeners.addInterface ( ::getCppuType((const Reference< XContainerListener >*)0), rListener ) ;
+}
+
+//____________________________________________________________________________________________________________
+//  XControlContainer
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl ) throw( RuntimeException )
+{
+    if ( rControl.is() )
+    {
+        // Ready for multithreading
+        MutexGuard aGuard (m_aMutex) ;
+
+        sal_uInt32 nControls = m_pControlInfoList->Count () ;
+
+        for ( sal_uInt32 n=0; n<nControls; n++ )
+        {
+            // Search for right control
+            IMPL_ControlInfo* pControl = m_pControlInfoList->GetObject (n) ;
+            if ( rControl == pControl->xControl )
+            {
+                //.is it found ... remove listener from control
+                pControl->xControl->removeEventListener (static_cast< XEventListener* >( static_cast< XWindowListener* >( this ) )) ;
+                pControl->xControl->setContext          ( Reference< XInterface >  ()   ) ;
+
+                // ... free memory
+                delete pControl ;
+                m_pControlInfoList->Remove (n) ;
+
+                // Send message to all other listener
+                OInterfaceContainerHelper * pInterfaceContainer = m_aListeners.getContainer( ::getCppuType((const Reference< XContainerListener >*)0) ) ;
+
+                if (pInterfaceContainer)
+                {
+                    ContainerEvent  aEvent ;
+
+                    aEvent.Source    = *this    ;
+                    aEvent.Element <<= rControl ;
+
+                    OInterfaceIteratorHelper    aIterator (*pInterfaceContainer) ;
+
+                    while ( aIterator.hasMoreElements() )
+                    {
+                        ((XContainerListener*)aIterator.next())->elementRemoved (aEvent) ;
+                    }
+                }
+                // Break "for" !
+                break ;
+            }
+        }
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XControlContainer
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseContainerControl::removeContainerListener ( const Reference< XContainerListener > & rListener ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard ( m_aMutex ) ;
+
+    m_aListeners.removeInterface ( ::getCppuType((const Reference< XContainerListener >*)0), rListener ) ;
+}
+
+//____________________________________________________________________________________________________________
+//  XControlContainer
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText ) throw( RuntimeException )
+{
+    // go down to each parent
+    Reference< XControlContainer >  xContainer ( getContext(), UNO_QUERY ) ;
+
+    if ( xContainer.is () )
+    {
+        xContainer->setStatusText ( rStatusText ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XControlContainer
+//____________________________________________________________________________________________________________
+
+Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString& rName ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard  aGuard ( Mutex::getGlobalMutex() ) ;
+
+    Reference< XControl >  xRetControl  =   Reference< XControl >       () ;
+    sal_uInt32              nControls   =   m_pControlInfoList->Count   () ;
+
+    // Search for right control
+    for( sal_uInt32 nCount = 0; nCount < nControls; ++nCount )
+    {
+        IMPL_ControlInfo* pSearchControl = m_pControlInfoList->GetObject ( nCount ) ;
+
+        if ( pSearchControl->sName == rName )
+        {
+            // We have found it ...
+            // Break operation and return.
+            return pSearchControl->xControl ;
+        }
+    }
+
+    // We have not found it ... return NULL.
+    return Reference< XControl >  () ;
+}
+
+//____________________________________________________________________________________________________________
+//  XControlContainer
+//____________________________________________________________________________________________________________
+
+Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls () throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard  aGuard ( Mutex::getGlobalMutex() ) ;
+
+    sal_uInt32                          nControls       = m_pControlInfoList->Count ()  ;
+    Sequence< Reference< XControl > >   aDescriptor     ( nControls )                   ;
+    Reference< XControl > *             pDestination    = aDescriptor.getArray ()       ;
+    sal_uInt32                          nCount          = 0                             ;
+
+    // Copy controls to sequence
+    for( nCount = 0; nCount < nControls; ++nCount )
+    {
+        IMPL_ControlInfo* pCopyControl = m_pControlInfoList->GetObject ( nCount ) ;
+        pDestination [ nCount ] = pCopyControl->xControl ;
+    }
+
+    // Return sequence
+    return aDescriptor ;
+}
+
+//____________________________________________________________________________________________________________
+//  XUnoControlContainer
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseContainerControl::addTabController ( const Reference< XTabController > & rTabController ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard (m_aMutex) ;
+
+    sal_uInt32                                  nOldCount   = m_xTabControllerList.getLength () ;
+    Sequence< Reference< XTabController >  >    aNewList    ( nOldCount + 1 )                   ;
+    sal_uInt32                                  nCount      = 0                                 ;
+
+    // Copy old elements of sequence to new list.
+    for ( nCount = 0; nCount < nOldCount; ++nCount )
+    {
+        aNewList.getArray () [nCount] = m_xTabControllerList.getConstArray () [nCount] ;
+    }
+
+    // Add new controller
+    aNewList.getArray () [nOldCount] = rTabController ;
+
+    // change old and new list
+    m_xTabControllerList = aNewList ;
+}
+
+//____________________________________________________________________________________________________________
+//  XUnoControlContainer
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseContainerControl::removeTabController ( const Reference< XTabController > & rTabController ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard (m_aMutex) ;
+
+    sal_uInt32  nMaxCount   = m_xTabControllerList.getLength () ;
+    sal_uInt32  nCount      = 0                                 ;
+
+    // Search right tabcontroller ...
+    for ( nCount = 0; nCount < nMaxCount; ++nCount )
+    {
+        if ( m_xTabControllerList.getConstArray () [nCount] == rTabController )
+        {
+            // ... if is it found ... remove it from list.
+            m_xTabControllerList.getArray()[ nCount ] = Reference< XTabController >() ;
+            break ;
+        }
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XUnoControlContainer
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseContainerControl::setTabControllers ( const Sequence< Reference< XTabController >  >& rTabControllers ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard (m_aMutex) ;
+
+    m_xTabControllerList = rTabControllers ;
+}
+
+Sequence<Reference< XTabController > > SAL_CALL BaseContainerControl::getTabControllers () throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard (m_aMutex) ;
+
+    return m_xTabControllerList ;
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) throw( RuntimeException )
+{
+    // override baseclass definition
+    BaseControl::setVisible ( bVisible ) ;
+
+    // is it a top window ?
+    if ( !getContext().is() && bVisible )
+    {
+        // then show it automaticly
+        createPeer ( Reference< XToolkit > (), Reference< XWindowPeer > () ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+WindowDescriptor* BaseContainerControl::impl_getWindowDescriptor ( const Reference< XWindowPeer > & rParentPeer )
+{
+    // - used from "createPeer()" to set the values of an WindowDescriptor !!!
+    // - if you will change the descriptor-values, you must override thid virtuell function
+    // - the caller must release the memory for this dynamical descriptor !!!
+
+    WindowDescriptor    *   aDescriptor = new WindowDescriptor ;
+
+    aDescriptor->Type               = WindowClass_CONTAINER                             ;
+    aDescriptor->WindowServiceName  = OUString(RTL_CONSTASCII_USTRINGPARAM("window"))   ;
+    aDescriptor->ParentIndex        = -1                                                ;
+    aDescriptor->Parent             = rParentPeer                                       ;
+    aDescriptor->Bounds             = getPosSize ()                                     ;
+    aDescriptor->WindowAttributes   = 0                                                 ;
+
+    return aDescriptor ;
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+void BaseContainerControl::impl_paint ( sal_Int32 /*nX*/, sal_Int32 /*nY*/, const Reference< XGraphics > & /*rGraphics*/ )
+{
+/*
+    if (rGraphics.is())
+    {
+        for ( sal_uInt32 n=m_pControlInfoList->Count(); n; )
+        {
+            ControlInfo* pSearchControl = m_pControlInfoList->GetObject (--n) ;
+
+            pSearchControl->xControl->paint ( nX, nY, rGraphics ) ;
+        }
+    }
+*/
+}
+
+//____________________________________________________________________________________________________________
+//  private method
+//____________________________________________________________________________________________________________
+
+void BaseContainerControl::impl_activateTabControllers ()
+{
+    // Ready for multithreading
+    MutexGuard aGuard (m_aMutex) ;
+
+    sal_uInt32  nMaxCount   =   m_xTabControllerList.getLength ()   ;
+    sal_uInt32  nCount      =   0                                   ;
+
+    for ( nCount = 0; nCount < nMaxCount; ++nCount )
+    {
+         m_xTabControllerList.getArray () [nCount]->setContainer        ( this  ) ;
+         m_xTabControllerList.getArray () [nCount]->activateTabOrder    (       ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  private method
+//____________________________________________________________________________________________________________
+
+void BaseContainerControl::impl_cleanMemory ()
+{
+    // Get count of listitems.
+    sal_uInt32  nMaxCount   =   m_pControlInfoList->Count ()    ;
+    sal_uInt32  nCount      =   0                               ;
+
+    // Delete all items.
+    for ( nCount = 0; nCount < nMaxCount; ++nCount )
+    {
+        // Delete everytime first element of list!
+        // We count from 0 to MAX, where "MAX=count of items" BEFORE we delete some elements!
+        // If we use "GetObject ( nCount )" ... it can be, that we have an index greater then count of current elements!
+
+        IMPL_ControlInfo* pSearchControl = m_pControlInfoList->GetObject ( 0 ) ;
+        delete pSearchControl ;
+    }
+
+    // Delete list himself.
+    m_pControlInfoList->Clear () ;
+    delete m_pControlInfoList ;
+}
+
+} // namespace unocontrols
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
new file mode 100644
index 000000000000..030f19d6d452
--- /dev/null
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -0,0 +1,1019 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 include
+//____________________________________________________________________________________________________________
+
+#include "basecontrol.hxx"
+
+//____________________________________________________________________________________________________________
+//  includes of other projects
+//____________________________________________________________________________________________________________
+#include <com/sun/star/awt/XDevice.hpp>
+#include <com/sun/star/awt/XDisplayBitmap.hpp>
+#include <com/sun/star/awt/DeviceInfo.hpp>
+#include <com/sun/star/awt/WindowAttribute.hpp>
+#include <com/sun/star/awt/PosSize.hpp>
+#include <cppuhelper/typeprovider.hxx>
+
+//____________________________________________________________________________________________________________
+//  includes of my own project
+//____________________________________________________________________________________________________________
+
+//____________________________________________________________________________________________________________
+//  namespaces
+//____________________________________________________________________________________________________________
+
+using namespace ::cppu                  ;
+using namespace ::osl                   ;
+using namespace ::rtl                   ;
+using namespace ::com::sun::star::uno   ;
+using namespace ::com::sun::star::lang  ;
+using namespace ::com::sun::star::awt   ;
+
+namespace unocontrols{
+
+//____________________________________________________________________________________________________________
+//  defines
+//____________________________________________________________________________________________________________
+
+#define DEFAULT_PMULTIPLEXER                NULL
+#define DEFAULT_X                           0
+#define DEFAULT_Y                           0
+#define DEFAULT_WIDTH                       100
+#define DEFAULT_HEIGHT                      100
+#define DEFAULT_VISIBLE                     sal_False
+#define DEFAULT_INDESIGNMODE                sal_False
+#define DEFAULT_ENABLE                      sal_True
+#define SERVICE_VCLTOOLKIT                  "com.sun.star.awt.Toolkit"
+
+//____________________________________________________________________________________________________________
+//  construct/destruct
+//____________________________________________________________________________________________________________
+
+BaseControl::BaseControl( const Reference< XMultiServiceFactory >& xFactory )
+    : IMPL_MutexContainer       (                       )
+    , OComponentHelper          ( m_aMutex              )
+    , m_xFactory    ( xFactory              )
+    , m_pMultiplexer            ( DEFAULT_PMULTIPLEXER  )
+    , m_nX                      ( DEFAULT_X             )
+    , m_nY                      ( DEFAULT_Y             )
+    , m_nWidth                  ( DEFAULT_WIDTH         )
+    , m_nHeight                 ( DEFAULT_HEIGHT        )
+    , m_bVisible                ( DEFAULT_VISIBLE       )
+    , m_bInDesignMode           ( DEFAULT_INDESIGNMODE  )
+    , m_bEnable                 ( DEFAULT_ENABLE        )
+{
+}
+
+BaseControl::~BaseControl()
+{
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+Any SAL_CALL BaseControl::queryInterface( const Type& rType ) throw( RuntimeException )
+{
+    Any aReturn ;
+    if ( m_xDelegator.is() == sal_True )
+    {
+        // If an delegator exist, forward question to his queryInterface.
+        // Delegator will ask his own queryAggregation!
+        aReturn = m_xDelegator->queryInterface( rType );
+    }
+    else
+    {
+        // If an delegator unknown, forward question to own queryAggregation.
+        aReturn = queryAggregation( rType );
+    }
+
+    return aReturn ;
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::acquire() throw()
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Forward to baseclass
+    OComponentHelper::acquire();
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::release() throw()
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Forward to baseclass
+    OComponentHelper::release();
+}
+
+//____________________________________________________________________________________________________________
+//  XTypeProvider
+//____________________________________________________________________________________________________________
+
+Sequence< Type > SAL_CALL BaseControl::getTypes() throw( 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 OTypeCollection* pTypeCollection = NULL ;
+
+    if ( pTypeCollection == NULL )
+    {
+        // Ready for multithreading; get global mutex for first call of this method only! see before
+        MutexGuard aGuard( 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 OTypeCollection aTypeCollection  (   ::getCppuType(( const Reference< XPaintListener >*)NULL )   ,
+                                                          ::getCppuType(( const Reference< XWindowListener>*)NULL ) ,
+                                                          ::getCppuType(( const Reference< XView            >*)NULL )   ,
+                                                          ::getCppuType(( const Reference< XWindow      >*)NULL )   ,
+                                                          ::getCppuType(( const Reference< XServiceInfo >*)NULL )   ,
+                                                          ::getCppuType(( const Reference< XControl     >*)NULL )   ,
+                                                        OComponentHelper::getTypes()
+                                                    );
+
+            // ... and set his address to static pointer!
+            pTypeCollection = &aTypeCollection ;
+        }
+    }
+
+    return pTypeCollection->getTypes();
+}
+
+//____________________________________________________________________________________________________________
+//  XTypeProvider
+//____________________________________________________________________________________________________________
+
+Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( 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 OImplementationId* pID = NULL ;
+
+    if ( pID == NULL )
+    {
+        // Ready for multithreading; get global mutex for first call of this method only! see before
+        MutexGuard aGuard( 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 OImplementationId aID( sal_False );
+            // ... and set his address to static pointer!
+            pID = &aID ;
+        }
+    }
+
+    return pID->getImplementationId();
+}
+
+//____________________________________________________________________________________________________________
+//  XAggregation
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+    m_xDelegator = xDel;
+}
+
+//____________________________________________________________________________________________________________
+//  XAggregation
+//____________________________________________________________________________________________________________
+
+Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeException )
+{
+    // Ask for my own supported interfaces ...
+    // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
+    Any aReturn ( ::cppu::queryInterface(   aType                                   ,
+                                               static_cast< XPaintListener*> ( this )   ,
+                                               static_cast< XWindowListener*> ( this )  ,
+                                               static_cast< XView*          > ( this )  ,
+                                               static_cast< XWindow*        > ( this )  ,
+                                               static_cast< XServiceInfo*   > ( this )  ,
+                                               static_cast< XControl*       > ( this )
+                                        )
+                );
+
+    // If searched interface supported by this class ...
+    if ( aReturn.hasValue() == sal_True )
+    {
+        // ... return this information.
+        return aReturn ;
+    }
+    else
+    {
+        // Else; ... ask baseclass for interfaces!
+        return OComponentHelper::queryAggregation( aType );
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XServiceInfo
+//____________________________________________________________________________________________________________
+
+OUString SAL_CALL BaseControl::getImplementationName() throw( RuntimeException )
+{
+    return impl_getStaticImplementationName();
+}
+
+//____________________________________________________________________________________________________________
+//  XServiceInfo
+//____________________________________________________________________________________________________________
+
+sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) throw( RuntimeException )
+{
+    Sequence< OUString >    seqServiceNames =   getSupportedServiceNames();
+    const OUString*         pArray          =   seqServiceNames.getConstArray();
+    for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ )
+    {
+        if ( pArray[nCounter] == sServiceName )
+        {
+            return sal_True ;
+        }
+    }
+    return sal_False ;
+}
+
+//____________________________________________________________________________________________________________
+//  XServiceInfo
+//____________________________________________________________________________________________________________
+
+Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() throw( RuntimeException )
+{
+    return impl_getStaticSupportedServiceNames();
+}
+
+//____________________________________________________________________________________________________________
+//  XComponent
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::dispose() throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+
+    if ( m_pMultiplexer != NULL )
+    {
+        // to all other paint, focus, etc.
+        m_pMultiplexer->disposeAndClear();
+    }
+
+    // set the service manager to disposed
+    OComponentHelper::dispose();
+
+    // release context and peer
+    m_xContext = Reference< XInterface >();
+    impl_releasePeer();
+
+    // release view
+    if ( m_xGraphicsView.is() == sal_True )
+    {
+        m_xGraphicsView = Reference< XGraphics >();
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XComponent
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+    OComponentHelper::addEventListener( xListener );
+}
+
+//____________________________________________________________________________________________________________
+//  XComponent
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+    OComponentHelper::removeEventListener( xListener );
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::createPeer(  const   Reference< XToolkit >&      xToolkit    ,
+                                        const   Reference< XWindowPeer >&   xParentPeer ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+
+    if ( m_xPeer.is() == sal_False )
+    {
+        // use method "BaseControl::getWindowDescriptor()" fot change window attributes !!!
+        WindowDescriptor* pDescriptor = impl_getWindowDescriptor( xParentPeer );
+
+        if ( m_bVisible == sal_True )
+        {
+            pDescriptor->WindowAttributes |= WindowAttribute::SHOW ;
+        }
+
+        // very slow under remote conditions!
+        // create the window on the server
+        Reference< XToolkit > xLocalToolkit = xToolkit ;
+        if ( xLocalToolkit.is() == sal_False )
+        {
+            // but first create wellknown toolkit, if it not exist
+            xLocalToolkit = Reference< XToolkit > ( m_xFactory->createInstance( OUString::createFromAscii( SERVICE_VCLTOOLKIT ) ), UNO_QUERY );
+        }
+        m_xPeer         = xLocalToolkit->createWindow( *pDescriptor );
+        m_xPeerWindow   = Reference< XWindow >( m_xPeer, UNO_QUERY );
+
+        // don't forget to release the memory!
+        delete pDescriptor ;
+
+        if ( m_xPeerWindow.is() == sal_True )
+        {
+            if ( m_pMultiplexer != NULL )
+            {
+                m_pMultiplexer->setPeer( m_xPeerWindow );
+            }
+
+            // create new referenz to xgraphics for painting on a peer
+            // and add a paint listener
+            Reference< XDevice > xDevice( m_xPeerWindow, UNO_QUERY );
+
+            if ( xDevice.is() == sal_True )
+            {
+                m_xGraphicsPeer = xDevice->createGraphics();
+            }
+
+            if ( m_xGraphicsPeer.is() == sal_True )
+            {
+                addPaintListener( this );
+                addWindowListener( this );
+            }
+
+            // PosSize_POSSIZE defined in <stardiv/uno/awt/window.hxx>
+            m_xPeerWindow->setPosSize(  m_nX, m_nY, m_nWidth, m_nHeight, PosSize::POSSIZE   );
+            m_xPeerWindow->setEnable(   m_bEnable                                           );
+            m_xPeerWindow->setVisible(  m_bVisible && !m_bInDesignMode                      );
+        }
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+    m_xContext = xContext ;
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+    m_bInDesignMode = bOn ;
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+    return m_xContext ;
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+    return m_xPeer ;
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+    return Reference< XView >( (OWeakObject*)this, UNO_QUERY );
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+    return m_bInDesignMode ;
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+sal_Bool SAL_CALL BaseControl::isTransparent() throw( RuntimeException )
+{
+    return sal_False ;
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::setPosSize(  sal_Int32   nX      ,
+                                        sal_Int32   nY      ,
+                                        sal_Int32   nWidth  ,
+                                        sal_Int32   nHeight ,
+                                        sal_Int16   nFlags  ) throw( RuntimeException )
+{
+    // - change size and position of window and save the values
+    // - "nFlags" declared in <stardiv/uno/awt/window.hxx> ("#define PosSize_X .....")
+
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+
+    sal_Bool bChanged = sal_False ;
+
+    if ( nFlags & PosSize::X )
+    {
+        bChanged |= m_nX != nX, m_nX = nX ;
+    }
+
+    if ( nFlags & PosSize::Y )
+    {
+        bChanged |= m_nY != nY, m_nY = nY ;
+    }
+
+    if ( nFlags & PosSize::WIDTH )
+    {
+        bChanged |= m_nWidth != nWidth, m_nWidth  = nWidth ;
+    }
+
+    if ( nFlags & PosSize::HEIGHT )
+    {
+        bChanged |= m_nHeight != nHeight, m_nHeight = nHeight  ;
+    }
+
+    if ( bChanged && m_xPeerWindow.is() )
+    {
+        m_xPeerWindow->setPosSize( m_nX, m_nY, m_nWidth, m_nHeight, nFlags );
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+
+    // Set new state of flag
+    m_bVisible = bVisible ;
+
+    if ( m_xPeerWindow.is() == sal_True )
+    {
+        // Set it also on peerwindow
+        m_xPeerWindow->setVisible( m_bVisible );
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+
+    // Set new state of flag
+    m_bEnable = bEnable ;
+
+    if ( m_xPeerWindow.is() == sal_True )
+    {
+        // Set it also on peerwindow
+        m_xPeerWindow->setEnable( m_bEnable );
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::setFocus() throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+
+    if ( m_xPeerWindow.is() == sal_True )
+    {
+        m_xPeerWindow->setFocus();
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+    return Rectangle( m_nX, m_nY , m_nWidth, m_nHeight );
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException )
+{
+    impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XWindowListener >*)0), xListener );
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException )
+{
+    impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XFocusListener >*)0), xListener );
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException )
+{
+    impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XKeyListener >*)0), xListener );
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException )
+{
+    impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XMouseListener >*)0), xListener );
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException )
+{
+    impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XMouseMotionListener >*)0), xListener );
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException )
+{
+    impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XPaintListener >*)0), xListener );
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException )
+{
+    impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XWindowListener >*)0), xListener );
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException )
+{
+    impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XFocusListener >*)0), xListener );
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException )
+{
+    impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XKeyListener >*)0), xListener );
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException )
+{
+    impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XMouseListener >*)0), xListener );
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void  SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException )
+{
+    impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XMouseMotionListener >*)0), xListener );
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException )
+{
+    impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XPaintListener >*)0), xListener );
+}
+
+//____________________________________________________________________________________________________________
+//  XView
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::draw(    sal_Int32   nX  ,
+                                    sal_Int32   nY  ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+
+    // - paint to an view
+    // - use the method "paint()"
+    // - see also "windowPaint()"
+    impl_paint( nX, nY, m_xGraphicsView );
+}
+
+//____________________________________________________________________________________________________________
+//  XView
+//____________________________________________________________________________________________________________
+
+sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevice ) throw( RuntimeException )
+{
+    // - set the graphics for an view
+    // - in this class exist 2 graphics-member ... one for peer[_xGraphicsPeer] and one for view[_xGraphicsView]
+    // - they are used by "windowPaint() and draw()", forwarded to "paint ()"
+    sal_Bool bReturn = sal_False ;
+    if ( xDevice.is() == sal_True )
+    {
+        // Ready for multithreading
+        MutexGuard aGuard( m_aMutex );
+
+        m_xGraphicsView = xDevice   ;
+        bReturn         = sal_True  ;
+    }
+
+    return bReturn ;
+}
+
+//____________________________________________________________________________________________________________
+//  XView
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::setZoom( float   /*fZoomX*/  ,
+                                    float   /*fZoomY*/  ) throw( RuntimeException )
+{
+    // Not implemented yet
+}
+
+//____________________________________________________________________________________________________________
+//  XView
+//____________________________________________________________________________________________________________
+
+Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+    return m_xGraphicsView ;
+}
+
+//____________________________________________________________________________________________________________
+//  XView
+//____________________________________________________________________________________________________________
+
+Size SAL_CALL BaseControl::getSize() throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+    return Size( m_nWidth, m_nHeight );
+}
+
+//____________________________________________________________________________________________________________
+//  XEventListener
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+
+    // - release ALL references
+    // - it must be !!!
+    if ( m_xGraphicsPeer.is() == sal_True )
+    {
+        removePaintListener( this );
+        removeWindowListener( this );
+        m_xGraphicsPeer = Reference< XGraphics >();
+    }
+
+    if ( m_xGraphicsView.is() == sal_True )
+    {
+        m_xGraphicsView = Reference< XGraphics >();
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XPaintListener
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+
+    // - repaint the peer
+    // - use the method "paint ()" for painting on a peer and a print device !!!
+    // - see also "draw ()"
+    impl_paint( 0, 0, m_xGraphicsPeer );
+}
+
+//____________________________________________________________________________________________________________
+//  XWindowListener
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+
+    m_nWidth    =   aEvent.Width    ;
+    m_nHeight   =   aEvent.Height   ;
+    WindowEvent aMappedEvent = aEvent;
+    aMappedEvent.X = 0;
+    aMappedEvent.Y = 0;
+    impl_recalcLayout( aMappedEvent );
+}
+
+//____________________________________________________________________________________________________________
+//  XWindowListener
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+
+    m_nWidth    =   aEvent.Width    ;
+    m_nHeight   =   aEvent.Height   ;
+    WindowEvent aMappedEvent = aEvent;
+    aMappedEvent.X = 0;
+    aMappedEvent.Y = 0;
+    impl_recalcLayout( aMappedEvent );
+}
+
+//____________________________________________________________________________________________________________
+//  XWindowListener
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) throw( RuntimeException )
+{
+}
+
+//____________________________________________________________________________________________________________
+//  XWindowListener
+//____________________________________________________________________________________________________________
+
+void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ ) throw( RuntimeException )
+{
+}
+
+//____________________________________________________________________________________________________________
+//  impl but public method to register service in DLL
+//  (In this BASE-implementation not implemented! Overwrite it in derived classes.)
+//____________________________________________________________________________________________________________
+
+const Sequence< OUString > BaseControl::impl_getStaticSupportedServiceNames()
+{
+    return Sequence< OUString >();
+}
+
+//____________________________________________________________________________________________________________
+//  impl but public method to register service in DLL
+//  (In this BASE-implementation not implemented! Overwrite it in derived classes.)
+//____________________________________________________________________________________________________________
+
+const OUString BaseControl::impl_getStaticImplementationName()
+{
+    return OUString();
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+const Reference< XMultiServiceFactory > BaseControl::impl_getMultiServiceFactory()
+{
+    return m_xFactory ;
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+const Reference< XWindow > BaseControl::impl_getPeerWindow()
+{
+    return m_xPeerWindow ;
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+const Reference< XGraphics > BaseControl::impl_getGraphicsPeer()
+{
+    return m_xGraphicsPeer ;
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+const sal_Int32& BaseControl::impl_getWidth()
+{
+    return m_nWidth ;
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+const sal_Int32& BaseControl::impl_getHeight()
+{
+    return m_nHeight ;
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference< XWindowPeer >& xParentPeer )
+{
+    // - used from "createPeer()" to set the values of an ::com::sun::star::awt::WindowDescriptor !!!
+    // - if you will change the descriptor-values, you must override this virtuell function
+    // - the caller must release the memory for this dynamical descriptor !!!
+
+    WindowDescriptor* pDescriptor = new WindowDescriptor ;
+
+    pDescriptor->Type               = WindowClass_SIMPLE                    ;
+    pDescriptor->WindowServiceName  = OUString::createFromAscii( "window" ) ;
+    pDescriptor->ParentIndex        = -1                                    ;
+    pDescriptor->Parent             = xParentPeer                           ;
+    pDescriptor->Bounds             = getPosSize ()                         ;
+    pDescriptor->WindowAttributes   = 0                                     ;
+
+    return pDescriptor ;
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+void BaseControl::impl_paint(           sal_Int32               /*nX*/          ,
+                                        sal_Int32               /*nY*/          ,
+                                const   Reference< XGraphics >& /*xGraphics*/   )
+{
+    // - one paint method for peer AND view !!!
+    //   (see also => "windowPaint()" and "draw()")
+    // - not used in this implementation, but its not necessary to make it pure virtual !!!
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+void BaseControl::impl_recalcLayout( const WindowEvent& /*aEvent*/ )
+{
+    // We need as virtual function to support automaticly resizing of derived controls!
+    // But we make it not pure virtual because it's not neccessary for all derived classes!
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+Reference< XInterface > BaseControl::impl_getDelegator()
+{
+    return m_xDelegator ;
+}
+
+//____________________________________________________________________________________________________________
+//  private method
+//____________________________________________________________________________________________________________
+
+void BaseControl::impl_releasePeer()
+{
+    if ( m_xPeer.is() == sal_True )
+    {
+        if ( m_xGraphicsPeer.is() == sal_True )
+        {
+            removePaintListener( this );
+            removeWindowListener( this );
+            m_xGraphicsPeer = Reference< XGraphics >();
+        }
+
+        m_xPeer->dispose();
+        m_xPeerWindow   = Reference< XWindow >();
+        m_xPeer         = Reference< XWindowPeer >();
+
+        if ( m_pMultiplexer != NULL )
+        {
+            // take changes on multiplexer
+            m_pMultiplexer->setPeer( Reference< XWindow >() );
+        }
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  private method
+//____________________________________________________________________________________________________________
+
+OMRCListenerMultiplexerHelper* BaseControl::impl_getMultiplexer()
+{
+    if ( m_pMultiplexer == NULL )
+    {
+        m_pMultiplexer = new OMRCListenerMultiplexerHelper( (XWindow*)this, m_xPeerWindow );
+        m_xMultiplexer = Reference< XInterface >( (OWeakObject*)m_pMultiplexer, UNO_QUERY );
+    }
+
+    return m_pMultiplexer ;
+}
+
+} // namespace unocontrols
diff --git a/UnoControls/source/base/makefile.mk b/UnoControls/source/base/makefile.mk
new file mode 100644
index 000000000000..74c6d4d43656
--- /dev/null
+++ b/UnoControls/source/base/makefile.mk
@@ -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.
+#
+#*************************************************************************
+PRJ=..$/..
+
+PRJNAME=UnoControls
+TARGET=base
+ENABLE_EXCEPTIONS=TRUE
+#LIBTARGET=NO
+#USE_LDUMP2=TRUE
+#USE_DEFFILE=TRUE
+
+# --- Settings -----------------------------------------------------
+.INCLUDE :	$(PRJ)$/util$/makefile.pmk
+
+
+# --- Files --------------------------------------------------------
+SLOFILES=		$(SLO)$/multiplexer.obj				\
+                $(SLO)$/basecontrol.obj				\
+                $(SLO)$/basecontainercontrol.obj	\
+                $(SLO)$/registercontrols.obj
+
+#LIB1TARGET= 	$(SLB)$/$(TARGET).lib
+#LIB1OBJFILES=	$(SLOFILES)
+
+#SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
+
+#SHL1STDLIBS=\
+#		$(ONELIB)	 \
+#		$(USRLIB)	 \
+#		$(UNOLIB)	 \
+#		$(VOSLIB) 	 \
+#		$(OSLLIB) 	 \
+#		$(TOOLSLIB) 	 \
+#		$(RTLLIB)
+
+#SHL1DEPN=		makefile.mk
+#SHL1LIBS=		$(LIB1TARGET)
+#SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
+
+#DEF1NAME=		$(SHL1TARGET)
+#DEF1EXPORTFILE=	exports.dxp
+
+# --- Targets ------------------------------------------------------
+.INCLUDE :	target.mk
+#.INCLUDE :	$(PRJ)$/util$/target.pmk
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
new file mode 100644
index 000000000000..0c1ded49694e
--- /dev/null
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -0,0 +1,577 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 include
+//____________________________________________________________________________________________________________
+
+#include "multiplexer.hxx"
+
+//____________________________________________________________________________________________________________
+//  includes of other projects
+//____________________________________________________________________________________________________________
+#include <vos/diagnose.hxx>
+
+//____________________________________________________________________________________________________________
+//  includes of my own project
+//____________________________________________________________________________________________________________
+
+//____________________________________________________________________________________________________________
+//  namespaces
+//____________________________________________________________________________________________________________
+
+using namespace ::cppu                  ;
+using namespace ::osl                   ;
+using namespace ::com::sun::star::uno   ;
+using namespace ::com::sun::star::awt   ;
+using namespace ::com::sun::star::lang  ;
+
+namespace unocontrols{
+
+//____________________________________________________________________________________________________________
+//  macros
+//____________________________________________________________________________________________________________
+
+#define MULTIPLEX( INTERFACE, METHOD, EVENTTYP, EVENT )                                                                             \
+                                                                                                                                    \
+    /* First get all interfaces from container with right type.*/                                                                   \
+    OInterfaceContainerHelper* pContainer = m_aListenerHolder.getContainer( ::getCppuType((const Reference< INTERFACE >*)0) );  \
+    /* Do the follow only, if elements in container exist.*/                                                                        \
+    if( pContainer != NULL )                                                                                                        \
+    {                                                                                                                               \
+        OInterfaceIteratorHelper aIterator( *pContainer );                                                                          \
+        EVENTTYP aLocalEvent = EVENT;                                                                                               \
+        /* Remark: The control is the event source not the peer.*/                                                                  \
+        /*         We must change the source of the event.      */                                                                  \
+        aLocalEvent.Source = m_xControl ;                                                                                           \
+        /* Is the control not destroyed? */                                                                                         \
+        if( aLocalEvent.Source.is() == sal_True )                                                                                   \
+        {                                                                                                                           \
+            if( aIterator.hasMoreElements() )                                                                                       \
+            {                                                                                                                       \
+                INTERFACE * pListener = (INTERFACE *)aIterator.next();                                                          \
+                try                                                                                                                 \
+                {                                                                                                                   \
+                    pListener->METHOD( aLocalEvent );                                                                               \
+                }                                                                                                                   \
+                catch( RuntimeException& )                                                                                          \
+                {                                                                                                                   \
+                    /* Ignore all system exceptions from the listener! */                                                           \
+                }                                                                                                                   \
+            }                                                                                                                       \
+        }                                                                                                                           \
+    }
+
+//____________________________________________________________________________________________________________
+//  construct/destruct
+//____________________________________________________________________________________________________________
+
+OMRCListenerMultiplexerHelper::OMRCListenerMultiplexerHelper(   const   Reference< XWindow >&   xControl    ,
+                                                                const   Reference< XWindow >&   xPeer       )
+    : m_xPeer           ( xPeer     )
+    , m_xControl        ( xControl  )
+    , m_aListenerHolder ( m_aMutex  )
+{
+}
+
+OMRCListenerMultiplexerHelper::OMRCListenerMultiplexerHelper( const OMRCListenerMultiplexerHelper& /*aCopyInstance*/ )
+    : XFocusListener()
+    , XWindowListener()
+    , XKeyListener()
+    , XMouseListener()
+    , XMouseMotionListener()
+    , XPaintListener()
+    , XTopWindowListener()
+    , OWeakObject()
+    , m_aListenerHolder ( m_aMutex  )
+{
+}
+
+OMRCListenerMultiplexerHelper::~OMRCListenerMultiplexerHelper()
+{
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType ) throw( RuntimeException )
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Ask for my own supported interfaces ...
+    // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
+    Any aReturn ( ::cppu::queryInterface(   rType                                           ,
+                                            static_cast< XWindowListener*       > ( this )  ,
+                                            static_cast< XKeyListener*          > ( this )  ,
+                                            static_cast< XFocusListener*        > ( this )  ,
+                                            static_cast< XMouseListener*        > ( this )  ,
+                                            static_cast< XMouseMotionListener*  > ( this )  ,
+                                            static_cast< XPaintListener*        > ( this )  ,
+                                            static_cast< XTopWindowListener*    > ( this )  ,
+                                            static_cast< XTopWindowListener*    > ( this )
+                                        )
+                );
+
+    // If searched interface supported by this class ...
+    if ( aReturn.hasValue() == sal_True )
+    {
+        // ... return this information.
+        return aReturn ;
+    }
+    else
+    {
+        // Else; ... ask baseclass for interfaces!
+        return OWeakObject::queryInterface( rType );
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+void SAL_CALL OMRCListenerMultiplexerHelper::acquire() throw()
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Forward to baseclass
+    OWeakObject::acquire();
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+void SAL_CALL OMRCListenerMultiplexerHelper::release() throw()
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Forward to baseclass
+    OWeakObject::release();
+}
+
+//____________________________________________________________________________________________________________
+//  operator
+//____________________________________________________________________________________________________________
+
+OMRCListenerMultiplexerHelper::operator Reference< XInterface >() const
+{
+    return ((OWeakObject*)this) ;
+}
+
+//____________________________________________________________________________________________________________
+//  operator
+//____________________________________________________________________________________________________________
+
+//OMRCListenerMultiplexerHelper& OMRCListenerMultiplexerHelper::operator= ( const OMRCListenerMultiplexerHelper& aCopyInstance )
+//{
+//  return this ;
+//}
+
+//____________________________________________________________________________________________________________
+//  container method
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::setPeer( const Reference< XWindow >& xPeer )
+{
+    MutexGuard aGuard( m_aMutex );
+    if( m_xPeer != xPeer )
+    {
+        if( m_xPeer.is() )
+        {
+            // get all types from the listener added to the peer
+            Sequence< Type >    aContainedTypes = m_aListenerHolder.getContainedTypes();
+            const Type*         pArray          = aContainedTypes.getConstArray();
+            sal_Int32           nCount          = aContainedTypes.getLength();
+            // loop over all listener types and remove the listeners from the peer
+            for( sal_Int32 i=0; i<nCount; i++ )
+                impl_unadviseFromPeer( m_xPeer, pArray[i] );
+        }
+        m_xPeer = xPeer;
+        if( m_xPeer.is() )
+        {
+            // get all types from the listener added to the peer
+            Sequence< Type >    aContainedTypes = m_aListenerHolder.getContainedTypes();
+            const Type*         pArray          = aContainedTypes.getConstArray();
+            sal_Int32           nCount          = aContainedTypes.getLength();
+            // loop over all listener types and add the listeners to the peer
+            for( sal_Int32 i = 0; i < nCount; i++ )
+                impl_adviseToPeer( m_xPeer, pArray[i] );
+        }
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  container method
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::disposeAndClear()
+{
+    EventObject aEvent ;
+    aEvent.Source = m_xControl ;
+    m_aListenerHolder.disposeAndClear( aEvent );
+}
+
+//____________________________________________________________________________________________________________
+//  container method
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::advise( const   Type&                       aType       ,
+                                            const   Reference< XInterface >&    xListener   )
+{
+    MutexGuard aGuard( m_aMutex );
+    if( m_aListenerHolder.addInterface( aType, xListener ) == 1 )
+    {
+        // the first listener is added
+        if( m_xPeer.is() )
+        {
+            impl_adviseToPeer( m_xPeer, aType );
+        }
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  container method
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::unadvise(   const   Type&                       aType       ,
+                                                const   Reference< XInterface >&    xListener   )
+{
+    MutexGuard aGuard( m_aMutex );
+    if( m_aListenerHolder.removeInterface( aType, xListener ) == 0 )
+    {
+        // the last listener is removed
+        if ( m_xPeer.is() )
+        {
+            impl_unadviseFromPeer( m_xPeer, aType );
+        }
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XEventListener
+//____________________________________________________________________________________________________________
+
+void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException )
+{
+    MutexGuard aGuard( m_aMutex );
+    // peer is disposed, clear the reference
+    m_xPeer = Reference< XWindow >();
+}
+
+//____________________________________________________________________________________________________________
+//  XFcousListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+{
+/*
+    OInterfaceContainerHelper * pCont = aListenerHolder.getContainer( ::getCppuType((const Reference< XFocusListener >*)0) );
+    if( pCont )
+    {
+        OInterfaceIteratorHelper    aIt( *pCont );
+        FocusEvent aEvt = e;
+        // Reamark: The control is the event source not the peer. We must change
+        // the source of the event
+        xControl.queryHardRef( ((XInterface*)NULL)->getSmartUik(), aEvt.Source );
+        //.is the control not destroyed
+        if( aEvt.Source.is() )
+        {
+            if( aIt.hasMoreElements() )
+            {
+                XFocusListener * pListener = (XFocusListener *)aIt.next();
+                try
+                {
+                    pListener->focusGained( aEvt );
+                }
+                catch( RuntimeException, e )
+                {
+                    // ignore all usr system exceptions from the listener
+                }
+            }
+        }
+    }
+*/
+    MULTIPLEX( XFocusListener, focusGained, FocusEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XFcousListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XFocusListener, focusLost, FocusEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XWindowListener, windowResized, WindowEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XWindowListener, windowMoved, WindowEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XWindowListener, windowShown, EventObject, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XWindowListener, windowHidden, EventObject, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XKeyListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XKeyListener, keyPressed, KeyEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XKeyListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XKeyListener, keyReleased, KeyEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XMouseListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XMouseListener, mousePressed, MouseEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XMouseListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XMouseListener, mouseReleased, MouseEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XMouseListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XMouseListener, mouseEntered, MouseEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XMouseListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XMouseListener, mouseExited, MouseEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XMouseMotionListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XMouseMotionListener, mouseDragged, MouseEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XMouseMotionListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XMouseMotionListener, mouseMoved, MouseEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XPaintListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XPaintListener, windowPaint, PaintEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XTopWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XTopWindowListener, windowOpened, EventObject, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XTopWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XTopWindowListener, windowClosing, EventObject, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XTopWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XTopWindowListener, windowClosed, EventObject, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XTopWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XTopWindowListener, windowMinimized, EventObject, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XTopWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XTopWindowListener, windowNormalized, EventObject, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XTopWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XTopWindowListener, windowActivated, EventObject, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XTopWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) throw( UNO3_RUNTIMEEXCEPTION )
+{
+    MULTIPLEX( XTopWindowListener, windowDeactivated, EventObject, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::impl_adviseToPeer(  const   Reference< XWindow >&   xPeer   ,
+                                                        const   Type&                   aType   )
+{
+    // add a listener to the source (peer)
+    if( aType == ::getCppuType((const Reference< XWindowListener >*)0) )
+        xPeer->addWindowListener( this );
+    else if( aType == ::getCppuType((const Reference< XKeyListener >*)0) )
+        xPeer->addKeyListener( this );
+    else if( aType == ::getCppuType((const Reference< XFocusListener >*)0) )
+        xPeer->addFocusListener( this );
+    else if( aType == ::getCppuType((const Reference< XMouseListener >*)0) )
+        xPeer->addMouseListener( this );
+    else if( aType == ::getCppuType((const Reference< XMouseMotionListener >*)0) )
+        xPeer->addMouseMotionListener( this );
+    else if( aType == ::getCppuType((const Reference< XPaintListener >*)0) )
+        xPeer->addPaintListener( this );
+    else if( aType == ::getCppuType((const Reference< XTopWindowListener >*)0) )
+    {
+        Reference< XTopWindow > xTop( xPeer, UNO_QUERY );
+        if( xTop.is() )
+            xTop->addTopWindowListener( this );
+    }
+    else
+    {
+        VOS_ENSHURE( sal_False, "unknown listener" );
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::impl_unadviseFromPeer(  const   Reference< XWindow >&   xPeer   ,
+                                                            const   Type&                   aType   )
+{
+    // the last listener is removed, remove the listener from the source (peer)
+    if( aType == ::getCppuType((const Reference< XWindowListener >*)0) )
+        xPeer->removeWindowListener( this );
+    else if( aType == ::getCppuType((const Reference< XKeyListener >*)0) )
+        xPeer->removeKeyListener( this );
+    else if( aType == ::getCppuType((const Reference< XFocusListener >*)0) )
+        xPeer->removeFocusListener( this );
+    else if( aType == ::getCppuType((const Reference< XMouseListener >*)0) )
+        xPeer->removeMouseListener( this );
+    else if( aType == ::getCppuType((const Reference< XMouseMotionListener >*)0) )
+        xPeer->removeMouseMotionListener( this );
+    else if( aType == ::getCppuType((const Reference< XPaintListener >*)0) )
+        xPeer->removePaintListener( this );
+    else if( aType == ::getCppuType((const Reference< XTopWindowListener >*)0) )
+    {
+        Reference< XTopWindow >  xTop( xPeer, UNO_QUERY );
+        if( xTop.is() )
+            xTop->removeTopWindowListener( this );
+    }
+    else
+    {
+        VOS_ENSHURE( sal_False, "unknown listener" );
+    }
+}
+
+} // namespace unocontrols
diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx
new file mode 100644
index 000000000000..6a10f42b8fb8
--- /dev/null
+++ b/UnoControls/source/base/registercontrols.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+//______________________________________________________________________________________________________________
+//  includes of other projects
+//______________________________________________________________________________________________________________
+
+#include <cppuhelper/factory.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/container/XSet.hpp>
+
+#include <stdio.h>
+
+//______________________________________________________________________________________________________________
+//  includes of my own project
+//______________________________________________________________________________________________________________
+
+//=============================================================================
+//  Add new include line to use new services.
+//=============================================================================
+#include "framecontrol.hxx"
+#include "progressbar.hxx"
+#include "progressmonitor.hxx"
+#include "statusindicator.hxx"
+//=============================================================================
+
+//______________________________________________________________________________________________________________
+//  defines
+//______________________________________________________________________________________________________________
+
+// If you will debug macros of this file ... you must define follow constant!
+// Ths switch on another macro AS_DBG_OUT(...), which will print text to "stdout".
+
+//#define AS_DBG_SWITCH
+
+//______________________________________________________________________________________________________________
+//  namespaces
+//______________________________________________________________________________________________________________
+
+using namespace ::rtl                                           ;
+using namespace ::cppu                                          ;
+using namespace ::unocontrols                                   ;
+using namespace ::com::sun::star::uno                           ;
+using namespace ::com::sun::star::container                     ;
+using namespace ::com::sun::star::lang                          ;
+using namespace ::com::sun::star::registry                      ;
+
+//______________________________________________________________________________________________________________
+//  macros
+//______________________________________________________________________________________________________________
+
+//******************************************************************************************************************************
+// See AS_DBG_SWITCH below !!!
+#ifdef AS_DBG_SWITCH
+    #define AS_DBG_OUT(OUTPUT)  printf( OUTPUT );
+#else
+    #define AS_DBG_OUT(OUTPUT)
+#endif
+
+//******************************************************************************************************************************
+#define CREATEINSTANCE(CLASS)                                                                                                               \
+                                                                                                                                            \
+    static Reference< XInterface > SAL_CALL CLASS##_createInstance ( const Reference< XMultiServiceFactory >& rServiceManager ) throw ( Exception ) \
+    {                                                                                                                                       \
+        AS_DBG_OUT ( "\tCREATEINSTANCE():\tOK\n" )                                                                                          \
+        return Reference< XInterface >( *(OWeakObject*)(new CLASS( rServiceManager )) );                                                    \
+    }
+
+//******************************************************************************************************************************
+#define CREATEFACTORY_ONEINSTANCE(CLASS)                                                                                \
+                                                                                                                        \
+    AS_DBG_OUT ( "\tCREATEFACTORY_ONEINSTANCE():\t[start]\n" )                                                          \
+    /* Create right factory ... */                                                                                      \
+    xFactory = Reference< XSingleServiceFactory >                                                                       \
+                    (                                                                                                   \
+                        cppu::createOneInstanceFactory  (   xServiceManager                                     ,       \
+                                                            CLASS::impl_getStaticImplementationName     ()  ,       \
+                                                            CLASS##_createInstance                              ,       \
+                                                            CLASS::impl_getStaticSupportedServiceNames  ()  )       \
+                    ) ;                                                                                                 \
+    AS_DBG_OUT ( "\tCREATEFACTORY_ONEINSTANCE():\t[end]\n" )
+
+//******************************************************************************************************************************
+#define CREATEFACTORY_SINGLE(CLASS)                                                                                     \
+                                                                                                                        \
+    AS_DBG_OUT ( "\tCREATEFACTORY_SINGLE():\t[start]\n" )                                                               \
+    /* Create right factory ... */                                                                                      \
+    xFactory = Reference< XSingleServiceFactory >                                                                       \
+                    (                                                                                                   \
+                        cppu::createSingleFactory   (   xServiceManager                                     ,           \
+                                                        CLASS::impl_getStaticImplementationName     ()  ,           \
+                                                        CLASS##_createInstance                              ,           \
+                                                        CLASS::impl_getStaticSupportedServiceNames  ()  )           \
+                    ) ;                                                                                                 \
+    AS_DBG_OUT ( "\tCREATEFACTORY_SINGLE():\t[end]\n" )
+
+//******************************************************************************************************************************
+#define IF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE(CLASS)                                                               \
+                                                                                                                        \
+    if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) )     \
+    {                                                                                                                   \
+        AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE():\timplementationname found\n" )                    \
+        CREATEFACTORY_ONEINSTANCE ( CLASS )                                                                         \
+    }
+
+//******************************************************************************************************************************
+#define IF_NAME_CREATECOMPONENTFACTORY_SINGLE(CLASS)                                                                    \
+                                                                                                                        \
+    if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) )     \
+    {                                                                                                                   \
+        AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_SINGLE():\timplementationname found\n" )                         \
+        CREATEFACTORY_SINGLE ( CLASS )                                                                              \
+    }
+
+//______________________________________________________________________________________________________________
+//  declare functions to create a new instance of service
+//______________________________________________________________________________________________________________
+
+//=============================================================================
+//  Add new macro line to use new services.
+//
+//  !!! ATTENTION !!!
+//      Write no ";" at end of line! (see macro)
+//=============================================================================
+CREATEINSTANCE  ( FrameControl      )
+CREATEINSTANCE  ( ProgressBar       )
+CREATEINSTANCE  ( ProgressMonitor   )
+CREATEINSTANCE  ( StatusIndicator   )
+//=============================================================================
+
+//______________________________________________________________________________________________________________
+//  return environment
+//______________________________________________________________________________________________________________
+
+extern "C" void SAL_CALL component_getImplementationEnvironment(    const   sal_Char**          ppEnvironmentTypeName   ,
+                                                                            uno_Environment**   /*ppEnvironment*/           )
+{
+    *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
+}
+
+//______________________________________________________________________________________________________________
+//  create right component factory
+//______________________________________________________________________________________________________________
+
+extern "C" void* SAL_CALL component_getFactory( const   sal_Char*   pImplementationName ,
+                                                        void*       pServiceManager     ,
+                                                        void*       /*pRegistryKey*/        )
+{
+    AS_DBG_OUT( "component_getFactory():\t[start]\n" )
+
+    // Set default return value for this operation - if it failed.
+    void* pReturn = NULL ;
+
+    if  (
+            ( pImplementationName   !=  NULL ) &&
+            ( pServiceManager       !=  NULL )
+        )
+    {
+        AS_DBG_OUT( "component_getFactory():\t\t... enter scope - pointer are valid\n" )
+
+        // Define variables which are used in following macros.
+        Reference< XSingleServiceFactory >  xFactory                                                                        ;
+        Reference< XMultiServiceFactory >   xServiceManager( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
+
+        //=============================================================================
+        //  Add new macro line to handle new service.
+        //
+        //  !!! ATTENTION !!!
+        //      Write no ";" at end of line and dont forget "else" ! (see macro)
+        //=============================================================================
+        IF_NAME_CREATECOMPONENTFACTORY_SINGLE( FrameControl     )
+        else
+        IF_NAME_CREATECOMPONENTFACTORY_SINGLE( ProgressBar      )
+        else
+        IF_NAME_CREATECOMPONENTFACTORY_SINGLE( ProgressMonitor  )
+        else
+        IF_NAME_CREATECOMPONENTFACTORY_SINGLE( StatusIndicator  )
+        //=============================================================================
+
+        // Factory is valid - service was found.
+        if ( xFactory.is() )
+        {
+            AS_DBG_OUT( "component_getFactory():\t\t\t... xFactory valid - service was found\n" )
+
+            xFactory->acquire();
+            pReturn = xFactory.get();
+        }
+
+        AS_DBG_OUT( "component_getFactory():\t\t... leave scope\n" )
+    }
+
+    AS_DBG_OUT ( "component_getFactory():\t[end]\n" )
+
+    // Return with result of this operation.
+    return pReturn ;
+}
diff --git a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
new file mode 100644
index 000000000000..56f336124a7d
--- /dev/null
+++ b/UnoControls/source/controls/OConnectionPointContainerHelper.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.
+ *
+ ************************************************************************/
+
+//______________________________________________________________________________________________________________
+//  my own include
+//______________________________________________________________________________________________________________
+
+#include "OConnectionPointContainerHelper.hxx"
+
+//______________________________________________________________________________________________________________
+//  includes of other projects
+//______________________________________________________________________________________________________________
+
+//______________________________________________________________________________________________________________
+//  include of my own project
+//______________________________________________________________________________________________________________
+#include "OConnectionPointHelper.hxx"
+
+//______________________________________________________________________________________________________________
+//  namespaces
+//______________________________________________________________________________________________________________
+
+using namespace ::rtl                   ;
+using namespace ::osl                   ;
+using namespace ::cppu                  ;
+using namespace ::com::sun::star::uno   ;
+using namespace ::com::sun::star::lang  ;
+
+namespace unocontrols{
+
+//______________________________________________________________________________________________________________
+//  construct/destruct
+//______________________________________________________________________________________________________________
+
+OConnectionPointContainerHelper::OConnectionPointContainerHelper( Mutex& aMutex )
+    : m_aSharedMutex        ( aMutex    )
+    , m_aMultiTypeContainer ( aMutex    )
+{
+}
+
+OConnectionPointContainerHelper::~OConnectionPointContainerHelper()
+{
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType ) throw( RuntimeException )
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Ask for my own supported interfaces ...
+    Any aReturn ( ::cppu::queryInterface(   aType                                               ,
+                                               static_cast< XConnectionPointContainer*  > ( this )
+                                        )
+                );
+
+    // If searched interface not supported by this class ...
+    if ( aReturn.hasValue() == sal_False )
+    {
+        // ... ask baseclasses.
+        aReturn = OWeakObject::queryInterface( aType );
+    }
+
+    return aReturn ;
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+void SAL_CALL OConnectionPointContainerHelper::acquire() throw()
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Forward to baseclass
+    OWeakObject::acquire();
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+void SAL_CALL OConnectionPointContainerHelper::release() throw()
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Forward to baseclass
+    OWeakObject::release();
+}
+
+//______________________________________________________________________________________________________________
+//  XConnectionPointContainer
+//______________________________________________________________________________________________________________
+
+Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTypes() throw( RuntimeException )
+{
+    // Container is threadsafe himself !
+    return m_aMultiTypeContainer.getContainedTypes();
+}
+
+//______________________________________________________________________________________________________________
+//  XConnectionPointContainer
+//______________________________________________________________________________________________________________
+
+Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryConnectionPoint( const Type& aType ) throw( RuntimeException )
+{
+    // Set default return value, if method failed.
+    Reference< XConnectionPoint > xConnectionPoint = Reference< XConnectionPoint >();
+
+    // Get all elements of the container, which have the searched type.
+    OInterfaceContainerHelper* pSpecialContainer = m_aMultiTypeContainer.getContainer( aType );
+    if ( pSpecialContainer && pSpecialContainer->getLength() > 0 )
+    {
+        // Ready for multithreading
+        MutexGuard aGuard( m_aSharedMutex );
+        // If this container contains elements, build a connectionpoint-instance.
+        OConnectionPointHelper* pNewConnectionPoint = new OConnectionPointHelper( m_aSharedMutex, this, aType );
+        xConnectionPoint = Reference< XConnectionPoint >( (OWeakObject*)pNewConnectionPoint, UNO_QUERY );
+    }
+
+    return xConnectionPoint ;
+}
+
+//______________________________________________________________________________________________________________
+//  XConnectionPointContainer
+//______________________________________________________________________________________________________________
+
+void SAL_CALL OConnectionPointContainerHelper::advise(  const   Type&                       aType       ,
+                                                        const   Reference< XInterface >&    xListener   ) throw( RuntimeException )
+{
+    // Container is threadsafe himself !
+    m_aMultiTypeContainer.addInterface( aType, xListener );
+}
+
+//______________________________________________________________________________________________________________
+//  XConnectionPointContainer
+//______________________________________________________________________________________________________________
+
+void SAL_CALL OConnectionPointContainerHelper::unadvise(    const   Type&                       aType       ,
+                                                            const   Reference< XInterface >&    xListener   ) throw( RuntimeException )
+{
+    // Container is threadsafe himself !
+    m_aMultiTypeContainer.removeInterface( aType, xListener );
+}
+
+//______________________________________________________________________________________________________________
+//  public but impl method!
+//  Is neccessary to get container member at OConnectionPoint-instance.
+//______________________________________________________________________________________________________________
+
+OMultiTypeInterfaceContainerHelper& OConnectionPointContainerHelper::impl_getMultiTypeContainer()
+{
+    // Impl methods are not threadsafe!
+    // "Parent" function must do this.
+    return m_aMultiTypeContainer;
+}
+
+}   // namespace unocontrols
diff --git a/UnoControls/source/controls/OConnectionPointHelper.cxx b/UnoControls/source/controls/OConnectionPointHelper.cxx
new file mode 100644
index 000000000000..24b08f6a4937
--- /dev/null
+++ b/UnoControls/source/controls/OConnectionPointHelper.cxx
@@ -0,0 +1,271 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 include
+//______________________________________________________________________________________________________________
+
+#include "OConnectionPointHelper.hxx"
+
+//______________________________________________________________________________________________________________
+//  includes of other projects
+//______________________________________________________________________________________________________________
+
+//______________________________________________________________________________________________________________
+//  include of my own project
+//______________________________________________________________________________________________________________
+#include "OConnectionPointContainerHelper.hxx"
+
+//______________________________________________________________________________________________________________
+//  namespaces
+//______________________________________________________________________________________________________________
+
+using namespace ::rtl                   ;
+using namespace ::osl                   ;
+using namespace ::cppu                  ;
+using namespace ::com::sun::star::uno   ;
+using namespace ::com::sun::star::lang  ;
+
+namespace unocontrols{
+
+//______________________________________________________________________________________________________________
+//  construct/destruct
+//______________________________________________________________________________________________________________
+
+OConnectionPointHelper::OConnectionPointHelper( Mutex&                              aMutex                      ,
+                                                 OConnectionPointContainerHelper*   pContainerImplementation    ,
+                                                UNO3_TYPE                           aType                       )
+    : m_aSharedMutex                ( aMutex                    )
+    , m_oContainerWeakReference     ( pContainerImplementation  )
+    , m_pContainerImplementation    ( pContainerImplementation  )
+    , m_aInterfaceType              ( aType                     )
+{
+}
+
+OConnectionPointHelper::~OConnectionPointHelper()
+{
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) throw( RuntimeException )
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Ask for my own supported interfaces ...
+    Any aReturn ( ::cppu::queryInterface(   aType                                       ,
+                                               static_cast< XConnectionPoint*   > ( this )
+                                        )
+                );
+
+    // If searched interface not supported by this class ...
+    if ( aReturn.hasValue() == sal_False )
+    {
+        // ... ask baseclasses.
+        aReturn = OWeakObject::queryInterface( aType );
+    }
+
+    return aReturn ;
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+void SAL_CALL OConnectionPointHelper::acquire() throw()
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Forward to baseclass
+    OWeakObject::acquire();
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+void SAL_CALL OConnectionPointHelper::release() throw()
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Forward to baseclass
+    OWeakObject::release();
+}
+
+//______________________________________________________________________________________________________________
+//  XConnectionPoint
+//______________________________________________________________________________________________________________
+
+Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aSharedMutex );
+
+    // Set default return value, if method failed.
+    if ( impl_LockContainer() == sal_False )
+    {
+        // Container not exist! Its an runtime error.
+        throw RuntimeException();
+    }
+
+    // If container reference valid, return right type of supported interfaces of THIS connectionpoint.
+    Type aReturnType = m_aInterfaceType ;
+    // Don't forget this!
+    impl_UnlockContainer();
+
+    return aReturnType;
+}
+
+//______________________________________________________________________________________________________________
+//  XConnectionPoint
+//______________________________________________________________________________________________________________
+
+Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConnectionPointContainer() throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aSharedMutex );
+    // Convert weakreference to correct uno3-reference and return value. It can be NULL, if container destroyed!
+    return Reference< XConnectionPointContainer >( m_oContainerWeakReference.get(), UNO_QUERY );
+}
+
+//______________________________________________________________________________________________________________
+//  XConnectionPoint
+//______________________________________________________________________________________________________________
+
+void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xListener ) throw( ListenerExistException      ,
+                                                                                                InvalidListenerException    ,
+                                                                                                RuntimeException            )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aSharedMutex );
+
+    // If type of listener not the same for this special container ...
+    Any aCheckType = xListener->queryInterface( m_aInterfaceType );
+    if ( aCheckType.hasValue() )
+    {
+        // ... throw an exception.
+        throw InvalidListenerException();
+    }
+
+    // ListenerExistException is obsolete!?
+    // Its the same container for XConnectionPointContainer and XConnectionPoint. But only here we must control, if a listener already exist!?
+    // You can add a listener more then one time at XConnectionPointContainer, but here only one ...
+
+    // Operation is permitted only, if reference to container is valid!
+    if ( impl_LockContainer() == sal_False )
+    {
+        // Container not exist! Its an runtime error.
+        throw RuntimeException();
+    }
+    // Forward it to OConnectionPointHelperContainer!
+    m_pContainerImplementation->advise( m_aInterfaceType, xListener );
+    // Don't forget this!
+    impl_UnlockContainer();
+}
+
+//______________________________________________________________________________________________________________
+//  XConnectionPoint
+//______________________________________________________________________________________________________________
+
+void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& xListener ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aSharedMutex );
+    // Operation is permitted only, if reference to container is valid!
+    if ( impl_LockContainer() == sal_False )
+    {
+        // Container not exist! Its an runtime error.
+        throw RuntimeException();
+
+    }
+    // Forward it to OConnectionPointHelperContainer!
+    m_pContainerImplementation->unadvise( m_aInterfaceType, xListener );
+    // Don't forget this!
+    impl_UnlockContainer();
+}
+
+//______________________________________________________________________________________________________________
+//  XConnectionPoint
+//______________________________________________________________________________________________________________
+
+Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnections() throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aSharedMutex );
+    // Operation is permitted only, if reference to container is valid!
+    if ( impl_LockContainer() == sal_False )
+    {
+        // Container not exist! Its an runtime error.
+        throw RuntimeException();
+    }
+    // Set default return value, if method failed.
+    Sequence< Reference< XInterface > > seqReturnConnections = Sequence< Reference< XInterface > >();
+    // Get reference to private member of OConnectionPointHelperContainer!
+    OMultiTypeInterfaceContainerHelper& aSharedContainer = m_pContainerImplementation->impl_getMultiTypeContainer();
+    // Get pointer to specialized container which hold all interfaces of searched type.
+    OInterfaceContainerHelper* pSpecialContainer = aSharedContainer.getContainer( m_aInterfaceType );
+    // Get elements of searched type, if somelse exist.
+    if ( pSpecialContainer != NULL )
+    {
+        seqReturnConnections = pSpecialContainer->getElements();
+    }
+    // Don't forget this!
+    impl_UnlockContainer();
+
+    return seqReturnConnections;
+}
+
+//______________________________________________________________________________________________________________
+//  private method
+//______________________________________________________________________________________________________________
+
+sal_Bool OConnectionPointHelper::impl_LockContainer()
+{
+    // Convert weakreference to hard uno3-reference and return state.
+    // If this reference different from NULL, there exist a hard reference to container. Container-instance can't be destroyed.
+    // Don't forget to "unlock" this reference!
+    m_xLock = m_oContainerWeakReference.get();
+    return m_xLock.is();
+}
+
+//______________________________________________________________________________________________________________
+//  private method
+//______________________________________________________________________________________________________________
+
+void OConnectionPointHelper::impl_UnlockContainer()
+{
+    // Free hard uno3-reference to container.
+    // see also "impl_LockContainer()"
+    m_xLock = Reference< XInterface >();
+}
+
+}   // namespace unocontrols
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
new file mode 100644
index 000000000000..2ae0e27dc56c
--- /dev/null
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -0,0 +1,604 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 include
+//______________________________________________________________________________________________________________
+
+#include "framecontrol.hxx"
+
+//______________________________________________________________________________________________________________
+//  includes of other projects
+//______________________________________________________________________________________________________________
+#include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/FrameSearchFlag.hpp>
+#include <com/sun/star/frame/FrameSearchFlag.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <cppuhelper/typeprovider.hxx>
+#include <vos/diagnose.hxx>
+
+//______________________________________________________________________________________________________________
+//  include of my own project
+//______________________________________________________________________________________________________________
+
+//______________________________________________________________________________________________________________
+//  namespaces
+//______________________________________________________________________________________________________________
+
+using namespace ::rtl                   ;
+using namespace ::osl                   ;
+using namespace ::cppu                  ;
+using namespace ::com::sun::star::uno   ;
+using namespace ::com::sun::star::lang  ;
+using namespace ::com::sun::star::beans ;
+using namespace ::com::sun::star::awt   ;
+using namespace ::com::sun::star::frame ;
+using namespace ::com::sun::star::util  ;
+
+namespace unocontrols{
+
+//______________________________________________________________________________________________________________
+//  construct/destruct
+//______________________________________________________________________________________________________________
+
+FrameControl::FrameControl( const Reference< XMultiServiceFactory >& xFactory )
+    : BaseControl                   ( xFactory                                                                              )
+    , OBroadcastHelper              ( m_aMutex                                                                              )
+    , OPropertySetHelper            ( *SAL_STATIC_CAST( OBroadcastHelper *, this )  )
+    , m_aInterfaceContainer         ( m_aMutex                                                                              )
+    , m_aConnectionPointContainer   ( m_aMutex                                                                              )
+{
+}
+
+FrameControl::~FrameControl()
+{
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+Any SAL_CALL FrameControl::queryInterface( const Type& rType ) throw( RuntimeException )
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    Any aReturn ;
+    Reference< XInterface > xDel = BaseControl::impl_getDelegator();
+    if ( xDel.is() )
+    {
+        // If an delegator exist, forward question to his queryInterface.
+        // Delegator will ask his own queryAggregation!
+        aReturn = xDel->queryInterface( rType );
+    }
+    else
+    {
+        // If an delegator unknown, forward question to own queryAggregation.
+        aReturn = queryAggregation( rType );
+    }
+
+    return aReturn ;
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+void SAL_CALL FrameControl::acquire() throw()
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Forward to baseclass
+    BaseControl::acquire();
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+void SAL_CALL FrameControl::release() throw()
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Forward to baseclass
+    BaseControl::release();
+}
+
+//____________________________________________________________________________________________________________
+//  XTypeProvider
+//____________________________________________________________________________________________________________
+
+Sequence< Type > SAL_CALL FrameControl::getTypes() throw( 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 OTypeCollection* pTypeCollection = NULL ;
+
+    if ( pTypeCollection == NULL )
+    {
+        // Ready for multithreading; get global mutex for first call of this method only! see before
+        MutexGuard aGuard( 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 OTypeCollection aTypeCollection  (   ::getCppuType(( const Reference< XControlModel              >*)NULL )   ,
+                                                          ::getCppuType(( const Reference< XControlContainer            >*)NULL )   ,
+                                                          ::getCppuType(( const Reference< XConnectionPointContainer    >*)NULL )   ,
+                                                        BaseControl::getTypes()
+                                                    );
+            // ... and set his address to static pointer!
+            pTypeCollection = &aTypeCollection ;
+        }
+    }
+
+    return pTypeCollection->getTypes();
+}
+
+//____________________________________________________________________________________________________________
+//  XAggregation
+//____________________________________________________________________________________________________________
+
+Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeException )
+{
+    // Ask for my own supported interfaces ...
+    // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
+    Any aReturn ( ::cppu::queryInterface(   aType                                               ,
+                                               static_cast< XControlModel*              > ( this )  ,
+                                               static_cast< XConnectionPointContainer*  > ( this )
+                                        )
+                );
+
+    // If searched interface not supported by this class ...
+    if ( aReturn.hasValue() == sal_False )
+    {
+        // ... ask baseclasses.
+        aReturn = OPropertySetHelper::queryInterface( aType );
+        if ( aReturn.hasValue() == sal_False )
+        {
+            aReturn = BaseControl::queryAggregation( aType );
+        }
+    }
+
+    return aReturn ;
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+void SAL_CALL FrameControl::createPeer( const   Reference< XToolkit >&      xToolkit    ,
+                                        const   Reference< XWindowPeer >&   xParentPeer ) throw( RuntimeException )
+{
+    BaseControl::createPeer( xToolkit, xParentPeer );
+    if ( impl_getPeerWindow().is() )
+    {
+        if( m_sComponentURL.getLength() > 0 )
+        {
+            impl_createFrame( getPeer(), m_sComponentURL, m_seqLoaderArguments );
+        }
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException )
+{
+    // We have no model.
+    return sal_False ;
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+Reference< XControlModel > SAL_CALL FrameControl::getModel() throw( RuntimeException )
+{
+    // We have no model.
+    return Reference< XControlModel >();
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+void SAL_CALL FrameControl::dispose() throw( RuntimeException )
+{
+    impl_deleteFrame();
+    BaseControl::dispose();
+}
+
+//____________________________________________________________________________________________________________
+//  XView
+//____________________________________________________________________________________________________________
+
+sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDevice*/ ) throw( RuntimeException )
+{
+    // it is not possible to print this control
+    return sal_False ;
+}
+
+//____________________________________________________________________________________________________________
+//  XView
+//____________________________________________________________________________________________________________
+
+Reference< XGraphics > SAL_CALL FrameControl::getGraphics() throw( RuntimeException )
+{
+    // when its not posible to set graphics ! then its possible to return null
+    return Reference< XGraphics >();
+}
+
+//____________________________________________________________________________________________________________
+//  XConnectionPointContainer
+//____________________________________________________________________________________________________________
+
+Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( RuntimeException )
+{
+    // Forwarded to helper class
+    return m_aConnectionPointContainer.getConnectionPointTypes();
+}
+
+//____________________________________________________________________________________________________________
+//  XConnectionPointContainer
+//____________________________________________________________________________________________________________
+
+Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const Type& aType ) throw( RuntimeException )
+{
+    // Forwarded to helper class
+    return m_aConnectionPointContainer.queryConnectionPoint( aType );
+}
+
+//____________________________________________________________________________________________________________
+//  XConnectionPointContainer
+//____________________________________________________________________________________________________________
+
+void SAL_CALL FrameControl::advise( const   Type&                       aType       ,
+                                    const   Reference< XInterface >&    xListener   ) throw( RuntimeException )
+{
+    // Forwarded to helper class
+    m_aConnectionPointContainer.advise( aType, xListener );
+}
+
+//____________________________________________________________________________________________________________
+//  XConnectionPointContainer
+//____________________________________________________________________________________________________________
+
+void SAL_CALL FrameControl::unadvise(   const   Type&                       aType       ,
+                                        const   Reference< XInterface >&    xListener   ) throw( RuntimeException )
+{
+    // Forwarded to helper class
+    m_aConnectionPointContainer.unadvise( aType, xListener );
+}
+
+//____________________________________________________________________________________________________________
+//  impl but public method to register service
+//____________________________________________________________________________________________________________
+
+const Sequence< OUString > FrameControl::impl_getStaticSupportedServiceNames()
+{
+    MutexGuard aGuard( Mutex::getGlobalMutex() );
+    Sequence< OUString > seqServiceNames( 1 );
+    seqServiceNames.getArray() [0] = OUString::createFromAscii( SERVICENAME_FRAMECONTROL );
+    return seqServiceNames ;
+}
+
+//____________________________________________________________________________________________________________
+//  impl but public method to register service
+//____________________________________________________________________________________________________________
+
+const OUString FrameControl::impl_getStaticImplementationName()
+{
+    return OUString::createFromAscii( IMPLEMENTATIONNAME_FRAMECONTROL );
+}
+
+//____________________________________________________________________________________________________________
+//  OPropertySetHelper
+//____________________________________________________________________________________________________________
+
+sal_Bool FrameControl::convertFastPropertyValue(        Any&        rConvertedValue ,
+                                                        Any&        rOldValue       ,
+                                                        sal_Int32   nHandle         ,
+                                                const   Any&        rValue          ) throw( IllegalArgumentException )
+{
+    sal_Bool bReturn = sal_False ;
+    switch (nHandle)
+    {
+        case PROPERTYHANDLE_COMPONENTURL        :       rConvertedValue   = rValue                  ;
+                                                        rOldValue       <<= m_sComponentURL         ;
+                                                        bReturn           = sal_True                ;
+                                                        break ;
+
+        case PROPERTYHANDLE_LOADERARGUMENTS     :       rConvertedValue   = rValue                  ;
+                                                        rOldValue       <<= m_seqLoaderArguments    ;
+                                                        bReturn           = sal_True                ;
+                                                        break ;
+    }
+
+    if ( bReturn == sal_False )
+    {
+        throw IllegalArgumentException();
+    }
+
+    return bReturn ;
+}
+
+//____________________________________________________________________________________________________________
+//  OPropertySetHelper
+//____________________________________________________________________________________________________________
+
+void FrameControl::setFastPropertyValue_NoBroadcast(            sal_Int32   nHandle ,
+                                                        const   Any&        rValue  )
+                                                        throw ( ::com::sun::star::uno::Exception )
+{
+    // this method only set the value
+    MutexGuard  aGuard (m_aMutex) ;
+    switch (nHandle)
+    {
+        case PROPERTYHANDLE_COMPONENTURL        :       rValue >>= m_sComponentURL ;
+                                                        if (getPeer().is())
+                                                        {
+                                                            impl_createFrame ( getPeer(), m_sComponentURL, m_seqLoaderArguments ) ;
+                                                        }
+                                                        break ;
+
+        case PROPERTYHANDLE_LOADERARGUMENTS     :       rValue >>= m_seqLoaderArguments ;
+                                                        break ;
+
+        default :                                       VOS_ENSHURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  OPropertySetHelper
+//____________________________________________________________________________________________________________
+
+void FrameControl::getFastPropertyValue(    Any&        rRet    ,
+                                            sal_Int32   nHandle ) const
+{
+    MutexGuard  aGuard ( Mutex::getGlobalMutex() ) ;
+
+    switch (nHandle)
+    {
+        case PROPERTYHANDLE_COMPONENTURL    :       rRet <<= m_sComponentURL ;
+                                                    break ;
+
+        case PROPERTYHANDLE_LOADERARGUMENTS :       rRet <<= m_seqLoaderArguments ;
+                                                    break ;
+
+        case PROPERTYHANDLE_FRAME           :       rRet <<= m_xFrame ;
+                                                       break ;
+
+        default :                                   VOS_ENSHURE ( nHandle == -1, ERRORTEXT_VOSENSHURE ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  OPropertySetHelper
+//____________________________________________________________________________________________________________
+
+IPropertyArrayHelper& FrameControl::getInfoHelper()
+{
+    // Create a table that map names to index values.
+    static OPropertyArrayHelper* pInfo ;
+
+    if (!pInfo)
+    {
+        // global method must be guarded
+        MutexGuard  aGuard ( Mutex::getGlobalMutex() ) ;
+
+        if (!pInfo)
+        {
+            pInfo = new OPropertyArrayHelper( impl_getStaticPropertyDescriptor(), sal_True );
+        }
+    }
+
+    return *pInfo ;
+}
+/*
+//--------------------------------------------------------------------------------------------------
+// start OConnectionPointContainerHelper
+//--------------------------------------------------------------------------------------------------
+Uik* FrameControl::getConnectionPointUiks ( sal_Int32* pCount ) const
+{
+    static Uik szUiks[] =
+    {
+        ((XEventListener*)NULL)->getSmartUik  (),
+        ::getCppuType((const Reference< XPropertyChangeListener >*)0),
+        ::getCppuType((const Reference< XVetoableChangeListener >*)0),
+        ::getCppuType((const Reference< XPropertiesChangeListener >*)0)
+    } ;
+
+    *pCount = 4 ;
+
+    return szUiks ;
+}
+//--------------------------------------------------------------------------------------------------
+// end OConnectionPointContainerHelper
+//--------------------------------------------------------------------------------------------------
+*/
+
+//____________________________________________________________________________________________________________
+//  OPropertySetHelper
+//____________________________________________________________________________________________________________
+
+Reference< XPropertySetInfo > SAL_CALL FrameControl::getPropertySetInfo() throw( 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; pInfo is NULL - for the second call pInfo is different from NULL!
+    static Reference< XPropertySetInfo >* pInfo = (Reference< XPropertySetInfo >*)0 ;
+    if ( pInfo == (Reference< XPropertySetInfo >*)0 )
+    {
+        // Ready for multithreading
+        MutexGuard aGuard ( Mutex::getGlobalMutex () ) ;
+        // Control this pointer again, another instance can be faster then these!
+        if ( pInfo == (Reference< XPropertySetInfo >*)0 )
+        {
+            // Create structure of propertysetinfo for baseclass "OPropertySetHelper".
+            // (Use method "getInfoHelper()".)
+            static Reference< XPropertySetInfo > xInfo ( createPropertySetInfo ( getInfoHelper () ) ) ;
+            pInfo = &xInfo ;
+        }
+    }
+    return ( *pInfo ) ;
+}
+
+//____________________________________________________________________________________________________________
+//  BaseControl
+//____________________________________________________________________________________________________________
+
+WindowDescriptor* FrameControl::impl_getWindowDescriptor( const Reference< XWindowPeer >& xParentPeer )
+{
+    WindowDescriptor* pDescriptor   = new WindowDescriptor  ;
+
+    pDescriptor->Type               = WindowClass_CONTAINER ;
+    pDescriptor->ParentIndex        = -1                    ;
+    pDescriptor->Parent             = xParentPeer           ;
+    pDescriptor->Bounds             = getPosSize ()         ;
+    pDescriptor->WindowAttributes   = 0                     ;
+
+    return pDescriptor ;
+}
+
+//____________________________________________________________________________________________________________
+//  private method
+//____________________________________________________________________________________________________________
+
+void FrameControl::impl_createFrame(    const   Reference< XWindowPeer >&   xPeer       ,
+                                        const   OUString&                   rURL        ,
+                                        const   Sequence< PropertyValue >&  rArguments  )
+{
+    Reference< XFrame >     xOldFrame   ;
+    Reference< XFrame >     xNewFrame   ;
+
+    {
+        MutexGuard  aGuard ( m_aMutex ) ;
+        xOldFrame = m_xFrame ;
+    }
+
+    xNewFrame = Reference< XFrame >  ( impl_getMultiServiceFactory()->createInstance ( OUString::createFromAscii( "com.sun.star.frame.Frame" ) ), UNO_QUERY ) ;
+    Reference< XDispatchProvider >  xDSP ( xNewFrame, UNO_QUERY ) ;
+
+    if (xDSP.is())
+    {
+        Reference< XWindow >  xWP ( xPeer, UNO_QUERY ) ;
+        xNewFrame->initialize ( xWP ) ;
+
+        //  option
+        //xFrame->setName( "WhatYouWant" );
+
+        Reference< XURLTransformer >  xTrans ( impl_getMultiServiceFactory()->createInstance ( OUString::createFromAscii( "com.sun.star.util.URLTransformer" ) ), UNO_QUERY ) ;
+        if(xTrans.is())
+        {
+            // load file
+            URL aURL ;
+
+            aURL.Complete = rURL ;
+            xTrans->parseStrict( aURL ) ;
+
+            Reference< XDispatch >  xDisp = xDSP->queryDispatch ( aURL, OUString (), FrameSearchFlag::SELF ) ;
+            if (xDisp.is())
+            {
+                xDisp->dispatch ( aURL, rArguments ) ;
+            }
+        }
+    }
+
+    // set the frame
+    {
+        MutexGuard aGuard ( m_aMutex ) ;
+        m_xFrame = xNewFrame ;
+    }
+
+    // notify the listeners
+    sal_Int32   nFrameId = PROPERTYHANDLE_FRAME ;
+    Any aNewFrame ( &xNewFrame, ::getCppuType((const Reference< XFrame >*)0) ) ;
+    Any aOldFrame ( &xOldFrame, ::getCppuType((const Reference< XFrame >*)0) ) ;
+
+    fire ( &nFrameId, &aNewFrame, &aOldFrame, 1, sal_False ) ;
+
+    if (xOldFrame.is())
+    {
+        xOldFrame->dispose () ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  private method
+//____________________________________________________________________________________________________________
+
+void FrameControl::impl_deleteFrame()
+{
+    Reference< XFrame >  xOldFrame;
+    Reference< XFrame >  xNullFrame;
+
+    {
+        // do not dispose the frame in this guarded section (deadlock?)
+        MutexGuard aGuard( m_aMutex );
+        xOldFrame = m_xFrame;
+        m_xFrame = Reference< XFrame > ();
+    }
+
+    // notify the listeners
+    sal_Int32 nFrameId = PROPERTYHANDLE_FRAME;
+    Any aNewFrame( &xNullFrame, ::getCppuType((const Reference< XFrame >*)0) );
+    Any aOldFrame( &xOldFrame, ::getCppuType((const Reference< XFrame >*)0) );
+    fire( &nFrameId, &aNewFrame, &aOldFrame, 1, sal_False );
+
+    // dispose the frame
+    if( xOldFrame.is() )
+        xOldFrame->dispose();
+}
+
+//____________________________________________________________________________________________________________
+//  private method
+//____________________________________________________________________________________________________________
+
+const Sequence< Property > FrameControl::impl_getStaticPropertyDescriptor()
+{
+    // All Properties of this implementation. The array must be sorted!
+    static const Property pPropertys[PROPERTY_COUNT] =
+    {
+        Property( OUString::createFromAscii( PROPERTYNAME_COMPONENTURL      ), PROPERTYHANDLE_COMPONENTURL      , ::getCppuType((const OUString*)0)                 , PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ),
+        Property( OUString::createFromAscii( PROPERTYNAME_FRAME             ), PROPERTYHANDLE_FRAME             , ::getCppuType((const Reference< XFrame >*)0)      , PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT   ),
+        Property( OUString::createFromAscii( PROPERTYNAME_LOADERARGUMENTS   ), PROPERTYHANDLE_LOADERARGUMENTS   , ::getCppuType((const Sequence< PropertyValue >*)0), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED )
+    };
+
+    static const Sequence< Property > seqPropertys( pPropertys, PROPERTY_COUNT );
+
+    return seqPropertys ;
+}
+
+}   // namespace unocontrols
diff --git a/UnoControls/source/controls/makefile.mk b/UnoControls/source/controls/makefile.mk
new file mode 100644
index 000000000000..20314ea8e321
--- /dev/null
+++ b/UnoControls/source/controls/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=UnoControls
+TARGET=controls
+ENABLE_EXCEPTIONS=TRUE
+.IF "$(L10N_framework)"==""
+
+# --- Settings -----------------------------------------------------
+.INCLUDE :	$(PRJ)$/util$/makefile.pmk
+
+# --- Files --------------------------------------------------------
+SLOFILES=\
+            $(SLO)$/progressbar.obj						\
+            $(SLO)$/framecontrol.obj					\
+            $(SLO)$/progressmonitor.obj					\
+            $(SLO)$/OConnectionPointHelper.obj			\
+            $(SLO)$/OConnectionPointContainerHelper.obj	\
+            $(SLO)$/statusindicator.obj
+
+# --- Targets ------------------------------------------------------
+.ENDIF # L10N_framework
+
+.INCLUDE :	target.mk
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
new file mode 100644
index 000000000000..842affed16da
--- /dev/null
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -0,0 +1,558 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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
+//____________________________________________________________________________________________________________
+
+#include "progressbar.hxx"
+
+//____________________________________________________________________________________________________________
+//  includes of other projects
+//____________________________________________________________________________________________________________
+#include <com/sun/star/awt/GradientStyle.hpp>
+#include <com/sun/star/awt/RasterOperation.hpp>
+#include <com/sun/star/awt/Gradient.hpp>
+#include <com/sun/star/awt/XGraphics.hpp>
+#include <tools/debug.hxx>
+#include <cppuhelper/typeprovider.hxx>
+
+#include <math.h>
+#include <limits.h>
+
+//____________________________________________________________________________________________________________
+//  includes of my project
+//____________________________________________________________________________________________________________
+
+//____________________________________________________________________________________________________________
+//  namespace
+//____________________________________________________________________________________________________________
+
+using namespace ::cppu                  ;
+using namespace ::osl                   ;
+using namespace ::rtl                   ;
+using namespace ::com::sun::star::uno   ;
+using namespace ::com::sun::star::lang  ;
+using namespace ::com::sun::star::awt   ;
+
+namespace unocontrols{
+
+//____________________________________________________________________________________________________________
+//  construct/destruct
+//____________________________________________________________________________________________________________
+
+ProgressBar::ProgressBar( const Reference< XMultiServiceFactory >& xFactory )
+    : BaseControl           (    xFactory                   )
+    , m_bHorizontal         (    DEFAULT_HORIZONTAL         )
+    , m_aBlockSize          (    DEFAULT_BLOCKDIMENSION     )
+    , m_nForegroundColor    (    DEFAULT_FOREGROUNDCOLOR    )
+    , m_nBackgroundColor    (    DEFAULT_BACKGROUNDCOLOR    )
+    , m_nMinRange           (    DEFAULT_MINRANGE           )
+    , m_nMaxRange           (    DEFAULT_MAXRANGE           )
+    , m_nBlockValue         (    DEFAULT_BLOCKVALUE         )
+    , m_nValue              (    DEFAULT_VALUE              )
+{
+}
+
+ProgressBar::~ProgressBar()
+{
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+Any SAL_CALL ProgressBar::queryInterface( const Type& rType ) throw( RuntimeException )
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    Any aReturn ;
+    Reference< XInterface > xDel = BaseControl::impl_getDelegator();
+    if ( xDel.is() )
+    {
+        // If an delegator exist, forward question to his queryInterface.
+        // Delegator will ask his own queryAggregation!
+        aReturn = xDel->queryInterface( rType );
+    }
+    else
+    {
+        // If an delegator unknown, forward question to own queryAggregation.
+        aReturn = queryAggregation( rType );
+    }
+
+    return aReturn ;
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressBar::acquire() throw()
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Forward to baseclass
+    BaseControl::acquire();
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressBar::release() throw()
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Forward to baseclass
+    BaseControl::release();
+}
+
+//____________________________________________________________________________________________________________
+//  XTypeProvider
+//____________________________________________________________________________________________________________
+
+Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( 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 OTypeCollection* pTypeCollection = NULL ;
+
+    if ( pTypeCollection == NULL )
+    {
+        // Ready for multithreading; get global mutex for first call of this method only! see before
+        MutexGuard aGuard( 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 OTypeCollection aTypeCollection  (   ::getCppuType(( const Reference< XControlModel  >*)NULL )   ,
+                                                          ::getCppuType(( const Reference< XProgressBar >*)NULL )   ,
+                                                        BaseControl::getTypes()
+                                                    );
+            // ... and set his address to static pointer!
+            pTypeCollection = &aTypeCollection ;
+        }
+    }
+
+    return pTypeCollection->getTypes();
+}
+
+//____________________________________________________________________________________________________________
+//  XAggregation
+//____________________________________________________________________________________________________________
+
+Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeException )
+{
+    // Ask for my own supported interfaces ...
+    // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
+    Any aReturn ( ::cppu::queryInterface(   aType                                   ,
+                                               static_cast< XControlModel*  > ( this )  ,
+                                               static_cast< XProgressBar*   > ( this )
+                                        )
+                );
+
+    // If searched interface not supported by this class ...
+    if ( aReturn.hasValue() == sal_False )
+    {
+        // ... ask baseclasses.
+        aReturn = BaseControl::queryAggregation( aType );
+    }
+
+    return aReturn ;
+}
+
+//____________________________________________________________________________________________________________
+//  XProgressBar
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard  aGuard (m_aMutex) ;
+
+    // Safe color for later use.
+    m_nForegroundColor = nColor ;
+
+    // Repaint control
+    impl_paint ( 0, 0, impl_getGraphicsPeer() ) ;
+}
+
+//____________________________________________________________________________________________________________
+//  XProgressBar
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard  aGuard (m_aMutex) ;
+
+    // Safe color for later use.
+    m_nBackgroundColor = nColor ;
+
+    // Repaint control
+    impl_paint ( 0, 0, impl_getGraphicsPeer() ) ;
+}
+
+//____________________________________________________________________________________________________________
+//  XProgressBar
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException )
+{
+    // This method is defined for follow things:
+    //      1) Values >= _nMinRange
+    //      2) Values <= _nMaxRange
+
+    // Ready for multithreading
+    MutexGuard aGuard (m_aMutex) ;
+
+    // save impossible cases
+    // This method is only defined for valid values
+    DBG_ASSERT ( (( nValue >= m_nMinRange ) && ( nValue <= m_nMaxRange )), "ProgressBar::setValue()\nNot valid value.\n" ) ;
+
+    // If new value not valid ... do nothing in release version!
+    if (
+        ( nValue >= m_nMinRange ) &&
+        ( nValue <= m_nMaxRange )
+       )
+    {
+        // New value is ok => save this
+        m_nValue = nValue ;
+
+        // Repaint to display changes
+        impl_paint ( 0, 0, impl_getGraphicsPeer() ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XProgressBar
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException )
+{
+    // This method is defined for follow things:
+    //      1) All values of sal_Int32
+    //      2) Min < Max
+    //      3) Min > Max
+
+    // save impossible cases
+    // This method is only defined for valid values
+    // If you ignore this, the release version wil produce an error "division by zero" in "ProgressBar::setValue()"!
+    DBG_ASSERT ( ( nMin != nMax ) , "ProgressBar::setRange()\nValues for MIN and MAX are the same. This is not allowed!\n" ) ;
+
+    // Ready for multithreading
+    MutexGuard  aGuard (m_aMutex) ;
+
+    // control the values for min and max
+    if ( nMin < nMax )
+    {
+        // Take correct Min and Max
+        m_nMinRange = nMin  ;
+        m_nMaxRange = nMax  ;
+    }
+    else
+    {
+        // Change Min and Max automaticly
+        m_nMinRange = nMax  ;
+        m_nMaxRange = nMin  ;
+    }
+
+    // assure that m_nValue is within the range
+    if (!(m_nMinRange < m_nValue  &&  m_nValue < m_nMaxRange))
+        m_nValue = m_nMinRange;
+
+    impl_recalcRange () ;
+
+    // Do not repaint the control at this place!!!
+    // An old "m_nValue" is set and can not be correct for this new range.
+    // Next call of "ProgressBar::setValue()" do this.
+}
+
+//____________________________________________________________________________________________________________
+//  XProgressBar
+//____________________________________________________________________________________________________________
+
+sal_Int32 SAL_CALL ProgressBar::getValue () throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard (m_aMutex) ;
+
+    return ( m_nValue ) ;
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressBar::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw( RuntimeException )
+{
+    // Take old size BEFORE you set the new values at baseclass!
+    // You will control changes. At the other way, the values are the same!
+    Rectangle aBasePosSize = getPosSize () ;
+    BaseControl::setPosSize (nX, nY, nWidth, nHeight, nFlags) ;
+
+    // Do only, if size has changed.
+    if (
+        ( nWidth  != aBasePosSize.Width     ) ||
+        ( nHeight != aBasePosSize.Height    )
+       )
+    {
+        impl_recalcRange    (                           ) ;
+        impl_paint          ( 0, 0, impl_getGraphicsPeer () ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException )
+{
+    // A model is not possible for this control.
+    return sal_False ;
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+Reference< XControlModel > SAL_CALL ProgressBar::getModel() throw( RuntimeException )
+{
+    // A model is not possible for this control.
+    return Reference< XControlModel >();
+}
+
+//____________________________________________________________________________________________________________
+//  impl but public method to register service
+//____________________________________________________________________________________________________________
+
+const Sequence< OUString > ProgressBar::impl_getStaticSupportedServiceNames()
+{
+    MutexGuard aGuard( Mutex::getGlobalMutex() );
+    Sequence< OUString > seqServiceNames( 1 );
+    seqServiceNames.getArray() [0] = OUString::createFromAscii( SERVICENAME_PROGRESSBAR );
+    return seqServiceNames ;
+}
+
+//____________________________________________________________________________________________________________
+//  impl but public method to register service
+//____________________________________________________________________________________________________________
+
+const OUString ProgressBar::impl_getStaticImplementationName()
+{
+    return OUString::createFromAscii( IMPLEMENTATIONNAME_PROGRESSBAR );
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGraphics > & rGraphics )
+{
+    // save impossible cases
+    DBG_ASSERT ( rGraphics.is(), "ProgressBar::paint()\nCalled with invalid Reference< XGraphics > ." ) ;
+
+    // This paint method ist not buffered !!
+    // Every request paint the completely control. ( but only, if peer exist )
+     if ( rGraphics.is () )
+    {
+        MutexGuard  aGuard (m_aMutex) ;
+
+        // Clear background
+        // (same color for line and fill)
+        rGraphics->setFillColor ( m_nBackgroundColor                        ) ;
+        rGraphics->setLineColor ( m_nBackgroundColor                        ) ;
+        rGraphics->drawRect     ( nX, nY, impl_getWidth(), impl_getHeight() ) ;
+
+        // same color for line and fill for blocks
+        rGraphics->setFillColor ( m_nForegroundColor ) ;
+        rGraphics->setLineColor ( m_nForegroundColor ) ;
+
+        sal_Int32   nBlockStart     =   0                                                                           ;   // = left site of new block
+        sal_Int32   nBlockCount     =   m_nBlockValue!=0.00 ? (sal_Int32)((m_nValue-m_nMinRange)/m_nBlockValue) : 0 ;   // = number of next block
+
+        // Draw horizontal progressbar
+        // decision in "recalcRange()"
+        if (m_bHorizontal)
+        {
+            // Step to left side of window
+            nBlockStart = nX ;
+
+            for ( sal_Int16 i=1; i<=nBlockCount; ++i )
+            {
+                // step free field
+                nBlockStart +=  FREESPACE   ;
+                // paint block
+                rGraphics->drawRect (nBlockStart, nY+FREESPACE, m_aBlockSize.Width, m_aBlockSize.Height) ;
+                // step next free field
+                nBlockStart +=  m_aBlockSize.Width ;
+            }
+        }
+        // draw vertikal progressbar
+        // decision in "recalcRange()"
+        else
+        {
+            // step to bottom side of window
+            nBlockStart  =  nY+impl_getHeight() ;
+            nBlockStart -=  m_aBlockSize.Height ;
+
+            for ( sal_Int16 i=1; i<=nBlockCount; ++i )
+            {
+                // step free field
+                nBlockStart -=  FREESPACE   ;
+                // paint block
+                rGraphics->drawRect (nX+FREESPACE, nBlockStart, m_aBlockSize.Width, m_aBlockSize.Height) ;
+                // step next free field
+                nBlockStart -=  m_aBlockSize.Height;
+            }
+        }
+
+        // Paint shadow border around the progressbar
+        rGraphics->setLineColor ( LINECOLOR_SHADOW                          ) ;
+        rGraphics->drawLine     ( nX, nY, impl_getWidth(), nY               ) ;
+        rGraphics->drawLine     ( nX, nY, nX             , impl_getHeight() ) ;
+
+        rGraphics->setLineColor ( LINECOLOR_BRIGHT                                                              ) ;
+        rGraphics->drawLine     ( impl_getWidth()-1, impl_getHeight()-1, impl_getWidth()-1, nY                  ) ;
+        rGraphics->drawLine     ( impl_getWidth()-1, impl_getHeight()-1, nX               , impl_getHeight()-1  ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+void ProgressBar::impl_recalcRange ()
+{
+    MutexGuard  aGuard (m_aMutex) ;
+
+    sal_Int32 nWindowWidth  = impl_getWidth()  ;
+    sal_Int32 nWindowHeight = impl_getHeight() ;
+    double    fBlockHeight                     ;
+    double    fBlockWidth                      ;
+    double    fMaxBlocks                       ;
+
+    if( nWindowWidth > nWindowHeight )
+    {
+        m_bHorizontal = sal_True                            ;
+        fBlockHeight  = (nWindowHeight-(2*FREESPACE))       ;
+        fBlockWidth   = fBlockHeight                        ;
+        fMaxBlocks    = nWindowWidth/(fBlockWidth+FREESPACE);
+    }
+    else
+    {
+        m_bHorizontal = sal_False                             ;
+        fBlockWidth   = (nWindowWidth-(2*FREESPACE))          ;
+        fBlockHeight  = fBlockWidth                           ;
+        fMaxBlocks    = nWindowHeight/(fBlockHeight+FREESPACE);
+    }
+
+    double fRange       = m_nMaxRange-m_nMinRange    ;
+    double fBlockValue  = fRange/fMaxBlocks          ;
+
+    m_nBlockValue       = fBlockValue            ;
+    m_aBlockSize.Height = (sal_Int32)fBlockHeight;
+    m_aBlockSize.Width  = (sal_Int32)fBlockWidth ;
+/*
+        // Calculate count of blocks for actual size
+        // (prevent error "division by zero")
+        if ( nHeight == 0 )
+        {
+            nHeight = 1 ;
+        }
+
+        nMaxBlock    =  nWidth / nHeight    ;
+        nMaxBlock   *=  2                   ;
+
+        // prevent error "division by zero"
+        if ( nMaxBlock == 0 )
+        {
+            nMaxBlock = 1 ;
+        }
+
+        // Calculate new value and new size for ONE block.
+
+        // Do not a calculation like this: "m_nBlockValue=(m_nMaxRange-m_nMinRange)/nMaxBlock"  !
+        // If difference between m_nMaxRange and m_nMinRange to large, it give an overflow and a
+        // following error "division by zero" in method "paint() ... nBlockCount=nDifference/m_nBlockValue ..."
+
+        // Overflow ? => example: _I32_MAX - _I32_MIN = -1 and not _UI32_MAX !!!
+
+        m_nBlockValue       =   ( m_nMaxRange / nMaxBlock ) - ( m_nMinRange / nMaxBlock ) ;
+        m_aBlockSize.Height =   ( nHeight - ( FREESPACE * 2 )                           ) ;
+        m_aBlockSize.Width  =   ( ( nWidth / nMaxBlock ) - FREESPACE                    ) ;
+    }
+    else
+    {
+        // Don't forget to save this state! Used in "ProgressBar::paint()"
+        m_bHorizontal = sal_False ;
+
+        double fBlockWidth  = (nHeight-(2*FREESPACE))       ;
+        double fBlockHeight = fBlockWidth                   ;
+        double fRange       = m_nMaxRange-m_nMinRange       ;
+        double fBlockValue  = fRange/(fBlockWidth+FREESPACE);
+
+        m_nBlockValue       = fBlockValue            ;
+        m_aBlockSize.Height = (sal_Int32)fBlockHeight;
+        m_aBlockSize.Width  = (sal_Int32)fBlockWidth ;
+
+        // Calculate count of blocks for actual size
+        // (prevent error "division by zero")
+        if ( nWidth == 0 )
+        {
+            nWidth = 1 ;
+        }
+
+        nMaxBlock    =  nHeight / nWidth    ;
+        nMaxBlock   *=  2                   ;
+
+        // prevent error "division by zero"
+        if ( nMaxBlock == 0 )
+        {
+            nMaxBlock = 1 ;
+        }
+
+        // Calculate new value and new size for ONE block.
+
+        // Do not a calculation like this: "m_nBlockValue=(m_nMaxRange-m_nMinRange)/nMaxBlock"  !
+        // If difference between m_nMaxRange and m_nMinRange to large, it give an overflow and a
+        // following error "division by zero" in method "paint() ... nBlockCount=nDifference/m_nBlockValue ..."
+
+        // Overflow ? => example: _I32_MAX - _I32_MIN = -1 and not _UI32_MAX !!!
+
+        m_nBlockValue       =   ( m_nMaxRange / nMaxBlock ) - ( m_nMinRange / nMaxBlock ) ;
+        m_aBlockSize.Height =   ( ( nHeight / nMaxBlock ) - FREESPACE                   ) ;
+        m_aBlockSize.Width  =   ( nWidth - ( FREESPACE * 2 )                            ) ;
+
+    }
+*/
+}
+
+}   // namespace unocontrols
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
new file mode 100644
index 000000000000..39bf4d84f8b9
--- /dev/null
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -0,0 +1,1066 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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
+//____________________________________________________________________________________________________________
+
+#include "progressmonitor.hxx"
+
+//____________________________________________________________________________________________________________
+//  includes of other projects
+//____________________________________________________________________________________________________________
+#include <com/sun/star/awt/GradientStyle.hpp>
+#include <com/sun/star/awt/RasterOperation.hpp>
+#include <com/sun/star/awt/Gradient.hpp>
+#include <com/sun/star/awt/XGraphics.hpp>
+#include <com/sun/star/awt/PosSize.hpp>
+#include <cppuhelper/typeprovider.hxx>
+#include <tools/debug.hxx>
+#include <tools/solar.h>
+
+//____________________________________________________________________________________________________________
+//  includes of my project
+//____________________________________________________________________________________________________________
+#include "progressbar.hxx"
+
+//____________________________________________________________________________________________________________
+//  namespace
+//____________________________________________________________________________________________________________
+
+using namespace ::cppu                  ;
+using namespace ::osl                   ;
+using namespace ::rtl                   ;
+using namespace ::com::sun::star::uno   ;
+using namespace ::com::sun::star::lang  ;
+using namespace ::com::sun::star::awt   ;
+
+namespace unocontrols{
+
+//____________________________________________________________________________________________________________
+//  construct/destruct
+//____________________________________________________________________________________________________________
+
+ProgressMonitor::ProgressMonitor( const Reference< XMultiServiceFactory >& xFactory )
+    : BaseContainerControl  ( xFactory  )
+{
+    // Its not allowed to work with member in this method (refcounter !!!)
+    // But with a HACK (++refcount) its "OK" :-(
+    ++m_refCount ;
+
+    // Create instances for fixedtext, button and progress ...
+    m_xTopic_Top    = Reference< XFixedText >       ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME   ) ), UNO_QUERY ) ;
+    m_xText_Top     = Reference< XFixedText >       ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME   ) ), UNO_QUERY ) ;
+    m_xTopic_Bottom = Reference< XFixedText >       ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME   ) ), UNO_QUERY ) ;
+    m_xText_Bottom  = Reference< XFixedText >       ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_SERVICENAME   ) ), UNO_QUERY ) ;
+    m_xButton       = Reference< XButton >          ( xFactory->createInstance ( OUString::createFromAscii( BUTTON_SERVICENAME      ) ), UNO_QUERY ) ;
+    m_xProgressBar  = Reference< XProgressBar >     ( xFactory->createInstance ( OUString::createFromAscii( SERVICENAME_PROGRESSBAR ) ), UNO_QUERY ) ;
+
+    // ... cast controls to Reference< XControl >  (for "setModel"!) ...
+    Reference< XControl >   xRef_Topic_Top      ( m_xTopic_Top    , UNO_QUERY ) ;
+    Reference< XControl >   xRef_Text_Top       ( m_xText_Top     , UNO_QUERY ) ;
+    Reference< XControl >   xRef_Topic_Bottom   ( m_xTopic_Bottom , UNO_QUERY ) ;
+    Reference< XControl >   xRef_Text_Bottom    ( m_xText_Bottom  , UNO_QUERY ) ;
+    Reference< XControl >   xRef_Button         ( m_xButton       , UNO_QUERY ) ;
+    Reference< XControl >   xRef_ProgressBar    ( m_xProgressBar  , UNO_QUERY ) ;
+
+    // ... set models ...
+    xRef_Topic_Top->setModel        ( Reference< XControlModel >  ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_MODELNAME   ) ), UNO_QUERY ) ) ;
+    xRef_Text_Top->setModel         ( Reference< XControlModel >  ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_MODELNAME   ) ), UNO_QUERY ) ) ;
+    xRef_Topic_Bottom->setModel     ( Reference< XControlModel >  ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_MODELNAME   ) ), UNO_QUERY ) ) ;
+    xRef_Text_Bottom->setModel      ( Reference< XControlModel >  ( xFactory->createInstance ( OUString::createFromAscii( FIXEDTEXT_MODELNAME   ) ), UNO_QUERY ) ) ;
+    xRef_Button->setModel           ( Reference< XControlModel >  ( xFactory->createInstance ( OUString::createFromAscii( BUTTON_MODELNAME      ) ), UNO_QUERY ) ) ;
+    // ProgressBar has no model !!!
+
+    // ... and add controls to basecontainercontrol!
+    addControl ( OUString::createFromAscii( CONTROLNAME_TEXT        ) , xRef_Topic_Top      ) ;
+    addControl ( OUString::createFromAscii( CONTROLNAME_TEXT        ) , xRef_Text_Top       ) ;
+    addControl ( OUString::createFromAscii( CONTROLNAME_TEXT        ) , xRef_Topic_Bottom   ) ;
+    addControl ( OUString::createFromAscii( CONTROLNAME_TEXT        ) , xRef_Text_Bottom    ) ;
+    addControl ( OUString::createFromAscii( CONTROLNAME_BUTTON      ) , xRef_Button         ) ;
+    addControl ( OUString::createFromAscii( CONTROLNAME_PROGRESSBAR ) , xRef_ProgressBar    ) ;
+
+    // FixedText make it automaticly visible by himself ... but not the progressbar !!!
+    // it must be set explicitly
+    Reference< XWindow > xWindowRef_ProgressBar( m_xProgressBar, UNO_QUERY );
+    xWindowRef_ProgressBar->setVisible( sal_True );
+
+    // Reset to defaults !!!
+    // (progressbar take automaticly its own defaults)
+    m_xButton->setLabel         ( OUString::createFromAscii( DEFAULT_BUTTONLABEL    ) ) ;
+    m_xTopic_Top->setText       ( OUString::createFromAscii( DEFAULT_TOPIC          ) ) ;
+    m_xText_Top->setText        ( OUString::createFromAscii( DEFAULT_TEXT           ) ) ;
+    m_xTopic_Bottom->setText    ( OUString::createFromAscii( DEFAULT_TOPIC          ) ) ;
+    m_xText_Bottom->setText     ( OUString::createFromAscii( DEFAULT_TEXT           ) ) ;
+
+    --m_refCount ;
+
+    // Initialize info lists for fixedtext's
+    m_pTextlist_Top     = new IMPL_Textlist ;
+    m_pTextlist_Bottom  = new IMPL_Textlist ;
+}
+
+ProgressMonitor::~ProgressMonitor()
+{
+    impl_cleanMemory () ;
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) throw( RuntimeException )
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    Any aReturn ;
+    Reference< XInterface > xDel = BaseContainerControl::impl_getDelegator();
+    if ( xDel.is() )
+    {
+        // If an delegator exist, forward question to his queryInterface.
+        // Delegator will ask his own queryAggregation!
+        aReturn = xDel->queryInterface( rType );
+    }
+    else
+    {
+        // If an delegator unknown, forward question to own queryAggregation.
+        aReturn = queryAggregation( rType );
+    }
+
+    return aReturn ;
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressMonitor::acquire() throw()
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Forward to baseclass
+    BaseControl::acquire();
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressMonitor::release() throw()
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Forward to baseclass
+    BaseControl::release();
+}
+
+//____________________________________________________________________________________________________________
+//  XTypeProvider
+//____________________________________________________________________________________________________________
+
+Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( 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 OTypeCollection* pTypeCollection = NULL ;
+
+    if ( pTypeCollection == NULL )
+    {
+        // Ready for multithreading; get global mutex for first call of this method only! see before
+        MutexGuard aGuard( 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 OTypeCollection aTypeCollection  (   ::getCppuType(( const Reference< XLayoutConstrains  >*)NULL )   ,
+                                                          ::getCppuType(( const Reference< XButton          >*)NULL )   ,
+                                                          ::getCppuType(( const Reference< XProgressMonitor >*)NULL )   ,
+                                                        BaseContainerControl::getTypes()
+                                                    );
+            // ... and set his address to static pointer!
+            pTypeCollection = &aTypeCollection ;
+        }
+    }
+
+    return pTypeCollection->getTypes();
+}
+
+//____________________________________________________________________________________________________________
+//  XAggregation
+//____________________________________________________________________________________________________________
+
+Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( RuntimeException )
+{
+    // Ask for my own supported interfaces ...
+    // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
+    Any aReturn ( ::cppu::queryInterface(   aType                                       ,
+                                               static_cast< XLayoutConstrains*  > ( this )  ,
+                                               static_cast< XButton*            > ( this )  ,
+                                               static_cast< XProgressMonitor*   > ( this )
+                                        )
+                );
+
+    // If searched interface not supported by this class ...
+    if ( aReturn.hasValue() == sal_False )
+    {
+        // ... ask baseclasses.
+        aReturn = BaseControl::queryAggregation( aType );
+    }
+
+    return aReturn ;
+}
+
+//____________________________________________________________________________________________________________
+//  XProgressMonitor
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressMonitor::addText( const OUString& rTopic, const OUString& rText, sal_Bool bbeforeProgress ) throw( RuntimeException )
+{
+    // Safe impossible cases
+    // Check valid call of this method.
+    DBG_ASSERT ( impl_debug_checkParameter ( rTopic, rText, bbeforeProgress )   , "ProgressMonitor::addText()\nCall without valid parameters!\n") ;
+    DBG_ASSERT ( !(impl_searchTopic ( rTopic, bbeforeProgress ) != NULL )       , "ProgresMonitor::addText()\nThe text already exist.\n"        ) ;
+
+    // Do nothing (in Release), if topic already exist.
+    if ( impl_searchTopic ( rTopic, bbeforeProgress ) != NULL )
+    {
+        return ;
+    }
+
+    // Else ... take memory for new item ...
+    IMPL_TextlistItem*  pTextItem = new IMPL_TextlistItem ;
+
+    if ( pTextItem != NULL )
+    {
+        // Set values ...
+        pTextItem->sTopic   = rTopic ;
+        pTextItem->sText    = rText ;
+
+        // Ready for multithreading
+        MutexGuard aGuard ( m_aMutex ) ;
+
+        // ... and insert it in right list.
+        if ( bbeforeProgress == sal_True )
+        {
+            m_pTextlist_Top->Insert    ( pTextItem, LIST_APPEND ) ;
+        }
+        else
+        {
+            m_pTextlist_Bottom->Insert ( pTextItem, LIST_APPEND ) ;
+        }
+    }
+
+    // ... update window
+    impl_rebuildFixedText   () ;
+    impl_recalcLayout       () ;
+}
+
+//____________________________________________________________________________________________________________
+//  XProgressMonitor
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbeforeProgress ) throw( RuntimeException )
+{
+    // Safe impossible cases
+    // Check valid call of this method.
+    DBG_ASSERT ( impl_debug_checkParameter ( rTopic, bbeforeProgress ), "ProgressMonitor::removeText()\nCall without valid parameters!\n" ) ;
+
+    // Search the topic ...
+    IMPL_TextlistItem* pSearchItem = impl_searchTopic ( rTopic, bbeforeProgress ) ;
+
+    if ( pSearchItem != NULL )
+    {
+        // Ready for multithreading
+        MutexGuard aGuard ( m_aMutex ) ;
+
+        // ... delete item from right list ...
+        if ( bbeforeProgress == sal_True )
+        {
+            m_pTextlist_Top->Remove    ( pSearchItem ) ;
+        }
+        else
+        {
+            m_pTextlist_Bottom->Remove ( pSearchItem ) ;
+        }
+
+        delete pSearchItem ;
+
+        // ... and update window.
+        impl_rebuildFixedText   () ;
+        impl_recalcLayout       () ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XProgressMonitor
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressMonitor::updateText ( const OUString& rTopic, const OUString& rText, sal_Bool bbeforeProgress ) throw( RuntimeException )
+{
+    // Safe impossible cases
+    // Check valid call of this method.
+    DBG_ASSERT ( impl_debug_checkParameter ( rTopic, rText, bbeforeProgress ), "ProgressMonitor::updateText()\nCall without valid parameters!\n" ) ;
+
+    // Search topic ...
+    IMPL_TextlistItem* pSearchItem = impl_searchTopic ( rTopic, bbeforeProgress ) ;
+
+    if ( pSearchItem != NULL )
+    {
+        // Ready for multithreading
+        MutexGuard aGuard ( m_aMutex ) ;
+
+        // ... update text ...
+        pSearchItem->sText = rText ;
+
+        // ... and update window.
+        impl_rebuildFixedText   () ;
+        impl_recalcLayout       () ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XProgressBar
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard ( m_aMutex ) ;
+
+    if ( m_xProgressBar.is () )
+    {
+        m_xProgressBar->setForegroundColor ( nColor ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XProgressBar
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard ( m_aMutex ) ;
+
+    if ( m_xProgressBar.is () )
+    {
+        m_xProgressBar->setBackgroundColor ( nColor ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XProgressBar
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard ( m_aMutex ) ;
+
+    if ( m_xProgressBar.is () )
+    {
+        m_xProgressBar->setValue ( nValue ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XProgressBar
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard ( m_aMutex ) ;
+
+    if ( m_xProgressBar.is () )
+    {
+        m_xProgressBar->setRange ( nMin, nMax ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XProgressBar
+//____________________________________________________________________________________________________________
+
+sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard ( m_aMutex ) ;
+
+    if (m_xProgressBar.is())
+    {
+        return m_xProgressBar->getValue () ;
+    }
+
+    return 0 ;
+}
+
+//____________________________________________________________________________________________________________
+//  XButton
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressMonitor::addActionListener ( const Reference< XActionListener > & rListener ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard ( m_aMutex ) ;
+
+    if ( m_xButton.is () )
+    {
+        m_xButton->addActionListener ( rListener ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XButton
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressMonitor::removeActionListener ( const Reference< XActionListener > & rListener ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard ( m_aMutex ) ;
+
+    if ( m_xButton.is () )
+    {
+        m_xButton->removeActionListener ( rListener ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XButton
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard ( m_aMutex ) ;
+
+    if ( m_xButton.is () )
+    {
+        m_xButton->setLabel ( rLabel ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XButton
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard ( m_aMutex ) ;
+
+    if ( m_xButton.is () )
+    {
+        m_xButton->setActionCommand ( rCommand ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XLayoutConstrains
+//____________________________________________________________________________________________________________
+
+Size SAL_CALL ProgressMonitor::getMinimumSize () throw( RuntimeException )
+{
+    return Size (DEFAULT_WIDTH, DEFAULT_HEIGHT) ;
+}
+
+//____________________________________________________________________________________________________________
+//  XLayoutConstrains
+//____________________________________________________________________________________________________________
+
+Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException )
+{
+    // Ready for multithreading
+    ClearableMutexGuard aGuard ( m_aMutex ) ;
+
+    // get information about required place of child controls
+    Reference< XLayoutConstrains >  xTopicLayout_Top        ( m_xTopic_Top      , UNO_QUERY ) ;
+    Reference< XLayoutConstrains >  xTopicLayout_Bottom     ( m_xTopic_Bottom   , UNO_QUERY ) ;
+    Reference< XLayoutConstrains >  xButtonLayout           ( m_xButton         , UNO_QUERY ) ;
+    Reference< XWindow >            xProgressBarWindow      ( m_xProgressBar    , UNO_QUERY ) ;
+
+    Size        aTopicSize_Top      =   xTopicLayout_Top->getPreferredSize          ();
+    Size        aTopicSize_Bottom   =   xTopicLayout_Bottom->getPreferredSize       ();
+    Size        aButtonSize         =   xButtonLayout->getPreferredSize             ();
+    Rectangle   aTempRectangle      =   xProgressBarWindow->getPosSize              ();
+    Size        aProgressBarSize    =   Size( aTempRectangle.Width, aTempRectangle.Height );
+
+    aGuard.clear () ;
+
+    // calc preferred size of progressmonitor
+    sal_Int32   nWidth  =   0 ;
+    sal_Int32   nHeight =   0 ;
+
+    nWidth   =  3 * FREEBORDER          ;
+    nWidth  +=  aProgressBarSize.Width  ;
+
+    nHeight  =  6 * FREEBORDER          ;
+    nHeight +=  aTopicSize_Top.Height   ;
+    nHeight +=  aProgressBarSize.Height ;
+    nHeight +=  aTopicSize_Bottom.Height;
+    nHeight +=  2                       ;   // 1 for black line, 1 for white line = 3D-Line!
+    nHeight +=  aButtonSize.Height      ;
+
+    // norm to minimum
+    if ( nWidth<DEFAULT_WIDTH )
+    {
+        nWidth = DEFAULT_WIDTH ;
+    }
+    if ( nHeight<DEFAULT_HEIGHT )
+    {
+        nHeight = DEFAULT_HEIGHT ;
+    }
+
+    // return to caller
+    return Size ( nWidth, nHeight ) ;
+}
+
+//____________________________________________________________________________________________________________
+//  XLayoutConstrains
+//____________________________________________________________________________________________________________
+
+Size SAL_CALL ProgressMonitor::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException )
+{
+    return getPreferredSize () ;
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressMonitor::createPeer ( const Reference< XToolkit > & rToolkit, const Reference< XWindowPeer > & rParent    ) throw( RuntimeException )
+{
+    if (!getPeer().is())
+    {
+        BaseContainerControl::createPeer ( rToolkit, rParent ) ;
+
+        // If user forget to call "setPosSize()", we have still a correct size.
+        // And a "MinimumSize" IS A "MinimumSize"!
+        // We change not the position of control at this point.
+        Size aDefaultSize = getMinimumSize () ;
+        setPosSize ( 0, 0, aDefaultSize.Width, aDefaultSize.Height, PosSize::SIZE ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+sal_Bool SAL_CALL ProgressMonitor::setModel ( const Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException )
+{
+    // We have no model.
+    return sal_False ;
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw( RuntimeException )
+{
+    // We have no model.
+    // return (XControlModel*)this ;
+    return Reference< XControlModel >  () ;
+}
+
+//____________________________________________________________________________________________________________
+//  XComponent
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard ( m_aMutex ) ;
+
+    // "removeControl()" control the state of a reference
+    Reference< XControl >  xRef_Topic_Top       ( m_xTopic_Top      , UNO_QUERY ) ;
+    Reference< XControl >  xRef_Text_Top        ( m_xText_Top       , UNO_QUERY ) ;
+    Reference< XControl >  xRef_Topic_Bottom    ( m_xTopic_Bottom   , UNO_QUERY ) ;
+    Reference< XControl >  xRef_Text_Bottom     ( m_xText_Bottom    , UNO_QUERY ) ;
+    Reference< XControl >  xRef_Button          ( m_xButton         , UNO_QUERY ) ;
+    Reference< XControl >  xRef_ProgressBar     ( m_xProgressBar    , UNO_QUERY ) ;
+
+    removeControl ( xRef_Topic_Top      ) ;
+    removeControl ( xRef_Text_Top       ) ;
+    removeControl ( xRef_Topic_Bottom   ) ;
+    removeControl ( xRef_Text_Bottom    ) ;
+    removeControl ( xRef_Button         ) ;
+    removeControl ( xRef_ProgressBar    ) ;
+
+    // do'nt use "...->clear ()" or "... = XFixedText ()"
+    // when other hold a reference at this object !!!
+    xRef_Topic_Top->dispose     () ;
+    xRef_Text_Top->dispose      () ;
+    xRef_Topic_Bottom->dispose  () ;
+    xRef_Text_Bottom->dispose   () ;
+    xRef_Button->dispose        () ;
+    xRef_ProgressBar->dispose   () ;
+
+    BaseContainerControl::dispose () ;
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw( RuntimeException )
+{
+    Rectangle   aBasePosSize = getPosSize () ;
+    BaseContainerControl::setPosSize (nX, nY, nWidth, nHeight, nFlags) ;
+
+    // if position or size changed
+    if (
+        ( nWidth  != aBasePosSize.Width ) ||
+        ( nHeight != aBasePosSize.Height)
+       )
+    {
+        // calc new layout for controls
+        impl_recalcLayout () ;
+        // clear background (!)
+        // [Childs was repainted in "recalcLayout" by setPosSize() automaticly!]
+        getPeer()->invalidate(2);
+        // and repaint the control
+        impl_paint ( 0, 0, impl_getGraphicsPeer() ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  impl but public method to register service
+//____________________________________________________________________________________________________________
+
+const Sequence< OUString > ProgressMonitor::impl_getStaticSupportedServiceNames()
+{
+    MutexGuard aGuard( Mutex::getGlobalMutex() );
+    Sequence< OUString > seqServiceNames( 1 );
+    seqServiceNames.getArray() [0] = OUString::createFromAscii( SERVICENAME_PROGRESSMONITOR );
+    return seqServiceNames ;
+}
+
+//____________________________________________________________________________________________________________
+//  impl but public method to register service
+//____________________________________________________________________________________________________________
+
+const OUString ProgressMonitor::impl_getStaticImplementationName()
+{
+    return OUString::createFromAscii( IMPLEMENTATIONNAME_PROGRESSMONITOR );
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+void ProgressMonitor::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGraphics > & rGraphics )
+{
+    if (rGraphics.is())
+    {
+        // Ready for multithreading
+        MutexGuard aGuard ( m_aMutex ) ;
+
+        // paint shadowed border around the progressmonitor
+        rGraphics->setLineColor ( LINECOLOR_SHADOW                                                              ) ;
+        rGraphics->drawLine     ( impl_getWidth()-1, impl_getHeight()-1, impl_getWidth()-1, nY                  ) ;
+        rGraphics->drawLine     ( impl_getWidth()-1, impl_getHeight()-1, nX               , impl_getHeight()-1  ) ;
+
+        rGraphics->setLineColor ( LINECOLOR_BRIGHT                          ) ;
+        rGraphics->drawLine     ( nX, nY, impl_getWidth(), nY               ) ;
+        rGraphics->drawLine     ( nX, nY, nX             , impl_getHeight() ) ;
+
+        // Paint 3D-line
+        rGraphics->setLineColor ( LINECOLOR_SHADOW  ) ;
+        rGraphics->drawLine     ( m_a3DLine.X, m_a3DLine.Y, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y ) ;
+
+        rGraphics->setLineColor ( LINECOLOR_BRIGHT  ) ;
+        rGraphics->drawLine     ( m_a3DLine.X, m_a3DLine.Y+1, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y+1 ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  private method
+//____________________________________________________________________________________________________________
+
+void ProgressMonitor::impl_recalcLayout ()
+{
+    sal_Int32   nX_Button               ;
+    sal_Int32   nY_Button               ;
+    sal_Int32   nWidth_Button           ;
+    sal_Int32   nHeight_Button          ;
+
+    sal_Int32   nX_ProgressBar          ;
+    sal_Int32   nY_ProgressBar          ;
+    sal_Int32   nWidth_ProgressBar      ;
+    sal_Int32   nHeight_ProgressBar     ;
+
+    sal_Int32   nX_3DLine               ;
+    sal_Int32   nY_3DLine               ;
+    sal_Int32   nWidth_3DLine           ;
+    sal_Int32   nHeight_3DLine          ;
+
+    sal_Int32   nX_Text_Top             ;
+    sal_Int32   nY_Text_Top             ;
+    sal_Int32   nWidth_Text_Top         ;
+    sal_Int32   nHeight_Text_Top        ;
+
+    sal_Int32   nX_Topic_Top            ;
+    sal_Int32   nY_Topic_Top            ;
+    sal_Int32   nWidth_Topic_Top        ;
+    sal_Int32   nHeight_Topic_Top       ;
+
+    sal_Int32   nX_Text_Bottom          ;
+    sal_Int32   nY_Text_Bottom          ;
+    sal_Int32   nWidth_Text_Bottom      ;
+    sal_Int32   nHeight_Text_Bottom     ;
+
+    sal_Int32   nX_Topic_Bottom         ;
+    sal_Int32   nY_Topic_Bottom         ;
+    sal_Int32   nWidth_Topic_Bottom     ;
+    sal_Int32   nHeight_Topic_Bottom    ;
+
+    // Ready for multithreading
+    MutexGuard aGuard ( m_aMutex ) ;
+
+    // get information about required place of child controls
+    Reference< XLayoutConstrains >  xTopicLayout_Top    ( m_xTopic_Top      , UNO_QUERY ) ;
+    Reference< XLayoutConstrains >  xTextLayout_Top     ( m_xText_Top       , UNO_QUERY ) ;
+    Reference< XLayoutConstrains >  xTopicLayout_Bottom ( m_xTopic_Bottom   , UNO_QUERY ) ;
+    Reference< XLayoutConstrains >  xTextLayout_Bottom  ( m_xText_Bottom    , UNO_QUERY ) ;
+    Reference< XLayoutConstrains >  xButtonLayout       ( m_xButton         , UNO_QUERY ) ;
+
+    Size    aTopicSize_Top      =   xTopicLayout_Top->getPreferredSize      () ;
+    Size    aTextSize_Top       =   xTextLayout_Top->getPreferredSize       () ;
+    Size    aTopicSize_Bottom   =   xTopicLayout_Bottom->getPreferredSize   () ;
+    Size    aTextSize_Bottom    =   xTextLayout_Bottom->getPreferredSize    () ;
+    Size    aButtonSize         =   xButtonLayout->getPreferredSize         () ;
+
+    // calc position and size of child controls
+    // Button has preferred size!
+    nWidth_Button           =   aButtonSize.Width                                               ;
+    nHeight_Button          =   aButtonSize.Height                                              ;
+
+    // Left column before progressbar has preferred size and fixed position.
+    // But "Width" is oriented on left column below progressbar to!!! "max(...)"
+    nX_Topic_Top            =   FREEBORDER                                                      ;
+    nY_Topic_Top            =   FREEBORDER                                                      ;
+    nWidth_Topic_Top        =   Max ( aTopicSize_Top.Width, aTopicSize_Bottom.Width )           ;
+    nHeight_Topic_Top       =   aTopicSize_Top.Height                                           ;
+
+    // Right column before progressbar has relativ position to left column ...
+    // ... and a size as rest of dialog size!
+    nX_Text_Top             =   nX_Topic_Top+nWidth_Topic_Top+FREEBORDER                        ;
+    nY_Text_Top             =   nY_Topic_Top                                                    ;
+    nWidth_Text_Top         =   Max ( aTextSize_Top.Width, aTextSize_Bottom.Width )             ;
+    // Fix size of this column to minimum!
+    sal_Int32 nSummaryWidth = nWidth_Text_Top+nWidth_Topic_Top+(3*FREEBORDER) ;
+    if ( nSummaryWidth < DEFAULT_WIDTH )
+        nWidth_Text_Top     =   DEFAULT_WIDTH-nWidth_Topic_Top-(3*FREEBORDER);
+    // Fix size of column to maximum!
+    if ( nSummaryWidth > impl_getWidth() )
+        nWidth_Text_Top     =   impl_getWidth()-nWidth_Topic_Top-(3*FREEBORDER)                 ;
+    nHeight_Text_Top        =   nHeight_Topic_Top                                               ;
+
+    // Position of progressbar is relativ to columns before.
+    // Progressbar.Width  = Dialog.Width !!!
+    // Progressbar.Height = Button.Height
+    nX_ProgressBar          =   nX_Topic_Top                                                    ;
+    nY_ProgressBar          =   nY_Topic_Top+nHeight_Topic_Top+FREEBORDER                       ;
+    nWidth_ProgressBar      =   FREEBORDER+nWidth_Topic_Top+nWidth_Text_Top                     ;
+    nHeight_ProgressBar     =   nHeight_Button                                                  ;
+
+    // Oriented by left column before progressbar.
+    nX_Topic_Bottom         =   nX_Topic_Top                                                    ;
+    nY_Topic_Bottom         =   nY_ProgressBar+nHeight_ProgressBar+FREEBORDER                   ;
+    nWidth_Topic_Bottom     =   nWidth_Topic_Top                                                ;
+    nHeight_Topic_Bottom    =   aTopicSize_Bottom.Height                                        ;
+
+    // Oriented by right column before progressbar.
+    nX_Text_Bottom          =   nX_Topic_Bottom+nWidth_Topic_Bottom+FREEBORDER                  ;
+    nY_Text_Bottom          =   nY_Topic_Bottom                                                 ;
+    nWidth_Text_Bottom      =   nWidth_Text_Top                                                 ;
+    nHeight_Text_Bottom     =   nHeight_Topic_Bottom                                            ;
+
+    // Oriented by progressbar.
+    nX_3DLine               =   nX_Topic_Top                                                    ;
+    nY_3DLine               =   nY_Topic_Bottom+nHeight_Topic_Bottom+(FREEBORDER/2)             ;
+    nWidth_3DLine           =   nWidth_ProgressBar                                              ;
+    nHeight_3DLine          =   1                                                               ;   // Height for ONE line ! (But we paint two lines!)
+
+    // Oriented by progressbar.
+    nX_Button               =   nX_ProgressBar+nWidth_ProgressBar-nWidth_Button                 ;
+    nY_Button               =   nY_Topic_Bottom+nHeight_Topic_Bottom+FREEBORDER                 ;
+
+    // Calc offsets to center controls
+    sal_Int32   nDx ;
+    sal_Int32   nDy ;
+
+    nDx =   ( (2*FREEBORDER)+nWidth_ProgressBar                                                             ) ;
+    nDy =   ( (6*FREEBORDER)+nHeight_Topic_Top+nHeight_ProgressBar+nHeight_Topic_Bottom+2+nHeight_Button    ) ;
+
+    // At this point use original dialog size to center controls!
+    nDx =   (impl_getWidth ()/2)-(nDx/2)    ;
+    nDy =   (impl_getHeight()/2)-(nDy/2)    ;
+
+    if ( nDx<0 )
+    {
+        nDx=0 ;
+    }
+    if ( nDy<0 )
+    {
+        nDy=0 ;
+    }
+
+    // Set new position and size on all controls
+    Reference< XWindow >  xRef_Topic_Top        ( m_xTopic_Top      , UNO_QUERY ) ;
+    Reference< XWindow >  xRef_Text_Top         ( m_xText_Top       , UNO_QUERY ) ;
+    Reference< XWindow >  xRef_Topic_Bottom     ( m_xTopic_Bottom   , UNO_QUERY ) ;
+    Reference< XWindow >  xRef_Text_Bottom      ( m_xText_Bottom    , UNO_QUERY ) ;
+    Reference< XWindow >  xRef_Button           ( m_xButton         , UNO_QUERY ) ;
+    Reference< XWindow >  xRef_ProgressBar      ( m_xProgressBar    , UNO_QUERY ) ;
+
+    xRef_Topic_Top->setPosSize      ( nDx+nX_Topic_Top      , nDy+nY_Topic_Top      , nWidth_Topic_Top      , nHeight_Topic_Top     , 15 ) ;
+    xRef_Text_Top->setPosSize       ( nDx+nX_Text_Top       , nDy+nY_Text_Top       , nWidth_Text_Top       , nHeight_Text_Top      , 15 ) ;
+    xRef_Topic_Bottom->setPosSize   ( nDx+nX_Topic_Bottom   , nDy+nY_Topic_Bottom   , nWidth_Topic_Bottom   , nHeight_Topic_Bottom  , 15 ) ;
+    xRef_Text_Bottom->setPosSize    ( nDx+nX_Text_Bottom    , nDy+nY_Text_Bottom    , nWidth_Text_Bottom    , nHeight_Text_Bottom   , 15 ) ;
+    xRef_Button->setPosSize         ( nDx+nX_Button         , nDy+nY_Button         , nWidth_Button         , nHeight_Button        , 15 ) ;
+    xRef_ProgressBar->setPosSize    ( nDx+nX_ProgressBar    , nDy+nY_ProgressBar    , nWidth_ProgressBar    , nHeight_ProgressBar   , 15 ) ;
+
+    m_a3DLine.X         = nDx+nX_Topic_Top                                          ;
+    m_a3DLine.Y         = nDy+nY_Topic_Bottom+nHeight_Topic_Bottom+(FREEBORDER/2)   ;
+    m_a3DLine.Width     = nWidth_ProgressBar                                        ;
+    m_a3DLine.Height    = nHeight_ProgressBar                                       ;
+
+    // All childcontrols make an implicit repaint in setPosSize()!
+    // Make it also for this 3D-line ...
+    Reference< XGraphics >  xGraphics = impl_getGraphicsPeer () ;
+
+    xGraphics->setLineColor ( LINECOLOR_SHADOW  ) ;
+    xGraphics->drawLine     ( m_a3DLine.X, m_a3DLine.Y, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y ) ;
+
+    xGraphics->setLineColor ( LINECOLOR_BRIGHT  ) ;
+    xGraphics->drawLine     ( m_a3DLine.X, m_a3DLine.Y+1, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y+1 ) ;
+}
+
+//____________________________________________________________________________________________________________
+//  private method
+//____________________________________________________________________________________________________________
+
+void ProgressMonitor::impl_rebuildFixedText ()
+{
+    // Ready for multithreading
+    MutexGuard aGuard ( m_aMutex ) ;
+
+    // Rebuild fixedtext before progress
+
+    // Rebuild left site of text
+    if (m_xTopic_Top.is())
+    {
+        OUString        aCollectString  ;
+
+        // Collect all topics from list and format text.
+        // "\n" MUST BE at the end of line!!! => Else ... topic and his text are not in the same line!!!
+        for ( sal_uInt32 n=0; n<m_pTextlist_Top->Count(); ++n )
+        {
+            IMPL_TextlistItem* pSearchItem = m_pTextlist_Top->GetObject (n) ;
+            aCollectString  +=  pSearchItem->sTopic ;
+            aCollectString  +=  OUString::createFromAscii("\n")             ;
+        }
+        aCollectString  +=  OUString::createFromAscii("\0") ;   // It's better :-)
+
+        m_xTopic_Top->setText ( aCollectString ) ;
+    }
+
+    // Rebuild right site of text
+    if (m_xText_Top.is())
+    {
+        OUString        aCollectString  ;
+
+        // Collect all topics from list and format text.
+        // "\n" MUST BE at the end of line!!! => Else ... topic and his text are not in the same line!!!
+        for ( sal_uInt32 n=0; n<m_pTextlist_Top->Count(); ++n )
+        {
+            IMPL_TextlistItem* pSearchItem = m_pTextlist_Top->GetObject (n) ;
+            aCollectString  +=  pSearchItem->sText ;
+            aCollectString  +=  OUString::createFromAscii("\n")            ;
+        }
+        aCollectString  +=  OUString::createFromAscii("\0") ;   // It's better :-)
+
+        m_xText_Top->setText ( aCollectString ) ;
+    }
+
+    // Rebuild fixedtext below progress
+
+    // Rebuild left site of text
+    if (m_xTopic_Bottom.is())
+    {
+        OUString        aCollectString  ;
+
+        // Collect all topics from list and format text.
+        // "\n" MUST BE at the end of line!!! => Else ... topic and his text are not in the same line!!!
+        for ( sal_uInt32 n=0; n<m_pTextlist_Bottom->Count(); ++n )
+        {
+            IMPL_TextlistItem* pSearchItem = m_pTextlist_Bottom->GetObject (n) ;
+            aCollectString  +=  pSearchItem->sTopic ;
+            aCollectString  +=  OUString::createFromAscii("\n")             ;
+        }
+        aCollectString  +=  OUString::createFromAscii("\0") ;   // It's better :-)
+
+        m_xTopic_Bottom->setText ( aCollectString ) ;
+    }
+
+    // Rebuild right site of text
+    if (m_xText_Bottom.is())
+    {
+        OUString        aCollectString  ;
+
+        // Collect all topics from list and format text.
+        // "\n" MUST BE at the end of line!!! => Else ... topic and his text are not in the same line!!!
+        for ( sal_uInt32 n=0; n<m_pTextlist_Bottom->Count(); ++n )
+        {
+            IMPL_TextlistItem* pSearchItem = m_pTextlist_Bottom->GetObject (n) ;
+            aCollectString  +=  pSearchItem->sText ;
+            aCollectString  +=  OUString::createFromAscii("\n")            ;
+        }
+        aCollectString  +=  OUString::createFromAscii("\0") ;   // It's better :-)
+
+        m_xText_Bottom->setText ( aCollectString ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  private method
+//____________________________________________________________________________________________________________
+
+void ProgressMonitor::impl_cleanMemory ()
+{
+    // Ready for multithreading
+    MutexGuard aGuard ( m_aMutex ) ;
+
+    // Delete all of lists.
+
+    sal_uInt32 nPosition ;
+
+    for ( nPosition = 0; nPosition < m_pTextlist_Top->Count () ; ++nPosition )
+    {
+        IMPL_TextlistItem* pSearchItem = m_pTextlist_Top->GetObject ( nPosition ) ;
+        delete pSearchItem ;
+    }
+    m_pTextlist_Top->Clear () ;
+    delete m_pTextlist_Top ;
+
+    for ( nPosition = 0; nPosition < m_pTextlist_Bottom->Count () ; ++nPosition )
+    {
+        IMPL_TextlistItem* pSearchItem = m_pTextlist_Bottom->GetObject ( nPosition ) ;
+        delete pSearchItem ;
+    }
+    m_pTextlist_Bottom->Clear () ;
+    delete m_pTextlist_Bottom ;
+}
+
+//____________________________________________________________________________________________________________
+//  private method
+//____________________________________________________________________________________________________________
+
+IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, sal_Bool bbeforeProgress )
+{
+    // Get right textlist for following operations.
+    IMPL_Textlist* pTextList ;
+
+    // Ready for multithreading
+    ClearableMutexGuard aGuard ( m_aMutex ) ;
+
+    if ( bbeforeProgress == sal_True )
+    {
+        pTextList = m_pTextlist_Top    ;
+    }
+    else
+    {
+        pTextList = m_pTextlist_Bottom ;
+    }
+
+    // Switch off guard.
+    aGuard.clear () ;
+
+    // Search the topic in textlist.
+    sal_uInt32  nPosition   =   0                   ;
+    sal_uInt32  nCount      =   pTextList->Count () ;
+
+    for ( nPosition = 0; nPosition < nCount ; ++nPosition )
+    {
+        IMPL_TextlistItem* pSearchItem = pTextList->GetObject ( nPosition ) ;
+
+        if ( pSearchItem->sTopic == rTopic )
+        {
+            // We have found this topic ... return a valid pointer.
+            return pSearchItem ;
+        }
+    }
+
+    // We have'nt found this topic ... return a nonvalid pointer.
+    return NULL ;
+}
+
+//____________________________________________________________________________________________________________
+//  debug methods
+//____________________________________________________________________________________________________________
+
+#ifdef DBG_UTIL
+
+// addText, updateText
+sal_Bool ProgressMonitor::impl_debug_checkParameter ( const OUString& rTopic, const OUString& rText, sal_Bool /*bbeforeProgress*/ )
+{
+    // Check "rTopic"
+    if ( &rTopic        ==  NULL    ) return sal_False ;    // NULL-pointer for reference ???!!!
+    if ( rTopic.getLength ()    <   1       ) return sal_False ;    // ""
+
+    // Check "rText"
+    if ( &rText         ==  NULL    ) return sal_False ;    // NULL-pointer for reference ???!!!
+    if ( rText.getLength () <   1       ) return sal_False ;    // ""
+
+    // "bbeforeProgress" is valid in everyway!
+
+    // Parameter OK ... return sal_True.
+    return sal_True ;
+}
+
+// removeText
+sal_Bool ProgressMonitor::impl_debug_checkParameter ( const OUString& rTopic, sal_Bool /*bbeforeProgress*/ )
+{
+    // Check "rTopic"
+    if ( &rTopic        ==  NULL    ) return sal_False ;    // NULL-pointer for reference ???!!!
+    if ( rTopic.getLength ()    <   1       ) return sal_False ;    // ""
+
+    // "bbeforeProgress" is valid in everyway!
+
+    // Parameter OK ... return sal_True.
+    return sal_True ;
+}
+
+#endif  // #ifdef DBG_UTIL
+
+}   // namespace unocontrols
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
new file mode 100644
index 000000000000..5dd5bd647017
--- /dev/null
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -0,0 +1,558 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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
+//____________________________________________________________________________________________________________
+
+#include "statusindicator.hxx"
+
+//____________________________________________________________________________________________________________
+//  includes of other projects
+//____________________________________________________________________________________________________________
+#include <com/sun/star/awt/InvalidateStyle.hpp>
+#include <com/sun/star/awt/WindowAttribute.hpp>
+#include <cppuhelper/typeprovider.hxx>
+#include <tools/debug.hxx>
+
+//____________________________________________________________________________________________________________
+//  includes of my project
+//____________________________________________________________________________________________________________
+#include "progressbar.hxx"
+
+//____________________________________________________________________________________________________________
+//  namespace
+//____________________________________________________________________________________________________________
+
+using namespace ::cppu                  ;
+using namespace ::osl                   ;
+using namespace ::rtl                   ;
+using namespace ::com::sun::star::uno   ;
+using namespace ::com::sun::star::lang  ;
+using namespace ::com::sun::star::awt   ;
+using namespace ::com::sun::star::task  ;
+
+namespace unocontrols{
+
+//____________________________________________________________________________________________________________
+//  construct/destruct
+//____________________________________________________________________________________________________________
+
+StatusIndicator::StatusIndicator( const Reference< XMultiServiceFactory >& xFactory )
+    : BaseContainerControl  ( xFactory  )
+{
+    // Its not allowed to work with member in this method (refcounter !!!)
+    // But with a HACK (++refcount) its "OK" :-(
+    ++m_refCount ;
+
+    // Create instances for fixedtext and progress ...
+    m_xText         = Reference< XFixedText >   ( xFactory->createInstance( OUString::createFromAscii( FIXEDTEXT_SERVICENAME    ) ), UNO_QUERY );
+    m_xProgressBar  = Reference< XProgressBar > ( xFactory->createInstance( OUString::createFromAscii( SERVICENAME_PROGRESSBAR  ) ), UNO_QUERY );
+    // ... cast controls to Reference< XControl > and set model ...
+    // ( ProgressBar has no model !!! )
+    Reference< XControl > xTextControl      ( m_xText       , UNO_QUERY );
+    Reference< XControl > xProgressControl  ( m_xProgressBar, UNO_QUERY );
+    xTextControl->setModel( Reference< XControlModel >( xFactory->createInstance( OUString::createFromAscii( FIXEDTEXT_MODELNAME ) ), UNO_QUERY ) );
+    // ... and add controls to basecontainercontrol!
+    addControl( OUString::createFromAscii( CONTROLNAME_TEXT         ), xTextControl     );
+    addControl( OUString::createFromAscii( CONTROLNAME_PROGRESSBAR  ), xProgressControl );
+    // FixedText make it automaticly visible by himself ... but not the progressbar !!!
+    // it must be set explicitly
+    Reference< XWindow > xProgressWindow( m_xProgressBar, UNO_QUERY );
+    xProgressWindow->setVisible( sal_True );
+    // Reset to defaults !!!
+    // (progressbar take automaticly its own defaults)
+    m_xText->setText( OUString::createFromAscii( DEFAULT_TEXT ) );
+
+    --m_refCount ;
+}
+
+StatusIndicator::~StatusIndicator()
+{
+    // Release all references
+    m_xText         = Reference< XFixedText >();
+    m_xProgressBar  = Reference< XProgressBar >();
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+Any SAL_CALL StatusIndicator::queryInterface( const Type& rType ) throw( RuntimeException )
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+    Any aReturn ;
+    Reference< XInterface > xDel = BaseContainerControl::impl_getDelegator();
+    if ( xDel.is() )
+    {
+        // If an delegator exist, forward question to his queryInterface.
+        // Delegator will ask his own queryAggregation!
+        aReturn = xDel->queryInterface( rType );
+    }
+    else
+    {
+        // If an delegator unknown, forward question to own queryAggregation.
+        aReturn = queryAggregation( rType );
+    }
+
+    return aReturn ;
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+void SAL_CALL StatusIndicator::acquire() throw()
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Forward to baseclass
+    BaseControl::acquire();
+}
+
+//____________________________________________________________________________________________________________
+//  XInterface
+//____________________________________________________________________________________________________________
+
+void SAL_CALL StatusIndicator::release() throw()
+{
+    // Attention:
+    //  Don't use mutex or guard in this method!!! Is a method of XInterface.
+
+    // Forward to baseclass
+    BaseControl::release();
+}
+
+//____________________________________________________________________________________________________________
+//  XTypeProvider
+//____________________________________________________________________________________________________________
+
+Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( 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 OTypeCollection* pTypeCollection = NULL ;
+
+    if ( pTypeCollection == NULL )
+    {
+        // Ready for multithreading; get global mutex for first call of this method only! see before
+        MutexGuard aGuard( 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 OTypeCollection aTypeCollection  (   ::getCppuType(( const Reference< XLayoutConstrains  >*)NULL )   ,
+                                                          ::getCppuType(( const Reference< XStatusIndicator >*)NULL )   ,
+                                                        BaseContainerControl::getTypes()
+                                                    );
+            // ... and set his address to static pointer!
+            pTypeCollection = &aTypeCollection ;
+        }
+    }
+
+    return pTypeCollection->getTypes();
+}
+
+//____________________________________________________________________________________________________________
+//  XAggregation
+//____________________________________________________________________________________________________________
+
+Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( RuntimeException )
+{
+    // Ask for my own supported interfaces ...
+    // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
+    Any aReturn ( ::cppu::queryInterface(   aType                                       ,
+                                               static_cast< XLayoutConstrains*  > ( this )  ,
+                                               static_cast< XStatusIndicator*   > ( this )
+                                        )
+                );
+
+    // If searched interface not supported by this class ...
+    if ( aReturn.hasValue() == sal_False )
+    {
+        // ... ask baseclasses.
+        aReturn = BaseControl::queryAggregation( aType );
+    }
+
+    return aReturn ;
+}
+
+//____________________________________________________________________________________________________________
+//  XStatusIndicator
+//____________________________________________________________________________________________________________
+
+void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+
+    // Initialize status controls with given values.
+    m_xText->setText( sText );
+    m_xProgressBar->setRange( 0, nRange );
+    // force repaint ... fixedtext has changed !
+    impl_recalcLayout ( WindowEvent(static_cast< OWeakObject* >(this),0,0,impl_getWidth(),impl_getHeight(),0,0,0,0) ) ;
+}
+
+//____________________________________________________________________________________________________________
+//  XStatusIndicator
+//____________________________________________________________________________________________________________
+
+void SAL_CALL StatusIndicator::end() throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+
+    // Clear values of status controls.
+    m_xText->setText( OUString() );
+    m_xProgressBar->setValue( 0 );
+    setVisible( sal_False );
+}
+
+//____________________________________________________________________________________________________________
+//  XStatusIndicator
+//____________________________________________________________________________________________________________
+
+void SAL_CALL StatusIndicator::setText( const OUString& sText ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+
+    // Take text on right control
+    m_xText->setText( sText );
+}
+
+//____________________________________________________________________________________________________________
+//  XStatusIndicator
+//____________________________________________________________________________________________________________
+
+void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+
+    // Take value on right control
+    m_xProgressBar->setValue( nValue );
+}
+
+//____________________________________________________________________________________________________________
+//  XStatusIndicator
+//____________________________________________________________________________________________________________
+
+void SAL_CALL StatusIndicator::reset() throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard( m_aMutex );
+
+    // Clear values of status controls.
+    // (Don't hide the window! User will reset current values ... but he will not finish using of indicator!)
+    m_xText->setText( OUString() );
+    m_xProgressBar->setValue( 0 );
+}
+
+//____________________________________________________________________________________________________________
+//  XLayoutConstrains
+//____________________________________________________________________________________________________________
+
+Size SAL_CALL StatusIndicator::getMinimumSize () throw( RuntimeException )
+{
+    return Size (DEFAULT_WIDTH, DEFAULT_HEIGHT) ;
+}
+
+//____________________________________________________________________________________________________________
+//  XLayoutConstrains
+//____________________________________________________________________________________________________________
+
+Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException )
+{
+    // Ready for multithreading
+    ClearableMutexGuard aGuard ( m_aMutex ) ;
+
+    // get information about required place of child controls
+    Reference< XLayoutConstrains >  xTextLayout ( m_xText, UNO_QUERY );
+    Size                            aTextSize   = xTextLayout->getPreferredSize();
+
+    aGuard.clear () ;
+
+    // calc preferred size of status indicator
+    sal_Int32 nWidth  = impl_getWidth()                 ;
+    sal_Int32 nHeight = (2*FREEBORDER)+aTextSize.Height ;
+
+    // norm to minimum
+    if ( nWidth<DEFAULT_WIDTH )
+    {
+        nWidth = DEFAULT_WIDTH ;
+    }
+    if ( nHeight<DEFAULT_HEIGHT )
+    {
+        nHeight = DEFAULT_HEIGHT ;
+    }
+
+    // return to caller
+    return Size ( nWidth, nHeight ) ;
+}
+
+//____________________________________________________________________________________________________________
+//  XLayoutConstrains
+//____________________________________________________________________________________________________________
+
+Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException )
+{
+    return getPreferredSize () ;
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+void SAL_CALL StatusIndicator::createPeer ( const Reference< XToolkit > & rToolkit, const Reference< XWindowPeer > & rParent    ) throw( RuntimeException )
+{
+    if( getPeer().is() == sal_False )
+    {
+        BaseContainerControl::createPeer( rToolkit, rParent );
+
+        // If user forget to call "setPosSize()", we have still a correct size.
+        // And a "MinimumSize" IS A "MinimumSize"!
+        // We change not the position of control at this point.
+        Size aDefaultSize = getMinimumSize () ;
+        setPosSize ( 0, 0, aDefaultSize.Width, aDefaultSize.Height, PosSize::SIZE ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+sal_Bool SAL_CALL StatusIndicator::setModel ( const Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException )
+{
+    // We have no model.
+    return sal_False ;
+}
+
+//____________________________________________________________________________________________________________
+//  XControl
+//____________________________________________________________________________________________________________
+
+Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw( RuntimeException )
+{
+    // We have no model.
+    // return (XControlModel*)this ;
+    return Reference< XControlModel >  () ;
+}
+
+//____________________________________________________________________________________________________________
+//  XComponent
+//____________________________________________________________________________________________________________
+
+void SAL_CALL StatusIndicator::dispose () throw( RuntimeException )
+{
+    // Ready for multithreading
+    MutexGuard aGuard ( m_aMutex ) ;
+
+    // "removeControl()" control the state of a reference
+    Reference< XControl >  xTextControl     ( m_xText       , UNO_QUERY );
+    Reference< XControl >  xProgressControl ( m_xProgressBar, UNO_QUERY );
+
+    removeControl( xTextControl     );
+    removeControl( xProgressControl );
+
+    // do'nt use "...->clear ()" or "... = XFixedText ()"
+    // when other hold a reference at this object !!!
+    xTextControl->dispose();
+    xProgressControl->dispose();
+    BaseContainerControl::dispose();
+}
+
+//____________________________________________________________________________________________________________
+//  XWindow
+//____________________________________________________________________________________________________________
+
+void SAL_CALL StatusIndicator::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw( RuntimeException )
+{
+    Rectangle   aBasePosSize = getPosSize () ;
+    BaseContainerControl::setPosSize (nX, nY, nWidth, nHeight, nFlags) ;
+
+    // if position or size changed
+    if (
+        ( nWidth  != aBasePosSize.Width ) ||
+        ( nHeight != aBasePosSize.Height)
+       )
+    {
+        // calc new layout for controls
+        impl_recalcLayout ( WindowEvent(static_cast< OWeakObject* >(this),0,0,nWidth,nHeight,0,0,0,0) ) ;
+        // clear background (!)
+        // [Childs was repainted in "recalcLayout" by setPosSize() automaticly!]
+        getPeer()->invalidate(2);
+        // and repaint the control
+        impl_paint ( 0, 0, impl_getGraphicsPeer() ) ;
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  impl but public method to register service
+//____________________________________________________________________________________________________________
+
+const Sequence< OUString > StatusIndicator::impl_getStaticSupportedServiceNames()
+{
+    MutexGuard aGuard( Mutex::getGlobalMutex() );
+    Sequence< OUString > seqServiceNames( 1 );
+    seqServiceNames.getArray() [0] = OUString::createFromAscii( SERVICENAME_STATUSINDICATOR );
+    return seqServiceNames ;
+}
+
+//____________________________________________________________________________________________________________
+//  impl but public method to register service
+//____________________________________________________________________________________________________________
+
+const OUString StatusIndicator::impl_getStaticImplementationName()
+{
+    return OUString::createFromAscii( IMPLEMENTATIONNAME_STATUSINDICATOR );
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+WindowDescriptor* StatusIndicator::impl_getWindowDescriptor( const Reference< XWindowPeer >& xParentPeer )
+{
+    // - used from "createPeer()" to set the values of an ::com::sun::star::awt::WindowDescriptor !!!
+    // - if you will change the descriptor-values, you must override this virtuell function
+    // - the caller must release the memory for this dynamical descriptor !!!
+
+    WindowDescriptor* pDescriptor = new WindowDescriptor ;
+
+    pDescriptor->Type               =   WindowClass_SIMPLE                              ;
+    pDescriptor->WindowServiceName  =   OUString::createFromAscii( "floatingwindow" )   ;
+    pDescriptor->ParentIndex        =   -1                                              ;
+    pDescriptor->Parent             =   xParentPeer                                     ;
+    pDescriptor->Bounds             =   getPosSize ()                                   ;
+
+    return pDescriptor ;
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+void StatusIndicator::impl_paint ( sal_Int32 nX, sal_Int32 nY, const Reference< XGraphics > & rGraphics )
+{
+    // This paint method ist not buffered !!
+    // Every request paint the completely control. ( but only, if peer exist )
+     if ( rGraphics.is () )
+    {
+        MutexGuard  aGuard (m_aMutex) ;
+
+        // background = gray
+        Reference< XWindowPeer > xPeer( impl_getPeerWindow(), UNO_QUERY );
+        if( xPeer.is() == sal_True )
+            xPeer->setBackground( BACKGROUNDCOLOR );
+
+        // FixedText background = gray
+        Reference< XControl > xTextControl( m_xText, UNO_QUERY );
+        xPeer = xTextControl->getPeer();
+        if( xPeer.is() == sal_True )
+            xPeer->setBackground( BACKGROUNDCOLOR );
+
+        // Progress background = gray
+        xPeer = Reference< XWindowPeer >( m_xProgressBar, UNO_QUERY );
+        if( xPeer.is() == sal_True )
+            xPeer->setBackground( BACKGROUNDCOLOR );
+
+        // paint shadow border
+        rGraphics->setLineColor ( LINECOLOR_BRIGHT                          );
+        rGraphics->drawLine     ( nX, nY, impl_getWidth(), nY               );
+        rGraphics->drawLine     ( nX, nY, nX             , impl_getHeight() );
+
+        rGraphics->setLineColor ( LINECOLOR_SHADOW                                                              );
+        rGraphics->drawLine     ( impl_getWidth()-1, impl_getHeight()-1, impl_getWidth()-1, nY                  );
+        rGraphics->drawLine     ( impl_getWidth()-1, impl_getHeight()-1, nX               , impl_getHeight()-1  );
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  protected method
+//____________________________________________________________________________________________________________
+
+void StatusIndicator::impl_recalcLayout ( const WindowEvent& aEvent )
+{
+    sal_Int32   nX_ProgressBar          ;
+    sal_Int32   nY_ProgressBar          ;
+    sal_Int32   nWidth_ProgressBar      ;
+    sal_Int32   nHeight_ProgressBar     ;
+    sal_Int32   nX_Text                 ;
+    sal_Int32   nY_Text                 ;
+    sal_Int32   nWidth_Text             ;
+    sal_Int32   nHeight_Text            ;
+
+    // Ready for multithreading
+    MutexGuard aGuard ( m_aMutex ) ;
+
+    // get information about required place of child controls
+    Size                            aWindowSize     ( aEvent.Width, aEvent.Height );
+    Reference< XLayoutConstrains >  xTextLayout     ( m_xText, UNO_QUERY );
+    Size                            aTextSize       = xTextLayout->getPreferredSize();
+
+    if( aWindowSize.Width < DEFAULT_WIDTH )
+    {
+        aWindowSize.Width = DEFAULT_WIDTH;
+    }
+    if( aWindowSize.Height < DEFAULT_HEIGHT )
+    {
+        aWindowSize.Height = DEFAULT_HEIGHT;
+    }
+
+    // calc position and size of child controls
+    nX_Text             = FREEBORDER                                    ;
+    nY_Text             = FREEBORDER                                    ;
+    nWidth_Text         = aTextSize.Width                               ;
+    nHeight_Text        = aTextSize.Height                              ;
+
+    nX_ProgressBar      = nX_Text+nWidth_Text+FREEBORDER                ;
+    nY_ProgressBar      = nY_Text                                       ;
+    nWidth_ProgressBar  = aWindowSize.Width-nWidth_Text-(3*FREEBORDER)  ;
+    nHeight_ProgressBar = nHeight_Text                                  ;
+
+    // Set new position and size on all controls
+    Reference< XWindow >  xTextWindow       ( m_xText       , UNO_QUERY );
+    Reference< XWindow >  xProgressWindow   ( m_xProgressBar, UNO_QUERY );
+
+    xTextWindow->setPosSize     ( nX_Text       , nY_Text       , nWidth_Text       , nHeight_Text          , 15 ) ;
+    xProgressWindow->setPosSize ( nX_ProgressBar, nY_ProgressBar, nWidth_ProgressBar, nHeight_ProgressBar   , 15 ) ;
+}
+
+//____________________________________________________________________________________________________________
+//  debug methods
+//____________________________________________________________________________________________________________
+
+#if OSL_DEBUG_LEVEL > 1
+
+#endif  // #if OSL_DEBUG_LEVEL > 1
+
+}   // namespace unocontrols
diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
new file mode 100644
index 000000000000..92e7e7df0fe2
--- /dev/null
+++ b/UnoControls/source/inc/OConnectionPointContainerHelper.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 _OCONNECTIONPOINTCONTAINERHELPER_HXX
+#define _OCONNECTIONPOINTCONTAINERHELPER_HXX
+
+//______________________________________________________________________________________________________________
+//  includes of other projects
+//______________________________________________________________________________________________________________
+
+#include <com/sun/star/lang/XConnectionPointContainer.hpp>
+#include <com/sun/star/lang/XConnectionPoint.hpp>
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/propshlp.hxx>
+
+//______________________________________________________________________________________________________________
+//  includes of my own project
+//______________________________________________________________________________________________________________
+
+//______________________________________________________________________________________________________________
+//  namespaces
+//______________________________________________________________________________________________________________
+
+namespace unocontrols{
+
+#define UNO3_ANY                                        ::com::sun::star::uno::Any
+#define UNO3_SEQUENCE                                   ::com::sun::star::uno::Sequence
+#define UNO3_TYPE                                       ::com::sun::star::uno::Type
+#define UNO3_REFERENCE                                  ::com::sun::star::uno::Reference
+#define UNO3_XCONNECTIONPOINTCONTAINER                  ::com::sun::star::lang::XConnectionPointContainer
+#define UNO3_XCONNECTIONPOINT                           ::com::sun::star::lang::XConnectionPoint
+#define UNO3_MUTEX                                      ::osl::Mutex
+#define UNO3_RUNTIMEEXCEPTION                           ::com::sun::star::uno::RuntimeException
+#define UNO3_XINTERFACE                                 ::com::sun::star::uno::XInterface
+#define UNO3_OMULTITYPEINTERFACECONTAINERHELPER         ::cppu::OMultiTypeInterfaceContainerHelper
+#define UNO3_LISTENEREXISTEXCEPTION                     ::com::sun::star::lang::ListenerExistException
+#define UNO3_INVALIDLISTENEREXCEPTION                   ::com::sun::star::lang::InvalidListenerException
+#define UNO3_WEAKREFERENCE                              ::com::sun::star::uno::WeakReference
+#define UNO3_OWEAKOBJECT                                ::cppu::OWeakObject
+
+//______________________________________________________________________________________________________________
+//  defines
+//______________________________________________________________________________________________________________
+
+//______________________________________________________________________________________________________________
+//  class declaration OConnectionPointContainerHelper
+//______________________________________________________________________________________________________________
+
+class OConnectionPointContainerHelper   :   public  UNO3_XCONNECTIONPOINTCONTAINER
+                                        ,   public  UNO3_OWEAKOBJECT
+{
+
+//______________________________________________________________________________________________________________
+//  public methods
+//______________________________________________________________________________________________________________
+
+public:
+
+    //__________________________________________________________________________________________________________
+    //  construct/destruct
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    OConnectionPointContainerHelper( UNO3_MUTEX& aMutex );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual ~OConnectionPointContainerHelper();
+
+    //________________________________________________________________________________________________________
+    //  XInterface
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      give answer, if interface is supported
+        @descr      The interfaces are searched by type.
+
+        @seealso    XInterface
+
+        @param      "rType" is the type of searched interface.
+
+        @return     Any     information about found interface
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      increment refcount
+        @descr      -
+
+        @seealso    XInterface
+        @seealso    release()
+
+        @param      -
+
+        @return     -
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual void SAL_CALL acquire() throw();
+
+    /**_______________________________________________________________________________________________________
+        @short      decrement refcount
+        @descr      -
+
+        @seealso    XInterface
+        @seealso    acquire()
+
+        @param      -
+
+        @return     -
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual void SAL_CALL release() throw();
+
+    //__________________________________________________________________________________________________________
+    //  XConnectionPointContainer
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getConnectionPointTypes() throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual UNO3_REFERENCE< UNO3_XCONNECTIONPOINT > SAL_CALL queryConnectionPoint( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL advise(   const   UNO3_TYPE&                          aType       ,
+                                    const   UNO3_REFERENCE< UNO3_XINTERFACE >&  xListener   ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL unadvise( const   UNO3_TYPE&                          aType       ,
+                                    const   UNO3_REFERENCE< UNO3_XINTERFACE >&  xListener   ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    UNO3_OMULTITYPEINTERFACECONTAINERHELPER& impl_getMultiTypeContainer();
+
+//______________________________________________________________________________________________________________
+//  private variables
+//______________________________________________________________________________________________________________
+
+private:
+
+    UNO3_MUTEX&                                 m_aSharedMutex          ;
+    UNO3_OMULTITYPEINTERFACECONTAINERHELPER     m_aMultiTypeContainer   ;   // Container to hold listener
+
+};  // class OConnectionPointContainerHelper
+
+}   // namespace unocontrols
+
+#endif  // #ifndef _OCONNECTIONPOINTCONTAINERHELPER_HXX
diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx
new file mode 100644
index 000000000000..0856db8027f4
--- /dev/null
+++ b/UnoControls/source/inc/OConnectionPointHelper.hxx
@@ -0,0 +1,306 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _OCONNECTIONPOINTHELPER_HXX
+#define _OCONNECTIONPOINTHELPER_HXX
+
+//______________________________________________________________________________________________________________
+//  includes of other projects
+//______________________________________________________________________________________________________________
+
+#include <com/sun/star/lang/XConnectionPointContainer.hpp>
+#include <com/sun/star/lang/XConnectionPoint.hpp>
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/propshlp.hxx>
+
+//______________________________________________________________________________________________________________
+//  includes of my own project
+//______________________________________________________________________________________________________________
+#include "OConnectionPointContainerHelper.hxx"
+
+//______________________________________________________________________________________________________________
+//  namespaces
+//______________________________________________________________________________________________________________
+
+namespace unocontrols{
+
+#define UNO3_ANY                                        ::com::sun::star::uno::Any
+#define UNO3_SEQUENCE                                   ::com::sun::star::uno::Sequence
+#define UNO3_TYPE                                       ::com::sun::star::uno::Type
+#define UNO3_REFERENCE                                  ::com::sun::star::uno::Reference
+#define UNO3_XCONNECTIONPOINTCONTAINER                  ::com::sun::star::lang::XConnectionPointContainer
+#define UNO3_XCONNECTIONPOINT                           ::com::sun::star::lang::XConnectionPoint
+#define UNO3_MUTEX                                      ::osl::Mutex
+#define UNO3_RUNTIMEEXCEPTION                           ::com::sun::star::uno::RuntimeException
+#define UNO3_XINTERFACE                                 ::com::sun::star::uno::XInterface
+#define UNO3_OMULTITYPEINTERFACECONTAINERHELPER         ::cppu::OMultiTypeInterfaceContainerHelper
+#define UNO3_LISTENEREXISTEXCEPTION                     ::com::sun::star::lang::ListenerExistException
+#define UNO3_INVALIDLISTENEREXCEPTION                   ::com::sun::star::lang::InvalidListenerException
+#define UNO3_WEAKREFERENCE                              ::com::sun::star::uno::WeakReference
+#define UNO3_OWEAKOBJECT                                ::cppu::OWeakObject
+#define UNO3_OCONNECTIONPOINTCONTAINERHELPER            OConnectionPointContainerHelper
+
+//______________________________________________________________________________________________________________
+//  defines
+//______________________________________________________________________________________________________________
+
+//______________________________________________________________________________________________________________
+//  class declaration OConnectionPointHelper
+//______________________________________________________________________________________________________________
+
+class OConnectionPointHelper    :   public  UNO3_XCONNECTIONPOINT
+                                ,   public  UNO3_OWEAKOBJECT
+{
+
+//______________________________________________________________________________________________________________
+//  public methods
+//______________________________________________________________________________________________________________
+
+public:
+
+    //__________________________________________________________________________________________________________
+    //  construct/destruct
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    OConnectionPointHelper( UNO3_MUTEX&                             aMutex                      ,
+                            UNO3_OCONNECTIONPOINTCONTAINERHELPER*   pContainerImplementation    ,
+                            UNO3_TYPE                               aType                       );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual ~OConnectionPointHelper();
+
+    //________________________________________________________________________________________________________
+    //  XInterface
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      give answer, if interface is supported
+        @descr      The interfaces are searched by type.
+
+        @seealso    XInterface
+
+        @param      "rType" is the type of searched interface.
+
+        @return     Any     information about found interface
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      increment refcount
+        @descr      -
+
+        @seealso    XInterface
+        @seealso    release()
+
+        @param      -
+
+        @return     -
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual void SAL_CALL acquire() throw();
+
+    /**_______________________________________________________________________________________________________
+        @short      decrement refcount
+        @descr      -
+
+        @seealso    XInterface
+        @seealso    acquire()
+
+        @param      -
+
+        @return     -
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual void SAL_CALL release() throw();
+
+    //__________________________________________________________________________________________________________
+    //  XConnectionPoint
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual UNO3_TYPE SAL_CALL getConnectionType() throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual UNO3_REFERENCE< UNO3_XCONNECTIONPOINTCONTAINER > SAL_CALL getConnectionPointContainer() throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL advise( const UNO3_REFERENCE< UNO3_XINTERFACE >& xListener ) throw(   UNO3_LISTENEREXISTEXCEPTION     ,
+                                                                                                UNO3_INVALIDLISTENEREXCEPTION   ,
+                                                                                                UNO3_RUNTIMEEXCEPTION           );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL unadvise( const UNO3_REFERENCE< UNO3_XINTERFACE >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual UNO3_SEQUENCE< UNO3_REFERENCE< UNO3_XINTERFACE > > SAL_CALL getConnections() throw( UNO3_RUNTIMEEXCEPTION );
+
+//______________________________________________________________________________________________________________
+//  private methods
+//______________________________________________________________________________________________________________
+
+private:
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    sal_Bool impl_LockContainer();
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    void impl_UnlockContainer();
+
+//______________________________________________________________________________________________________________
+//  private variables
+//______________________________________________________________________________________________________________
+
+private:
+
+    UNO3_MUTEX&                                             m_aSharedMutex              ;
+    UNO3_WEAKREFERENCE< UNO3_XCONNECTIONPOINTCONTAINER >    m_oContainerWeakReference   ;   // Reference to container-class!. Don't use Reference<...>
+                                                                                            // It is a ring-reference => and must be a wekreference!
+    UNO3_OCONNECTIONPOINTCONTAINERHELPER*                   m_pContainerImplementation  ;
+    UNO3_TYPE                                               m_aInterfaceType            ;
+    UNO3_REFERENCE< UNO3_XINTERFACE >                       m_xLock                     ;
+
+};  // class OConnectionPointHelper
+
+}   // namespace unocontrols
+
+#endif  // #ifndef _OCONNECTIONPOINTHELPER_HXX
diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx
new file mode 100644
index 000000000000..4ec2683e1ba6
--- /dev/null
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -0,0 +1,624 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
+#define _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
+
+//______________________________________________________________________________________________________________
+//  includes of other projects
+//______________________________________________________________________________________________________________
+
+#include <com/sun/star/frame/XFrameActionListener.hpp>
+#include <com/sun/star/frame/XComponentLoader.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/FrameActionEvent.hpp>
+#include <com/sun/star/frame/FrameAction.hpp>
+#include <com/sun/star/lang/XServiceName.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XConnectionPointContainer.hpp>
+#include <cppuhelper/propshlp.hxx>
+
+//______________________________________________________________________________________________________________
+//  includes of my own project
+//______________________________________________________________________________________________________________
+#include "basecontrol.hxx"
+#include "OConnectionPointContainerHelper.hxx"
+
+//______________________________________________________________________________________________________________
+//  namespaces
+//______________________________________________________________________________________________________________
+
+namespace unocontrols{
+
+#define UNO3_ANY                                        ::com::sun::star::uno::Any
+#define UNO3_ILLEGALARGUMENTEXCEPTION                   ::com::sun::star::lang::IllegalArgumentException
+#define UNO3_IPROPERTYARRAYHELPER                       ::cppu::IPropertyArrayHelper
+#define UNO3_OBROADCASTHELPER                           ::cppu::OBroadcastHelper
+#define UNO3_OCONNECTIONPOINTCONTAINERHELPER            OConnectionPointContainerHelper
+#define UNO3_OMULTITYPEINTERFACECONTAINERHELPER         ::cppu::OMultiTypeInterfaceContainerHelper
+#define UNO3_OPROPERTYSETHELPER                         ::cppu::OPropertySetHelper
+#define UNO3_OUSTRING                                   ::rtl::OUString
+#define UNO3_PROPERTY                                   ::com::sun::star::beans::Property
+#define UNO3_PROPERTYVALUE                              ::com::sun::star::beans::PropertyValue
+#define UNO3_REFERENCE                                  ::com::sun::star::uno::Reference
+#define UNO3_RUNTIMEEXCEPTION                           ::com::sun::star::uno::RuntimeException
+#define UNO3_SEQUENCE                                   ::com::sun::star::uno::Sequence
+#define UNO3_TYPE                                       ::com::sun::star::uno::Type
+#define UNO3_WINDOWDESCRIPTOR                           ::com::sun::star::awt::WindowDescriptor
+#define UNO3_XCONNECTIONPOINT                           ::com::sun::star::lang::XConnectionPoint
+#define UNO3_XCONNECTIONPOINTCONTAINER                  ::com::sun::star::lang::XConnectionPointContainer
+#define UNO3_XCONTROLMODEL                              ::com::sun::star::awt::XControlModel
+#define UNO3_XFRAME                                     ::com::sun::star::frame::XFrame
+#define UNO3_XGRAPHICS                                  ::com::sun::star::awt::XGraphics
+#define UNO3_XINTERFACE                                 ::com::sun::star::uno::XInterface
+#define UNO3_XMULTISERVICEFACTORY                       ::com::sun::star::lang::XMultiServiceFactory
+#define UNO3_XPROPERTYSETINFO                           ::com::sun::star::beans::XPropertySetInfo
+#define UNO3_XTOOLKIT                                   ::com::sun::star::awt::XToolkit
+#define UNO3_XWINDOWPEER                                ::com::sun::star::awt::XWindowPeer
+
+//______________________________________________________________________________________________________________
+//  defines
+//______________________________________________________________________________________________________________
+
+#define SERVICENAME_FRAMECONTROL                        "com.sun.star.frame.FrameControl"
+#define IMPLEMENTATIONNAME_FRAMECONTROL                 "stardiv.UnoControls.FrameControl"
+#define PROPERTYNAME_LOADERARGUMENTS                    "LoaderArguments"
+#define PROPERTYNAME_COMPONENTURL                       "ComponentURL"
+#define PROPERTYNAME_FRAME                              "Frame"
+#define ERRORTEXT_VOSENSHURE                            "This is an invalid property handle."
+#define PROPERTY_COUNT                                  3                                                       // you must count the propertys
+#define PROPERTYHANDLE_COMPONENTURL                     0                                                       // Id must be the index into the array
+#define PROPERTYHANDLE_FRAME                            1
+#define PROPERTYHANDLE_LOADERARGUMENTS                  2
+
+//______________________________________________________________________________________________________________
+//  class
+//______________________________________________________________________________________________________________
+
+class FrameControl  : public UNO3_XCONTROLMODEL
+                    , public UNO3_XCONNECTIONPOINTCONTAINER
+                    , public BaseControl                                // This order is neccessary for right initialization of m_aMutex!
+                    , public UNO3_OBROADCASTHELPER
+                    , public UNO3_OPROPERTYSETHELPER
+{
+
+//______________________________________________________________________________________________________________
+//  public methods
+//______________________________________________________________________________________________________________
+
+public:
+
+    //__________________________________________________________________________________________________________
+    //  construct/destruct
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    FrameControl( const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >& xFactory );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual ~FrameControl();
+
+    //__________________________________________________________________________________________________________
+    //  XInterface
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      increment refcount
+        @descr      -
+
+        @seealso    XInterface
+        @seealso    release()
+
+        @param      -
+
+        @return     -
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual void SAL_CALL acquire() throw();
+
+    /**_______________________________________________________________________________________________________
+        @short      decrement refcount
+        @descr      -
+
+        @seealso    XInterface
+        @seealso    acquire()
+
+        @param      -
+
+        @return     -
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual void SAL_CALL release() throw();
+
+    //__________________________________________________________________________________________________________
+    //  XTypeProvider
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //__________________________________________________________________________________________________________
+    //  XAggregation
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    //__________________________________________________________________________________________________________
+    //  XControl
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL createPeer(   const   UNO3_REFERENCE< UNO3_XTOOLKIT >&    xToolkit    ,
+                                        const   UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParent     ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //__________________________________________________________________________________________________________
+    //  XComponent
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL dispose() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //__________________________________________________________________________________________________________
+    //  XView
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual sal_Bool SAL_CALL setGraphics( const UNO3_REFERENCE< UNO3_XGRAPHICS >& xDevice ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual UNO3_REFERENCE< UNO3_XGRAPHICS > SAL_CALL getGraphics() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //__________________________________________________________________________________________________________
+    //  XConnectionPointContainer
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getConnectionPointTypes() throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual UNO3_REFERENCE< UNO3_XCONNECTIONPOINT > SAL_CALL queryConnectionPoint( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL advise(   const   UNO3_TYPE&                          aType       ,
+                                    const   UNO3_REFERENCE< UNO3_XINTERFACE >&  xListener   ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL unadvise( const   UNO3_TYPE&                          aType       ,
+                                    const   UNO3_REFERENCE< UNO3_XINTERFACE >&  xListener   ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    //__________________________________________________________________________________________________________
+    //  impl but public methods to register service!
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    static const UNO3_SEQUENCE< UNO3_OUSTRING > impl_getStaticSupportedServiceNames();
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    static const UNO3_OUSTRING impl_getStaticImplementationName();
+
+//______________________________________________________________________________________________________________
+//  protected methods
+//______________________________________________________________________________________________________________
+
+protected:
+    using OPropertySetHelper::getFastPropertyValue;
+    //__________________________________________________________________________________________________________
+    //  OPropertySetHelper
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual sal_Bool SAL_CALL convertFastPropertyValue(         UNO3_ANY&   rConvertedValue ,
+                                                                UNO3_ANY&   rOldValue       ,
+                                                                sal_Int32   nHandle         ,
+                                                        const   UNO3_ANY&   rValue          ) throw( UNO3_ILLEGALARGUMENTEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(         sal_Int32   nHandle ,
+                                                              const UNO3_ANY&   rValue  ) throw ( ::com::sun::star::uno::Exception );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL getFastPropertyValue( UNO3_ANY&   rValue  ,
+                                                  sal_Int32 nHandle ) const ;
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual UNO3_IPROPERTYARRAYHELPER& SAL_CALL getInfoHelper();
+
+    //__________________________________________________________________________________________________________
+    //  XPropertySet
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    UNO3_REFERENCE< UNO3_XPROPERTYSETINFO > SAL_CALL getPropertySetInfo() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //__________________________________________________________________________________________________________
+    //  BaseControl
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual UNO3_WINDOWDESCRIPTOR* impl_getWindowDescriptor( const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParentPeer );
+
+//______________________________________________________________________________________________________________
+//  private methods
+//______________________________________________________________________________________________________________
+
+private:
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    void impl_createFrame(  const   UNO3_REFERENCE< UNO3_XWINDOWPEER >&     xPeer           ,
+                            const   UNO3_OUSTRING&                          sURL            ,
+                            const   UNO3_SEQUENCE< UNO3_PROPERTYVALUE >&    seqArguments    );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    void impl_deleteFrame();
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    static const UNO3_SEQUENCE< UNO3_PROPERTY > impl_getStaticPropertyDescriptor();
+
+
+//______________________________________________________________________________________________________________
+//  private variables
+//______________________________________________________________________________________________________________
+
+private:
+
+    UNO3_REFERENCE< UNO3_XFRAME >               m_xFrame                    ;
+    UNO3_OUSTRING                               m_sComponentURL             ;
+    UNO3_SEQUENCE< UNO3_PROPERTYVALUE >         m_seqLoaderArguments        ;
+    UNO3_OMULTITYPEINTERFACECONTAINERHELPER     m_aInterfaceContainer       ;
+    UNO3_OCONNECTIONPOINTCONTAINERHELPER        m_aConnectionPointContainer ;
+
+};  // class FrameControl
+
+}   // namespace unocontrols
+
+#endif  // #ifndef _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx
new file mode 100644
index 000000000000..743d0568f879
--- /dev/null
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -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.
+ *
+ ************************************************************************/
+
+#ifndef _UNOCONTROLS_PROGRESSBAR_CTRL_HXX
+#define _UNOCONTROLS_PROGRESSBAR_CTRL_HXX
+
+//____________________________________________________________________________________________________________
+//  includes of other projects
+//____________________________________________________________________________________________________________
+
+#include <com/sun/star/lang/XServiceName.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+
+//____________________________________________________________________________________________________________
+//  includes of my own project
+//____________________________________________________________________________________________________________
+#include "basecontrol.hxx"
+
+//____________________________________________________________________________________________________________
+//  namespaces
+//____________________________________________________________________________________________________________
+
+namespace unocontrols{
+
+#define UNO3_REFERENCE                  ::com::sun::star::uno::Reference
+#define UNO3_XMULTISERVICEFACTORY       ::com::sun::star::lang::XMultiServiceFactory
+#define UNO3_RUNTIMEEXCEPTION           ::com::sun::star::uno::RuntimeException
+#define UNO3_XCONTROLMODEL              ::com::sun::star::awt::XControlModel
+#define UNO3_XPROGRESSBAR               ::com::sun::star::awt::XProgressBar
+#define UNO3_ANY                        ::com::sun::star::uno::Any
+#define UNO3_TYPE                       ::com::sun::star::uno::Type
+#define UNO3_SEQUENCE                   ::com::sun::star::uno::Sequence
+#define UNO3_XGRAPHICS                  ::com::sun::star::awt::XGraphics
+#define UNO3_OUSTRING                   ::rtl::OUString
+#define UNO3_SIZE                       ::com::sun::star::awt::Size
+
+//____________________________________________________________________________________________________________
+//  defines
+//____________________________________________________________________________________________________________
+
+#define SERVICENAME_PROGRESSBAR             "com.sun.star.awt.XProgressBar"
+#define IMPLEMENTATIONNAME_PROGRESSBAR      "stardiv.UnoControls.ProgressBar"
+#define FREESPACE                           4
+#define DEFAULT_HORIZONTAL                  sal_True
+#define DEFAULT_BLOCKDIMENSION              Size(1,1)
+#define DEFAULT_BACKGROUNDCOLOR             TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )    // lightgray
+#define DEFAULT_FOREGROUNDCOLOR             TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x80 )    // blue
+#define DEFAULT_MINRANGE                    INT_MIN
+#define DEFAULT_MAXRANGE                    INT_MAX
+#define DEFAULT_BLOCKVALUE                  1
+#define DEFAULT_VALUE                       DEFAULT_MINRANGE
+#define LINECOLOR_BRIGHT                    TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )    // white
+#define LINECOLOR_SHADOW                    TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )    // black
+
+//____________________________________________________________________________________________________________
+//  classes
+//____________________________________________________________________________________________________________
+
+class ProgressBar   : public UNO3_XCONTROLMODEL
+                    , public UNO3_XPROGRESSBAR
+                    , public BaseControl
+{
+
+//____________________________________________________________________________________________________________
+//  public methods
+//____________________________________________________________________________________________________________
+
+public:
+
+    //________________________________________________________________________________________________________
+    //  construct/destruct
+    //________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    ProgressBar( const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >& xFactory );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual ~ProgressBar();
+
+    //__________________________________________________________________________________________________________
+    //  XInterface
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      increment refcount
+        @descr      -
+
+        @seealso    XInterface
+        @seealso    release()
+
+        @param      -
+
+        @return     -
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual void SAL_CALL acquire() throw();
+
+    /**_______________________________________________________________________________________________________
+        @short      decrement refcount
+        @descr      -
+
+        @seealso    XInterface
+        @seealso    acquire()
+
+        @param      -
+
+        @return     -
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual void SAL_CALL release() throw();
+
+    //__________________________________________________________________________________________________________
+    //  XTypeProvider
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //__________________________________________________________________________________________________________
+    //  XAggregation
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XProgressBar
+    //________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL setRange( sal_Int32   nMin    ,
+                                    sal_Int32   nMax    ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual sal_Int32 SAL_CALL getValue() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //__________________________________________________________________________________________________________
+    //  XWindow
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL setPosSize(   sal_Int32   nX      ,
+                                        sal_Int32   nY      ,
+                                        sal_Int32   nWidth  ,
+                                        sal_Int32   nHeight ,
+                                        sal_Int16   nFlags  ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    //__________________________________________________________________________________________________________
+    //  XControl
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //__________________________________________________________________________________________________________
+    //  BaseControl
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    static const UNO3_SEQUENCE< UNO3_OUSTRING > impl_getStaticSupportedServiceNames();
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    static const UNO3_OUSTRING impl_getStaticImplementationName();
+
+//____________________________________________________________________________________________________________
+//  protected methods
+//____________________________________________________________________________________________________________
+
+protected:
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void impl_paint(        sal_Int32                           nX          ,
+                                    sal_Int32                           nY          ,
+                            const   UNO3_REFERENCE< UNO3_XGRAPHICS >&   xGraphics   );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    void impl_recalcRange();
+
+//____________________________________________________________________________________________________________
+//  private variables
+//____________________________________________________________________________________________________________
+
+private:
+
+    sal_Bool    m_bHorizontal       ;   // orientation for steps            [true=horizontal/false=vertikal]
+    UNO3_SIZE   m_aBlockSize        ;   // width and height of a block      [>=0,0]
+    sal_Int32   m_nForegroundColor  ;   //                                  (alpha,r,g,b)
+    sal_Int32   m_nBackgroundColor  ;   //                                  (alpha,r,g,b)
+    sal_Int32   m_nMinRange         ;   // lowest value  =   0%             [long, <_nMaxRange]
+    sal_Int32   m_nMaxRange         ;   // highest value = 100%             [long, >_nMinRange]
+    double      m_nBlockValue       ;   // value for one block              [long, >0]
+    sal_Int32   m_nValue            ;   // value for progress               [long]
+
+};  // class ProgressBar
+
+}   // namespace unocontrols
+
+#endif  // #ifndef _UNOCONTROLS_PROGRESSBAR_CTRL_HXX
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
new file mode 100644
index 000000000000..dfb6a1ae9fb9
--- /dev/null
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -0,0 +1,805 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX
+#define _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX
+
+//____________________________________________________________________________________________________________
+//  includes of other projects
+//____________________________________________________________________________________________________________
+
+#include <com/sun/star/awt/XFileDialog.hpp>
+#include <com/sun/star/awt/XTextComponent.hpp>
+#include <com/sun/star/awt/XListBox.hpp>
+#include <com/sun/star/awt/XProgressMonitor.hpp>
+#include <com/sun/star/awt/TextAlign.hpp>
+#include <com/sun/star/awt/XScrollBar.hpp>
+#include <com/sun/star/awt/XVclContainerPeer.hpp>
+#include <com/sun/star/awt/XTabControllerModel.hpp>
+#include <com/sun/star/awt/XMessageBox.hpp>
+#include <com/sun/star/awt/XTextEditField.hpp>
+#include <com/sun/star/awt/Style.hpp>
+#include <com/sun/star/awt/XTimeField.hpp>
+#include <com/sun/star/awt/XVclWindowPeer.hpp>
+#include <com/sun/star/awt/XControlModel.hpp>
+#include <com/sun/star/awt/XSpinField.hpp>
+#include <com/sun/star/awt/XUnoControlContainer.hpp>
+#include <com/sun/star/awt/XTextLayoutConstrains.hpp>
+#include <com/sun/star/awt/XNumericField.hpp>
+#include <com/sun/star/awt/XButton.hpp>
+#include <com/sun/star/awt/XTextArea.hpp>
+#include <com/sun/star/awt/XImageButton.hpp>
+#include <com/sun/star/awt/XFixedText.hpp>
+#include <com/sun/star/awt/XControlContainer.hpp>
+#include <com/sun/star/awt/XDialog.hpp>
+#include <com/sun/star/awt/ScrollBarOrientation.hpp>
+#include <com/sun/star/awt/XRadioButton.hpp>
+#include <com/sun/star/awt/XCurrencyField.hpp>
+#include <com/sun/star/awt/XPatternField.hpp>
+#include <com/sun/star/awt/VclWindowPeerAttribute.hpp>
+#include <com/sun/star/awt/XTabController.hpp>
+#include <com/sun/star/awt/XVclContainer.hpp>
+#include <com/sun/star/awt/XDateField.hpp>
+#include <com/sun/star/awt/XComboBox.hpp>
+#include <com/sun/star/awt/XControl.hpp>
+#include <com/sun/star/awt/XCheckBox.hpp>
+#include <com/sun/star/awt/MessageBoxCommand.hpp>
+#include <com/sun/star/awt/XLayoutConstrains.hpp>
+#include <com/sun/star/awt/XProgressBar.hpp>
+
+//____________________________________________________________________________________________________________
+//  includes of my own project
+//____________________________________________________________________________________________________________
+#include "basecontainercontrol.hxx"
+
+//____________________________________________________________________________________________________________
+//  namespace
+//____________________________________________________________________________________________________________
+
+namespace unocontrols{
+
+#define UNO3_ANY                                        ::com::sun::star::uno::Any
+#define UNO3_OUSTRING                                   ::rtl::OUString
+#define UNO3_RECTANGLE                                  ::com::sun::star::awt::Rectangle
+#define UNO3_REFERENCE                                  ::com::sun::star::uno::Reference
+#define UNO3_RUNTIMEEXCEPTION                           ::com::sun::star::uno::RuntimeException
+#define UNO3_SEQUENCE                                   ::com::sun::star::uno::Sequence
+#define UNO3_SIZE                                       ::com::sun::star::awt::Size
+#define UNO3_TYPE                                       ::com::sun::star::uno::Type
+#define UNO3_XACTIONLISTENER                            ::com::sun::star::awt::XActionListener
+#define UNO3_XBUTTON                                    ::com::sun::star::awt::XButton
+#define UNO3_XCONTROLMODEL                              ::com::sun::star::awt::XControlModel
+#define UNO3_XFIXEDTEXT                                 ::com::sun::star::awt::XFixedText
+#define UNO3_XGRAPHICS                                  ::com::sun::star::awt::XGraphics
+#define UNO3_XLAYOUTCONSTRAINS                          ::com::sun::star::awt::XLayoutConstrains
+#define UNO3_XMULTISERVICEFACTORY                       ::com::sun::star::lang::XMultiServiceFactory
+#define UNO3_XPROGRESSBAR                               ::com::sun::star::awt::XProgressBar
+#define UNO3_XPROGRESSMONITOR                           ::com::sun::star::awt::XProgressMonitor
+#define UNO3_XTOOLKIT                                   ::com::sun::star::awt::XToolkit
+#define UNO3_XWINDOWPEER                                ::com::sun::star::awt::XWindowPeer
+
+//____________________________________________________________________________________________________________
+//  defines
+//____________________________________________________________________________________________________________
+
+#define SERVICENAME_PROGRESSMONITOR                     "com.sun.star.awt.XProgressMonitor"
+#define IMPLEMENTATIONNAME_PROGRESSMONITOR              "stardiv.UnoControls.ProgressMonitor"
+#define FREEBORDER                                      10                                                      // border around and between the controls
+#define WIDTH_RELATION                                  4                                                       // reserve 1/4 for button width and rest for progressbar width
+#define HEIGHT_RELATION                                 5                                                       // reserve 1/5 for button and progressbar heigth and rest for text height
+#define FIXEDTEXT_SERVICENAME                           "com.sun.star.awt.UnoControlFixedText"
+#define BUTTON_SERVICENAME                              "com.sun.star.awt.UnoControlButton"
+#define FIXEDTEXT_MODELNAME                             "com.sun.star.awt.UnoControlFixedTextModel"
+#define BUTTON_MODELNAME                                "com.sun.star.awt.UnoControlButtonModel"
+#define CONTROLNAME_TEXT                                "Text"                                                  // identifier the control in container
+#define CONTROLNAME_BUTTON                              "Button"                                                //              -||-
+#define CONTROLNAME_PROGRESSBAR                         "ProgressBar"                                           //              -||-
+#define DEFAULT_BUTTONLABEL                             "Abbrechen"
+#define DEFAULT_TOPIC                                   "\0"
+#define DEFAULT_TEXT                                    "\0"
+#define BACKGROUNDCOLOR                                 TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )                // lighgray
+#define LINECOLOR_BRIGHT                                TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )                // white
+#define LINECOLOR_SHADOW                                TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )                // black
+#define HEIGHT_PROGRESSBAR                              15
+// Overwrite defines from basecontrol.hxx!!!
+#undef  DEFAULT_WIDTH
+#undef  DEFAULT_HEIGHT
+#define DEFAULT_WIDTH                                   350
+#define DEFAULT_HEIGHT                                  100
+
+//____________________________________________________________________________________________________________
+//  structs, types
+//____________________________________________________________________________________________________________
+
+/// Item of TextList
+struct IMPL_TextlistItem
+{
+    UNO3_OUSTRING   sTopic  ;   /// Left site of textline in dialog
+    UNO3_OUSTRING   sText   ;   /// Right site of textline in dialog
+};
+
+/// Define a list-class for struct IMPL_TextlistItem
+class IMPL_Textlist ;
+DECLARE_LIST( IMPL_Textlist, IMPL_TextlistItem* )
+
+//____________________________________________________________________________________________________________
+//  class declaration
+//____________________________________________________________________________________________________________
+
+class ProgressMonitor   : public UNO3_XLAYOUTCONSTRAINS
+                        , public UNO3_XBUTTON
+                        , public UNO3_XPROGRESSMONITOR
+                        , public BaseContainerControl
+{
+
+//____________________________________________________________________________________________________________
+//  public methods
+//____________________________________________________________________________________________________________
+
+public:
+
+    //________________________________________________________________________________________________________
+    //  construct/destruct
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    ProgressMonitor( const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >& xFactory );
+
+    /**_______________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual ~ProgressMonitor();
+
+    //________________________________________________________________________________________________________
+    //  XInterface
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      give answer, if interface is supported
+        @descr      The interfaces are searched by type.
+
+        @seealso    XInterface
+
+        @param      "rType" is the type of searched interface.
+
+        @return     Any     information about found interface
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      increment refcount
+        @descr      -
+
+        @seealso    XInterface
+        @seealso    release()
+
+        @param      -
+
+        @return     -
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual void SAL_CALL acquire() throw();
+
+    /**_______________________________________________________________________________________________________
+        @short      decrement refcount
+        @descr      -
+
+        @seealso    XInterface
+        @seealso    acquire()
+
+        @param      -
+
+        @return     -
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual void SAL_CALL release() throw();
+
+    //________________________________________________________________________________________________________
+    //  XTypeProvider
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      get information about supported interfaces
+        @descr      -
+
+        @seealso    XTypeProvider
+
+        @param      -
+
+        @return     Sequence of types of all supported interfaces
+
+        @onerror    A RuntimeException is thrown.
+    */
+
+    virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XAggregation
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XProgressMonitor
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      add topic to dialog
+        @descr      Add a topic with a text in right textlist (used for FixedText-member).<BR>
+                    ( "beforeProgress" fix the right list ). The dialog metric is recalculated.
+
+        @seealso    removeText(), updateText()
+
+        @param      sTopic              Name of topic<BR>
+                                         [sTopic != "" && sTopic != NULL]
+        @param      sText               Value of topic<BR>
+                                         [sText != "" && sText != NULL]
+        @param      bbeforeProgress     Position of topic<BR>
+                                         [True => before progressbar / False => below progressbar]
+
+        @return     -
+
+        @onerror    DEBUG   = Assertion<BR>
+                    RELEASE = nothing
+    */
+
+    virtual void SAL_CALL addText(  const   UNO3_OUSTRING&  sTopic          ,
+                                    const   UNO3_OUSTRING&  sText           ,
+                                            sal_Bool        bbeforeProgress ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeText(   const   UNO3_OUSTRING&  sTopic          ,
+                                                sal_Bool        bbeforeProgress ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL updateText(   const   UNO3_OUSTRING&  sTopic          ,
+                                        const   UNO3_OUSTRING&  sText           ,
+                                                sal_Bool        bbeforeProgress ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XProgressBar
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setRange( sal_Int32   nMin    ,
+                                    sal_Int32   nMax    ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual sal_Int32 SAL_CALL getValue() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XButton
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addActionListener( const UNO3_REFERENCE< UNO3_XACTIONLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeActionListener( const UNO3_REFERENCE< UNO3_XACTIONLISTENER >& xListener ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setLabel( const UNO3_OUSTRING& sLabel ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setActionCommand( const UNO3_OUSTRING& sCommand ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XLayoutConstrains
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_SIZE SAL_CALL getMinimumSize() throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_SIZE SAL_CALL getPreferredSize() throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_SIZE SAL_CALL calcAdjustedSize( const UNO3_SIZE& aNewSize ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XControl
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL createPeer(   const   UNO3_REFERENCE< UNO3_XTOOLKIT >&    xToolkit    ,
+                                        const   UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParent     ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XComponent
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL dispose() throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  XWindow
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setPosSize(   sal_Int32   nX      ,
+                                        sal_Int32   nY      ,
+                                        sal_Int32   nWidth  ,
+                                        sal_Int32   nHeight ,
+                                        sal_Int16   nFlags  ) throw( UNO3_RUNTIMEEXCEPTION );
+
+    //________________________________________________________________________________________________________
+    //  BaseControl
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    static const UNO3_SEQUENCE< UNO3_OUSTRING > impl_getStaticSupportedServiceNames();
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    static const UNO3_OUSTRING impl_getStaticImplementationName();
+
+//____________________________________________________________________________________________________________
+//  protected methods
+//____________________________________________________________________________________________________________
+
+protected:
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void impl_paint(        sal_Int32                           nX          ,
+                                    sal_Int32                           nY          ,
+                            const   UNO3_REFERENCE< UNO3_XGRAPHICS >&   xGraphics   );
+
+//____________________________________________________________________________________________________________
+// private methods
+//____________________________________________________________________________________________________________
+
+private:
+    using BaseControl::impl_recalcLayout;
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    void impl_recalcLayout();
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    void impl_rebuildFixedText();
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    void impl_cleanMemory();
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    IMPL_TextlistItem* impl_searchTopic(    const   UNO3_OUSTRING&  sTopic          ,
+                                                     sal_Bool       bbeforeProgress );
+
+//____________________________________________________________________________________________________________
+// debug methods
+//____________________________________________________________________________________________________________
+
+private:
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    #ifdef DBG_UTIL
+
+    sal_Bool impl_debug_checkParameter( const UNO3_OUSTRING& sTopic, const UNO3_OUSTRING& sText, sal_Bool bbeforeProgress );    // addText, updateText
+    sal_Bool impl_debug_checkParameter( const UNO3_OUSTRING& rTopic, sal_Bool bbeforeProgress );                                // removeText
+
+    #endif
+//____________________________________________________________________________________________________________
+// private variables
+//____________________________________________________________________________________________________________
+
+private:
+
+    IMPL_Textlist*                          m_pTextlist_Top         ;   // Elements before progress
+    UNO3_REFERENCE< UNO3_XFIXEDTEXT >       m_xTopic_Top            ;   // (used, if parameter "beforeProgress"=sal_True in "addText, updateText, removeText")
+    UNO3_REFERENCE< UNO3_XFIXEDTEXT >       m_xText_Top             ;
+
+    IMPL_Textlist*                          m_pTextlist_Bottom      ;   // Elements below of progress
+    UNO3_REFERENCE< UNO3_XFIXEDTEXT >       m_xTopic_Bottom         ;   // (used, if parameter "beforeProgress"=sal_False in "addText, updateText, removeText")
+    UNO3_REFERENCE< UNO3_XFIXEDTEXT >       m_xText_Bottom          ;
+
+    UNO3_REFERENCE< UNO3_XPROGRESSBAR >     m_xProgressBar          ;
+    UNO3_REFERENCE< UNO3_XBUTTON >          m_xButton               ;
+    UNO3_RECTANGLE                          m_a3DLine               ;
+
+};  // class ProgressMonitor
+
+}   // namespace unocontrols
+
+#endif  // #ifndef _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX
diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx
new file mode 100644
index 000000000000..3ea07a4e0d0b
--- /dev/null
+++ b/UnoControls/source/inc/statusindicator.hxx
@@ -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.
+ *
+ ************************************************************************/
+
+#ifndef _UNOCONTROLS_STATUSINDICATOR_CTRL_HXX
+#define _UNOCONTROLS_STATUSINDICATOR_CTRL_HXX
+
+//____________________________________________________________________________________________________________
+//  includes of other projects
+//____________________________________________________________________________________________________________
+
+#include <com/sun/star/awt/XControlModel.hpp>
+#include <com/sun/star/awt/XFixedText.hpp>
+#include <com/sun/star/awt/XGraphics.hpp>
+#include <com/sun/star/awt/XLayoutConstrains.hpp>
+#include <com/sun/star/awt/XProgressBar.hpp>
+#include <com/sun/star/task/XStatusIndicator.hpp>
+#include <com/sun/star/awt/XToolkit.hpp>
+#include <com/sun/star/awt/XWindowPeer.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+
+//____________________________________________________________________________________________________________
+//  includes of my own project
+//____________________________________________________________________________________________________________
+#include "basecontainercontrol.hxx"
+
+//____________________________________________________________________________________________________________
+//  namespace
+//____________________________________________________________________________________________________________
+
+namespace unocontrols{
+
+#define UNO3_ANY                                        ::com::sun::star::uno::Any
+#define UNO3_OUSTRING                                   ::rtl::OUString
+#define UNO3_RECTANGLE                                  ::com::sun::star::awt::Rectangle
+#define UNO3_REFERENCE                                  ::com::sun::star::uno::Reference
+#define UNO3_RUNTIMEEXCEPTION                           ::com::sun::star::uno::RuntimeException
+#define UNO3_SEQUENCE                                   ::com::sun::star::uno::Sequence
+#define UNO3_SIZE                                       ::com::sun::star::awt::Size
+#define UNO3_TYPE                                       ::com::sun::star::uno::Type
+#define UNO3_XCONTROLMODEL                              ::com::sun::star::awt::XControlModel
+#define UNO3_XFIXEDTEXT                                 ::com::sun::star::awt::XFixedText
+#define UNO3_XGRAPHICS                                  ::com::sun::star::awt::XGraphics
+#define UNO3_XLAYOUTCONSTRAINS                          ::com::sun::star::awt::XLayoutConstrains
+#define UNO3_XMULTISERVICEFACTORY                       ::com::sun::star::lang::XMultiServiceFactory
+#define UNO3_XPROGRESSBAR                               ::com::sun::star::awt::XProgressBar
+#define UNO3_XSTATUSINDICATOR                           ::com::sun::star::task::XStatusIndicator
+#define UNO3_XTOOLKIT                                   ::com::sun::star::awt::XToolkit
+#define UNO3_XWINDOWPEER                                ::com::sun::star::awt::XWindowPeer
+
+//____________________________________________________________________________________________________________
+//  defines
+//____________________________________________________________________________________________________________
+
+#define SERVICENAME_STATUSINDICATOR                     "com.sun.star.task.XStatusIndicator"
+#define IMPLEMENTATIONNAME_STATUSINDICATOR              "stardiv.UnoControls.StatusIndicator"
+#undef  FREEBORDER
+#define FREEBORDER                                      5                                                       // border around and between the controls
+#define FIXEDTEXT_SERVICENAME                           "com.sun.star.awt.UnoControlFixedText"
+#define FIXEDTEXT_MODELNAME                             "com.sun.star.awt.UnoControlFixedTextModel"
+#define CONTROLNAME_TEXT                                "Text"                                                  // identifier the control in container
+#define CONTROLNAME_PROGRESSBAR                         "ProgressBar"                                           //              -||-
+#define DEFAULT_TEXT                                    "\0"
+#define BACKGROUNDCOLOR                                 TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )                // lighgray
+#define LINECOLOR_BRIGHT                                TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )                // white
+#define LINECOLOR_SHADOW                                TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )                // black
+// Overwrite defines from basecontrol.hxx!!!
+#undef  DEFAULT_WIDTH
+#undef  DEFAULT_HEIGHT
+#define DEFAULT_WIDTH                                   300
+#define DEFAULT_HEIGHT                                   25
+
+//____________________________________________________________________________________________________________
+//  structs, types
+//____________________________________________________________________________________________________________
+
+//____________________________________________________________________________________________________________
+//  class declaration
+//____________________________________________________________________________________________________________
+
+class StatusIndicator   : public UNO3_XLAYOUTCONSTRAINS
+                        , public UNO3_XSTATUSINDICATOR
+                        , public BaseContainerControl
+{
+
+    //-------------------------------------------------------------------------------------------------------------
+    //  public methods
+    //-------------------------------------------------------------------------------------------------------------
+
+    public:
+
+        //---------------------------------------------------------------------------------------------------------
+        //  construct/destruct
+        //---------------------------------------------------------------------------------------------------------
+
+        /**_______________________________________________________________________________________________________
+            @short
+            @descr
+
+            @seealso
+
+            @param
+
+            @return
+
+            @onerror
+        */
+
+        StatusIndicator( const UNO3_REFERENCE< UNO3_XMULTISERVICEFACTORY >& xFactory );
+
+        /**_______________________________________________________________________________________________________
+            @short
+            @descr
+
+            @seealso
+
+            @param
+
+            @return
+
+            @onerror
+        */
+
+        virtual ~StatusIndicator();
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XInterface
+        //---------------------------------------------------------------------------------------------------------
+
+        /**_______________________________________________________________________________________________________
+            @short      give answer, if interface is supported
+            @descr      The interfaces are searched by type.
+
+            @seealso    XInterface
+
+            @param      "rType" is the type of searched interface.
+
+            @return     Any     information about found interface
+
+            @onerror    A RuntimeException is thrown.
+        */
+
+        virtual UNO3_ANY SAL_CALL queryInterface( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+
+        /**_______________________________________________________________________________________________________
+            @short      increment refcount
+            @descr      -
+
+            @seealso    XInterface
+            @seealso    release()
+
+            @param      -
+
+            @return     -
+
+            @onerror    A RuntimeException is thrown.
+        */
+
+        virtual void SAL_CALL acquire() throw();
+
+        /**_______________________________________________________________________________________________________
+            @short      decrement refcount
+            @descr      -
+
+            @seealso    XInterface
+            @seealso    acquire()
+
+            @param      -
+
+            @return     -
+
+            @onerror    A RuntimeException is thrown.
+        */
+
+        virtual void SAL_CALL release() throw();
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XTypeProvider
+        //---------------------------------------------------------------------------------------------------------
+
+        /**_______________________________________________________________________________________________________
+            @short      get information about supported interfaces
+            @descr      -
+
+            @seealso    XTypeProvider
+
+            @param      -
+
+            @return     Sequence of types of all supported interfaces
+
+            @onerror    A RuntimeException is thrown.
+        */
+
+        virtual UNO3_SEQUENCE< UNO3_TYPE > SAL_CALL getTypes() throw( UNO3_RUNTIMEEXCEPTION );
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XAggregation
+        //---------------------------------------------------------------------------------------------------------
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual UNO3_ANY SAL_CALL queryAggregation( const UNO3_TYPE& aType ) throw( UNO3_RUNTIMEEXCEPTION );
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XStatusIndicator
+        //---------------------------------------------------------------------------------------------------------
+
+        /*-****************************************************************************************************//**
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        *//*-*****************************************************************************************************/
+
+        virtual void SAL_CALL start(    const   UNO3_OUSTRING&  sText   ,
+                                                sal_Int32       nRange  ) throw( UNO3_RUNTIMEEXCEPTION );
+
+        /*-****************************************************************************************************//**
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        *//*-*****************************************************************************************************/
+
+        virtual void SAL_CALL end() throw( UNO3_RUNTIMEEXCEPTION );
+
+        /*-****************************************************************************************************//**
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        *//*-*****************************************************************************************************/
+
+        virtual void SAL_CALL reset() throw( UNO3_RUNTIMEEXCEPTION );
+
+        /*-****************************************************************************************************//**
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        *//*-*****************************************************************************************************/
+
+        virtual void SAL_CALL setText( const UNO3_OUSTRING& sText ) throw( UNO3_RUNTIMEEXCEPTION );
+
+        /*-****************************************************************************************************//**
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        *//*-*****************************************************************************************************/
+
+        virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( UNO3_RUNTIMEEXCEPTION );
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XLayoutConstrains
+        //---------------------------------------------------------------------------------------------------------
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual UNO3_SIZE SAL_CALL getMinimumSize() throw( UNO3_RUNTIMEEXCEPTION );
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual UNO3_SIZE SAL_CALL getPreferredSize() throw( UNO3_RUNTIMEEXCEPTION );
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual UNO3_SIZE SAL_CALL calcAdjustedSize( const UNO3_SIZE& aNewSize ) throw( UNO3_RUNTIMEEXCEPTION );
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XControl
+        //---------------------------------------------------------------------------------------------------------
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual void SAL_CALL createPeer(   const   UNO3_REFERENCE< UNO3_XTOOLKIT >&    xToolkit    ,
+                                            const   UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParent     ) throw( UNO3_RUNTIMEEXCEPTION );
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual sal_Bool SAL_CALL setModel( const UNO3_REFERENCE< UNO3_XCONTROLMODEL >& xModel ) throw( UNO3_RUNTIMEEXCEPTION );
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual UNO3_REFERENCE< UNO3_XCONTROLMODEL > SAL_CALL getModel() throw( UNO3_RUNTIMEEXCEPTION );
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XComponent
+        //---------------------------------------------------------------------------------------------------------
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual void SAL_CALL dispose() throw( UNO3_RUNTIMEEXCEPTION );
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XWindow
+        //---------------------------------------------------------------------------------------------------------
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual void SAL_CALL setPosSize(   sal_Int32   nX      ,
+                                            sal_Int32   nY      ,
+                                            sal_Int32   nWidth  ,
+                                            sal_Int32   nHeight ,
+                                            sal_Int16   nFlags  ) throw( UNO3_RUNTIMEEXCEPTION );
+
+        //---------------------------------------------------------------------------------------------------------
+        //  BaseControl
+        //---------------------------------------------------------------------------------------------------------
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        static const UNO3_SEQUENCE< UNO3_OUSTRING > impl_getStaticSupportedServiceNames();
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        static const UNO3_OUSTRING impl_getStaticImplementationName();
+
+//____________________________________________________________________________________________________________
+//  protected methods
+//____________________________________________________________________________________________________________
+
+protected:
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual UNO3_WINDOWDESCRIPTOR* impl_getWindowDescriptor( const UNO3_REFERENCE< UNO3_XWINDOWPEER >& xParentPeer );
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual void impl_paint ( sal_Int32 nX, sal_Int32 nY, const UNO3_REFERENCE< UNO3_XGRAPHICS > & rGraphics );
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual void impl_recalcLayout( const UNO3_WINDOWEVENT& aEvent );
+
+//____________________________________________________________________________________________________________
+// debug methods
+//____________________________________________________________________________________________________________
+
+private:
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    #if OSL_DEBUG_LEVEL > 1
+
+    #endif
+
+//____________________________________________________________________________________________________________
+// private variables
+//____________________________________________________________________________________________________________
+
+private:
+
+    UNO3_REFERENCE< UNO3_XFIXEDTEXT >       m_xText         ;
+    UNO3_REFERENCE< UNO3_XPROGRESSBAR >     m_xProgressBar  ;
+
+};  // class StatusIndicator
+
+}   // namespace unocontrols
+
+#endif  // #ifndef _UNOCONTROLS_STATUSINDICATOR_CTRL_HXX
diff --git a/UnoControls/util/ctl.component b/UnoControls/util/ctl.component
new file mode 100644
index 000000000000..32901f529c8b
--- /dev/null
+++ b/UnoControls/util/ctl.component
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="stardiv.UnoControls.FrameControl">
+    <service name="com.sun.star.frame.FrameControl"/>
+  </implementation>
+  <implementation name="stardiv.UnoControls.ProgressBar">
+    <service name="com.sun.star.awt.XProgressBar"/>
+  </implementation>
+  <implementation name="stardiv.UnoControls.ProgressMonitor">
+    <service name="com.sun.star.awt.XProgressMonitor"/>
+  </implementation>
+  <implementation name="stardiv.UnoControls.StatusIndicator">
+    <service name="com.sun.star.task.XStatusIndicator"/>
+  </implementation>
+</component>
diff --git a/UnoControls/util/makefile.mk b/UnoControls/util/makefile.mk
new file mode 100644
index 000000000000..73617d24452c
--- /dev/null
+++ b/UnoControls/util/makefile.mk
@@ -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.
+#
+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=UnoControls
+TARGET=ctl
+LIBTARGET=NO
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	$(PRJ)$/util$/makefile.pmk
+
+# --- Files --------------------------------------------------------
+
+LIB1TARGET= 	$(SLB)$/$(TARGET).lib
+LIB1FILES=	$(SLB)$/base.lib	\
+        $(SLB)$/controls.lib
+
+SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
+SHL1IMPLIB= i$(TARGET)
+
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+DEF1NAME=$(SHL1TARGET)
+
+SHL1STDLIBS= \
+        $(TOOLSLIB) \
+        $(CPPUHELPERLIB) \
+        $(CPPULIB) \
+        $(SALLIB)
+
+SHL1DEPN=		makefile.mk
+SHL1LIBS=		$(LIB1TARGET)
+
+# --- Targets ------------------------------------------------------
+.INCLUDE :	target.mk
+
+ALLTAR : $(MISC)/ctl.component
+
+$(MISC)/ctl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ctl.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ctl.component
diff --git a/UnoControls/util/makefile.pmk b/UnoControls/util/makefile.pmk
new file mode 100644
index 000000000000..02a34a2434a1
--- /dev/null
+++ b/UnoControls/util/makefile.pmk
@@ -0,0 +1,27 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+.INCLUDE :  settings.mk
diff --git a/UnoControls/util/target.pmk b/UnoControls/util/target.pmk
new file mode 100644
index 000000000000..c7c1de9c2563
--- /dev/null
+++ b/UnoControls/util/target.pmk
@@ -0,0 +1,35 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+ALLSLO: $(SLOFILES)
+
+SOSHL: $(SHL1TARGETN)
+
+WHOLEPRJ:
+    cd $(PRJ)$/prj
+    make debug linkinc prjpch compinc
+    @echo "READY"
+
diff --git a/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java b/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java
new file mode 100755
index 000000000000..ec479fb3949d
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/accessibility/AccessBridge.java
@@ -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.
+ *
+ ************************************************************************/
+package org.openoffice.accessibility;
+
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.awt.XTopWindow;
+import com.sun.star.awt.XTopWindowListener;
+import com.sun.star.awt.XWindow;
+import com.sun.star.comp.loader.FactoryHelper;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XInitialization;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.lang.XSingleServiceFactory;
+import com.sun.star.registry.*;
+import com.sun.star.uno.*;
+
+import org.openoffice.java.accessibility.*;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import javax.accessibility.Accessible;
+
+
+public class AccessBridge {
+    //
+    protected static java.util.Hashtable topWindowMap = new java.util.Hashtable();
+
+    private static java.awt.Window getTopWindowImpl(XAccessible xAccessible) {
+        // Because it can not be garantied that
+        // WindowsAccessBridgeAdapter.registerTopWindow() is called
+        // before windowOpened(), we have to make this operation
+        // atomic.
+        synchronized (topWindowMap) {
+            String oid = UnoRuntime.generateOid(xAccessible);
+            java.awt.Window w = (java.awt.Window) topWindowMap.get(oid);
+
+            if (w == null) {
+                w = AccessibleObjectFactory.getTopWindow(xAccessible);
+
+                if (w != null) {
+                    topWindowMap.put(oid, w);
+                }
+            }
+
+            return w;
+        }
+    }
+
+    protected static java.awt.Window getTopWindow(XAccessible xAccessible) {
+        if (xAccessible != null) {
+            XAccessibleContext xAccessibleContext = xAccessible.getAccessibleContext();
+            if (xAccessibleContext != null) {
+
+                // Toolkit reports the VCL peer windows as toplevels. These have an
+                // accessible parent which represents the native frame window
+                switch(xAccessibleContext.getAccessibleRole()) {
+                    case AccessibleRole.ROOT_PANE:
+                    case AccessibleRole.POPUP_MENU:
+                        return getTopWindow(xAccessibleContext.getAccessibleParent());
+
+                    case AccessibleRole.WINDOW:
+                    case AccessibleRole.FRAME:
+                    case AccessibleRole.DIALOG:
+                    case AccessibleRole.ALERT:
+                        return getTopWindowImpl(xAccessible);
+
+                    default:
+                        break;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    protected static java.awt.Window removeTopWindow(XAccessible xAccessible) {
+        if (xAccessible != null) {
+            XAccessibleContext xAccessibleContext = xAccessible.getAccessibleContext();
+            if (xAccessibleContext != null) {
+
+                // Toolkit reports the VCL peer windows as toplevels. These have an
+                // accessible parent which represents the native frame window
+                switch(xAccessibleContext.getAccessibleRole()) {
+                    case AccessibleRole.ROOT_PANE:
+                    case AccessibleRole.POPUP_MENU:
+                        return removeTopWindow(xAccessibleContext.getAccessibleParent());
+
+                    case AccessibleRole.WINDOW:
+                    case AccessibleRole.FRAME:
+                    case AccessibleRole.DIALOG:
+                        return (java.awt.Window) topWindowMap.remove(UnoRuntime.generateOid(xAccessible));
+
+                    default:
+                        break;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    public static XSingleServiceFactory __getServiceFactory(String implName,
+        XMultiServiceFactory multiFactory, XRegistryKey regKey) {
+        XSingleServiceFactory xSingleServiceFactory = null;
+
+        if (implName.equals(AccessBridge.class.getName())) {
+            // Initialize toolkit to register at Java <-> Windows access bridge
+            java.awt.Toolkit tk = java.awt.Toolkit.getDefaultToolkit();
+
+            xSingleServiceFactory = FactoryHelper.getServiceFactory(_AccessBridge.class,
+                    _AccessBridge._serviceName, multiFactory, regKey);
+        }
+
+        return xSingleServiceFactory;
+    }
+
+    static public class _AccessBridge implements XTopWindowListener,
+        XInitialization, XComponent {
+        static final String _serviceName = "com.sun.star.accessibility.AccessBridge";
+        XComponentContext xComponentContext;
+
+        public _AccessBridge(XComponentContext xComponentContext) {
+            this.xComponentContext = xComponentContext;
+        }
+
+        /*
+        * XInitialization
+        */
+        public void initialize(java.lang.Object[] arguments) {
+            try {
+                // FIXME: Currently there is no way to determine if key event forwarding is needed or not,
+                // so we have to do it always ..
+                XExtendedToolkit unoToolkit = (XExtendedToolkit) AnyConverter.toObject(new Type(
+                            XExtendedToolkit.class), arguments[0]);
+
+                if (unoToolkit != null) {
+                    // FIXME this should be done in VCL
+                    unoToolkit.addTopWindowListener(this);
+
+                    String os = (String) System.getProperty("os.name");
+
+                    // Try to initialize the WindowsAccessBridgeAdapter
+                    if (os.startsWith("Windows")) {
+                        WindowsAccessBridgeAdapter.attach(xComponentContext);
+                    } else {
+                        unoToolkit.addKeyHandler(new KeyHandler());
+                    }
+                } else if (Build.DEBUG) {
+                    System.err.println(
+                        "argument 0 is not of type XExtendedToolkit.");
+                }
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+                // FIXME: output
+            }
+        }
+
+        /*
+        * XTopWindowListener
+        */
+        public void windowOpened(com.sun.star.lang.EventObject event) {
+            XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface(XAccessible.class,
+                    event.Source);
+            java.awt.Window w = getTopWindow(xAccessible);
+        }
+
+        public void windowActivated(com.sun.star.lang.EventObject event) {
+        }
+
+        public void windowDeactivated(com.sun.star.lang.EventObject event) {
+        }
+
+        public void windowMinimized(com.sun.star.lang.EventObject event) {
+        }
+
+        public void windowNormalized(com.sun.star.lang.EventObject event) {
+        }
+
+        public void windowClosing(com.sun.star.lang.EventObject event) {
+        }
+
+        public void windowClosed(com.sun.star.lang.EventObject event) {
+            XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface(XAccessible.class,
+                    event.Source);
+
+            java.awt.Window w = removeTopWindow(xAccessible);
+
+            if (w != null) {
+                w.dispose();
+            }
+        }
+
+        public void disposing(com.sun.star.lang.EventObject event) {
+        }
+
+        /*
+        * XComponent
+        */
+
+        public void addEventListener(com.sun.star.lang.XEventListener listener) {
+        }
+
+        public void removeEventListener(com.sun.star.lang.XEventListener listener) {
+        }
+
+        public void dispose() {
+            try {
+                java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue().invokeAndWait(
+                    new Runnable() {
+                        public void run() {
+                        }
+                    } );
+            } catch (java.lang.InterruptedException e) {
+            } catch (java.lang.reflect.InvocationTargetException e) {
+            }
+        }
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/accessibility/KeyHandler.java b/accessibility/bridge/org/openoffice/accessibility/KeyHandler.java
new file mode 100755
index 000000000000..1e9f2f6520ae
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/accessibility/KeyHandler.java
@@ -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.
+ *
+ ************************************************************************/
+
+
+package org.openoffice.accessibility;
+
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.awt.XKeyHandler;
+import org.openoffice.java.accessibility.AccessibleKeyBinding;
+import org.openoffice.java.accessibility.Build;
+
+import java.awt.*;
+import java.awt.event.KeyEvent;
+import javax.accessibility.*;
+
+public class KeyHandler extends Component implements XKeyHandler, java.awt.KeyEventDispatcher {
+    EventQueue eventQueue;
+
+    public class VCLKeyEvent extends KeyEvent implements Runnable {
+        boolean consumed = true;
+
+        public VCLKeyEvent(Component c, int id, int modifiers, int keyCode, char keyChar) {
+            super(c, id, System.currentTimeMillis(), modifiers, keyCode, keyChar);
+        }
+
+        public void run() {
+            // This is a no-op ..
+        }
+
+        public void setConsumed(boolean b) {
+            consumed = b;
+        }
+
+        public boolean isConsumed() {
+            return consumed;
+        }
+    }
+
+    public KeyHandler() {
+        eventQueue = Toolkit.getDefaultToolkit().getSystemEventQueue();
+        java.awt.KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(this);
+    }
+
+    /** This method is called by the current KeyboardFocusManager requesting that this KeyEventDispatcher
+    * dispatch the specified event on its behalf
+    */
+    public boolean dispatchKeyEvent(java.awt.event.KeyEvent e) {
+        if (e instanceof VCLKeyEvent) {
+            VCLKeyEvent event = (VCLKeyEvent) e;
+            event.setConsumed(false);
+            return true;
+        }
+        return false;
+    }
+
+    /** Handler for KeyPressed events */
+    public boolean keyPressed(com.sun.star.awt.KeyEvent event) {
+//      try {
+            VCLKeyEvent vke = new VCLKeyEvent(this, KeyEvent.KEY_PRESSED,
+                AccessibleKeyBinding.convertModifiers(event.Modifiers),
+                AccessibleKeyBinding.convertKeyCode(event.KeyCode),
+                event.KeyChar != 0 ? event.KeyChar : KeyEvent.CHAR_UNDEFINED);
+
+            eventQueue.postEvent(vke);
+
+            // VCL events for TABs have empty KeyChar
+            if (event.KeyCode == com.sun.star.awt.Key.TAB ) {
+                event.KeyChar = '\t';
+            }
+
+            // Synthesize KEY_TYPED event to emulate Java behavior
+            if (event.KeyChar != 0) {
+                eventQueue.postEvent(new VCLKeyEvent(this,
+                    KeyEvent.KEY_TYPED,
+                    AccessibleKeyBinding.convertModifiers(event.Modifiers),
+                    KeyEvent.VK_UNDEFINED,
+                    event.KeyChar));
+            }
+
+            // Wait until the key event is processed
+            return false;
+//          eventQueue.invokeAndWait(vke);
+//          return vke.isConsumed();
+//      } catch(java.lang.InterruptedException e) {
+//          return false;
+//      } catch(java.lang.reflect.InvocationTargetException e) {
+//          return false;
+//      }
+    }
+
+    /** Handler for KeyReleased events */
+    public boolean keyReleased(com.sun.star.awt.KeyEvent event) {
+//      try {
+            VCLKeyEvent vke = new VCLKeyEvent(this, KeyEvent.KEY_RELEASED,
+                AccessibleKeyBinding.convertModifiers(event.Modifiers),
+                AccessibleKeyBinding.convertKeyCode(event.KeyCode),
+                event.KeyChar != 0 ? event.KeyChar : KeyEvent.CHAR_UNDEFINED);
+            eventQueue.postEvent(vke);
+
+            // Wait until the key event is processed
+            return false;
+//          eventQueue.invokeAndWait(vke);
+//          return vke.isConsumed();
+//      } catch(java.lang.InterruptedException e) {
+//          return false;
+//      } catch(java.lang.reflect.InvocationTargetException e) {
+//          return false;
+//      }
+    }
+
+    public void disposing(com.sun.star.lang.EventObject event) {
+        java.awt.KeyboardFocusManager.getCurrentKeyboardFocusManager().removeKeyEventDispatcher(this);
+    }
+};
diff --git a/accessibility/bridge/org/openoffice/accessibility/PopupWindow.java b/accessibility/bridge/org/openoffice/accessibility/PopupWindow.java
new file mode 100644
index 000000000000..a63b0589b4fa
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/accessibility/PopupWindow.java
@@ -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.
+ *
+ ************************************************************************/
+package org.openoffice.accessibility;
+
+import org.openoffice.java.accessibility.*;
+
+
+/**
+ *
+ */
+public class PopupWindow extends java.awt.Window {
+    javax.accessibility.AccessibleContext accessibleContext = null;
+    ContainerProxy layeredPane = new ContainerProxy(javax.accessibility.AccessibleRole.LAYERED_PANE);
+    ContainerProxy rootPane = new ContainerProxy(javax.accessibility.AccessibleRole.ROOT_PANE);
+    ContainerProxy popupLayer = new ContainerProxy(javax.accessibility.AccessibleRole.PANEL);
+    boolean opened = false;
+    boolean visible = false;
+
+    /** Creates a new instance of PopupWindow */
+    public PopupWindow(java.awt.Window owner) {
+        super(owner);
+        super.add(rootPane);
+        rootPane.add(layeredPane);
+
+        javax.accessibility.AccessibleContext ac = rootPane.getAccessibleContext();
+
+        if (ac != null) {
+            ac.setAccessibleParent(this);
+        }
+    }
+
+    static PopupWindow create(
+        com.sun.star.accessibility.XAccessible xAccessible) {
+        java.awt.Window parent = java.awt.KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                                                              .getActiveWindow();
+
+        if (parent != null) {
+            PopupWindow w = new PopupWindow(parent);
+            w.setVisible(true);
+            AccessibleObjectFactory.invokeAndWait();
+            AccessibleObjectFactory.addChild(w, xAccessible);
+
+            return w;
+        }
+
+        return null;
+    }
+
+    public boolean isShowing() {
+        if (isVisible()) {
+            java.awt.Container parent = getParent();
+
+            return (parent == null) || parent.isShowing();
+        }
+
+        return false;
+    }
+
+    public void addNotify() {
+    }
+
+    public void removeNotify() {
+    }
+
+    public boolean isVisible() {
+        return visible;
+    }
+
+    public void setVisible(boolean b) {
+        if (visible != b) {
+            visible = b;
+
+            if (b) {
+                // If it is the first show, fire WINDOW_OPENED event
+                if (!opened) {
+                    AccessibleObjectFactory.postWindowOpened(this);
+                    opened = true;
+                }
+            }
+        }
+    }
+
+    public java.awt.Component add(java.awt.Component c) {
+        popupLayer.add(c);
+        layeredPane.add(popupLayer);
+
+        if (c instanceof javax.accessibility.Accessible) {
+            javax.accessibility.AccessibleContext ac = layeredPane.getAccessibleContext();
+
+            if (ac != null) {
+                ac.firePropertyChange(ac.ACCESSIBLE_CHILD_PROPERTY, null,
+                    popupLayer.getAccessibleContext());
+            }
+        }
+
+        return c;
+    }
+
+    public void remove(java.awt.Component c) {
+        layeredPane.remove(popupLayer);
+
+        if (c instanceof javax.accessibility.Accessible) {
+            javax.accessibility.AccessibleContext ac = layeredPane.getAccessibleContext();
+
+            if (ac != null) {
+                ac.firePropertyChange(ac.ACCESSIBLE_CHILD_PROPERTY,
+                    popupLayer.getAccessibleContext(), null);
+            }
+        }
+
+        popupLayer.remove(c);
+    }
+
+    public void dispose() {
+        setVisible(false);
+        AccessibleObjectFactory.postWindowClosed(this);
+    }
+
+    public javax.accessibility.AccessibleContext getAccessibleContext() {
+        if (accessibleContext == null) {
+            accessibleContext = new AccessiblePopupWindow();
+        }
+
+        return accessibleContext;
+    }
+
+    protected class AccessiblePopupWindow
+        extends java.awt.Window.AccessibleAWTWindow {
+        AccessiblePopupWindow() {
+        }
+    }
+
+    protected class ContainerProxy extends java.awt.Container
+        implements javax.accessibility.Accessible {
+        javax.accessibility.AccessibleContext accessibleContext = null;
+        javax.accessibility.AccessibleRole role;
+
+        protected ContainerProxy(javax.accessibility.AccessibleRole role) {
+            this.role = role;
+        }
+
+        public java.awt.Component add(java.awt.Component c) {
+            if (c instanceof javax.accessibility.Accessible) {
+                javax.accessibility.Accessible a = (javax.accessibility.Accessible) c;
+                javax.accessibility.AccessibleContext ac = a.getAccessibleContext();
+
+                if (ac != null) {
+                    ac.setAccessibleParent(this);
+                }
+            }
+
+            return super.add(c);
+        }
+
+        public void remove(java.awt.Component c) {
+            if (c instanceof javax.accessibility.Accessible) {
+                javax.accessibility.Accessible a = (javax.accessibility.Accessible) c;
+                javax.accessibility.AccessibleContext ac = a.getAccessibleContext();
+
+                if (ac != null) {
+                    ac.setAccessibleParent(null);
+                }
+            }
+
+            super.remove(c);
+        }
+
+        public javax.accessibility.AccessibleContext getAccessibleContext() {
+            if (accessibleContext == null) {
+                accessibleContext = new AccessibleContainerProxy();
+            }
+
+            return accessibleContext;
+        }
+
+        private class AccessibleContainerProxy
+            extends java.awt.Container.AccessibleAWTContainer {
+            AccessibleContainerProxy() {
+            }
+
+            public javax.accessibility.AccessibleRole getAccessibleRole() {
+                return ContainerProxy.this.role;
+            }
+        }
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java b/accessibility/bridge/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java
new file mode 100644
index 000000000000..28e58940867d
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/accessibility/WindowsAccessBridgeAdapter.java
@@ -0,0 +1,654 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+package org.openoffice.accessibility;
+
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.java.XJavaVM;
+import com.sun.star.uno.*;
+
+import org.openoffice.java.accessibility.*;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import javax.accessibility.*;
+
+
+public class WindowsAccessBridgeAdapter {
+    private static Method registerVirtualFrame;
+    private static Method revokeVirtualFrame;
+    private static java.util.Hashtable frameMap;
+
+    protected static native byte[] getProcessID();
+
+    protected static native boolean createMapping(long jvmaccess);
+
+    // On Windows all native frames must be registered to the access bridge.
+    // Therefor the bridge exports two methods that we try to find here.
+    protected static void attach(XComponentContext xComponentContext) {
+        try {
+            Class bridge = Class.forName(
+                    "com.sun.java.accessibility.AccessBridge");
+            Class[] parameterTypes = {
+                javax.accessibility.Accessible.class, Integer.class
+            };
+
+            if (bridge != null) {
+                registerVirtualFrame = bridge.getMethod("registerVirtualFrame",
+                        parameterTypes);
+                revokeVirtualFrame = bridge.getMethod("revokeVirtualFrame",
+                        parameterTypes);
+
+                // load the native dll
+                System.loadLibrary("java_uno_accessbridge");
+
+                Object any = xComponentContext.getValueByName(
+                        "/singletons/com.sun.star.java.theJavaVirtualMachine");
+
+                if (AnyConverter.isObject(any)) {
+                    XJavaVM xJavaVM = (XJavaVM) UnoRuntime.queryInterface(XJavaVM.class,
+                            AnyConverter.toObject(new Type(XJavaVM.class), any));
+
+                    if (xJavaVM != null) {
+                        any = xJavaVM.getJavaVM(getProcessID());
+
+                        if (AnyConverter.isLong(any)) {
+                            createMapping(AnyConverter.toLong(any));
+                            frameMap = new java.util.Hashtable();
+                        }
+                    }
+                }
+            }
+        } catch (NoSuchMethodException e) {
+            System.err.println("ERROR: incompatible AccessBridge found: " +
+                e.getMessage());
+
+            // Forward this exception to UNO to indicate that the service will
+            // not work correctly.
+            throw new com.sun.star.uno.RuntimeException(
+                "incompatible AccessBridge class: " + e.getMessage());
+        } catch (java.lang.SecurityException e) {
+            System.err.println("ERROR: no access to AccessBridge: " +
+                e.getMessage());
+
+            // Forward this exception to UNO to indicate that the service will not work correctly.
+            throw new com.sun.star.uno.RuntimeException(
+                "Security exception caught: " + e.getMessage());
+        } catch (ClassNotFoundException e) {
+            // Forward this exception to UNO to indicate that the service will not work correctly.
+            throw new com.sun.star.uno.RuntimeException(
+                "ClassNotFound exception caught: " + e.getMessage());
+        } catch (IllegalArgumentException e) {
+            System.err.println("IllegalArgumentException caught: " +
+                e.getMessage());
+
+            // Forward this exception to UNO to indicate that the service will not work correctly.
+            throw new com.sun.star.uno.RuntimeException(
+                "IllegalArgumentException caught: " + e.getMessage());
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+            System.err.println("UNO IllegalArgumentException caught: " +
+                e.getMessage());
+
+            // Forward this exception to UNO to indicate that the service will not work correctly.
+            throw new com.sun.star.uno.RuntimeException(
+                "UNO IllegalArgumentException caught: " + e.getMessage());
+        }
+    }
+
+    protected static boolean isAttached() {
+        return frameMap != null;
+    }
+
+    protected static Accessible getAccessibleWrapper(XAccessible xAccessible) {
+        Accessible a = null;
+
+        try {
+            XAccessibleContext xAccessibleContext = xAccessible.getAccessibleContext();
+
+            if (xAccessibleContext != null) {
+                switch (xAccessibleContext.getAccessibleRole()) {
+                    case AccessibleRole.LIST:
+                        a = (Accessible) AccessibleObjectFactory.getAccessibleComponent(xAccessible);
+                        if (a != null) {
+                            a = new ListProxy(a.getAccessibleContext());
+                        }
+                        break;
+
+                    case AccessibleRole.MENU:
+
+                        Accessible tmp = (Accessible) AccessibleObjectFactory.getAccessibleComponent(xAccessible);
+                        if (tmp != null) {
+                            AccessibleContext ac = tmp.getAccessibleContext();
+
+                            if (ac != null) {
+                                a = new PopupMenuProxy(ac);
+                            }
+                        }
+
+                        break;
+
+                    case AccessibleRole.TOOL_TIP:
+                        a = PopupWindow.create(xAccessible);
+                        break;
+
+                    default:
+                        a = (Accessible) AccessBridge.getTopWindow(xAccessible);
+                        break;
+                }
+            }
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+
+        return a;
+    }
+
+    /** Registers a native frame at the Java AccessBridge for Windows */
+    public static void registerTopWindow(int handle, XAccessible xAccessible) {
+        Integer hwnd = new Integer(handle);
+
+        if (!frameMap.contains(hwnd)) {
+            if (Build.DEBUG) {
+                System.err.println("Native frame " + hwnd + " of role " +
+                    AccessibleRoleAdapter.getAccessibleRole(xAccessible) +
+                    " has been opened");
+            }
+
+            Accessible a = getAccessibleWrapper(xAccessible);
+
+            if (a != null) {
+                Object[] args = { a, hwnd };
+
+                frameMap.put(hwnd, a);
+
+                if (Build.DEBUG) {
+                    System.err.println("registering native frame " + hwnd);
+                }
+
+                try {
+                    registerVirtualFrame.invoke(null, args);
+                } catch (IllegalAccessException e) {
+                    System.err.println("IllegalAccessException caught: " +
+                        e.getMessage());
+                } catch (IllegalArgumentException e) {
+                    System.err.println("IllegalArgumentException caught: " +
+                        e.getMessage());
+                } catch (InvocationTargetException e) {
+                    System.err.println("InvokationTargetException caught: " +
+                        e.getMessage());
+                }
+            }
+        }
+    }
+
+    /** Revokes a native frame at the Java AccessBridge for Windows */
+    public static void revokeTopWindow(int handle, XAccessible xAccessible) {
+        Integer hwnd = new Integer(handle);
+
+        Accessible a = (Accessible) frameMap.remove(hwnd);
+
+        if (a != null) {
+            Object[] args = { a, hwnd };
+
+            if (Build.DEBUG) {
+                System.err.println("revoking native frame " + hwnd);
+            }
+
+            try {
+                revokeVirtualFrame.invoke(null, args);
+            } catch (IllegalAccessException e) {
+                System.err.println("IllegalAccessException caught: " +
+                    e.getMessage());
+            } catch (IllegalArgumentException e) {
+                System.err.println("IllegalArgumentException caught: " +
+                    e.getMessage());
+            } catch (InvocationTargetException e) {
+                System.err.println("InvokationTargetException caught: " +
+                    e.getMessage());
+            }
+        }
+
+        if (a instanceof PopupWindow) {
+            PopupWindow toolTipWindow = (PopupWindow) a;
+            toolTipWindow.removeAll();
+            toolTipWindow.dispose();
+        }
+    }
+
+    protected static class PopupMenuProxy extends AccessibleContext
+        implements Accessible, AccessibleComponent {
+        AccessibleContext menu;
+        AccessibleComponent menuComponent;
+        int x = 0; int y = 0; int width = 0; int height = 0;
+
+        PopupMenuProxy(AccessibleContext ac) {
+            menu = ac;
+            menuComponent = menu.getAccessibleComponent();
+
+            /** calculate the bounding rectangle by iterating over the
+             *  the children.
+             */
+            int x2 = 0; int y2 = 0;
+            int count = ac.getAccessibleChildrenCount();
+            for (int i = 0; i < count; i++) {
+                Accessible a = menu.getAccessibleChild(i);
+
+                if (a != null) {
+                    AccessibleContext childAC = a.getAccessibleContext();
+
+                    if (childAC != null) {
+                        AccessibleComponent comp = ac.getAccessibleComponent();
+
+                        if (comp != null) {
+                            java.awt.Point p = comp.getLocationOnScreen();
+                            java.awt.Dimension d = comp.getSize();
+
+                            if (p != null && d != null) {
+                                if (p.x < x) {
+                                    x = p.x;
+                                }
+                                if (p.y < y) {
+                                    y = p.y;
+                                }
+                                if (p.x + d.width > x2) {
+                                    x2 = p.x + d.width;
+                                }
+                                if (p.y + d.height > y2) {
+                                    y2 = p.y + d.height;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            width = x2 - x;
+            height = y2 - y;
+        }
+
+        /** Returns the AccessibleContext associated with this object */
+        public javax.accessibility.AccessibleContext getAccessibleContext() {
+            return this;
+        }
+
+        /** Returns the AccessibleContext associated with this object */
+        public javax.accessibility.AccessibleComponent getAccessibleComponent() {
+            return this;
+        }
+
+        /** Returns the AccessibleText associated with this object */
+        public javax.accessibility.AccessibleText getAccessibleText() {
+            return menu.getAccessibleText();
+        }
+
+        /** Returns the AccessibleContext associated with this object */
+        public javax.accessibility.AccessibleStateSet getAccessibleStateSet() {
+            return menu.getAccessibleStateSet();
+        }
+
+        public java.util.Locale getLocale() {
+            return menu.getLocale();
+        }
+
+        public int getAccessibleIndexInParent() {
+            return -1;
+        }
+
+        public int getAccessibleChildrenCount() {
+            return menu.getAccessibleChildrenCount();
+        }
+
+        public javax.accessibility.Accessible getAccessibleChild(int i) {
+            return menu.getAccessibleChild(i);
+        }
+
+        public javax.accessibility.AccessibleRole getAccessibleRole() {
+            return javax.accessibility.AccessibleRole.POPUP_MENU;
+        }
+
+        /*
+        * AccessibleComponent
+        */
+        public void addFocusListener(java.awt.event.FocusListener fl) {
+            menuComponent.addFocusListener(fl);
+        }
+
+        public void removeFocusListener(java.awt.event.FocusListener fl) {
+            menuComponent.removeFocusListener(fl);
+        }
+
+        /** Returns the background color of the object */
+        public java.awt.Color getBackground() {
+            return menuComponent.getBackground();
+        }
+
+        public void setBackground(java.awt.Color c) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the foreground color of the object */
+        public java.awt.Color getForeground() {
+            return menuComponent.getForeground();
+        }
+
+        public void setForeground(java.awt.Color c) {
+            menuComponent.setForeground(c);
+        }
+
+        public java.awt.Cursor getCursor() {
+            return menuComponent.getCursor();
+        }
+
+        public void setCursor(java.awt.Cursor cursor) {
+            menuComponent.setCursor(cursor);
+        }
+
+        public java.awt.Font getFont() {
+            return menuComponent.getFont();
+        }
+
+        public void setFont(java.awt.Font f) {
+            menuComponent.setFont(f);
+        }
+
+        public java.awt.FontMetrics getFontMetrics(java.awt.Font f) {
+            return menuComponent.getFontMetrics(f);
+        }
+
+        public boolean isEnabled() {
+            return menuComponent.isEnabled();
+        }
+
+        public void setEnabled(boolean b) {
+            menuComponent.setEnabled(b);
+        }
+
+        public boolean isVisible() {
+            return menuComponent.isVisible();
+        }
+
+        public void setVisible(boolean b) {
+            menuComponent.setVisible(b);
+        }
+
+        public boolean isShowing() {
+            return menuComponent.isShowing();
+        }
+
+        public boolean contains(java.awt.Point p) {
+            java.awt.Dimension d = getSize();
+
+            if (Build.DEBUG) {
+                System.err.println("PopupMenuProxy.containsPoint(" + p.x + "," +
+                    p.y + ") returns " +
+                    (((d.width >= 0) && (p.x < d.width) && (d.height >= 0) &&
+                    (p.y < d.height)) ? "true" : "false"));
+            }
+
+            if ((d.width >= 0) && (p.x < d.width) && (d.height >= 0) &&
+                    (p.y < d.height)) {
+                return true;
+            }
+
+            return false;
+        }
+
+        /** Returns the location of the object on the screen. */
+        public java.awt.Point getLocationOnScreen() {
+            return new java.awt.Point(x,y);
+        }
+
+        /** Gets the location of this component in the form of a point specifying the component's top-left corner */
+        public java.awt.Point getLocation() {
+            // This object represents a toplevel, so this is the same as getLocationOnScreen()
+            return getLocationOnScreen();
+        }
+
+        /** Moves this component to a new location */
+        public void setLocation(java.awt.Point p) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Gets the bounds of this component in the form of a Rectangle object */
+        public java.awt.Rectangle getBounds() {
+            return new java.awt.Rectangle(x, y, width, height);
+        }
+
+        /** Moves and resizes this component to conform to the new bounding rectangle r */
+        public void setBounds(java.awt.Rectangle r) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the size of this component in the form of a Dimension object */
+        public java.awt.Dimension getSize() {
+            return new java.awt.Dimension(width, height);
+        }
+
+        /** Resizes this component so that it has width d.width and height d.height */
+        public void setSize(java.awt.Dimension d) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the Accessible child, if one exists, contained at the local
+         * coordinate Point
+         */
+        public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
+            java.awt.Point p2 = menuComponent.getLocationOnScreen();
+            return menuComponent.getAccessibleAt(
+                new java.awt.Point(p.x + x - p2.x, p.y + y - p2.y));
+        }
+
+        public boolean isFocusTraversable() {
+            return menuComponent.isFocusTraversable();
+        }
+
+        public void requestFocus() {
+            menuComponent.requestFocus();
+        }
+    }
+
+    protected static class ListProxy extends AccessibleContext
+        implements Accessible, AccessibleComponent {
+        AccessibleContext list;
+        AccessibleComponent listComponent;
+
+        ListProxy(AccessibleContext ac) {
+            list = ac;
+            listComponent = list.getAccessibleComponent();
+        }
+
+        /** Returns the AccessibleContext associated with this object */
+        public javax.accessibility.AccessibleContext getAccessibleContext() {
+            return this;
+        }
+
+        /** Returns the AccessibleContext associated with this object */
+        public javax.accessibility.AccessibleComponent getAccessibleComponent() {
+            return this;
+        }
+
+        /** Returns the AccessibleSelection associated with this object */
+        public javax.accessibility.AccessibleSelection getAccessibleSelection() {
+            return list.getAccessibleSelection();
+        }
+
+        /** Returns the AccessibleContext associated with this object */
+        public javax.accessibility.AccessibleStateSet getAccessibleStateSet() {
+            return list.getAccessibleStateSet();
+        }
+
+        public java.util.Locale getLocale() {
+            return list.getLocale();
+        }
+
+        public int getAccessibleIndexInParent() {
+            return -1;
+        }
+
+        public int getAccessibleChildrenCount() {
+            return list.getAccessibleChildrenCount();
+        }
+
+        public javax.accessibility.Accessible getAccessibleChild(int i) {
+            return list.getAccessibleChild(i);
+        }
+
+        public javax.accessibility.AccessibleRole getAccessibleRole() {
+            return javax.accessibility.AccessibleRole.LIST;
+        }
+
+        /*
+        * AccessibleComponent
+        */
+        public void addFocusListener(java.awt.event.FocusListener fl) {
+            listComponent.addFocusListener(fl);
+        }
+
+        public void removeFocusListener(java.awt.event.FocusListener fl) {
+            listComponent.removeFocusListener(fl);
+        }
+
+        /** Returns the background color of the object */
+        public java.awt.Color getBackground() {
+            return listComponent.getBackground();
+        }
+
+        public void setBackground(java.awt.Color c) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the foreground color of the object */
+        public java.awt.Color getForeground() {
+            return listComponent.getForeground();
+        }
+
+        public void setForeground(java.awt.Color c) {
+            listComponent.setForeground(c);
+        }
+
+        public java.awt.Cursor getCursor() {
+            return listComponent.getCursor();
+        }
+
+        public void setCursor(java.awt.Cursor cursor) {
+            listComponent.setCursor(cursor);
+        }
+
+        public java.awt.Font getFont() {
+            return listComponent.getFont();
+        }
+
+        public void setFont(java.awt.Font f) {
+            listComponent.setFont(f);
+        }
+
+        public java.awt.FontMetrics getFontMetrics(java.awt.Font f) {
+            return listComponent.getFontMetrics(f);
+        }
+
+        public boolean isEnabled() {
+            return listComponent.isEnabled();
+        }
+
+        public void setEnabled(boolean b) {
+            listComponent.setEnabled(b);
+        }
+
+        public boolean isVisible() {
+            return listComponent.isVisible();
+        }
+
+        public void setVisible(boolean b) {
+           listComponent.setVisible(b);
+        }
+
+        public boolean isShowing() {
+            return listComponent.isShowing();
+        }
+
+        public boolean contains(java.awt.Point p) {
+            return listComponent.contains(p);
+        }
+
+        /** Returns the location of the object on the screen. */
+        public java.awt.Point getLocationOnScreen() {
+            return listComponent.getLocationOnScreen();
+        }
+
+        /** Gets the location of this component in the form of a point specifying
+         * the component's top-left corner
+         */
+        public java.awt.Point getLocation() {
+            // This object represents a toplevel object, so getLocation() should
+            // return the same as getLocationOnScreen().
+            return getLocationOnScreen();
+        }
+
+        /** Moves this component to a new location */
+        public void setLocation(java.awt.Point p) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Gets the bounds of this component in the form of a Rectangle object */
+        public java.awt.Rectangle getBounds() {
+            java.awt.Point p = getLocationOnScreen();
+            java.awt.Dimension d = getSize();
+            return new java.awt.Rectangle(p.x, p.y, d.width, d.height);
+        }
+
+        /** Moves and resizes this component to conform to the new bounding rectangle r */
+        public void setBounds(java.awt.Rectangle r) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the size of this component in the form of a Dimension object */
+        public java.awt.Dimension getSize() {
+            return listComponent.getSize();
+        }
+
+        /** Resizes this component so that it has width d.width and height d.height */
+        public void setSize(java.awt.Dimension d) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the Accessible child, if one exists, contained at the local
+         * coordinate Point
+         */
+        public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
+            return listComponent.getAccessibleAt(p);
+        }
+
+        public boolean isFocusTraversable() {
+            return listComponent.isFocusTraversable();
+        }
+
+        public void requestFocus() {
+            listComponent.requestFocus();
+        }
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component b/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component
new file mode 100644
index 000000000000..5fc897f2d5aa
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="org.openoffice.accessibility.AccessBridge">
+    <service name="com.sun.star.accessibility.AccessBridge"/>
+  </implementation>
+</component>
diff --git a/accessibility/bridge/org/openoffice/accessibility/makefile.mk b/accessibility/bridge/org/openoffice/accessibility/makefile.mk
new file mode 100755
index 000000000000..1fa29f5bfcb1
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/accessibility/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.
+#
+#*************************************************************************
+
+PRJNAME	= accessibility
+PRJ		= ..$/..$/..$/..
+TARGET	= java_uno_accessbridge
+PACKAGE	= org$/openoffice$/accessibility
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+JARFILES = jurt.jar unoil.jar ridl.jar 
+JAVAFILES = \
+    AccessBridge.java \
+    KeyHandler.java \
+    PopupWindow.java \
+    WindowsAccessBridgeAdapter.java
+
+JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+
+JARTARGET               = $(TARGET).jar
+JARCOMPRESS             = TRUE
+JARCLASSDIRS            = $(PACKAGE) org/openoffice/java/accessibility 
+CUSTOMMANIFESTFILE      = manifest
+
+# --- Targets ------------------------------------------------------
+
+
+.INCLUDE :  target.mk
+
+ALLTAR : $(MISC)/java_uno_accessbridge.component
+
+$(MISC)/java_uno_accessbridge.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt java_uno_accessbridge.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt java_uno_accessbridge.component
diff --git a/accessibility/bridge/org/openoffice/accessibility/manifest b/accessibility/bridge/org/openoffice/accessibility/manifest
new file mode 100755
index 000000000000..4b5ffd54d34b
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/accessibility/manifest
@@ -0,0 +1,2 @@
+RegistrationClassName: org.openoffice.accessibility.AccessBridge
+UNO-Type-Path: 
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AbstractButton.java b/accessibility/bridge/org/openoffice/java/accessibility/AbstractButton.java
new file mode 100644
index 000000000000..be7b72df8732
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AbstractButton.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import javax.accessibility.AccessibleState;
+
+import com.sun.star.uno.*;
+import com.sun.star.accessibility.*;
+
+/**
+ */
+public abstract class AbstractButton extends Component {
+
+    protected AbstractButton(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
+        super(xAccessible, xAccessibleContext);
+    }
+
+    protected abstract class AccessibleAbstractButton extends AccessibleUNOComponent
+        implements javax.accessibility.AccessibleAction {
+
+        /**
+        * Though the class is abstract, this should be called by all sub-classes
+        */
+        protected AccessibleAbstractButton() {
+            super();
+        }
+
+        /*
+        * AccessibleContext
+        */
+
+        /** Gets the AccessibleAction associated with this object that supports one or more actions */
+        public javax.accessibility.AccessibleAction getAccessibleAction() {
+            return this;
+        }
+
+        /** Gets the AccessibleText associated with this object presenting text on the display */
+        public javax.accessibility.AccessibleText getAccessibleText() {
+
+            if (disposed)
+                return null;
+
+            try {
+                XAccessibleText unoAccessibleText = (XAccessibleText)
+                    UnoRuntime.queryInterface(XAccessibleText.class,unoAccessibleComponent);
+                if (unoAccessibleText != null) {
+                    return new AccessibleTextImpl(unoAccessibleText);
+                } else {
+                    return null;
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Returns the relation set of this object */
+        public javax.accessibility.AccessibleRelationSet getAccessibleRelationSet() {
+            try {
+                XAccessibleRelationSet unoAccessibleRelationSet = unoAccessibleContext.getAccessibleRelationSet();
+
+                if (unoAccessibleRelationSet == null) {
+                    return null;
+                }
+
+                javax.accessibility.AccessibleRelationSet relationSet = new javax.accessibility.AccessibleRelationSet();
+                int count = unoAccessibleRelationSet.getRelationCount();
+
+                for (int i = 0; i < count; i++) {
+                    AccessibleRelation unoAccessibleRelation = unoAccessibleRelationSet.getRelation(i);
+
+                    switch (unoAccessibleRelation.RelationType) {
+                        case AccessibleRelationType.MEMBER_OF:
+                            relationSet.add(new javax.accessibility.AccessibleRelation(
+                                    javax.accessibility.AccessibleRelation.MEMBER_OF,
+                                    getAccessibleComponents(
+                                        unoAccessibleRelation.TargetSet)));
+                            break;
+
+                        case AccessibleRelationType.LABELED_BY:
+                            relationSet.add(new javax.accessibility.AccessibleRelation(
+                                    javax.accessibility.AccessibleRelation.LABELED_BY,
+                                    getAccessibleComponents(
+                                        unoAccessibleRelation.TargetSet)));
+                            break;
+                        default:
+                            break;
+                    }
+                }
+
+                return relationSet;
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return null;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /*
+        * AccessibleAction
+        */
+
+        /** Performs the specified Action on the object */
+        public boolean doAccessibleAction(int param) {
+            if (param == 0) {
+                // HACK: this action might open a modal dialog and therefor block
+                // until the dialog is closed. In case of this thread being the
+                // AWT EventDispatcherThread this means, the opened dialog will
+                // not be accessible, so deligate this request to another thread.
+                if (java.awt.EventQueue.isDispatchThread()) {
+                    Thread t = new Thread () {
+                        public void run() {
+                            AbstractButton.AccessibleAbstractButton.this.doAccessibleAction(0);
+                        }
+                    };
+                    t.start();
+                    return true;
+                } else {
+                    // Actions of MenuItems may also be performed if the item is not
+                    // visible, so just try ..
+                    try {
+                        XAccessibleContext xAccessibleContext = unoAccessibleContext;
+                        if (xAccessibleContext != null) {
+                            // Query for XAccessibleAction interface
+                            XAccessibleAction xAccessibleAction = (XAccessibleAction)
+                                UnoRuntime.queryInterface(XAccessibleAction.class, xAccessibleContext);
+
+                            if (xAccessibleAction != null) {
+                                return xAccessibleAction.doAccessibleAction(0);
+                            }
+                        }
+                    } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                    } catch (com.sun.star.uno.RuntimeException e) {
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        /** Returns a description of the specified action of the object */
+        public java.lang.String getAccessibleActionDescription(int param) {
+            return javax.swing.UIManager.getString("AbstractButton.clickText");
+        }
+
+        /** Returns the number of accessible actions available in this object */
+        public int getAccessibleActionCount() {
+            return 1;
+        }
+    }
+}
+
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleActionImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleActionImpl.java
new file mode 100644
index 000000000000..e4905752d833
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleActionImpl.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import com.sun.star.accessibility.XAccessibleAction;
+
+/** The AccessibleActionWrapper maps the calls to the java AccessibleAction interface
+ *  to the corresponding methods of the UNO XAccessibleAction interface.
+ */
+public class AccessibleActionImpl implements javax.accessibility.AccessibleAction {
+
+    protected XAccessibleAction unoObject;
+
+    /** Creates new AccessibleActionWrapper */
+    public AccessibleActionImpl(XAccessibleAction xAccessibleAction) {
+        unoObject = xAccessibleAction;
+    }
+
+    public boolean doAccessibleAction(int param) {
+        try {
+            return unoObject.doAccessibleAction(param);
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            return false;
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return false;
+        }
+    }
+
+    public java.lang.String getAccessibleActionDescription(int param) {
+        try {
+            return unoObject.getAccessibleActionDescription(param);
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            return null;
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return null;
+        }
+    }
+
+    public int getAccessibleActionCount() {
+        try {
+            return unoObject.getAccessibleActionCount();
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return 0;
+        }
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleComponentImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleComponentImpl.java
new file mode 100644
index 000000000000..5bac982756a2
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleComponentImpl.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import com.sun.star.accessibility.AccessibleStateType;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleComponent;
+// import com.sun.star.accessibility.XAccessibleExtendedComponent;
+import com.sun.star.uno.UnoRuntime;
+
+public class AccessibleComponentImpl implements javax.accessibility.AccessibleComponent {
+
+    protected XAccessibleComponent unoObject;
+//  protected XAccessibleExtendedComponent unoAccessibleExtendedComponent = null;
+
+    /** Creates new AccessibleComponentImpl */
+    public AccessibleComponentImpl(XAccessibleComponent xAccessibleComponent) {
+        unoObject = xAccessibleComponent;
+    }
+
+    protected boolean hasState(short state) {
+        try {
+            XAccessibleContext unoAccessibleContext = (XAccessibleContext)
+                UnoRuntime.queryInterface(XAccessibleContext.class, unoObject);
+            // All UNO accessibility implementations must support XAccessibleContext
+            // and return a valid XAccessibleStateSet ..
+            return unoAccessibleContext.getAccessibleStateSet().contains(state);
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return false;
+        } catch (java.lang.NullPointerException e) {
+            System.err.println("XAccessibleContext unsupported or no XAccessibleStateSet returned.");
+            return false;
+        }
+    }
+
+    /*
+     * XAccessibleComponent
+     */
+
+    /** Returns the background color of the object */
+    public java.awt.Color getBackground() {
+        try {
+            return new java.awt.Color(unoObject.getBackground());
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return null;
+        }
+    }
+
+    public void setBackground(java.awt.Color c) {
+        // Not supported by UNO accessibility API
+    }
+
+    /** Returns the foreground color of the object */
+    public java.awt.Color getForeground() {
+        try {
+            return new java.awt.Color(unoObject.getForeground());
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return null;
+        }
+    }
+
+    public void setForeground(java.awt.Color c) {
+        // Not supported by UNO accessibility API
+    }
+
+    public java.awt.Cursor getCursor() {
+        // Not supported by UNO accessibility API
+        return null;
+    }
+
+    public void setCursor(java.awt.Cursor cursor) {
+        // Not supported by UNO accessibility API
+    }
+
+    public java.awt.Font getFont() {
+        // FIXME
+        return null;
+    }
+
+    public void setFont(java.awt.Font f) {
+        // Not supported by UNO accessibility API
+    }
+
+    public java.awt.FontMetrics getFontMetrics(java.awt.Font f) {
+        // FIXME
+        return null;
+    }
+
+    public boolean isEnabled() {
+        return hasState(AccessibleStateType.ENABLED);
+        }
+
+    public void setEnabled(boolean b) {
+        // Not supported by UNO accessibility API
+    }
+
+    public boolean isVisible() {
+        return hasState(AccessibleStateType.VISIBLE);
+    }
+
+    public void setVisible(boolean b) {
+        // Not supported by UNO accessibility API
+    }
+
+    public boolean isShowing() {
+        return hasState(AccessibleStateType.SHOWING);
+    }
+
+    public boolean contains(java.awt.Point p) {
+        try {
+            return unoObject.containsPoint(new com.sun.star.awt.Point(p.x, p.y));
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return false;
+        }
+    }
+
+    /** Returns the location of the object on the screen. */
+    public java.awt.Point getLocationOnScreen() {
+        try {
+            com.sun.star.awt.Point unoPoint = unoObject.getLocationOnScreen();
+            return new java.awt.Point(unoPoint.X, unoPoint.Y);
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return null;
+        }
+    }
+
+    /** Gets the location of this component in the form of a point specifying the component's top-left corner */
+    public java.awt.Point getLocation() {
+        try {
+            com.sun.star.awt.Point unoPoint = unoObject.getLocation();
+            return new java.awt.Point( unoPoint.X, unoPoint.Y );
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return null;
+        }
+    }
+
+    /** Moves this component to a new location */
+    public void setLocation(java.awt.Point p) {
+        // Not supported by UNO accessibility API
+    }
+
+    /** Gets the bounds of this component in the form of a Rectangle object */
+    public java.awt.Rectangle getBounds() {
+        try {
+            com.sun.star.awt.Rectangle unoRect = unoObject.getBounds();
+            return new java.awt.Rectangle(unoRect.X, unoRect.Y, unoRect.Width, unoRect.Height);
+            } catch (com.sun.star.uno.RuntimeException e) {
+            return null;
+        }
+    }
+
+    /** Moves and resizes this component to conform to the new bounding rectangle r */
+    public void setBounds(java.awt.Rectangle r) {
+        // Not supported by UNO accessibility API
+    }
+
+    /** Returns the size of this component in the form of a Dimension object */
+    public java.awt.Dimension getSize() {
+        try {
+            com.sun.star.awt.Size unoSize = unoObject.getSize();
+            return new java.awt.Dimension(unoSize.Width, unoSize.Height);
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return null;
+        }
+    }
+
+    /** Resizes this component so that it has width d.width and height d.height */
+    public void setSize(java.awt.Dimension d) {
+        // Not supported by UNO accessibility API
+    }
+
+    public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
+        // Not supported by this implementation
+        return null;
+    }
+
+    public boolean isFocusTraversable() {
+        return hasState(AccessibleStateType.FOCUSABLE);
+        }
+
+    public void requestFocus() {
+        unoObject.grabFocus();
+    }
+
+    /**
+    * Adds the specified focus listener to receive focus events from
+    * this component when this component gains input focus.
+    * If listener <code>l</code> is <code>null</code>,
+    * no exception is thrown and no action is performed.
+    */
+
+    public void addFocusListener(java.awt.event.FocusListener l) {
+        // Not supported by this implementation
+    }
+
+    /**
+    * Removes the specified focus listener so that it no longer
+    * receives focus events from this component. This method performs
+    * no function, nor does it throw an exception, if the listener
+    * specified by the argument was not previously added to this component.
+    * If listener <code>l</code> is <code>null</code>,
+    * no exception is thrown and no action is performed.
+    */
+
+    public void removeFocusListener(java.awt.event.FocusListener l) {
+        // Not supported by this implementation
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl.java
new file mode 100644
index 000000000000..4863b560ef71
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleEditableTextImpl.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import com.sun.star.awt.*;
+import com.sun.star.style.*;
+import com.sun.star.uno.*;
+import com.sun.star.accessibility.AccessibleTextType;
+import com.sun.star.accessibility.XAccessibleEditableText;
+
+import javax.accessibility.AccessibleText;
+import javax.swing.text.StyleConstants;
+
+/** The GenericAccessibleEditableText mapps the calls to the java AccessibleEditableText
+ *  interface to the corresponding methods of the UNO XAccessibleEditableText interface.
+ */
+public class AccessibleEditableTextImpl extends AccessibleTextImpl implements javax.accessibility.AccessibleEditableText {
+    final static double toPointFactor = 1 / (7/10 + 34.5);
+
+    /** Creates new GenericAccessibleEditableText object */
+    public AccessibleEditableTextImpl(XAccessibleEditableText xAccessibleEditableText) {
+        super(xAccessibleEditableText);
+    }
+
+    /** Cuts the text between two indices into the system clipboard */
+    public void cut(int startIndex, int endIndex) {
+        try {
+            ((XAccessibleEditableText) unoObject).cutText(startIndex, endIndex);
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+    }
+
+    /** Deletes the text between two indices */
+    public void delete(int startIndex, int endIndex) {
+        try {
+            ((XAccessibleEditableText) unoObject).deleteText(startIndex, endIndex);
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+    }
+
+    /** Returns the text range between two indices */
+    public String getTextRange(int startIndex, int endIndex) {
+        try {
+            return unoObject.getTextRange(startIndex, endIndex);
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+        return null;
+    }
+
+    /** Inserts the specified string at the given index */
+    public void insertTextAtIndex(int index, String s){
+        try {
+            ((XAccessibleEditableText) unoObject).insertText(s, index);
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+    }
+
+    /** Pastes the text form the system clipboard into the text starting at the specified index */
+    public void paste(int startIndex) {
+        try {
+            ((XAccessibleEditableText) unoObject).pasteText(startIndex);
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+    }
+
+    /** Replaces the text between two indices with the specified string */
+    public void replaceText(int startIndex, int endIndex, String s) {
+        try {
+            ((XAccessibleEditableText) unoObject).replaceText(startIndex, endIndex, s);
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+    }
+
+    /** Selects the text between two indices */
+    public void selectText(int startIndex, int endIndex) {
+        try {
+            unoObject.setSelection(startIndex, endIndex);
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+    }
+
+    /** Sets the attributes for the text between two indices */
+    public void setAttributes(int startIndex, int endIndex, javax.swing.text.AttributeSet as) {
+        java.util.Vector propertyValues = new java.util.Vector();
+
+        // Convert Alignment attribute
+        Object attribute = as.getAttribute(StyleConstants.Alignment);
+        if (null != attribute) {
+            com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
+            propertyValue.Name = "ParaAdjust";
+
+            switch (StyleConstants.getAlignment(as)) {
+                case StyleConstants.ALIGN_RIGHT:
+                    propertyValue.Value = ParagraphAdjust.RIGHT;
+                    break;
+                case StyleConstants.ALIGN_CENTER:
+                    propertyValue.Value = ParagraphAdjust.CENTER;
+                    break;
+                case StyleConstants.ALIGN_JUSTIFIED:
+                    propertyValue.Value = ParagraphAdjust.BLOCK;
+                    break;
+                default:
+                    propertyValue.Value = ParagraphAdjust.LEFT;
+                    break;
+            }
+            propertyValues.add(propertyValue);
+        }
+
+        // Convert Background attribute
+        attribute = as.getAttribute(StyleConstants.Background);
+        if (null != attribute) {
+            com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
+            propertyValue.Name = "CharBackColor";
+            propertyValue.Value = new Integer(StyleConstants.getBackground(as).getRGB());
+            propertyValues.add(propertyValue);
+        }
+
+        // FIXME: BidiLevel
+
+        // Set Bold attribute
+        attribute = as.getAttribute(StyleConstants.Bold);
+        if (null != attribute) {
+            com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
+            propertyValue.Name = "CharWeight";
+            if (StyleConstants.isBold(as)) {
+                propertyValue.Value =  new Float(150);
+            } else {
+                propertyValue.Value =  new Float(100);
+            }
+            propertyValues.add(propertyValue);
+        }
+
+        // FIXME: Java 1.4 ComponentAttribute, ComponentElementName, ComposedTextAttribute
+
+        // Set FirstLineIndent attribute
+        attribute = as.getAttribute(StyleConstants.FirstLineIndent);
+        if (null != attribute) {
+            com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
+            propertyValue.Name = "ParaFirstLineIndent";
+            propertyValue.Value = new Double(StyleConstants.getFirstLineIndent(as) / toPointFactor);
+            propertyValues.add(propertyValue);
+        }
+
+        // Set font family attribute
+        attribute = as.getAttribute(StyleConstants.FontFamily);
+        if (null != attribute) {
+            com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
+            propertyValue.Name = "CharFontPitch";
+
+            if (StyleConstants.getFontFamily(as).equals( "Proportional" )) {
+                propertyValue.Value = new Short("2");
+            } else {
+                propertyValue.Value = new Short("1");
+            }
+            propertyValues.add(propertyValue);
+        }
+
+        // Set font size attribute
+        attribute = as.getAttribute(StyleConstants.FontSize);
+        if (null != attribute) {
+            com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
+            propertyValue.Name = "CharHeight";
+            propertyValue.Value = new Integer(StyleConstants.getFontSize(as));
+            propertyValues.add(propertyValue);
+        }
+
+        // Map foreground color
+        attribute = as.getAttribute(StyleConstants.Foreground);
+        if (null != attribute) {
+            com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
+            propertyValue.Name = "CharColor";
+            propertyValue.Value = new Integer (StyleConstants.getForeground(as).getRGB());
+            propertyValues.add(propertyValue);
+        }
+
+        // FIXME: IconAttribute, IconElementName
+
+        // Set italic attribute
+        attribute = as.getAttribute(StyleConstants.Italic);
+        if (null != attribute) {
+            com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
+            propertyValue.Name = "CharPosture";
+
+            if (StyleConstants.isItalic(as)) {
+                propertyValue.Value = FontSlant.ITALIC;
+            } else {
+                propertyValue.Value = FontSlant.DONTKNOW;
+            }
+            propertyValues.add(propertyValue);
+        }
+
+        // Set left indent attribute
+        attribute = as.getAttribute(StyleConstants.LeftIndent);
+        if (null != attribute) {
+            com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
+            propertyValue.Name = "ParaFirstLeftMargin";
+            propertyValue.Value = new Integer(new Double(StyleConstants.getLeftIndent(as) / toPointFactor).intValue());
+            propertyValues.add(propertyValue);
+        }
+
+        // Set right indent attribute
+        attribute = as.getAttribute(StyleConstants.RightIndent);
+        if (null != attribute) {
+            com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
+            propertyValue.Name = "ParaFirstRightMargin";
+            propertyValue.Value = new Integer(new Double(StyleConstants.getRightIndent(as) / toPointFactor).intValue());
+            propertyValues.add(propertyValue);
+        }
+
+        // Set line spacing attribute
+        attribute = as.getAttribute(StyleConstants.LineSpacing);
+        if (null != attribute) {
+            com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
+            propertyValue.Name = "ParaLineSpacing";
+            propertyValue.Value = new Integer(new Double(StyleConstants.getLineSpacing(as) / toPointFactor).intValue());
+            propertyValues.add(propertyValue);
+        }
+
+        // FIXME: Java 1.4 NameAttribute, Orientation, ResolveAttribute
+
+        // Set space above attribute
+        attribute = as.getAttribute(StyleConstants.SpaceAbove);
+        if (null != attribute) {
+            com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
+            propertyValue.Name = "ParaTopMargin";
+            propertyValue.Value = new Integer(new Double( StyleConstants.getSpaceAbove(as) / toPointFactor).intValue());
+            propertyValues.add(propertyValue);
+        }
+
+        // Set space below attribute
+        attribute = as.getAttribute(StyleConstants.SpaceBelow);
+        if (null != attribute) {
+            com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
+                        propertyValue.Name = "ParaBottomMargin";
+            propertyValue.Value = new Integer(new Double(StyleConstants.getSpaceBelow(as) / toPointFactor).intValue());
+            propertyValues.add(propertyValue);
+        }
+
+        // Set strike through attribute
+        attribute = as.getAttribute(StyleConstants.StrikeThrough);
+        if (null != attribute) {
+            com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
+                        propertyValue.Name = "CharPosture";
+            if (StyleConstants.isStrikeThrough(as)) {
+                propertyValue.Value = new Short(FontStrikeout.SINGLE);
+            } else {
+                propertyValue.Value = new Short(FontStrikeout.NONE);
+            }
+            propertyValues.add(propertyValue);
+        }
+
+        // Set sub-/superscript attribute
+        attribute = as.getAttribute(StyleConstants.Superscript);
+        if (null == attribute) {
+            attribute = as.getAttribute(StyleConstants.Subscript);
+        }
+        if (null != attribute) {
+            com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
+            propertyValue.Name = "CharEscapement";
+
+            if (StyleConstants.isSuperscript(as)) {
+                propertyValue.Value = new Short( "1" );
+            } else if (StyleConstants.isSubscript(as)) {
+                propertyValue.Value = new Short( "-1" );
+            } else {
+                propertyValue.Value = new Short( "0" );
+            }
+            propertyValues.add(propertyValue);
+        }
+
+        // Set tabset attribute
+        attribute = as.getAttribute(StyleConstants.TabSet);
+        if (null != attribute) {
+            com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
+            propertyValue.Name = "ParaTabStops";
+
+            javax.swing.text.TabSet tabSet = StyleConstants.getTabSet(as);
+            java.util.ArrayList tabStops = new java.util.ArrayList(tabSet.getTabCount());
+
+            for (int i = 0, max = tabSet.getTabCount(); i < max; i++) {
+                javax.swing.text.TabStop tab = tabSet.getTab(i);
+                com.sun.star.style.TabStop unoTab = new com.sun.star.style.TabStop();
+
+                unoTab.Position = new Double(tab.getPosition() / toPointFactor).intValue();
+
+                switch (tab.getAlignment()) {
+                    case javax.swing.text.TabStop.ALIGN_CENTER:
+                        unoTab.Alignment = TabAlign.CENTER;
+                        break;
+                    case javax.swing.text.TabStop.ALIGN_RIGHT:
+                        unoTab.Alignment = TabAlign.RIGHT;
+                        break;
+                    case javax.swing.text.TabStop.ALIGN_DECIMAL:
+                        unoTab.Alignment = TabAlign.DECIMAL;
+                        break;
+                    default:
+                        unoTab.Alignment = TabAlign.LEFT;
+                        break;
+                }
+
+                tabStops.add(unoTab);
+            }
+            propertyValue.Value = (com.sun.star.style.TabStop[]) tabStops.toArray();
+            propertyValues.add(propertyValue);
+        }
+
+        // Set underline attribute
+        attribute = as.getAttribute(StyleConstants.Underline);
+        if (null != attribute) {
+            com.sun.star.beans.PropertyValue propertyValue = new com.sun.star.beans.PropertyValue();
+            propertyValue.Name = "CharUnderline";
+
+            if (StyleConstants.isUnderline(as)) {
+                propertyValue.Value = new Short(FontUnderline.SINGLE);
+            } else {
+                propertyValue.Value = new Short(FontUnderline.NONE);
+            }
+            propertyValues.add(propertyValue);
+        }
+
+        try {
+            ((XAccessibleEditableText) unoObject).setAttributes(startIndex, endIndex, (com.sun.star.beans.PropertyValue[]) propertyValues.toArray());
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+    }
+
+    /** Sets the text contents to the specified string */
+    public void setTextContents(String s) {
+        try {
+            ((XAccessibleEditableText) unoObject).setText(s);
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleExtendedState.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleExtendedState.java
new file mode 100644
index 000000000000..3d4500d322df
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleExtendedState.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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import javax.accessibility.AccessibleState;
+
+public class AccessibleExtendedState extends AccessibleState {
+    public static final AccessibleState DEFUNCT;
+    public static final AccessibleState INDETERMINATE;
+    public static final AccessibleState MANAGES_DESCENDANTS;
+    public static final AccessibleState SENSITIVE;
+    public static final AccessibleState STALE;
+
+    static {
+        DEFUNCT = new AccessibleExtendedState("defunct");
+
+        // JAVA 1.5: will come with manages_descendants and indeterminate
+        INDETERMINATE = new AccessibleExtendedState("indeterminate");
+        MANAGES_DESCENDANTS = new AccessibleExtendedState("managesDescendants");
+
+        SENSITIVE = new AccessibleExtendedState("sensitive");
+        STALE = new AccessibleExtendedState("stale");
+    }
+
+    protected AccessibleExtendedState(String key) {
+        super(key);
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleHypertextImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleHypertextImpl.java
new file mode 100644
index 000000000000..1bb3bc5961ad
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleHypertextImpl.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import org.openoffice.java.accessibility.logging.*;
+
+import com.sun.star.accessibility.*;
+import com.sun.star.uno.*;
+
+/** The AccessibleHypertextImpl mapps all calls to the java AccessibleHypertext
+ *  interface to the corresponding methods of the UNO XAccessibleHypertext
+ *  interface.
+ */
+public class AccessibleHypertextImpl extends AccessibleTextImpl
+    implements javax.accessibility.AccessibleHypertext {
+
+    protected class Hyperlink extends javax.accessibility.AccessibleHyperlink {
+        protected XAccessibleHyperlink unoObject;
+
+        public Hyperlink(XAccessibleHyperlink xHyperlink) {
+            unoObject = xHyperlink;
+        }
+
+        public int getStartIndex() {
+            try {
+                System.err.println("StartIndex: " + unoObject.getStartIndex());
+                return unoObject.getStartIndex();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return -1;
+            }
+        }
+
+        public Object getAccessibleActionObject(int param) {
+            System.err.println("getActionObject");
+            try {
+                Object any = unoObject.getAccessibleActionObject(param);
+                if (AnyConverter.isString(any)) {
+                    String url = AnyConverter.toString(any);
+                    if (null != url) {
+                        return new java.net.URL(url);
+                    }
+                }
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+            } catch (java.net.MalformedURLException exception) {
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+
+            return null;
+        }
+
+        public int getEndIndex() {
+            try {
+                System.err.println("StartIndex: " + unoObject.getEndIndex());
+                return unoObject.getEndIndex();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return -1;
+            }
+        }
+
+        public Object getAccessibleActionAnchor(int param) {
+            System.err.println("getActionAnchor");
+            try {
+                Object any = unoObject.getAccessibleActionObject(param);
+                if (AnyConverter.isString(any)) {
+                    System.err.println("Anchor: " + AnyConverter.toString(any));
+                    return AnyConverter.toString(any);
+                }
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+            return null;
+        }
+
+        public boolean isValid() {
+            return unoObject.isValid();
+        }
+
+        public boolean doAccessibleAction(int param) {
+            try {
+                return unoObject.doAccessibleAction(param);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return false;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return false;
+            }
+        }
+
+        public String getAccessibleActionDescription(int param) {
+            try {
+                return unoObject.getAccessibleActionDescription(param);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return null;
+            }
+        }
+
+        public int getAccessibleActionCount() {
+            try {
+                return unoObject.getAccessibleActionCount();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return 0;
+            }
+        }
+    }
+
+    /** Creates new AccessibleHypertextImpl */
+    public AccessibleHypertextImpl(XAccessibleHypertext xAccessibleHypertext) {
+        if (Build.PRODUCT) {
+            unoObject = xAccessibleHypertext;
+        } else {
+            String property = System.getProperty("AccessBridgeLogging");
+            if ((property != null) && (property.indexOf("text") != -1)) {
+                unoObject = new XAccessibleHypertextLog(xAccessibleHypertext);
+            } else {
+                unoObject = xAccessibleHypertext;
+            }
+        }
+    }
+
+    public static javax.accessibility.AccessibleText get(com.sun.star.uno.XInterface unoObject) {
+        try {
+            XAccessibleHypertext unoAccessibleHypertext = (XAccessibleHypertext)
+                UnoRuntime.queryInterface(XAccessibleHypertext.class, unoObject);
+            if (unoAccessibleHypertext != null) {
+                return new AccessibleHypertextImpl(unoAccessibleHypertext);
+            }
+
+            XAccessibleText unoAccessibleText = (XAccessibleText)
+                UnoRuntime.queryInterface(XAccessibleText.class, unoObject);
+            if (unoAccessibleText != null) {
+                return new AccessibleTextImpl(unoAccessibleText);
+            }
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+        return null;
+    }
+
+    public javax.accessibility.AccessibleHyperlink getLink(int param) {
+        try {
+            return new Hyperlink(((XAccessibleHypertext) unoObject).getHyperLink(param));
+        }
+
+        catch(com.sun.star.lang.IndexOutOfBoundsException exception) {
+            throw new IndexOutOfBoundsException(exception.getMessage());
+        }
+    }
+
+    public int getLinkCount() {
+        try {
+            return ((XAccessibleHypertext) unoObject).getHyperLinkCount();
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return 0;
+        }
+    }
+
+    public int getLinkIndex(int param) {
+        try {
+            return ((XAccessibleHypertext) unoObject).getHyperLinkIndex(param);
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            return -1;
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return -1;
+        }
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleIconImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleIconImpl.java
new file mode 100644
index 000000000000..ba41534f245b
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleIconImpl.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import com.sun.star.accessibility.XAccessibleImage;
+
+/**
+ */
+public class AccessibleIconImpl implements javax.accessibility.AccessibleIcon {
+
+    XAccessibleImage unoAccessibleImage;
+
+    public AccessibleIconImpl(XAccessibleImage xImage) {
+        unoAccessibleImage = xImage;
+    }
+
+    /** Gets the description of the icon */
+    public String getAccessibleIconDescription() {
+        try {
+            return unoAccessibleImage.getAccessibleImageDescription();
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return null;
+        }
+    }
+
+    /** Gets the height of the icon */
+    public int getAccessibleIconHeight() {
+        try {
+            return unoAccessibleImage.getAccessibleImageHeight();
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return 0;
+        }
+    }
+
+    /** Gets the width of the icon */
+    public int getAccessibleIconWidth() {
+        try {
+            return unoAccessibleImage.getAccessibleImageWidth();
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return 0;
+        }
+    }
+
+    /** Sets the description of the icon */
+    public void setAccessibleIconDescription(String s) {
+        // Not supported
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding.java
new file mode 100644
index 000000000000..1eb3201c5d68
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleKeyBinding.java
@@ -0,0 +1,386 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import com.sun.star.accessibility.*;
+import com.sun.star.awt.KeyStroke;
+
+/**
+ *
+ */
+public class AccessibleKeyBinding extends Object implements javax.accessibility.AccessibleKeyBinding {
+
+    XAccessibleKeyBinding unoAccessibleKeybinding;
+
+    public AccessibleKeyBinding(XAccessibleKeyBinding unoKB) {
+        unoAccessibleKeybinding = unoKB;
+    }
+
+    public static int convertModifiers(short s) {
+        int modifiers = 0;
+        if ((s & com.sun.star.awt.KeyModifier.SHIFT) != 0) {
+            modifiers = modifiers | java.awt.event.KeyEvent.SHIFT_DOWN_MASK;
+        }
+
+        if ((s & com.sun.star.awt.KeyModifier.MOD1) != 0) {
+            modifiers = modifiers | java.awt.event.KeyEvent.CTRL_DOWN_MASK;
+        }
+
+        if ((s & com.sun.star.awt.KeyModifier.MOD2) != 0) {
+            modifiers = modifiers | java.awt.event.KeyEvent.ALT_DOWN_MASK;
+        }
+
+        if ((s & com.sun.star.awt.KeyModifier.MOD3) != 0) {
+            modifiers = modifiers | java.awt.event.KeyEvent.META_DOWN_MASK;
+        }
+
+        return modifiers;
+    }
+
+    public static int convertKeyCode(short s) {
+        int keycode = java.awt.event.KeyEvent.VK_UNDEFINED;
+
+        switch(s) {
+            case com.sun.star.awt.Key.NUM0:
+                keycode = java.awt.event.KeyEvent.VK_0;
+                break;
+            case com.sun.star.awt.Key.NUM1:
+                keycode = java.awt.event.KeyEvent.VK_1;
+                break;
+            case com.sun.star.awt.Key.NUM2:
+                keycode = java.awt.event.KeyEvent.VK_2;
+                break;
+            case com.sun.star.awt.Key.NUM3:
+                keycode = java.awt.event.KeyEvent.VK_3;
+                break;
+            case com.sun.star.awt.Key.NUM4:
+                keycode = java.awt.event.KeyEvent.VK_4;
+                break;
+            case com.sun.star.awt.Key.NUM5:
+                keycode = java.awt.event.KeyEvent.VK_5;
+                break;
+            case com.sun.star.awt.Key.NUM6:
+                keycode = java.awt.event.KeyEvent.VK_6;
+                break;
+            case com.sun.star.awt.Key.NUM7:
+                keycode = java.awt.event.KeyEvent.VK_7;
+                break;
+            case com.sun.star.awt.Key.NUM8:
+                keycode = java.awt.event.KeyEvent.VK_8;
+                break;
+            case com.sun.star.awt.Key.NUM9:
+                keycode = java.awt.event.KeyEvent.VK_9;
+                break;
+            case com.sun.star.awt.Key.A:
+                keycode = java.awt.event.KeyEvent.VK_A;
+                break;
+            case com.sun.star.awt.Key.B:
+                keycode = java.awt.event.KeyEvent.VK_B;
+                break;
+            case com.sun.star.awt.Key.C:
+                keycode = java.awt.event.KeyEvent.VK_C;
+                break;
+            case com.sun.star.awt.Key.D:
+                keycode = java.awt.event.KeyEvent.VK_D;
+                break;
+            case com.sun.star.awt.Key.E:
+                keycode = java.awt.event.KeyEvent.VK_E;
+                break;
+            case com.sun.star.awt.Key.F:
+                keycode = java.awt.event.KeyEvent.VK_F;
+                break;
+            case com.sun.star.awt.Key.G:
+                keycode = java.awt.event.KeyEvent.VK_G;
+                break;
+            case com.sun.star.awt.Key.H:
+                keycode = java.awt.event.KeyEvent.VK_H;
+                break;
+            case com.sun.star.awt.Key.I:
+                keycode = java.awt.event.KeyEvent.VK_I;
+                break;
+            case com.sun.star.awt.Key.J:
+                keycode = java.awt.event.KeyEvent.VK_J;
+                break;
+            case com.sun.star.awt.Key.K:
+                keycode = java.awt.event.KeyEvent.VK_K;
+                break;
+            case com.sun.star.awt.Key.L:
+                keycode = java.awt.event.KeyEvent.VK_L;
+                break;
+            case com.sun.star.awt.Key.M:
+                keycode = java.awt.event.KeyEvent.VK_M;
+                break;
+            case com.sun.star.awt.Key.N:
+                keycode = java.awt.event.KeyEvent.VK_N;
+                break;
+            case com.sun.star.awt.Key.O:
+                keycode = java.awt.event.KeyEvent.VK_O;
+                break;
+            case com.sun.star.awt.Key.P:
+                keycode = java.awt.event.KeyEvent.VK_P;
+                break;
+            case com.sun.star.awt.Key.Q:
+                keycode = java.awt.event.KeyEvent.VK_Q;
+                break;
+            case com.sun.star.awt.Key.R:
+                keycode = java.awt.event.KeyEvent.VK_R;
+                break;
+            case com.sun.star.awt.Key.S:
+                keycode = java.awt.event.KeyEvent.VK_S;
+                break;
+            case com.sun.star.awt.Key.T:
+                keycode = java.awt.event.KeyEvent.VK_T;
+                break;
+            case com.sun.star.awt.Key.U:
+                keycode = java.awt.event.KeyEvent.VK_U;
+                break;
+            case com.sun.star.awt.Key.V:
+                keycode = java.awt.event.KeyEvent.VK_V;
+                break;
+            case com.sun.star.awt.Key.W:
+                keycode = java.awt.event.KeyEvent.VK_W;
+                break;
+            case com.sun.star.awt.Key.X:
+                keycode = java.awt.event.KeyEvent.VK_X;
+                break;
+            case com.sun.star.awt.Key.Y:
+                keycode = java.awt.event.KeyEvent.VK_Y;
+                break;
+            case com.sun.star.awt.Key.Z:
+                keycode = java.awt.event.KeyEvent.VK_Z;
+                break;
+            case com.sun.star.awt.Key.F1:
+                keycode = java.awt.event.KeyEvent.VK_F1;
+                break;
+            case com.sun.star.awt.Key.F2:
+                keycode = java.awt.event.KeyEvent.VK_F2;
+                break;
+            case com.sun.star.awt.Key.F3:
+                keycode = java.awt.event.KeyEvent.VK_F3;
+                break;
+            case com.sun.star.awt.Key.F4:
+                keycode = java.awt.event.KeyEvent.VK_F4;
+                break;
+            case com.sun.star.awt.Key.F5:
+                keycode = java.awt.event.KeyEvent.VK_F5;
+                break;
+            case com.sun.star.awt.Key.F6:
+                keycode = java.awt.event.KeyEvent.VK_F6;
+                break;
+            case com.sun.star.awt.Key.F7:
+                keycode = java.awt.event.KeyEvent.VK_F7;
+                break;
+            case com.sun.star.awt.Key.F8:
+                keycode = java.awt.event.KeyEvent.VK_F8;
+                break;
+            case com.sun.star.awt.Key.F9:
+                keycode = java.awt.event.KeyEvent.VK_F9;
+                break;
+            case com.sun.star.awt.Key.F10:
+                keycode = java.awt.event.KeyEvent.VK_F10;
+                break;
+            case com.sun.star.awt.Key.F11:
+                keycode = java.awt.event.KeyEvent.VK_F11;
+                break;
+            case com.sun.star.awt.Key.F12:
+                keycode = java.awt.event.KeyEvent.VK_F12;
+                break;
+            case com.sun.star.awt.Key.F13:
+                keycode = java.awt.event.KeyEvent.VK_F13;
+                break;
+            case com.sun.star.awt.Key.F14:
+                keycode = java.awt.event.KeyEvent.VK_F14;
+                break;
+            case com.sun.star.awt.Key.F15:
+                keycode = java.awt.event.KeyEvent.VK_F15;
+                break;
+            case com.sun.star.awt.Key.F16:
+                keycode = java.awt.event.KeyEvent.VK_F16;
+                break;
+            case com.sun.star.awt.Key.F17:
+                keycode = java.awt.event.KeyEvent.VK_F17;
+                break;
+            case com.sun.star.awt.Key.F18:
+                keycode = java.awt.event.KeyEvent.VK_F18;
+                break;
+            case com.sun.star.awt.Key.F19:
+                keycode = java.awt.event.KeyEvent.VK_F19;
+                break;
+            case com.sun.star.awt.Key.F20:
+                keycode = java.awt.event.KeyEvent.VK_F20;
+                break;
+            case com.sun.star.awt.Key.F21:
+                keycode = java.awt.event.KeyEvent.VK_F21;
+                break;
+            case com.sun.star.awt.Key.F22:
+                keycode = java.awt.event.KeyEvent.VK_F22;
+                break;
+            case com.sun.star.awt.Key.F23:
+                keycode = java.awt.event.KeyEvent.VK_F23;
+                break;
+            case com.sun.star.awt.Key.F24:
+                keycode = java.awt.event.KeyEvent.VK_F24;
+                break;
+            case com.sun.star.awt.Key.DOWN:
+                keycode = java.awt.event.KeyEvent.VK_DOWN;
+                break;
+            case com.sun.star.awt.Key.UP:
+                keycode = java.awt.event.KeyEvent.VK_UP;
+                break;
+            case com.sun.star.awt.Key.LEFT:
+                keycode = java.awt.event.KeyEvent.VK_LEFT;
+                break;
+            case com.sun.star.awt.Key.RIGHT:
+                keycode = java.awt.event.KeyEvent.VK_RIGHT;
+                break;
+            case com.sun.star.awt.Key.HOME:
+                keycode = java.awt.event.KeyEvent.VK_HOME;
+                break;
+            case com.sun.star.awt.Key.END:
+                keycode = java.awt.event.KeyEvent.VK_END;
+                break;
+            case com.sun.star.awt.Key.PAGEUP:
+                keycode = java.awt.event.KeyEvent.VK_PAGE_UP;
+                break;
+            case com.sun.star.awt.Key.PAGEDOWN:
+                keycode = java.awt.event.KeyEvent.VK_PAGE_DOWN;
+                break;
+            case com.sun.star.awt.Key.RETURN:
+                keycode = java.awt.event.KeyEvent.VK_ENTER;
+                break;
+            case com.sun.star.awt.Key.ESCAPE:
+                keycode = java.awt.event.KeyEvent.VK_ESCAPE;
+                break;
+            case com.sun.star.awt.Key.TAB:
+                keycode = java.awt.event.KeyEvent.VK_TAB;
+                break;
+            case com.sun.star.awt.Key.BACKSPACE:
+                keycode = java.awt.event.KeyEvent.VK_BACK_SPACE;
+                break;
+            case com.sun.star.awt.Key.SPACE:
+                keycode = java.awt.event.KeyEvent.VK_SPACE;
+                break;
+            case com.sun.star.awt.Key.INSERT:
+                keycode = java.awt.event.KeyEvent.VK_INSERT;
+                break;
+            case com.sun.star.awt.Key.DELETE:
+                keycode = java.awt.event.KeyEvent.VK_DELETE;
+                break;
+            case com.sun.star.awt.Key.ADD:
+                keycode = java.awt.event.KeyEvent.VK_ADD;
+                break;
+            case com.sun.star.awt.Key.SUBTRACT:
+                keycode = java.awt.event.KeyEvent.VK_SUBTRACT;
+                break;
+            case com.sun.star.awt.Key.MULTIPLY:
+                keycode = java.awt.event.KeyEvent.VK_MULTIPLY;
+                break;
+            case com.sun.star.awt.Key.DIVIDE:
+                keycode = java.awt.event.KeyEvent.VK_DIVIDE;
+                break;
+            case com.sun.star.awt.Key.POINT:
+                keycode = java.awt.event.KeyEvent.VK_PERIOD;
+                break;
+            case com.sun.star.awt.Key.COMMA:
+                keycode = java.awt.event.KeyEvent.VK_COMMA;
+                break;
+            case com.sun.star.awt.Key.LESS:
+                keycode = java.awt.event.KeyEvent.VK_LESS;
+                break;
+            case com.sun.star.awt.Key.GREATER:
+                keycode = java.awt.event.KeyEvent.VK_GREATER;
+                break;
+            case com.sun.star.awt.Key.EQUAL:
+                keycode = java.awt.event.KeyEvent.VK_EQUALS;
+                break;
+            case com.sun.star.awt.Key.CUT:
+                keycode = java.awt.event.KeyEvent.VK_CUT;
+                break;
+            case com.sun.star.awt.Key.COPY:
+                keycode = java.awt.event.KeyEvent.VK_COPY;
+                break;
+            case com.sun.star.awt.Key.PASTE:
+                keycode = java.awt.event.KeyEvent.VK_PASTE;
+                break;
+            case com.sun.star.awt.Key.UNDO:
+                keycode = java.awt.event.KeyEvent.VK_UNDO;
+                break;
+            case com.sun.star.awt.Key.FIND:
+                keycode = java.awt.event.KeyEvent.VK_FIND;
+                break;
+            case com.sun.star.awt.Key.PROPERTIES:
+                keycode = java.awt.event.KeyEvent.VK_PROPS;
+                break;
+            case com.sun.star.awt.Key.HELP:
+                keycode = java.awt.event.KeyEvent.VK_HELP;
+                break;
+            default:
+                ;
+        }
+        return keycode;
+    }
+
+    /*
+    * AccessibleKeyBinding
+    */
+
+    /** Returns a key binding for this object */
+    public Object getAccessibleKeyBinding(int i) {
+        try {
+            KeyStroke[] keys = unoAccessibleKeybinding.getAccessibleKeyBinding(i);
+            javax.swing.KeyStroke[] data = new javax.swing.KeyStroke[keys.length];
+            for (int j=0; j < keys.length; j++) {
+                int keyCode = convertKeyCode(keys[j].KeyCode);
+                if (keyCode != java.awt.event.KeyEvent.VK_UNDEFINED) {
+                    data[j] = javax.swing.KeyStroke.getKeyStroke(keyCode, convertModifiers(keys[j].Modifiers));
+                } else {
+                    data[j] = null;
+                }
+            }
+
+            if (keys.length == 1) {
+                return data[0];
+            } else {
+                return data;
+            }
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            return null;
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return null;
+        }
+    }
+
+    /** Returns the number of key bindings for this object */
+        public int getAccessibleKeyBindingCount() {
+        try {
+            return unoAccessibleKeybinding.getAccessibleKeyBindingCount();
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return 0;
+        }
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java
new file mode 100644
index 000000000000..129a3b820993
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleObjectFactory.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import java.lang.ref.WeakReference;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleStateSet;
+
+import com.sun.star.uno.*;
+import com.sun.star.accessibility.*;
+import org.openoffice.java.accessibility.logging.XAccessibleEventLog;
+
+/**
+*/
+public class AccessibleObjectFactory {
+    // This type is needed for conversions from/to uno Any
+    public static final Type XAccessibleType = new Type(XAccessible.class);
+
+    private static java.util.Hashtable objectList = new java.util.Hashtable();
+    private static java.awt.FocusTraversalPolicy focusTraversalPolicy = new FocusTraversalPolicy();
+
+    private static java.awt.EventQueue theEventQueue = java.awt.Toolkit.getDefaultToolkit().
+                                                                        getSystemEventQueue();
+
+    public static java.awt.EventQueue getEventQueue() {
+        return theEventQueue;
+    }
+
+    public static void postFocusGained(java.awt.Component c) {
+        getEventQueue().postEvent(new java.awt.event.FocusEvent(c, java.awt.event.FocusEvent.FOCUS_GAINED));
+    }
+
+    public static void postWindowGainedFocus(java.awt.Window w) {
+        postWindowEvent(w, java.awt.event.WindowEvent.WINDOW_GAINED_FOCUS);
+    }
+
+    public static void postWindowLostFocus(java.awt.Window w) {
+        postWindowEvent(w, java.awt.event.WindowEvent.WINDOW_LOST_FOCUS);
+    }
+
+    public static void postWindowActivated(java.awt.Window w) {
+        postWindowEvent(w, java.awt.event.WindowEvent.WINDOW_ACTIVATED);
+    }
+
+    public static void postWindowDeactivated(java.awt.Window w) {
+        postWindowEvent(w, java.awt.event.WindowEvent.WINDOW_DEACTIVATED);
+    }
+
+    public static void postWindowOpened(java.awt.Window w) {
+        postWindowEvent(w, java.awt.event.WindowEvent.WINDOW_OPENED);
+    }
+
+    public static void postWindowClosed(java.awt.Window w) {
+        postWindowEvent(w, java.awt.event.WindowEvent.WINDOW_CLOSED);
+    }
+
+    public static void invokeAndWait() {
+        try {
+            theEventQueue.invokeAndWait( new java.lang.Runnable () {
+                                                public void run() {
+                                                }
+                                             });
+        } catch (java.lang.reflect.InvocationTargetException e) {
+        } catch (java.lang.InterruptedException e) {
+        }
+    }
+
+    private static void postWindowEvent(java.awt.Window w, int i) {
+        theEventQueue.postEvent(new java.awt.event.WindowEvent(w, i));
+    }
+
+    public static java.awt.Component getAccessibleComponent(XAccessible xAccessible) {
+        java.awt.Component c = null;
+        if (xAccessible != null) {
+            // Retrieve unique id for the original UNO object to be used as a hash key
+            String oid = UnoRuntime.generateOid(xAccessible);
+
+            // Check if we already have a wrapper object for this context
+            synchronized (objectList) {
+                WeakReference r = (WeakReference) objectList.get(oid);
+                if(r != null) {
+                    c = (java.awt.Component) r.get();
+                }
+            }
+        }
+        return c;
+    }
+
+    public static void addChild(java.awt.Container parent, Object any) {
+        try {
+            addChild(parent, (XAccessible) AnyConverter.toObject(XAccessibleType, any));
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+            System.err.println(e.getClass().getName() + " caught: " + e.getMessage());
+        }
+    }
+
+    public static void addChild(java.awt.Container parent, XAccessible child) {
+        try {
+            if (child != null) {
+                XAccessibleContext childAC = child.getAccessibleContext();
+                if (childAC != null) {
+                    XAccessibleStateSet stateSet = childAC.getAccessibleStateSet();
+                    if (stateSet != null) {
+                        java.awt.Component c = getAccessibleComponent(child);
+
+                        // Re-use existing wrapper if possible, create a new one otherwise
+                        if (c != null) {
+                            // Seems to be already in child list
+                            if (parent.equals(c.getParent()))
+                                return;
+                            // Update general component states
+                            c.setEnabled(stateSet.contains(AccessibleStateType.ENABLED));
+                            c.setVisible(stateSet.contains(AccessibleStateType.VISIBLE));
+                        } else {
+                            c = createAccessibleComponentImpl(child, childAC, stateSet);
+                        }
+
+                        if (c != null) {
+                            if (c instanceof java.awt.Container) {
+                                populateContainer((java.awt.Container) c, childAC);
+                            }
+                            parent.add(c);
+                            // Simulate focus gained event for new child
+                            if (stateSet.contains(AccessibleStateType.FOCUSED)) {
+                                postFocusGained(c);
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (com.sun.star.uno.RuntimeException e) {
+                System.err.println(e.getClass().getName() + " caught: " + e.getMessage());
+                e.printStackTrace();
+        }
+    }
+
+    protected static void removeChild(java.awt.Container parent, Object any) {
+        try {
+            XAccessible xAccessible = (XAccessible) AnyConverter.toObject(XAccessibleType, any);
+            java.awt.Component c = getAccessibleComponent(xAccessible);
+
+            if (c != null) {
+                    parent.remove(c);
+
+                    if (c instanceof java.awt.Container) {
+                        clearContainer((java.awt.Container) c);
+                    }
+                }
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+            System.err.println(e.getClass().getName() + " caught: " + e.getMessage());
+        }
+    }
+
+
+    /**
+    * Removes all children from the container parent
+    */
+
+    protected static void clearContainer(java.awt.Container parent) {
+        // Purge all children from this container
+        int count = parent.getComponentCount();
+        for (int i = 0; i < count; i++) {
+            java.awt.Component c = parent.getComponent(i);
+            if (c instanceof java.awt.Container) {
+                clearContainer((java.awt.Container) c);
+            }
+        }
+        parent.removeAll();
+    }
+
+
+    /**
+    * Populates the given Container parent with wrapper objects for all children of parentAC. This method is
+    * intended to be called when a container is added using a CHILDREN_CHANGED event.
+    */
+
+    protected static void populateContainer(java.awt.Container parent, XAccessibleContext parentAC) {
+        if (parentAC != null) {
+            try {
+                int childCount = parentAC.getAccessibleChildCount();
+                for (int i=0; i<childCount; i++) {
+                    addChild(parent, parentAC.getAccessibleChild(i));
+                }
+            } catch (java.lang.Exception e) {
+                System.err.println(e.getClass().getName() + " caught: " + e.getMessage());
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+    * Populates the given Container parent with wrapper objects for all children of parentAC. This method is
+    * intended to be called when a new window has been opened.
+    */
+    protected static void populateContainer(java.awt.Container parent, XAccessibleContext parentAC, java.awt.Window frame) {
+        if (parentAC != null) {
+            try {
+                int childCount = parentAC.getAccessibleChildCount();
+                for (int i=0; i<childCount; i++) {
+                    XAccessible child = parentAC.getAccessibleChild(i);
+                    if (child != null) {
+                        XAccessibleContext childAC = child.getAccessibleContext();
+                        java.awt.Component c = createAccessibleComponent(child, childAC, frame);
+                        if (c != null) {
+                            if (c instanceof java.awt.Container) {
+                                populateContainer((java.awt.Container) c, childAC, frame);
+                            }
+                            parent.add(c);
+                        }
+                    } else if (Build.DEBUG) {
+                        System.err.println("ignoring not accessible child " + i);
+                    }
+                }
+            }
+
+            catch (java.lang.Exception e) {
+                System.err.println(e.getClass().getName() + " caught: " + e.getMessage());
+                e.printStackTrace();
+            }
+        }
+    }
+
+    protected static java.awt.Component createAccessibleComponent(XAccessible xAccessible) {
+        try {
+            XAccessibleContext xAccessibleContext = xAccessible.getAccessibleContext();
+            if (xAccessibleContext != null) {
+                return createAccessibleComponentImpl(xAccessible, xAccessibleContext, xAccessibleContext.getAccessibleStateSet());
+            }
+        } catch (com.sun.star.uno.RuntimeException e) {
+                System.err.println(e.getClass().getName() + " caught: " + e.getMessage());
+                e.printStackTrace();
+        }
+        return null;
+    }
+
+    protected static java.awt.Component createAccessibleComponent(XAccessible xAccessible, XAccessibleContext xAccessibleContext,
+        java.awt.Window frame) {
+        if (xAccessibleContext != null) {
+            try {
+                XAccessibleStateSet xAccessibleStateSet = xAccessibleContext.getAccessibleStateSet();
+                java.awt.Component c = createAccessibleComponentImpl(xAccessible, xAccessibleContext, xAccessibleStateSet);
+                if (c != null) {
+                    // Set this component as initial component
+                    if (xAccessibleStateSet.contains(AccessibleStateType.FOCUSED)) {
+                        if (frame instanceof NativeFrame) {
+                            ((NativeFrame) frame).setInitialComponent(c);
+                        }
+                    }
+                    return c;
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+                System.err.println(e.getClass().getName() + " caught: " + e.getMessage());
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+    protected static java.awt.Component createAccessibleComponentImpl(XAccessible xAccessible, XAccessibleContext xAccessibleContext,
+        XAccessibleStateSet xAccessibleStateSet) {
+        java.awt.Component c = null;
+        short role = xAccessibleContext.getAccessibleRole();
+        switch (role) {
+            case AccessibleRole.CANVAS:
+                c = new Container(javax.accessibility.AccessibleRole.CANVAS,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.CHECK_BOX:
+                c = new CheckBox(xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.COMBO_BOX:
+                c = new ComboBox(xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.DOCUMENT:
+                c = new Container(javax.accessibility.AccessibleRole.CANVAS,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.EMBEDDED_OBJECT:
+                c = new Container(javax.accessibility.AccessibleRole.PANEL,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.END_NOTE:
+                c = new Container(javax.accessibility.AccessibleRole.PANEL,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.FILLER:
+                c = new Container(javax.accessibility.AccessibleRole.FILLER,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.FOOTNOTE:
+                c = new Container(javax.accessibility.AccessibleRole.PANEL,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.FOOTER:
+                c = new Container(javax.accessibility.AccessibleRole.PANEL,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.GRAPHIC:
+                c = new Container(javax.accessibility.AccessibleRole.PANEL,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.HEADER:
+                c = new Container(javax.accessibility.AccessibleRole.PANEL,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.ICON:
+                c = new Icon(xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.LABEL:
+                c = new Label(xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.LAYERED_PANE:
+                c = new Container(javax.accessibility.AccessibleRole.LAYERED_PANE,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.LIST:
+                if (xAccessibleStateSet.contains(AccessibleStateType.MANAGES_DESCENDANTS)) {
+                    c = new List(xAccessible, xAccessibleContext);
+                } else {
+                    c = new Container(javax.accessibility.AccessibleRole.LIST,
+                        xAccessible, xAccessibleContext);
+                }
+                break;
+            case AccessibleRole.MENU:
+                c = new Menu(xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.MENU_BAR:
+                c = new MenuContainer(javax.accessibility.AccessibleRole.MENU_BAR, xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.MENU_ITEM:
+                c = new MenuItem(xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.POPUP_MENU:
+                c = new MenuContainer(javax.accessibility.AccessibleRole.POPUP_MENU, xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.OPTION_PANE:
+                c = new Container(javax.accessibility.AccessibleRole.OPTION_PANE,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.PAGE_TAB:
+                c = new Container(javax.accessibility.AccessibleRole.PAGE_TAB, xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.PAGE_TAB_LIST:
+                c = new Container(javax.accessibility.AccessibleRole.PAGE_TAB_LIST, xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.PARAGRAPH:
+            case AccessibleRole.HEADING:
+                c = new Paragraph(xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.PANEL:
+                c = new Container(javax.accessibility.AccessibleRole.PANEL,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.PUSH_BUTTON:
+                c = new Button(xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.RADIO_BUTTON:
+                c = new RadioButton(xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.ROOT_PANE:
+                c = new Container(javax.accessibility.AccessibleRole.ROOT_PANE,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.SCROLL_BAR:
+                c = new ScrollBar(xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.SCROLL_PANE:
+                c = new Container(javax.accessibility.AccessibleRole.SCROLL_PANE,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.SEPARATOR:
+                c = new Separator(xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.SHAPE:
+                c = new Container(javax.accessibility.AccessibleRole.CANVAS,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.SPLIT_PANE:
+                c = new Container(javax.accessibility.AccessibleRole.SPLIT_PANE,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.STATUS_BAR:
+                c = new Container(javax.accessibility.AccessibleRole.STATUS_BAR,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.COLUMN_HEADER:
+            case AccessibleRole.TABLE:
+                if (xAccessibleStateSet.contains(AccessibleStateType.MANAGES_DESCENDANTS)) {
+                    c = new Table(xAccessible, xAccessibleContext,
+                        xAccessibleStateSet.contains(AccessibleStateType.MULTI_SELECTABLE));
+                } else {
+                    c = new Container(javax.accessibility.AccessibleRole.TABLE,
+                        xAccessible, xAccessibleContext);
+                }
+                break;
+            case AccessibleRole.TABLE_CELL:
+                if( xAccessibleContext.getAccessibleChildCount() > 0 )
+                    c = new Container(javax.accessibility.AccessibleRole.PANEL,
+                        xAccessible, xAccessibleContext);
+                else
+                    c = new Label(xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.TEXT:
+                c = new TextComponent(xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.TEXT_FRAME:
+                c = new Container(javax.accessibility.AccessibleRole.PANEL,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.TOGGLE_BUTTON:
+                c = new ToggleButton(xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.TOOL_BAR:
+                c = new Container(javax.accessibility.AccessibleRole.TOOL_BAR,
+                    xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.TOOL_TIP:
+                c = new ToolTip(xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.TREE:
+                c = new Tree(xAccessible, xAccessibleContext);
+                break;
+            case AccessibleRole.VIEW_PORT:
+                c = new Container(javax.accessibility.AccessibleRole.VIEWPORT,
+                    xAccessible, xAccessibleContext);
+                break;
+            default:
+                System.err.println("Unmapped accessible object " + role);
+                System.err.println("usually mapped to " + AccessibleRoleAdapter.getAccessibleRole(role));
+                c = new Container(AccessibleRoleAdapter.getAccessibleRole(role),
+                    xAccessible, xAccessibleContext);
+                break;
+        }
+        if (c != null) {
+            // Add the newly created object to the cache list
+            synchronized (objectList) {
+                objectList.put(c.toString(), new WeakReference(c));
+                if (Build.DEBUG) {
+//                  System.out.println("Object cache now contains " + objectList.size() + " objects.");
+                }
+            }
+
+            AccessibleStateAdapter.setComponentState(c, xAccessibleStateSet);
+
+            if (! Build.PRODUCT) {
+                String property = System.getProperty("AccessBridgeLogging");
+                if ((property != null) && (property.indexOf("event") != -1)) {
+                    XAccessibleEventLog.addEventListener(xAccessibleContext, c);
+                }
+            }
+        }
+
+        return c;
+    }
+
+    protected static void disposing(java.awt.Component c) {
+        if (c != null) {
+            synchronized (objectList) {
+                objectList.remove(c.toString());
+            }
+        }
+    }
+
+    public static java.awt.Window getTopWindow(XAccessible xAccessible) {
+        XAccessibleContext xAccessibleContext = xAccessible.getAccessibleContext();
+
+        if (xAccessibleContext != null) {
+            short role = xAccessibleContext.getAccessibleRole();
+            XAccessibleStateSet xAccessibleStateSet = xAccessibleContext.getAccessibleStateSet();
+            XAccessibleComponent xAccessibleComponent = (XAccessibleComponent)
+                UnoRuntime.queryInterface(XAccessibleComponent.class, xAccessibleContext);
+
+            java.awt.Window w;
+            if (role == AccessibleRole.DIALOG) {
+                w = new Dialog(new Application(),
+                    xAccessibleContext.getAccessibleName(),
+                    xAccessibleStateSet.contains(AccessibleStateType.MODAL),
+                    xAccessibleComponent);
+            } else if (role == AccessibleRole.ALERT) {
+                w = new Alert(new Application(),
+                    xAccessibleContext.getAccessibleName(),
+                    xAccessibleStateSet.contains(AccessibleStateType.MODAL),
+                    xAccessibleComponent);
+            } else if (role == AccessibleRole.FRAME) {
+                w = new Frame(xAccessibleContext.getAccessibleName(),
+                    xAccessibleComponent);
+            } else if (role == AccessibleRole.WINDOW) {
+                java.awt.Window activeWindow =
+                    java.awt.KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow();
+                if (activeWindow != null) {
+                    w = new Window(activeWindow, xAccessibleComponent);
+                } else {
+                    if (Build.DEBUG) {
+                        System.err.println("no active frame found for Window: " + role);
+                    }
+                    return null;
+                }
+            } else {
+                if (Build.DEBUG) {
+                    System.err.println("invalid role for toplevel window: " + role);
+                }
+                return null;
+            }
+            populateContainer(w, xAccessibleContext, w);
+            w.setFocusTraversalPolicy(focusTraversalPolicy);
+            w.setVisible(true);
+
+            // Make the new window the focused one if it has an initialy focused object set.
+            java.awt.Component c = ((NativeFrame) w).getInitialComponent();
+            if (c != null) {
+                postWindowGainedFocus(w);
+            }
+            return w;
+        }
+
+        return null;
+    }
+}
+
+
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRelationAdapter.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRelationAdapter.java
new file mode 100644
index 000000000000..2f1709acac45
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRelationAdapter.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import javax.accessibility.Accessible;
+import com.sun.star.accessibility.AccessibleRelation;
+import com.sun.star.accessibility.XAccessible;
+
+/**
+ */
+public abstract class AccessibleRelationTypeMap {
+
+    final static String[] data = {
+        null,
+        javax.accessibility.AccessibleRelation.CONTROLLED_BY,
+        javax.accessibility.AccessibleRelation.CONTROLLED_BY,
+        javax.accessibility.AccessibleRelation.CONTROLLER_FOR,
+        javax.accessibility.AccessibleRelation.CONTROLLER_FOR,
+        javax.accessibility.AccessibleRelation.LABEL_FOR,
+        javax.accessibility.AccessibleRelation.LABEL_FOR,
+        javax.accessibility.AccessibleRelation.LABELED_BY,
+        javax.accessibility.AccessibleRelation.LABELED_BY,
+        javax.accessibility.AccessibleRelation.MEMBER_OF,
+        javax.accessibility.AccessibleRelation.MEMBER_OF
+    };
+
+    public static void fillAccessibleRelationSet(javax.accessibility.AccessibleRelationSet s, AccessibleRelation[] relations) {
+        AccessibleObjectFactory factory = AccessibleObjectFactory.getDefault();
+        for(int i=0; i<relations.length; i++) {
+            if( relations[i].RelationType < data.length && data[relations[i].RelationType] != null ) {
+                javax.accessibility.AccessibleRelation r =
+                    new javax.accessibility.AccessibleRelation(data[relations[i].RelationType]);
+
+                r.setTarget(factory.getAccessibleObjectSet(relations[i].TargetSet));
+                s.add(r);
+            }
+        }
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRoleAdapter.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRoleAdapter.java
new file mode 100644
index 000000000000..c7f630fdd3ab
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleRoleAdapter.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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+
+/** This class maps the AccessibleRole(s) of the UNO accessibility API
+ *  to the corresponding javax.accessibility objects.
+ */
+public abstract class AccessibleRoleAdapter {
+
+    /* This array is used as a mapping between the UNO AccessibleRole
+    * and the AccessibleRole objects of the Java accessibility API.
+    */
+    public static final javax.accessibility.AccessibleRole[] data = {
+        javax.accessibility.AccessibleRole.UNKNOWN,
+        javax.accessibility.AccessibleRole.ALERT,
+        javax.accessibility.AccessibleRole.COLUMN_HEADER,
+        javax.accessibility.AccessibleRole.CANVAS,
+        javax.accessibility.AccessibleRole.CHECK_BOX,
+        javax.accessibility.AccessibleRole.CHECK_BOX,   // CHECK_MENU_ITEM
+        javax.accessibility.AccessibleRole.COLOR_CHOOSER,
+        javax.accessibility.AccessibleRole.COMBO_BOX,
+        javax.accessibility.AccessibleRole.DATE_EDITOR,
+        javax.accessibility.AccessibleRole.DESKTOP_ICON,
+        javax.accessibility.AccessibleRole.DESKTOP_PANE,
+        javax.accessibility.AccessibleRole.DIRECTORY_PANE,
+        javax.accessibility.AccessibleRole.DIALOG,
+        javax.accessibility.AccessibleRole.CANVAS, // DOCUMENT
+        javax.accessibility.AccessibleRole.PANEL,  // EMBEDDED_OBJECT
+        javax.accessibility.AccessibleRole.PANEL,  // ENDNOTE
+        javax.accessibility.AccessibleRole.FILE_CHOOSER,
+        javax.accessibility.AccessibleRole.FILLER,
+        javax.accessibility.AccessibleRole.FONT_CHOOSER,
+        javax.accessibility.AccessibleRole.FOOTER,
+        javax.accessibility.AccessibleRole.PANEL,  // FOOTNOTE
+        javax.accessibility.AccessibleRole.FRAME,
+        javax.accessibility.AccessibleRole.GLASS_PANE,
+        javax.accessibility.AccessibleRole.PANEL,  // GRAPHIC
+        javax.accessibility.AccessibleRole.GROUP_BOX,
+        javax.accessibility.AccessibleRole.HEADER,
+        javax.accessibility.AccessibleRole.TEXT,   // HEADING
+        javax.accessibility.AccessibleRole.HYPERLINK,
+        javax.accessibility.AccessibleRole.ICON,
+        javax.accessibility.AccessibleRole.INTERNAL_FRAME,
+        javax.accessibility.AccessibleRole.LABEL,
+        javax.accessibility.AccessibleRole.LAYERED_PANE,
+        javax.accessibility.AccessibleRole.LIST,
+        javax.accessibility.AccessibleRole.LABEL,   // LIST_ITEM - required by Zoomtext
+        javax.accessibility.AccessibleRole.MENU,
+        javax.accessibility.AccessibleRole.MENU_BAR,
+        javax.accessibility.AccessibleRole.MENU_ITEM,
+        javax.accessibility.AccessibleRole.OPTION_PANE,
+        javax.accessibility.AccessibleRole.PAGE_TAB,
+        javax.accessibility.AccessibleRole.PAGE_TAB_LIST,
+        javax.accessibility.AccessibleRole.PANEL,
+        javax.accessibility.AccessibleRole.PARAGRAPH,
+        javax.accessibility.AccessibleRole.PASSWORD_TEXT,
+        javax.accessibility.AccessibleRole.POPUP_MENU,
+        javax.accessibility.AccessibleRole.PUSH_BUTTON,
+        javax.accessibility.AccessibleRole.PROGRESS_BAR,
+        javax.accessibility.AccessibleRole.RADIO_BUTTON,
+        javax.accessibility.AccessibleRole.RADIO_BUTTON,  // RADIO_MENU_ITEM
+        javax.accessibility.AccessibleRole.ROW_HEADER,
+        javax.accessibility.AccessibleRole.ROOT_PANE,
+        javax.accessibility.AccessibleRole.SCROLL_BAR,
+        javax.accessibility.AccessibleRole.SCROLL_PANE,
+        javax.accessibility.AccessibleRole.CANVAS,  // SHAPE
+        javax.accessibility.AccessibleRole.SEPARATOR,
+        javax.accessibility.AccessibleRole.SLIDER,
+        javax.accessibility.AccessibleRole.SPIN_BOX,
+        javax.accessibility.AccessibleRole.SPLIT_PANE,
+        javax.accessibility.AccessibleRole.STATUS_BAR,
+        javax.accessibility.AccessibleRole.TABLE,
+        javax.accessibility.AccessibleRole.LABEL,  // TABLE_CELL - required by ZoomText
+        javax.accessibility.AccessibleRole.TEXT,
+        javax.accessibility.AccessibleRole.PANEL,  // TEXT_FRAME
+        javax.accessibility.AccessibleRole.TOGGLE_BUTTON,
+        javax.accessibility.AccessibleRole.TOOL_BAR,
+        javax.accessibility.AccessibleRole.TOOL_TIP,
+        javax.accessibility.AccessibleRole.TREE,
+        javax.accessibility.AccessibleRole.VIEWPORT,
+        javax.accessibility.AccessibleRole.WINDOW,
+    javax.accessibility.AccessibleRole.RADIO_BUTTON,  // BUTTON_DROPDOWN
+    javax.accessibility.AccessibleRole.RADIO_BUTTON,  // BUTTON_MENU
+    javax.accessibility.AccessibleRole.PANEL,  // CAPTION
+    javax.accessibility.AccessibleRole.PANEL,  // CHART
+    javax.accessibility.AccessibleRole.EDITBAR,
+    javax.accessibility.AccessibleRole.PANEL,  // FORM
+    javax.accessibility.AccessibleRole.PANEL,  // IMAGE_MAP
+    javax.accessibility.AccessibleRole.PANEL,  // NOTE
+    javax.accessibility.AccessibleRole.PANEL,  // PAGE
+    javax.accessibility.AccessibleRole.RULER,
+    javax.accessibility.AccessibleRole.PANEL,  // SECTION
+    javax.accessibility.AccessibleRole.LABEL,  // TREE_ITEM
+    javax.accessibility.AccessibleRole.TABLE   // TREE_TABLE
+    };
+
+    public static javax.accessibility.AccessibleRole getAccessibleRole(short role) {
+        if(role < data.length) {
+            if(data[role] == null) {
+                System.err.println("Unmapped role: " + role);
+            }
+            return data[role];
+        }
+        // FIXME: remove debug out
+        System.err.println("Unmappable role: " + role);
+        return null;
+    }
+
+    public static javax.accessibility.AccessibleRole getAccessibleRole(XAccessible unoAccessible) {
+        try {
+                        XAccessibleContext unoAccessibleContext = unoAccessible.getAccessibleContext();
+                        if (unoAccessibleContext != null) {
+                            return getAccessibleRole(unoAccessibleContext.getAccessibleRole());
+                        }
+                        return null;
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return javax.accessibility.AccessibleRole.UNKNOWN;
+        }
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleSelectionImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleSelectionImpl.java
new file mode 100644
index 000000000000..6e40c1e7a78d
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleSelectionImpl.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import com.sun.star.accessibility.*;
+
+class AccessibleSelectionImpl implements javax.accessibility.AccessibleSelection {
+    XAccessibleSelection unoAccessibleSelection;
+
+    AccessibleSelectionImpl(XAccessibleSelection xAccessibleSelection) {
+        unoAccessibleSelection = xAccessibleSelection;
+    }
+
+    /** Returns an Accessible representing the specified selected child of the object */
+    public javax.accessibility.Accessible getAccessibleSelection(int i) {
+        try {
+            return (javax.accessibility.Accessible) AccessibleObjectFactory.getAccessibleComponent(
+                unoAccessibleSelection.getSelectedAccessibleChild(i));
+        } catch (com.sun.star.uno.Exception e) {
+            return null;
+        }
+    }
+
+    /** Adds the specified Accessible child of the object to the object's selection */
+    public void addAccessibleSelection(int i) {
+        try {
+            unoAccessibleSelection.selectAccessibleChild(i);
+        } catch (com.sun.star.uno.Exception e) {
+        }
+    }
+
+    /** Clears the selection in the object, so that no children in the object are selected */
+    public void clearAccessibleSelection() {
+        try {
+            unoAccessibleSelection.clearAccessibleSelection();
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+    }
+
+    /** Returns the number of Accessible children currently selected */
+    public int getAccessibleSelectionCount() {
+        try {
+            return unoAccessibleSelection.getSelectedAccessibleChildCount();
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return 0;
+        }
+    }
+
+    /** Determines if the current child of this object is selected */
+    public boolean isAccessibleChildSelected(int i) {
+        try {
+            return unoAccessibleSelection.isAccessibleChildSelected(i);
+        } catch (com.sun.star.uno.Exception e) {
+            return false;
+        }
+    }
+
+    /** Removes the specified child of the object from the object's selection */
+    public void removeAccessibleSelection(int i) {
+        try {
+            unoAccessibleSelection.deselectAccessibleChild(i);
+        } catch (com.sun.star.uno.Exception e) {
+        }
+    }
+
+    /** Causes every child of the object to be selected if the object supports multiple selection */
+    public void selectAllAccessibleSelection() {
+        try {
+            unoAccessibleSelection.selectAllAccessibleChildren();
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+    }
+
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleStateAdapter.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleStateAdapter.java
new file mode 100644
index 000000000000..ea1979a545ed
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleStateAdapter.java
@@ -0,0 +1,214 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
+
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.accessibility.AccessibleStateType;
+import com.sun.star.accessibility.XAccessibleStateSet;
+
+public class AccessibleStateAdapter {
+
+    private static final AccessibleState[] stateTypeMap = {
+        null,
+        AccessibleState.ACTIVE,
+        AccessibleState.ARMED,
+        AccessibleState.BUSY,
+        AccessibleState.CHECKED,
+        AccessibleExtendedState.DEFUNCT,
+        AccessibleState.EDITABLE,
+        AccessibleState.ENABLED,
+        AccessibleState.EXPANDABLE,
+        AccessibleState.EXPANDED,
+        AccessibleState.FOCUSABLE,
+        AccessibleState.FOCUSED,
+        AccessibleState.HORIZONTAL,
+        AccessibleState.ICONIFIED,
+        AccessibleExtendedState.INDETERMINATE,
+        AccessibleExtendedState.MANAGES_DESCENDANTS,
+        AccessibleState.MODAL,
+        AccessibleState.MULTI_LINE,
+        AccessibleState.MULTISELECTABLE,
+        AccessibleState.OPAQUE,
+        AccessibleState.PRESSED,
+        AccessibleState.RESIZABLE,
+        AccessibleState.SELECTABLE,
+        AccessibleState.SELECTED,
+        AccessibleExtendedState.SENSITIVE,
+        AccessibleState.SHOWING,
+        AccessibleState.SINGLE_LINE,
+        AccessibleExtendedState.STALE,
+        AccessibleState.TRANSIENT,
+        AccessibleState.VERTICAL,
+        AccessibleState.VISIBLE
+    };
+
+    private static void printToplevelStateMessage(AccessibleState s, java.awt.Component c) {
+        System.err.println("*** ERROR *** " + s + " state is a toplevel window state " + c);
+    }
+
+    private static String getDisplayName(java.awt.Component c) {
+        javax.accessibility.Accessible a = (javax.accessibility.Accessible) c;
+        if( a != null) {
+            javax.accessibility.AccessibleContext ac = a.getAccessibleContext();
+            return "[" + ac.getAccessibleRole() + "] " + ac.getAccessibleName();
+        } else {
+            return c.toString();
+        }
+    }
+
+    private static void printOutOfSyncMessage(AccessibleState s, java.awt.Component c, boolean enabled) {
+        System.err.println("*** ERROR *** " + s + " state out of sync (UNO state set: " + !enabled + ", Java component state: " + enabled + ") for " + getDisplayName(c));
+    }
+
+    public static AccessibleState getAccessibleState(Object any) {
+       try {
+            if (AnyConverter.isShort(any)) {
+                return getAccessibleState(AnyConverter.toShort(any));
+            }
+            return null;
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+            return null;
+        }
+    }
+
+    public static AccessibleState getAccessibleState(short unoStateType) {
+        if (unoStateType > 0 && unoStateType < stateTypeMap.length) {
+            return stateTypeMap[unoStateType];
+        }
+        return null;
+    }
+
+    public static AccessibleStateSet getDefunctStateSet() {
+        AccessibleStateSet ass = new AccessibleStateSet();
+        ass.add(AccessibleExtendedState.DEFUNCT);
+        return ass;
+    }
+
+    public static void setComponentState(java.awt.Component c,
+            XAccessibleStateSet xAccessibleStateSet) {
+
+        try {
+            if (xAccessibleStateSet != null) {
+                // Set the boundings of the component if it is visible ..
+                if (!xAccessibleStateSet.contains(AccessibleStateType.VISIBLE)) {
+                    c.setVisible(false);
+                }
+                // Set the components' enabled state ..
+                if (!xAccessibleStateSet.contains(AccessibleStateType.ENABLED)) {
+                    c.setEnabled(false);
+                }
+                // Set the components' focusable state ..
+                if (!xAccessibleStateSet.contains(AccessibleStateType.FOCUSABLE)) {
+                    c.setFocusable(false);
+                }
+            }
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+    }
+
+    public static AccessibleStateSet getAccessibleStateSet(java.awt.Component c,
+            XAccessibleStateSet xAccessibleStateSet) {
+
+        try {
+            if (xAccessibleStateSet != null) {
+                AccessibleStateSet as = new AccessibleStateSet();
+                short[] unoStateTypes = xAccessibleStateSet.getStates();
+                for (int i=0; i<unoStateTypes.length; i++) {
+                    if (unoStateTypes[i] > 0 &&
+                            unoStateTypes[i] < stateTypeMap.length) {
+                        as.add(stateTypeMap[unoStateTypes[i]]);
+                    }
+                }
+
+                // Note: COLLAPSED does not exists in the UAA.
+                if (as.contains(AccessibleState.EXPANDABLE) &&
+                        ! as.contains(AccessibleState.EXPANDED)) {
+                    as.add(AccessibleState.COLLAPSED);
+                }
+
+                // Sync office and Java FOCUSED state
+                boolean isFocusInSync;
+                if (c.isFocusOwner()) {
+                    isFocusInSync = !as.add(AccessibleState.FOCUSED);
+                } else {
+                    isFocusInSync = !as.remove(AccessibleState.FOCUSED);
+                }
+
+                // Sync office and Java ACTIVE state
+                boolean isActiveInSync;
+                if (c instanceof java.awt.Window && ((java.awt.Window) c).isActive()) {
+                    isActiveInSync = !as.add(AccessibleState.ACTIVE);
+                } else {
+                    isActiveInSync = !as.remove(AccessibleState.ACTIVE);
+                }
+
+                // Report out-of-sync messages
+                if (!Build.PRODUCT) {
+                    if (!isFocusInSync) {
+                        printOutOfSyncMessage(AccessibleState.FOCUSED, c, c.isFocusOwner());
+                    }
+                    if (!isActiveInSync) {
+                        printOutOfSyncMessage(AccessibleState.ACTIVE, c, ((java.awt.Window) c).isActive());
+                    }
+                    if (as.contains(AccessibleState.ENABLED) != c.isEnabled()) {
+                        printOutOfSyncMessage(AccessibleState.ENABLED, c, c.isEnabled());
+                    }
+                    if (as.contains(AccessibleState.FOCUSABLE) != c.isFocusable()) {
+                        printOutOfSyncMessage(AccessibleState.FOCUSABLE, c, c.isFocusable());
+                    }
+                    if (as.contains(AccessibleState.SHOWING) != c.isShowing()) {
+                        printOutOfSyncMessage(AccessibleState.SHOWING, c, c.isShowing());
+                    }
+                    if (as.contains(AccessibleState.VISIBLE) != c.isVisible()) {
+                        printOutOfSyncMessage(AccessibleState.VISIBLE, c, c.isVisible());
+                    }
+
+                    // The following states are for toplevel windows only
+                    if (! (c instanceof java.awt.Window)) {
+                        if (as.contains(AccessibleState.ACTIVE)) {
+                            printToplevelStateMessage(AccessibleState.ACTIVE, c);
+                        }
+                        if (as.contains(AccessibleState.ICONIFIED)) {
+                            printToplevelStateMessage(AccessibleState.ICONIFIED, c);
+                        }
+                        if (as.contains(AccessibleState.MODAL)) {
+                            printToplevelStateMessage(AccessibleState.MODAL, c);
+                        }
+                    }
+                }
+                return as;
+            }
+            return null;
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return getDefunctStateSet();
+        }
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.java
new file mode 100644
index 000000000000..c3bcbde2a71a
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleTextImpl.java
@@ -0,0 +1,678 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+package org.openoffice.java.accessibility;
+
+import com.sun.star.accessibility.*;
+import com.sun.star.awt.*;
+import com.sun.star.style.*;
+import com.sun.star.uno.*;
+
+import org.openoffice.java.accessibility.logging.*;
+
+import java.text.BreakIterator;
+import java.util.Locale;
+
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleText;
+
+import javax.swing.text.StyleConstants;
+
+/** The GenericAccessibleEditableText mapps the calls to the java AccessibleEditableText
+ *  interface to the corresponding methods of the UNO XAccessibleEditableText interface.
+ */
+public class AccessibleTextImpl implements javax.accessibility.AccessibleText {
+    final static double toPointFactor = 1 / ((7 / 10) + 34.5);
+    final static String[] attributeList = {
+        "ParaAdjust", "CharBackColor", "CharWeight", "ParaFirstLineIndent",
+        "CharFontPitch", "CharHeight", "CharColor", "CharPosture",
+        "ParaLeftMargin", "ParaLineSpacing", "ParaTopMargin", "ParaBottomMargin",
+        "CharStrikeout", "CharEscapement", "ParaTabStops", "CharUnderline"
+    };
+
+    final static String[] localeAttributeList = {
+        "CharLocale", "CharLocaleAsian", "CharLocaleComplex"
+    };
+
+    XAccessibleText unoObject;
+    private javax.swing.text.TabSet tabSet = null;
+    private javax.swing.text.TabStop[] tabStops = null;
+    private static Type TextSegmentType = new Type(TextSegment.class);
+    private static Type UnoLocaleType = new Type(com.sun.star.lang.Locale.class);
+
+    /** Creates new GenericAccessibleEditableText object */
+    public AccessibleTextImpl(XAccessibleText xAccessibleText) {
+
+        if (Build.PRODUCT) {
+            unoObject = xAccessibleText;
+        } else {
+            String property = System.getProperty("AccessBridgeLogging");
+            if ((property != null) && (property.indexOf("text") != -1)) {
+                unoObject = new XAccessibleTextLog(xAccessibleText);
+            } else {
+                unoObject = xAccessibleText;
+            }
+        }
+    }
+
+    public AccessibleTextImpl() {
+    }
+
+    public static javax.accessibility.AccessibleText get(com.sun.star.uno.XInterface unoObject) {
+        try {
+            XAccessibleText unoAccessibleText = (XAccessibleText)
+                UnoRuntime.queryInterface(XAccessibleText.class, unoObject);
+            if (unoAccessibleText != null) {
+                return new AccessibleTextImpl(unoAccessibleText);
+            }
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+        return null;
+    }
+
+    protected static Object convertTextSegment(Object any) {
+        try {
+            if (AnyConverter.isObject(any)) {
+                TextSegment ts = (TextSegment)
+                    AnyConverter.toObject(TextSegmentType, any);
+                if (ts != null) {
+                    // Since there is nothing like a "range" object in the JAA yet,
+                    // the Object[3] is a private negotiation with the JABG
+                    Object[] array = { new Integer(ts.SegmentStart),
+                        new Integer(ts.SegmentEnd), ts.SegmentText };
+                    return array;
+                }
+            }
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+        }
+
+        return null;
+    }
+
+    /** Returns the locale object.
+     *
+     *  Since switching the UI language only takes effect on the next
+     *  office start, UI elements can return a cached value here - given
+     *  that Java UNO initializes the default locale correctly, this is
+     *  the perfect place to grab this cached values.
+     *
+     *  However, since there are more sophisticated components with
+     *  potentially more than one locale, we first check for the
+     *  CharLocale[Asian|Complex] property.
+     */
+
+    protected java.util.Locale getLocale(int index) {
+        try {
+            com.sun.star.beans.PropertyValue[] propertyValues =
+                unoObject.getCharacterAttributes(index, localeAttributeList);
+
+            if (null != propertyValues) {
+                for (int i = 0; i < propertyValues.length; i++) {
+                    com.sun.star.lang.Locale unoLocale = (com.sun.star.lang.Locale)
+                        AnyConverter.toObject(UnoLocaleType, propertyValues[i]);
+                    if (unoLocale != null) {
+                        return new java.util.Locale(unoLocale.Language, unoLocale.Country);
+                    }
+                }
+            }
+
+            return java.util.Locale.getDefault();
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+            return java.util.Locale.getDefault();
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            return java.util.Locale.getDefault();
+        }
+    }
+
+
+    /** Returns the string after a given index
+     *
+     *  The Java word iterator has a different understanding of what
+     *  a word is than the word iterator used by OOo, so we use the
+     *  Java iterators to ensure maximal compatibility with Java.
+     */
+    public String getAfterIndex(int part, int index) {
+        switch (part) {
+        case AccessibleText.CHARACTER:
+            try {
+                String s = unoObject.getText();
+                return s.substring(index+1, index+2);
+            } catch (IndexOutOfBoundsException e) {
+                return null;
+            }
+        case AccessibleText.WORD:
+            try {
+                String s = unoObject.getText();
+                BreakIterator words = BreakIterator.getWordInstance(getLocale(index));
+                words.setText(s);
+                int start = words.following(index);
+                if (start == BreakIterator.DONE || start >= s.length()) {
+                    return null;
+                }
+                int end = words.following(start);
+                if (end == BreakIterator.DONE || end >= s.length()) {
+                    return null;
+                }
+                return s.substring(start, end);
+            } catch (IllegalArgumentException e) {
+                return null;
+            } catch (IndexOutOfBoundsException e) {
+                return null;
+            }
+        case AccessibleText.SENTENCE:
+            try {
+                String s = unoObject.getText();
+                BreakIterator sentence =
+                    BreakIterator.getSentenceInstance(getLocale(index));
+                sentence.setText(s);
+                int start = sentence.following(index);
+                if (start == BreakIterator.DONE || start >= s.length()) {
+                    return null;
+                }
+                int end = sentence.following(start);
+                if (end == BreakIterator.DONE || end >= s.length()) {
+                    return null;
+                }
+                return s.substring(start, end);
+            } catch (IllegalArgumentException e) {
+                return null;
+            } catch (IndexOutOfBoundsException e) {
+                return null;
+            }
+        case 4:
+            try {
+                TextSegment ts = unoObject.getTextBehindIndex(index, AccessibleTextType.LINE);
+                return ts.SegmentText;
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                // Workaround for #104847#
+                if (index > 0 && getCharCount() == index) {
+                    return getAfterIndex(part, index - 1);
+                }
+                return null;
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+                return null;
+            }
+        case 5:
+            try {
+                TextSegment ts = unoObject.getTextBehindIndex(index, AccessibleTextType.ATTRIBUTE_RUN);
+                return ts.SegmentText;
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return null;
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+                return null;
+            }
+        default:
+            return null;
+        }
+    }
+
+    /** Returns the zero-based offset of the caret */
+    public int getCaretPosition() {
+        try {
+            return unoObject.getCaretPosition();
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return -1;
+        }
+    }
+
+    /** Returns the start offset within the selected text */
+    public int getSelectionStart() {
+        try {
+            int index = unoObject.getSelectionStart();
+
+            if (index == -1) {
+                index = getCaretPosition();
+            }
+
+            return index;
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return -1;
+        }
+    }
+
+    protected void setAttribute(javax.swing.text.MutableAttributeSet as,
+        com.sun.star.beans.PropertyValue property) {
+        try {
+            // Map alignment attribute
+            if (property.Name.equals("ParaAdjust")) {
+                ParagraphAdjust adjust = null;
+
+                if (property.Value instanceof ParagraphAdjust) {
+                    adjust = (ParagraphAdjust) property.Value;
+                } else if (property.Value instanceof Any) {
+                    adjust = (ParagraphAdjust) AnyConverter.toObject(new Type(
+                                ParagraphAdjust.class), property.Value);
+                } else {
+                    adjust = ParagraphAdjust.fromInt(AnyConverter.toInt(
+                                property.Value));
+                }
+
+                if (adjust != null) {
+                    if (adjust.equals(ParagraphAdjust.LEFT)) {
+                        StyleConstants.setAlignment(as,
+                            StyleConstants.ALIGN_LEFT);
+                    } else if (adjust.equals(ParagraphAdjust.RIGHT)) {
+                        StyleConstants.setAlignment(as,
+                            StyleConstants.ALIGN_RIGHT);
+                    } else if (adjust.equals(ParagraphAdjust.CENTER)) {
+                        StyleConstants.setAlignment(as,
+                            StyleConstants.ALIGN_CENTER);
+                    } else if (adjust.equals(ParagraphAdjust.BLOCK) ||
+                            adjust.equals(ParagraphAdjust.STRETCH)) {
+                        StyleConstants.setAlignment(as,
+                            StyleConstants.ALIGN_JUSTIFIED);
+                    }
+                } else if (Build.DEBUG) {
+                    System.err.println(
+                        "Invalid property value for key ParaAdjust: " +
+                        property.Value.getClass().getName());
+                }
+
+                // Map background color
+            } else if (property.Name.equals("CharBackColor")) {
+                StyleConstants.setBackground(as,
+                    new java.awt.Color(AnyConverter.toInt(property.Value)));
+
+                // FIXME: BidiLevel
+                // Set bold attribute
+            } else if (property.Name.equals("CharWeight")) {
+                boolean isBold = AnyConverter.toFloat(property.Value) > 125;
+                StyleConstants.setBold(as, isBold);
+
+                // FIXME: Java 1.4 ComponentAttribute, ComponentElementName, ComposedTextAttribute
+                // Set FirstLineIndent attribute
+            } else if (property.Name.equals("ParaFirstLineIndent")) {
+                StyleConstants.setFirstLineIndent(as,
+                    (float) (toPointFactor * AnyConverter.toInt(property.Value)));
+
+                // Set font family attribute
+            } else if (property.Name.equals("CharFontPitch")) {
+                if (AnyConverter.toShort(property.Value) == 2) {
+                    StyleConstants.setFontFamily(as, "Proportional");
+                }
+
+                // Set font size attribute
+            } else if (property.Name.equals("CharHeight")) {
+                StyleConstants.setFontSize(as,
+                    (int) AnyConverter.toFloat(property.Value));
+
+                // Map foreground color
+            } else if (property.Name.equals("CharColor")) {
+                StyleConstants.setForeground(as,
+                    new java.awt.Color(AnyConverter.toInt(property.Value)));
+
+                // FIXME: IconAttribute, IconElementName
+                // Set italic attribute
+            } else if (property.Name.equals("CharPosture")) {
+                FontSlant fs = null;
+
+                if (property.Value instanceof FontSlant) {
+                    fs = (FontSlant) property.Value;
+                } else if (property.Value instanceof Any) {
+                    fs = (FontSlant) AnyConverter.toObject(new Type(
+                                FontSlant.class), property.Value);
+                }
+
+                if (fs != null) {
+                    StyleConstants.setItalic(as, FontSlant.ITALIC.equals(fs));
+                }
+
+                // Set left indent attribute
+            } else if (property.Name.equals("ParaLeftMargin")) {
+                StyleConstants.setLeftIndent(as,
+                    (float) (toPointFactor * AnyConverter.toInt(property.Value)));
+
+                // Set right indent attribute
+            } else if (property.Name.equals("ParaRightMargin")) {
+                StyleConstants.setRightIndent(as,
+                    (float) (toPointFactor * AnyConverter.toInt(property.Value)));
+            }
+            // Set line spacing attribute
+            else if (property.Name.equals("ParaLineSpacing")) {
+                LineSpacing ls = null;
+
+                if (property.Value instanceof LineSpacing) {
+                    ls = (LineSpacing) property.Value;
+                } else if (property.Value instanceof Any) {
+                    ls = (LineSpacing) AnyConverter.toObject(new Type(
+                                LineSpacing.class), property.Value);
+                }
+
+                if (ls != null) {
+                    StyleConstants.setLineSpacing(as,
+                        (float) (toPointFactor * ls.Height));
+                }
+            }
+            // FIXME: Java 1.4 NameAttribute, Orientation, ResolveAttribute
+            // Set space above attribute
+            else if (property.Name.equals("ParaTopMargin")) {
+                StyleConstants.setSpaceAbove(as,
+                    (float) (toPointFactor * AnyConverter.toInt(property.Value)));
+            }
+            // Set space below attribute
+            else if (property.Name.equals("ParaBottomMargin")) {
+                StyleConstants.setSpaceBelow(as,
+                    (float) (toPointFactor * AnyConverter.toInt(property.Value)));
+
+                // Set strike through attribute
+            } else if (property.Name.equals("CharStrikeout")) {
+                boolean isStrikeThrough = (FontStrikeout.NONE != AnyConverter.toShort(property.Value));
+                StyleConstants.setStrikeThrough(as, isStrikeThrough);
+
+                // Set sub-/superscript attribute
+            } else if (property.Name.equals("CharEscapement")) {
+                short value = AnyConverter.toShort(property.Value);
+
+                if (value > 0) {
+                    StyleConstants.setSuperscript(as, true);
+                } else if (value < 0) {
+                    StyleConstants.setSubscript(as, true);
+                }
+
+                // Set tabset attribute
+            } else if (property.Name.equals("ParaTabStops")) {
+                TabStop[] unoTabStops = (TabStop[]) AnyConverter.toArray(property.Value);
+                javax.swing.text.TabStop[] tabStops = new javax.swing.text.TabStop[unoTabStops.length];
+
+                for (int index2 = 0; index2 < unoTabStops.length; index2++) {
+                    float pos = (float) (toPointFactor * unoTabStops[index2].Position);
+
+                    if (unoTabStops[index2].Alignment.equals(TabAlign.LEFT)) {
+                        tabStops[index2] = new javax.swing.text.TabStop(pos,
+                                javax.swing.text.TabStop.ALIGN_LEFT,
+                                javax.swing.text.TabStop.LEAD_NONE);
+                    } else if (unoTabStops[index2].Alignment.equals(
+                                TabAlign.CENTER)) {
+                        tabStops[index2] = new javax.swing.text.TabStop(pos,
+                                javax.swing.text.TabStop.ALIGN_CENTER,
+                                javax.swing.text.TabStop.LEAD_NONE);
+                    } else if (unoTabStops[index2].Alignment.equals(
+                                TabAlign.RIGHT)) {
+                        tabStops[index2] = new javax.swing.text.TabStop(pos,
+                                javax.swing.text.TabStop.ALIGN_RIGHT,
+                                javax.swing.text.TabStop.LEAD_NONE);
+                    } else if (unoTabStops[index2].Alignment.equals(
+                                TabAlign.DECIMAL)) {
+                        tabStops[index2] = new javax.swing.text.TabStop(pos,
+                                javax.swing.text.TabStop.ALIGN_DECIMAL,
+                                javax.swing.text.TabStop.LEAD_NONE);
+                    } else {
+                        tabStops[index2] = new javax.swing.text.TabStop(pos);
+                    }
+                }
+
+                // Re-use tabSet object if possible to make AttributeSet.equals work
+                if ((this.tabSet == null) ||
+                        !java.util.Arrays.equals(tabStops, this.tabStops)) {
+                    this.tabStops = tabStops;
+                    this.tabSet = new javax.swing.text.TabSet(tabStops);
+                }
+
+                StyleConstants.setTabSet(as, this.tabSet);
+
+                // Set underline attribute
+            } else if (property.Name.equals("CharUnderline")) {
+                boolean isUnderline = (FontUnderline.NONE != AnyConverter.toShort(property.Value));
+                StyleConstants.setUnderline(as, isUnderline);
+            }
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+            if (Build.DEBUG) {
+                System.err.println("*** ERROR *** " + e.getClass().getName() +
+                    " caught for property " + property.Name + ": " +
+                    e.getMessage());
+                System.err.println("              value is of type " +
+                    property.Value.getClass().getName());
+            }
+        }
+    }
+
+    /** Returns the AttributSet for a given character at a given index */
+    public javax.swing.text.AttributeSet getCharacterAttribute(int index) {
+        try {
+            com.sun.star.beans.PropertyValue[] propertyValues = unoObject.getCharacterAttributes(index,
+                    attributeList);
+            javax.swing.text.SimpleAttributeSet attributeSet = new javax.swing.text.SimpleAttributeSet();
+
+            if (null != propertyValues) {
+                for (int i = 0; i < propertyValues.length; i++) {
+                    setAttribute(attributeSet, propertyValues[i]);
+                }
+            }
+
+            return attributeSet;
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            if ((index > 0) && (getCharCount() == index)) {
+                return getCharacterAttribute(index - 1);
+            }
+            return null;
+        }
+    }
+
+    /** Given a point in local coordinates, return the zero-based index of the character under that point */
+    public int getIndexAtPoint(java.awt.Point point) {
+        try {
+            return unoObject.getIndexAtPoint(new Point(point.x, point.y));
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return -1;
+        }
+    }
+
+    /** Returns the end offset within the selected text */
+    public int getSelectionEnd() {
+        try {
+            int index = unoObject.getSelectionEnd();
+
+            if (index == -1) {
+                index = getCaretPosition();
+            }
+
+            return index;
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return -1;
+        }
+    }
+
+    /** Returns the string before a given index
+     *
+     *  The Java word iterator has a different understanding of what
+     *  a word is than the word iterator used by OOo, so we use the
+     *  Java iterators to ensure maximal compatibility with Java.
+     */
+    public java.lang.String getBeforeIndex(int part, int index) {
+        switch (part) {
+        case AccessibleText.CHARACTER:
+            try {
+                String s = unoObject.getText();
+                return s.substring(index-1, index);
+            } catch (IndexOutOfBoundsException e) {
+                return null;
+            }
+        case AccessibleText.WORD:
+            try {
+                String s = unoObject.getText();
+                BreakIterator words = BreakIterator.getWordInstance(getLocale(index));
+                words.setText(s);
+                int end = words.following(index);
+                end = words.previous();
+                int start = words.previous();
+                if (start == BreakIterator.DONE) {
+                    return null;
+                }
+                return s.substring(start, end);
+            } catch (IllegalArgumentException e) {
+                return null;
+            } catch (IndexOutOfBoundsException e) {
+                return null;
+            }
+        case AccessibleText.SENTENCE:
+            try {
+                String s = unoObject.getText();
+                BreakIterator sentence =
+                    BreakIterator.getSentenceInstance(getLocale(index));
+                sentence.setText(s);
+                int end = sentence.following(index);
+                end = sentence.previous();
+                int start = sentence.previous();
+                if (start == BreakIterator.DONE) {
+                    return null;
+                }
+                return s.substring(start, end);
+            } catch (IllegalArgumentException e) {
+                return null;
+            } catch (IndexOutOfBoundsException e) {
+                return null;
+            }
+        case 4:
+            try {
+                TextSegment ts = unoObject.getTextBeforeIndex(index, AccessibleTextType.LINE);
+                return ts.SegmentText;
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                // Workaround for #104847#
+                if (index > 0 && getCharCount() == index) {
+                    return getBeforeIndex(part, index - 1);
+                }
+                return null;
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+                return null;
+            }
+        case 5:
+            try {
+                TextSegment ts = unoObject.getTextBeforeIndex(index, AccessibleTextType.ATTRIBUTE_RUN);
+                return ts.SegmentText;
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return null;
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+                return null;
+            }
+        default:
+            return null;
+        }
+    }
+
+
+    /** Returns the string at a given index
+     *
+     *  The Java word iterator has a different understanding of what
+     *  a word is than the word iterator used by OOo, so we use the
+     *  Java iterators to ensure maximal compatibility with Java.
+     */
+    public java.lang.String getAtIndex(int part, int index) {
+        switch (part) {
+        case AccessibleText.CHARACTER:
+            try {
+                String s = unoObject.getText();
+                return s.substring(index, index + 1);
+            } catch (IndexOutOfBoundsException e) {
+                return null;
+            }
+        case AccessibleText.WORD:
+            try {
+                String s = unoObject.getText();
+                BreakIterator words = BreakIterator.getWordInstance(getLocale(index));
+                words.setText(s);
+                int end = words.following(index);
+                return s.substring(words.previous(), end);
+            } catch (IllegalArgumentException e) {
+                return null;
+            } catch (IndexOutOfBoundsException e) {
+                return null;
+            }
+        case AccessibleText.SENTENCE:
+            try {
+                String s = unoObject.getText();
+                BreakIterator sentence =
+                    BreakIterator.getSentenceInstance(getLocale(index));
+                sentence.setText(s);
+                int end = sentence.following(index);
+                return s.substring(sentence.previous(), end);
+            } catch (IllegalArgumentException e) {
+                return null;
+            } catch (IndexOutOfBoundsException e) {
+                return null;
+            }
+        case 4:
+            try {
+                TextSegment ts = unoObject.getTextAtIndex(index, AccessibleTextType.LINE);
+                return ts.SegmentText;
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                // Workaround for #104847#
+                if (index > 0 && getCharCount() == index) {
+                    return getAtIndex(part, index - 1);
+                }
+                return null;
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+                return null;
+            }
+        case 5:
+            try {
+                TextSegment ts = unoObject.getTextAtIndex(index, AccessibleTextType.ATTRIBUTE_RUN);
+                return ts.SegmentText;
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return null;
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+                return null;
+            }
+
+        default:
+            return null;
+        }
+    }
+
+    /** Returns the number of characters (valid indicies) */
+    public int getCharCount() {
+        try {
+            return unoObject.getCharacterCount();
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+
+        return 0;
+    }
+
+    /** Returns the portion of the text that is selected */
+    public java.lang.String getSelectedText() {
+        try {
+            return unoObject.getSelectedText();
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+
+        return null;
+    }
+
+    /** Determines the bounding box of the character at the given index into the string */
+    public java.awt.Rectangle getCharacterBounds(int index) {
+        try {
+            Rectangle unoRect = unoObject.getCharacterBounds(index);
+            return new java.awt.Rectangle(unoRect.X, unoRect.Y, unoRect.Width, unoRect.Height);
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            if ((index > 0) && (getCharCount() == index)) {
+                return getCharacterBounds(index - 1);
+            }
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+
+        return new java.awt.Rectangle();
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/AccessibleValueImpl.java b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleValueImpl.java
new file mode 100644
index 000000000000..cabbf3f5d323
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/AccessibleValueImpl.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import com.sun.star.accessibility.XAccessibleValue;
+import com.sun.star.uno.AnyConverter;
+
+/** The AccessibleValueImpl mappes the calls to the java AccessibleValue
+ *  interface to the corresponding methods of the UNO XAccessibleValue interface
+ */
+public class AccessibleValueImpl implements javax.accessibility.AccessibleValue {
+    protected XAccessibleValue unoObject;
+
+    /** Creates new AccessibleValueImpl */
+    public AccessibleValueImpl(XAccessibleValue xAccessibleValue) {
+        unoObject = xAccessibleValue;
+    }
+
+    public static java.lang.Number toNumber(java.lang.Object any) {
+        try {
+            if(AnyConverter.isByte(any)) {
+                return new Byte(AnyConverter.toByte(any));
+            } else if (AnyConverter.isShort(any)) {
+                return new Short(AnyConverter.toShort(any));
+            } else if (AnyConverter.isInt(any)) {
+                return new Integer(AnyConverter.toInt(any));
+            } else if (AnyConverter.isLong(any)) {
+                return new Long(AnyConverter.toLong(any));
+            } else if (AnyConverter.isFloat(any)) {
+                return new Float(AnyConverter.toFloat(any));
+            } else if (AnyConverter.isDouble(any)) {
+                return new Double(AnyConverter.toDouble(any));
+            }
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+        }
+
+        return null;
+    }
+
+    public java.lang.Number getMinimumAccessibleValue() {
+        try {
+            return toNumber(unoObject.getMinimumValue());
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return null;
+        }
+    }
+
+    public java.lang.Number getCurrentAccessibleValue() {
+        try {
+            return toNumber(unoObject.getCurrentValue());
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return null;
+        }
+    }
+
+    public java.lang.Number getMaximumAccessibleValue() {
+        try {
+            return toNumber(unoObject.getMaximumValue());
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return null;
+        }
+    }
+
+    public boolean setCurrentAccessibleValue(java.lang.Number number) {
+        try {
+            return unoObject.setCurrentValue(number);
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return false;
+        }
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Alert.java b/accessibility/bridge/org/openoffice/java/accessibility/Alert.java
new file mode 100644
index 000000000000..e853fabecba0
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Alert.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import javax.accessibility.AccessibleRole;
+import com.sun.star.accessibility.*;
+
+public class Alert extends Dialog {
+
+    protected Alert(java.awt.Frame owner, XAccessibleComponent xAccessibleComponent) {
+        super(owner, xAccessibleComponent);
+    }
+
+    protected Alert(java.awt.Frame owner, String name, XAccessibleComponent xAccessibleComponent) {
+        super(owner, name, xAccessibleComponent);
+    }
+
+    protected Alert(java.awt.Frame owner, String name, boolean modal, XAccessibleComponent xAccessibleComponent) {
+        super(owner, name, modal, xAccessibleComponent);
+    }
+
+    /** Returns the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext getAccessibleContext() {
+        if (accessibleContext == null) {
+            accessibleContext = new AccessibleAlert();
+            accessibleContext.setAccessibleName(getTitle());
+        }
+        return accessibleContext;
+    }
+
+    protected class AccessibleAlert extends AccessibleDialog {
+
+        protected AccessibleAlert() {
+            super();
+        }
+
+        public AccessibleRole getAccessibleRole() {
+            return AccessibleRole.ALERT;
+        }
+    };
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Application.java b/accessibility/bridge/org/openoffice/java/accessibility/Application.java
new file mode 100644
index 000000000000..c67da714f4df
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Application.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+
+public class Application extends java.awt.Frame implements Accessible {
+
+    protected AccessibleContext accessibleContext = null;
+
+    protected Application() {
+        super();
+    }
+
+    public boolean isShowing() {
+        return true;
+    }
+}
+
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Button.java b/accessibility/bridge/org/openoffice/java/accessibility/Button.java
new file mode 100644
index 000000000000..44bccc30ffc1
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Button.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import com.sun.star.uno.*;
+import com.sun.star.accessibility.*;
+
+class Button extends AbstractButton implements javax.accessibility.Accessible {
+
+    public Button(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
+        super(xAccessible, xAccessibleContext);
+    }
+
+    protected XAccessibleEventListener createEventListener() {
+        return new AccessibleButtonListener();
+    }
+
+    protected class AccessibleButtonListener
+        extends AccessibleUNOComponentListener {
+        protected AccessibleButtonListener() {
+            super();
+        }
+
+        protected javax.accessibility.AccessibleContext getContext( Object any ) {
+            try {
+                XAccessible xAccessible = (XAccessible)
+                    AnyConverter.toObject( AccessibleObjectFactory.XAccessibleType, any );
+
+                    javax.accessibility.Accessible accessible =
+                    (javax.accessibility.Accessible) Button.this.getComponent( xAccessible );
+
+                    return accessible.getAccessibleContext();
+            } catch( com.sun.star.uno.Exception e ) {
+                return null;
+            }
+        }
+
+        /** Called by OpenOffice process to notify property changes */
+        public void notifyEvent(AccessibleEventObject event) {
+            switch (event.EventId) {
+                case AccessibleEventId.CHILD:
+                    java.awt.Component c = getComponent(unoAccessible);
+
+                    Object values[] = { null, null };
+
+                    if (AnyConverter.isObject(event.OldValue)) {
+                        values[0] = getContext( event.OldValue );
+                    }
+
+                    if (AnyConverter.isObject(event.NewValue)) {
+                        values[1] = getContext( event.NewValue);
+                    }
+
+                    firePropertyChange(javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                        values[0], values[1]);
+                    break;
+
+                default:
+                    super.notifyEvent(event);
+            }
+        }
+    }
+
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleButton();
+    }
+
+    protected java.awt.Component getComponent(XAccessible unoAccessible) {
+        java.awt.Component c = AccessibleObjectFactory.getAccessibleComponent(unoAccessible);
+
+        if (c == null) {
+            c = AccessibleObjectFactory.createAccessibleComponent(unoAccessible);
+
+            if (c instanceof javax.accessibility.Accessible) {
+                ((javax.accessibility.Accessible) c).getAccessibleContext()
+                 .setAccessibleParent(this);
+            }
+
+            if( c instanceof java.awt.Container ) {
+                AccessibleObjectFactory.populateContainer((java.awt.Container) c, unoAccessible.getAccessibleContext() );
+            }
+        }
+
+        return c;
+    }
+
+    protected class AccessibleButton extends AccessibleAbstractButton {
+
+        /** Gets the role of this object */
+        public javax.accessibility.AccessibleRole getAccessibleRole() {
+            return javax.accessibility.AccessibleRole.PUSH_BUTTON;
+        }
+
+        /** Returns the number of accessible children of the object */
+        public int getAccessibleChildrenCount() {
+            try {
+                return unoAccessibleContext.getAccessibleChildCount();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return 0;
+            }
+        }
+
+        /** Returns the specified Accessible child of the object */
+        public synchronized javax.accessibility.Accessible getAccessibleChild( int i) {
+            try {
+                 return (javax.accessibility.Accessible) getComponent( unoAccessibleContext.getAccessibleChild(i) );
+            } catch (com.sun.star.uno.RuntimeException e) {
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            }
+            return null;
+        }
+
+        /*
+        * AccessibleComponent
+        */
+
+        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */
+        public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
+            try {
+                java.awt.Component c = getComponent(unoAccessibleComponent.getAccessibleAtPoint(
+                            new com.sun.star.awt.Point(p.x, p.y)));
+
+                return (javax.accessibility.Accessible) c;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+    }
+}
+
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/CheckBox.java b/accessibility/bridge/org/openoffice/java/accessibility/CheckBox.java
new file mode 100644
index 000000000000..624dfd048c89
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/CheckBox.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import com.sun.star.uno.*;
+import com.sun.star.accessibility.*;
+
+class CheckBox extends ToggleButton {
+
+    public CheckBox(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
+        super(xAccessible, xAccessibleContext);
+    }
+
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleCheckBox();
+    }
+
+    protected class AccessibleCheckBox extends AccessibleToggleButton {
+        /** Gets the role of this object */
+        public javax.accessibility.AccessibleRole getAccessibleRole() {
+            return javax.accessibility.AccessibleRole.CHECK_BOX;
+        }
+    }
+}
+
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java b/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java
new file mode 100644
index 000000000000..5f5cf4a34374
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/ComboBox.java
@@ -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.
+ *
+ ************************************************************************/
+package org.openoffice.java.accessibility;
+
+import com.sun.star.accessibility.*;
+import com.sun.star.uno.*;
+
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
+
+import javax.swing.SwingConstants;
+
+
+/**
+ */
+public class ComboBox extends Container {
+    private XAccessibleAction unoAccessibleAction = null;
+
+    public ComboBox(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
+        super(javax.accessibility.AccessibleRole.COMBO_BOX, xAccessible,
+            xAccessibleContext);
+    }
+
+    /** Appends the specified component to the end of this container */
+    public java.awt.Component add(java.awt.Component c) {
+        // List should be always the first child
+        if (c instanceof List) {
+            return super.add(c, 0);
+        } else {
+            return super.add(c);
+        }
+    }
+
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleComboBox();
+    }
+
+    protected class AccessibleComboBox extends AccessibleContainer
+        implements javax.accessibility.AccessibleAction {
+        /**
+        * Though the class is abstract, this should be called by all sub-classes
+        */
+        protected AccessibleComboBox() {
+            super();
+        }
+
+        /*
+        * AccessibleContext
+        */
+
+        /** Gets the AccessibleAction associated with this object that supports one or more actions */
+        public javax.accessibility.AccessibleAction getAccessibleAction() {
+            if (unoAccessibleAction == null) {
+                unoAccessibleAction = (XAccessibleAction) UnoRuntime.queryInterface(XAccessibleAction.class,
+                        unoAccessibleContext);
+
+                if (unoAccessibleAction == null) {
+                    return null;
+                }
+            }
+
+            return this;
+        }
+
+        /*
+        * AccessibleAction
+        */
+
+        /** Performs the specified Action on the object */
+        public boolean doAccessibleAction(int param) {
+            if (param == 0) {
+                try {
+                    return unoAccessibleAction.doAccessibleAction(0);
+                } catch (com.sun.star.uno.Exception e) {
+                }
+            }
+
+            return false;
+        }
+
+        /** Returns a description of the specified action of the object */
+        public java.lang.String getAccessibleActionDescription(int param) {
+            return javax.swing.UIManager.getString("ComboBox.togglePopupText");
+        }
+
+        /** Returns the number of accessible actions available in this object */
+        public int getAccessibleActionCount() {
+            return 1;
+        }
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Component.java b/accessibility/bridge/org/openoffice/java/accessibility/Component.java
new file mode 100644
index 000000000000..21043e1f5098
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Component.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleState;
+
+import com.sun.star.uno.*;
+import com.sun.star.accessibility.*;
+
+public abstract class Component extends java.awt.Component {
+    public static final Type RectangleType = new Type(com.sun.star.awt.Rectangle.class);
+    public static final Type SelectionType = new Type(com.sun.star.awt.Selection.class);
+
+    protected XAccessible unoAccessible;
+    protected XAccessibleContext unoAccessibleContext;
+    protected XAccessibleComponent unoAccessibleComponent;
+
+    protected boolean disposed = false;
+
+    protected Component(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
+        super();
+        unoAccessible = xAccessible;
+        unoAccessibleContext = xAccessibleContext;
+        unoAccessibleComponent = (XAccessibleComponent)
+            UnoRuntime.queryInterface(XAccessibleComponent.class, xAccessibleContext);
+        // Add the event listener right away, because the global focus notification doesn't
+        // work yet ..
+        XAccessibleEventBroadcaster broadcaster = (XAccessibleEventBroadcaster)
+            UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class,
+            unoAccessibleComponent);
+        if (broadcaster != null) {
+            broadcaster.addEventListener(createEventListener());
+        }
+    }
+
+    /**
+    * Determines whether this <code>Component</code> is showing on screen.
+    * This means that the component must be visible, and it must be in a
+    * <code>container</code> that is visible and showing.
+    * @see       #addNotify
+    * @see       #removeNotify
+    * @since JDK1.0
+    */
+    public boolean isShowing() {
+        if (isVisible()) {
+            java.awt.Container parent = getParent();
+            return (parent == null) || parent.isShowing();
+        }
+        return false;
+    }
+
+    /**
+    * Makes this <code>Component</code> displayable by connecting it to a
+    * native screen resource.
+    * This method is called internally by the toolkit and should
+    * not be called directly by programs.
+    * @see       #isDisplayable
+    * @see       #removeNotify
+    * @since JDK1.0
+    */
+    public void addNotify() {
+    }
+
+    /**
+    * Makes this <code>Component</code> undisplayable by destroying it native
+    * screen resource.
+    * This method is called by the toolkit internally and should
+    * not be called directly by programs.
+    * @see       #isDisplayable
+    * @see       #addNotify
+    * @since JDK1.0
+    */
+    public void removeNotify() {
+    }
+
+    /*
+     * Fake the java focus handling. This is necessary to keep OOo focus
+     * in sync with the java focus. See java.awt.DefaultKeyboardFocusManager
+     * for implementation details.
+     **/
+
+    /** Requests focus for this object */
+    public void requestFocus() {
+    }
+
+    /** Requests focus for this object */
+    public boolean requestFocus(boolean temporary) {
+        // Must be a no-op to make focus handling work
+        return true;
+    }
+
+    /** Requests the focus for this object in the containing window */
+    public boolean requestFocusInWindow() {
+        return requestFocusInWindow(false);
+    }
+
+    /** Requests the focus for this object in the containing window */
+    protected boolean requestFocusInWindow(boolean temporary) {
+        if (isFocusable() && isVisible()) {
+            getEventQueue().postEvent(new java.awt.event.FocusEvent(this, java.awt.event.FocusEvent.FOCUS_GAINED, temporary));
+            return true;
+        }
+        return false;
+    }
+
+    public Object[] getAccessibleComponents(Object[] targetSet) {
+        try {
+            java.util.ArrayList list = new java.util.ArrayList(targetSet.length);
+            for (int i=0; i < targetSet.length; i++) {
+                java.awt.Component c = AccessibleObjectFactory.getAccessibleComponent(
+                    (XAccessible) UnoRuntime.queryInterface(XAccessible.class, targetSet[i]));
+                if (c != null) {
+                    list.add(c);
+                }
+            }
+            list.trimToSize();
+            return list.toArray();
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return null;
+        }
+    }
+
+    protected java.awt.EventQueue getEventQueue() {
+        return java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue();
+    }
+
+    protected class PropertyChangeBroadcaster implements Runnable {
+        String propertyName;
+        Object oldValue;
+        Object newValue;
+
+        public PropertyChangeBroadcaster(String name, Object param1, Object param2) {
+            propertyName = name;
+            oldValue = param1;
+            newValue = param2;
+        }
+
+        public void run() {
+            // Because this code is executed in the DispatchThread, it is better to catch every
+            // exception that might occur
+            try {
+                AccessibleContext ac = accessibleContext;
+                if (ac != null) {
+                    ac.firePropertyChange(propertyName, oldValue, newValue);
+                }
+            } catch (java.lang.Exception e) {
+                if (Build.DEBUG) {
+                    System.err.println(e.getClass().getName() + " caught propagating " + propertyName + " event: " + e.getMessage());
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    protected void firePropertyChange(String property, Object oldValue, Object newValue) {
+        getEventQueue().invokeLater(new PropertyChangeBroadcaster(property, oldValue, newValue));
+    }
+
+    protected void fireStatePropertyChange(AccessibleState state, boolean set) {
+        PropertyChangeBroadcaster broadcaster;
+
+//      if (Build.DEBUG) {
+//          System.err.println("[" + AccessibleRoleAdapter.getAccessibleRole(unoAccessibleContext.getAccessibleRole()) + "] " +
+//                  unoAccessibleContext.getAccessibleName() + " is " + (set ? "now " : "no longer ") + state);
+//      }
+
+        if (set) {
+            broadcaster = new PropertyChangeBroadcaster(
+                accessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                null, state);
+        } else {
+            broadcaster = new PropertyChangeBroadcaster(
+                accessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                state, null);
+        }
+        getEventQueue().invokeLater(broadcaster);
+    }
+
+    /**
+    * Update the proxy objects appropriatly on property change events
+    */
+    protected class AccessibleUNOComponentListener implements XAccessibleEventListener {
+
+        protected AccessibleUNOComponentListener() {
+        }
+
+        protected void setComponentState(short state, boolean enable) {
+            switch (state) {
+                case AccessibleStateType.ACTIVE:
+                    // Only frames should be active
+                    break;
+                case AccessibleStateType.ARMED:
+                    fireStatePropertyChange(AccessibleState.ARMED, enable);
+                    break;
+                case AccessibleStateType.CHECKED:
+                    fireStatePropertyChange(AccessibleState.CHECKED, enable);
+                    break;
+                case AccessibleStateType.ENABLED:
+                    setEnabled(enable);
+                    // Since we can't access awt.Componet.accessibleContext, we need to fire
+                    // this event manually ..
+                    fireStatePropertyChange(AccessibleState.ENABLED, enable);
+                    break;
+                case AccessibleStateType.FOCUSED:
+                    getEventQueue().postEvent(new java.awt.event.FocusEvent(
+                        Component.this, enable ?
+                        java.awt.event.FocusEvent.FOCUS_GAINED :
+                        java.awt.event.FocusEvent.FOCUS_LOST));
+                    break;
+                case AccessibleStateType.PRESSED:
+                    fireStatePropertyChange(AccessibleState.PRESSED, enable);
+                    break;
+                case AccessibleStateType.SELECTED:
+                    fireStatePropertyChange(AccessibleState.SELECTED, enable);
+                    break;
+                case AccessibleStateType.SENSITIVE:
+                    // This state equals ENABLED in OOo (but not in Gtk+) and does not exist in Java 1.5
+                    break;
+                case AccessibleStateType.SHOWING:
+//                  fireStatePropertyChange(AccessibleState.SHOWING, enable);
+                    break;
+                case AccessibleStateType.VISIBLE:
+                    Component.this.setVisible(enable);
+                    break;
+                default:
+                    if (Build.DEBUG) {
+                        System.err.println("[component]: " + getName() + "unexpected state change " + state);
+                    }
+                    break;
+            }
+        }
+
+        /** Updates the accessible name and fires the appropriate PropertyChangedEvent */
+        protected void handleNameChangedEvent(Object any) {
+            try {
+                // This causes the property change event to be fired in the VCL thread
+                // context. If this causes problems, it has to be deligated to the java
+                // dispatch thread ..
+                if (accessibleContext != null) {
+                    accessibleContext.setAccessibleName(AnyConverter.toString(any));
+                }
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+            }
+        }
+
+        /** Updates the accessible description and fires the appropriate PropertyChangedEvent */
+        protected void handleDescriptionChangedEvent(Object any) {
+            try {
+                // This causes the property change event to be fired in the VCL thread
+                // context. If this causes problems, it has to be deligated to the java
+                // dispatch thread ..
+                if (accessibleContext != null) {
+                    accessibleContext.setAccessibleDescription(AnyConverter.toString(any));
+                }
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+            }
+        }
+
+        /** Updates the internal states and fires the appropriate PropertyChangedEvent */
+        protected void handleStateChangedEvent(Object any1, Object any2) {
+            try {
+                if (AnyConverter.isShort(any1)) {
+                    setComponentState(AnyConverter.toShort(any1), false);
+                }
+
+                if (AnyConverter.isShort(any2)) {
+                    setComponentState(AnyConverter.toShort(any2), true);
+                }
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+            }
+        }
+
+        /** Called by OpenOffice process to notify property changes */
+        public void notifyEvent(AccessibleEventObject event) {
+
+            if ( !disposed ) {
+
+                switch (event.EventId) {
+                    case AccessibleEventId.ACTION_CHANGED:
+                        firePropertyChange(accessibleContext.ACCESSIBLE_ACTION_PROPERTY,
+                            toNumber(event.OldValue), toNumber(event.NewValue));
+                        break;
+                    case AccessibleEventId.NAME_CHANGED:
+                        // Set the accessible name for the corresponding context, which will fire a property
+                        // change event itself
+                        handleNameChangedEvent(event.NewValue);
+                        break;
+                    case AccessibleEventId.DESCRIPTION_CHANGED:
+                        // Set the accessible description for the corresponding context, which will fire a property
+                        // change event itself - so do not set propertyName !
+                        handleDescriptionChangedEvent(event.NewValue);
+                        break;
+                    case AccessibleEventId.CHILD:
+                        if (Build.DEBUG) {
+                            System.out.println("Unexpected child event for object of role " + getAccessibleContext().getAccessibleRole());
+                        }
+                        break;
+                    case AccessibleEventId.STATE_CHANGED:
+                        // Update the internal state set and fire the appropriate PropertyChangedEvent
+                        handleStateChangedEvent(event.OldValue, event.NewValue);
+                        break;
+                    case AccessibleEventId.VISIBLE_DATA_CHANGED:
+                    case AccessibleEventId.BOUNDRECT_CHANGED:
+                        firePropertyChange(AccessibleContext.ACCESSIBLE_VISIBLE_DATA_PROPERTY, null, null);
+                        break;
+                    case AccessibleEventId.TEXT_CHANGED:
+                        firePropertyChange(AccessibleContext.ACCESSIBLE_TEXT_PROPERTY,
+                                                AccessibleTextImpl.convertTextSegment(event.OldValue),
+                                                AccessibleTextImpl.convertTextSegment(event.NewValue));
+                        break;
+                    /*
+                     * the Java AccessBridge for GNOME maps SELECTION_PROPERTY change events
+                     * for objects of role TEXT to object:text-selection-changed
+                     */
+                    case AccessibleEventId.TEXT_SELECTION_CHANGED:
+                        firePropertyChange(AccessibleContext.ACCESSIBLE_SELECTION_PROPERTY, null, null);
+                        break;
+                    case AccessibleEventId.CARET_CHANGED:
+                        firePropertyChange(accessibleContext.ACCESSIBLE_CARET_PROPERTY, toNumber(event.OldValue), toNumber(event.NewValue));
+                        break;
+                    case AccessibleEventId.VALUE_CHANGED:
+                        firePropertyChange(accessibleContext.ACCESSIBLE_VALUE_PROPERTY, toNumber(event.OldValue), toNumber(event.NewValue));
+                    default:
+                        // Warn about unhandled events
+                        if(Build.DEBUG) {
+                            System.out.println(this + ": unhandled accessibility event id=" + event.EventId);
+                        }
+                }
+            }
+        }
+
+        /** Called by OpenOffice process to notify that the UNO component is disposing */
+        public void disposing(com.sun.star.lang.EventObject eventObject) {
+            disposed = true;
+            AccessibleObjectFactory.disposing(Component.this);
+        }
+    }
+
+    protected XAccessibleEventListener createEventListener() {
+        return new AccessibleUNOComponentListener();
+    }
+
+    protected javax.accessibility.AccessibleContext accessibleContext = null;
+
+    /** This method actually creates the AccessibleContext object returned by
+     * getAccessibleContext().
+     */
+    protected javax.accessibility.AccessibleContext createAccessibleContext() {
+        return null;
+    }
+
+    /** Returns the AccessibleContext associated with this object */
+    public final javax.accessibility.AccessibleContext getAccessibleContext() {
+        if (accessibleContext == null) {
+            try {
+                AccessibleContext ac = createAccessibleContext();
+                if (ac != null) {
+                    // Set accessible name and description here to avoid
+                    // unnecessary property change events later ..
+                    ac.setAccessibleName(unoAccessibleContext.getAccessibleName());
+                    ac.setAccessibleDescription(unoAccessibleContext.getAccessibleDescription());
+                    accessibleContext = ac;
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+        }
+        return accessibleContext;
+    }
+
+    protected abstract class AccessibleUNOComponent extends java.awt.Component.AccessibleAWTComponent
+        implements javax.accessibility.AccessibleExtendedComponent {
+
+        protected java.awt.event.ComponentListener accessibleComponentHandler = null;
+
+        /**
+        * Fire PropertyChange listener, if one is registered,
+        * when shown/hidden..
+        */
+        protected class AccessibleComponentHandler implements java.awt.event.ComponentListener {
+            public void componentHidden(java.awt.event.ComponentEvent e)  {
+                AccessibleUNOComponent.this.firePropertyChange(
+                    AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                    AccessibleState.VISIBLE, null);
+            }
+
+            public void componentShown(java.awt.event.ComponentEvent e)  {
+                AccessibleUNOComponent.this.firePropertyChange(
+                    AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                    null, AccessibleState.VISIBLE);
+            }
+
+            public void componentMoved(java.awt.event.ComponentEvent e)  {
+            }
+
+            public void componentResized(java.awt.event.ComponentEvent e)  {
+            }
+        } // inner class AccessibleComponentHandler
+
+        protected java.awt.event.FocusListener accessibleFocusHandler = null;
+
+        /**
+        * Fire PropertyChange listener, if one is registered,
+        * when focus events happen
+        */
+        protected class AccessibleFocusHandler implements java.awt.event.FocusListener {
+            public void focusGained(java.awt.event.FocusEvent event) {
+                AccessibleUNOComponent.this.firePropertyChange(
+                    AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                    null, AccessibleState.FOCUSED);
+                if (Build.DEBUG) {
+                    System.err.println("[" + getAccessibleRole() + "] " + getAccessibleName() + " is now focused");
+                }
+            }
+            public void focusLost(java.awt.event.FocusEvent event) {
+                AccessibleUNOComponent.this.firePropertyChange(
+                    AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                    AccessibleState.FOCUSED, null);
+                if (Build.DEBUG) {
+                    System.err.println("[" + getAccessibleRole() + "] " + getAccessibleName() + " is no longer focused");
+                }
+            }
+        } // inner class AccessibleFocusHandler
+
+        protected int propertyChangeListenerCount = 0;
+
+        /**
+        * Add a PropertyChangeListener to the listener list.
+        *
+        * @param listener  The PropertyChangeListener to be added
+        */
+        public void addPropertyChangeListener(java.beans.PropertyChangeListener listener) {
+            if (propertyChangeListenerCount++ == 0) {
+                accessibleComponentHandler = new AccessibleComponentHandler();
+                Component.this.addComponentListener(accessibleComponentHandler);
+
+                accessibleFocusHandler = new AccessibleFocusHandler();
+                Component.this.addFocusListener(accessibleFocusHandler);
+            }
+            super.addPropertyChangeListener(listener);
+        }
+
+        /**
+        * Remove a PropertyChangeListener from the listener list.
+        * This removes a PropertyChangeListener that was registered
+        * for all properties.
+        *
+        * @param listener  The PropertyChangeListener to be removed
+        */
+        public void removePropertyChangeListener(java.beans.PropertyChangeListener listener) {
+            if (--propertyChangeListenerCount == 0) {
+                Component.this.removeComponentListener(accessibleComponentHandler);
+                accessibleComponentHandler = null;
+
+                Component.this.removeFocusListener(accessibleFocusHandler);
+                accessibleFocusHandler = null;
+            }
+            super.removePropertyChangeListener(listener);
+        }
+
+        /**
+        * Gets the current state set of this object.
+        *
+        * @return an instance of <code>AccessibleStateSet</code>
+        *    containing the current state set of the object
+        * @see AccessibleState
+        */
+        public javax.accessibility.AccessibleStateSet getAccessibleStateSet() {
+            if (disposed)
+                return AccessibleStateAdapter.getDefunctStateSet();
+
+            try {
+                return AccessibleStateAdapter.getAccessibleStateSet(Component.this,
+                    unoAccessibleContext.getAccessibleStateSet());
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return AccessibleStateAdapter.getDefunctStateSet();
+            }
+        }
+
+        /** Gets the locale of the component */
+        public java.util.Locale getLocale() throws java.awt.IllegalComponentStateException {
+            try {
+                com.sun.star.lang.Locale unoLocale = unoAccessible.getAccessibleContext().getLocale();
+                return new java.util.Locale(unoLocale.Language, unoLocale.Country);
+            } catch (IllegalAccessibleComponentStateException e) {
+                throw new java.awt.IllegalComponentStateException(e.getMessage());
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return java.util.Locale.getDefault();
+            }
+        }
+
+        /*
+        * AccessibleExtendedComponent
+        */
+
+        /** Returns the background color of the object */
+        public java.awt.Color getBackground() {
+            try {
+                return new java.awt.Color(unoAccessibleComponent.getBackground());
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        public void setBackground(java.awt.Color c) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the foreground color of the object */
+        public java.awt.Color getForeground() {
+            try {
+                return new java.awt.Color(unoAccessibleComponent.getForeground());
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        public void setForeground(java.awt.Color c) {
+            // Not supported by UNO accessibility API
+        }
+
+        public java.awt.Cursor getCursor() {
+            // Not supported by UNO accessibility API
+            return null;
+        }
+
+        public void setCursor(java.awt.Cursor cursor) {
+            // Not supported by UNO accessibility API
+        }
+
+        public java.awt.Font getFont() {
+            // FIXME
+            return null;
+        }
+
+        public void setFont(java.awt.Font f) {
+            // Not supported by UNO accessibility API
+        }
+
+        public java.awt.FontMetrics getFontMetrics(java.awt.Font f) {
+            // FIXME
+            return null;
+        }
+
+        public boolean isEnabled() {
+            return Component.this.isEnabled();
+        }
+
+        public void setEnabled(boolean b) {
+            // Not supported by UNO accessibility API
+        }
+
+        public boolean isVisible() {
+            return Component.this.isVisible();
+        }
+
+        public void setVisible(boolean b) {
+            // Not supported by UNO accessibility API
+        }
+
+        public boolean isShowing() {
+            return Component.this.isShowing();
+        }
+
+        public boolean contains(java.awt.Point p) {
+            try {
+                return unoAccessibleComponent.containsPoint(new com.sun.star.awt.Point(p.x, p.y));
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return false;
+            }
+        }
+
+        /** Returns the location of the object on the screen. */
+        public java.awt.Point getLocationOnScreen() {
+            try {
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocationOnScreen();
+//              if (Build.DEBUG) {
+//                  System.err.println("Returning location on screen( " + unoPoint.X + ", " + unoPoint.Y + " )" );
+//              }
+                return new java.awt.Point(unoPoint.X, unoPoint.Y);
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Gets the location of this component in the form of a point specifying the component's top-left corner */
+        public java.awt.Point getLocation() {
+            try {
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocation();
+                return new java.awt.Point( unoPoint.X, unoPoint.Y );
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Moves this component to a new location */
+        public void setLocation(java.awt.Point p) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Gets the bounds of this component in the form of a Rectangle object */
+        public java.awt.Rectangle getBounds() {
+            try {
+                com.sun.star.awt.Rectangle unoRect = unoAccessibleComponent.getBounds();
+                return new java.awt.Rectangle(unoRect.X, unoRect.Y, unoRect.Width, unoRect.Height);
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Moves and resizes this component to conform to the new bounding rectangle r */
+        public void setBounds(java.awt.Rectangle r) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the size of this component in the form of a Dimension object */
+        public java.awt.Dimension getSize() {
+            try {
+                com.sun.star.awt.Size unoSize = unoAccessibleComponent.getSize();
+                return new java.awt.Dimension(unoSize.Width, unoSize.Height);
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Resizes this component so that it has width d.width and height d.height */
+        public void setSize(java.awt.Dimension d) {
+            // Not supported by UNO accessibility API
+        }
+
+        public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
+            // Not supported by this implementation
+            return null;
+        }
+
+        public boolean isFocusTraversable() {
+            return Component.this.isFocusable();
+        }
+
+        public void requestFocus() {
+            unoAccessibleComponent.grabFocus();
+        }
+
+        public String getToolTipText() {
+            try {
+                XAccessibleExtendedComponent unoAccessibleExtendedComponent = (XAccessibleExtendedComponent)
+                    UnoRuntime.queryInterface(XAccessibleExtendedComponent.class, unoAccessibleComponent);
+                if (unoAccessibleExtendedComponent != null) {
+                    return unoAccessibleExtendedComponent.getToolTipText();
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+            return null;
+        }
+
+        public String getTitledBorderText() {
+            try {
+                XAccessibleExtendedComponent unoAccessibleExtendedComponent = (XAccessibleExtendedComponent)
+                    UnoRuntime.queryInterface(XAccessibleExtendedComponent.class, unoAccessibleComponent);
+                if (unoAccessibleExtendedComponent != null) {
+                    return unoAccessibleExtendedComponent.getTitledBorderText();
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+            return null;
+        }
+
+        public javax.accessibility.AccessibleKeyBinding getAccessibleKeyBinding() {
+            try {
+                XAccessibleAction unoAccessibleAction = (XAccessibleAction)
+                    UnoRuntime.queryInterface(XAccessibleAction.class, unoAccessibleComponent);
+                if (unoAccessibleAction != null) {
+                    XAccessibleKeyBinding unoAccessibleKeyBinding = unoAccessibleAction.getAccessibleActionKeyBinding(0);
+                    if (unoAccessibleKeyBinding != null) {
+                        return new AccessibleKeyBinding(unoAccessibleKeyBinding);
+                    }
+                }
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return null;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+            return null;
+        }
+    }
+
+    // Extract a number from a UNO any
+    public static java.lang.Number toNumber(java.lang.Object any) {
+        try {
+            if (AnyConverter.isByte(any)) {
+                return new Byte(AnyConverter.toByte(any));
+            } else if (AnyConverter.isShort(any)) {
+                return new Short(AnyConverter.toShort(any));
+            } else if (AnyConverter.isInt(any)) {
+                return new Integer(AnyConverter.toInt(any));
+            } else if (AnyConverter.isLong(any)) {
+                return new Long(AnyConverter.toLong(any));
+            } else if (AnyConverter.isFloat(any)) {
+                return new Float(AnyConverter.toFloat(any));
+            } else if (AnyConverter.isDouble(any)) {
+                return new Double(AnyConverter.toDouble(any));
+            }
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+            throw new IllegalArgumentException(e.getMessage());
+        }
+            return null;
+    }
+
+    public String toString() {
+        return UnoRuntime.generateOid(unoAccessible);
+    }
+}
+
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Container.java b/accessibility/bridge/org/openoffice/java/accessibility/Container.java
new file mode 100644
index 000000000000..257cdab8b757
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Container.java
@@ -0,0 +1,763 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleState;
+
+import com.sun.star.uno.*;
+import com.sun.star.accessibility.*;
+
+public class Container extends java.awt.Container implements javax.accessibility.Accessible {
+
+    protected XAccessible unoAccessible;
+    protected XAccessibleContext unoAccessibleContext;
+    protected XAccessibleComponent unoAccessibleComponent = null;
+
+    protected javax.accessibility.AccessibleRole accessibleRole;
+    protected javax.accessibility.AccessibleText accessibleText;
+    protected boolean disposed = false;
+
+    protected Container(javax.accessibility.AccessibleRole role,
+        XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
+        accessibleRole = role;
+        unoAccessible = xAccessible;
+        unoAccessibleContext = xAccessibleContext;
+        unoAccessibleComponent = (XAccessibleComponent)
+            UnoRuntime.queryInterface(XAccessibleComponent.class,
+            xAccessibleContext);
+
+        // Add the event listener right away, because the global focus notification doesn't
+        // work yet ..
+        XAccessibleEventBroadcaster broadcaster = (XAccessibleEventBroadcaster)
+            UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class,
+            unoAccessibleContext);
+        if (broadcaster != null) {
+            broadcaster.addEventListener(createEventListener());
+        }
+    }
+
+    /**
+    * Determines whether this <code>Container</code> is showing on screen.
+    * This means that the component must be visible, and it must be in a
+    * <code>container</code> that is visible and showing.
+    * @see       #addNotify
+    * @see       #removeNotify
+    * @since JDK1.0
+    */
+    public boolean isShowing() {
+        if (isVisible()) {
+            java.awt.Container parent = getParent();
+            return (parent == null) || parent.isShowing();
+        }
+        return false;
+    }
+
+    /**
+    * Makes this <code>Container</code> displayable by connecting it to a
+    * native screen resource.
+    * This method is called internally by the toolkit and should
+    * not be called directly by programs.
+    * @see       #isDisplayable
+    * @see       #removeNotify
+    * @since JDK1.0
+    */
+    public void addNotify() {
+    }
+
+    /**
+    * Makes this <code>Container</code> undisplayable by destroying it native
+    * screen resource.
+    * This method is called by the toolkit internally and should
+    * not be called directly by programs.
+    * @see       #isDisplayable
+    * @see       #addNotify
+    * @since JDK1.0
+    */
+    public void removeNotify() {
+    }
+
+    /*
+     * Fake the java focus handling. This is necessary to keep OOo focus
+     * in sync with the java focus. See java.awt.DefaultKeyboardFocusManager
+     * for implementation details.
+     **/
+
+    /** Requests focus for this object */
+    public void requestFocus() {
+    }
+
+    /** Requests focus for this object */
+    public boolean requestFocus(boolean temporary) {
+        // Must be a no-op to make focus handling work
+        return true;
+    }
+
+    /** Requests the focus for this object in the containing window */
+    public boolean requestFocusInWindow() {
+        return requestFocusInWindow(false);
+    }
+
+    /** Requests the focus for this object in the containing window */
+    protected boolean requestFocusInWindow(boolean temporary) {
+        if (isFocusable() && isVisible()) {
+            getEventQueue().postEvent(new java.awt.event.FocusEvent(this, java.awt.event.FocusEvent.FOCUS_GAINED, temporary));
+            return true;
+        }
+        return false;
+    }
+
+    public Object[] getAccessibleComponents(Object[] targetSet) {
+        try {
+            java.util.ArrayList list = new java.util.ArrayList(targetSet.length);
+            for (int i=0; i < targetSet.length; i++) {
+                java.awt.Component c = AccessibleObjectFactory.getAccessibleComponent(
+                    (XAccessible) UnoRuntime.queryInterface(XAccessible.class, targetSet[i]));
+                if (c != null) {
+                    list.add(c);
+                }
+            }
+            list.trimToSize();
+            return list.toArray();
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return null;
+        }
+    }
+
+    protected java.awt.EventQueue getEventQueue() {
+        return java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue();
+    }
+
+    protected class PropertyChangeBroadcaster implements Runnable {
+        String propertyName;
+        Object oldValue;
+        Object newValue;
+
+        public PropertyChangeBroadcaster(String name, Object param1, Object param2) {
+            propertyName = name;
+            oldValue = param1;
+            newValue = param2;
+        }
+
+        public void run() {
+            // Because this code is executed in the DispatchThread, it is better tocatch every
+            // exception that might occur
+            try {
+                AccessibleContext ac = Container.this.accessibleContext;
+                if (ac != null) {
+                    ac.firePropertyChange(propertyName, oldValue, newValue);
+                }
+            } catch (java.lang.Exception e) {
+                if (Build.DEBUG) {
+                    System.err.println(e.getClass().getName() + " caught propagating " + propertyName + " event: " + e.getMessage());
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    protected void firePropertyChange(String property, Object oldValue, Object newValue) {
+        getEventQueue().invokeLater(new PropertyChangeBroadcaster(property, oldValue, newValue));
+    }
+
+    protected void fireStatePropertyChange(AccessibleState state, boolean set) {
+        PropertyChangeBroadcaster broadcaster;
+        if (set) {
+            broadcaster = new PropertyChangeBroadcaster(
+                AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                null, state);
+        } else {
+            broadcaster = new PropertyChangeBroadcaster(
+                AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                state, null);
+        }
+        getEventQueue().invokeLater(broadcaster);
+    }
+
+    /**
+    * Update the proxy objects appropriatly on property change events
+    */
+    protected class AccessibleContainerListener implements XAccessibleEventListener {
+
+        protected AccessibleContainerListener() {
+        }
+
+        protected java.awt.EventQueue getEventQueue() {
+            return java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue();
+        }
+
+        protected void setComponentState(short state, boolean enable) {
+            switch (state) {
+                case AccessibleStateType.ACTIVE:
+                    // Only frames should be active
+                    break;
+                case AccessibleStateType.ENABLED:
+                    setEnabled(enable);
+                    // Since we can't access awt.Componet.accessibleContext, we need to fire
+                    // this event manually ..
+                    fireStatePropertyChange(AccessibleState.ENABLED, enable);
+                    break;
+                case AccessibleStateType.FOCUSED:
+                    getEventQueue().postEvent(new java.awt.event.FocusEvent(
+                        Container.this, enable ?
+                        java.awt.event.FocusEvent.FOCUS_GAINED :
+                        java.awt.event.FocusEvent.FOCUS_LOST));
+                    break;
+                case AccessibleStateType.SELECTED:
+                    fireStatePropertyChange(AccessibleState.SELECTED, enable);
+                    break;
+                case AccessibleStateType.SENSITIVE:
+                    // This state equals ENABLED in OOo (but not in Gtk+) and does not exist in Java 1.5
+                    break;
+                case AccessibleStateType.SHOWING:
+                case AccessibleStateType.VISIBLE:
+                    setVisible(enable);
+                    break;
+                default:
+                    if (Build.DEBUG) {
+                        System.err.println(Container.this + "unexpected state change " + state);
+                    }
+                    break;
+            }
+        }
+        /** Updates the accessible name and fires the appropriate PropertyChangedEvent */
+        protected void handleNameChangedEvent(Object any) {
+            try {
+                // This causes the property change event to be fired in the VCL thread
+                // context. If this causes problems, it has to be deligated to the java
+                // dispatch thread ..
+                if (accessibleContext != null) {
+                    accessibleContext.setAccessibleName(AnyConverter.toString(any));
+                }
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+            }
+        }
+
+        /** Updates the accessible description and fires the appropriate PropertyChangedEvent */
+        protected void handleDescriptionChangedEvent(Object any) {
+            try {
+                // This causes the property change event to be fired in the VCL thread
+                // context. If this causes problems, it has to be deligated to the java
+                // dispatch thread ..
+                if (accessibleContext != null) {
+                    accessibleContext.setAccessibleDescription(AnyConverter.toString(any));
+                }
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+            }
+        }
+
+        /** Updates the internal states and fires the appropriate PropertyChangedEvent */
+        protected void handleStateChangedEvent(Object any1, Object any2) {
+            try {
+                if (AnyConverter.isShort(any1)) {
+                    setComponentState(AnyConverter.toShort(any1), false);
+                }
+
+                if (AnyConverter.isShort(any2)) {
+                    setComponentState(AnyConverter.toShort(any2), true);
+                }
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+            }
+        }
+
+        /* This event is only necessary because some objects in the office don't know their parent
+         *  and are therefor unable to revoke and re-insert themselves.
+         */
+        protected void handleAllChildrenChangedEvent() {
+            javax.accessibility.Accessible parent = (javax.accessibility.Accessible) getParent();
+            if (parent != null) {
+                javax.accessibility.AccessibleContext parentAC = parent.getAccessibleContext();
+                if (parentAC != null) {
+
+                    parentAC.firePropertyChange(
+                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                        Container.this,
+                        null);
+
+                    AccessibleObjectFactory.clearContainer(Container.this);
+                    AccessibleObjectFactory.populateContainer(Container.this, unoAccessibleContext);
+
+                    parentAC.firePropertyChange(
+                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                        null,
+                        Container.this);
+                }
+            }
+        }
+
+        /** Called by OpenOffice process to notify property changes */
+        public void notifyEvent(AccessibleEventObject event) {
+
+            if ( !disposed ) {
+
+                switch (event.EventId) {
+                    case AccessibleEventId.NAME_CHANGED:
+                        // Set the accessible name for the corresponding context, which will fire a property
+                        // change event itself
+                        handleNameChangedEvent(event.NewValue);
+                        break;
+                    case AccessibleEventId.DESCRIPTION_CHANGED:
+                        // Set the accessible description for the corresponding context, which will fire a property
+                        // change event itself - so do not set propertyName !
+                        handleDescriptionChangedEvent(event.NewValue);
+                        break;
+                    case AccessibleEventId.STATE_CHANGED:
+                        // Update the internal state set and fire the appropriate PropertyChangedEvent
+                        handleStateChangedEvent(event.OldValue, event.NewValue);
+                        break;
+                    case AccessibleEventId.TEXT_CHANGED:
+                        firePropertyChange(AccessibleContext.ACCESSIBLE_TEXT_PROPERTY,
+                                                AccessibleTextImpl.convertTextSegment(event.OldValue),
+                                                AccessibleTextImpl.convertTextSegment(event.NewValue));
+                        break;
+                    case AccessibleEventId.CHILD:
+                        if (AnyConverter.isObject(event.OldValue)) {
+                            AccessibleObjectFactory.removeChild(Container.this, event.OldValue);
+                        } else if (AnyConverter.isObject(event.NewValue)) {
+                            AccessibleObjectFactory.addChild(Container.this, event.NewValue);
+                        }
+                        break;
+                    case AccessibleEventId.VISIBLE_DATA_CHANGED:
+                    case AccessibleEventId.BOUNDRECT_CHANGED:
+                        firePropertyChange(AccessibleContext.ACCESSIBLE_VISIBLE_DATA_PROPERTY, null, null);
+                        break;
+                    /*
+                     * the Java AccessBridge for GNOME maps SELECTION_PROPERTY change events
+                     * for objects of role TEXT to object:text-selection-changed
+                     */
+                    case AccessibleEventId.TEXT_SELECTION_CHANGED:
+                    case AccessibleEventId.SELECTION_CHANGED:
+                        firePropertyChange(AccessibleContext.ACCESSIBLE_SELECTION_PROPERTY, null, null);
+                        break;
+                    case AccessibleEventId.INVALIDATE_ALL_CHILDREN:
+                        handleAllChildrenChangedEvent();
+                        break;
+                    default:
+                        // Warn about unhandled events
+                        if(Build.DEBUG) {
+                            System.out.println(this + ": unhandled accessibility event id=" + event.EventId);
+                        }
+                }
+            }
+        }
+
+        /** Called by OpenOffice process to notify that the UNO component is disposing */
+        public void disposing(com.sun.star.lang.EventObject eventObject) {
+            disposed = true;
+            AccessibleObjectFactory.disposing(Container.this);
+        }
+    }
+
+    protected XAccessibleEventListener createEventListener() {
+        return new AccessibleContainerListener();
+    }
+
+    protected javax.accessibility.AccessibleContext accessibleContext = null;
+
+    /** This method actually creates the AccessibleContext object returned by
+     * getAccessibleContext().
+     */
+    protected javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleContainer();
+    }
+
+    /** Returns the AccessibleContext associated with this object */
+    public final javax.accessibility.AccessibleContext getAccessibleContext() {
+        if (accessibleContext == null) {
+            try {
+                AccessibleContext ac = createAccessibleContext();
+                if (ac != null) {
+                    // Set accessible name and description here to avoid
+                    // unnecessary property change events later ..
+                    ac.setAccessibleName(unoAccessibleContext.getAccessibleName());
+                    ac.setAccessibleDescription(unoAccessibleContext.getAccessibleDescription());
+                    accessibleContext = ac;
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+        }
+        return accessibleContext;
+    }
+
+    protected class AccessibleContainer extends java.awt.Container.AccessibleAWTContainer {
+
+        protected AccessibleContainer() {
+            /* Since getAccessibleText() is heavily used by the java access
+             * bridge for gnome and the gnome at-tools, we do a query interface
+             * here and remember the result.
+             */
+            accessibleText = AccessibleTextImpl.get(unoAccessibleContext);
+        }
+
+        protected AccessibleContainer(boolean query) {
+            /* This constructor is explicitly for subclasses that implement
+             * AccessibleHypertext and therefor the default constructor would
+             * bring unnecessary overhead.
+             */
+        }
+
+        protected java.awt.event.ComponentListener accessibleComponentHandler = null;
+
+        /**
+        * Fire PropertyChange listener, if one is registered,
+        * when shown/hidden..
+        */
+        protected class AccessibleComponentHandler implements java.awt.event.ComponentListener {
+            public void componentHidden(java.awt.event.ComponentEvent e)  {
+                AccessibleContainer.this.firePropertyChange(
+                    AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                    AccessibleState.VISIBLE, null);
+            }
+
+            public void componentShown(java.awt.event.ComponentEvent e)  {
+                AccessibleContainer.this.firePropertyChange(
+                    AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                    null, AccessibleState.VISIBLE);
+            }
+
+            public void componentMoved(java.awt.event.ComponentEvent e)  {
+            }
+
+            public void componentResized(java.awt.event.ComponentEvent e)  {
+            }
+        } // inner class AccessibleContainerHandler
+
+        protected java.awt.event.FocusListener accessibleFocusHandler = null;
+
+        /**
+        * Fire PropertyChange listener, if one is registered,
+        * when focus events happen
+        */
+        protected class AccessibleFocusHandler implements java.awt.event.FocusListener {
+            public void focusGained(java.awt.event.FocusEvent event) {
+                AccessibleContainer.this.firePropertyChange(
+                    AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                    null, AccessibleState.FOCUSED);
+                if (Build.DEBUG) {
+                    System.err.println("[" + getAccessibleRole() + "] " + getAccessibleName() + " is now focused");
+                }
+            }
+            public void focusLost(java.awt.event.FocusEvent event) {
+                AccessibleContainer.this.firePropertyChange(
+                    AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                    AccessibleState.FOCUSED, null);
+                if (Build.DEBUG) {
+                    System.err.println("[" + getAccessibleRole() + "] " + getAccessibleName() + " is no longer focused");
+                }
+            }
+        } // inner class AccessibleFocusHandler
+
+        protected java.awt.event.ContainerListener accessibleContainerHandler = null;
+
+        /**
+        * Fire PropertyChange listener, if one is registered,
+        * when children added/removed.
+        */
+
+        protected class AccessibleContainerHandler implements java.awt.event.ContainerListener {
+            public void componentAdded(java.awt.event.ContainerEvent e) {
+                java.awt.Component c = e.getChild();
+                if (c != null && c instanceof javax.accessibility.Accessible) {
+                    AccessibleContainer.this.firePropertyChange(
+                        AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                        null, ((javax.accessibility.Accessible) c).getAccessibleContext());
+                }
+            }
+            public void componentRemoved(java.awt.event.ContainerEvent e) {
+                java.awt.Component c = e.getChild();
+                if (c != null && c instanceof javax.accessibility.Accessible) {
+                    AccessibleContainer.this.firePropertyChange(
+                        AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                        ((javax.accessibility.Accessible) c).getAccessibleContext(), null);
+                }
+            }
+        }
+
+        protected int propertyChangeListenerCount = 0;
+
+        /**
+        * Add a PropertyChangeListener to the listener list.
+        *
+        * @param listener  The PropertyChangeListener to be added
+        */
+        public void addPropertyChangeListener(java.beans.PropertyChangeListener listener) {
+            if (propertyChangeListenerCount++ == 0) {
+                accessibleFocusHandler = new AccessibleFocusHandler();
+                Container.this.addFocusListener(accessibleFocusHandler);
+
+                accessibleContainerHandler = new AccessibleContainerHandler();
+                Container.this.addContainerListener(accessibleContainerHandler);
+
+                accessibleComponentHandler = new AccessibleComponentHandler();
+                Container.this.addComponentListener(accessibleComponentHandler);
+            }
+            super.addPropertyChangeListener(listener);
+        }
+
+        /**
+        * Remove a PropertyChangeListener from the listener list.
+        * This removes a PropertyChangeListener that was registered
+        * for all properties.
+        *
+        * @param listener  The PropertyChangeListener to be removed
+        */
+        public void removePropertyChangeListener(java.beans.PropertyChangeListener listener) {
+            if (--propertyChangeListenerCount == 0) {
+                Container.this.removeComponentListener(accessibleComponentHandler);
+                accessibleComponentHandler = null;
+
+                Container.this.removeContainerListener(accessibleContainerHandler);
+                accessibleContainerHandler = null;
+
+                Container.this.removeFocusListener(accessibleFocusHandler);
+                accessibleFocusHandler = null;
+            }
+            super.removePropertyChangeListener(listener);
+        }
+
+        /** Gets the role of this object */
+        public javax.accessibility.AccessibleRole getAccessibleRole() {
+            return accessibleRole;
+        }
+
+        /** Gets the AccessibleText associated with this object presenting text on the display */
+        public javax.accessibility.AccessibleText getAccessibleText() {
+
+            if (disposed)
+                return null;
+
+            return accessibleText;
+        }
+
+        /**
+        * Gets the current state set of this object.
+        *
+        * @return an instance of <code>AccessibleStateSet</code>
+        *    containing the current state set of the object
+        * @see AccessibleState
+        */
+        public javax.accessibility.AccessibleStateSet getAccessibleStateSet() {
+            if (disposed)
+                return AccessibleStateAdapter.getDefunctStateSet();
+
+            try {
+                return AccessibleStateAdapter.getAccessibleStateSet(Container.this,
+                    unoAccessibleContext.getAccessibleStateSet());
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return AccessibleStateAdapter.getDefunctStateSet();
+            }
+        }
+
+        /** Returns the AccessibleSelection interface for this object */
+        public javax.accessibility.AccessibleSelection getAccessibleSelection() {
+            try {
+                XAccessibleSelection unoAccessibleSelection = (XAccessibleSelection)
+                    UnoRuntime.queryInterface(XAccessibleSelection.class, unoAccessibleContext);
+                if (unoAccessibleSelection != null) {
+                    return new AccessibleSelectionImpl(unoAccessibleSelection);
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+
+            return null;
+        }
+
+        /** Gets the locale of the component */
+        public java.util.Locale getLocale() throws java.awt.IllegalComponentStateException {
+            try {
+                com.sun.star.lang.Locale unoLocale = unoAccessible.getAccessibleContext().getLocale();
+                return new java.util.Locale(unoLocale.Language, unoLocale.Country);
+            } catch (IllegalAccessibleComponentStateException e) {
+                throw new java.awt.IllegalComponentStateException(e.getMessage());
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return super.getLocale();
+            }
+        }
+
+        /*
+        * AccessibleComponent
+        */
+
+        /** Returns the background color of the object */
+        public java.awt.Color getBackground() {
+            try {
+                return new java.awt.Color(unoAccessibleComponent.getBackground());
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        public void setBackground(java.awt.Color c) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the foreground color of the object */
+        public java.awt.Color getForeground() {
+            try {
+                return new java.awt.Color(unoAccessibleComponent.getForeground());
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        public void setForeground(java.awt.Color c) {
+            // Not supported by UNO accessibility API
+        }
+
+        public java.awt.Cursor getCursor() {
+            // Not supported by UNO accessibility API
+            return null;
+        }
+
+        public void setCursor(java.awt.Cursor cursor) {
+            // Not supported by UNO accessibility API
+        }
+
+        public java.awt.Font getFont() {
+            // FIXME
+            return null;
+        }
+
+        public void setFont(java.awt.Font f) {
+            // Not supported by UNO accessibility API
+        }
+
+        public java.awt.FontMetrics getFontMetrics(java.awt.Font f) {
+            // FIXME
+            return null;
+        }
+
+        public boolean isEnabled() {
+            return Container.this.isEnabled();
+        }
+
+        public void setEnabled(boolean b) {
+            // Not supported by UNO accessibility API
+        }
+
+        public boolean isVisible() {
+            return Container.this.isVisible();
+        }
+
+        public void setVisible(boolean b) {
+            // Not supported by UNO accessibility API
+        }
+
+        public boolean isShowing() {
+            return Container.this.isShowing();
+        }
+
+        public boolean contains(java.awt.Point p) {
+            try {
+                return unoAccessibleComponent.containsPoint(new com.sun.star.awt.Point(p.x, p.y));
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return false;
+            }
+        }
+
+        /** Returns the location of the object on the screen. */
+        public java.awt.Point getLocationOnScreen() {
+            try {
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocationOnScreen();
+                return new java.awt.Point(unoPoint.X, unoPoint.Y);
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Gets the location of this component in the form of a point specifying the component's top-left corner */
+        public java.awt.Point getLocation() {
+            try {
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocation();
+                return new java.awt.Point( unoPoint.X, unoPoint.Y );
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Moves this component to a new location */
+        public void setLocation(java.awt.Point p) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Gets the bounds of this component in the form of a Rectangle object */
+        public java.awt.Rectangle getBounds() {
+            try {
+                com.sun.star.awt.Rectangle unoRect = unoAccessibleComponent.getBounds();
+                return new java.awt.Rectangle(unoRect.X, unoRect.Y, unoRect.Width, unoRect.Height);
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Moves and resizes this component to conform to the new bounding rectangle r */
+        public void setBounds(java.awt.Rectangle r) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the size of this component in the form of a Dimension object */
+        public java.awt.Dimension getSize() {
+            try {
+                com.sun.star.awt.Size unoSize = unoAccessibleComponent.getSize();
+                return new java.awt.Dimension(unoSize.Width, unoSize.Height);
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Resizes this component so that it has width d.width and height d.height */
+        public void setSize(java.awt.Dimension d) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */
+        public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
+            try {
+                java.awt.Component c = AccessibleObjectFactory.getAccessibleComponent(
+                    unoAccessibleComponent.getAccessibleAtPoint(new com.sun.star.awt.Point(p.x, p.y)));
+
+                return (javax.accessibility.Accessible) c;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        public boolean isFocusTraversable() {
+            return Container.this.isFocusable();
+        }
+
+        public void requestFocus() {
+            unoAccessibleComponent.grabFocus();
+        }
+    }
+
+    public String toString() {
+        return UnoRuntime.generateOid(unoAccessible);
+    }
+}
+
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/DescendantManager.java b/accessibility/bridge/org/openoffice/java/accessibility/DescendantManager.java
new file mode 100644
index 000000000000..5b8c45b716b4
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/DescendantManager.java
@@ -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.
+ *
+ ************************************************************************/
+package org.openoffice.java.accessibility;
+
+import com.sun.star.accessibility.*;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.UnoRuntime;
+
+import javax.accessibility.AccessibleState;
+
+
+public abstract class DescendantManager extends Component {
+    protected XAccessibleSelection unoAccessibleSelection = null;
+    protected javax.accessibility.Accessible activeDescendant = null;
+    protected boolean multiselectable = false;
+
+    protected DescendantManager(XAccessible xAccessible,
+        XAccessibleContext xAccessibleContext) {
+        super(xAccessible, xAccessibleContext);
+    }
+
+    protected DescendantManager(XAccessible xAccessible,
+        XAccessibleContext xAccessibleContext, boolean multiselectable) {
+        super(xAccessible, xAccessibleContext);
+        this.multiselectable = multiselectable;
+    }
+
+    /**
+    * Update the proxy objects appropriatly on property change events
+    */
+    protected class AccessibleDescendantManagerListener
+        extends AccessibleUNOComponentListener {
+        protected AccessibleDescendantManagerListener() {
+            unoAccessibleSelection = (XAccessibleSelection) UnoRuntime.queryInterface(XAccessibleSelection.class,
+                    unoAccessibleContext);
+        }
+
+        /** Called by OpenOffice process to notify property changes */
+        public void notifyEvent(AccessibleEventObject event) {
+            switch (event.EventId) {
+                case AccessibleEventId.SELECTION_CHANGED:
+                    firePropertyChange(javax.accessibility.AccessibleContext.ACCESSIBLE_SELECTION_PROPERTY,
+                        null, null);
+
+                    break;
+
+                default:
+                    super.notifyEvent(event);
+            }
+        }
+    }
+
+    protected abstract class AccessibleDescendantManager
+        extends AccessibleUNOComponent
+        implements javax.accessibility.AccessibleSelection {
+        protected AccessibleDescendantManager() {
+            unoAccessibleSelection = (XAccessibleSelection) UnoRuntime.queryInterface(XAccessibleSelection.class,
+                    unoAccessibleContext);
+        }
+
+        /*
+        * AccessibleContext
+        */
+
+        /** Returns the number of accessible children of the object */
+        public int getAccessibleChildrenCount() {
+            try {
+                return unoAccessibleContext.getAccessibleChildCount();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return 0;
+            }
+        }
+
+        /** Returns the AccessibleSelection interface for this object */
+        public javax.accessibility.AccessibleSelection getAccessibleSelection() {
+            return (unoAccessibleSelection != null) ? this : null;
+        }
+
+        /*
+        * AccessibleSelection
+        */
+
+        /** Adds the specified Accessible child of the object to the object's selection */
+        public void addAccessibleSelection(int i) {
+            try {
+                unoAccessibleSelection.selectAccessibleChild(i);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+        }
+
+        /** Clears the selection in the object, so that no children in the object are selected */
+        public void clearAccessibleSelection() {
+            try {
+                unoAccessibleSelection.clearAccessibleSelection();
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+        }
+
+        /** Returns the number of Accessible children currently selected */
+        public int getAccessibleSelectionCount() {
+            try {
+                return unoAccessibleSelection.getSelectedAccessibleChildCount();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return 0;
+            }
+        }
+
+        /** Determines if the current child of this object is selected */
+        public boolean isAccessibleChildSelected(int i) {
+            try {
+                return unoAccessibleSelection.isAccessibleChildSelected(i);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return false;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return false;
+            }
+        }
+
+        /** Removes the specified child of the object from the object's selection */
+        public void removeAccessibleSelection(int i) {
+            try {
+                unoAccessibleSelection.deselectAccessibleChild(i);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+        }
+
+        /** Causes every child of the object to be selected if the object supports multiple selection */
+        public void selectAllAccessibleSelection() {
+            try {
+                unoAccessibleSelection.selectAllAccessibleChildren();
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+        }
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java b/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java
new file mode 100644
index 000000000000..dcb067368996
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Dialog.java
@@ -0,0 +1,633 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import javax.accessibility.AccessibleState;
+
+import com.sun.star.uno.*;
+import com.sun.star.accessibility.*;
+
+public class Dialog extends java.awt.Dialog implements javax.accessibility.Accessible, NativeFrame {
+    protected XAccessibleComponent unoAccessibleComponent;
+
+    boolean opened = false;
+    boolean visible = false;
+    boolean active = false;
+
+    java.awt.EventQueue eventQueue = null;
+
+    protected Dialog(java.awt.Frame owner, XAccessibleComponent xAccessibleComponent) {
+        super(owner);
+        initialize(xAccessibleComponent);
+    }
+
+    protected Dialog(java.awt.Frame owner, String name, XAccessibleComponent xAccessibleComponent) {
+        super(owner, name);
+        initialize(xAccessibleComponent);
+    }
+
+    protected Dialog(java.awt.Frame owner, String name, boolean modal, XAccessibleComponent xAccessibleComponent) {
+        super(owner, name, modal);
+        initialize(xAccessibleComponent);
+    }
+
+    private void initialize(XAccessibleComponent xAccessibleComponent) {
+        unoAccessibleComponent = xAccessibleComponent;
+        eventQueue = java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue();
+        XAccessibleEventBroadcaster broadcaster = (XAccessibleEventBroadcaster)
+            UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class,
+            xAccessibleComponent);
+        if (broadcaster != null) {
+            broadcaster.addEventListener(new AccessibleDialogListener());
+        }
+    }
+
+    java.awt.Component initialComponent = null;
+
+    public java.awt.Component getInitialComponent() {
+        return initialComponent;
+    }
+
+    public void setInitialComponent(java.awt.Component c) {
+        initialComponent = c;
+    }
+
+    public Integer getHWND() {
+        return null;
+    }
+
+    /**
+    * Determines whether this <code>Component</code> is showing on screen.
+    * This means that the component must be visible, and it must be in a
+    * <code>container</code> that is visible and showing.
+    * @see       #addNotify
+    * @see       #removeNotify
+    * @since JDK1.0
+    */
+    public boolean isShowing() {
+        if (isVisible()) {
+            java.awt.Container parent = getParent();
+            return (parent == null) || parent.isShowing();
+        }
+        return false;
+    }
+
+    /**
+    * Makes this <code>Component</code> displayable by connecting it to a
+    * native screen resource.
+    * This method is called internally by the toolkit and should
+    * not be called directly by programs.
+    * @see       #isDisplayable
+    * @see       #removeNotify
+    * @since JDK1.0
+    */
+    public void addNotify() {
+//      createHierarchyEvents(0, null, null, 0, false);
+    }
+
+    /**
+    * Makes this <code>Component</code> undisplayable by destroying it native
+    * screen resource.
+    * This method is called by the toolkit internally and should
+    * not be called directly by programs.
+    * @see       #isDisplayable
+    * @see       #addNotify
+    * @since JDK1.0
+    */
+    public void removeNotify() {
+    }
+
+        /**
+         * Determines if the object is visible.  Note: this means that the
+         * object intends to be visible; however, it may not in fact be
+         * showing on the screen because one of the objects that this object
+         * is contained by is not visible.  To determine if an object is
+         * showing on the screen, use <code>isShowing</code>.
+         *
+         * @return true if object is visible; otherwise, false
+         */
+    public boolean isVisible(){
+        return visible;
+    }
+
+    /**
+    * Shows or hides this component depending on the value of parameter
+    * <code>b</code>.
+    * @param b  if <code>true</code>, shows this component;
+    * otherwise, hides this component
+    * @see #isVisible
+    * @since JDK1.1
+    */
+    public void setVisible(boolean b) {
+        if (visible != b){
+            visible = b;
+            if (b) {
+                // If it is the first show, fire WINDOW_OPENED event
+                if (!opened) {
+                    postWindowEvent(java.awt.event.WindowEvent.WINDOW_OPENED);
+                    opened = true;
+                }
+                postComponentEvent(java.awt.event.ComponentEvent.COMPONENT_SHOWN);
+            } else {
+                postComponentEvent(java.awt.event.ComponentEvent.COMPONENT_HIDDEN);
+            }
+        }
+    }
+
+    public void dispose() {
+        setVisible(false);
+        postWindowEvent(java.awt.event.WindowEvent.WINDOW_CLOSED);
+    }
+
+    protected void postWindowEvent(int i) {
+        eventQueue.postEvent(new java.awt.event.WindowEvent(this, i));
+    }
+
+    protected void postComponentEvent(int i) {
+        eventQueue.postEvent(new java.awt.event.ComponentEvent(this, i));
+    }
+
+    /**
+    * Update the proxy objects appropriatly on property change events
+    */
+    protected class AccessibleDialogListener implements XAccessibleEventListener {
+
+        protected AccessibleDialogListener() {
+        }
+
+        protected void setComponentState(short state, boolean enable) {
+            switch (state) {
+                case AccessibleStateType.ACTIVE:
+                    active = enable;
+                    if (enable) {
+                        AccessibleObjectFactory.postWindowActivated(Dialog.this);
+                    } else {
+                        AccessibleObjectFactory.postWindowLostFocus(Dialog.this);
+                    }
+                    break;
+                case AccessibleStateType.ICONIFIED:
+                    postWindowEvent(enable ?
+                        java.awt.event.WindowEvent.WINDOW_ICONIFIED :
+                        java.awt.event.WindowEvent.WINDOW_DEICONIFIED);
+                    break;
+                case AccessibleStateType.VISIBLE:
+                    Dialog.this.setVisible(enable);
+                    break;
+                default:
+                    if (Build.DEBUG) {
+                        System.err.println("[dialog]: " + getTitle() + "unexpected state change " + state);
+                    }
+                    break;
+            }
+        }
+
+        /** Updates the accessible name and fires the appropriate PropertyChangedEvent */
+        protected void handleNameChangedEvent(Object any) {
+            try {
+                String title = AnyConverter.toString(any);
+                setTitle(title);
+                // This causes the property change event to be fired in the VCL thread
+                // context. If this causes problems, it has to be deligated to the java
+                // dispatch thread ..
+                javax.accessibility.AccessibleContext ac = accessibleContext;
+                if (ac!= null) {
+                    ac.setAccessibleName(title);
+                }
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+            }
+        }
+
+        /** Updates the accessible description and fires the appropriate PropertyChangedEvent */
+        protected void handleDescriptionChangedEvent(Object any) {
+            try {
+                // This causes the property change event to be fired in the VCL thread
+                // context. If this causes problems, it has to be deligated to the java
+                // dispatch thread ..
+                javax.accessibility.AccessibleContext ac = accessibleContext;
+                if (ac!= null) {
+                    ac.setAccessibleDescription(AnyConverter.toString(any));
+                }
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+            }
+        }
+
+        /** Updates the internal states and fires the appropriate PropertyChangedEvent */
+        protected void handleStateChangedEvent(Object any1, Object any2) {
+            try {
+                if (AnyConverter.isShort(any1)) {
+                    setComponentState(AnyConverter.toShort(any1), false);
+                }
+
+                if (AnyConverter.isShort(any2)) {
+                    setComponentState(AnyConverter.toShort(any2), true);
+                }
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+            }
+        }
+
+        /** Fires a visible data property change event */
+        protected void handleVisibleDataEvent() {
+            javax.accessibility.AccessibleContext ac = accessibleContext;
+            if (ac != null) {
+                ac.firePropertyChange(javax.accessibility.AccessibleContext.ACCESSIBLE_VISIBLE_DATA_PROPERTY, null, null);
+            }
+        }
+
+        /** Called by OpenOffice process to notify property changes */
+        public void notifyEvent(AccessibleEventObject event) {
+            switch (event.EventId) {
+                case AccessibleEventId.NAME_CHANGED:
+                    // Set the accessible name for the corresponding context, which will fire a property
+                    // change event itself
+                    handleNameChangedEvent(event.NewValue);
+                    break;
+                case AccessibleEventId.DESCRIPTION_CHANGED:
+                    // Set the accessible description for the corresponding context, which will fire a property
+                    // change event itself - so do not set propertyName !
+                    handleDescriptionChangedEvent(event.NewValue);
+                    break;
+                case AccessibleEventId.STATE_CHANGED:
+                    // Update the internal state set and fire the appropriate PropertyChangedEvent
+                    handleStateChangedEvent(event.OldValue, event.NewValue);
+                    break;
+                case AccessibleEventId.CHILD:
+                    if (AnyConverter.isObject(event.OldValue)) {
+                        AccessibleObjectFactory.removeChild(Dialog.this, event.OldValue);
+                    } else if (AnyConverter.isObject(event.NewValue)) {
+                        AccessibleObjectFactory.addChild(Dialog.this, event.NewValue);
+                    }
+                    break;
+                case AccessibleEventId.VISIBLE_DATA_CHANGED:
+                case AccessibleEventId.BOUNDRECT_CHANGED:
+                    handleVisibleDataEvent();
+                    break;
+                default:
+                    // Warn about unhandled events
+                    if(Build.DEBUG) {
+                        System.out.println(this + ": unhandled accessibility event id=" + event.EventId);
+                    }
+            }
+        }
+
+        /** Called by OpenOffice process to notify that the UNO component is disposing */
+        public void disposing(com.sun.star.lang.EventObject eventObject) {
+        }
+    }
+
+    javax.accessibility.AccessibleContext accessibleContext = null;
+
+    /** Returns the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext getAccessibleContext() {
+        if (accessibleContext == null) {
+            accessibleContext = new AccessibleDialog();
+            accessibleContext.setAccessibleName(getTitle());
+        }
+        return accessibleContext;
+    }
+
+    protected class AccessibleDialog extends java.awt.Dialog.AccessibleAWTDialog {
+        protected AccessibleDialog() {
+            super();
+        }
+
+        protected java.awt.event.ComponentListener accessibleComponentHandler = null;
+
+        /**
+        * Fire PropertyChange listener, if one is registered,
+        * when shown/hidden..
+        */
+        protected class AccessibleComponentHandler implements java.awt.event.ComponentListener {
+            public void componentHidden(java.awt.event.ComponentEvent e)  {
+                AccessibleDialog.this.firePropertyChange(
+                    javax.accessibility.AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                    javax.accessibility.AccessibleState.VISIBLE, null);
+            }
+
+            public void componentShown(java.awt.event.ComponentEvent e)  {
+                AccessibleDialog.this.firePropertyChange(
+                    javax.accessibility.AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                    null, javax.accessibility.AccessibleState.VISIBLE);
+            }
+
+            public void componentMoved(java.awt.event.ComponentEvent e)  {
+            }
+
+            public void componentResized(java.awt.event.ComponentEvent e)  {
+            }
+        } // inner class AccessibleComponentHandler
+
+        protected java.awt.event.WindowListener accessibleWindowHandler = null;
+
+        /**
+        * Fire PropertyChange listener, if one is registered,
+        * when window events happen
+        */
+        protected class AccessibleWindowHandler implements java.awt.event.WindowListener {
+            /** Invoked when the Window is set to be the active Window. */
+            public void windowActivated(java.awt.event.WindowEvent e) {
+                AccessibleDialog.this.firePropertyChange(
+                    javax.accessibility.AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                    null, javax.accessibility.AccessibleState.ACTIVE);
+                if (Build.DEBUG) {
+                    System.err.println("[Dialog] " + getTitle() + " is now active");
+                }
+            }
+
+            /** Invoked when a window has been closed as the result of calling dispose on the window. */
+            public void windowClosed(java.awt.event.WindowEvent e) {
+                if (Build.DEBUG) {
+                    System.err.println("[Dialog] " + getTitle() + " has been closed");
+                }
+            }
+
+            /** Invoked when the user attempts to close the window from the window's system menu. */
+            public void windowClosing(java.awt.event.WindowEvent e) {
+                if (Build.DEBUG) {
+                    System.err.println("[Dialog] " + getTitle() + " is closing");
+                }
+            }
+
+            /** Invoked when a Window is no longer the active Window. */
+            public void windowDeactivated(java.awt.event.WindowEvent e) {
+                AccessibleDialog.this.firePropertyChange(
+                    javax.accessibility.AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                    javax.accessibility.AccessibleState.ACTIVE, null);
+                if (Build.DEBUG) {
+                    System.err.println("[Dialog] " + getTitle() + " is no longer active");
+                }
+            }
+
+            /** Invoked when a window is changed from a minimized to a normal state. */
+            public void windowDeiconified(java.awt.event.WindowEvent e) {
+                if (Build.DEBUG) {
+                    System.err.println("[Dialog] " + getTitle() + " has been deiconified");
+                }
+            }
+
+            /** Invoked when a window is changed from a normal to a minimized state. */
+            public void windowIconified(java.awt.event.WindowEvent e) {
+                if (Build.DEBUG) {
+                    System.err.println("[Dialog] " + getTitle() + " has been iconified");
+                }
+            }
+
+            /** Invoked the first time a window is made visible. */
+            public void windowOpened(java.awt.event.WindowEvent e) {
+                if (Build.DEBUG) {
+                    System.err.println("[Dialog] " + getTitle() + " has been opened");
+                }
+            }
+
+        } // inner class AccessibleWindowHandler
+
+        protected java.awt.event.ContainerListener accessibleContainerHandler = null;
+
+        /**
+        * Fire PropertyChange listener, if one is registered,
+        * when children added/removed.
+        */
+
+        protected class AccessibleContainerHandler implements java.awt.event.ContainerListener {
+            public void componentAdded(java.awt.event.ContainerEvent e) {
+                java.awt.Component c = e.getChild();
+                if (c != null && c instanceof javax.accessibility.Accessible) {
+                    AccessibleDialog.this.firePropertyChange(
+                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                        null, ((javax.accessibility.Accessible) c).getAccessibleContext());
+                }
+            }
+            public void componentRemoved(java.awt.event.ContainerEvent e) {
+                java.awt.Component c = e.getChild();
+                if (c != null && c instanceof javax.accessibility.Accessible) {
+                    AccessibleDialog.this.firePropertyChange(
+                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                        ((javax.accessibility.Accessible) c).getAccessibleContext(), null);
+                }
+            }
+        }
+
+        protected int propertyChangeListenerCount = 0;
+
+        /**
+        * Add a PropertyChangeListener to the listener list.
+        *
+        * @param listener  The PropertyChangeListener to be added
+        */
+        public void addPropertyChangeListener(java.beans.PropertyChangeListener listener) {
+            if (propertyChangeListenerCount++ == 0) {
+                accessibleWindowHandler = new AccessibleWindowHandler();
+                Dialog.this.addWindowListener(accessibleWindowHandler);
+
+                accessibleContainerHandler = new AccessibleContainerHandler();
+                Dialog.this.addContainerListener(accessibleContainerHandler);
+
+                accessibleComponentHandler = new AccessibleComponentHandler();
+                Dialog.this.addComponentListener(accessibleComponentHandler);
+            }
+            super.addPropertyChangeListener(listener);
+        }
+
+        /**
+        * Remove a PropertyChangeListener from the listener list.
+        * This removes a PropertyChangeListener that was registered
+        * for all properties.
+        *
+        * @param listener  The PropertyChangeListener to be removed
+        */
+        public void removePropertyChangeListener(java.beans.PropertyChangeListener listener) {
+            if (--propertyChangeListenerCount == 0) {
+                Dialog.this.removeComponentListener(accessibleComponentHandler);
+                accessibleComponentHandler = null;
+
+                Dialog.this.removeContainerListener(accessibleContainerHandler);
+                accessibleContainerHandler = null;
+
+                Dialog.this.removeWindowListener(accessibleWindowHandler);
+                accessibleWindowHandler = null;
+            }
+            super.removePropertyChangeListener(listener);
+        }
+
+        /*
+        * AccessibleComponent
+        */
+
+        /** Returns the background color of the object */
+        public java.awt.Color getBackground() {
+            try {
+                return new java.awt.Color(unoAccessibleComponent.getBackground());
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        public void setBackground(java.awt.Color c) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the foreground color of the object */
+        public java.awt.Color getForeground() {
+            try {
+                return new java.awt.Color(unoAccessibleComponent.getForeground());
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        public void setForeground(java.awt.Color c) {
+            // Not supported by UNO accessibility API
+        }
+
+        public java.awt.Cursor getCursor() {
+            // Not supported by UNO accessibility API
+            return null;
+        }
+
+        public void setCursor(java.awt.Cursor cursor) {
+            // Not supported by UNO accessibility API
+        }
+
+        public java.awt.Font getFont() {
+            // FIXME
+            return null;
+        }
+
+        public void setFont(java.awt.Font f) {
+            // Not supported by UNO accessibility API
+        }
+
+        public java.awt.FontMetrics getFontMetrics(java.awt.Font f) {
+            // FIXME
+            return null;
+        }
+
+        public boolean isEnabled() {
+            return Dialog.this.isEnabled();
+        }
+
+        public void setEnabled(boolean b) {
+            // Not supported by UNO accessibility API
+        }
+
+        public boolean isVisible() {
+            return Dialog.this.isVisible();
+        }
+
+        public void setVisible(boolean b) {
+            // Not supported by UNO accessibility API
+        }
+
+        public boolean isShowing() {
+            return Dialog.this.isShowing();
+        }
+
+        public boolean contains(java.awt.Point p) {
+            try {
+                return unoAccessibleComponent.containsPoint(new com.sun.star.awt.Point(p.x, p.y));
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return false;
+            }
+        }
+
+        /** Returns the location of the object on the screen. */
+        public java.awt.Point getLocationOnScreen() {
+            try {
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocationOnScreen();
+                return new java.awt.Point(unoPoint.X, unoPoint.Y);
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Gets the location of this component in the form of a point specifying the component's top-left corner */
+        public java.awt.Point getLocation() {
+            try {
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocation();
+                return new java.awt.Point( unoPoint.X, unoPoint.Y );
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Moves this component to a new location */
+        public void setLocation(java.awt.Point p) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Gets the bounds of this component in the form of a Rectangle object */
+        public java.awt.Rectangle getBounds() {
+            try {
+                com.sun.star.awt.Rectangle unoRect = unoAccessibleComponent.getBounds();
+                return new java.awt.Rectangle(unoRect.X, unoRect.Y, unoRect.Width, unoRect.Height);
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Moves and resizes this component to conform to the new bounding rectangle r */
+        public void setBounds(java.awt.Rectangle r) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the size of this component in the form of a Dimension object */
+        public java.awt.Dimension getSize() {
+            try {
+                com.sun.star.awt.Size unoSize = unoAccessibleComponent.getSize();
+                return new java.awt.Dimension(unoSize.Width, unoSize.Height);
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Resizes this component so that it has width d.width and height d.height */
+        public void setSize(java.awt.Dimension d) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */
+        public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
+            try {
+                java.awt.Component c = AccessibleObjectFactory.getAccessibleComponent(
+                    unoAccessibleComponent.getAccessibleAtPoint(new com.sun.star.awt.Point(p.x, p.y)));
+
+                return (javax.accessibility.Accessible) c;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        public boolean isFocusTraversable() {
+            return Dialog.this.isFocusable();
+        }
+
+        public void requestFocus() {
+            unoAccessibleComponent.grabFocus();
+        }
+    }
+}
+
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/FocusTraversalPolicy.java b/accessibility/bridge/org/openoffice/java/accessibility/FocusTraversalPolicy.java
new file mode 100644
index 000000000000..75f6c91354f4
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/FocusTraversalPolicy.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+
+public class FocusTraversalPolicy extends java.awt.FocusTraversalPolicy {
+
+    protected javax.accessibility.Accessible getSelectedAccessibleChild(javax.accessibility.Accessible a) {
+        javax.accessibility.AccessibleContext ac = a.getAccessibleContext();
+        if (ac != null) {
+            javax.accessibility.AccessibleSelection as = ac.getAccessibleSelection();
+            if (as != null) {
+                return as.getAccessibleSelection(0);
+            }
+        }
+        return null;
+    }
+
+    /** Returns the Component that should receive the focus after aComponent */
+    public java.awt.Component getComponentAfter(java.awt.Container focusCycleRoot,
+        java.awt.Component aComponent) {
+        return null;
+    }
+
+    /** Returns the Component that should receive the focus before aComponent */
+    public java.awt.Component getComponentBefore(java.awt.Container focusCycleRoot,
+        java.awt.Component aComponent) {
+        return null;
+    }
+
+    /** Returns the default Component to focus */
+    public java.awt.Component getDefaultComponent(java.awt.Container focusCycleRoot) {
+        // getDefaultComponent must not return null for Windows to make them focusable.
+        if (focusCycleRoot instanceof NativeFrame) {
+            java.awt.Component c = ((NativeFrame) focusCycleRoot).getInitialComponent();
+            if (c != null) {
+                return c;
+            }
+        }
+
+        if (focusCycleRoot instanceof javax.accessibility.Accessible) {
+            return (java.awt.Component) getSelectedAccessibleChild((javax.accessibility.Accessible) focusCycleRoot);
+        }
+        return null;
+    }
+
+    /** Returns the first Component in the traversal cycle */
+    public java.awt.Component getFirstComponent(java.awt.Container focusCycleRoot) {
+        return null;
+    }
+
+    /** Returns the Component that should receive the focus when a Window is made visible for the first time */
+    public java.awt.Component getInitialComponent(java.awt.Window window) {
+        if (window instanceof NativeFrame) {
+            return ((NativeFrame) window).getInitialComponent();
+        }
+        return null;
+    }
+
+    /** Returns the last Component in the traversal cycle */
+    public java.awt.Component getLastComponent(java.awt.Container focusCycleRoot) {
+        return null;
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Frame.java b/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
new file mode 100644
index 000000000000..b7f37b2d6b18
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
@@ -0,0 +1,646 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import com.sun.star.uno.*;
+import com.sun.star.accessibility.*;
+
+public class Frame extends java.awt.Frame implements javax.accessibility.Accessible, NativeFrame {
+    protected XAccessibleComponent unoAccessibleComponent;
+
+    boolean opened = false;
+    boolean visible = false;
+    boolean active = false;
+
+    java.awt.EventQueue eventQueue = null;
+
+    protected Frame(XAccessibleComponent xAccessibleComponent) {
+        initialize(xAccessibleComponent);
+    }
+
+    protected Frame(String name, XAccessibleComponent xAccessibleComponent) {
+        super(name);
+        initialize(xAccessibleComponent);
+    }
+
+    private void initialize(XAccessibleComponent xAccessibleComponent) {
+        unoAccessibleComponent = xAccessibleComponent;
+        eventQueue = java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue();
+        XAccessibleEventBroadcaster broadcaster = (XAccessibleEventBroadcaster)
+            UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class,
+            unoAccessibleComponent);
+        if (broadcaster != null) {
+            broadcaster.addEventListener(new AccessibleFrameListener());
+        }
+    }
+
+    java.awt.Component initialComponent = null;
+
+    public java.awt.Component getInitialComponent() {
+        return initialComponent;
+    }
+
+    public void setInitialComponent(java.awt.Component c) {
+        initialComponent = c;
+    }
+
+    public Integer getHWND() {
+        return null;
+    }
+
+    /**
+    * Determines whether this <code>Component</code> is showing on screen.
+    * This means that the component must be visible, and it must be in a
+    * <code>container</code> that is visible and showing.
+    * @see       #addNotify
+    * @see       #removeNotify
+    * @since JDK1.0
+    */
+    public boolean isShowing() {
+        if (isVisible()) {
+            java.awt.Container parent = getParent();
+            return (parent == null) || parent.isShowing();
+        }
+        return false;
+    }
+
+    /**
+    * Makes this <code>Component</code> displayable by connecting it to a
+    * native screen resource.
+    * This method is called internally by the toolkit and should
+    * not be called directly by programs.
+    * @see       #isDisplayable
+    * @see       #removeNotify
+    * @since JDK1.0
+    */
+    public void addNotify() {
+//      createHierarchyEvents(0, null, null, 0, false);
+    }
+
+    /**
+    * Makes this <code>Component</code> undisplayable by destroying it native
+    * screen resource.
+    * This method is called by the toolkit internally and should
+    * not be called directly by programs.
+    * @see       #isDisplayable
+    * @see       #addNotify
+    * @since JDK1.0
+    */
+    public void removeNotify() {
+    }
+
+        /**
+         * Determines if the object is visible.  Note: this means that the
+         * object intends to be visible; however, it may not in fact be
+         * showing on the screen because one of the objects that this object
+         * is contained by is not visible.  To determine if an object is
+         * showing on the screen, use <code>isShowing</code>.
+         *
+         * @return true if object is visible; otherwise, false
+         */
+    public boolean isVisible(){
+        return visible;
+    }
+
+    /**
+    * Shows or hides this component depending on the value of parameter
+    * <code>b</code>.
+    * @param b  if <code>true</code>, shows this component;
+    * otherwise, hides this component
+    * @see #isVisible
+    * @since JDK1.1
+    */
+    public void setVisible(boolean b) {
+        if (visible != b){
+            visible = b;
+            if (b) {
+                // If it is the first show, fire WINDOW_OPENED event
+                if (!opened) {
+                    postWindowEvent(java.awt.event.WindowEvent.WINDOW_OPENED);
+                    opened = true;
+                }
+                postComponentEvent(java.awt.event.ComponentEvent.COMPONENT_SHOWN);
+            } else {
+                postComponentEvent(java.awt.event.ComponentEvent.COMPONENT_HIDDEN);
+            }
+        }
+    }
+
+    public void dispose() {
+        setVisible(false);
+        postWindowEvent(java.awt.event.WindowEvent.WINDOW_CLOSED);
+    }
+
+    protected void postWindowEvent(int i) {
+        eventQueue.postEvent(new java.awt.event.WindowEvent(this, i));
+    }
+
+    protected void postComponentEvent(int i) {
+        eventQueue.postEvent(new java.awt.event.ComponentEvent(this, i));
+    }
+
+    /**
+    * Update the proxy objects appropriatly on property change events
+    */
+    protected class AccessibleFrameListener implements XAccessibleEventListener {
+
+        protected AccessibleFrameListener() {
+        }
+
+        // The only expected state changes are ACTIVE and VISIBLE
+        protected void setComponentState(short state, boolean enable) {
+            switch (state) {
+                case AccessibleStateType.ACTIVE:
+                    active = enable;
+                    if (enable) {
+                        AccessibleObjectFactory.postWindowActivated(Frame.this);
+                    } else {
+                        AccessibleObjectFactory.postWindowLostFocus(Frame.this);
+                    }
+                    break;
+                case AccessibleStateType.ICONIFIED:
+                    if (Build.DEBUG) {
+                        System.err.println("[frame]" + getTitle() + (enable ? " is now " : " is no longer ") + "iconified");
+                    }
+                    postWindowEvent(enable ?
+                        java.awt.event.WindowEvent.WINDOW_ICONIFIED :
+                        java.awt.event.WindowEvent.WINDOW_DEICONIFIED);
+                    break;
+                case AccessibleStateType.VISIBLE:
+                    Frame.this.setVisible(enable);
+                    break;
+                default:
+                    if (Build.DEBUG) {
+                        System.err.println("[frame]: " + getTitle() + "unexpected state change " + state);
+                    }
+                    break;
+            }
+        }
+
+        /** Updates the accessible name and fires the appropriate PropertyChangedEvent */
+        protected void handleNameChangedEvent(Object any) {
+            try {
+                String title = AnyConverter.toString(any);
+                setTitle(title);
+                // This causes the property change event to be fired in the VCL thread
+                // context. If this causes problems, it has to be deligated to the java
+                // dispatch thread ..
+                javax.accessibility.AccessibleContext ac = accessibleContext;
+                if (ac!= null) {
+                    ac.setAccessibleName(title);
+                }
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+            }
+        }
+
+        /** Updates the accessible description and fires the appropriate PropertyChangedEvent */
+        protected void handleDescriptionChangedEvent(Object any) {
+            try {
+                // This causes the property change event to be fired in the VCL thread
+                // context. If this causes problems, it has to be deligated to the java
+                // dispatch thread ..
+                javax.accessibility.AccessibleContext ac = accessibleContext;
+                if (ac!= null) {
+                    ac.setAccessibleDescription(AnyConverter.toString(any));
+                }
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+            }
+        }
+
+        /** Updates the internal states and fires the appropriate PropertyChangedEvent */
+        protected void handleStateChangedEvent(Object any1, Object any2) {
+            try {
+                if (AnyConverter.isShort(any1)) {
+                    setComponentState(AnyConverter.toShort(any1), false);
+                }
+
+                if (AnyConverter.isShort(any2)) {
+                    setComponentState(AnyConverter.toShort(any2), true);
+                }
+            }
+
+            catch (com.sun.star.lang.IllegalArgumentException e) {
+            }
+        }
+
+        /** Fires a visible data property change event */
+        protected void handleVisibleDataEvent() {
+            javax.accessibility.AccessibleContext ac = accessibleContext;
+            if (ac != null) {
+                ac.firePropertyChange(javax.accessibility.AccessibleContext.ACCESSIBLE_VISIBLE_DATA_PROPERTY, null, null);
+            }
+        }
+
+        /** Called by OpenOffice process to notify property changes */
+        public void notifyEvent(AccessibleEventObject event) {
+            switch (event.EventId) {
+                case AccessibleEventId.NAME_CHANGED:
+                    // Set the accessible name for the corresponding context, which will fire a property
+                    // change event itself
+                    handleNameChangedEvent(event.NewValue);
+                    break;
+                case AccessibleEventId.DESCRIPTION_CHANGED:
+                    // Set the accessible description for the corresponding context, which will fire a property
+                    // change event itself - so do not set propertyName !
+                    handleDescriptionChangedEvent(event.NewValue);
+                    break;
+                case AccessibleEventId.STATE_CHANGED:
+                    // Update the internal state set and fire the appropriate PropertyChangedEvent
+                    handleStateChangedEvent(event.OldValue, event.NewValue);
+                    break;
+                case AccessibleEventId.CHILD:
+                    if (AnyConverter.isObject(event.OldValue)) {
+                        AccessibleObjectFactory.removeChild(Frame.this, event.OldValue);
+                    } else if (AnyConverter.isObject(event.NewValue)) {
+                        AccessibleObjectFactory.addChild(Frame.this, event.NewValue);
+                    }
+                    break;
+                case AccessibleEventId.VISIBLE_DATA_CHANGED:
+                case AccessibleEventId.BOUNDRECT_CHANGED:
+                    handleVisibleDataEvent();
+                    break;
+                default:
+                    // Warn about unhandled events
+                    if(Build.DEBUG) {
+                        System.out.println(this + ": unhandled accessibility event id=" + event.EventId);
+                    }
+            }
+        }
+
+        /** Called by OpenOffice process to notify that the UNO component is disposing */
+        public void disposing(com.sun.star.lang.EventObject eventObject) {
+        }
+    }
+
+    protected javax.accessibility.AccessibleContext accessibleContext = null;
+
+    /** Returns the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext getAccessibleContext() {
+        if (accessibleContext == null) {
+            accessibleContext = new AccessibleFrame();
+            accessibleContext.setAccessibleName(getTitle());
+        }
+        return accessibleContext;
+    }
+
+    protected class AccessibleFrame extends java.awt.Frame.AccessibleAWTFrame {
+        protected AccessibleFrame() {
+            super();
+        }
+
+        protected java.awt.event.ComponentListener accessibleComponentHandler = null;
+
+        /**
+        * Fire PropertyChange listener, if one is registered,
+        * when shown/hidden..
+        */
+        protected class AccessibleComponentHandler implements java.awt.event.ComponentListener {
+            public void componentHidden(java.awt.event.ComponentEvent e)  {
+                AccessibleFrame.this.firePropertyChange(
+                    javax.accessibility.AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                    javax.accessibility.AccessibleState.VISIBLE, null);
+            }
+
+            public void componentShown(java.awt.event.ComponentEvent e)  {
+                AccessibleFrame.this.firePropertyChange(
+                    javax.accessibility.AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                    null, javax.accessibility.AccessibleState.VISIBLE);
+            }
+
+            public void componentMoved(java.awt.event.ComponentEvent e)  {
+            }
+
+            public void componentResized(java.awt.event.ComponentEvent e)  {
+            }
+        } // inner class AccessibleComponentHandler
+
+        protected java.awt.event.WindowListener accessibleWindowHandler = null;
+
+        /**
+        * Fire PropertyChange listener, if one is registered,
+        * when window events happen
+        */
+        protected class AccessibleWindowHandler implements java.awt.event.WindowListener {
+            /** Invoked when the Window is set to be the active Window. */
+            public void windowActivated(java.awt.event.WindowEvent e) {
+                AccessibleFrame.this.firePropertyChange(
+                    javax.accessibility.AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                    null, javax.accessibility.AccessibleState.ACTIVE);
+                if (Build.DEBUG) {
+                    System.err.println("[frame] " + getTitle() + " is now active");
+                }
+            }
+
+            /** Invoked when a window has been closed as the result of calling dispose on the window. */
+            public void windowClosed(java.awt.event.WindowEvent e) {
+                if (Build.DEBUG) {
+                    System.err.println("[frame] " + getTitle() + " has been closed");
+                }
+            }
+
+            /** Invoked when the user attempts to close the window from the window's system menu. */
+            public void windowClosing(java.awt.event.WindowEvent e) {
+                if (Build.DEBUG) {
+                    System.err.println("[frame] " + getTitle() + " is closing");
+                }
+            }
+
+            /** Invoked when a Window is no longer the active Window. */
+            public void windowDeactivated(java.awt.event.WindowEvent e) {
+                AccessibleFrame.this.firePropertyChange(
+                    javax.accessibility.AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                    javax.accessibility.AccessibleState.ACTIVE, null);
+                if (Build.DEBUG) {
+                    System.err.println("[frame] " + getTitle() + " is no longer active");
+                }
+            }
+
+            /** Invoked when a window is changed from a minimized to a normal state. */
+            public void windowDeiconified(java.awt.event.WindowEvent e) {
+                if (Build.DEBUG) {
+                    System.err.println("[frame] " + getTitle() + " is no longer iconified");
+                }
+            }
+
+            /** Invoked when a window is changed from a normal to a minimized state. */
+            public void windowIconified(java.awt.event.WindowEvent e) {
+                if (Build.DEBUG) {
+                    System.err.println("[frame] " + getTitle() + " has been iconified");
+                }
+            }
+
+            /** Invoked the first time a window is made visible. */
+            public void windowOpened(java.awt.event.WindowEvent e) {
+                if (Build.DEBUG) {
+                    System.err.println("[frame] " + getTitle() + " has been opened");
+                }
+            }
+
+        } // inner class AccessibleWindowHandler
+
+        protected java.awt.event.ContainerListener accessibleContainerHandler = null;
+
+        /**
+        * Fire PropertyChange listener, if one is registered,
+        * when children added/removed.
+        */
+
+        protected class AccessibleContainerHandler implements java.awt.event.ContainerListener {
+            public void componentAdded(java.awt.event.ContainerEvent e) {
+                java.awt.Component c = e.getChild();
+                if (c != null && c instanceof javax.accessibility.Accessible) {
+                    AccessibleFrame.this.firePropertyChange(
+                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                        null, ((javax.accessibility.Accessible) c).getAccessibleContext());
+                }
+            }
+            public void componentRemoved(java.awt.event.ContainerEvent e) {
+                java.awt.Component c = e.getChild();
+                if (c != null && c instanceof javax.accessibility.Accessible) {
+                    AccessibleFrame.this.firePropertyChange(
+                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                        ((javax.accessibility.Accessible) c).getAccessibleContext(), null);
+                }
+            }
+        }
+
+        protected int propertyChangeListenerCount = 0;
+
+        /**
+        * Add a PropertyChangeListener to the listener list.
+        *
+        * @param listener  The PropertyChangeListener to be added
+        */
+        public void addPropertyChangeListener(java.beans.PropertyChangeListener listener) {
+            if (propertyChangeListenerCount++ == 0) {
+                accessibleWindowHandler = new AccessibleWindowHandler();
+                Frame.this.addWindowListener(accessibleWindowHandler);
+
+                accessibleContainerHandler = new AccessibleContainerHandler();
+                Frame.this.addContainerListener(accessibleContainerHandler);
+
+                accessibleComponentHandler = new AccessibleComponentHandler();
+                Frame.this.addComponentListener(accessibleComponentHandler);
+            }
+            super.addPropertyChangeListener(listener);
+        }
+
+        /**
+        * Remove a PropertyChangeListener from the listener list.
+        * This removes a PropertyChangeListener that was registered
+        * for all properties.
+        *
+        * @param listener  The PropertyChangeListener to be removed
+        */
+        public void removePropertyChangeListener(java.beans.PropertyChangeListener listener) {
+            if (--propertyChangeListenerCount == 0) {
+                Frame.this.removeComponentListener(accessibleComponentHandler);
+                accessibleComponentHandler = null;
+
+                Frame.this.removeContainerListener(accessibleContainerHandler);
+                accessibleContainerHandler = null;
+
+                Frame.this.removeWindowListener(accessibleWindowHandler);
+                accessibleWindowHandler = null;
+            }
+            super.removePropertyChangeListener(listener);
+        }
+
+        /**
+        * Get the state set of this object.
+        *
+        * @return an instance of AccessibleState containing the current state
+        * of the object
+        * @see AccessibleState
+        */
+        public javax.accessibility.AccessibleStateSet getAccessibleStateSet() {
+            javax.accessibility.AccessibleStateSet states = super.getAccessibleStateSet();
+            if ((getExtendedState() & java.awt.Frame.ICONIFIED) > 0) {
+                    states.add(javax.accessibility.AccessibleState.ICONIFIED);
+            }
+            return states;
+        }
+
+        /*
+        * AccessibleComponent
+        */
+
+        /** Returns the background color of the object */
+        public java.awt.Color getBackground() {
+            try {
+                return new java.awt.Color(unoAccessibleComponent.getBackground());
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        public void setBackground(java.awt.Color c) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the foreground color of the object */
+        public java.awt.Color getForeground() {
+            try {
+                return new java.awt.Color(unoAccessibleComponent.getForeground());
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        public void setForeground(java.awt.Color c) {
+            // Not supported by UNO accessibility API
+        }
+
+        public java.awt.Cursor getCursor() {
+            // Not supported by UNO accessibility API
+            return null;
+        }
+
+        public void setCursor(java.awt.Cursor cursor) {
+            // Not supported by UNO accessibility API
+        }
+
+        public java.awt.Font getFont() {
+            // FIXME
+            return null;
+        }
+
+        public void setFont(java.awt.Font f) {
+            // Not supported by UNO accessibility API
+        }
+
+        public java.awt.FontMetrics getFontMetrics(java.awt.Font f) {
+            // FIXME
+            return null;
+        }
+
+        public boolean isEnabled() {
+            return Frame.this.isEnabled();
+        }
+
+        public void setEnabled(boolean b) {
+            // Not supported by UNO accessibility API
+        }
+
+        public boolean isVisible() {
+            return Frame.this.isVisible();
+        }
+
+        public void setVisible(boolean b) {
+            // Not supported by UNO accessibility API
+        }
+
+        public boolean isShowing() {
+            return Frame.this.isShowing();
+        }
+
+        public boolean contains(java.awt.Point p) {
+            try {
+                return unoAccessibleComponent.containsPoint(new com.sun.star.awt.Point(p.x, p.y));
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return false;
+            }
+        }
+
+        /** Returns the location of the object on the screen. */
+        public java.awt.Point getLocationOnScreen() {
+            try {
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocationOnScreen();
+                return new java.awt.Point(unoPoint.X, unoPoint.Y);
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Gets the location of this component in the form of a point specifying the component's top-left corner */
+        public java.awt.Point getLocation() {
+            try {
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocation();
+                return new java.awt.Point( unoPoint.X, unoPoint.Y );
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Moves this component to a new location */
+        public void setLocation(java.awt.Point p) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Gets the bounds of this component in the form of a Rectangle object */
+        public java.awt.Rectangle getBounds() {
+            try {
+                com.sun.star.awt.Rectangle unoRect = unoAccessibleComponent.getBounds();
+                return new java.awt.Rectangle(unoRect.X, unoRect.Y, unoRect.Width, unoRect.Height);
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Moves and resizes this component to conform to the new bounding rectangle r */
+        public void setBounds(java.awt.Rectangle r) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the size of this component in the form of a Dimension object */
+        public java.awt.Dimension getSize() {
+            try {
+                com.sun.star.awt.Size unoSize = unoAccessibleComponent.getSize();
+                return new java.awt.Dimension(unoSize.Width, unoSize.Height);
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Resizes this component so that it has width d.width and height d.height */
+        public void setSize(java.awt.Dimension d) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */
+        public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
+            try {
+                java.awt.Component c = AccessibleObjectFactory.getAccessibleComponent(
+                    unoAccessibleComponent.getAccessibleAtPoint(new com.sun.star.awt.Point(p.x, p.y)));
+
+                return (javax.accessibility.Accessible) c;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        public boolean isFocusTraversable() {
+            return Frame.this.isFocusable();
+        }
+
+        public void requestFocus() {
+            unoAccessibleComponent.grabFocus();
+        }
+    }
+}
+
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Icon.java b/accessibility/bridge/org/openoffice/java/accessibility/Icon.java
new file mode 100644
index 000000000000..8ccc97def4d8
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Icon.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.
+ *
+ ************************************************************************/
+package org.openoffice.java.accessibility;
+
+import com.sun.star.accessibility.*;
+import com.sun.star.uno.*;
+
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
+
+
+/**
+ */
+public class Icon extends Component implements javax.accessibility.Accessible {
+    protected Icon(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
+        super(xAccessible, xAccessibleContext);
+    }
+
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleIcon();
+    }
+
+    protected class AccessibleIcon extends AccessibleUNOComponent {
+        /**
+        * Though the class is abstract, this should be called by all sub-classes
+        */
+        protected AccessibleIcon() {
+            super();
+        }
+
+        /** Gets the AccessibleText associated with this object presenting text on the display */
+        public javax.accessibility.AccessibleIcon[] getAccessibleIcon() {
+            try {
+                XAccessibleImage unoAccessibleImage = (XAccessibleImage) UnoRuntime.queryInterface(XAccessibleImage.class,
+                        unoAccessibleComponent);
+
+                if (unoAccessibleImage != null) {
+                    javax.accessibility.AccessibleIcon[] icons = {
+                        new AccessibleIconImpl(unoAccessibleImage)
+                    };
+
+                    return icons;
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+
+            return null;
+        }
+
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Label.java b/accessibility/bridge/org/openoffice/java/accessibility/Label.java
new file mode 100644
index 000000000000..9afaa0a1ae37
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Label.java
@@ -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.
+ *
+ ************************************************************************/
+package org.openoffice.java.accessibility;
+
+import com.sun.star.accessibility.*;
+import com.sun.star.uno.*;
+
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
+
+
+/**
+ */
+public class Label extends Component implements javax.accessibility.Accessible {
+    protected Label(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
+        super(xAccessible, xAccessibleContext);
+    }
+
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleLabel();
+    }
+
+    protected class AccessibleLabel extends AccessibleUNOComponent {
+        /**
+        * Though the class is abstract, this should be called by all sub-classes
+        */
+        protected AccessibleLabel() {
+            super();
+        }
+
+        /*
+        * AccessibleContext
+        */
+
+        /** Gets the role of this object */
+        public javax.accessibility.AccessibleRole getAccessibleRole() {
+            return javax.accessibility.AccessibleRole.LABEL;
+        }
+
+        /** Gets the AccessibleText associated with this object presenting text on the display */
+        public javax.accessibility.AccessibleText getAccessibleText() {
+
+            if (disposed)
+                return null;
+
+            try {
+                XAccessibleText unoAccessibleText = (XAccessibleText) UnoRuntime.queryInterface(XAccessibleText.class,
+                        unoAccessibleContext);
+
+                if (unoAccessibleText != null) {
+                    return new AccessibleTextImpl(unoAccessibleText);
+                } else {
+                    return null;
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Returns the relation set of this object */
+        public javax.accessibility.AccessibleRelationSet getAccessibleRelationSet() {
+            try {
+                XAccessibleRelationSet unoAccessibleRelationSet = unoAccessibleContext.getAccessibleRelationSet();
+
+                if (unoAccessibleRelationSet == null) {
+                    return null;
+                }
+
+                javax.accessibility.AccessibleRelationSet relationSet = new javax.accessibility.AccessibleRelationSet();
+                int count = unoAccessibleRelationSet.getRelationCount();
+
+                for (int i = 0; i < count; i++) {
+                    AccessibleRelation unoAccessibleRelation = unoAccessibleRelationSet.getRelation(i);
+
+                    switch (unoAccessibleRelation.RelationType) {
+                        case AccessibleRelationType.LABEL_FOR:
+                            relationSet.add(new javax.accessibility.AccessibleRelation(
+                                    javax.accessibility.AccessibleRelation.LABEL_FOR,
+                                    getAccessibleComponents(
+                                        unoAccessibleRelation.TargetSet)));
+
+                            break;
+
+                        case AccessibleRelationType.MEMBER_OF:
+                            relationSet.add(new javax.accessibility.AccessibleRelation(
+                                    javax.accessibility.AccessibleRelation.MEMBER_OF,
+                                    getAccessibleComponents(
+                                        unoAccessibleRelation.TargetSet)));
+
+                            break;
+
+                        default:
+                            break;
+                    }
+                }
+
+                return relationSet;
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return null;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/List.java b/accessibility/bridge/org/openoffice/java/accessibility/List.java
new file mode 100644
index 000000000000..c0583bf9b692
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/List.java
@@ -0,0 +1,452 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleState;
+
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.accessibility.*;
+
+public class List extends DescendantManager implements javax.accessibility.Accessible {
+
+    protected List(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
+        super(xAccessible, xAccessibleContext);
+    }
+
+    protected void setActiveDescendant(javax.accessibility.Accessible descendant) {
+        javax.accessibility.Accessible oldAD = activeDescendant;
+        activeDescendant = descendant;
+        firePropertyChange(AccessibleContext.ACCESSIBLE_ACTIVE_DESCENDANT_PROPERTY,
+            oldAD, descendant);
+    }
+
+    protected void setActiveDescendant(Object any) {
+        javax.accessibility.Accessible descendant = null;
+        try {
+            if (AnyConverter.isObject(any)) {
+                XAccessible unoAccessible = (XAccessible) AnyConverter.toObject(
+                    AccessibleObjectFactory.XAccessibleType, any);
+                if (unoAccessible != null) {
+                    // FIXME: have to handle non transient objects here ..
+                    descendant = new ListItem(unoAccessible);
+                    if (Build.DEBUG) {
+                        try {
+                            if (Build.DEBUG) {
+                                System.err.println("[List] retrieved active descendant event: new descendant is " +
+                                    unoAccessible.getAccessibleContext().getAccessibleName());
+                            }
+                        } catch (java.lang.NullPointerException e) {
+                            System.err.println("*** ERROR *** new active descendant not accessible");
+                        }
+                    }
+                }
+            }
+            setActiveDescendant(descendant);
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+        }
+    }
+
+    protected void add(XAccessible unoAccessible) {
+        if (unoAccessible != null) {
+            ListItem item = new ListItem(unoAccessible);
+            // The AccessBridge for Windows expects an instance of AccessibleContext
+            // as parameters
+            firePropertyChange(AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                null, item.getAccessibleContext());
+        }
+    }
+
+    protected void remove(XAccessible unoAccessible) {
+        if (unoAccessible != null) {
+            ListItem item = new ListItem(unoAccessible);
+            // The AccessBridge for Windows expects an instance of AccessibleContext
+            // as parameters
+            firePropertyChange(AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                item.getAccessibleContext(), null);
+        }
+    }
+
+    protected void add(Object any) {
+        try {
+            add((XAccessible) AnyConverter.toObject(AccessibleObjectFactory.XAccessibleType, any));
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+        }
+    }
+
+    protected void remove(Object any) {
+        try {
+            remove((XAccessible) AnyConverter.toObject(AccessibleObjectFactory.XAccessibleType, any));
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+        }
+    }
+
+    /**
+    * Update the proxy objects appropriatly on property change events
+    */
+    protected class AccessibleListListener extends AccessibleDescendantManagerListener {
+
+        protected AccessibleListListener() {
+            super();
+        }
+
+        /** Called by OpenOffice process to notify property changes */
+        public void notifyEvent(AccessibleEventObject event) {
+            switch (event.EventId) {
+                case AccessibleEventId.ACTIVE_DESCENDANT_CHANGED:
+                    setActiveDescendant(event.NewValue);
+                    break;
+                case AccessibleEventId.CHILD:
+                    if (AnyConverter.isObject(event.OldValue)) {
+                        remove(event.OldValue);
+                    }
+                    if (AnyConverter.isObject(event.NewValue)) {
+                        add(event.NewValue);
+                    }
+                    break;
+                case AccessibleEventId.INVALIDATE_ALL_CHILDREN:
+                    // Since List items a transient a child events are mostly used
+                    // to attach/detach listeners, it is save to ignore it here
+                    break;
+                default:
+                    super.notifyEvent(event);
+            }
+        }
+    }
+
+    protected XAccessibleEventListener createEventListener() {
+        return new AccessibleListListener();
+    }
+
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleList();
+    }
+
+    protected class AccessibleList extends AccessibleDescendantManager {
+
+        /** Gets the role of this object */
+        public javax.accessibility.AccessibleRole getAccessibleRole() {
+            return javax.accessibility.AccessibleRole.LIST;
+        }
+
+        /** Returns the specified Accessible child of the object */
+        public javax.accessibility.Accessible getAccessibleChild(int i) {
+            javax.accessibility.Accessible child = null;
+            try {
+                XAccessible xAccessible = unoAccessibleContext.getAccessibleChild(i);
+                if (xAccessible != null) {
+                    // Re-use the active descandant wrapper if possible
+                    javax.accessibility.Accessible activeDescendant = List.this.activeDescendant;
+                    if ((activeDescendant instanceof ListItem) && xAccessible.equals(((ListItem) activeDescendant).unoAccessible)) {
+                        child = activeDescendant;
+                    } else {
+                        child = new ListItem(xAccessible);
+                    }
+                }
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+            return child;
+        }
+
+        /*
+         * AccessibleComponent
+         */
+
+        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */
+        public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
+            javax.accessibility.Accessible child = null;
+            try {
+                XAccessible xAccessible = unoAccessibleComponent.getAccessibleAtPoint(new com.sun.star.awt.Point(p.x, p.y));
+                if (xAccessible != null) {
+                    // Re-use the active descandant wrapper if possible
+                    javax.accessibility.Accessible activeDescendant = List.this.activeDescendant;
+                    if ((activeDescendant instanceof ListItem) && xAccessible.equals(((ListItem) activeDescendant).unoAccessible)) {
+                        child = activeDescendant;
+                    } else {
+                        child = new ListItem(xAccessible);
+                    }
+                }
+                return child;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /*
+        * AccessibleSelection
+        */
+
+        /** Returns an Accessible representing the specified selected child of the object */
+        public javax.accessibility.Accessible getAccessibleSelection(int i) {
+            javax.accessibility.Accessible child = null;
+            try {
+                XAccessible xAccessible = unoAccessibleSelection.getSelectedAccessibleChild(i);
+                if (xAccessible != null) {
+                    // Re-use the active descandant wrapper if possible
+                    javax.accessibility.Accessible activeDescendant = List.this.activeDescendant;
+                    if ((activeDescendant instanceof ListItem) && xAccessible.equals(((ListItem) activeDescendant).unoAccessible)) {
+                        child = activeDescendant;
+                    } else {
+                        child = new ListItem(xAccessible);
+                    }
+                } else if (Build.DEBUG) {
+                    System.out.println(i + "th selected child is not accessible");
+                }
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                if (Build.DEBUG) {
+                    System.err.println("IndexOutOfBoundsException caught for AccessibleList.getAccessibleSelection(" + i + ")");
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+            return child;
+        }
+    }
+
+    class ListItem extends java.awt.Component implements javax.accessibility.Accessible {
+
+        protected XAccessible unoAccessible;
+
+        public ListItem(XAccessible xAccessible) {
+            unoAccessible = xAccessible;
+        }
+
+        public Object[] create(Object[] targetSet) {
+            try {
+                java.util.ArrayList list = new java.util.ArrayList(targetSet.length);
+                for (int i=0; i < targetSet.length; i++) {
+                    XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface(
+                        XAccessible.class, targetSet[i]);
+                    if (xAccessible != null) {
+                        list.add(new ListItem(xAccessible));
+                    }
+                }
+                list.trimToSize();
+                return list.toArray();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        javax.accessibility.AccessibleContext accessibleContext = null;
+
+        /** Returns the AccessibleContext associated with this object */
+        public javax.accessibility.AccessibleContext getAccessibleContext() {
+            if (accessibleContext == null) {
+                try {
+                    XAccessibleContext xAccessibleContext = unoAccessible.getAccessibleContext();
+                    if (xAccessibleContext != null) {
+                        javax.accessibility.AccessibleContext ac = new AccessibleListItem(xAccessibleContext);
+                        if (ac != null) {
+                            ac.setAccessibleParent(List.this);
+                            accessibleContext = ac;
+                        }
+                        AccessibleStateAdapter.setComponentState(this, xAccessibleContext.getAccessibleStateSet());
+                    }
+                } catch (com.sun.star.uno.RuntimeException e) {
+                }
+            }
+            return accessibleContext;
+        }
+
+        protected class AccessibleListItem extends javax.accessibility.AccessibleContext {
+
+            XAccessibleContext unoAccessibleContext;
+
+            public AccessibleListItem(XAccessibleContext xAccessibleContext) {
+                unoAccessibleContext = xAccessibleContext;
+            }
+
+            /** Returns the accessible name of this object */
+            public String getAccessibleName() {
+                try {
+                    return unoAccessibleContext.getAccessibleName();
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Sets the accessible name of this object */
+            public void setAccessibleName(String name) {
+                // Not supported
+            }
+
+            /** Returns the accessible name of this object */
+            public String getAccessibleDescription() {
+                try {
+                    return unoAccessibleContext.getAccessibleDescription();
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Sets the accessible name of this object */
+            public void setAccessibleDescription(String name) {
+                // Not supported
+            }
+
+            /** Returns the accessible role of this object */
+            public javax.accessibility.AccessibleRole getAccessibleRole() {
+                try {
+                    javax.accessibility.AccessibleRole role = AccessibleRoleAdapter.getAccessibleRole(
+                        unoAccessibleContext.getAccessibleRole());
+                    return (role != null) ? role : javax.accessibility.AccessibleRole.LABEL;
+                } catch(com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Gets the locale of the component */
+            public java.util.Locale getLocale() throws java.awt.IllegalComponentStateException {
+                try {
+                    com.sun.star.lang.Locale unoLocale = unoAccessibleContext.getLocale();
+                    return new java.util.Locale(unoLocale.Language, unoLocale.Country);
+                } catch (IllegalAccessibleComponentStateException e) {
+                    throw new java.awt.IllegalComponentStateException(e.getMessage());
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return List.this.getLocale();
+                }
+            }
+
+            /** Gets the 0-based index of this object in its accessible parent */
+            public int getAccessibleIndexInParent() {
+                try {
+                    return unoAccessibleContext.getAccessibleIndexInParent();
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return -1;
+                }
+            }
+
+            /** Returns the number of accessible children of the object. */
+            public int getAccessibleChildrenCount() {
+                try {
+                    return unoAccessibleContext.getAccessibleChildCount();
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return 0;
+                }
+            }
+
+            /** Returns the specified Accessible child of the object. */
+            public javax.accessibility.Accessible getAccessibleChild(int i) {
+                javax.accessibility.Accessible child = null;
+                try {
+                    XAccessible xAccessible = unoAccessibleContext.getAccessibleChild(i);
+                    // Re-use the active descandant wrapper if possible
+                    javax.accessibility.Accessible activeDescendant = List.this.activeDescendant;
+                    if ((activeDescendant instanceof ListItem) && ((ListItem) activeDescendant).unoAccessible.equals(xAccessible)) {
+                        child = activeDescendant;
+                    } else if (xAccessible != null) {
+                        child = new ListItem(xAccessible);
+                    }
+                } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                } catch (com.sun.star.uno.RuntimeException e) {
+                }
+                return child;
+            }
+
+            /** Returns the state set of this object */
+            public javax.accessibility.AccessibleStateSet getAccessibleStateSet() {
+                try {
+                    return AccessibleStateAdapter.getAccessibleStateSet(ListItem.this,
+                        unoAccessibleContext.getAccessibleStateSet());
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return AccessibleStateAdapter.getDefunctStateSet();
+                }
+            }
+
+            /** Gets the AccessibleComponent associated with this object that has a graphical representation */
+            public javax.accessibility.AccessibleComponent getAccessibleComponent() {
+                try {
+                    XAccessibleComponent unoAccessibleComponent = (XAccessibleComponent)
+                        UnoRuntime.queryInterface(XAccessibleComponent.class, unoAccessibleContext);
+                    return (unoAccessibleComponent != null) ?
+                        new AccessibleComponentImpl(unoAccessibleComponent) : null;
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Gets the AccessibleAction associated with this object that has a graphical representation */
+            public javax.accessibility.AccessibleAction getAccessibleAction() {
+                try {
+                    XAccessibleAction unoAccessibleAction = (XAccessibleAction)
+                        UnoRuntime.queryInterface(XAccessibleAction.class, unoAccessibleContext);
+                    return (unoAccessibleAction != null) ?
+                        new AccessibleActionImpl(unoAccessibleAction) : null;
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Gets the AccessibleText associated with this object that has a graphical representation */
+            public javax.accessibility.AccessibleText getAccessibleText() {
+
+                if (disposed)
+                    return null;
+
+                try {
+                    XAccessibleText unoAccessibleText = (XAccessibleText)
+                        UnoRuntime.queryInterface(XAccessibleText.class, unoAccessibleContext);
+                    return (unoAccessibleText != null) ?
+                        new AccessibleTextImpl(unoAccessibleText) : null;
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Gets the AccessibleValue associated with this object that has a graphical representation */
+            public javax.accessibility.AccessibleValue getAccessibleValue() {
+                try {
+                    XAccessibleValue unoAccessibleValue = (XAccessibleValue)
+                        UnoRuntime.queryInterface(XAccessibleValue.class, unoAccessibleContext);
+                    return (unoAccessibleValue != null) ?
+                        new AccessibleValueImpl(unoAccessibleValue) : null;
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Gets the AccessibleText associated with this object presenting text on the display */
+            public javax.accessibility.AccessibleIcon[] getAccessibleIcon() {
+                try {
+                    XAccessibleImage unoAccessibleImage = (XAccessibleImage)
+                        UnoRuntime.queryInterface(XAccessibleImage.class, unoAccessibleContext);
+                    if (unoAccessibleImage != null) {
+                        javax.accessibility.AccessibleIcon[] icons = { new AccessibleIconImpl(unoAccessibleImage) };
+                        return icons;
+                    }
+                } catch (com.sun.star.uno.RuntimeException e) {
+                }
+                return null;
+            }
+        }
+    }
+}
+
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Menu.java b/accessibility/bridge/org/openoffice/java/accessibility/Menu.java
new file mode 100644
index 000000000000..346baca749b3
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Menu.java
@@ -0,0 +1,328 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+package org.openoffice.java.accessibility;
+
+import com.sun.star.accessibility.*;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.UnoRuntime;
+
+
+public class Menu extends AbstractButton
+    implements javax.accessibility.Accessible {
+    private java.util.Vector children;
+    protected XAccessibleSelection unoAccessibleSelection = null;
+
+    protected Menu(XAccessible xAccessible,
+        XAccessibleContext xAccessibleContext) {
+        super(xAccessible, xAccessibleContext);
+
+        try {
+            // Create a vector with the correct initial capacity
+            int count = unoAccessibleContext.getAccessibleChildCount();
+            children = new java.util.Vector(count);
+
+            // Fill the vector with objects
+            for (int i = 0; i < count; i++) {
+                java.awt.Component c = getComponent(unoAccessibleContext.getAccessibleChild(i));
+
+                if (c != null) {
+                    children.add(c);
+                }
+            }
+        } catch (com.sun.star.uno.RuntimeException e) {
+            if (Build.DEBUG) {
+                System.err.println(
+                    "RuntimeException caught during menu initialization: " +
+                    e.getMessage());
+            }
+
+            if (children == null) {
+                children = new java.util.Vector(0);
+            }
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+        }
+    }
+
+    protected synchronized void add(XAccessible unoAccessible) {
+        // The AccessBridge for Windows expects an instance of AccessibleContext
+        // as parameters
+        java.awt.Component c = getComponent(unoAccessible);
+
+        if (c != null) {
+            try {
+                children.add(unoAccessible.getAccessibleContext()
+                                          .getAccessibleIndexInParent(), c);
+                firePropertyChange(javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                    null,
+                    ((javax.accessibility.Accessible) c).getAccessibleContext());
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+        }
+    }
+
+    protected synchronized void remove(XAccessible unoAccessible) {
+        // The AccessBridge for Windows expects an instance of AccessibleContext
+        // as parameters
+        java.awt.Component c = getComponent(unoAccessible);
+
+        if (c != null) {
+            try {
+                children.remove(c);
+                firePropertyChange(javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                    ((javax.accessibility.Accessible) c).getAccessibleContext(),
+                    null);
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+        }
+    }
+
+    protected void add(Object any) {
+        try {
+            add((XAccessible) AnyConverter.toObject(
+                    AccessibleObjectFactory.XAccessibleType, any));
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+        }
+    }
+
+    protected void remove(Object any) {
+        try {
+            remove((XAccessible) AnyConverter.toObject(
+                    AccessibleObjectFactory.XAccessibleType, any));
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+        }
+    }
+
+    protected synchronized int indexOf(Object child) {
+        return children.indexOf(child);
+    }
+
+    protected java.awt.Component getComponent(XAccessible unoAccessible) {
+        java.awt.Component c = AccessibleObjectFactory.getAccessibleComponent(unoAccessible);
+
+        if (c == null) {
+            c = AccessibleObjectFactory.createAccessibleComponent(unoAccessible);
+
+            if (c instanceof javax.accessibility.Accessible) {
+                ((javax.accessibility.Accessible) c).getAccessibleContext()
+                 .setAccessibleParent(this);
+            }
+        }
+
+        return c;
+    }
+
+    protected XAccessibleEventListener createEventListener() {
+        return new AccessibleMenuListener();
+    }
+
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleMenu();
+    }
+
+    /**
+    * Update the proxy objects appropriatly on property change events
+    */
+    protected class AccessibleMenuListener
+        extends AccessibleUNOComponentListener {
+        protected AccessibleMenuListener() {
+            super();
+        }
+
+        /** Called by OpenOffice process to notify property changes */
+        public void notifyEvent(AccessibleEventObject event) {
+            switch (event.EventId) {
+                case AccessibleEventId.CHILD:
+
+                    if (AnyConverter.isObject(event.OldValue)) {
+                        remove(event.OldValue);
+                    }
+
+                    if (AnyConverter.isObject(event.NewValue)) {
+                        add(event.NewValue);
+                    }
+
+                    break;
+
+                // #i56539# Java 1.5 does not fire ACCESSIBLE_SELECTION_PROPERTY for menus
+                case AccessibleEventId.SELECTION_CHANGED:
+                    break;
+
+                default:
+                    super.notifyEvent(event);
+            }
+        }
+    }
+
+    protected class AccessibleMenu extends AccessibleAbstractButton
+        implements javax.accessibility.AccessibleSelection {
+        protected AccessibleMenu() {
+            unoAccessibleSelection = (XAccessibleSelection) UnoRuntime.queryInterface(XAccessibleSelection.class,
+                    unoAccessibleContext);
+        }
+
+        /** Gets the role of this object */
+        public javax.accessibility.AccessibleRole getAccessibleRole() {
+            return javax.accessibility.AccessibleRole.MENU;
+        }
+
+        /** Gets the 0-based index of this object in its accessible parent */
+        public int getAccessibleIndexInParent() {
+            if (getAccessibleParent() instanceof Menu) {
+                return ((Menu) getAccessibleParent()).indexOf(Menu.this);
+            } else {
+                return super.getAccessibleIndexInParent();
+            }
+        }
+
+        /** Returns the number of accessible children of the object */
+        public synchronized int getAccessibleChildrenCount() {
+            return children.size();
+        }
+
+        /** Returns the specified Accessible child of the object */
+        public synchronized javax.accessibility.Accessible getAccessibleChild(
+            int i) {
+            try {
+                if (i < children.size()) {
+                    return (javax.accessibility.Accessible) children.get(i);
+                } else {
+                    return null;
+                }
+            } catch (ArrayIndexOutOfBoundsException e) {
+                return null;
+            }
+        }
+
+        /** Returns the AccessibleSelection interface for this object */
+        public javax.accessibility.AccessibleSelection getAccessibleSelection() {
+            // This method is called to determine the SELECTABLE state of every
+            // child, so don't do the query interface here.
+            return this;
+        }
+
+        /*
+        * AccessibleComponent
+        */
+
+        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */
+        public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
+            try {
+                java.awt.Component c = AccessibleObjectFactory.getAccessibleComponent(unoAccessibleComponent.getAccessibleAtPoint(
+                            new com.sun.star.awt.Point(p.x, p.y)));
+
+                return (javax.accessibility.Accessible) c;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /*
+        * AccessibleSelection
+        */
+
+        /** Returns an Accessible representing the specified selected child of the object */
+        public javax.accessibility.Accessible getAccessibleSelection(int i) {
+            try {
+                return (javax.accessibility.Accessible) getComponent(unoAccessibleSelection.getSelectedAccessibleChild(
+                        i));
+            } catch (java.lang.Exception e) {
+                /*
+                * Possible exceptions are:
+                *   java.lang.NullPointerException
+                *   com.sun.star.uno.RuntimeException
+                *   com.sun.star.lang.IndexOutOfBoundsException
+                */
+                return null;
+            }
+        }
+
+        /** Adds the specified Accessible child of the object to the object's selection */
+        public void addAccessibleSelection(int i) {
+            try {
+                javax.accessibility.Accessible a = getAccessibleChild(i);
+
+                // selecting menu items invokes the click action in Java 1.5
+                if( a instanceof MenuItem )
+                    a.getAccessibleContext().getAccessibleAction().doAccessibleAction(0);
+                else
+                    unoAccessibleSelection.selectAccessibleChild(i);
+            } catch (java.lang.Exception e) {
+                /*
+                * Possible exceptions are:
+                *   java.lang.NullPointerException
+                *   com.sun.star.uno.RuntimeException
+                *   com.sun.star.lang.IndexOutOfBoundsException
+                */
+            }
+        }
+
+        /** Clears the selection in the object, so that no children in the object are selected */
+        public void clearAccessibleSelection() {
+            try {
+                unoAccessibleSelection.clearAccessibleSelection();
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+        }
+
+        /** Returns the number of Accessible children currently selected */
+        public int getAccessibleSelectionCount() {
+            try {
+                return unoAccessibleSelection.getSelectedAccessibleChildCount();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return 0;
+            }
+        }
+
+        /** Determines if the current child of this object is selected */
+        public boolean isAccessibleChildSelected(int i) {
+            try {
+                return unoAccessibleSelection.isAccessibleChildSelected(i);
+            } catch (java.lang.Exception e) {
+                /*
+                * Possible exceptions are:
+                *   java.lang.NullPointerException
+                *   com.sun.star.uno.RuntimeException
+                *   com.sun.star.lang.IndexOutOfBoundsException
+                */
+                return false;
+            }
+        }
+
+        /** Removes the specified child of the object from the object's selection */
+        public void removeAccessibleSelection(int i) {
+            if (isAccessibleChildSelected(i)) {
+                clearAccessibleSelection();
+            }
+        }
+
+        /** Causes every child of the object to be selected if the object supports multiple selection */
+        public void selectAllAccessibleSelection() {
+            // not supported
+        }
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/MenuContainer.java b/accessibility/bridge/org/openoffice/java/accessibility/MenuContainer.java
new file mode 100644
index 000000000000..ccae0ccadd04
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/MenuContainer.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import javax.accessibility.AccessibleContext;
+
+import com.sun.star.uno.*;
+import com.sun.star.accessibility.*;
+
+/**
+ * Specialized container for MenuBar and Popup-Menu(s)
+ * FIXME: join with Menu ?
+ */
+public class MenuContainer extends Container implements javax.accessibility.Accessible {
+
+    protected XAccessibleSelection unoAccessibleSelection = null;
+
+    protected MenuContainer(javax.accessibility.AccessibleRole role, XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
+        super(role, xAccessible, xAccessibleContext);
+    }
+
+    protected class AccessibleMenuContainerListener extends AccessibleContainerListener {
+
+        protected AccessibleMenuContainerListener() {
+            super();
+        }
+
+        /** Called by OpenOffice process to notify property changes */
+        public void notifyEvent(AccessibleEventObject event) {
+            switch (event.EventId) {
+
+                // #i56539# Java 1.5 does not fire ACCESSIBLE_SELECTION_PROPERTY for menus
+                case AccessibleEventId.SELECTION_CHANGED:
+                    break;
+
+                default:
+                    super.notifyEvent(event);
+            }
+        }
+    }
+
+    protected XAccessibleEventListener createEventListener() {
+        return new AccessibleMenuContainerListener();
+    }
+
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleMenuContainer();
+    }
+
+    protected class AccessibleMenuContainer extends AccessibleContainer implements javax.accessibility.AccessibleSelection {
+
+        protected AccessibleMenuContainer() {
+            unoAccessibleSelection = (XAccessibleSelection) UnoRuntime.queryInterface(XAccessibleSelection.class,
+                    unoAccessibleContext);
+        }
+
+        /** Returns the AccessibleSelection interface for this object */
+        public javax.accessibility.AccessibleSelection getAccessibleSelection() {
+            return this;
+        }
+
+        /*
+        * AccessibleSelection
+        */
+
+        /** Returns an Accessible representing the specified selected child of the object */
+        public javax.accessibility.Accessible getAccessibleSelection(int i) {
+            try {
+                return (javax.accessibility.Accessible) AccessibleObjectFactory.getAccessibleComponent(
+                    unoAccessibleSelection.getSelectedAccessibleChild(i));
+            } catch (com.sun.star.uno.Exception e) {
+                return null;
+            }
+        }
+
+        /** Adds the specified Accessible child of the object to the object's selection */
+        public void addAccessibleSelection(int i) {
+            try {
+                javax.accessibility.Accessible a = getAccessibleChild(i);
+
+                // selecting menu items invokes the click action in Java 1.5
+                if( a instanceof MenuItem )
+                    a.getAccessibleContext().getAccessibleAction().doAccessibleAction(0);
+                else
+                    unoAccessibleSelection.selectAccessibleChild(i);
+            } catch (java.lang.Exception e) {
+                /*
+                * Possible exceptions are:
+                *   java.lang.NullPointerException
+                *   com.sun.star.uno.RuntimeException
+                *   com.sun.star.lang.IndexOutOfBoundsException
+                */
+            }
+        }
+
+        /** Clears the selection in the object, so that no children in the object are selected */
+        public void clearAccessibleSelection() {
+            try {
+                unoAccessibleSelection.clearAccessibleSelection();
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+        }
+
+        /** Returns the number of Accessible children currently selected */
+        public int getAccessibleSelectionCount() {
+            try {
+                return unoAccessibleSelection.getSelectedAccessibleChildCount();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return 0;
+            }
+        }
+
+        /** Determines if the current child of this object is selected */
+        public boolean isAccessibleChildSelected(int i) {
+            try {
+                return unoAccessibleSelection.isAccessibleChildSelected(i);
+            } catch (java.lang.Exception e) {
+                /*
+                * Possible exceptions are:
+                *   java.lang.NullPointerException
+                *   com.sun.star.uno.RuntimeException
+                *   com.sun.star.lang.IndexOutOfBoundsException
+                */
+                return false;
+            }
+        }
+
+        /** Removes the specified child of the object from the object's selection */
+        public void removeAccessibleSelection(int i) {
+            if (isAccessibleChildSelected(i)) {
+                clearAccessibleSelection();
+            }
+        }
+
+        /** Causes every child of the object to be selected if the object supports multiple selection */
+        public void selectAllAccessibleSelection() {
+            // not supported
+        }
+    }
+}
+
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java b/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java
new file mode 100644
index 000000000000..39aa1b73ce30
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java
@@ -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.
+ *
+ ************************************************************************/
+package org.openoffice.java.accessibility;
+
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleEventListener;
+
+
+class MenuItem extends ToggleButton {
+    public MenuItem(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
+        super(xAccessible, xAccessibleContext);
+    }
+
+    protected class AccessibleMenuItemListener extends AccessibleUNOComponentListener {
+
+        protected AccessibleMenuItemListener() {
+        }
+
+        protected void setComponentState(short state, boolean enable) {
+
+            // #i56538# menu items in Java 1.5 are ARMED, not SELECTED
+            if( state == com.sun.star.accessibility.AccessibleStateType.SELECTED )
+                fireStatePropertyChange(javax.accessibility.AccessibleState.ARMED, enable);
+            else
+                super.setComponentState(state, enable);
+        }
+    };
+
+    protected XAccessibleEventListener createEventListener() {
+        return new AccessibleMenuItemListener();
+    }
+
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleMenuItem();
+    }
+
+    protected class AccessibleMenuItem extends AccessibleToggleButton {
+        /** Gets the role of this object */
+        public javax.accessibility.AccessibleRole getAccessibleRole() {
+            return javax.accessibility.AccessibleRole.MENU_ITEM;
+        }
+
+        /** Gets the 0-based index of this object in its accessible parent */
+        public int getAccessibleIndexInParent() {
+            if (getAccessibleParent() instanceof Menu) {
+                return ((Menu) getAccessibleParent()).indexOf(MenuItem.this);
+            } else {
+                return super.getAccessibleIndexInParent();
+            }
+        }
+
+        /**
+        * Gets the current state set of this object.
+        *
+        * @return an instance of <code>AccessibleStateSet</code>
+        *    containing the current state set of the object
+        * @see AccessibleState
+        */
+        public javax.accessibility.AccessibleStateSet getAccessibleStateSet() {
+            javax.accessibility.AccessibleStateSet stateSet = super.getAccessibleStateSet();
+
+            // #i56538# menu items in Java do not have SELECTABLE ..
+            stateSet.remove(javax.accessibility.AccessibleState.SELECTABLE);
+
+            // .. and also ARMED insted of SELECTED
+            if( stateSet.remove(javax.accessibility.AccessibleState.SELECTED) )
+                stateSet.add(javax.accessibility.AccessibleState.ARMED);
+
+            return stateSet;
+        }
+
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/NativeFrame.java b/accessibility/bridge/org/openoffice/java/accessibility/NativeFrame.java
new file mode 100644
index 000000000000..bcc4c0dddebc
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/NativeFrame.java
@@ -0,0 +1,35 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+public interface NativeFrame {
+    public java.awt.Component getInitialComponent();
+    public void setInitialComponent(java.awt.Component c);
+//  public Integer getHWND();
+}
+
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Paragraph.java b/accessibility/bridge/org/openoffice/java/accessibility/Paragraph.java
new file mode 100644
index 000000000000..6088bf48eabe
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Paragraph.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleText;
+
+import com.sun.star.uno.*;
+import com.sun.star.accessibility.*;
+
+/**
+ */
+public class Paragraph extends Container implements javax.accessibility.Accessible {
+
+    protected Paragraph(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
+        super(javax.accessibility.AccessibleRole.TEXT, xAccessible, xAccessibleContext);
+    }
+
+    protected class AccessibleParagraphListener extends AccessibleContainerListener {
+
+        protected AccessibleParagraphListener() {
+            super();
+        }
+
+        protected void setComponentState(short state, boolean enable) {
+            switch (state) {
+                case AccessibleStateType.EDITABLE:
+                    fireStatePropertyChange(javax.accessibility.AccessibleState.EDITABLE, enable);
+                    break;
+                case AccessibleStateType.MULTI_LINE:
+                    fireStatePropertyChange(javax.accessibility.AccessibleState.MULTI_LINE, enable);
+                    break;
+                case AccessibleStateType.SINGLE_LINE:
+                    break;
+                default:
+                    super.setComponentState(state, enable);
+                    break;
+            }
+        }
+
+
+        protected void handleVisibleDataChanged() {
+            if (Paragraph.this.isFocusOwner()) {
+                AccessibleContext ac = accessibleContext;
+                if (ac != null) {
+                    AccessibleText at = ac.getAccessibleText();
+                    if (at != null) {
+                        int pos = at.getCaretPosition();
+                        // Simulating a caret event here should help at tools
+                        // that re not aware of the paragraph approach of OOo.
+                        firePropertyChange(ac.ACCESSIBLE_CARET_PROPERTY,
+                            new Integer(-1), new Integer(pos));
+                    }
+                }
+            }
+        }
+
+        /** Called by OpenOffice process to notify property changes */
+        public void notifyEvent(AccessibleEventObject event) {
+            switch (event.EventId) {
+                case AccessibleEventId.CARET_CHANGED:
+                    firePropertyChange(accessibleContext.ACCESSIBLE_CARET_PROPERTY,
+                        Component.toNumber(event.OldValue),
+                        Component.toNumber(event.NewValue));
+                    break;
+                case AccessibleEventId.VISIBLE_DATA_CHANGED:
+                case AccessibleEventId.BOUNDRECT_CHANGED:
+                    // Whenever a paragraph gets inserted above the currently
+                    // focused one, this is the only event that will occur for.
+                    handleVisibleDataChanged();
+                default:
+                    super.notifyEvent(event);
+                break;
+            }
+        }
+    }
+
+    protected XAccessibleEventListener createEventListener() {
+        return new AccessibleParagraphListener();
+    }
+
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleParagraph();
+    }
+
+    protected class AccessibleParagraph extends AccessibleContainer {
+
+        protected AccessibleParagraph() {
+            // Don't do the queryInterface on XAccessibleText already ..
+            super(false);
+            /* Since getAccessibleText() is heavily used by the java access
+             * bridge for gnome and the gnome at-tools, we do a query interface
+             * here and remember the result.
+             */
+            accessibleText = AccessibleHypertextImpl.get(unoAccessibleContext);
+        }
+
+        /*
+        * AccessibleContext
+        */
+
+        /** Gets the role of this object */
+        public javax.accessibility.AccessibleRole getAccessibleRole() {
+            return javax.accessibility.AccessibleRole.TEXT;
+        }
+
+        /** Gets the AccessibleEditableText associated with this object presenting text on the display */
+        public javax.accessibility.AccessibleEditableText getAccessibleEditableText() {
+
+            if (disposed)
+                return null;
+
+            try {
+                XAccessibleEditableText unoAccessibleText = (XAccessibleEditableText)
+                    UnoRuntime.queryInterface(XAccessibleEditableText.class,
+                    unoAccessibleComponent);
+                if (unoAccessibleText != null) {
+                    return new AccessibleEditableTextImpl(unoAccessibleText);
+                } else {
+                    return null;
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Gets the AccessibleAction associated with this object that has a graphical representation */
+        public javax.accessibility.AccessibleAction getAccessibleAction() {
+            try {
+                XAccessibleAction unoAccessibleAction = (XAccessibleAction)
+                    UnoRuntime.queryInterface(XAccessibleAction.class, unoAccessibleComponent);
+                return (unoAccessibleAction != null) ?
+                    new AccessibleActionImpl(unoAccessibleAction) : null;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Returns the relation set of this object */
+        public javax.accessibility.AccessibleRelationSet getAccessibleRelationSet() {
+            try {
+                XAccessibleRelationSet unoAccessibleRelationSet =
+                    unoAccessible.getAccessibleContext().getAccessibleRelationSet();
+                if (unoAccessibleRelationSet == null) {
+                    return super.getAccessibleRelationSet();
+                }
+
+                javax.accessibility.AccessibleRelationSet relationSet = new javax.accessibility.AccessibleRelationSet();
+                int count = unoAccessibleRelationSet.getRelationCount();
+                for (int i = 0; i < count; i++) {
+                    AccessibleRelation unoAccessibleRelation = unoAccessibleRelationSet.getRelation(i);
+                    switch (unoAccessibleRelation.RelationType) {
+                        case AccessibleRelationType.CONTROLLED_BY:
+                            relationSet.add(new javax.accessibility.AccessibleRelation(
+                                javax.accessibility.AccessibleRelation.CONTROLLED_BY,
+                                getAccessibleComponents(unoAccessibleRelation.TargetSet)));
+                            break;
+                        case AccessibleRelationType.CONTROLLER_FOR:
+                            relationSet.add(new javax.accessibility.AccessibleRelation(
+                                javax.accessibility.AccessibleRelation.CONTROLLER_FOR,
+                                getAccessibleComponents(unoAccessibleRelation.TargetSet)));
+                            break;
+                        case AccessibleRelationType.LABELED_BY:
+                            relationSet.add(new javax.accessibility.AccessibleRelation(
+                                javax.accessibility.AccessibleRelation.LABELED_BY,
+                                getAccessibleComponents(unoAccessibleRelation.TargetSet)));
+                            break;
+                        case AccessibleRelationType.MEMBER_OF:
+                            relationSet.add(new javax.accessibility.AccessibleRelation(
+                                javax.accessibility.AccessibleRelation.MEMBER_OF,
+                                getAccessibleComponents(unoAccessibleRelation.TargetSet)));
+                            break;
+                        case AccessibleRelationType.CONTENT_FLOWS_TO:
+                            relationSet.add(new javax.accessibility.AccessibleRelation(
+                                "flowsTo",
+                                getAccessibleComponents(unoAccessibleRelation.TargetSet)));
+                            break;
+                        case AccessibleRelationType.CONTENT_FLOWS_FROM:
+                            relationSet.add(new javax.accessibility.AccessibleRelation(
+                                "flowsFrom",
+                                getAccessibleComponents(unoAccessibleRelation.TargetSet)));
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                return relationSet;
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return super.getAccessibleRelationSet();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return super.getAccessibleRelationSet();
+            }
+        }
+    }
+}
+
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/RadioButton.java b/accessibility/bridge/org/openoffice/java/accessibility/RadioButton.java
new file mode 100644
index 000000000000..3daeee6cd8de
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/RadioButton.java
@@ -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.
+ *
+ ************************************************************************/
+package org.openoffice.java.accessibility;
+
+import com.sun.star.accessibility.*;
+import com.sun.star.uno.*;
+
+
+class RadioButton extends ToggleButton {
+    public RadioButton(XAccessible xAccessible,
+        XAccessibleContext xAccessibleContext) {
+        super(xAccessible, xAccessibleContext);
+    }
+
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleRadioButton();
+    }
+
+    protected class AccessibleRadioButton extends AccessibleToggleButton {
+        /** Gets the role of this object */
+        public javax.accessibility.AccessibleRole getAccessibleRole() {
+            return javax.accessibility.AccessibleRole.RADIO_BUTTON;
+        }
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/ScrollBar.java b/accessibility/bridge/org/openoffice/java/accessibility/ScrollBar.java
new file mode 100644
index 000000000000..83b17d698201
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/ScrollBar.java
@@ -0,0 +1,126 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
+import javax.swing.SwingConstants;
+
+import com.sun.star.uno.*;
+import com.sun.star.accessibility.*;
+
+/**
+ */
+public class ScrollBar extends Component implements SwingConstants, javax.accessibility.Accessible {
+
+    public ScrollBar(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
+        super(xAccessible, xAccessibleContext);
+    }
+
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleScrollBar();
+    }
+
+    protected class AccessibleScrollBar extends AccessibleUNOComponent implements
+        javax.accessibility.AccessibleAction {
+
+        protected XAccessibleAction unoAccessibleAction;
+        protected int actionCount = 0;
+
+        /**
+        * Though the class is abstract, this should be called by all sub-classes
+        */
+        protected AccessibleScrollBar() {
+            super();
+            unoAccessibleAction = (XAccessibleAction) UnoRuntime.queryInterface(
+                XAccessibleAction.class, unoAccessibleContext);
+            if (unoAccessibleAction != null) {
+                actionCount = unoAccessibleAction.getAccessibleActionCount();
+            }
+        }
+
+        /*
+        * AccessibleContext
+        */
+
+        /** Gets the role of this object */
+        public javax.accessibility.AccessibleRole getAccessibleRole() {
+            return javax.accessibility.AccessibleRole.SCROLL_BAR;
+        }
+
+        /** Gets the AccessibleValue associated with this object that has a graphical representation */
+        public javax.accessibility.AccessibleValue getAccessibleValue() {
+            try {
+                XAccessibleValue unoAccessibleValue = (XAccessibleValue)
+                    UnoRuntime.queryInterface(XAccessibleValue.class, unoAccessibleContext);
+                return (unoAccessibleValue != null) ?
+                    new AccessibleValueImpl(unoAccessibleValue) : null;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Gets the AccessibleAction associated with this object that supports one or more actions */
+        public javax.accessibility.AccessibleAction getAccessibleAction() {
+            return this;
+        }
+
+        /*
+        * AccessibleAction
+        */
+
+        /** Performs the specified Action on the object */
+        public boolean doAccessibleAction(int param) {
+            if (param < actionCount) {
+                try {
+                    return unoAccessibleAction.doAccessibleAction(param);
+                } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
+                }
+            }
+            return false;
+        }
+
+        /** Returns a description of the specified action of the object */
+        public java.lang.String getAccessibleActionDescription(int param) {
+            if(param < actionCount) {
+                try {
+                    return unoAccessibleAction.getAccessibleActionDescription(param);
+                } catch(com.sun.star.lang.IndexOutOfBoundsException e) {
+                }
+            }
+            return null;
+        }
+
+        /** Returns the number of accessible actions available in this object */
+        public int getAccessibleActionCount() {
+            return actionCount;
+        }
+    }
+}
+
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Separator.java b/accessibility/bridge/org/openoffice/java/accessibility/Separator.java
new file mode 100644
index 000000000000..892768e07cbb
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Separator.java
@@ -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.
+ *
+ ************************************************************************/
+package org.openoffice.java.accessibility;
+
+import com.sun.star.accessibility.*;
+import com.sun.star.uno.*;
+
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
+
+import javax.swing.SwingConstants;
+
+
+/**
+ */
+public class Separator extends Component implements SwingConstants,
+    javax.accessibility.Accessible {
+
+    public Separator(XAccessible xAccessible,
+        XAccessibleContext xAccessibleContext) {
+        super(xAccessible, xAccessibleContext);
+        setFocusable(false);
+    }
+
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleSeparator();
+    }
+
+    protected class AccessibleSeparator extends AccessibleUNOComponent {
+        /**
+        * Though the class is abstract, this should be called by all sub-classes
+        */
+        protected AccessibleSeparator() {
+            super();
+        }
+
+        /*
+        * AccessibleContext
+        */
+
+        /** Gets the role of this object */
+        public javax.accessibility.AccessibleRole getAccessibleRole() {
+            return javax.accessibility.AccessibleRole.SEPARATOR;
+        }
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Table.java b/accessibility/bridge/org/openoffice/java/accessibility/Table.java
new file mode 100644
index 000000000000..24ea912d4217
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Table.java
@@ -0,0 +1,727 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import javax.accessibility.AccessibleState;
+
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.accessibility.*;
+
+public class Table extends DescendantManager implements javax.accessibility.Accessible {
+
+    protected Table(XAccessible xAccessible, XAccessibleContext xAccessibleContext, boolean multiselectable) {
+        super(xAccessible, xAccessibleContext, multiselectable);
+    }
+
+    protected void setActiveDescendant(javax.accessibility.Accessible descendant) {
+        javax.accessibility.Accessible oldAD = activeDescendant;
+        activeDescendant = descendant;
+        firePropertyChange(javax.accessibility.AccessibleContext.ACCESSIBLE_ACTIVE_DESCENDANT_PROPERTY,
+            oldAD, descendant);
+    }
+
+    protected void setActiveDescendant(Object any) {
+        javax.accessibility.Accessible descendant = null;
+        try {
+            if (AnyConverter.isObject(any)) {
+                XAccessible unoAccessible = (XAccessible) AnyConverter.toObject(
+                    AccessibleObjectFactory.XAccessibleType, any);
+                if (unoAccessible != null) {
+                    // FIXME: have to handle non transient objects here ..
+                    descendant = new TableCell(unoAccessible);
+                }
+            }
+            setActiveDescendant(descendant);
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+        }
+    }
+
+    protected void add(XAccessible unoAccessible) {
+        if (unoAccessible != null) {
+            TableCell cell = new TableCell(unoAccessible);
+            // The AccessBridge for Windows expects an instance of AccessibleContext
+            // as parameters
+            firePropertyChange(javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                null, cell.getAccessibleContext());
+        }
+    }
+
+    protected void remove(XAccessible unoAccessible) {
+        if (unoAccessible != null) {
+            TableCell cell = new TableCell(unoAccessible);
+            // The AccessBridge for Windows expects an instance of AccessibleContext
+            // as parameters
+            firePropertyChange(javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                cell.getAccessibleContext(), null);
+        }
+    }
+
+    protected void add(Object any) {
+        try {
+            add((XAccessible) AnyConverter.toObject(AccessibleObjectFactory.XAccessibleType, any));
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+        }
+    }
+
+    protected void remove(Object any) {
+        try {
+            remove((XAccessible) AnyConverter.toObject(AccessibleObjectFactory.XAccessibleType, any));
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+        }
+    }
+
+    /**
+    * Update the proxy objects appropriatly on property change events
+    */
+    protected class AccessibleTableListener extends AccessibleDescendantManagerListener {
+
+        protected AccessibleTableListener() {
+            super();
+        }
+
+        /** Called by OpenOffice process to notify property changes */
+        public void notifyEvent(AccessibleEventObject event) {
+            switch (event.EventId) {
+                case AccessibleEventId.ACTIVE_DESCENDANT_CHANGED:
+                    setActiveDescendant(event.NewValue);
+                    break;
+                case AccessibleEventId.CHILD:
+                    if (AnyConverter.isObject(event.OldValue)) {
+                        remove(event.OldValue);
+                    }
+                    if (AnyConverter.isObject(event.NewValue)) {
+                        add(event.NewValue);
+                    }
+                    break;
+                default:
+                    super.notifyEvent(event);
+            }
+        }
+    }
+
+    protected XAccessibleEventListener createEventListener() {
+        return new AccessibleTableListener();
+    }
+
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleTable();
+    }
+
+    protected class AccessibleTable extends AccessibleDescendantManager implements javax.accessibility.AccessibleExtendedTable {
+
+        protected XAccessibleTable unoAccessibleTable;
+
+        public AccessibleTable() {
+            unoAccessibleTable = (XAccessibleTable) UnoRuntime.queryInterface(XAccessibleTable.class, unoAccessibleContext);
+        }
+
+        /** Gets the role of this object */
+        public javax.accessibility.AccessibleRole getAccessibleRole() {
+            return javax.accessibility.AccessibleRole.TABLE;
+        }
+
+        /** Returns the AccessibleTable interface of this object */
+        public javax.accessibility.AccessibleTable getAccessibleTable() {
+            return this;
+        }
+
+        /** Returns the specified Accessible child of the object */
+        public javax.accessibility.Accessible getAccessibleChild(int i) {
+            javax.accessibility.Accessible child = null;
+            try {
+                XAccessible xAccessible = unoAccessibleContext.getAccessibleChild(i);
+                if (xAccessible != null) {
+                    // Re-use the active descandant wrapper if possible
+                    javax.accessibility.Accessible activeDescendant = Table.this.activeDescendant;
+                    if ((activeDescendant instanceof TableCell) && xAccessible.equals(((TableCell) activeDescendant).unoAccessible)) {
+                        child = activeDescendant;
+                    } else {
+                        child = new TableCell(xAccessible);
+                    }
+                }
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+            return child;
+        }
+
+        /*
+        * AccessibleComponent
+        */
+
+        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */
+        public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
+            javax.accessibility.Accessible child = null;
+            try {
+                XAccessible xAccessible = unoAccessibleComponent.getAccessibleAtPoint(
+                    new com.sun.star.awt.Point(p.x, p.y));
+                if (xAccessible != null) {
+                    // Re-use the active descandant wrapper if possible
+                    javax.accessibility.Accessible activeDescendant = Table.this.activeDescendant;
+                    if ((activeDescendant instanceof TableCell) && xAccessible.equals(((TableCell) activeDescendant).unoAccessible)) {
+                        child = activeDescendant;
+                    } else {
+                        child = new TableCell(xAccessible);
+                    }
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+            return child;
+        }
+
+        /*
+        * AccessibleSelection
+        */
+
+        /** Returns an Accessible representing the specified selected child of the object */
+        public javax.accessibility.Accessible getAccessibleSelection(int i) {
+            javax.accessibility.Accessible child = null;
+            try {
+                XAccessible xAccessible = unoAccessibleSelection.getSelectedAccessibleChild(i);
+                if (xAccessible != null) {
+                    // Re-use the active descandant wrapper if possible
+                    javax.accessibility.Accessible activeDescendant = Table.this.activeDescendant;
+                    if ((activeDescendant instanceof TableCell) && xAccessible.equals(((TableCell) activeDescendant).unoAccessible)) {
+                        child = activeDescendant;
+                    } else {
+                        child = new TableCell(xAccessible);
+                    }
+                }
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+            return child;
+        }
+
+        /*
+        * AccessibleTable
+        */
+
+        /** Returns the Accessible at a specified row and column in the table. */
+        public javax.accessibility.Accessible getAccessibleAt(int r, int c) {
+            javax.accessibility.Accessible child = null;
+            try {
+                XAccessible xAccessible = unoAccessibleTable.getAccessibleCellAt(r,c);
+                if (xAccessible != null) {
+                    // Re-use the active descandant wrapper if possible
+                    javax.accessibility.Accessible activeDescendant = Table.this.activeDescendant;
+                    if ((activeDescendant instanceof TableCell) && xAccessible.equals(((TableCell) activeDescendant).unoAccessible)) {
+                        child = activeDescendant;
+                    } else {
+                        child = new TableCell(xAccessible);
+                    }
+                }
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+            return child;
+        }
+
+        /** Returns the caption for the table. */
+        public javax.accessibility.Accessible getAccessibleCaption() {
+            // Not yet supported.
+            return null;
+        }
+
+        /** Returns the number of columns in the table. */
+        public int getAccessibleColumnCount() {
+             try {
+                return unoAccessibleTable.getAccessibleColumnCount();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return 0;
+            }
+       }
+
+        /** Returns the description text of the specified column in the table. */
+        public javax.accessibility.Accessible getAccessibleColumnDescription(int c) {
+            try {
+                return new javax.swing.JLabel(
+                    unoAccessibleTable.getAccessibleColumnDescription(c));
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return null;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /**
+         * Returns the number of columns occupied by the Accessible
+         * at a specified row and column in the table.
+         */
+        public int getAccessibleColumnExtentAt(int r, int c) {
+            try {
+                return unoAccessibleTable.getAccessibleColumnExtentAt(r,c);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return 0;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return 0;
+            }
+        }
+
+        /** Returns the column headers as an AccessibleTable. */
+        public javax.accessibility.AccessibleTable getAccessibleColumnHeader() {
+            // Not yet supported
+            return null;
+        }
+
+        /** Returns the number of rows in the table. */
+        public int getAccessibleRowCount() {
+             try {
+                return unoAccessibleTable.getAccessibleRowCount();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return 0;
+            }
+        }
+
+        /** Returns the description of the specified row in the table. */
+        public javax.accessibility.Accessible getAccessibleRowDescription(int r) {
+            try {
+                return new javax.swing.JLabel(
+                    unoAccessibleTable.getAccessibleRowDescription(r));
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return null;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /**
+         * Returns the number of rows occupied by the Accessible
+         * at a specified row and column in the table.
+         */
+        public int getAccessibleRowExtentAt(int r, int c) {
+            try {
+                return unoAccessibleTable.getAccessibleRowExtentAt(r,c);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return 0;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return 0;
+            }
+        }
+
+        /** Returns the row headers as an AccessibleTable. */
+        public javax.accessibility.AccessibleTable getAccessibleRowHeader() {
+            // Not yet supported
+            return null;
+        }
+
+        /** Returns the summary description of the table. */
+        public javax.accessibility.Accessible getAccessibleSummary() {
+            // Not yet supported.
+            return null;
+        }
+
+        /** Returns the selected columns in a table. */
+        public int[] getSelectedAccessibleColumns() {
+            try {
+                return unoAccessibleTable.getSelectedAccessibleColumns();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Returns the selected rows in a table. */
+        public int[] getSelectedAccessibleRows() {
+            try {
+                return unoAccessibleTable.getSelectedAccessibleRows();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Returns a boolean value indicating whether the specified column is selected. */
+        public boolean isAccessibleColumnSelected(int c) {
+            try {
+                return unoAccessibleTable.isAccessibleColumnSelected(c);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return false;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return false;
+            }
+        }
+
+        /** Returns a boolean value indicating whether the specified row is selected. */
+        public boolean isAccessibleRowSelected(int r) {
+            try {
+                return unoAccessibleTable.isAccessibleRowSelected(r);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return false;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return false;
+            }
+        }
+
+        /**
+         * Returns a boolean value indicating whether the accessible
+         * at a specified row and column is selected.
+         */
+        public boolean isAccessibleSelected(int r, int c) {
+            try {
+                return unoAccessibleTable.isAccessibleSelected(r,c);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return false;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return false;
+            }
+        }
+
+        /** Sets the caption for the table. */
+        public void setAccessibleCaption(javax.accessibility.Accessible accessible) {
+            // Not supported by the UNO Accessibility API
+        }
+
+        /** Sets the description text of the specified column in the table. */
+        public void setAccessibleColumnDescription(int param, javax.accessibility.Accessible accessible) {
+            // Not supported by the UNO Accessibility API
+        }
+
+        /** Sets the column headers. */
+        public void setAccessibleColumnHeader(javax.accessibility.AccessibleTable accessibleTable) {
+            // Not supported by the UNO Accessibility API
+        }
+
+        /** Sets the description text of the specified row of the table. */
+        public void setAccessibleRowDescription(int param, javax.accessibility.Accessible accessible) {
+            // Not supported by the UNO Accessibility API
+        }
+
+        /** Sets the row headers. */
+        public void setAccessibleRowHeader(javax.accessibility.AccessibleTable accessibleTable) {
+            // Not supported by the UNO Accessibility API
+        }
+
+        /** Sets the summary description of the table */
+        public void setAccessibleSummary(javax.accessibility.Accessible accessible) {
+            // Not supported by the UNO Accessibility API
+        }
+
+        /** Returns the column number of an index in the table */
+        public int getAccessibleColumn(int index) {
+            try {
+                return unoAccessibleTable.getAccessibleColumn(index);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return -1;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return -1;
+            }
+        }
+
+        /** Returns the index of a specified row and column in the table. */
+        public int getAccessibleIndex(int r, int c) {
+            try {
+                return unoAccessibleTable.getAccessibleIndex(r,c);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return -1;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return -1;
+            }
+        }
+
+        /** Returns the row number of an index in the table */
+        public int getAccessibleRow(int index) {
+            try {
+                return unoAccessibleTable.getAccessibleRow(index);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return -1;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return -1;
+            }
+        }
+    }
+
+    class TableCell extends java.awt.Component implements javax.accessibility.Accessible {
+
+        protected XAccessible unoAccessible;
+
+        public TableCell(XAccessible xAccessible) {
+            unoAccessible = xAccessible;
+        }
+
+        public Object[] create(Object[] targetSet) {
+            try {
+                java.util.ArrayList list = new java.util.ArrayList(targetSet.length);
+                for (int i=0; i < targetSet.length; i++) {
+                    XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface(
+                        XAccessible.class, targetSet[i]);
+                    if (xAccessible != null) {
+                        list.add(new TableCell(xAccessible));
+                    }
+                }
+                list.trimToSize();
+                return list.toArray();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        javax.accessibility.AccessibleContext accessibleContext = null;
+
+        /** Returns the AccessibleContext associated with this object */
+        public javax.accessibility.AccessibleContext getAccessibleContext() {
+            if (accessibleContext == null) {
+                try {
+                    XAccessibleContext xAccessibleContext = unoAccessible.getAccessibleContext();
+                    if (xAccessibleContext != null) {
+                                            javax.accessibility.AccessibleContext ac = new AccessibleTableCell(xAccessibleContext);
+                                            if (ac != null) {
+                                                ac.setAccessibleParent(Table.this);
+                                                accessibleContext = ac;
+                                            }
+                    }
+                } catch (com.sun.star.uno.RuntimeException e) {
+                }
+            }
+            return accessibleContext;
+        }
+
+        protected class AccessibleTableCell extends javax.accessibility.AccessibleContext {
+
+            XAccessibleContext unoAccessibleContext;
+
+            public AccessibleTableCell(XAccessibleContext xAccessibleContext) {
+                unoAccessibleContext = xAccessibleContext;
+            }
+
+            /** Returns the accessible name of this object */
+            public String getAccessibleName() {
+                try {
+                    return unoAccessibleContext.getAccessibleName();
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Sets the accessible name of this object */
+            public void setAccessibleName(String name) {
+                // Not supported
+            }
+
+            /** Returns the accessible name of this object */
+            public String getAccessibleDescription() {
+                try {
+                    return unoAccessibleContext.getAccessibleDescription();
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Sets the accessible name of this object */
+            public void setAccessibleDescription(String name) {
+                // Not supported
+            }
+
+            /** Returns the accessible role of this object */
+            public javax.accessibility.AccessibleRole getAccessibleRole() {
+                try {
+                    javax.accessibility.AccessibleRole role = AccessibleRoleAdapter.getAccessibleRole(
+                        unoAccessibleContext.getAccessibleRole());
+                    return (role != null) ? role : javax.accessibility.AccessibleRole.LABEL;
+                } catch(com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Gets the locale of the component */
+            public java.util.Locale getLocale() throws java.awt.IllegalComponentStateException {
+                try {
+                    com.sun.star.lang.Locale unoLocale = unoAccessibleContext.getLocale();
+                    return new java.util.Locale(unoLocale.Language, unoLocale.Country);
+                } catch (IllegalAccessibleComponentStateException e) {
+                    throw new java.awt.IllegalComponentStateException(e.getMessage());
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return Table.this.getLocale();
+                }
+            }
+
+            /** Gets the 0-based index of this object in its accessible parent */
+            public int getAccessibleIndexInParent() {
+                try {
+                    return unoAccessibleContext.getAccessibleIndexInParent();
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return -1;
+                }
+            }
+
+            /** Returns the number of accessible children of the object. */
+            public int getAccessibleChildrenCount() {
+                try {
+                    return unoAccessibleContext.getAccessibleChildCount();
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return 0;
+                }
+            }
+
+            /** Returns the specified Accessible child of the object. */
+            public javax.accessibility.Accessible getAccessibleChild(int i) {
+                javax.accessibility.Accessible child = null;
+                try {
+                    XAccessible xAccessible = unoAccessibleContext.getAccessibleChild(i);
+                    // Re-use the active descandant wrapper if possible
+                    javax.accessibility.Accessible activeDescendant = Table.this.activeDescendant;
+                    if ((activeDescendant instanceof TableCell) && ((TableCell) activeDescendant).unoAccessible.equals(xAccessible)) {
+                        child = activeDescendant;
+                    } else if (xAccessible != null) {
+                        child = new TableCell(xAccessible);
+                    }
+                } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                } catch (com.sun.star.uno.RuntimeException e) {
+                }
+                return child;
+            }
+
+            /** Returns the state set of this object */
+            public javax.accessibility.AccessibleStateSet getAccessibleStateSet() {
+                try {
+                    return AccessibleStateAdapter.getAccessibleStateSet(TableCell.this,
+                        unoAccessibleContext.getAccessibleStateSet());
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return AccessibleStateAdapter.getDefunctStateSet();
+                }
+            }
+
+            /** Returns the relation set of this object */
+            public javax.accessibility.AccessibleRelationSet getAccessibleRelationSet() {
+                try {
+                    XAccessibleRelationSet unoAccessibleRelationSet = unoAccessibleContext.getAccessibleRelationSet();
+                    if (unoAccessibleRelationSet == null) {
+                        return null;
+                    }
+
+                    javax.accessibility.AccessibleRelationSet relationSet = new javax.accessibility.AccessibleRelationSet();
+                    int count = unoAccessibleRelationSet.getRelationCount();
+                    for (int i = 0; i < count; i++) {
+                        AccessibleRelation unoAccessibleRelation = unoAccessibleRelationSet.getRelation(i);
+                        switch (unoAccessibleRelation.RelationType) {
+                            case AccessibleRelationType.CONTROLLED_BY:
+                                relationSet.add(new javax.accessibility.AccessibleRelation(
+                                    javax.accessibility.AccessibleRelation.CONTROLLED_BY,
+                                    create(unoAccessibleRelation.TargetSet)));
+                                break;
+                            case AccessibleRelationType.CONTROLLER_FOR:
+                                relationSet.add(new javax.accessibility.AccessibleRelation(
+                                    javax.accessibility.AccessibleRelation.CONTROLLER_FOR,
+                                    create(unoAccessibleRelation.TargetSet)));
+                                break;
+                            case AccessibleRelationType.LABELED_BY:
+                                relationSet.add(new javax.accessibility.AccessibleRelation(
+                                    javax.accessibility.AccessibleRelation.LABELED_BY,
+                                    create(unoAccessibleRelation.TargetSet)));
+                                break;
+                            case AccessibleRelationType.LABEL_FOR:
+                                relationSet.add(new javax.accessibility.AccessibleRelation(
+                                    javax.accessibility.AccessibleRelation.LABEL_FOR,
+                                    create(unoAccessibleRelation.TargetSet)));
+                                break;
+                            case AccessibleRelationType.MEMBER_OF:
+                                relationSet.add(new javax.accessibility.AccessibleRelation(
+                                    javax.accessibility.AccessibleRelation.MEMBER_OF,
+                                    create(unoAccessibleRelation.TargetSet)));
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    return relationSet;
+                } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                    return null;
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Gets the AccessibleComponent associated with this object that has a graphical representation */
+            public javax.accessibility.AccessibleComponent getAccessibleComponent() {
+                try {
+                    XAccessibleComponent unoAccessibleComponent = (XAccessibleComponent)
+                        UnoRuntime.queryInterface(XAccessibleComponent.class, unoAccessibleContext);
+                    return (unoAccessibleComponent != null) ?
+                        new AccessibleComponentImpl(unoAccessibleComponent) : null;
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Gets the AccessibleAction associated with this object that has a graphical representation */
+            public javax.accessibility.AccessibleAction getAccessibleAction() {
+                try {
+                    XAccessibleAction unoAccessibleAction = (XAccessibleAction)
+                        UnoRuntime.queryInterface(XAccessibleAction.class, unoAccessibleContext);
+                    return (unoAccessibleAction != null) ?
+                        new AccessibleActionImpl(unoAccessibleAction) : null;
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Gets the AccessibleText associated with this object that has a graphical representation */
+            public javax.accessibility.AccessibleText getAccessibleText() {
+
+                if (disposed)
+                    return null;
+
+                try {
+                    XAccessibleText unoAccessibleText = (XAccessibleText)
+                        UnoRuntime.queryInterface(XAccessibleText.class, unoAccessibleContext);
+                    return (unoAccessibleText != null) ?
+                        new AccessibleTextImpl(unoAccessibleText) : null;
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Gets the AccessibleValue associated with this object that has a graphical representation */
+            public javax.accessibility.AccessibleValue getAccessibleValue() {
+                try {
+                    XAccessibleValue unoAccessibleValue = (XAccessibleValue)
+                        UnoRuntime.queryInterface(XAccessibleValue.class, unoAccessibleContext);
+                    return (unoAccessibleValue != null) ?
+                        new AccessibleValueImpl(unoAccessibleValue) : null;
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Gets the AccessibleText associated with this object presenting text on the display */
+            public javax.accessibility.AccessibleIcon[] getAccessibleIcon() {
+                try {
+                    XAccessibleImage unoAccessibleImage = (XAccessibleImage)
+                        UnoRuntime.queryInterface(XAccessibleImage.class, unoAccessibleContext);
+                    if (unoAccessibleImage != null) {
+                        javax.accessibility.AccessibleIcon[] icons = { new AccessibleIconImpl(unoAccessibleImage) };
+                        return icons;
+                    }
+                } catch (com.sun.star.uno.RuntimeException e) {
+                }
+                return null;
+            }
+        }
+    }
+}
+
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/TextComponent.java b/accessibility/bridge/org/openoffice/java/accessibility/TextComponent.java
new file mode 100644
index 000000000000..a142297c4c12
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/TextComponent.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.accessibility.*;
+
+/**
+ */
+public class TextComponent extends Component implements javax.accessibility.Accessible {
+
+    protected TextComponent(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
+        super(xAccessible, xAccessibleContext);
+    }
+
+    protected class AccessibleTextComponentListener extends AccessibleUNOComponentListener {
+
+        protected AccessibleTextComponentListener() {
+            super();
+        }
+
+        protected void setComponentState(short state, boolean enable) {
+            switch (state) {
+                case AccessibleStateType.EDITABLE:
+                    fireStatePropertyChange(javax.accessibility.AccessibleState.EDITABLE, enable);
+                    break;
+                case AccessibleStateType.MULTI_LINE:
+                    fireStatePropertyChange(javax.accessibility.AccessibleState.MULTI_LINE, enable);
+                    break;
+                case AccessibleStateType.SINGLE_LINE:
+                    break;
+                default:
+                    super.setComponentState(state, enable);
+                    break;
+            }
+        }
+    }
+
+    protected XAccessibleEventListener createEventListener() {
+        return new AccessibleTextComponentListener();
+    }
+
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleTextComponent();
+    }
+
+    protected class AccessibleTextComponent extends AccessibleUNOComponent {
+
+        /**
+        * Though the class is abstract, this should be called by all sub-classes
+        */
+        protected AccessibleTextComponent() {
+            super();
+        }
+
+        /*
+        * AccessibleContext
+        */
+
+        /** Gets the role of this object */
+        public javax.accessibility.AccessibleRole getAccessibleRole() {
+            return javax.accessibility.AccessibleRole.TEXT;
+        }
+
+        /** Gets the AccessibleText associated with this object presenting text on the display */
+        public javax.accessibility.AccessibleText getAccessibleText() {
+
+            if (disposed)
+                return null;
+
+            try {
+                XAccessibleText unoAccessibleText = (XAccessibleText)
+                    UnoRuntime.queryInterface(XAccessibleText.class,unoAccessibleComponent);
+                if (unoAccessibleText != null) {
+                    return new AccessibleTextImpl(unoAccessibleText);
+                } else {
+                    return null;
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Gets the AccessibleEditableText associated with this object presenting text on the display */
+        public javax.accessibility.AccessibleEditableText getAccessibleEditableText() {
+            try {
+                XAccessibleEditableText unoAccessibleText = (XAccessibleEditableText)
+                    UnoRuntime.queryInterface(XAccessibleEditableText.class,unoAccessibleComponent);
+                if (unoAccessibleText != null) {
+                    return new AccessibleEditableTextImpl(unoAccessibleText);
+                } else {
+                    return null;
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Gets the AccessibleAction associated with this object that has a graphical representation */
+        public javax.accessibility.AccessibleAction getAccessibleAction() {
+            try {
+                XAccessibleAction unoAccessibleAction = (XAccessibleAction)
+                    UnoRuntime.queryInterface(XAccessibleAction.class, unoAccessibleComponent);
+                return (unoAccessibleAction != null) ?
+                    new AccessibleActionImpl(unoAccessibleAction) : null;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Returns the relation set of this object */
+        public javax.accessibility.AccessibleRelationSet getAccessibleRelationSet() {
+            try {
+                XAccessibleRelationSet unoAccessibleRelationSet =
+                    unoAccessible.getAccessibleContext().getAccessibleRelationSet();
+                if (unoAccessibleRelationSet == null) {
+                    return super.getAccessibleRelationSet();
+                }
+
+                javax.accessibility.AccessibleRelationSet relationSet = new javax.accessibility.AccessibleRelationSet();
+                int count = unoAccessibleRelationSet.getRelationCount();
+                for (int i = 0; i < count; i++) {
+                    AccessibleRelation unoAccessibleRelation = unoAccessibleRelationSet.getRelation(i);
+                    switch (unoAccessibleRelation.RelationType) {
+                        case AccessibleRelationType.CONTROLLED_BY:
+                            relationSet.add(new javax.accessibility.AccessibleRelation(
+                                javax.accessibility.AccessibleRelation.CONTROLLED_BY,
+                                getAccessibleComponents(unoAccessibleRelation.TargetSet)));
+                            break;
+                        case AccessibleRelationType.CONTROLLER_FOR:
+                            relationSet.add(new javax.accessibility.AccessibleRelation(
+                                javax.accessibility.AccessibleRelation.CONTROLLER_FOR,
+                                getAccessibleComponents(unoAccessibleRelation.TargetSet)));
+                            break;
+                        case AccessibleRelationType.LABELED_BY:
+                            relationSet.add(new javax.accessibility.AccessibleRelation(
+                                javax.accessibility.AccessibleRelation.LABELED_BY,
+                                getAccessibleComponents(unoAccessibleRelation.TargetSet)));
+                            break;
+                        case AccessibleRelationType.MEMBER_OF:
+                            relationSet.add(new javax.accessibility.AccessibleRelation(
+                                javax.accessibility.AccessibleRelation.MEMBER_OF,
+                                getAccessibleComponents(unoAccessibleRelation.TargetSet)));
+                            break;
+                        case AccessibleRelationType.CONTENT_FLOWS_TO:
+                            relationSet.add(new javax.accessibility.AccessibleRelation(
+                                "flowsTo",
+                                getAccessibleComponents(unoAccessibleRelation.TargetSet)));
+                            break;
+                        case AccessibleRelationType.CONTENT_FLOWS_FROM:
+                            relationSet.add(new javax.accessibility.AccessibleRelation(
+                                "flowsFrom",
+                                getAccessibleComponents(unoAccessibleRelation.TargetSet)));
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                return relationSet;
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return super.getAccessibleRelationSet();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return super.getAccessibleRelationSet();
+            }
+        }
+    }
+}
+
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/ToggleButton.java b/accessibility/bridge/org/openoffice/java/accessibility/ToggleButton.java
new file mode 100644
index 000000000000..bac8035a2ece
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/ToggleButton.java
@@ -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.
+ *
+ ************************************************************************/
+package org.openoffice.java.accessibility;
+
+import com.sun.star.accessibility.*;
+import com.sun.star.uno.*;
+
+
+class ToggleButton extends AbstractButton implements javax.accessibility.Accessible {
+    public ToggleButton(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
+        super(xAccessible, xAccessibleContext);
+    }
+
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleToggleButton();
+    }
+
+    protected class AccessibleToggleButton extends AccessibleAbstractButton {
+        /** Gets the role of this object */
+        public javax.accessibility.AccessibleRole getAccessibleRole() {
+            return javax.accessibility.AccessibleRole.TOGGLE_BUTTON;
+        }
+
+        /** Gets the AccessibleValue associated with this object that has a graphical representation */
+        public javax.accessibility.AccessibleValue getAccessibleValue() {
+            try {
+                XAccessibleValue unoAccessibleValue = (XAccessibleValue) UnoRuntime.queryInterface(XAccessibleValue.class,
+                        unoAccessibleContext);
+
+                return (unoAccessibleValue != null)
+                ? new AccessibleValueImpl(unoAccessibleValue) : null;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/ToolTip.java b/accessibility/bridge/org/openoffice/java/accessibility/ToolTip.java
new file mode 100644
index 000000000000..071a6a37fd98
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/ToolTip.java
@@ -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.
+ *
+ ************************************************************************/
+package org.openoffice.java.accessibility;
+
+import com.sun.star.accessibility.*;
+import com.sun.star.uno.*;
+
+import javax.accessibility.AccessibleState;
+import javax.accessibility.AccessibleStateSet;
+
+
+/**
+ */
+public class ToolTip extends Component implements javax.accessibility.Accessible {
+    protected ToolTip(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
+        super(xAccessible, xAccessibleContext);
+    }
+
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleToolTip();
+    }
+
+    protected class AccessibleToolTip extends AccessibleUNOComponent {
+
+        /*
+        * AccessibleContext
+        */
+
+        /** Gets the role of this object */
+        public javax.accessibility.AccessibleRole getAccessibleRole() {
+            return javax.accessibility.AccessibleRole.TOOL_TIP;
+        }
+
+        /** Gets the AccessibleText associated with this object presenting text on the display */
+        public javax.accessibility.AccessibleText getAccessibleText() {
+
+            if (disposed)
+                return null;
+
+            try {
+                XAccessibleText unoAccessibleText = (XAccessibleText) UnoRuntime.queryInterface(XAccessibleText.class,
+                        unoAccessibleComponent);
+
+                if (unoAccessibleText != null) {
+                    return new AccessibleTextImpl(unoAccessibleText);
+                } else {
+                    return null;
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Returns the relation set of this object */
+
+        /*
+                        public javax.accessibility.AccessibleRelationSet getAccessibleRelationSet() {
+                                try {
+                                        XAccessibleRelationSet unoAccessibleRelationSet = unoAccessibleContext.getAccessibleRelationSet();
+                                        if (unoAccessibleRelationSet == null) {
+                                                return null;
+                                        }
+
+                                        javax.accessibility.AccessibleRelationSet relationSet = new javax.accessibility.AccessibleRelationSet();
+                                        int count = unoAccessibleRelationSet.getRelationCount();
+                                        for (int i = 0; i < count; i++) {
+                                                AccessibleRelation unoAccessibleRelation = unoAccessibleRelationSet.getRelation(i);
+                                                switch (unoAccessibleRelation.RelationType) {
+                                                        case AccessibleRelationType.LABEL_FOR:
+                                                                relationSet.add(new javax.accessibility.AccessibleRelation(
+                                                                        javax.accessibility.AccessibleRelation.LABEL_FOR,
+                                                                        getAccessibleComponents(unoAccessibleRelation.TargetSet)));
+                                                                break;
+                                                        case AccessibleRelationType.MEMBER_OF:
+                                                                relationSet.add(new javax.accessibility.AccessibleRelation(
+                                                                        javax.accessibility.AccessibleRelation.MEMBER_OF,
+                                                                        getAccessibleComponents(unoAccessibleRelation.TargetSet)));
+                                                                break;
+                                                        default:
+                                                                break;
+                                                }
+                                        }
+                                        return relationSet;
+                                } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                                        return null;
+                                } catch (com.sun.star.uno.RuntimeException e) {
+                                        return null;
+                                }
+                        }
+        */
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Tree.java b/accessibility/bridge/org/openoffice/java/accessibility/Tree.java
new file mode 100644
index 000000000000..5fdd5a196397
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Tree.java
@@ -0,0 +1,768 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleState;
+
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.accessibility.*;
+
+public class Tree extends DescendantManager implements javax.accessibility.Accessible {
+
+    protected Tree(XAccessible xAccessible, XAccessibleContext xAccessibleContext) {
+        super(xAccessible, xAccessibleContext);
+    }
+
+    protected void setActiveDescendant(javax.accessibility.Accessible descendant) {
+        javax.accessibility.Accessible oldAD = activeDescendant;
+        activeDescendant = descendant;
+        firePropertyChange(AccessibleContext.ACCESSIBLE_ACTIVE_DESCENDANT_PROPERTY,
+            oldAD, descendant);
+    }
+
+    protected void setActiveDescendant(Object any) {
+        javax.accessibility.Accessible descendant = null;
+        try {
+            if (AnyConverter.isObject(any)) {
+                XAccessible unoAccessible = (XAccessible) AnyConverter.toObject(
+                    AccessibleObjectFactory.XAccessibleType, any);
+                if (unoAccessible != null) {
+                    // FIXME: have to handle non transient objects here ..
+                    descendant = new TreeItem(unoAccessible);
+                }
+            }
+            setActiveDescendant(descendant);
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+        }
+    }
+
+    protected void add(XAccessible unoAccessible) {
+        if (unoAccessible != null) {
+            firePropertyChange(AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                null, new TreeItem(unoAccessible));
+        }
+    }
+
+    protected void remove(XAccessible unoAccessible) {
+        if (unoAccessible != null) {
+            firePropertyChange(AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                new TreeItem(unoAccessible), null);
+        }
+    }
+
+    protected void add(Object any) {
+        try {
+            add((XAccessible) AnyConverter.toObject(AccessibleObjectFactory.XAccessibleType, any));
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+        }
+    }
+
+    protected void remove(Object any) {
+        try {
+            remove((XAccessible) AnyConverter.toObject(AccessibleObjectFactory.XAccessibleType, any));
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+        }
+    }
+
+    /**
+    * Update the proxy objects appropriatly on property change events
+    */
+    protected class AccessibleTreeListener extends AccessibleDescendantManagerListener {
+
+        protected AccessibleTreeListener() {
+            super();
+        }
+
+        /** Called by OpenOffice process to notify property changes */
+        public void notifyEvent(AccessibleEventObject event) {
+            switch (event.EventId) {
+                case AccessibleEventId.ACTIVE_DESCENDANT_CHANGED:
+                    setActiveDescendant(event.NewValue);
+                    break;
+                case AccessibleEventId.CHILD:
+                    if (AnyConverter.isObject(event.OldValue)) {
+                        remove(event.OldValue);
+                    }
+                    if (AnyConverter.isObject(event.NewValue)) {
+                        add(event.NewValue);
+                    }
+                    break;
+
+                case AccessibleEventId.LISTBOX_ENTRY_EXPANDED:
+                    firePropertyChange(AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                        AccessibleState.COLLAPSED, AccessibleState.EXPANDED);
+                    break;
+
+                case AccessibleEventId.LISTBOX_ENTRY_COLLAPSED:
+                    firePropertyChange(AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                        AccessibleState.EXPANDED, AccessibleState.COLLAPSED);
+                    break;
+
+                default:
+                    super.notifyEvent(event);
+            }
+        }
+    }
+
+    protected XAccessibleEventListener createEventListener() {
+        return new AccessibleTreeListener();
+    }
+
+    /** Creates the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext createAccessibleContext() {
+        return new AccessibleTree();
+    }
+
+    protected class AccessibleTree extends AccessibleDescendantManager implements javax.accessibility.AccessibleExtendedTable {
+
+        protected XAccessibleTable unoAccessibleTable;
+
+        public AccessibleTree() {
+            unoAccessibleTable = (XAccessibleTable) UnoRuntime.queryInterface(XAccessibleTable.class, unoAccessibleContext);
+        }
+
+        /*
+        * AccessibleContext
+        */
+
+        /** Gets the role of this object */
+        public javax.accessibility.AccessibleRole getAccessibleRole() {
+            return javax.accessibility.AccessibleRole.TREE;
+        }
+
+        /** Returns the AccessibleTable interface of this object */
+        public javax.accessibility.AccessibleTable getAccessibleTable() {
+            return ( unoAccessibleTable != null ) ? this : null;
+        }
+
+        /** Returns the specified Accessible child of the object */
+        public javax.accessibility.Accessible getAccessibleChild(int i) {
+            javax.accessibility.Accessible child = null;
+            try {
+                XAccessible xAccessible = unoAccessibleContext.getAccessibleChild(i);
+                if (xAccessible != null) {
+                    // Re-use the active descandant wrapper if possible
+                    javax.accessibility.Accessible activeDescendant = Tree.this.activeDescendant;
+                    if ((activeDescendant instanceof TreeItem) && xAccessible.equals(((TreeItem) activeDescendant).unoAccessible)) {
+                        child = activeDescendant;
+                    } else {
+                        child = new TreeItem(xAccessible);
+                    }
+                }
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+            return child;
+        }
+
+        /*
+         * AccessibleComponent
+         */
+
+        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */
+        public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
+            javax.accessibility.Accessible child = null;
+            try {
+                XAccessible xAccessible = unoAccessibleComponent.getAccessibleAtPoint(
+                    new com.sun.star.awt.Point(p.x, p.y));
+                if (xAccessible != null) {
+                    // Re-use the active descandant wrapper if possible
+                    javax.accessibility.Accessible activeDescendant = Tree.this.activeDescendant;
+                    if ((activeDescendant instanceof TreeItem) && xAccessible.equals(((TreeItem) activeDescendant).unoAccessible)) {
+                        child = activeDescendant;
+                    } else {
+                        child = new TreeItem(xAccessible);
+                    }
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+            return child;
+        }
+
+        /*
+         * AccessibleSelection
+         */
+
+        /** Returns an Accessible representing the specified selected child of the object */
+        public javax.accessibility.Accessible getAccessibleSelection(int i) {
+            javax.accessibility.Accessible child = null;
+            try {
+                XAccessible xAccessible = unoAccessibleContext.getAccessibleChild(i);
+                if (xAccessible != null) {
+                    // Re-use the active descandant wrapper if possible
+                    javax.accessibility.Accessible activeDescendant = Tree.this.activeDescendant;
+                    if ((activeDescendant instanceof TreeItem) && xAccessible.equals(((TreeItem) activeDescendant).unoAccessible)) {
+                        child = activeDescendant;
+                    } else {
+                        child = new TreeItem(xAccessible);
+                    }
+                }
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+            return child;
+        }
+
+         /*
+        * AccessibleTable
+        */
+
+        /** Returns the Accessible at a specified row and column in the table. */
+        public javax.accessibility.Accessible getAccessibleAt(int r, int c) {
+            javax.accessibility.Accessible child = null;
+            try {
+                XAccessible xAccessible = unoAccessibleTable.getAccessibleCellAt(r,c);
+                if (xAccessible != null) {
+                    // Re-use the active descandant wrapper if possible
+                    javax.accessibility.Accessible activeDescendant = Tree.this.activeDescendant;
+                    if ((activeDescendant instanceof TreeItem) && xAccessible.equals(((TreeItem) activeDescendant).unoAccessible)) {
+                        child = activeDescendant;
+                    } else {
+                        child = new TreeItem(xAccessible);
+                    }
+                }
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+            return child;
+        }
+
+        /** Returns the caption for the table. */
+        public javax.accessibility.Accessible getAccessibleCaption() {
+            // Not yet supported.
+            return null;
+        }
+
+        /** Returns the number of columns in the table. */
+        public int getAccessibleColumnCount() {
+             try {
+                return unoAccessibleTable.getAccessibleColumnCount();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return 0;
+            }
+       }
+
+        /** Returns the description text of the specified column in the table. */
+        public javax.accessibility.Accessible getAccessibleColumnDescription(int c) {
+            try {
+                return new javax.swing.JLabel(
+                    unoAccessibleTable.getAccessibleColumnDescription(c));
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return null;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /**
+         * Returns the number of columns occupied by the Accessible
+         * at a specified row and column in the table.
+         */
+        public int getAccessibleColumnExtentAt(int r, int c) {
+            try {
+                return unoAccessibleTable.getAccessibleColumnExtentAt(r,c);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return 0;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return 0;
+            }
+        }
+
+        /** Returns the column headers as an AccessibleTable. */
+        public javax.accessibility.AccessibleTable getAccessibleColumnHeader() {
+            // Not yet supported
+            return null;
+        }
+
+        /** Returns the number of rows in the table. */
+        public int getAccessibleRowCount() {
+             try {
+                return unoAccessibleTable.getAccessibleRowCount();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return 0;
+            }
+        }
+
+        /** Returns the description of the specified row in the table. */
+        public javax.accessibility.Accessible getAccessibleRowDescription(int r) {
+            try {
+                return new javax.swing.JLabel(
+                    unoAccessibleTable.getAccessibleRowDescription(r));
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return null;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /**
+         * Returns the number of rows occupied by the Accessible
+         * at a specified row and column in the table.
+         */
+        public int getAccessibleRowExtentAt(int r, int c) {
+            try {
+                return unoAccessibleTable.getAccessibleRowExtentAt(r,c);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return 0;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return 0;
+            }
+        }
+
+        /** Returns the row headers as an AccessibleTable. */
+        public javax.accessibility.AccessibleTable getAccessibleRowHeader() {
+            // Not yet supported
+            return null;
+        }
+
+        /** Returns the summary description of the table. */
+        public javax.accessibility.Accessible getAccessibleSummary() {
+            // Not yet supported.
+            return null;
+        }
+
+        /** Returns the selected columns in a table. */
+        public int[] getSelectedAccessibleColumns() {
+            try {
+                return unoAccessibleTable.getSelectedAccessibleColumns();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Returns the selected rows in a table. */
+        public int[] getSelectedAccessibleRows() {
+            try {
+                return unoAccessibleTable.getSelectedAccessibleRows();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Returns a boolean value indicating whether the specified column is selected. */
+        public boolean isAccessibleColumnSelected(int c) {
+            try {
+                return unoAccessibleTable.isAccessibleColumnSelected(c);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return false;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return false;
+            }
+        }
+
+        /** Returns a boolean value indicating whether the specified row is selected. */
+        public boolean isAccessibleRowSelected(int r) {
+            try {
+                return unoAccessibleTable.isAccessibleRowSelected(r);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return false;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return false;
+            }
+        }
+
+        /**
+         * Returns a boolean value indicating whether the accessible
+         * at a specified row and column is selected.
+         */
+        public boolean isAccessibleSelected(int r, int c) {
+            try {
+                return unoAccessibleTable.isAccessibleSelected(r,c);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return false;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return false;
+            }
+        }
+
+        /** Sets the caption for the table. */
+        public void setAccessibleCaption(javax.accessibility.Accessible accessible) {
+            // Not supported by the UNO Accessibility API
+        }
+
+        /** Sets the description text of the specified column in the table. */
+        public void setAccessibleColumnDescription(int param, javax.accessibility.Accessible accessible) {
+            // Not supported by the UNO Accessibility API
+        }
+
+        /** Sets the column headers. */
+        public void setAccessibleColumnHeader(javax.accessibility.AccessibleTable accessibleTable) {
+            // Not supported by the UNO Accessibility API
+        }
+
+        /** Sets the description text of the specified row of the table. */
+        public void setAccessibleRowDescription(int param, javax.accessibility.Accessible accessible) {
+            // Not supported by the UNO Accessibility API
+        }
+
+        /** Sets the row headers. */
+        public void setAccessibleRowHeader(javax.accessibility.AccessibleTable accessibleTable) {
+            // Not supported by the UNO Accessibility API
+        }
+
+        /** Sets the summary description of the table */
+        public void setAccessibleSummary(javax.accessibility.Accessible accessible) {
+            // Not supported by the UNO Accessibility API
+        }
+
+        /** Returns the column number of an index in the table */
+        public int getAccessibleColumn(int index) {
+            try {
+                return unoAccessibleTable.getAccessibleColumn(index);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return -1;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return -1;
+            }
+        }
+
+        /** Returns the index of a specified row and column in the table. */
+        public int getAccessibleIndex(int r, int c) {
+            try {
+                return unoAccessibleTable.getAccessibleIndex(r,c);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return -1;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return -1;
+            }
+        }
+
+        /** Returns the row number of an index in the table */
+        public int getAccessibleRow(int index) {
+            try {
+                return unoAccessibleTable.getAccessibleRow(index);
+            } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                return -1;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return -1;
+            }
+        }
+   }
+
+    class TreeItem extends java.awt.Component implements javax.accessibility.Accessible {
+
+        protected XAccessible unoAccessible;
+
+        public TreeItem(XAccessible xAccessible) {
+            unoAccessible = xAccessible;
+        }
+
+        public Object[] create(Object[] targetSet) {
+            try {
+                java.util.ArrayList list = new java.util.ArrayList(targetSet.length);
+                for (int i=0; i < targetSet.length; i++) {
+                    XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface(
+                        XAccessible.class, targetSet[i]);
+                    if (xAccessible != null) {
+                        list.add(new TreeItem(xAccessible));
+                    }
+                }
+                list.trimToSize();
+                return list.toArray();
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        javax.accessibility.AccessibleContext accessibleContext = null;
+
+        /** Returns the AccessibleContext associated with this object */
+        public javax.accessibility.AccessibleContext getAccessibleContext() {
+            if (accessibleContext == null) {
+                try {
+                    XAccessibleContext xAccessibleContext = unoAccessible.getAccessibleContext();
+                    if (xAccessibleContext != null) {
+                                            javax.accessibility.AccessibleContext ac = new AccessibleTreeItem(xAccessibleContext);
+                                            if (ac != null) {
+                                                ac.setAccessibleParent(Tree.this);
+                                                accessibleContext = ac;
+                                            }
+                    }
+                } catch (com.sun.star.uno.RuntimeException e) {
+                }
+            }
+            return accessibleContext;
+        }
+
+        protected class AccessibleTreeItem extends javax.accessibility.AccessibleContext
+            implements javax.accessibility.AccessibleSelection {
+
+            XAccessibleContext unoAccessibleContext;
+            XAccessibleSelection unoAccessibleSelection;
+
+            public AccessibleTreeItem(XAccessibleContext xAccessibleContext) {
+                unoAccessibleContext = xAccessibleContext;
+                unoAccessibleSelection = (XAccessibleSelection)
+                    UnoRuntime.queryInterface(XAccessibleSelection.class, xAccessibleContext);
+            }
+
+            /** Returns the accessible name of this object */
+            public String getAccessibleName() {
+                try {
+                    return unoAccessibleContext.getAccessibleName();
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Sets the accessible name of this object */
+            public void setAccessibleName(String name) {
+                // Not supported
+            }
+
+            /** Returns the accessible name of this object */
+            public String getAccessibleDescription() {
+                try {
+                    return unoAccessibleContext.getAccessibleDescription();
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Sets the accessible name of this object */
+            public void setAccessibleDescription(String name) {
+                // Not supported
+            }
+
+            /** Returns the accessible role of this object */
+            public javax.accessibility.AccessibleRole getAccessibleRole() {
+                try {
+                    javax.accessibility.AccessibleRole role = AccessibleRoleAdapter.getAccessibleRole(
+                        unoAccessibleContext.getAccessibleRole());
+                    return (role != null) ? role : javax.accessibility.AccessibleRole.LABEL;
+                } catch(com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Gets the locale of the component */
+            public java.util.Locale getLocale() throws java.awt.IllegalComponentStateException {
+                try {
+                    com.sun.star.lang.Locale unoLocale = unoAccessibleContext.getLocale();
+                    return new java.util.Locale(unoLocale.Language, unoLocale.Country);
+                } catch (IllegalAccessibleComponentStateException e) {
+                    throw new java.awt.IllegalComponentStateException(e.getMessage());
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return Tree.this.getLocale();
+                }
+            }
+
+            /** Gets the 0-based index of this object in its accessible parent */
+            public int getAccessibleIndexInParent() {
+                try {
+                    return unoAccessibleContext.getAccessibleIndexInParent();
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return -1;
+                }
+            }
+
+            /** Returns the number of accessible children of the object. */
+            public int getAccessibleChildrenCount() {
+                try {
+                    return unoAccessibleContext.getAccessibleChildCount();
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return 0;
+                }
+            }
+
+            /** Returns the specified Accessible child of the object. */
+            public javax.accessibility.Accessible getAccessibleChild(int i) {
+                javax.accessibility.Accessible child = null;
+                try {
+                    XAccessible xAccessible = unoAccessibleContext.getAccessibleChild(i);
+                    // Re-use the active descandant wrapper if possible
+                    javax.accessibility.Accessible activeDescendant = Tree.this.activeDescendant;
+                    if ((activeDescendant instanceof TreeItem) && ((TreeItem) activeDescendant).unoAccessible.equals(xAccessible)) {
+                        child = activeDescendant;
+                    } else if (xAccessible != null) {
+                        child = new TreeItem(xAccessible);
+                    }
+                } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                } catch (com.sun.star.uno.RuntimeException e) {
+                }
+                return child;
+            }
+
+            /** Returns the state set of this object */
+            public javax.accessibility.AccessibleStateSet getAccessibleStateSet() {
+                try {
+                    return AccessibleStateAdapter.getAccessibleStateSet(TreeItem.this,
+                        unoAccessibleContext.getAccessibleStateSet());
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return AccessibleStateAdapter.getDefunctStateSet();
+                }
+            }
+
+            /** Gets the AccessibleComponent associated with this object that has a graphical representation */
+            public javax.accessibility.AccessibleComponent getAccessibleComponent() {
+                try {
+                    XAccessibleComponent unoAccessibleComponent = (XAccessibleComponent)
+                        UnoRuntime.queryInterface(XAccessibleComponent.class, unoAccessibleContext);
+                    return (unoAccessibleComponent != null) ?
+                        new AccessibleComponentImpl(unoAccessibleComponent) : null;
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Returns the AccessibleSelection interface for this object */
+            public javax.accessibility.AccessibleSelection getAccessibleSelection() {
+                return (unoAccessibleSelection != null) ? this : null;
+            }
+
+            /** Gets the AccessibleAction associated with this object that has a graphical representation */
+            public javax.accessibility.AccessibleAction getAccessibleAction() {
+                try {
+                    XAccessibleAction unoAccessibleAction = (XAccessibleAction)
+                        UnoRuntime.queryInterface(XAccessibleAction.class, unoAccessibleContext);
+                    return (unoAccessibleAction != null) ?
+                        new AccessibleActionImpl(unoAccessibleAction) : null;
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Gets the AccessibleText associated with this object that has a graphical representation */
+            public javax.accessibility.AccessibleText getAccessibleText() {
+
+                if (disposed)
+                    return null;
+
+                try {
+                    XAccessibleText unoAccessibleText = (XAccessibleText)
+                        UnoRuntime.queryInterface(XAccessibleText.class, unoAccessibleContext);
+                    return (unoAccessibleText != null) ?
+                        new AccessibleTextImpl(unoAccessibleText) : null;
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Gets the AccessibleValue associated with this object that has a graphical representation */
+            public javax.accessibility.AccessibleValue getAccessibleValue() {
+                try {
+                    XAccessibleValue unoAccessibleValue = (XAccessibleValue)
+                        UnoRuntime.queryInterface(XAccessibleValue.class, unoAccessibleContext);
+                    return (unoAccessibleValue != null) ?
+                        new AccessibleValueImpl(unoAccessibleValue) : null;
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return null;
+                }
+            }
+
+            /** Gets the AccessibleText associated with this object presenting text on the display */
+            public javax.accessibility.AccessibleIcon[] getAccessibleIcon() {
+                try {
+                    XAccessibleImage unoAccessibleImage = (XAccessibleImage)
+                        UnoRuntime.queryInterface(XAccessibleImage.class, unoAccessibleContext);
+                    if (unoAccessibleImage != null) {
+                        javax.accessibility.AccessibleIcon[] icons = { new AccessibleIconImpl(unoAccessibleImage) };
+                        return icons;
+                    }
+                } catch (com.sun.star.uno.RuntimeException e) {
+                }
+                return null;
+            }
+
+            /*
+             * AccessibleSelection
+             */
+
+            /** Returns an Accessible representing the specified selected child of the object */
+            public javax.accessibility.Accessible getAccessibleSelection(int i) {
+                javax.accessibility.Accessible child = null;
+                try {
+                    XAccessible xAccessible = unoAccessibleContext.getAccessibleChild(i);
+                    if (xAccessible != null) {
+                        child = new TreeItem(xAccessible);
+                    }
+                } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                } catch (com.sun.star.uno.RuntimeException e) {
+                }
+                return child;
+            }
+
+            /** Adds the specified Accessible child of the object to the object's selection */
+            public void addAccessibleSelection(int i) {
+                try {
+                    unoAccessibleSelection.selectAccessibleChild(i);
+                } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                } catch (com.sun.star.uno.RuntimeException e) {
+                }
+            }
+
+            /** Clears the selection in the object, so that no children in the object are selected */
+            public void clearAccessibleSelection() {
+                try {
+                    unoAccessibleSelection.clearAccessibleSelection();
+                } catch (com.sun.star.uno.RuntimeException e) {
+                }
+            }
+
+            /** Returns the number of Accessible children currently selected */
+            public int getAccessibleSelectionCount() {
+                try {
+                    return unoAccessibleSelection.getSelectedAccessibleChildCount();
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return 0;
+                }
+            }
+
+            /** Determines if the current child of this object is selected */
+            public boolean isAccessibleChildSelected(int i) {
+                try {
+                    return unoAccessibleSelection.isAccessibleChildSelected(i);
+                } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                    return false;
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    return false;
+                }
+            }
+
+            /** Removes the specified child of the object from the object's selection */
+            public void removeAccessibleSelection(int i) {
+                try {
+                    unoAccessibleSelection.deselectAccessibleChild(i);
+                } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+                } catch (com.sun.star.uno.RuntimeException e) {
+                }
+            }
+
+            /** Causes every child of the object to be selected if the object supports multiple selection */
+            public void selectAllAccessibleSelection() {
+                try {
+                    unoAccessibleSelection.selectAllAccessibleChildren();
+                } catch (com.sun.star.uno.RuntimeException e) {
+                }
+            }
+        }
+    }
+}
+
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Window.java b/accessibility/bridge/org/openoffice/java/accessibility/Window.java
new file mode 100644
index 000000000000..ef44c3380a48
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Window.java
@@ -0,0 +1,551 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility;
+
+import com.sun.star.uno.*;
+import com.sun.star.accessibility.*;
+
+public class Window extends java.awt.Window implements javax.accessibility.Accessible, NativeFrame {
+    protected XAccessibleComponent unoAccessibleComponent;
+
+    boolean opened = false;
+    boolean visible = false;
+
+    java.awt.EventQueue eventQueue = null;
+
+    public Window(java.awt.Window owner, XAccessibleComponent xAccessibleComponent) {
+        super(owner);
+        initialize(xAccessibleComponent);
+    }
+
+    private void initialize(XAccessibleComponent xAccessibleComponent) {
+        unoAccessibleComponent = xAccessibleComponent;
+        eventQueue = java.awt.Toolkit.getDefaultToolkit().getSystemEventQueue();
+        XAccessibleEventBroadcaster broadcaster = (XAccessibleEventBroadcaster)
+            UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class,
+            unoAccessibleComponent);
+        if (broadcaster != null) {
+            broadcaster.addEventListener(new AccessibleWindowListener());
+        }
+    }
+
+    java.awt.Component initialComponent = null;
+
+    public java.awt.Component getInitialComponent() {
+        if (Build.DEBUG) {
+            System.err.println("returning initial component object of class: " + initialComponent.getClass().getName());
+        }
+        return initialComponent;
+    }
+
+    public void setInitialComponent(java.awt.Component c) {
+        initialComponent = c;
+    }
+
+    public Integer getHWND() {
+        return null;
+    }
+
+    /**
+    * Determines whether this <code>Component</code> is showing on screen.
+    * This means that the component must be visible, and it must be in a
+    * <code>container</code> that is visible and showing.
+    * @see       #addNotify
+    * @see       #removeNotify
+    * @since JDK1.0
+    */
+    public boolean isShowing() {
+        if (isVisible()) {
+            java.awt.Container parent = getParent();
+            return (parent == null) || parent.isShowing();
+        }
+        return false;
+    }
+
+    /**
+    * Makes this <code>Component</code> displayable by connecting it to a
+    * native screen resource.
+    * This method is called internally by the toolkit and should
+    * not be called directly by programs.
+    * @see       #isDisplayable
+    * @see       #removeNotify
+    * @since JDK1.0
+    */
+    public void addNotify() {
+//      createHierarchyEvents(0, null, null, 0, false);
+    }
+
+    /**
+    * Makes this <code>Component</code> undisplayable by destroying it native
+    * screen resource.
+    * This method is called by the toolkit internally and should
+    * not be called directly by programs.
+    * @see       #isDisplayable
+    * @see       #addNotify
+    * @since JDK1.0
+    */
+    public void removeNotify() {
+    }
+
+        /**
+         * Determines if the object is visible.  Note: this means that the
+         * object intends to be visible; however, it may not in fact be
+         * showing on the screen because one of the objects that this object
+         * is contained by is not visible.  To determine if an object is
+         * showing on the screen, use <code>isShowing</code>.
+         *
+         * @return true if object is visible; otherwise, false
+         */
+    public boolean isVisible(){
+        return visible;
+    }
+
+    /**
+    * Shows or hides this component depending on the value of parameter
+    * <code>b</code>.
+    * @param b  if <code>true</code>, shows this component;
+    * otherwise, hides this component
+    * @see #isVisible
+    * @since JDK1.1
+    */
+    public void setVisible(boolean b) {
+        if (visible != b){
+            visible = b;
+            if (b) {
+                // If it is the first show, fire WINDOW_OPENED event
+                if (!opened) {
+                    postWindowEvent(java.awt.event.WindowEvent.WINDOW_OPENED);
+                    opened = true;
+                }
+                postComponentEvent(java.awt.event.ComponentEvent.COMPONENT_SHOWN);
+            } else {
+                postComponentEvent(java.awt.event.ComponentEvent.COMPONENT_HIDDEN);
+            }
+        }
+    }
+
+    public void dispose() {
+        setVisible(false);
+        postWindowEvent(java.awt.event.WindowEvent.WINDOW_CLOSED);
+
+        // Transfer window focus back to the owner window if it is still the active frame
+        if ((getOwner() instanceof Frame && ((Frame) getOwner()).active) ||
+                (getOwner() instanceof Dialog && ((Dialog) getOwner()).active)) {
+            eventQueue.postEvent(new java.awt.event.WindowEvent(getOwner(),
+                java.awt.event.WindowEvent.WINDOW_GAINED_FOCUS));
+        }
+    }
+
+    protected void postWindowEvent(int i) {
+        eventQueue.postEvent(new java.awt.event.WindowEvent(this, i));
+    }
+
+    protected void postComponentEvent(int i) {
+        eventQueue.postEvent(new java.awt.event.ComponentEvent(this, i));
+    }
+
+    /**
+    * Update the proxy objects appropriatly on property change events
+    */
+    protected class AccessibleWindowListener implements XAccessibleEventListener {
+
+        protected AccessibleWindowListener() {
+        }
+
+        // The only expected state changes are ACTIVE and VISIBLE
+        protected void setComponentState(short state, boolean enable) {
+            switch (state) {
+                case AccessibleStateType.ICONIFIED:
+                    postWindowEvent(enable ?
+                        java.awt.event.WindowEvent.WINDOW_ICONIFIED :
+                        java.awt.event.WindowEvent.WINDOW_DEICONIFIED);
+                    break;
+                case AccessibleStateType.SHOWING:
+                case AccessibleStateType.VISIBLE:
+                    setVisible(enable);
+                    break;
+                default:
+                    if (Build.DEBUG) {
+//                      System.err.println("[frame]: " + getTitle() + "unexpected state change " + state);
+                    }
+                    break;
+            }
+        }
+
+        /** Updates the accessible name and fires the appropriate PropertyChangedEvent */
+        protected void handleNameChangedEvent(Object any) {
+            try {
+                // This causes the property change event to be fired in the VCL thread
+                // context. If this causes problems, it has to be deligated to the java
+                // dispatch thread ..
+                javax.accessibility.AccessibleContext ac = accessibleContext;
+                if (ac!= null) {
+                    ac.setAccessibleName(AnyConverter.toString(any));
+                }
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+            }
+        }
+
+        /** Updates the accessible description and fires the appropriate PropertyChangedEvent */
+        protected void handleDescriptionChangedEvent(Object any) {
+            try {
+                // This causes the property change event to be fired in the VCL thread
+                // context. If this causes problems, it has to be deligated to the java
+                // dispatch thread ..
+                if (accessibleContext != null) {
+                    accessibleContext.setAccessibleDescription(AnyConverter.toString(any));
+                }
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+            }
+        }
+
+        /** Updates the internal states and fires the appropriate PropertyChangedEvent */
+        protected void handleStateChangedEvent(Object any1, Object any2) {
+            try {
+                if (AnyConverter.isShort(any1)) {
+                    setComponentState(AnyConverter.toShort(any1), false);
+                }
+
+                if (AnyConverter.isShort(any2)) {
+                    setComponentState(AnyConverter.toShort(any2), true);
+                }
+            } catch (com.sun.star.lang.IllegalArgumentException e) {
+            }
+        }
+
+        /** Fires a visible data property change event */
+        protected void handleVisibleDataEvent() {
+            javax.accessibility.AccessibleContext ac = accessibleContext;
+            if (ac != null) {
+                ac.firePropertyChange(javax.accessibility.AccessibleContext.ACCESSIBLE_VISIBLE_DATA_PROPERTY, null, null);
+            }
+        }
+
+        /** Called by OpenOffice process to notify property changes */
+        public void notifyEvent(AccessibleEventObject event) {
+            switch (event.EventId) {
+                case AccessibleEventId.NAME_CHANGED:
+                    // Set the accessible name for the corresponding context, which will fire a property
+                    // change event itself
+                    handleNameChangedEvent(event.NewValue);
+                    break;
+                case AccessibleEventId.DESCRIPTION_CHANGED:
+                    // Set the accessible description for the corresponding context, which will fire a property
+                    // change event itself - so do not set propertyName !
+                    handleDescriptionChangedEvent(event.NewValue);
+                    break;
+                case AccessibleEventId.STATE_CHANGED:
+                    // Update the internal state set and fire the appropriate PropertyChangedEvent
+                    handleStateChangedEvent(event.OldValue, event.NewValue);
+                    break;
+                case AccessibleEventId.CHILD:
+                    if (AnyConverter.isObject(event.OldValue)) {
+                        AccessibleObjectFactory.removeChild(Window.this, event.OldValue);
+                    } else if (AnyConverter.isObject(event.NewValue)) {
+                        AccessibleObjectFactory.addChild(Window.this, event.NewValue);
+                    }
+                    break;
+                case AccessibleEventId.VISIBLE_DATA_CHANGED:
+                case AccessibleEventId.BOUNDRECT_CHANGED:
+                    handleVisibleDataEvent();
+                    break;
+                default:
+                    // Warn about unhandled events
+                    if(Build.DEBUG) {
+                        System.out.println(this + ": unhandled accessibility event id=" + event.EventId);
+                    }
+            }
+        }
+
+        /** Called by OpenOffice process to notify that the UNO component is disposing */
+        public void disposing(com.sun.star.lang.EventObject eventObject) {
+        }
+    }
+
+    protected javax.accessibility.AccessibleContext accessibleContext = null;
+
+    /** Returns the AccessibleContext associated with this object */
+    public javax.accessibility.AccessibleContext getAccessibleContext() {
+        if (accessibleContext == null) {
+            accessibleContext = new AccessibleWindow();
+//          accessibleContext.setAccessibleName(getTitle());
+        }
+        return accessibleContext;
+    }
+
+    protected class AccessibleWindow extends java.awt.Window.AccessibleAWTWindow {
+        protected AccessibleWindow() {
+            super();
+        }
+
+        protected java.awt.event.ComponentListener accessibleComponentHandler = null;
+
+        /**
+        * Fire PropertyChange listener, if one is registered,
+        * when shown/hidden..
+        */
+        protected class AccessibleComponentHandler implements java.awt.event.ComponentListener {
+            public void componentHidden(java.awt.event.ComponentEvent e)  {
+                AccessibleWindow.this.firePropertyChange(
+                    javax.accessibility.AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                    javax.accessibility.AccessibleState.VISIBLE, null);
+            }
+
+            public void componentShown(java.awt.event.ComponentEvent e)  {
+                AccessibleWindow.this.firePropertyChange(
+                    javax.accessibility.AccessibleContext.ACCESSIBLE_STATE_PROPERTY,
+                    null, javax.accessibility.AccessibleState.VISIBLE);
+            }
+
+            public void componentMoved(java.awt.event.ComponentEvent e)  {
+            }
+
+            public void componentResized(java.awt.event.ComponentEvent e)  {
+            }
+        } // inner class AccessibleComponentHandler
+
+        protected java.awt.event.ContainerListener accessibleContainerHandler = null;
+
+        /**
+        * Fire PropertyChange listener, if one is registered,
+        * when children added/removed.
+        */
+
+        protected class AccessibleContainerHandler implements java.awt.event.ContainerListener {
+            public void componentAdded(java.awt.event.ContainerEvent e) {
+                java.awt.Component c = e.getChild();
+                if (c != null && c instanceof javax.accessibility.Accessible) {
+                    AccessibleWindow.this.firePropertyChange(
+                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                        null, ((javax.accessibility.Accessible) c).getAccessibleContext());
+                }
+            }
+            public void componentRemoved(java.awt.event.ContainerEvent e) {
+                java.awt.Component c = e.getChild();
+                if (c != null && c instanceof javax.accessibility.Accessible) {
+                    AccessibleWindow.this.firePropertyChange(
+                        javax.accessibility.AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
+                        ((javax.accessibility.Accessible) c).getAccessibleContext(), null);
+                }
+            }
+        }
+
+        protected int propertyChangeListenerCount = 0;
+
+        /**
+        * Add a PropertyChangeListener to the listener list.
+        *
+        * @param listener  The PropertyChangeListener to be added
+        */
+        public void addPropertyChangeListener(java.beans.PropertyChangeListener listener) {
+            if (propertyChangeListenerCount++ == 0) {
+                accessibleContainerHandler = new AccessibleContainerHandler();
+                Window.this.addContainerListener(accessibleContainerHandler);
+
+                accessibleComponentHandler = new AccessibleComponentHandler();
+                Window.this.addComponentListener(accessibleComponentHandler);
+            }
+            super.addPropertyChangeListener(listener);
+        }
+
+        /**
+        * Remove a PropertyChangeListener from the listener list.
+        * This removes a PropertyChangeListener that was registered
+        * for all properties.
+        *
+        * @param listener  The PropertyChangeListener to be removed
+        */
+        public void removePropertyChangeListener(java.beans.PropertyChangeListener listener) {
+            if (--propertyChangeListenerCount == 0) {
+                Window.this.removeComponentListener(accessibleComponentHandler);
+                accessibleComponentHandler = null;
+
+                Window.this.removeContainerListener(accessibleContainerHandler);
+                accessibleContainerHandler = null;
+            }
+            super.removePropertyChangeListener(listener);
+        }
+
+        /*
+        * AccessibleComponent
+        */
+
+        /** Returns the background color of the object */
+        public java.awt.Color getBackground() {
+            try {
+                return new java.awt.Color(unoAccessibleComponent.getBackground());
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        public void setBackground(java.awt.Color c) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the foreground color of the object */
+        public java.awt.Color getForeground() {
+            try {
+                return new java.awt.Color(unoAccessibleComponent.getForeground());
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        public void setForeground(java.awt.Color c) {
+            // Not supported by UNO accessibility API
+        }
+
+        public java.awt.Cursor getCursor() {
+            // Not supported by UNO accessibility API
+            return null;
+        }
+
+        public void setCursor(java.awt.Cursor cursor) {
+            // Not supported by UNO accessibility API
+        }
+
+        public java.awt.Font getFont() {
+            // FIXME
+            return null;
+        }
+
+        public void setFont(java.awt.Font f) {
+            // Not supported by UNO accessibility API
+        }
+
+        public java.awt.FontMetrics getFontMetrics(java.awt.Font f) {
+            // FIXME
+            return null;
+        }
+
+        public boolean isEnabled() {
+            return Window.this.isEnabled();
+        }
+
+        public void setEnabled(boolean b) {
+            // Not supported by UNO accessibility API
+        }
+
+        public boolean isVisible() {
+            return Window.this.isVisible();
+        }
+
+        public void setVisible(boolean b) {
+            // Not supported by UNO accessibility API
+        }
+
+        public boolean isShowing() {
+            return Window.this.isShowing();
+        }
+
+        public boolean contains(java.awt.Point p) {
+            try {
+                return unoAccessibleComponent.containsPoint(new com.sun.star.awt.Point(p.x, p.y));
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return false;
+            }
+        }
+
+        /** Returns the location of the object on the screen. */
+        public java.awt.Point getLocationOnScreen() {
+            try {
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocationOnScreen();
+                return new java.awt.Point(unoPoint.X, unoPoint.Y);
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Gets the location of this component in the form of a point specifying the component's top-left corner */
+        public java.awt.Point getLocation() {
+            try {
+                com.sun.star.awt.Point unoPoint = unoAccessibleComponent.getLocationOnScreen();
+                return new java.awt.Point( unoPoint.X, unoPoint.Y );
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Moves this component to a new location */
+        public void setLocation(java.awt.Point p) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Gets the bounds of this component in the form of a Rectangle object */
+        public java.awt.Rectangle getBounds() {
+            try {
+                com.sun.star.awt.Rectangle unoRect = unoAccessibleComponent.getBounds();
+                return new java.awt.Rectangle(unoRect.X, unoRect.Y, unoRect.Width, unoRect.Height);
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Moves and resizes this component to conform to the new bounding rectangle r */
+        public void setBounds(java.awt.Rectangle r) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the size of this component in the form of a Dimension object */
+        public java.awt.Dimension getSize() {
+            try {
+                com.sun.star.awt.Size unoSize = unoAccessibleComponent.getSize();
+                return new java.awt.Dimension(unoSize.Width, unoSize.Height);
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        /** Resizes this component so that it has width d.width and height d.height */
+        public void setSize(java.awt.Dimension d) {
+            // Not supported by UNO accessibility API
+        }
+
+        /** Returns the Accessible child, if one exists, contained at the local coordinate Point */
+        public javax.accessibility.Accessible getAccessibleAt(java.awt.Point p) {
+            try {
+                java.awt.Component c = AccessibleObjectFactory.getAccessibleComponent(
+                    unoAccessibleComponent.getAccessibleAtPoint(new com.sun.star.awt.Point(p.x, p.y)));
+
+                return (javax.accessibility.Accessible) c;
+            } catch (com.sun.star.uno.RuntimeException e) {
+                return null;
+            }
+        }
+
+        public boolean isFocusTraversable() {
+            return Window.this.isFocusable();
+        }
+
+        public void requestFocus() {
+            unoAccessibleComponent.grabFocus();
+        }
+    }
+}
+
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java b/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java
new file mode 100644
index 000000000000..36bec1cab8fb
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleEventLog.java
@@ -0,0 +1,186 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility.logging;
+
+import com.sun.star.accessibility.*;
+import com.sun.star.uno.*;
+
+/**
+ *
+ */
+public class XAccessibleEventLog implements XAccessibleEventListener {
+
+    private static XAccessibleEventLog theEventListener = null;
+
+    private static java.util.Hashtable proxyList = new java.util.Hashtable();
+
+    /** Creates a new instance of UNOAccessibleEventListener */
+    public XAccessibleEventLog() {
+    }
+
+    private static XAccessibleEventListener get() {
+        if (theEventListener == null) {
+            theEventListener = new XAccessibleEventLog();
+        }
+        return theEventListener;
+    }
+
+    public static void addEventListener(XAccessibleContext xac, java.awt.Component c) {
+        XAccessibleEventBroadcaster broadcaster = (XAccessibleEventBroadcaster)
+            UnoRuntime.queryInterface(XAccessibleEventBroadcaster.class, xac);
+        if (broadcaster != null) {
+            broadcaster.addEventListener(XAccessibleEventLog.get());
+
+            // remember the proxy objects
+            synchronized (proxyList) {
+//                proxyList.put(UnoRuntime.generateOid(xac), new WeakReference(c));
+                proxyList.put(UnoRuntime.generateOid(xac), c);
+            }
+        }
+    }
+
+    public void disposing(com.sun.star.lang.EventObject eventObject) {
+    }
+
+    public void notifyEvent(com.sun.star.accessibility.AccessibleEventObject accessibleEventObject) {
+        switch (accessibleEventObject.EventId) {
+            case AccessibleEventId.ACTIVE_DESCENDANT_CHANGED:
+                logMessage(accessibleEventObject.Source, "Retrieved active descendant event.");
+                break;
+            case AccessibleEventId.STATE_CHANGED:
+                logStateChange(accessibleEventObject.Source,
+                    accessibleEventObject.OldValue,
+                    accessibleEventObject.NewValue);
+                break;
+            case AccessibleEventId.CHILD:
+                logMessage(accessibleEventObject.Source, "Retrieved children event.");
+                break;
+           case AccessibleEventId.BOUNDRECT_CHANGED:
+                logMessage(accessibleEventObject.Source, "Retrieved boundrect changed event.");
+                break;
+           case AccessibleEventId.VISIBLE_DATA_CHANGED:
+                logMessage(accessibleEventObject.Source, "Retrieved visible data changed event.");
+                break;
+           case AccessibleEventId.INVALIDATE_ALL_CHILDREN:
+                logMessage(accessibleEventObject.Source, "Retrieved invalidate children event.");
+                break;
+            default:
+                break;
+        }
+    }
+
+    public void logStateChange(Object o, Object any1, Object any2) {
+        try {
+            if (AnyConverter.isShort(any1)) {
+                logStateChange(o, AnyConverter.toShort(any1), " is no longer ");
+            }
+
+            if (AnyConverter.isShort(any2)) {
+                logStateChange(o, AnyConverter.toShort(any2), " is now ");
+            }
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+        }
+    }
+
+    public void logStateChange(Object o, short n, String s) {
+        switch(n) {
+            case AccessibleStateType.ACTIVE:
+                logMessage(o, s + javax.accessibility.AccessibleState.ACTIVE);
+                break;
+            case AccessibleStateType.ARMED:
+                logMessage(o, s + javax.accessibility.AccessibleState.ARMED);
+                break;
+            case AccessibleStateType.CHECKED:
+                logMessage(o, s + javax.accessibility.AccessibleState.CHECKED);
+                break;
+            case AccessibleStateType.ENABLED:
+                logMessage(o, s + javax.accessibility.AccessibleState.ENABLED);
+                break;
+            case AccessibleStateType.FOCUSED:
+                logMessage(o, s + javax.accessibility.AccessibleState.FOCUSED);
+                break;
+            case AccessibleStateType.PRESSED:
+                logMessage(o, s + javax.accessibility.AccessibleState.PRESSED);
+                break;
+            case AccessibleStateType.SELECTED:
+                logMessage(o, s + javax.accessibility.AccessibleState.SELECTED);
+                break;
+            case AccessibleStateType.SENSITIVE:
+                logMessage(o, s + "sensitive");
+                break;
+            case AccessibleStateType.SHOWING:
+                logMessage(o, s + javax.accessibility.AccessibleState.SHOWING);
+                break;
+            case AccessibleStateType.VISIBLE:
+                logMessage(o, s + javax.accessibility.AccessibleState.VISIBLE);
+                break;
+            default:
+                logMessage(o, s + "??? (FIXME)");
+                break;
+        }
+    }
+
+    protected static void logMessage(Object o, String s) {
+        XAccessibleContext xac = (XAccessibleContext) UnoRuntime.queryInterface(XAccessibleContext.class, o);
+        if( xac != null ) {
+            String oid = UnoRuntime.generateOid(xac);
+            synchronized (proxyList) {
+                  logMessage( (javax.accessibility.Accessible) proxyList.get( oid ), s );
+//                WeakReference r = (WeakReference) proxyList.get( oid );
+//                if(r != null) {
+//                    System.err.println( "*** Warning *** event is " + r.get() );
+//                    logMessage( (javax.accessibility.Accessible) r.get(), s );
+//                } else {
+//                    System.err.println( "*** Warning *** event source not found in broadcaster list" );
+//                }
+            }
+        } else
+            System.err.println( "*** Warning *** event source does not implement XAccessibleContext" );
+    }
+
+    protected static void logMessage(javax.accessibility.Accessible a, String s) {
+        if (a != null) {
+            logMessage(a.getAccessibleContext(), s);
+        } else {
+            logMessage(s);
+        }
+    }
+
+    protected static void logMessage(javax.accessibility.AccessibleContext ac, String s) {
+        if (ac != null) {
+            logMessage("[" + ac.getAccessibleRole() + "] "
+                + ac.getAccessibleName() + ": " + s);
+        } else {
+            logMessage(s);
+        }
+    }
+
+    protected static void logMessage(String s) {
+        System.err.println(s);
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleHypertextLog.java b/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleHypertextLog.java
new file mode 100644
index 000000000000..f14da6d8280b
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleHypertextLog.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.java.accessibility.logging;
+
+import com.sun.star.accessibility.*;
+import com.sun.star.uno.*;
+
+/** The AccessibleHypertextImpl mapps all calls to the java AccessibleHypertext
+ *  interface to the corresponding methods of the UNO XAccessibleHypertext
+ *  interface.
+ */
+public class XAccessibleHypertextLog extends XAccessibleTextLog
+    implements com.sun.star.accessibility.XAccessibleHypertext {
+
+    private com.sun.star.accessibility.XAccessibleHypertext unoObject;
+
+    /** Creates a new instance of XAccessibleTextLog */
+    public XAccessibleHypertextLog(XAccessibleHypertext xAccessibleHypertext) {
+        super(xAccessibleHypertext);
+        unoObject = xAccessibleHypertext;
+    }
+
+    public XAccessibleHyperlink getHyperLink(int param)
+            throws com.sun.star.lang.IndexOutOfBoundsException {
+        return unoObject.getHyperLink(param);
+    }
+
+    public int getHyperLinkCount() {
+        return unoObject.getHyperLinkCount();
+    }
+
+    public int getHyperLinkIndex(int param)
+            throws com.sun.star.lang.IndexOutOfBoundsException {
+        return unoObject.getHyperLinkIndex(param);
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleTextLog.java b/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleTextLog.java
new file mode 100644
index 000000000000..4b415ee60c74
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/logging/XAccessibleTextLog.java
@@ -0,0 +1,270 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+package org.openoffice.java.accessibility.logging;
+
+import org.openoffice.java.accessibility.*;
+
+
+/**
+ *
+ */
+public class XAccessibleTextLog
+    implements com.sun.star.accessibility.XAccessibleText {
+    private com.sun.star.accessibility.XAccessibleText unoObject;
+    private String name = "[Unknown] NoName";
+
+    /** Creates a new instance of XAccessibleTextLog */
+    public XAccessibleTextLog(
+        com.sun.star.accessibility.XAccessibleText xAccessibleText) {
+        unoObject = xAccessibleText;
+        setName(xAccessibleText);
+    }
+
+    private void setName(
+        com.sun.star.accessibility.XAccessibleText xAccessibleText) {
+        try {
+            com.sun.star.accessibility.XAccessibleContext unoAccessibleContext = (com.sun.star.accessibility.XAccessibleContext) com.sun.star.uno.UnoRuntime.queryInterface(com.sun.star.accessibility.XAccessibleContext.class,
+                    xAccessibleText);
+
+            if (unoAccessibleContext != null) {
+                name = "[" +
+                    AccessibleRoleAdapter.getAccessibleRole(unoAccessibleContext.getAccessibleRole()) +
+                    "] " + unoAccessibleContext.getAccessibleName() + ": ";
+            }
+        } catch (com.sun.star.uno.RuntimeException e) {
+        }
+    }
+
+    private String getPartString(short s) {
+        String part = "INVALID";
+
+        switch (s) {
+            case com.sun.star.accessibility.AccessibleTextType.CHARACTER:
+                part = "CHARACTER";
+
+                break;
+
+            case com.sun.star.accessibility.AccessibleTextType.WORD:
+                part = "WORD";
+
+                break;
+
+            case com.sun.star.accessibility.AccessibleTextType.SENTENCE:
+                part = "SENTENCE";
+
+                break;
+
+            case com.sun.star.accessibility.AccessibleTextType.LINE:
+                part = "LINE";
+
+                break;
+
+            case com.sun.star.accessibility.AccessibleTextType.ATTRIBUTE_RUN:
+                part = "ATTRIBUTE_RUN";
+
+                break;
+
+            default:
+                break;
+        }
+
+        return part;
+    }
+
+    private String dumpTextSegment(com.sun.star.accessibility.TextSegment ts) {
+        if (ts != null) {
+            return "(" + ts.SegmentStart + "," + ts.SegmentEnd + "," +
+            ts.SegmentText + ")";
+        }
+
+        return "NULL";
+    }
+
+    public boolean copyText(int param, int param1)
+        throws com.sun.star.lang.IndexOutOfBoundsException {
+        return unoObject.copyText(param, param1);
+    }
+
+    public int getCaretPosition() {
+        int pos = unoObject.getCaretPosition();
+        System.err.println(name + "getCaretPosition() returns " + pos);
+
+        return pos;
+    }
+
+    public char getCharacter(int param)
+        throws com.sun.star.lang.IndexOutOfBoundsException {
+        return unoObject.getCharacter(param);
+    }
+
+    public com.sun.star.beans.PropertyValue[] getCharacterAttributes(
+        int param, String[] str)
+        throws com.sun.star.lang.IndexOutOfBoundsException {
+        return unoObject.getCharacterAttributes(param, str);
+    }
+
+    public com.sun.star.awt.Rectangle getCharacterBounds(int param)
+        throws com.sun.star.lang.IndexOutOfBoundsException {
+        try {
+            com.sun.star.awt.Rectangle r = unoObject.getCharacterBounds(param);
+            System.err.println(name + "getCharacterBounds(" + param +
+                ") returns (" + r.X + "," + r.Y + "," + r.Width + "," +
+                r.Height + ")");
+
+            return r;
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            System.err.println("IndexOutOufBoundsException caught for " + name +
+                "getCharacterBounds(" + param + ")");
+            throw e;
+        }
+    }
+
+    public int getCharacterCount() {
+        return unoObject.getCharacterCount();
+    }
+
+    public int getIndexAtPoint(com.sun.star.awt.Point point) {
+        try {
+            int index = unoObject.getIndexAtPoint(point);
+            System.err.println(name + "getIndexAtPoint(" + point.X + ", " +
+                point.Y + ") returns " + index);
+
+            return index;
+        } catch (com.sun.star.uno.RuntimeException e) {
+            System.err.println(name +
+                "RuntimeException caught for getIndexAtPoint(" + point.X +
+                ", " + point.Y + ")");
+            System.err.println(e.getMessage());
+            throw e;
+        }
+    }
+
+    public String getSelectedText() {
+        return unoObject.getSelectedText();
+    }
+
+    public int getSelectionEnd() {
+        return unoObject.getSelectionEnd();
+    }
+
+    public int getSelectionStart() {
+        return unoObject.getSelectionStart();
+    }
+
+    public String getText() {
+        return unoObject.getText();
+    }
+
+    public com.sun.star.accessibility.TextSegment getTextAtIndex(int param,
+        short param1)
+        throws com.sun.star.lang.IndexOutOfBoundsException,
+            com.sun.star.lang.IllegalArgumentException {
+        try {
+            com.sun.star.accessibility.TextSegment ts = unoObject.getTextAtIndex(param,
+                    param1);
+            System.err.println(name + "getTextAtIndex(" +
+                getPartString(param1) + "," + param + ") returns " +
+                dumpTextSegment(ts));
+
+            return ts;
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            System.err.println("IndexOutOufBoundsException caught for " + name +
+                " getTextAtIndex(" + getPartString(param1) + "," + param1 +
+                ")");
+            throw e;
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+            System.err.println("IllegalArgumentException caught for " + name +
+                " getTextAtIndex(" + getPartString(param1) + "," + param + ")");
+            throw e;
+        }
+    }
+
+    public com.sun.star.accessibility.TextSegment getTextBeforeIndex(
+        int param, short param1)
+        throws com.sun.star.lang.IndexOutOfBoundsException,
+            com.sun.star.lang.IllegalArgumentException {
+        try {
+            com.sun.star.accessibility.TextSegment ts = unoObject.getTextBeforeIndex(param,
+                    param1);
+            System.err.println(name + " getTextBeforeIndex(" +
+                getPartString(param1) + "," + param + ") returns " +
+                dumpTextSegment(ts));
+
+            return ts;
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            System.err.println("IndexOutOufBoundsException caught for " + name +
+                " getTextBeforeIndex(" + getPartString(param1) + "," + param1 +
+                ")");
+            throw e;
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+            System.err.println("IllegalArgumentException caught for " + name +
+                " getTextBeforeIndex(" + getPartString(param1) + "," + param +
+                ")");
+            throw e;
+        }
+    }
+
+    public com.sun.star.accessibility.TextSegment getTextBehindIndex(
+        int param, short param1)
+        throws com.sun.star.lang.IndexOutOfBoundsException,
+            com.sun.star.lang.IllegalArgumentException {
+        try {
+            com.sun.star.accessibility.TextSegment ts = unoObject.getTextBehindIndex(param,
+                    param1);
+            System.err.println(name + " getTextBehindIndex(" +
+                getPartString(param1) + "," + param + ") returns " +
+                dumpTextSegment(ts));
+
+            return ts;
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            System.err.println("IndexOutOufBoundsException caught for " + name +
+                " getTextBehindIndex(" + getPartString(param1) + "," + param1 +
+                ")");
+            throw e;
+        } catch (com.sun.star.lang.IllegalArgumentException e) {
+            System.err.println("IllegalArgumentException caught for " + name +
+                " getTextBehindIndex(" + getPartString(param1) + "," + param +
+                ")");
+            throw e;
+        }
+    }
+
+    public String getTextRange(int param, int param1)
+        throws com.sun.star.lang.IndexOutOfBoundsException {
+        return unoObject.getTextRange(param, param1);
+    }
+
+    public boolean setCaretPosition(int param)
+        throws com.sun.star.lang.IndexOutOfBoundsException {
+        return unoObject.setCaretPosition(param);
+    }
+
+    public boolean setSelection(int param, int param1)
+        throws com.sun.star.lang.IndexOutOfBoundsException {
+        return unoObject.setSelection(param, param1);
+    }
+}
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
new file mode 100755
index 000000000000..0d98760a31df
--- /dev/null
+++ b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
@@ -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.
+#
+#*************************************************************************
+
+PRJNAME	= accessibility
+PRJ		= ..$/..$/..$/..$/..
+TARGET	= java_accessibility
+PACKAGE	= org$/openoffice$/java$/accessibility
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+JAVADIR = $(OUT)$/misc$/java
+JARFILES = jurt.jar unoil.jar ridl.jar
+JAVAFILES = \
+    logging$/XAccessibleEventLog.java \
+    logging$/XAccessibleHypertextLog.java \
+    logging$/XAccessibleTextLog.java \
+    AbstractButton.java \
+    AccessibleActionImpl.java \
+    AccessibleComponentImpl.java \
+    AccessibleEditableTextImpl.java \
+    AccessibleExtendedState.java \
+    AccessibleHypertextImpl.java \
+    AccessibleIconImpl.java \
+    AccessibleKeyBinding.java \
+    AccessibleObjectFactory.java \
+    AccessibleRoleAdapter.java \
+    AccessibleSelectionImpl.java \
+    AccessibleStateAdapter.java \
+    AccessibleTextImpl.java \
+    AccessibleValueImpl.java \
+    Alert.java \
+    Application.java \
+    Button.java \
+    CheckBox.java \
+    ComboBox.java \
+    Component.java \
+    Container.java \
+    DescendantManager.java \
+    Dialog.java \
+    FocusTraversalPolicy.java \
+    Frame.java \
+    Icon.java \
+    Label.java \
+    List.java \
+    Menu.java \
+    MenuItem.java \
+    MenuContainer.java \
+    NativeFrame.java \
+    Paragraph.java \
+    RadioButton.java \
+    ScrollBar.java \
+    Separator.java \
+    Table.java \
+    TextComponent.java \
+    ToggleButton.java \
+    ToolTip.java \
+    Tree.java \
+    Window.java
+
+JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java//).class) $(CLASSDIR)$/$(PACKAGE)$/Build.class
+
+JARTARGET               = $(TARGET).jar
+JARCOMPRESS             = TRUE
+JARCLASSDIRS            = $(PACKAGE)
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+# Enable logging in non-product only
+.IF "$(PRODUCT)"!=""
+DEBUGSWITCH = false
+PRODUCTSWITCH = true
+.ELSE
+PRODUCTSWITCH = false
+DEBUGSWITCH = true
+.ENDIF
+
+$(JAVADIR)$/$(PACKAGE)$/%.java: makefile.mk
+    @@-$(MKDIRHIER) $(JAVADIR)$/$(PACKAGE)
+    @-echo package org.openoffice.java.accessibility\; > $@
+    @-echo public class Build { >> $@
+    @-echo public static final boolean DEBUG = $(DEBUGSWITCH)\; >> $@
+    @-echo public static final boolean PRODUCT = $(PRODUCTSWITCH)\; >> $@
+    @-echo } >> $@
+
+$(CLASSDIR)$/$(PACKAGE)$/Build.class : $(JAVADIR)$/$(PACKAGE)$/Build.java
+    -$(JAVAC) -d $(CLASSDIR) $(JAVADIR)$/$(PACKAGE)$/Build.java
+
diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
new file mode 100644
index 000000000000..a281b3aa51a1
--- /dev/null
+++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+
+//------------------------------------------------------------------------
+// includes
+//------------------------------------------------------------------------
+
+#include <WindowsAccessBridgeAdapter.h>
+
+#include <tools/prewin.h>
+#include <wtypes.h>
+#include <tools/postwin.h>
+#include <rtl/process.h>
+#include <tools/link.hxx>
+
+#ifndef _SVAPP_HXX
+#include <vcl/svapp.hxx>
+#endif
+#include <vcl/window.hxx>
+#include <vcl/sysdata.hxx>
+#include <uno/current_context.hxx>
+#include <uno/environment.h>
+#include <uno/mapping.hxx>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+
+#ifndef _JVMACCESS_UNOVIRTUALMACHINE_HXX_
+#include "jvmaccess/unovirtualmachine.hxx"
+#endif
+
+#ifndef _JVMACCESS_VIRTUALMACHINE_HXX_
+#include "jvmaccess/virtualmachine.hxx"
+#endif
+
+#include <osl/diagnose.h>
+
+using ::rtl::OUString;
+using ::com::sun::star::uno::Mapping;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::RuntimeException;
+using namespace ::com::sun::star::accessibility;
+
+long VCLEventListenerLinkFunc(void * pInst, void * pData);
+
+//------------------------------------------------------------------------
+// global vatiables
+//------------------------------------------------------------------------
+
+Link g_aEventListenerLink(NULL, VCLEventListenerLinkFunc);
+
+rtl::Reference< jvmaccess::UnoVirtualMachine > g_xUnoVirtualMachine;
+typelib_InterfaceTypeDescription * g_pTypeDescription = NULL;
+Mapping g_unoMapping;
+
+jclass g_jcWindowsAccessBridgeAdapter = NULL;
+jmethodID g_jmRegisterTopWindow = 0;
+jmethodID g_jmRevokeTopWindow = 0;
+
+//------------------------------------------------------------------------
+// functions
+//------------------------------------------------------------------------
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *, void *)
+{
+    return JNI_VERSION_1_2;
+}
+
+JNIEXPORT jbyteArray JNICALL
+Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_getProcessID(JNIEnv *pJNIEnv, jclass clazz)
+{
+    // Initialize global class and method references
+    g_jcWindowsAccessBridgeAdapter =
+        static_cast< jclass > (pJNIEnv->NewGlobalRef(clazz));
+    if (NULL == g_jcWindowsAccessBridgeAdapter) {
+        return 0; /* jni error occured */
+    }
+    g_jmRegisterTopWindow =
+        pJNIEnv->GetStaticMethodID(clazz, "registerTopWindow", "(ILcom/sun/star/accessibility/XAccessible;)V");
+    if (0 == g_jmRegisterTopWindow) {
+        return 0; /* jni error occured */
+    }
+    g_jmRevokeTopWindow =
+        pJNIEnv->GetStaticMethodID(clazz, "revokeTopWindow", "(ILcom/sun/star/accessibility/XAccessible;)V");
+    if (0 == g_jmRevokeTopWindow) {
+        return 0; /* jni error occured */
+    }
+
+    // Use the special protocol of XJavaVM.getJavaVM:  If the passed in
+    // process ID has an extra 17th byte of value one, the returned any
+    // contains a pointer to a jvmaccess::UnoVirtualMachine, instead of
+    // the underlying JavaVM pointer:
+    jbyte processID[17];
+    rtl_getGlobalProcessId(reinterpret_cast<sal_uInt8 *> (processID));
+    // #i51265# we need a jvmaccess::UnoVirtualMachine pointer for the
+    // uno_getEnvironment() call later.
+    processID[16] = 1;
+
+    // Copy the result into a java byte[] and return.
+    jbyteArray jbaProcessID = pJNIEnv->NewByteArray(17);
+    pJNIEnv->SetByteArrayRegion(jbaProcessID, 0, 17, processID);
+    return jbaProcessID;
+}
+
+JNIEXPORT jboolean JNICALL
+Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_createMapping(JNIEnv *, jclass, jlong pointer)
+{
+    uno_Environment * pJava_environment = NULL;
+    uno_Environment * pUno_environment = NULL;
+
+    try {
+        // We get a non-refcounted pointer to a jvmaccess::VirtualMachine
+        // from the XJavaVM service (the pointer is guaranteed to be valid
+        // as long as our reference to the XJavaVM service lasts), and
+        // convert the non-refcounted pointer into a refcounted one
+        // immediately:
+        g_xUnoVirtualMachine = reinterpret_cast< jvmaccess::UnoVirtualMachine * >(pointer);
+
+        if ( g_xUnoVirtualMachine.is() )
+        {
+            OUString sJava(RTL_CONSTASCII_USTRINGPARAM("java"));
+            uno_getEnvironment(&pJava_environment, sJava.pData, g_xUnoVirtualMachine.get());
+
+            OUString sCppu_current_lb_name(RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME));
+            uno_getEnvironment(&pUno_environment, sCppu_current_lb_name.pData, NULL);
+
+            if ( pJava_environment && pUno_environment )
+            {
+                g_unoMapping = Mapping(pUno_environment, pJava_environment);
+                getCppuType((::com::sun::star::uno::Reference< XAccessible > *) 0).getDescription((typelib_TypeDescription **) & g_pTypeDescription);
+            }
+
+            if ( pJava_environment )
+            {
+                // release java environment
+                pJava_environment->release(pJava_environment);
+                pJava_environment = NULL;
+            }
+
+            if ( pUno_environment )
+            {
+                // release uno environment
+                pUno_environment->release(pUno_environment);
+                pUno_environment = NULL;
+            }
+        }
+    }
+
+    catch ( RuntimeException e)
+    {
+        OSL_TRACE("RuntimeException caught while initializing the mapping");
+    }
+
+    if ( (0 != g_jmRegisterTopWindow) && (0 != g_jmRevokeTopWindow) )
+    {
+        ::Application::AddEventListener(g_aEventListenerLink);
+    }
+    return JNI_TRUE;
+}
+
+JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *jvm, void *)
+{
+    ::Application::RemoveEventListener(g_aEventListenerLink);
+
+    if ( NULL != g_jcWindowsAccessBridgeAdapter )
+    {
+        JNIEnv * pJNIEnv;
+        if ( ! jvm->GetEnv((void **) &pJNIEnv, JNI_VERSION_1_2) )
+        {
+            pJNIEnv->DeleteGlobalRef(g_jcWindowsAccessBridgeAdapter);
+            g_jcWindowsAccessBridgeAdapter = NULL;
+        }
+    }
+
+    if ( NULL != g_pTypeDescription )
+    {
+        typelib_typedescription_release( reinterpret_cast< typelib_TypeDescription * > (g_pTypeDescription) );
+        g_pTypeDescription = NULL;
+    }
+
+    g_unoMapping.clear();
+    g_xUnoVirtualMachine.clear();
+}
+
+HWND GetHWND(Window * pWindow)
+{
+    const SystemEnvData * pEnvData = pWindow->GetSystemData();
+    if (pEnvData != NULL)
+    {
+        return pEnvData->hWnd;
+    }
+    return (HWND) -1;
+}
+
+void handleWindowEvent(Window * pWindow, bool bShow)
+{
+    if ( pWindow && pWindow->IsTopWindow() )
+    {
+        ::com::sun::star::uno::Reference< XAccessible > xAccessible;
+
+        // Test for combo box - drop down floating windows first
+        Window * pParentWindow = pWindow->GetParent();
+
+        if ( pParentWindow )
+        {
+            try
+            {
+                // The parent window of a combo box floating window should have the role COMBO_BOX
+                ::com::sun::star::uno::Reference< XAccessible > xParentAccessible(pParentWindow->GetAccessible());
+                if ( xParentAccessible.is() )
+                {
+                    ::com::sun::star::uno::Reference< XAccessibleContext > xParentAC(xParentAccessible->getAccessibleContext());
+                    if ( xParentAC.is() && (AccessibleRole::COMBO_BOX == xParentAC->getAccessibleRole()) )
+                    {
+                        // O.k. - this is a combo box floating window corresponding to the child of role LIST of the parent.
+                        // Let's not rely on a specific child order, just search for the child with the role LIST
+                        sal_Int32 nCount = xParentAC->getAccessibleChildCount();
+                        for ( sal_Int32 n = 0; (n < nCount) && !xAccessible.is(); n++)
+                        {
+                            ::com::sun::star::uno::Reference< XAccessible > xChild = xParentAC->getAccessibleChild(n);
+                            if ( xChild.is() )
+                            {
+                                ::com::sun::star::uno::Reference< XAccessibleContext > xChildAC = xChild->getAccessibleContext();
+                                if ( xChildAC.is() && (AccessibleRole::LIST == xChildAC->getAccessibleRole()) )
+                                {
+                                    xAccessible = xChild;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (::com::sun::star::uno::RuntimeException e)
+            {
+                // Ignore show events that throw DisposedExceptions in getAccessibleContext(),
+                // but keep revoking these windows in hide(s).
+                if (bShow)
+                    return;
+            }
+        }
+
+        // We have to rely on the fact that Window::GetAccessible()->getAccessibleContext() returns a valid XAccessibleContext
+        // also for other menus than menubar or toplevel popup window. Otherwise we had to traverse the hierarchy to find the
+        // context object to this menu floater. This makes the call to Window->IsMenuFloatingWindow() obsolete.
+        if ( ! xAccessible.is() )
+            xAccessible = pWindow->GetAccessible();
+
+        if ( xAccessible.is() && g_unoMapping.is() )
+        {
+            jobject * joXAccessible = reinterpret_cast < jobject * > (g_unoMapping.mapInterface(
+                xAccessible.get(), g_pTypeDescription));
+
+            if ( NULL != joXAccessible )
+            {
+                jvmaccess::VirtualMachine::AttachGuard aGuard(g_xUnoVirtualMachine->getVirtualMachine());
+                JNIEnv * pJNIEnv = aGuard.getEnvironment();
+
+                if ( NULL != pJNIEnv )
+                {
+                    // g_jmRegisterTopWindow and g_jmRevokeTopWindow are ensured to be != 0 - otherwise
+                    // the event listener would not have been attached.
+                    pJNIEnv->CallStaticVoidMethod(g_jcWindowsAccessBridgeAdapter,
+                        (bShow) ? g_jmRegisterTopWindow : g_jmRevokeTopWindow,
+                        (jint) GetHWND(pWindow), joXAccessible );
+
+                    // Clear any exception that might have been occured.
+                    if (pJNIEnv->ExceptionCheck()) {
+                        pJNIEnv->ExceptionClear();
+                    }
+                }
+            }
+        }
+    }
+}
+
+long VCLEventListenerLinkFunc(void *, void * pData)
+{
+    ::VclSimpleEvent const * pEvent = (::VclSimpleEvent const *) pData;
+
+    switch (pEvent->GetId())
+    {
+    case VCLEVENT_WINDOW_SHOW:
+        handleWindowEvent(((::VclWindowEvent const *) pEvent)->GetWindow(), true);
+        break;
+    case VCLEVENT_WINDOW_HIDE:
+        handleWindowEvent(((::VclWindowEvent const *) pEvent)->GetWindow(), false);
+        break;
+    }
+
+    return 0;
+}
diff --git a/accessibility/bridge/source/java/exports.dxp b/accessibility/bridge/source/java/exports.dxp
new file mode 100644
index 000000000000..c97dba7d0047
--- /dev/null
+++ b/accessibility/bridge/source/java/exports.dxp
@@ -0,0 +1,4 @@
+JNI_OnLoad
+JNI_OnUnload
+Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_getProcessID
+Java_org_openoffice_accessibility_WindowsAccessBridgeAdapter_createMapping
diff --git a/accessibility/bridge/source/java/makefile.mk b/accessibility/bridge/source/java/makefile.mk
new file mode 100644
index 000000000000..6bb380725ac0
--- /dev/null
+++ b/accessibility/bridge/source/java/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=accessibility
+TARGET=accessbridge
+LIBTARGET=NO
+USE_DEFFILE=TRUE
+ENABLE_EXCEPTIONS=TRUE
+VERSIONOBJ=
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+# --- Files --------------------------------------------------------
+
+.IF "$(GUI)"=="WNT"
+
+SLOFILES= $(SLO)$/WindowsAccessBridgeAdapter.obj
+
+SHL1TARGET=java_uno_accessbridge
+SHL1IMPLIB=i$(SHL1TARGET)
+SHL1STDLIBS=$(VCLLIB) $(TOOLSLIB) $(JVMACCESSLIB) $(CPPULIB) $(SALLIB)
+SHL1OBJS=$(SLOFILES) 
+SHL1VERSIONOBJ=
+
+DEF1NAME=$(SHL1TARGET)
+DEF1EXPORTFILE=exports.dxp
+
+SHL1HEADER=$(OUT)$/inc$/WindowsAccessBridgeAdapter.h
+
+.ENDIF			# "$(GUI)"=="WNT"
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :	target.mk
+
+.IF "$(GUI)"=="WNT"
+
+$(SLO)$/WindowsAccessBridgeAdapter.obj : $(SHL1HEADER)
+
+$(SHL1HEADER) :
+    javah -classpath $(OUT)$/class -o $(SHL1HEADER) org.openoffice.accessibility.WindowsAccessBridgeAdapter
+
+.ENDIF			# "$(GUI)"=="WNT"
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
new file mode 100644
index 000000000000..fd86653ca5ed
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
@@ -0,0 +1,311 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#ifndef ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOX_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOX_HXX
+
+#include <accessibility/extended/AccessibleBrowseBoxBase.hxx>
+#include <cppuhelper/weakref.hxx>
+#include <svtools/accessibletableprovider.hxx>
+
+
+#include <memory>
+
+// ============================================================================
+
+namespace accessibility {
+
+    class AccessibleBrowseBoxImpl;
+    class AccessibleBrowseBoxTable;
+
+// ============================================================================
+
+/** This class represents the complete accessible BrowseBox object. */
+class AccessibleBrowseBox : public AccessibleBrowseBoxBase
+{
+    friend class AccessibleBrowseBoxAccess;
+
+protected:
+    AccessibleBrowseBox(
+        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxCreator,
+        ::svt::IAccessibleTableProvider& _rBrowseBox
+    );
+
+    virtual ~AccessibleBrowseBox();
+
+    /** sets the XAccessible which created the context
+
+        <p>To be called only once, and only if in the ctor NULL was passed.</p>
+    */
+    void    setCreator(
+        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxCreator
+    );
+
+    /** Cleans up members. */
+    using AccessibleBrowseBoxBase::disposing;
+    virtual void SAL_CALL disposing();
+
+protected:
+    // XAccessibleContext -----------------------------------------------------
+
+    /** @return  The count of visible children. */
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The XAccessible interface of the specified child. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleChild( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The role of this object (a table). */
+//    virtual sal_Int16 SAL_CALL getAccessibleRole()
+//        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XAccessibleComponent ---------------------------------------------------
+
+    /** @return
+            The accessible child rendered under the given point.
+    */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** Grabs the focus to the BrowseBox. */
+    virtual void SAL_CALL grabFocus()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The key bindings associated with this object. */
+    virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XServiceInfo -----------------------------------------------------------
+
+    /** @return
+            The name of this class.
+    */
+    virtual ::rtl::OUString SAL_CALL getImplementationName()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+public:
+    // helper functions
+    /** commitHeaderBarEvent commit the event at all listeners of the column/row header bar
+        @param nEventId
+            the event id
+        @param rNewValue
+            the new value
+        @param rOldValue
+            the old value
+    */
+    void commitHeaderBarEvent(sal_Int16 nEventId,
+            const ::com::sun::star::uno::Any& rNewValue,
+            const ::com::sun::star::uno::Any& rOldValue,sal_Bool _bColumnHeaderBar = sal_True);
+
+    // helper functions
+    /** commitTableEvent commit the event at all listeners of the table
+        @param nEventId
+            the event id
+        @param rNewValue
+            the new value
+        @param rOldValue
+            the old value
+    */
+    void commitTableEvent(sal_Int16 nEventId,
+            const ::com::sun::star::uno::Any& rNewValue,
+            const ::com::sun::star::uno::Any& rOldValue);
+
+    /** returns the accessible object for the row or the column header bar
+    */
+    inline ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible >
+        getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType )
+        {
+            return implGetHeaderBar(_eObjType);
+        }
+
+    /** returns the accessible object for the table representation
+    */
+    inline ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible >
+        getTable( )
+        {
+            return implGetTable();
+        }
+
+protected:
+    // internal virtual methods -----------------------------------------------
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) relative to the parent window. */
+    virtual Rectangle implGetBoundingBox();
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) in screen coordinates. */
+    virtual Rectangle implGetBoundingBoxOnScreen();
+
+    // internal helper methods ------------------------------------------------
+
+    /** This method creates (once) and returns the accessible data table child.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The XAccessible interface of the data table. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > implGetTable();
+
+    /** This method creates (once) and returns the specified header bar.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The XAccessible interface of the header bar. */
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible >
+        implGetHeaderBar( ::svt::AccessibleBrowseBoxObjType eObjType );
+
+    /** This method returns one of the children that are always present:
+        Data table, row and column header bar or corner control.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The XAccessible interface of the specified child. */
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible >
+    implGetFixedChild( sal_Int32 nChildIndex );
+
+    /** This method creates and returns an accessible table.
+        @return  An AccessibleBrowseBoxTable. */
+    virtual AccessibleBrowseBoxTable*   createAccessibleTable();
+
+private:
+    // members ----------------------------------------------------------------
+    ::std::auto_ptr< AccessibleBrowseBoxImpl > m_pImpl;
+};
+
+// ============================================================================
+/** the XAccessible which creates/returns an AccessibleBrowseBox
+
+    <p>The instance holds it's XAccessibleContext with a hard reference, while
+    the contxt holds this instance weak.</p>
+*/
+typedef ::cppu::WeakImplHelper1 <   ::com::sun::star::accessibility::XAccessible
+                                >   AccessibleBrowseBoxAccess_Base;
+
+class AccessibleBrowseBoxAccess :public AccessibleBrowseBoxAccess_Base
+                                ,public ::svt::IAccessibleBrowseBox
+{
+private:
+    ::osl::Mutex                m_aMutex;
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+                                        m_xParent;
+    ::svt::IAccessibleTableProvider&    m_rBrowseBox;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+                                m_xContext;
+    AccessibleBrowseBox*        m_pContext;
+                                    // note that this pointer is valid as long as m_xContext is valid!
+
+public:
+    AccessibleBrowseBoxAccess(
+        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+        ::svt::IAccessibleTableProvider& _rBrowseBox
+    );
+
+    /// checks whether the accessible context is still alive
+    bool                            isContextAlive() const;
+
+    /// returns the AccessibleContext belonging to this Accessible
+    inline AccessibleBrowseBox*            getContext()         { return m_pContext; }
+    inline const AccessibleBrowseBox*      getContext() const   { return m_pContext; }
+
+protected:
+    virtual ~AccessibleBrowseBoxAccess();
+
+    // XAccessible
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+        SAL_CALL getAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException );
+
+    // IAccessibleBrowseBox
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        getMyself()
+    {
+        return this;
+    }
+    void dispose();
+    virtual sal_Bool isAlive() const
+    {
+        return isContextAlive();
+    }
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType )
+    {
+        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccessible;
+        AccessibleBrowseBox* pContext( getContext() );
+        if ( pContext )
+            xAccessible = pContext->getHeaderBar( _eObjType );
+        return xAccessible;
+    }
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        getTable()
+    {
+        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccessible;
+        AccessibleBrowseBox* pContext( getContext() );
+        if ( pContext )
+            xAccessible = pContext->getTable();
+        return xAccessible;
+    }
+    virtual void commitHeaderBarEvent( sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue,
+        const ::com::sun::star::uno::Any& rOldValue, sal_Bool _bColumnHeaderBar )
+    {
+        AccessibleBrowseBox* pContext( getContext() );
+        if ( pContext )
+            pContext->commitHeaderBarEvent( nEventId, rNewValue, rOldValue, _bColumnHeaderBar );
+    }
+    virtual void commitTableEvent( sal_Int16 nEventId,
+        const ::com::sun::star::uno::Any& rNewValue, const ::com::sun::star::uno::Any& rOldValue )
+    {
+        AccessibleBrowseBox* pContext( getContext() );
+        if ( pContext )
+            pContext->commitTableEvent( nEventId, rNewValue, rOldValue );
+    }
+    virtual void commitEvent( sal_Int16 nEventId,
+        const ::com::sun::star::uno::Any& rNewValue, const ::com::sun::star::uno::Any& rOldValue )
+    {
+        AccessibleBrowseBox* pContext( getContext() );
+        if ( pContext )
+            pContext->commitEvent( nEventId, rNewValue, rOldValue );
+    }
+
+private:
+    AccessibleBrowseBoxAccess();                                                // never implemented
+    AccessibleBrowseBoxAccess( const AccessibleBrowseBoxAccess& );              // never implemented
+    AccessibleBrowseBoxAccess& operator=( const AccessibleBrowseBoxAccess& );   // never implemented
+};
+
+// ============================================================================
+} // namespace accessibility
+
+// ============================================================================
+
+#endif
+
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
new file mode 100644
index 000000000000..dc43e500dadd
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
@@ -0,0 +1,527 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#ifndef ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXBASE_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXBASE_HXX
+
+#include <svtools/AccessibleBrowseBoxObjType.hxx>
+#include <tools/debug.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/gen.hxx>
+#include <vcl/svapp.hxx>
+#include <cppuhelper/compbase5.hxx>
+#include <comphelper/broadcasthelper.hxx>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <toolkit/helper/convert.hxx>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/awt/XFocusListener.hpp>
+#include <comphelper/accessibleeventnotifier.hxx>
+#include <comphelper/uno3.hxx>
+
+// ============================================================================
+
+class Window;
+
+namespace utl {
+    class AccessibleStateSetHelper;
+}
+
+namespace svt {
+    class IAccessibleTableProvider;
+}
+
+// ============================================================================
+
+namespace accessibility {
+
+// ============================================================================
+
+/** Aquire the solar mutex. */
+class BBSolarGuard : public ::vos::OGuard
+{
+public:
+    inline BBSolarGuard() : ::vos::OGuard( Application::GetSolarMutex() ) {}
+};
+
+// ============================================================================
+
+typedef ::cppu::WeakAggComponentImplHelper5<
+            ::com::sun::star::accessibility::XAccessibleContext,
+            ::com::sun::star::accessibility::XAccessibleComponent,
+            ::com::sun::star::accessibility::XAccessibleEventBroadcaster,
+        ::com::sun::star::awt::XFocusListener,
+            ::com::sun::star::lang::XServiceInfo >
+        AccessibleBrowseBoxImplHelper;
+
+/** The BrowseBox accessible objects inherit from this base class. It
+    implements basic functionality for various Accessibility interfaces and
+    the event broadcaster and contains the ::osl::Mutex. */
+class AccessibleBrowseBoxBase :
+    public ::comphelper::OBaseMutex,
+    public AccessibleBrowseBoxImplHelper
+{
+public:
+    /** Constructor sets specified name and description. If the constant of a
+        text is BBTEXT_NONE, the derived class has to set the text via
+        implSetName() and implSetDescription() (in Ctor) or later via
+        setAccessibleName() and setAccessibleDescription() (these methods
+        notify the listeners about the change).
+        @param rxParent  XAccessible interface of the parent object.
+        @param rBrowseBox  The BrowseBox control.
+        @param eNameText  The constant for the name text.
+        @param eDescrText  The constant for the description text. */
+    AccessibleBrowseBoxBase(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessible >& rxParent,
+        ::svt::IAccessibleTableProvider&                  rBrowseBox,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+        ::svt::AccessibleBrowseBoxObjType  eObjType );
+
+    /** Constructor sets specified name and description.
+        @param rxParent  XAccessible interface of the parent object.
+        @param rBrowseBox  The BrowseBox control.
+        @param rName  The name of this object.
+        @param rDescription  The description text of this object. */
+    AccessibleBrowseBoxBase(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessible >& rxParent,
+        ::svt::IAccessibleTableProvider&                  rBrowseBox,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+        ::svt::AccessibleBrowseBoxObjType  eObjType,
+        const ::rtl::OUString&      rName,
+        const ::rtl::OUString&      rDescription );
+
+protected:
+    virtual ~AccessibleBrowseBoxBase();
+
+    /** Commits DeFunc event to listeners and cleans up members. */
+    virtual void SAL_CALL disposing();
+
+public:
+    // XAccessibleContext -----------------------------------------------------
+
+    /** @return  A reference to the parent accessible object. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleParent()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The index of this object among the parent's children. */
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return
+            The description of this object.
+    */
+    virtual ::rtl::OUString SAL_CALL getAccessibleDescription()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return
+            The name of this object.
+    */
+    virtual ::rtl::OUString SAL_CALL getAccessibleName()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return
+            The relation set (the BrowseBox does not have one).
+    */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL
+    getAccessibleRelationSet()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The set of current states. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL
+    getAccessibleStateSet()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The parent's locale. */
+    virtual ::com::sun::star::lang::Locale SAL_CALL getLocale()
+        throw ( ::com::sun::star::accessibility::IllegalAccessibleComponentStateException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return
+            The role of this object. Panel, ROWHEADER, COLUMNHEADER, TABLE, TABLE_CELL are supported.
+    */
+    virtual sal_Int16 SAL_CALL getAccessibleRole()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /*  Derived classes have to implement:
+        -   getAccessibleChildCount,
+        -   getAccessibleChild,
+        -   getAccessibleRole.
+        Derived classes may overwrite getAccessibleIndexInParent to increase
+        performance. */
+
+    // XAccessibleComponent ---------------------------------------------------
+
+    /** @return
+        <TRUE/>, if the point lies within the bounding box of this object. */
+    virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& rPoint )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The bounding box of this object. */
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return
+        The upper left corner of the bounding box relative to the parent. */
+    virtual ::com::sun::star::awt::Point SAL_CALL getLocation()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return
+        The upper left corner of the bounding box in screen coordinates. */
+    virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The size of the bounding box. */
+    virtual ::com::sun::star::awt::Size SAL_CALL getSize()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the object is showing. */
+    virtual sal_Bool SAL_CALL isShowing()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the object is visible. */
+    virtual sal_Bool SAL_CALL isVisible()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the object can accept the focus. */
+    virtual sal_Bool SAL_CALL isFocusTraversable()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    virtual sal_Int32 SAL_CALL getForeground(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XFocusListener
+    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+    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);
+
+    /*  Derived classes have to implement:
+        -   getAccessibleAt,
+        -   grabFocus,
+        -   getAccessibleKeyBinding. */
+
+    /** @return
+        No key bindings supported by default.
+    */
+    virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
+        throw ( ::com::sun::star::uno::RuntimeException );
+    /** @return
+            The accessible child rendered under the given point.
+    */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XAccessibleEventBroadcaster --------------------------------------------
+
+    /** Adds a new event listener */
+    using cppu::WeakAggComponentImplHelperBase::addEventListener;
+    virtual void SAL_CALL addEventListener(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::accessibility::XAccessibleEventListener>& rxListener )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** Removes an event listener. */
+    using cppu::WeakAggComponentImplHelperBase::removeEventListener;
+    virtual void SAL_CALL removeEventListener(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::accessibility::XAccessibleEventListener>& rxListener )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XTypeProvider ----------------------------------------------------------
+
+    /** @return  An unique implementation ID. */
+    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XServiceInfo -----------------------------------------------------------
+
+    /** @return  Whether the specified service is supported by this class. */
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  A list of all supported services. */
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    getSupportedServiceNames()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /*  Derived classes have to implement:
+        -   getImplementationName. */
+
+    // helper methods ---------------------------------------------------------
+
+    /** @return  The BrowseBox object type. */
+    inline ::svt::AccessibleBrowseBoxObjType getType() const;
+
+    /** Changes the name of the object and notifies listeners. */
+    void setAccessibleName( const ::rtl::OUString& rName );
+    /** Changes the description of the object and notifies listeners. */
+    void setAccessibleDescription( const ::rtl::OUString& rDescription );
+
+    /** Commits an event to all listeners. */
+    void commitEvent(
+            sal_Int16 nEventId,
+            const ::com::sun::star::uno::Any& rNewValue,
+
+    const ::com::sun::star::uno::Any& rOldValue );
+    /** @return  <TRUE/>, if the object is not disposed or disposing. */
+    sal_Bool isAlive() const;
+
+protected:
+    // internal virtual methods -----------------------------------------------
+
+    /** Determines whether the BrowseBox control is really showing inside of
+        its parent accessible window. Derived classes may implement different
+        behaviour.
+        @attention  This method requires locked mutex's and a living object.
+        @return  <TRUE/>, if the object is really showing. */
+    virtual sal_Bool implIsShowing();
+
+    /** Derived classes return the bounding box relative to the parent window.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) relative to the parent window. */
+    virtual Rectangle implGetBoundingBox() = 0;
+    /** Derived classes return the bounding box in screen coordinates.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) in screen coordinates. */
+    virtual Rectangle implGetBoundingBoxOnScreen() = 0;
+
+    /** Creates a new AccessibleStateSetHelper and fills it with states of the
+        current object. This method calls FillStateSet at the BrowseBox which
+        fills it with more states depending on the object type. Derived classes
+        may overwrite this method and add more states.
+        @attention  This method requires locked mutex's.
+        @return  A filled AccessibleStateSetHelper. */
+    virtual ::utl::AccessibleStateSetHelper* implCreateStateSetHelper();
+
+    // internal helper methods ------------------------------------------------
+
+    /** @throws <type>DisposedException</type>  If the object is not alive. */
+    void ensureIsAlive() const
+        throw ( ::com::sun::star::lang::DisposedException );
+
+    /** @return  The ::osl::Mutex member provided by the class OBaseMutex. */
+    inline ::osl::Mutex& getOslMutex();
+    /** @return  Pointer to the global ::osl::Mutex. */
+    static inline ::osl::Mutex* getOslGlobalMutex();
+
+    /** Changes the name of the object (flat assignment, no notify).
+        @attention  This method requires a locked mutex. */
+    inline void implSetName( const ::rtl::OUString& rName );
+    /** Changes the description of the object (flat assignment, no notify).
+        @attention  This method requires a locked mutex. */
+    inline void implSetDescription( const ::rtl::OUString& rDescription );
+
+    /** Locks all mutex's and calculates the bounding box relative to the
+        parent window.
+        @return  The bounding box (VCL rect.) relative to the parent object. */
+    Rectangle getBoundingBox()
+        throw ( ::com::sun::star::lang::DisposedException );
+    /** Locks all mutex's and calculates the bounding box in screen
+        coordinates.
+        @return  The bounding box (VCL rect.) in screen coordinates. */
+    Rectangle getBoundingBoxOnScreen()
+        throw ( ::com::sun::star::lang::DisposedException );
+
+    /** Creates a new UUID, if rId is empty.
+        @attention  This method requires locked global mutex to prevent double
+                    creation of an UUID. */
+    static void implCreateUuid( ::com::sun::star::uno::Sequence< sal_Int8 >& rId );
+
+    ::comphelper::AccessibleEventNotifier::TClientId getClientId() const { return m_aClientId; }
+    void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; }
+
+public:
+    // public versions of internal helper methods, with access control
+    struct AccessControl { friend class SolarMethodGuard; private: AccessControl() { } };
+
+    inline ::osl::Mutex&    getMutex( const AccessControl& ) { return getOslMutex(); }
+    inline void             ensureIsAlive( const AccessControl& ) { ensureIsAlive(); }
+
+protected:
+    // members ----------------------------------------------------------------
+
+    /** The parent accessible object. */
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > mxParent;
+    /** The VCL BrowseBox control. */
+    ::svt::IAccessibleTableProvider* mpBrowseBox;
+
+    /** This is the window which get all the nice focus events
+    */
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xFocusWindow;
+
+private:
+    /** Localized name. */
+    ::rtl::OUString maName;
+    /** Localized description text. */
+    ::rtl::OUString maDescription;
+
+    /** The type of this object (for names, descriptions, state sets, ...). */
+    ::svt::AccessibleBrowseBoxObjType meObjType;
+
+    ::comphelper::AccessibleEventNotifier::TClientId    m_aClientId;
+};
+
+// ============================================================================
+// a version of AccessibleBrowseBoxBase which implements not only the XAccessibleContext,
+// but also the XAccessible
+
+typedef ::cppu::ImplHelper1 <   ::com::sun::star::accessibility::XAccessible
+                            >   BrowseBoxAccessibleElement_Base;
+
+class BrowseBoxAccessibleElement
+            :public AccessibleBrowseBoxBase
+            ,public BrowseBoxAccessibleElement_Base
+{
+protected:
+    /** Constructor sets specified name and description. If the constant of a
+        text is BBTEXT_NONE, the derived class has to set the text via
+        implSetName() and implSetDescription() (in Ctor) or later via
+        setAccessibleName() and setAccessibleDescription() (these methods
+        notify the listeners about the change).
+
+        @param rxParent  XAccessible interface of the parent object.
+        @param rBrowseBox  The BrowseBox control.
+        @param eNameText  The constant for the name text.
+        @param eDescrText  The constant for the description text.
+    */
+    BrowseBoxAccessibleElement(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessible >& rxParent,
+        ::svt::IAccessibleTableProvider&                  rBrowseBox,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+        ::svt::AccessibleBrowseBoxObjType  eObjType );
+
+    /** Constructor sets specified name and description.
+
+        @param rxParent  XAccessible interface of the parent object.
+        @param rBrowseBox  The BrowseBox control.
+        @param rName  The name of this object.
+        @param rDescription  The description text of this object.
+    */
+    BrowseBoxAccessibleElement(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessible >& rxParent,
+        ::svt::IAccessibleTableProvider&                  rBrowseBox,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+        ::svt::AccessibleBrowseBoxObjType  eObjType,
+        const ::rtl::OUString&      rName,
+        const ::rtl::OUString&      rDescription );
+
+public:
+    // XInterface
+    DECLARE_XINTERFACE( )
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER( )
+
+protected:
+    virtual ~BrowseBoxAccessibleElement();
+
+protected:
+    // XAccessible ------------------------------------------------------------
+
+    /** @return  The XAccessibleContext interface of this object. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL
+    getAccessibleContext()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+private:
+    BrowseBoxAccessibleElement();                                               // never implemented
+    BrowseBoxAccessibleElement( const BrowseBoxAccessibleElement& );            // never implemented
+    BrowseBoxAccessibleElement& operator=( const BrowseBoxAccessibleElement& ); // never implemented
+};
+
+// ============================================================================
+// a helper class for protecting methods which need to lock the solar mutex in addition to the own mutex
+
+typedef ::osl::MutexGuard OslMutexGuard;
+
+class SolarMethodGuard : public BBSolarGuard, public OslMutexGuard
+{
+public:
+    inline SolarMethodGuard( AccessibleBrowseBoxBase& _rOwner, bool _bEnsureAlive = true )
+        :BBSolarGuard( )
+        ,OslMutexGuard( _rOwner.getMutex( AccessibleBrowseBoxBase::AccessControl() ) )
+    {
+        if ( _bEnsureAlive )
+            _rOwner.ensureIsAlive( AccessibleBrowseBoxBase::AccessControl() );
+    }
+};
+
+// inlines --------------------------------------------------------------------
+
+inline ::svt::AccessibleBrowseBoxObjType AccessibleBrowseBoxBase::getType() const
+{
+    return meObjType;
+}
+
+inline ::osl::Mutex& AccessibleBrowseBoxBase::getOslMutex()
+{
+    return m_aMutex;
+}
+
+inline ::osl::Mutex* AccessibleBrowseBoxBase::getOslGlobalMutex()
+{
+    return ::osl::Mutex::getGlobalMutex();
+}
+
+inline void AccessibleBrowseBoxBase::implSetName(
+        const ::rtl::OUString& rName )
+{
+    maName = rName;
+}
+
+inline void AccessibleBrowseBoxBase::implSetDescription(
+        const ::rtl::OUString& rDescription )
+{
+    maDescription = rDescription;
+}
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
+#endif
+
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
new file mode 100644
index 000000000000..1ade2b6289f5
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.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 ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXCHECKBOXCELL_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXCHECKBOXCELL_HXX
+
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#ifndef ACCESSIBILITY_EXT_BROWSE_BOX_CELL_HXX
+#include "accessibility/extended/accessiblebrowseboxcell.hxx"
+#endif
+#include <cppuhelper/implbase2.hxx>
+#include <tools/wintypes.hxx>
+// ============================================================================
+namespace accessibility
+{
+// ============================================================================
+    typedef ::cppu::ImplHelper2 <   ::com::sun::star::accessibility::XAccessible,
+                                    ::com::sun::star::accessibility::XAccessibleValue
+                                >   AccessibleCheckBoxCell_BASE;
+
+    class AccessibleCheckBoxCell :   public AccessibleBrowseBoxCell
+                                    ,public AccessibleCheckBoxCell_BASE
+    {
+    private:
+        TriState m_eState;
+        sal_Bool m_bEnabled;
+        sal_Bool m_bIsTriState;
+
+    protected:
+        virtual ~AccessibleCheckBoxCell() {}
+
+        virtual ::utl::AccessibleStateSetHelper* implCreateStateSetHelper();
+
+    public:
+        AccessibleCheckBoxCell(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+                                ::svt::IAccessibleTableProvider& _rBrowseBox,
+                                const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+                                sal_Int32 _nRowPos,
+                                sal_uInt16 _nColPos,
+                                const TriState& _eState,
+                                sal_Bool _bEnabled,
+                                sal_Bool _bIsTriState = sal_True);
+
+        // XInterface
+        DECLARE_XINTERFACE( )
+        // XTypeProvider
+        DECLARE_XTYPEPROVIDER( )
+
+        // XAccessible
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException );
+        virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException);
+
+
+        // XAccessibleValue
+        virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // internal
+        void        SetChecked( sal_Bool _bChecked );
+    };
+}
+#endif // ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXCHECKBOXCELL_HXX
+
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx
new file mode 100644
index 000000000000..ac0b2761eb1f
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.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 ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXHEADERBAR_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXHEADERBAR_HXX
+
+#include "accessibility/extended/AccessibleBrowseBoxTableBase.hxx"
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+
+// ============================================================================
+
+namespace accessibility {
+
+// ============================================================================
+
+typedef ::cppu::ImplHelper1<
+            ::com::sun::star::accessibility::XAccessibleSelection >
+        AccessibleBrowseBoxHeaderBarImplHelper;
+
+/** This class represents the accessible object of a header bar of a BrowseBox
+    control (row or column header bar). This object supports the
+    XAccessibleSelection interface. Selecting a child of this object selects
+    complete rows or columns of the data table. */
+class AccessibleBrowseBoxHeaderBar :
+    public AccessibleBrowseBoxTableBase,
+    public AccessibleBrowseBoxHeaderBarImplHelper
+{
+public:
+    /** @param eObjType  One of the two allowed types BBTYPE_ROWHEADERBAR or
+                         BBTYPE_COLUMNHEADERBAR. */
+    AccessibleBrowseBoxHeaderBar(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessible >& rxParent,
+        ::svt::IAccessibleTableProvider&                  rBrowseBox,
+        ::svt::AccessibleBrowseBoxObjType  eObjType );
+
+protected:
+    virtual ~AccessibleBrowseBoxHeaderBar();
+
+public:
+    // XAccessibleContext -----------------------------------------------------
+
+    /** @return
+        The XAccessible interface of the specified child.
+    */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleChild( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The index of this object among the parent's children. */
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XAccessibleComponent ---------------------------------------------------
+
+    /** @return  The accessible child rendered under the given point. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** Grabs the focus to (the current cell of) the data table. */
+    virtual void SAL_CALL grabFocus()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The key bindings associated with this object. */
+    virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XAccessibleTable -------------------------------------------------------
+
+    /** @return  The description text of the specified row. */
+    virtual ::rtl::OUString SAL_CALL
+    getAccessibleRowDescription( sal_Int32 nRow )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The description text of the specified column. */
+    virtual ::rtl::OUString SAL_CALL
+    getAccessibleColumnDescription( sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The XAccessibleTable interface of the row header bar. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL
+    getAccessibleRowHeaders()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The XAccessibleTable interface of the column header bar. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL
+    getAccessibleColumnHeaders()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  An index list of completely selected rows. */
+    virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
+    getSelectedAccessibleRows()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  An index list of completely selected columns. */
+    virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
+    getSelectedAccessibleColumns()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the specified row is completely selected. */
+    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the specified column is completely selected. */
+    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return The XAccessible interface of the cell object at the specified
+                cell position. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the specified cell is selected. */
+    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    // XAccessibleSelection ---------------------------------------------------
+
+    /** Selects the specified child (row or column of the table). */
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the specified child (row/column) is selected. */
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** Clears the complete selection. */
+    virtual void SAL_CALL clearAccessibleSelection()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** Selects all children or first, if multiselection is not supported. */
+    virtual void SAL_CALL selectAllAccessibleChildren()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The number of selected rows/columns. */
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The specified selected row/column. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** Removes the specified row/column from the selection. */
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    // XInterface -------------------------------------------------------------
+
+    /** Queries for a new interface. */
+    ::com::sun::star::uno::Any SAL_CALL queryInterface(
+            const ::com::sun::star::uno::Type& rType )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** Aquires the object (calls acquire() on base class). */
+    virtual void SAL_CALL acquire() throw ();
+
+    /** Releases the object (calls release() on base class). */
+    virtual void SAL_CALL release() throw ();
+
+    // XServiceInfo -----------------------------------------------------------
+
+    /** @return  The name of this class. */
+    virtual ::rtl::OUString SAL_CALL getImplementationName()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  An unique implementation ID. */
+    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+protected:
+    // internal virtual methods -----------------------------------------------
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) relative to the parent window. */
+    virtual Rectangle implGetBoundingBox();
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) in screen coordinates. */
+    virtual Rectangle implGetBoundingBoxOnScreen();
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The count of used rows. */
+    virtual sal_Int32 implGetRowCount() const;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The count of used columns. */
+    virtual sal_Int32 implGetColumnCount() const;
+
+    // internal helper methods ------------------------------------------------
+
+    /** @return  <TRUE/>, if the objects is a header bar for rows. */
+    inline sal_Bool isRowBar() const;
+    /** @return  <TRUE/>, if the objects is a header bar for columns. */
+    inline sal_Bool isColumnBar() const;
+
+    /** Returns the specified row or column. Uses one of the parameters,
+        depending on object type.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The XAccessible interface of the specified column/row. */
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible >
+    implGetChild( sal_Int32 nRow, sal_uInt16 nColumnPos );
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The absolute child index from the index of selected children.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified index is invalid. */
+    sal_Int32 implGetChildIndexFromSelectedIndex( sal_Int32 nSelectedChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified row/column index (depending on type) is invalid. */
+    void ensureIsValidHeaderIndex( sal_Int32 nIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
+};
+
+// inlines --------------------------------------------------------------------
+
+inline sal_Bool AccessibleBrowseBoxHeaderBar::isRowBar() const
+{
+    return getType() == ::svt::BBTYPE_ROWHEADERBAR;
+}
+
+inline sal_Bool AccessibleBrowseBoxHeaderBar::isColumnBar() const
+{
+    return getType() == ::svt::BBTYPE_COLUMNHEADERBAR;
+}
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
+#endif
+
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx
new file mode 100644
index 000000000000..68d4405ff25b
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.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 ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXHEADERCELL_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXHEADERCELL_HXX
+
+#include "accessibility/extended/AccessibleBrowseBoxBase.hxx"
+
+namespace accessibility
+{
+    class AccessibleBrowseBoxHeaderCell : public BrowseBoxAccessibleElement
+    {
+        sal_Int32   m_nColumnRowId;
+    public:
+        AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnRowId,
+                                          const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
+                                          ::svt::IAccessibleTableProvider&                  _rBrowseBox,
+                                          const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+                                          ::svt::AccessibleBrowseBoxObjType  _eObjType);
+        /** @return  The count of visible children. */
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw ( ::com::sun::star::uno::RuntimeException );
+
+        /** @return  The XAccessible interface of the specified child. */
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
+            getAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException,::com::sun::star::uno::RuntimeException );
+
+        /** @return  The index of this object among the parent's children. */
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw ( ::com::sun::star::uno::RuntimeException );
+
+        /** Grabs the focus to the BrowseBox. */
+        virtual void SAL_CALL grabFocus() throw ( ::com::sun::star::uno::RuntimeException );
+
+        inline sal_Bool isRowBarCell() const
+        {
+            return getType() == ::svt::BBTYPE_ROWHEADERCELL;
+        }
+
+        /** @return
+                The name of this class.
+        */
+        virtual ::rtl::OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException );
+
+        /** Creates a new AccessibleStateSetHelper and fills it with states of the
+            current object.
+            @return
+                A filled AccessibleStateSetHelper.
+        */
+        ::utl::AccessibleStateSetHelper* implCreateStateSetHelper();
+
+    protected:
+        virtual Rectangle implGetBoundingBox();
+
+        virtual Rectangle implGetBoundingBoxOnScreen();
+    };
+}
+
+#endif // ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXHEADERCELL_HXX
+
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx
new file mode 100644
index 000000000000..afb345487239
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.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 ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXTABLE_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXTABLE_HXX
+
+#include "accessibility/extended/AccessibleBrowseBoxTableBase.hxx"
+
+// ============================================================================
+
+namespace accessibility {
+
+// ============================================================================
+
+/** This class represents the accessible object of the data table of a
+    BrowseBox control. */
+class AccessibleBrowseBoxTable : public AccessibleBrowseBoxTableBase
+{
+    friend class AccessibleBrowseBox;   // to create header bars
+
+public:
+    AccessibleBrowseBoxTable(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessible >& rxParent,
+        ::svt::IAccessibleTableProvider& rBrowseBox );
+
+protected:
+    virtual ~AccessibleBrowseBoxTable();
+
+public:
+    // XAccessibleContext -----------------------------------------------------
+
+    /** @return  The XAccessible interface of the specified child. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleChild( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The index of this object among the parent's children. */
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XAccessibleComponent ---------------------------------------------------
+
+    /** @return  The accessible child rendered under the given point. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** Grabs the focus to (the current cell of) the data table. */
+    virtual void SAL_CALL grabFocus()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The key bindings associated with this object. */
+    virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XAccessibleTable -------------------------------------------------------
+
+    /** @return  The description text of the specified row. */
+    virtual ::rtl::OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The description text of the specified column. */
+    virtual ::rtl::OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The XAccessibleTable interface of the row header bar. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL
+    getAccessibleRowHeaders()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The XAccessibleTable interface of the column header bar. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL
+    getAccessibleColumnHeaders()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  An index list of completely selected rows. */
+    virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
+    getSelectedAccessibleRows()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  An index list of completely selected columns. */
+    virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
+    getSelectedAccessibleColumns()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the specified row is completely selected. */
+    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the specified column is completely selected. */
+    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return The XAccessible interface of the cell object at the specified
+                cell position. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the specified cell is selected. */
+    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    // XServiceInfo -----------------------------------------------------------
+
+    /** @return  The name of this class. */
+    virtual ::rtl::OUString SAL_CALL getImplementationName()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+protected:
+    // internal virtual methods -----------------------------------------------
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) relative to the parent window. */
+    virtual Rectangle implGetBoundingBox();
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) in screen coordinates. */
+    virtual Rectangle implGetBoundingBoxOnScreen();
+
+    // internal helper methods ------------------------------------------------
+
+    /** @attention  This method requires a locked mutex.
+        @return  The XAccessibleTable interface of the specified header bar. */
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleTable >
+    implGetHeaderBar( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::uno::RuntimeException );
+};
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
+#endif
+
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
new file mode 100644
index 000000000000..fa6ce94cfc7f
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
@@ -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.
+ *
+ ************************************************************************/
+
+
+#ifndef ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXTABLEBASE_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXTABLEBASE_HXX
+
+#include "accessibility/extended/AccessibleBrowseBoxBase.hxx"
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/accessibility/XAccessibleTable.hpp>
+
+// ============================================================================
+
+namespace accessibility {
+
+typedef ::cppu::ImplHelper1<
+            ::com::sun::star::accessibility::XAccessibleTable >
+        AccessibleBrowseBoxTableImplHelper;
+
+/** The BrowseBox accessible table objects inherit from this base class. It
+    implements basic functionality for the XAccessibleTable interface.
+    BrowseBox table objects are: the data table, the column header bar and the
+    row header bar. */
+class AccessibleBrowseBoxTableBase :
+    public BrowseBoxAccessibleElement,
+    public AccessibleBrowseBoxTableImplHelper
+{
+public:
+    /** Constructor sets specified name and description. If the constant of a
+        text is BBTEXT_NONE, the derived class has to set the text via
+        implSetName() and implSetDescription() (in Ctor) or later via
+        setAccessibleName() and setAccessibleDescription() (these methods
+        notify the listeners about the change).
+        @param rxParent  XAccessible interface of the parent object.
+        @param rBrowseBox  The BrowseBox control.
+        @param eNameText  The constant for the name text.
+        @param eDescrText  The constant for the description text. */
+    AccessibleBrowseBoxTableBase(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessible >& rxParent,
+        ::svt::IAccessibleTableProvider&                  rBrowseBox,
+        ::svt::AccessibleBrowseBoxObjType  eObjType );
+
+protected:
+    virtual ~AccessibleBrowseBoxTableBase();
+
+public:
+    // XAccessibleContext -----------------------------------------------------
+
+    /** @return  The count of visible children. */
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The role of this object (a table). */
+    virtual sal_Int16 SAL_CALL getAccessibleRole()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /*  Derived classes have to implement:
+        -   getAccessibleChild,
+        -   getAccessibleIndexInParent. */
+
+    // XAccessibleComponent ---------------------------------------------------
+
+    /*  Derived classes have to implement:
+        -   getAccessibleAt,
+        -   grabFocus,
+        -   getAccessibleKeyBinding. */
+
+    // XAccessibleTable -------------------------------------------------------
+
+    /** @return  The number of used rows in the table (0 = empty table). */
+    virtual sal_Int32 SAL_CALL getAccessibleRowCount()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The number of used columns in the table (0 = empty table). */
+    virtual sal_Int32 SAL_CALL getAccessibleColumnCount()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The row extent of the specified cell (always 1). */
+    virtual sal_Int32 SAL_CALL
+    getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The column extent of the specified cell (always 1). */
+    virtual sal_Int32 SAL_CALL
+    getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The caption cell of the table (not supported). */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleCaption()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The summary object of the table (not supported). */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleSummary()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The child index of the specified cell. */
+    virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The row index of the specified child cell. */
+    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The column index of the specified child cell. */
+    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /*  Derived classes have to implement:
+        -   getAccessibleRowDescription,
+        -   getAccessibleColumnDescription,
+        -   getAccessibleRowHeaders,
+        -   getAccessibleColumnHeaders,
+        -   getSelectedAccessibleRows,
+        -   getSelectedAccessibleColumns,
+        -   isAccessibleRowSelected,
+        -   isAccessibleColumnSelected,
+        -   getAccessibleCellAt,
+        -   isAccessibleSelected. */
+
+    // XInterface -------------------------------------------------------------
+
+    /** Queries for a new interface. */
+    ::com::sun::star::uno::Any SAL_CALL queryInterface(
+            const ::com::sun::star::uno::Type& rType )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** Aquires the object (calls acquire() on base class). */
+    virtual void SAL_CALL acquire() throw ();
+
+    /** Releases the object (calls release() on base class). */
+    virtual void SAL_CALL release() throw ();
+
+    // XTypeProvider ----------------------------------------------------------
+
+    /** @return  A sequence of possible types (received from base classes). */
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  An unique implementation ID. */
+    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XServiceInfo -----------------------------------------------------------
+
+    /*  Derived classes have to implement:
+        -   getImplementationName */
+
+protected:
+    // internal virtual methods -----------------------------------------------
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The count of data rows without header bar. */
+    virtual sal_Int32 implGetRowCount() const;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The count of data columns without "handle column". */
+    virtual sal_Int32 implGetColumnCount() const;
+
+    // internal helper methods ------------------------------------------------
+
+    /** @return  <TRUE/>, if first BrowseBox column is the "handle column". */
+    sal_Bool implHasHandleColumn() const;
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @param nColumn
+            the position of the column in the Accessible world
+        @return
+            the position of the column in VCL the Accessible world
+    */
+    sal_uInt16 implToVCLColumnPos( sal_Int32 nColumn ) const;
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The number of cells of the table. */
+    sal_Int32 implGetChildCount() const;
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The row index of the specified cell index. */
+    sal_Int32 implGetRow( sal_Int32 nChildIndex ) const;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The column index of the specified cell index. */
+    sal_Int32 implGetColumn( sal_Int32 nChildIndex ) const;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The child index of the specified cell address. */
+    sal_Int32 implGetChildIndex( sal_Int32 nRow, sal_Int32 nColumn ) const;
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  <TRUE/>, if the specified row is selected. */
+    sal_Bool implIsRowSelected( sal_Int32 nRow ) const;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  <TRUE/>, if the specified column is selected. */
+    sal_Bool implIsColumnSelected( sal_Int32 nColumn ) const;
+
+    /** Selects/deselects a row (tries to expand selection).
+        @attention  This method requires locked mutex's and a living object.
+        @param bSelect  <TRUE/> = select, <FALSE/> = deselect */
+    void implSelectRow( sal_Int32 nRow, sal_Bool bSelect );
+    /** Selects/deselects a column (tries to expand selection).
+        @attention  This method requires locked mutex's and a living object.
+        @param bSelect  <TRUE/> = select, <FALSE/> = deselect */
+    void implSelectColumn( sal_Int32 nColumnPos, sal_Bool bSelect );
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The count of selected rows. */
+    sal_Int32 implGetSelectedRowCount() const;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The count of selected columns. */
+    sal_Int32 implGetSelectedColumnCount() const;
+
+    /** Fills a sequence with sorted indexes of completely selected rows.
+        @attention  This method requires locked mutex's and a living object.
+        @param rSeq  Out-parameter that takes the sorted row index list. */
+    void implGetSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& rSeq );
+    /** Fills a sequence with sorted indexes of completely selected columns.
+        @attention  This method requires locked mutex's and a living object.
+        @param rSeq  Out-parameter that takes the sorted column index list. */
+    void implGetSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& rSeq );
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified row index is invalid. */
+    void ensureIsValidRow( sal_Int32 nRow )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
+    /** @attention  This method requires locked mutex's and a living object.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified column index is invalid. */
+    void ensureIsValidColumn( sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
+    /** @attention  This method requires locked mutex's and a living object.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified cell address is invalid. */
+    void ensureIsValidAddress( sal_Int32 nRow, sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
+    /** @attention  This method requires locked mutex's and a living object.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified child index is invalid. */
+    void ensureIsValidIndex( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
+};
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
+#endif
+
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx
new file mode 100644
index 000000000000..ec12e40dc179
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.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 ACCESSIBILITY_EXT_ACCESSIBILEBROWSEBOXTABLECELL_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBILEBROWSEBOXTABLECELL_HXX
+
+#include "accessibility/extended/accessiblebrowseboxcell.hxx"
+#include <comphelper/accessibletexthelper.hxx>
+#include <cppuhelper/implbase2.hxx>
+
+namespace accessibility
+{
+    typedef ::cppu::ImplHelper2 <   ::com::sun::star::accessibility::XAccessibleText
+                                ,   ::com::sun::star::accessibility::XAccessible
+                                >   AccessibleTextHelper_BASE;
+
+    // implementation of a table cell of BrowseBox
+    class AccessibleBrowseBoxTableCell  :public AccessibleBrowseBoxCell
+                                        ,public AccessibleTextHelper_BASE
+                                        ,public ::comphelper::OCommonAccessibleText
+    {
+    private:
+        sal_Int32   m_nOffset;
+
+    protected:
+        // OCommonAccessibleText
+        virtual ::rtl::OUString                 implGetText();
+        virtual ::com::sun::star::lang::Locale  implGetLocale();
+        virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+
+    public:
+        AccessibleBrowseBoxTableCell( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+                                    ::svt::IAccessibleTableProvider& _rBrowseBox,
+                                    const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+                                    sal_Int32 _nRowId,
+                                    sal_uInt16 _nColId,
+                                    sal_Int32 _nOffset );
+
+        void    nameChanged( const ::rtl::OUString& rNewName, const ::rtl::OUString& rOldName );
+
+        // XInterface -------------------------------------------------------------
+
+        /** Queries for a new interface. */
+        ::com::sun::star::uno::Any SAL_CALL queryInterface(
+                const ::com::sun::star::uno::Type& rType )
+            throw ( ::com::sun::star::uno::RuntimeException );
+
+        /** Aquires the object (calls acquire() on base class). */
+        virtual void SAL_CALL acquire() throw ();
+
+        /** Releases the object (calls release() on base class). */
+        virtual void SAL_CALL release() throw ();
+
+        // XEventListener
+        using AccessibleBrowseBoxBase::disposing;
+        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
+            throw(::com::sun::star::uno::RuntimeException);
+
+        /** @return  The index of this object among the parent's children. */
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
+            throw ( ::com::sun::star::uno::RuntimeException );
+
+        /** @return
+                The name of this class.
+        */
+        virtual ::rtl::OUString SAL_CALL getImplementationName()
+            throw ( ::com::sun::star::uno::RuntimeException );
+
+        /** @return
+                The count of visible children.
+        */
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount()
+            throw ( ::com::sun::star::uno::RuntimeException );
+
+        /** @return
+                The XAccessible interface of the specified child.
+        */
+        virtual ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessible > SAL_CALL
+            getAccessibleChild( sal_Int32 nChildIndex )
+                throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                        ::com::sun::star::uno::RuntimeException );
+
+        /** Creates a new AccessibleStateSetHelper and fills it with states of the
+            current object.
+            @return
+                A filled AccessibleStateSetHelper.
+        */
+        ::utl::AccessibleStateSetHelper* implCreateStateSetHelper();
+
+        // XAccessible ------------------------------------------------------------
+
+        /** @return  The XAccessibleContext interface of this object. */
+        virtual ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL
+        getAccessibleContext()
+            throw ( ::com::sun::star::uno::RuntimeException );
+
+        // XAccessibleText
+        virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    };
+}
+#endif // ACCESSIBILITY_EXT_ACCESSIBILEBROWSEBOXTABLECELL_HXX
+
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
new file mode 100755
index 000000000000..cb2c4f6628c8
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -0,0 +1,265 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#ifndef ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROL_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROL_HXX
+
+#include <accessibility/extended/AccessibleGridControlBase.hxx>
+#include <accessibility/extended/AccessibleGridControlTable.hxx>
+#include <cppuhelper/weakref.hxx>
+#include <svtools/accessibletable.hxx>
+
+
+#include <memory>
+
+using namespace ::svt::table;
+
+// ============================================================================
+
+namespace accessibility {
+
+    class AccessibleGridControl_Impl;
+
+// ============================================================================
+
+/** This class represents the complete accessible Grid Control object. */
+class AccessibleGridControl : public AccessibleGridControlBase
+{
+    friend class AccessibleGridControlAccess;
+
+protected:
+    AccessibleGridControl(
+        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxCreator,
+    ::svt::table::IAccessibleTable& _rTable
+    );
+
+    virtual ~AccessibleGridControl();
+
+    /** Cleans up members. */
+    using AccessibleGridControlBase::disposing;
+    virtual void SAL_CALL disposing();
+
+protected:
+    // XAccessibleContext -----------------------------------------------------
+
+    /** @return  The count of visible children. */
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The XAccessible interface of the specified child. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleChild( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The role of this object (a table). */
+    virtual sal_Int16 SAL_CALL getAccessibleRole()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XAccessibleComponent ---------------------------------------------------
+
+    /** @return
+            The accessible child rendered under the given point.
+    */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** Grabs the focus to the Grid Control. */
+    virtual void SAL_CALL grabFocus()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The key bindings associated with this object. */
+    virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XServiceInfo -----------------------------------------------------------
+
+    /** @return
+            The name of this class.
+    */
+    virtual ::rtl::OUString SAL_CALL getImplementationName()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+public:
+    // helper functions
+    /** returns the accessible object for the row or the column header bar
+    */
+    inline ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible >
+        getHeaderBar( ::svt::table::AccessibleTableControlObjType _eObjType )
+        {
+            return implGetHeaderBar(_eObjType);
+        }
+
+    /** returns the accessible object for the table representation
+    */
+    inline ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible >
+        getTable( )
+        {
+            return implGetTable();
+        }
+
+protected:
+    // internal virtual methods -----------------------------------------------
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) relative to the parent window. */
+    virtual Rectangle implGetBoundingBox();
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) in screen coordinates. */
+    virtual Rectangle implGetBoundingBoxOnScreen();
+
+    // internal helper methods ------------------------------------------------
+
+    /** This method creates (once) and returns the accessible data table child.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The XAccessible interface of the data table. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > implGetTable();
+
+    /** This method creates (once) and returns the specified header bar.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The XAccessible interface of the header bar. */
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible >
+        implGetHeaderBar( ::svt::table::AccessibleTableControlObjType eObjType );
+
+    /** This method returns one of the children that are always present:
+        Data table, row and column header bar or corner control.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The XAccessible interface of the specified child. */
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible >
+    implGetFixedChild( sal_Int32 nChildIndex );
+
+    /** This method creates and returns an accessible table.
+        @return  An AccessibleGridControlTable. */
+    virtual AccessibleGridControlTable* createAccessibleTable();
+
+private:
+    // members ----------------------------------------------------------------
+    ::std::auto_ptr< AccessibleGridControl_Impl > m_pImpl;
+};
+
+// ============================================================================
+/** the XAccessible which creates/returns an AccessibleGridControl
+
+    <p>The instance holds it's XAccessibleContext with a hard reference, while
+    the contxt holds this instance weak.</p>
+*/
+typedef ::cppu::WeakImplHelper1 < ::com::sun::star::accessibility::XAccessible > AccessibleGridControlAccess_Base;
+
+class AccessibleGridControlAccess :public AccessibleGridControlAccess_Base
+    ,public ::svt::table::IAccessibleTableControl
+{
+private:
+    ::osl::Mutex                m_aMutex;
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+                                        m_xParent;
+    ::svt::table::IAccessibleTable&    m_rTable;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+                                m_xContext;
+    AccessibleGridControl*      m_pContext;
+                                    // note that this pointer is valid as long as m_xContext is valid!
+
+public:
+    AccessibleGridControlAccess(
+        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+        ::svt::table::IAccessibleTable& _rTable
+    );
+
+    /// checks whether the accessible context is still alive
+    bool                            isContextAlive() const;
+
+    /// returns the AccessibleContext belonging to this Accessible
+    inline AccessibleGridControl*            getContext()         { return m_pContext; }
+    inline const AccessibleGridControl*      getContext() const   { return m_pContext; }
+
+protected:
+    virtual ~AccessibleGridControlAccess();
+
+    // XAccessible
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+        SAL_CALL getAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException );
+
+    // IAccessibleTable
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        getMyself()
+    {
+        return this;
+    }
+    void dispose();
+    virtual sal_Bool isAlive() const
+    {
+        return isContextAlive();
+    }
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        getTableHeader( ::svt::table::AccessibleTableControlObjType _eObjType )
+    {
+        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccessible;
+        AccessibleGridControl* pContext( getContext() );
+        if ( pContext )
+            xAccessible = pContext->getHeaderBar( _eObjType );
+        return xAccessible;
+    }
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        getTable()
+    {
+        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccessible;
+        AccessibleGridControl* pContext( getContext() );
+        if ( pContext )
+            xAccessible = pContext->getTable();
+        return xAccessible;
+    }
+    virtual void commitEvent( sal_Int16 nEventId,
+        const ::com::sun::star::uno::Any& rNewValue, const ::com::sun::star::uno::Any& rOldValue )
+    {
+        AccessibleGridControl* pContext( getContext() );
+        if ( pContext )
+            pContext->commitEvent( nEventId, rNewValue, rOldValue );
+    }
+
+private:
+    AccessibleGridControlAccess();                                              // never implemented
+    AccessibleGridControlAccess( const AccessibleGridControlAccess& );      // never implemented
+    AccessibleGridControlAccess& operator=( const AccessibleGridControlAccess& );   // never implemented
+};
+
+// ============================================================================
+} // namespace accessibility
+
+// ============================================================================
+
+#endif
+
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
new file mode 100644
index 000000000000..c6a26d8c4548
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
@@ -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.
+ *
+ ************************************************************************/
+
+
+#ifndef ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROLBASE_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROLBASE_HXX
+
+#include <svtools/accessibletable.hxx>
+#include <tools/debug.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/gen.hxx>
+#include <vcl/svapp.hxx>
+#include <cppuhelper/compbase4.hxx>
+#include <comphelper/broadcasthelper.hxx>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <toolkit/helper/convert.hxx>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/awt/XFocusListener.hpp>
+#include <comphelper/accessibleeventnotifier.hxx>
+#include <comphelper/uno3.hxx>
+
+// ============================================================================
+
+class Window;
+
+namespace utl {
+    class AccessibleStateSetHelper;
+}
+
+// ============================================================================
+
+namespace accessibility {
+
+// ============================================================================
+
+/** Aquire the solar mutex. */
+class TCSolarGuard : public ::vos::OGuard
+{
+public:
+    inline TCSolarGuard() : ::vos::OGuard( Application::GetSolarMutex() ) {}
+};
+
+// ============================================================================
+
+typedef ::cppu::WeakAggComponentImplHelper4<
+            ::com::sun::star::accessibility::XAccessibleContext,
+            ::com::sun::star::accessibility::XAccessibleComponent,
+            ::com::sun::star::accessibility::XAccessibleEventBroadcaster,
+            ::com::sun::star::lang::XServiceInfo >
+        AccessibleGridControlImplHelper;
+
+/** The GridControl accessible objects inherit from this base class. It
+    implements basic functionality for various Accessibility interfaces and
+    the event broadcaster and contains the ::osl::Mutex. */
+class AccessibleGridControlBase :
+    public ::comphelper::OBaseMutex,
+    public AccessibleGridControlImplHelper
+{
+public:
+    /** Constructor sets specified name and description.
+        @param rxParent  XAccessible interface of the parent object.
+        @param rTable  The Table control.
+        @param eNameText  The constant for the name text.
+        @param eDescrText  The constant for the description text. */
+    AccessibleGridControlBase(
+        const ::com::sun::star::uno::Reference<
+                ::com::sun::star::accessibility::XAccessible >& rxParent,
+        ::svt::table::IAccessibleTable& rTable,
+        ::svt::table::AccessibleTableControlObjType  eObjType );
+
+protected:
+    virtual ~AccessibleGridControlBase();
+
+    /** Commits DeFunc event to listeners and cleans up members. */
+    virtual void SAL_CALL disposing();
+
+public:
+    // XAccessibleContext -----------------------------------------------------
+
+    /** @return  A reference to the parent accessible object. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleParent()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The index of this object among the parent's children. */
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return
+            The description of this object.
+    */
+    virtual ::rtl::OUString SAL_CALL getAccessibleDescription()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return
+            The name of this object.
+    */
+    virtual ::rtl::OUString SAL_CALL getAccessibleName()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return
+            The relation set (the GridControl does not have one).
+    */
+    virtual ::com::sun::star::uno::Reference<
+    ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL
+        getAccessibleRelationSet()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The set of current states. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL
+        getAccessibleStateSet()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The parent's locale. */
+    virtual ::com::sun::star::lang::Locale SAL_CALL getLocale()
+        throw ( ::com::sun::star::accessibility::IllegalAccessibleComponentStateException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return
+            The role of this object. Panel, ROWHEADER, COLUMNHEADER, TABLE, TABLE_CELL are supported.
+    */
+    virtual sal_Int16 SAL_CALL getAccessibleRole()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /*  Derived classes have to implement:
+        -   getAccessibleChildCount,
+        -   getAccessibleChild,
+        -   getAccessibleRole.
+        Derived classes may overwrite getAccessibleIndexInParent to increase
+        performance. */
+
+    // XAccessibleComponent ---------------------------------------------------
+
+    /** @return
+        <TRUE/>, if the point lies within the bounding box of this object. */
+    virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& rPoint )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The bounding box of this object. */
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return
+        The upper left corner of the bounding box relative to the parent. */
+    virtual ::com::sun::star::awt::Point SAL_CALL getLocation()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return
+        The upper left corner of the bounding box in screen coordinates. */
+    virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The size of the bounding box. */
+    virtual ::com::sun::star::awt::Size SAL_CALL getSize()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the object is showing. */
+    virtual sal_Bool SAL_CALL isShowing()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the object is visible. */
+    virtual sal_Bool SAL_CALL isVisible()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the object can accept the focus. */
+    virtual sal_Bool SAL_CALL isFocusTraversable()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    virtual sal_Int32 SAL_CALL getForeground(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
+
+
+    /*  Derived classes have to implement:
+        -   getAccessibleAt,
+        -   grabFocus,
+        -   getAccessibleKeyBinding. */
+
+    /** @return
+        No key bindings supported by default.
+    */
+    virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
+        throw ( ::com::sun::star::uno::RuntimeException );
+    /** @return
+            The accessible child rendered under the given point.
+    */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XAccessibleEventBroadcaster --------------------------------------------
+
+    /** Adds a new event listener */
+    using cppu::WeakAggComponentImplHelperBase::addEventListener;
+    virtual void SAL_CALL addEventListener(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::accessibility::XAccessibleEventListener>& rxListener )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** Removes an event listener. */
+    using cppu::WeakAggComponentImplHelperBase::removeEventListener;
+    virtual void SAL_CALL removeEventListener(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::accessibility::XAccessibleEventListener>& rxListener )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XTypeProvider ----------------------------------------------------------
+
+    /** @return  An unique implementation ID. */
+    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XServiceInfo -----------------------------------------------------------
+
+    /** @return  Whether the specified service is supported by this class. */
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  A list of all supported services. */
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    getSupportedServiceNames()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /*  Derived classes have to implement:
+        -   getImplementationName. */
+
+    // helper methods ---------------------------------------------------------
+
+    /** @return  The GridControl object type. */
+    inline ::svt::table::AccessibleTableControlObjType getType() const;
+
+    /** Commits an event to all listeners. */
+    void commitEvent(
+            sal_Int16 nEventId,
+            const ::com::sun::star::uno::Any& rNewValue,
+
+    const ::com::sun::star::uno::Any& rOldValue );
+    /** @return  <TRUE/>, if the object is not disposed or disposing. */
+    sal_Bool isAlive() const;
+
+protected:
+    // internal virtual methods -----------------------------------------------
+
+    /** Determines whether the Grid control is really showing inside of
+        its parent accessible window. Derived classes may implement different
+        behaviour.
+        @attention  This method requires locked mutex's and a living object.
+        @return  <TRUE/>, if the object is really showing. */
+    virtual sal_Bool implIsShowing();
+
+    /** Derived classes return the bounding box relative to the parent window.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) relative to the parent window. */
+    virtual Rectangle implGetBoundingBox() = 0;
+    ///** Derived classes return the bounding box in screen coordinates.
+    //    @attention  This method requires locked mutex's and a living object.
+    //    @return  The bounding box (VCL rect.) in screen coordinates. */
+    virtual Rectangle implGetBoundingBoxOnScreen() = 0;
+
+    /** Creates a new AccessibleStateSetHelper and fills it with states of the
+        current object. This method calls FillStateSet at the GridControl which
+        fills it with more states depending on the object type. Derived classes
+        may overwrite this method and add more states.
+        @attention  This method requires locked mutex's.
+        @return  A filled AccessibleStateSetHelper. */
+    virtual ::utl::AccessibleStateSetHelper* implCreateStateSetHelper();
+
+    // internal helper methods ------------------------------------------------
+
+    /** @throws <type>DisposedException</type>  If the object is not alive. */
+    void ensureIsAlive() const
+        throw ( ::com::sun::star::lang::DisposedException );
+
+    /** @return  The ::osl::Mutex member provided by the class OBaseMutex. */
+    inline ::osl::Mutex& getOslMutex();
+    /** @return  Pointer to the global ::osl::Mutex. */
+    static inline ::osl::Mutex* getOslGlobalMutex();
+
+    /** Changes the name of the object (flat assignment, no notify).
+        @attention  This method requires a locked mutex. */
+    inline void implSetName( const ::rtl::OUString& rName );
+    /** Changes the description of the object (flat assignment, no notify).
+        @attention  This method requires a locked mutex. */
+    inline void implSetDescription( const ::rtl::OUString& rDescription );
+
+    /** Locks all mutex's and calculates the bounding box relative to the
+        parent window.
+        @return  The bounding box (VCL rect.) relative to the parent object. */
+    Rectangle getBoundingBox()
+        throw ( ::com::sun::star::lang::DisposedException );
+    ///** Locks all mutex's and calculates the bounding box in screen
+    //    coordinates.
+    //    @return  The bounding box (VCL rect.) in screen coordinates. */
+    Rectangle getBoundingBoxOnScreen()
+        throw ( ::com::sun::star::lang::DisposedException );
+
+    /** Creates a new UUID, if rId is empty.
+        @attention  This method requires locked global mutex to prevent double
+                    creation of an UUID. */
+    static void implCreateUuid( ::com::sun::star::uno::Sequence< sal_Int8 >& rId );
+
+    ::comphelper::AccessibleEventNotifier::TClientId getClientId() const { return m_aClientId; }
+    void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; }
+
+public:
+    // public versions of internal helper methods, with access control
+    struct TC_AccessControl { friend class TC_SolarMethodGuard; private: TC_AccessControl() { } };
+
+    inline ::osl::Mutex&    getMutex( const TC_AccessControl& ) { return getOslMutex(); }
+    inline void             ensureIsAlive( const TC_AccessControl& ) { ensureIsAlive(); }
+
+protected:
+    // members ----------------------------------------------------------------
+
+    /** The parent accessible object. */
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > m_xParent;
+    /** The SVT Table control. */
+    ::svt::table::IAccessibleTable& m_aTable;
+    /** The type of this object (for names, descriptions, state sets, ...). */
+    ::svt::table::AccessibleTableControlObjType m_eObjType;
+
+private:
+    /** Localized name. */
+    ::rtl::OUString m_aName;
+    /** Localized description text. */
+    ::rtl::OUString m_aDescription;
+    ::comphelper::AccessibleEventNotifier::TClientId    m_aClientId;
+};
+
+// ============================================================================
+// a version of AccessibleGridControlBase which implements not only the XAccessibleContext,
+// but also the XAccessible
+
+typedef ::cppu::ImplHelper1 <   ::com::sun::star::accessibility::XAccessible
+                            >   GridControlAccessibleElement_Base;
+
+class GridControlAccessibleElement
+            :public AccessibleGridControlBase
+            ,public GridControlAccessibleElement_Base
+{
+protected:
+    /** Constructor sets specified name and description.
+
+        @param rxParent  XAccessible interface of the parent object.
+        @param rTable  The Table control.
+        @param eNameText  The constant for the name text.
+        @param eDescrText  The constant for the description text.
+    */
+    GridControlAccessibleElement(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessible >& rxParent,
+            ::svt::table::IAccessibleTable& rTable,
+        ::svt::table::AccessibleTableControlObjType  eObjType );
+
+public:
+    // XInterface
+    DECLARE_XINTERFACE( )
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER( )
+
+protected:
+    virtual ~GridControlAccessibleElement();
+
+protected:
+    // XAccessible ------------------------------------------------------------
+
+    /** @return  The XAccessibleContext interface of this object. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL
+    getAccessibleContext()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+private:
+    GridControlAccessibleElement();                                             // never implemented
+    GridControlAccessibleElement( const GridControlAccessibleElement& );        // never implemented
+    GridControlAccessibleElement& operator=( const GridControlAccessibleElement& ); // never implemented
+};
+
+// ============================================================================
+// a helper class for protecting methods which need to lock the solar mutex in addition to the own mutex
+
+typedef ::osl::MutexGuard OslMutexGuard;
+
+class TC_SolarMethodGuard : public TCSolarGuard, public OslMutexGuard
+{
+public:
+    inline TC_SolarMethodGuard( AccessibleGridControlBase& _rOwner, bool _bEnsureAlive = true )
+        :TCSolarGuard( )
+        ,OslMutexGuard( _rOwner.getMutex( AccessibleGridControlBase::TC_AccessControl() ) )
+    {
+        if ( _bEnsureAlive )
+            _rOwner.ensureIsAlive( AccessibleGridControlBase::TC_AccessControl() );
+    }
+};
+
+// inlines --------------------------------------------------------------------
+
+inline ::svt::table::AccessibleTableControlObjType AccessibleGridControlBase::getType() const
+{
+    return m_eObjType;
+}
+
+inline ::osl::Mutex& AccessibleGridControlBase::getOslMutex()
+{
+    return m_aMutex;
+}
+
+inline ::osl::Mutex* AccessibleGridControlBase::getOslGlobalMutex()
+{
+    return ::osl::Mutex::getGlobalMutex();
+}
+
+inline void AccessibleGridControlBase::implSetName(
+        const ::rtl::OUString& rName )
+{
+    m_aName = rName;
+}
+
+inline void AccessibleGridControlBase::implSetDescription(
+        const ::rtl::OUString& rDescription )
+{
+    m_aDescription = rDescription;
+}
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
+#endif // ACCESSIBILITY_EXT_ACCESSIBILEGRIDCONTROLBASE_HXX
+
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
new file mode 100644
index 000000000000..90306435bd4b
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
@@ -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.
+ *
+ ************************************************************************/
+
+
+#ifndef ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROLHEADER_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROLHEADER_HXX
+
+
+#include "accessibility/extended/AccessibleGridControlHeaderCell.hxx"
+#include "accessibility/extended/AccessibleGridControlTableBase.hxx"
+
+// ============================================================================
+
+namespace accessibility {
+
+// ============================================================================
+
+/** This class represents the accessible object of a header bar of a Grid Control
+   (row or column header bar). This object supports the
+    XAccessibleSelection interface. Selecting a child of this object selects
+    complete rows or columns of the data table. */
+class AccessibleGridControlHeader : public AccessibleGridControlTableBase
+{
+public:
+    /** @param eObjType  One of the two allowed types TCTYPE_ROWHEADERBAR or
+                         TCTYPE_COLUMNHEADERBAR. */
+    AccessibleGridControlHeader(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessible >& rxParent,
+            ::svt::table::IAccessibleTable& rTable,
+            ::svt::table::AccessibleTableControlObjType  eObjType );
+
+protected:
+    virtual ~AccessibleGridControlHeader();
+
+public:
+    // XAccessibleContext -----------------------------------------------------
+
+    /** @return
+        The XAccessible interface of the specified child.
+    */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleChild( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The index of this object among the parent's children. */
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XAccessibleComponent ---------------------------------------------------
+
+    /** @return  The accessible child rendered under the given point. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** Grabs the focus to (the current cell of) the data table. */
+    virtual void SAL_CALL grabFocus()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The key bindings associated with this object. */
+    virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XAccessibleTable -------------------------------------------------------
+
+    /** @return  The description text of the specified row. */
+    virtual ::rtl::OUString SAL_CALL
+    getAccessibleRowDescription( sal_Int32 nRow )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The description text of the specified column. */
+    virtual ::rtl::OUString SAL_CALL
+    getAccessibleColumnDescription( sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The XAccessibleTable interface of the row header bar. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL
+    getAccessibleRowHeaders()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The XAccessibleTable interface of the column header bar. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL
+    getAccessibleColumnHeaders()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  An index list of completely selected rows. */
+    virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
+    getSelectedAccessibleRows()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  An index list of completely selected columns. */
+    virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
+    getSelectedAccessibleColumns()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the specified row is completely selected. */
+    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the specified column is completely selected. */
+    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return The XAccessible interface of the cell object at the specified
+                cell position. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the specified cell is selected. */
+    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    // XServiceInfo -----------------------------------------------------------
+
+    /** @return  The name of this class. */
+    virtual ::rtl::OUString SAL_CALL getImplementationName()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  An unique implementation ID. */
+    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+protected:
+    // internal virtual methods -----------------------------------------------
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The absolute child index from the index of selected children.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified index is invalid. */
+    //sal_Int32 implGetChildIndexFromSelectedIndex( sal_Int32 nSelectedChildIndex )
+    //    throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
+
+    /** Returns the specified row or column. Uses one of the parameters,
+        depending on object type.
+        @attention  This method requires locked mutex's and a living object.
+        @return  The XAccessible interface of the specified column/row. */
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible >
+    implGetChild( sal_Int32 nRow, sal_uInt32 nColumnPos );
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) relative to the parent window. */
+    virtual Rectangle implGetBoundingBox();
+   /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) in screen coordinates. */
+    virtual Rectangle implGetBoundingBoxOnScreen();
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The count of used rows. */
+    virtual sal_Int32 implGetRowCount() const;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The count of used columns. */
+    virtual sal_Int32 implGetColumnCount() const;
+
+    // internal helper methods ------------------------------------------------
+
+    /** @return  <TRUE/>, if the objects is a header bar for rows. */
+    inline sal_Bool isRowBar() const;
+    /** @return  <TRUE/>, if the objects is a header bar for columns. */
+    inline sal_Bool isColumnBar() const;
+};
+
+// inlines --------------------------------------------------------------------
+
+inline sal_Bool AccessibleGridControlHeader::isRowBar() const
+{
+    return getType() == ::svt::table::TCTYPE_ROWHEADERBAR;
+}
+
+inline sal_Bool AccessibleGridControlHeader::isColumnBar() const
+{
+    return getType() == ::svt::table::TCTYPE_COLUMNHEADERBAR;
+}
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
+#endif // ACCESSIBILITY_EXT_ACCESSIBILEGRIDCONTROLHEADER_HXX
+
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
new file mode 100755
index 000000000000..0672ca28a151
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.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 ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROLHEADERCELL_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROLHEADERCELL_HXX
+
+#include "accessibility/extended/AccessibleGridControlTableCell.hxx"
+
+namespace accessibility
+{
+    class AccessibleGridControlHeaderCell : public AccessibleGridControlCell, public ::com::sun::star::accessibility::XAccessible
+    {
+        sal_Int32   m_nColumnRowId;
+    public:
+        AccessibleGridControlHeaderCell(sal_Int32 _nColumnRowId,
+                        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
+                        ::svt::table::IAccessibleTable& _rTable,
+                        ::svt::table::AccessibleTableControlObjType  _eObjType);
+        /** @return  The count of visible children. */
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw ( ::com::sun::star::uno::RuntimeException );
+
+        /** @return  The XAccessible interface of the specified child. */
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
+            getAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException,::com::sun::star::uno::RuntimeException );
+
+        /** @return  The index of this object among the parent's children. */
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw ( ::com::sun::star::uno::RuntimeException );
+
+        /** Grabs the focus to the GridControl. */
+        virtual void SAL_CALL grabFocus() throw ( ::com::sun::star::uno::RuntimeException );
+
+        // XInterface -------------------------------------------------------------
+
+        /** Queries for a new interface. */
+        ::com::sun::star::uno::Any SAL_CALL queryInterface(
+                const ::com::sun::star::uno::Type& rType )
+            throw ( ::com::sun::star::uno::RuntimeException );
+
+        /** Aquires the object (calls acquire() on base class). */
+        virtual void SAL_CALL acquire() throw ();
+
+        /** Releases the object (calls release() on base class). */
+        virtual void SAL_CALL release() throw ();
+        // XAccessible ------------------------------------------------------------
+
+        /** @return  The XAccessibleContext interface of this object. */
+        virtual ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL
+        getAccessibleContext()
+            throw ( ::com::sun::star::uno::RuntimeException );
+        //-------------------------------------------------------------------------
+        inline sal_Bool isRowBarCell() const
+        {
+            return getType() == ::svt::table::TCTYPE_ROWHEADERCELL;
+        }
+
+        /** @return
+                The name of this class.
+        */
+        virtual ::rtl::OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException );
+
+        /** Creates a new AccessibleStateSetHelper and fills it with states of the
+            current object.
+            @return
+                A filled AccessibleStateSetHelper.
+        */
+        ::utl::AccessibleStateSetHelper* implCreateStateSetHelper();
+
+    protected:
+        virtual Rectangle implGetBoundingBox();
+
+        virtual Rectangle implGetBoundingBoxOnScreen();
+    private:
+        ::rtl::OUString m_sHeaderName;
+    };
+}
+
+#endif // ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROLHEADERCELL_HXX
+
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
new file mode 100644
index 000000000000..8058594d2938
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
@@ -0,0 +1,226 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#ifndef ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROLTABLE_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROLTABLE_HXX
+
+#include "accessibility/extended/AccessibleGridControlTableBase.hxx"
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+
+// ============================================================================
+
+namespace accessibility {
+
+// ============================================================================
+typedef ::cppu::ImplHelper1<
+            ::com::sun::star::accessibility::XAccessibleSelection >
+        AccessibleGridControlTableImplHelper1;
+/** This class represents the accessible object of the data table of a
+    Grid control. */
+class AccessibleGridControlTable : public AccessibleGridControlTableBase,
+                                public AccessibleGridControlTableImplHelper1
+{
+public:
+    AccessibleGridControlTable(
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessible >& rxParent,
+            ::svt::table::IAccessibleTable& rTable,
+            ::svt::table::AccessibleTableControlObjType _eType);
+
+protected:
+    virtual ~AccessibleGridControlTable();
+
+public:
+    // XAccessibleContext -----------------------------------------------------
+
+    /** @return  The XAccessible interface of the specified child. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleChild( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The index of this object among the parent's children. */
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XAccessibleComponent ---------------------------------------------------
+
+    /** @return  The accessible child rendered under the given point. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** Grabs the focus to (the current cell of) the data table. */
+    virtual void SAL_CALL grabFocus()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The key bindings associated with this object. */
+    virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    // XAccessibleTable -------------------------------------------------------
+
+    /** @return  The description text of the specified row. */
+    virtual ::rtl::OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The description text of the specified column. */
+    virtual ::rtl::OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The XAccessibleTable interface of the row header bar. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL
+    getAccessibleRowHeaders()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The XAccessibleTable interface of the column header bar. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL
+    getAccessibleColumnHeaders()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  An index list of completely selected rows. */
+    virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
+    getSelectedAccessibleRows()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  An index list of completely selected columns. */
+    virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
+    getSelectedAccessibleColumns()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the specified row is completely selected. */
+    virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the specified column is completely selected. */
+    virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return The XAccessible interface of the cell object at the specified
+                cell position. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the specified cell is selected. */
+    virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    // XAccessibleSelection ---------------------------------------------------
+
+    /** Selects the specified child (row or column of the table). */
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  <TRUE/>, if the specified child (row/column) is selected. */
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** Clears the complete selection. */
+    virtual void SAL_CALL clearAccessibleSelection()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** Selects all children or first, if multiselection is not supported. */
+    virtual void SAL_CALL selectAllAccessibleChildren()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The number of selected rows/columns. */
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The specified selected row/column. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** Removes the specified row/column from the selection. */
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+     // XInterface -------------------------------------------------------------
+
+    /** Queries for a new interface. */
+    ::com::sun::star::uno::Any SAL_CALL queryInterface(
+            const ::com::sun::star::uno::Type& rType )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** Aquires the object (calls acquire() on base class). */
+    virtual void SAL_CALL acquire() throw ();
+
+    /** Releases the object (calls release() on base class). */
+    virtual void SAL_CALL release() throw ();
+    // XServiceInfo -----------------------------------------------------------
+
+    /** @return  The name of this class. */
+    virtual ::rtl::OUString SAL_CALL getImplementationName()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+protected:
+    // internal virtual methods -----------------------------------------------
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The bounding box (VCL rect.) relative to the parent window. */
+    virtual Rectangle implGetBoundingBox();
+    ///** @attention  This method requires locked mutex's and a living object.
+    //    @return  The bounding box (VCL rect.) in screen coordinates. */
+    virtual Rectangle implGetBoundingBoxOnScreen();
+
+
+    //// internal helper methods ------------------------------------------------
+    ///** @attention  This method requires a locked mutex.
+    //    @return  The XAccessibleTable interface of the specified header bar. */
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleTable >
+    implGetHeaderBar( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::uno::RuntimeException );
+};
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
+#endif // ACCESSIBILITY_EXT_ACCESSIBILEGRIDCONTROLTABLE_HXX
+
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
new file mode 100755
index 000000000000..bee42d85e2a2
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
@@ -0,0 +1,228 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#ifndef ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROLTABLEBASE_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBLEGRIDCONTROLTABLEBASE_HXX
+
+#include "accessibility/extended/AccessibleGridControlBase.hxx"
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/accessibility/XAccessibleTable.hpp>
+
+// ============================================================================
+
+namespace accessibility {
+
+typedef ::cppu::ImplHelper1<
+            ::com::sun::star::accessibility::XAccessibleTable >
+        AccessibleGridControlTableImplHelper;
+
+/** The Grid Control accessible table objects inherit from this base class. It
+    implements basic functionality for the XAccessibleTable interface.
+    Grid COntrol table objects are: the data table, the column header bar and the
+    row header bar. */
+class AccessibleGridControlTableBase :
+    public GridControlAccessibleElement,
+    public AccessibleGridControlTableImplHelper
+{
+public:
+    /** Constructor sets specified name and description.
+        @param rxParent  XAccessible interface of the parent object.
+        @param rTable  The Table control.
+        @param eNameText  The constant for the name text.
+        @param eDescrText  The constant for the description text. */
+    AccessibleGridControlTableBase(
+        const ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible >& rxParent,
+    ::svt::table::IAccessibleTable& rTable,
+    ::svt::table::AccessibleTableControlObjType  eObjType );
+
+protected:
+    virtual ~AccessibleGridControlTableBase();
+
+public:
+    // XAccessibleContext -----------------------------------------------------
+
+    /** @return  The count of visible children. */
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The role of this object (a table). */
+    virtual sal_Int16 SAL_CALL getAccessibleRole()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /*  Derived classes have to implement:
+        -   getAccessibleChild,
+        -   getAccessibleIndexInParent. */
+
+    // XAccessibleComponent ---------------------------------------------------
+
+    /*  Derived classes have to implement:
+        -   getAccessibleAt,
+        -   grabFocus,
+        -   getAccessibleKeyBinding. */
+
+    // XAccessibleTable -------------------------------------------------------
+
+    /** @return  The number of used rows in the table (0 = empty table). */
+    virtual sal_Int32 SAL_CALL getAccessibleRowCount()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The number of used columns in the table (0 = empty table). */
+    virtual sal_Int32 SAL_CALL getAccessibleColumnCount()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The row extent of the specified cell (always 1). */
+    virtual sal_Int32 SAL_CALL
+    getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The column extent of the specified cell (always 1). */
+    virtual sal_Int32 SAL_CALL
+    getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The caption cell of the table (not supported). */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleCaption()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The summary object of the table (not supported). */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleSummary()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The child index of the specified cell. */
+    virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The row index of the specified child cell. */
+    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The column index of the specified child cell. */
+    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    /*  Derived classes have to implement:
+        -   getAccessibleRowDescription,
+        -   getAccessibleColumnDescription,
+        -   getAccessibleRowHeaders,
+        -   getAccessibleColumnHeaders,
+        -   getSelectedAccessibleRows,
+        -   getSelectedAccessibleColumns,
+        -   isAccessibleRowSelected,
+        -   isAccessibleColumnSelected,
+        -   getAccessibleCellAt,
+        -   isAccessibleSelected. */
+
+    // XInterface -------------------------------------------------------------
+
+    /** Queries for a new interface. */
+    ::com::sun::star::uno::Any SAL_CALL queryInterface(
+            const ::com::sun::star::uno::Type& rType )
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** Aquires the object (calls acquire() on base class). */
+    virtual void SAL_CALL acquire() throw ();
+
+    /** Releases the object (calls release() on base class). */
+    virtual void SAL_CALL release() throw ();
+
+    // XTypeProvider ----------------------------------------------------------
+
+    /** @return  A sequence of possible types (received from base classes). */
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  An unique implementation ID. */
+    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+protected:
+    // internal helper methods ------------------------------------------------
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The number of cells of the table. */
+    sal_Int32 implGetChildCount() const;
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The row index of the specified cell index. */
+    sal_Int32 implGetRow( sal_Int32 nChildIndex ) const;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The column index of the specified cell index. */
+    sal_Int32 implGetColumn( sal_Int32 nChildIndex ) const;
+    /** @attention  This method requires locked mutex's and a living object.
+        @return  The child index of the specified cell address. */
+    sal_Int32 implGetChildIndex( sal_Int32 nRow, sal_Int32 nColumn ) const;
+
+    /** Fills a sequence with sorted indexes of completely selected rows.
+        @attention  This method requires locked mutex's and a living object.
+        @param rSeq  Out-parameter that takes the sorted row index list. */
+    void implGetSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& rSeq );
+    /** Fills a sequence with sorted indexes of completely selected columns.
+        @attention  This method requires locked mutex's and a living object.
+        @param rSeq  Out-parameter that takes the sorted column index list. */
+    //void implGetSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& rSeq );
+
+    /** @attention  This method requires locked mutex's and a living object.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified row index is invalid. */
+    void ensureIsValidRow( sal_Int32 nRow )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
+    /** @attention  This method requires locked mutex's and a living object.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified column index is invalid. */
+    void ensureIsValidColumn( sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
+    /** @attention  This method requires locked mutex's and a living object.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified cell address is invalid. */
+    void ensureIsValidAddress( sal_Int32 nRow, sal_Int32 nColumn )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
+    /** @attention  This method requires locked mutex's and a living object.
+        @throws <type>IndexOutOfBoundsException</type>
+        If the specified child index is invalid. */
+    void ensureIsValidIndex( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
+};
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
+#endif // ACCESSIBILITY_EXT_ACCESSIBILEGRIDCONTROLTABLEBASE_HXX
+
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx
new file mode 100755
index 000000000000..dd44927d7fc1
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.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 ACCESSIBILITY_EXT_ACCESSIBILEGRIDCONTROLTABLECELL_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBILEGRIDCONTROLTABLECELL_HXX
+
+#include <comphelper/accessibletexthelper.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include "accessibility/extended/AccessibleGridControlBase.hxx"
+#include <svtools/accessibletable.hxx>
+
+namespace accessibility
+{
+    class AccessibleGridControlCell : public AccessibleGridControlBase
+    {
+    private:
+        sal_Int32               m_nRowPos;      // the row number of the table cell
+        sal_Int32               m_nColPos;      // the column id of the table cell
+
+    protected:
+        // attribute access
+        inline sal_Int32    getRowPos( ) const { return m_nRowPos; }
+        inline sal_Int32    getColumnPos( ) const { return m_nColPos; }
+
+        // XAccessibleComponent
+        virtual void SAL_CALL grabFocus() throw ( ::com::sun::star::uno::RuntimeException );
+
+    protected:
+        AccessibleGridControlCell(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+            ::svt::table::IAccessibleTable& _rTable,
+            sal_Int32 _nRowPos,
+            sal_uInt16 _nColPos,
+            ::svt::table::AccessibleTableControlObjType _eType
+        );
+
+        virtual ~AccessibleGridControlCell();
+
+    private:
+        AccessibleGridControlCell();                                                    // never implemented
+        AccessibleGridControlCell( const AccessibleGridControlCell& );              // never implemented
+        AccessibleGridControlCell& operator=( const AccessibleGridControlCell& );   // never implemented
+    };
+
+    typedef ::cppu::ImplHelper2 <   ::com::sun::star::accessibility::XAccessibleText
+                                ,   ::com::sun::star::accessibility::XAccessible
+                                >   AccessibleTextHelper_BASE;
+    // implementation of a table cell of GridControl
+    class AccessibleGridControlTableCell    :public AccessibleGridControlCell
+                                        ,public AccessibleTextHelper_BASE
+                                        ,public ::comphelper::OCommonAccessibleText
+    {
+    private:
+        sal_Int32   m_nOffset;
+
+    protected:
+        // OCommonAccessibleText
+        virtual ::rtl::OUString                 implGetText();
+        virtual ::com::sun::star::lang::Locale  implGetLocale();
+        virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+        virtual Rectangle implGetBoundingBox();
+        virtual Rectangle implGetBoundingBoxOnScreen();
+
+    public:
+        AccessibleGridControlTableCell( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+                                    ::svt::table::IAccessibleTable& _rTable,
+                                    sal_Int32 _nRowId,
+                                    sal_uInt16 _nColId,
+                                    svt::table::AccessibleTableControlObjType  eObjType);
+
+        // XInterface -------------------------------------------------------------
+
+        /** Queries for a new interface. */
+        ::com::sun::star::uno::Any SAL_CALL queryInterface(
+                const ::com::sun::star::uno::Type& rType )
+            throw ( ::com::sun::star::uno::RuntimeException );
+
+        /** Aquires the object (calls acquire() on base class). */
+        virtual void SAL_CALL acquire() throw ();
+
+        /** Releases the object (calls release() on base class). */
+        virtual void SAL_CALL release() throw ();
+
+        /** @return  The index of this object among the parent's children. */
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
+            throw ( ::com::sun::star::uno::RuntimeException );
+
+        /** @return
+                The name of this class.
+        */
+        virtual ::rtl::OUString SAL_CALL getImplementationName()
+            throw ( ::com::sun::star::uno::RuntimeException );
+
+        /** @return
+                The count of visible children.
+        */
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount()
+            throw ( ::com::sun::star::uno::RuntimeException );
+
+        /** @return
+                The XAccessible interface of the specified child.
+        */
+        virtual ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessible > SAL_CALL
+            getAccessibleChild( sal_Int32 nChildIndex )
+                throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                        ::com::sun::star::uno::RuntimeException );
+
+        /** Creates a new AccessibleStateSetHelper and fills it with states of the
+            current object.
+            @return
+                A filled AccessibleStateSetHelper.
+        */
+        ::utl::AccessibleStateSetHelper* implCreateStateSetHelper();
+
+        // XAccessible ------------------------------------------------------------
+
+        /** @return  The XAccessibleContext interface of this object. */
+        virtual ::com::sun::star::uno::Reference<
+            ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL
+        getAccessibleContext()
+            throw ( ::com::sun::star::uno::RuntimeException );
+
+        // XAccessibleText
+        virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    };
+}
+#endif // ACCESSIBILITY_EXT_ACCESSIBILEGRIDCONTROLTABLECELL_HXX
+
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
new file mode 100755
index 000000000000..10c6520b6a3d
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.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 ACC_ACCESSIBLETOOLPANELDECK_HXX
+#define ACC_ACCESSIBLETOOLPANELDECK_HXX
+
+/** === begin UNO includes === **/
+/** === end UNO includes === **/
+
+#include <cppuhelper/implbase1.hxx>
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+
+#include <boost/scoped_ptr.hpp>
+
+namespace svt
+{
+    class ToolPanelDeck;
+}
+
+//......................................................................................................................
+namespace accessibility
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= AccessibleToolPanelDeck
+    //==================================================================================================================
+    class AccessibleToolPanelDeck_Impl;
+    typedef VCLXAccessibleComponent   AccessibleToolPanelDeck_Base;
+    class AccessibleToolPanelDeck : public AccessibleToolPanelDeck_Base
+    {
+    public:
+        AccessibleToolPanelDeck(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rAccessibleParent,
+            ::svt::ToolPanelDeck& i_rPanelDeck
+        );
+
+        using AccessibleToolPanelDeck_Base::NotifyAccessibleEvent;
+
+    protected:
+        virtual ~AccessibleToolPanelDeck();
+
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleComponent
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL grabFocus(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // OComponentHelper
+        virtual void SAL_CALL disposing();
+
+        // VCLXAccessibleComponent
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetChildAccessible( const VclWindowEvent& i_rVclWindowEvent );
+        virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet );
+
+    private:
+        ::boost::scoped_ptr< AccessibleToolPanelDeck_Impl > m_pImpl;
+    };
+
+//......................................................................................................................
+} // namespace accessibility
+//......................................................................................................................
+
+#endif // ACC_ACCESSIBLETOOLPANELDECK_HXX
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
new file mode 100644
index 000000000000..cc2d39c5acbf
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.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 ACC_ACCESSIBLETOOLPANELTABBAR_HXX
+#define ACC_ACCESSIBLETOOLPANELTABBAR_HXX
+
+/** === begin UNO includes === **/
+/** === end UNO includes === **/
+
+#include <cppuhelper/implbase1.hxx>
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+
+#include <boost/scoped_ptr.hpp>
+
+namespace svt
+{
+    class IToolPanelDeck;
+    class PanelTabBar;
+}
+
+//......................................................................................................................
+namespace accessibility
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= AccessibleToolPanelTabBar
+    //==================================================================================================================
+    class AccessibleToolPanelTabBar_Impl;
+    typedef VCLXAccessibleComponent   AccessibleToolPanelTabBar_Base;
+    class AccessibleToolPanelTabBar : public AccessibleToolPanelTabBar_Base
+    {
+    public:
+        AccessibleToolPanelTabBar(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rAccessibleParent,
+            ::svt::IToolPanelDeck& i_rPanelDeck,
+            ::svt::PanelTabBar& i_rTabBar
+        );
+
+        using AccessibleToolPanelTabBar_Base::NotifyAccessibleEvent;
+
+    protected:
+        virtual ~AccessibleToolPanelTabBar();
+
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleComponent
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+
+        // OComponentHelper
+        virtual void SAL_CALL disposing();
+
+        // VCLXAccessibleComponent
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetChildAccessible( const VclWindowEvent& i_rVclWindowEvent );
+        virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet );
+
+    private:
+        ::boost::scoped_ptr< AccessibleToolPanelTabBar_Impl > m_pImpl;
+    };
+
+//......................................................................................................................
+} // namespace accessibility
+//......................................................................................................................
+
+#endif // ACC_ACCESSIBLETOOLPANELTABBAR_HXX
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
new file mode 100644
index 000000000000..80b2ccaaf104
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.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 ACC_ACCESSIBLETOOLPANELDECKTABBARITEM_HXX
+#define ACC_ACCESSIBLETOOLPANELDECKTABBARITEM_HXX
+
+/** === begin UNO includes === **/
+/** === end UNO includes === **/
+
+#include <comphelper/accessiblecomponenthelper.hxx>
+#include <cppuhelper/implbase1.hxx>
+
+#include <boost/scoped_ptr.hpp>
+
+namespace svt
+{
+    class IToolPanelDeck;
+    class PanelTabBar;
+}
+
+//......................................................................................................................
+namespace accessibility
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= AccessibleToolPanelDeckTabBarItem
+    //==================================================================================================================
+    class AccessibleToolPanelDeckTabBarItem_Impl;
+    typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleToolPanelDeckTabBarItem_Base;
+    class AccessibleToolPanelDeckTabBarItem : public AccessibleToolPanelDeckTabBarItem_Base
+    {
+    public:
+        AccessibleToolPanelDeckTabBarItem(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rAccessibleParent,
+            ::svt::IToolPanelDeck& i_rPanelDeck,
+            ::svt::PanelTabBar& i_rTabBar,
+            const size_t i_nItemPos
+        );
+
+        using AccessibleToolPanelDeckTabBarItem_Base::NotifyAccessibleEvent;
+        using AccessibleToolPanelDeckTabBarItem_Base::lateInit;
+
+    protected:
+        virtual ~AccessibleToolPanelDeckTabBarItem();
+
+    public:
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleComponent
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL grabFocus(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Int32 SAL_CALL getForeground(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleExtendedComponent
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    protected:
+        // OCommonAccessibleComponent
+        virtual ::com::sun::star::awt::Rectangle SAL_CALL implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // OComponentHelper
+        virtual void SAL_CALL disposing();
+
+    protected:
+        ::boost::scoped_ptr< AccessibleToolPanelDeckTabBarItem_Impl >   m_pImpl;
+    };
+
+//......................................................................................................................
+} // namespace accessibility
+//......................................................................................................................
+
+#endif // ACC_ACCESSIBLETOOLPANELDECKTABBARITEM_HXX
diff --git a/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx
new file mode 100644
index 000000000000..a7b78c092213
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.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 ACCESSIBILITY_ACCESSIBLE_BROWSE_BOX_CELL_HXX
+#define ACCESSIBILITY_ACCESSIBLE_BROWSE_BOX_CELL_HXX
+
+#include "accessibility/extended/AccessibleBrowseBoxBase.hxx"
+#include <svtools/AccessibleBrowseBoxObjType.hxx>
+
+// .................................................................................
+namespace accessibility
+{
+// .................................................................................
+
+    // =============================================================================
+    // = AccessibleBrowseBoxCell
+    // =============================================================================
+    /** common accessibility-functionality for browse box elements which occupy a cell
+    */
+    class AccessibleBrowseBoxCell : public AccessibleBrowseBoxBase
+    {
+    private:
+        sal_Int32               m_nRowPos;      // the row number of the table cell
+        sal_uInt16              m_nColPos;      // the column id of the table cell
+
+    protected:
+        // attribute access
+        inline sal_Int32    getRowPos( ) const { return m_nRowPos; }
+        inline sal_Int32    getColumnPos( ) const { return m_nColPos; }
+
+    protected:
+        // AccessibleBrowseBoxBase overridables
+        virtual Rectangle implGetBoundingBox();
+        virtual Rectangle implGetBoundingBoxOnScreen();
+
+        // XAccessibleComponent
+        virtual void SAL_CALL grabFocus() throw ( ::com::sun::star::uno::RuntimeException );
+
+    protected:
+        AccessibleBrowseBoxCell(
+            const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+            ::svt::IAccessibleTableProvider& _rBrowseBox,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+            sal_Int32 _nRowPos,
+            sal_uInt16 _nColPos,
+            ::svt::AccessibleBrowseBoxObjType _eType = ::svt::BBTYPE_TABLECELL
+        );
+
+        virtual ~AccessibleBrowseBoxCell();
+
+    private:
+        AccessibleBrowseBoxCell();                                                  // never implemented
+        AccessibleBrowseBoxCell( const AccessibleBrowseBoxCell& );              // never implemented
+        AccessibleBrowseBoxCell& operator=( const AccessibleBrowseBoxCell& );   // never implemented
+    };
+
+// .................................................................................
+}   // namespace accessibility
+// .................................................................................
+
+
+#endif // ACCESSIBILITY_ACCESSIBLE_BROWSE_BOX_CELL_HXX
diff --git a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
new file mode 100644
index 000000000000..a38877d5aeae
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
@@ -0,0 +1,156 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef ACCESSIBILITY_EXT_ACCESSIBILEEDITBROWSEBOXTABLECELL_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBILEEDITBROWSEBOXTABLECELL_HXX
+
+#ifndef ACCESSIBILITY_EXT_BROWSE_BOX_CELL_HXX
+#include "accessiblebrowseboxcell.hxx"
+#endif
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
+#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/compbase1.hxx>
+#include <comphelper/accessiblewrapper.hxx>
+
+namespace accessibility
+{
+    // =============================================================================
+    // = EditBrowseBoxTableCell
+    // =============================================================================
+    class EditBrowseBoxTableCell    :public AccessibleBrowseBoxCell
+                                    ,public ::comphelper::OAccessibleContextWrapperHelper
+    {
+    public:
+        EditBrowseBoxTableCell(
+            const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+            const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxOwningAccessible,
+            const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& _xControlChild,
+            ::svt::IAccessibleTableProvider& _rBrowseBox,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+            sal_Int32 _nRowPos,
+            sal_uInt16 _nColPos
+        );
+
+    protected:
+        virtual ~EditBrowseBoxTableCell();
+
+    protected:
+        // XAccessibleComponent
+        virtual sal_Int32 SAL_CALL getForeground(  ) throw (::com::sun::star::uno::RuntimeException) ;
+        virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException) ;
+
+        // XServiceInfo
+        virtual ::rtl::OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException );
+
+        // XInterface
+        DECLARE_XINTERFACE( )
+        // XTypeProvider
+        DECLARE_XTYPEPROVIDER( )
+
+        // XAccessibleContext
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        sal_Int16 SAL_CALL getAccessibleRole() throw ( ::com::sun::star::uno::RuntimeException );
+
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+    protected:
+        // OComponentHelper
+        virtual void SAL_CALL disposing();
+
+        // XComponent/OComponentProxyAggregationHelper (needs to be disambiguated)
+        virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException );
+
+        // OAccessibleContextWrapperHelper();
+        void notifyTranslatedEvent( const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent ) throw (::com::sun::star::uno::RuntimeException);
+
+    private:
+        EditBrowseBoxTableCell();                                           // never implemented
+        EditBrowseBoxTableCell( const EditBrowseBoxTableCell& );            // never implemented
+        EditBrowseBoxTableCell& operator=( const EditBrowseBoxTableCell& ); // never implemented
+    };
+
+    // =============================================================================
+    // = EditBrowseBoxTableCell
+    // =============================================================================
+    typedef ::cppu::WeakComponentImplHelper1    <   ::com::sun::star::accessibility::XAccessible
+                                                >   EditBrowseBoxTableCellAccess_Base;
+    // XAccessible providing an EditBrowseBoxTableCell
+    class EditBrowseBoxTableCellAccess
+                        :public ::comphelper::OBaseMutex
+                        ,public EditBrowseBoxTableCellAccess_Base
+    {
+    protected:
+        ::com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessibleContext >
+                                            m_aContext;
+        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+                                            m_xParent;
+        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+                                            m_xControlAccessible;
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >
+                                            m_xFocusWindow;
+        ::svt::IAccessibleTableProvider*    m_pBrowseBox;
+        sal_Int32                           m_nRowPos;
+        sal_uInt16                          m_nColPos;
+
+    public:
+        EditBrowseBoxTableCellAccess(
+            const ::com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible >& _rxParent,
+            const ::com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible > _xControlAccessible,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+            ::svt::IAccessibleTableProvider& _rBrowseBox,
+            sal_Int32 _nRowPos,
+            sal_uInt16 _nColPos
+        );
+
+    protected:
+        virtual ~EditBrowseBoxTableCellAccess();
+
+        // XAccessible
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XComponent/OComponentHelper
+        virtual void SAL_CALL disposing();
+
+    private:
+        EditBrowseBoxTableCellAccess();                                                 // never implemented
+        EditBrowseBoxTableCellAccess( const EditBrowseBoxTableCellAccess& );            // never implemented
+        EditBrowseBoxTableCellAccess& operator=( const EditBrowseBoxTableCellAccess& ); // never implemented
+    };
+}
+
+#endif // ACCESSIBILITY_EXT_ACCESSIBILEEDITBROWSEBOXTABLECELL_HXX
+
diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx
new file mode 100644
index 000000000000..05dc41313fdd
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.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 ACCESSIBILITY_EXT_ACCESSIBLEICONCHOICECTRL_HXX_
+#define ACCESSIBILITY_EXT_ACCESSIBLEICONCHOICECTRL_HXX_
+
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <cppuhelper/implbase2.hxx>
+#include <vcl/vclevent.hxx>
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+
+// class AccessibleListBox -----------------------------------------------
+
+class SvtIconChoiceCtrl;
+
+//........................................................................
+namespace accessibility
+{
+//........................................................................
+
+    typedef ::cppu::ImplHelper2<  ::com::sun::star::accessibility::XAccessible
+                                , ::com::sun::star::accessibility::XAccessibleSelection> AccessibleIconChoiceCtrl_BASE;
+
+    /** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry
+    */
+    class AccessibleIconChoiceCtrl  :public AccessibleIconChoiceCtrl_BASE
+                                    ,public VCLXAccessibleComponent
+    {
+    protected:
+        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xParent;
+
+    protected:
+        virtual ~AccessibleIconChoiceCtrl();
+
+        /** this function is called upon disposing the component */
+        virtual void SAL_CALL   disposing();
+
+        virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+        virtual void    FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+        SvtIconChoiceCtrl* getCtrl();
+    public:
+        /** OAccessibleBase needs a valid view
+            @param  _rIconCtrl
+                is the box for which we implement an accessible object
+            @param  _xParent
+                is our parent accessible object
+        */
+        AccessibleIconChoiceCtrl( SvtIconChoiceCtrl& _rIconCtrl,
+                                  const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent );
+
+        // XTypeProvider
+        DECLARE_XTYPEPROVIDER()
+
+        // XInterface
+        DECLARE_XINTERFACE()
+
+        // 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);
+
+        // XServiceInfo - static methods
+        static com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw(com::sun::star::uno::RuntimeException);
+        static ::rtl::OUString getImplementationName_Static(void) throw(com::sun::star::uno::RuntimeException);
+
+        // XAccessible
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleSelection
+        void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        void SAL_CALL clearAccessibleSelection(  ) throw (::com::sun::star::uno::RuntimeException);
+        void SAL_CALL selectAllAccessibleChildren(  ) throw (::com::sun::star::uno::RuntimeException);
+        sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    };
+
+//........................................................................
+}// namespace accessibility
+//........................................................................
+
+#endif // ACCESSIBILITY_EXT_ACCESSIBLEICONCHOICECTRL_HXX_
+
diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
new file mode 100644
index 000000000000..ccea420a1cff
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.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 ACCESSIBILITY_EXT_ACCESSIBLEICONCHOICECTRLENTRY_HXX_
+#define ACCESSIBILITY_EXT_ACCESSIBLEICONCHOICECTRLENTRY_HXX_
+
+#include <deque>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <cppuhelper/compbase8.hxx>
+#include <comphelper/broadcasthelper.hxx>
+#include <comphelper/accessibletexthelper.hxx>
+#include <tools/gen.hxx>
+
+// forward ---------------------------------------------------------------
+
+class SvxIconChoiceCtrlEntry;
+class SvtIconChoiceCtrl;
+
+//........................................................................
+namespace accessibility
+{
+//........................................................................
+
+// class AccessibleIconChoiceCtrlEntry ------------------------------------------
+
+    typedef ::cppu::WeakAggComponentImplHelper8< ::com::sun::star::accessibility::XAccessible
+                                                , ::com::sun::star::accessibility::XAccessibleContext
+                                                , ::com::sun::star::accessibility::XAccessibleComponent
+                                                , ::com::sun::star::accessibility::XAccessibleEventBroadcaster
+                                                , ::com::sun::star::accessibility::XAccessibleText
+                                                , ::com::sun::star::accessibility::XAccessibleAction
+                                                , ::com::sun::star::lang::XServiceInfo
+                                                , ::com::sun::star::lang::XEventListener > AccessibleIconChoiceCtrlEntry_BASE;
+
+    /** the class AccessibleListBoxEntry represents the class for an accessible object of a listbox entry */
+    class AccessibleIconChoiceCtrlEntry :   public ::comphelper::OBaseMutex,
+                                       public AccessibleIconChoiceCtrlEntry_BASE,
+                                    public ::comphelper::OCommonAccessibleText
+    {
+    private:
+        /** The treelistbox control */
+        SvtIconChoiceCtrl*                  m_pIconCtrl;
+        sal_Int32                           m_nIndex;
+
+    protected:
+        /// client id in the AccessibleEventNotifier queue
+        sal_uInt32                          m_nClientId;
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xParent;
+
+    private:
+    #ifdef ACCESSIBLE_EVENT_NOTIFICATION_ENABLED
+    // (the following method is unused currently. If you need it, simply remove the #ifdef thing here and
+    // in the cxx)
+        /** notifies all listeners that this object has changed
+            @param  _nEventId
+                is the event id
+            @param  _aOldValue
+                is the old value
+            @param  _aNewValue
+                is the new value
+        */
+        void    NotifyAccessibleEvent( sal_Int16 _nEventId,
+                                       const ::com::sun::star::uno::Any& _aOldValue,
+                                       const ::com::sun::star::uno::Any& _aNewValue );
+    #endif
+
+        Rectangle               GetBoundingBox_Impl() const;
+        Rectangle               GetBoundingBoxOnScreen_Impl() const;
+        sal_Bool                IsAlive_Impl() const;
+        sal_Bool                IsShowing_Impl() const;
+
+        Rectangle               GetBoundingBox() throw ( ::com::sun::star::lang::DisposedException );
+        Rectangle               GetBoundingBoxOnScreen() throw ( ::com::sun::star::lang::DisposedException );
+        void                    EnsureIsAlive() const throw ( ::com::sun::star::lang::DisposedException );
+
+    protected:
+        virtual ~AccessibleIconChoiceCtrlEntry();
+        /** this function is called upon disposing the component
+        */
+        virtual void SAL_CALL                   disposing();
+
+        // OCommonAccessibleText
+        virtual ::rtl::OUString                 implGetText();
+        virtual ::com::sun::star::lang::Locale  implGetLocale();
+        virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+
+    public:
+        /** Ctor()
+            @param  _rListBox
+                the view control
+            @param  _pEntry
+                the entry
+            @param  _xParent
+                is our parent accessible object
+        */
+        AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl,
+                                       sal_uLong _nPos,
+                                       const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent );
+
+        // XTypeProvider
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() 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);
+
+        // XServiceInfo - static methods
+        static com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw(com::sun::star::uno::RuntimeException);
+        static ::rtl::OUString getImplementationName_Static(void) throw(com::sun::star::uno::RuntimeException);
+
+        // XEventListener
+        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
+
+        // XAccessible
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleComponent
+        virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::awt::Point SAL_CALL getLocation(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::awt::Size SAL_CALL getSize(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL grabFocus(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getForeground(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleText
+        virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleEventBroadcaster
+        using cppu::WeakAggComponentImplHelperBase::addEventListener;
+        virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        using cppu::WeakAggComponentImplHelperBase::removeEventListener;
+        virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleAction
+        virtual sal_Int32 SAL_CALL getAccessibleActionCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    };
+
+//........................................................................
+}// namespace accessibility
+//........................................................................
+
+#endif // ACCESSIBILITY_EXT_ACCESSIBLELISTBOXENTRY_HXX_
+
diff --git a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx b/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
new file mode 100644
index 000000000000..a92ac6356fa2
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessiblelistbox.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 ACCESSIBILITY_EXT_ACCESSIBLELISTBOX_HXX_
+#define ACCESSIBILITY_EXT_ACCESSIBLELISTBOX_HXX_
+
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <cppuhelper/implbase2.hxx>
+#include <vcl/vclevent.hxx>
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+
+
+// class AccessibleListBox -----------------------------------------------
+
+class SvTreeListBox;
+
+//........................................................................
+namespace accessibility
+{
+//........................................................................
+
+    typedef ::cppu::ImplHelper2<  ::com::sun::star::accessibility::XAccessible
+                                , ::com::sun::star::accessibility::XAccessibleSelection> AccessibleListBox_BASE;
+
+    /** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry
+    */
+    class AccessibleListBox :public AccessibleListBox_BASE
+                            ,public VCLXAccessibleComponent
+    {
+    protected:
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xParent;
+
+    protected:
+        virtual ~AccessibleListBox();
+
+        // OComponentHelper overridables
+        /** this function is called upon disposing the component */
+        virtual void SAL_CALL   disposing();
+
+        // VCLXAccessibleComponent
+        virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+        virtual void    ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent );
+        virtual void    FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+        SvTreeListBox*  getListBox() const;
+
+    public:
+        /** OAccessibleBase needs a valid view
+            @param  _rListBox
+                is the box for which we implement an accessible object
+            @param  _xParent
+                is our parent accessible object
+        */
+        AccessibleListBox( SvTreeListBox& _rListBox,
+                           const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent );
+
+        // XTypeProvider
+        DECLARE_XTYPEPROVIDER()
+
+        // XInterface
+        DECLARE_XINTERFACE()
+
+        // 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);
+
+        // XServiceInfo - static methods
+        static com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw(com::sun::star::uno::RuntimeException);
+        static ::rtl::OUString getImplementationName_Static(void) throw(com::sun::star::uno::RuntimeException);
+
+        // XAccessible
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleSelection
+        void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        void SAL_CALL clearAccessibleSelection(  ) throw (::com::sun::star::uno::RuntimeException);
+        void SAL_CALL selectAllAccessibleChildren(  ) throw (::com::sun::star::uno::RuntimeException);
+        sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    };
+
+//........................................................................
+}// namespace accessibility
+//........................................................................
+
+#endif // ACCESSIBILITY_EXT_ACCESSIBLELISTBOX_HXX_
+
diff --git a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
new file mode 100644
index 000000000000..ce0fa5ad0ac0
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
@@ -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.
+ *
+ ************************************************************************/
+
+#ifndef ACCESSIBILITY_EXT_ACCESSIBLELISTBOXENTRY_HXX_
+#define ACCESSIBILITY_EXT_ACCESSIBLELISTBOXENTRY_HXX_
+
+#include <deque>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <cppuhelper/compbase8.hxx>
+#include <comphelper/broadcasthelper.hxx>
+#include <comphelper/accessibletexthelper.hxx>
+#include <tools/gen.hxx>
+#include "accessibility/extended/listboxaccessible.hxx"
+
+// forward ---------------------------------------------------------------
+
+namespace com { namespace sun { namespace star { namespace awt {
+    struct Point;
+    struct Rectangle;
+    struct Size;
+    class XFocusListener;
+} } } }
+
+class SvTreeListBox;
+class SvLBoxEntry;
+
+//........................................................................
+namespace accessibility
+{
+//........................................................................
+
+// class AccessibleListBoxEntry ------------------------------------------
+
+    typedef ::cppu::WeakAggComponentImplHelper8< ::com::sun::star::accessibility::XAccessible
+                                                , ::com::sun::star::accessibility::XAccessibleContext
+                                                , ::com::sun::star::accessibility::XAccessibleComponent
+                                                , ::com::sun::star::accessibility::XAccessibleEventBroadcaster
+                                                , ::com::sun::star::accessibility::XAccessibleAction
+                                                , ::com::sun::star::accessibility::XAccessibleSelection
+                                                , ::com::sun::star::accessibility::XAccessibleText
+                                                , ::com::sun::star::lang::XServiceInfo > AccessibleListBoxEntry_BASE;
+
+    /** the class AccessibleListBoxEntry represents the class for an accessible object of a listbox entry */
+    class AccessibleListBoxEntry:public ::comphelper::OBaseMutex
+                                   ,public AccessibleListBoxEntry_BASE
+                                ,public ::comphelper::OCommonAccessibleText
+                                ,public ListBoxAccessibleBase
+    {
+    friend class AccessibleListBox;
+
+    private:
+        /** The treelistbox control */
+        SvTreeListBox*                      m_pListBox;
+        ::std::deque< sal_Int32 >           m_aEntryPath;
+
+    protected:
+        /// client id in the AccessibleEventNotifier queue
+        sal_uInt32                          m_nClientId;
+
+        ::com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible >
+                                            m_aParent;
+
+    private:
+        Rectangle               GetBoundingBox_Impl() const;
+        Rectangle               GetBoundingBoxOnScreen_Impl() const;
+        sal_Bool                IsAlive_Impl() const;
+        sal_Bool                IsShowing_Impl() const;
+
+        Rectangle               GetBoundingBox() throw ( ::com::sun::star::lang::DisposedException );
+        Rectangle               GetBoundingBoxOnScreen() throw ( ::com::sun::star::lang::DisposedException );
+        void                    EnsureIsAlive() const throw ( ::com::sun::star::lang::DisposedException );
+
+    protected:
+        virtual ~AccessibleListBoxEntry();
+
+        /** this function is called upon disposing the component
+        */
+        virtual void SAL_CALL                   disposing();
+
+        // ListBoxAccessible/XComponent
+        virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException );
+
+        // OCommonAccessibleText
+        virtual ::rtl::OUString                 implGetText();
+        virtual ::com::sun::star::lang::Locale  implGetLocale();
+        virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+
+    public:
+        /** Ctor()
+            @param  _rListBox
+                the view control
+            @param  _pEntry
+                the entry
+            @param  _xParent
+                is our parent accessible object
+        */
+        AccessibleListBoxEntry( SvTreeListBox& _rListBox, SvLBoxEntry* _pEntry,
+                                const ::com::sun::star::uno::Reference<
+                                    ::com::sun::star::accessibility::XAccessible >& _xParent );
+
+    protected:
+        // XTypeProvider
+        virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() 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);
+
+        // XServiceInfo - static methods
+        static com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw(com::sun::star::uno::RuntimeException);
+        static ::rtl::OUString getImplementationName_Static(void) throw(com::sun::star::uno::RuntimeException);
+
+        // XAccessible
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleComponent
+        virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::awt::Point SAL_CALL getLocation(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::awt::Size SAL_CALL getSize(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL grabFocus(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getForeground(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleText
+        virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleEventBroadcaster
+        using cppu::WeakAggComponentImplHelperBase::addEventListener;
+        virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+        using cppu::WeakAggComponentImplHelperBase::removeEventListener;
+        virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleAction
+        virtual sal_Int32 SAL_CALL getAccessibleActionCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleSelection
+        void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        void SAL_CALL clearAccessibleSelection(  ) throw (::com::sun::star::uno::RuntimeException);
+        void SAL_CALL selectAllAccessibleChildren(  ) throw (::com::sun::star::uno::RuntimeException);
+        sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    private:
+        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > implGetParentAccessible( ) const;
+    };
+
+//........................................................................
+}// namespace accessibility
+//........................................................................
+
+#endif // ACCESSIBILITY_EXT_ACCESSIBLELISTBOXENTRY_HXX_
+
diff --git a/accessibility/inc/accessibility/extended/accessibletabbar.hxx b/accessibility/inc/accessibility/extended/accessibletabbar.hxx
new file mode 100644
index 000000000000..df30cc1dc647
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessibletabbar.hxx
@@ -0,0 +1,120 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ACCESSIBILITY_EXT_ACCESSIBLETABBAR_HXX_
+#define ACCESSIBILITY_EXT_ACCESSIBLETABBAR_HXX_
+
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <cppuhelper/implbase2.hxx>
+#include "accessibility/extended/accessibletabbarbase.hxx"
+
+#include <vector>
+
+namespace utl {
+class AccessibleStateSetHelper;
+}
+
+//.........................................................................
+namespace accessibility
+{
+//.........................................................................
+
+    //  ----------------------------------------------------
+    //  class AccessibleTabBar
+    //  ----------------------------------------------------
+
+    typedef ::cppu::ImplHelper2<
+        ::com::sun::star::accessibility::XAccessible,
+        ::com::sun::star::lang::XServiceInfo > AccessibleTabBar_BASE;
+
+    class AccessibleTabBar :    public AccessibleTabBarBase,
+                                public AccessibleTabBar_BASE
+    {
+    private:
+        typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > AccessibleChildren;
+
+        AccessibleChildren      m_aAccessibleChildren;
+
+    protected:
+        virtual void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+        virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+        // OCommonAccessibleComponent
+        virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XComponent
+        virtual void SAL_CALL   disposing();
+
+    public:
+        AccessibleTabBar( TabBar* pTabBar );
+        ~AccessibleTabBar();
+
+        // XInterface
+        DECLARE_XINTERFACE()
+
+        // XTypeProvider
+        DECLARE_XTYPEPROVIDER()
+
+        // XServiceInfo
+        virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessible
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleComponent
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL grabFocus(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getForeground(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleExtendedComponent
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
+    };
+
+//.........................................................................
+}   // namespace accessibility
+//.........................................................................
+
+#endif // ACCESSIBILITY_EXT_ACCESSIBLETABBAR_HXX_
+
diff --git a/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx b/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx
new file mode 100644
index 000000000000..eac79b152b75
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessibletabbarbase.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 ACCESSIBILITY_EXT_ACCESSIBLETABBARBASE_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBLETABBARBASE_HXX
+
+#include <comphelper/accessiblecomponenthelper.hxx>
+#include <tools/link.hxx>
+
+class TabBar;
+class VCLExternalSolarLock;
+class VclSimpleEvent;
+class VclWindowEvent;
+
+//.........................................................................
+namespace accessibility
+{
+//.........................................................................
+
+// ============================================================================
+
+typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE;
+
+class AccessibleTabBarBase : public AccessibleExtendedComponentHelper_BASE
+{
+public:
+    explicit            AccessibleTabBarBase( TabBar* pTabBar );
+    virtual             ~AccessibleTabBarBase();
+
+protected:
+    DECL_LINK( WindowEventListener, VclSimpleEvent* );
+
+    virtual void        ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+
+    // XComponent
+    virtual void SAL_CALL disposing();
+
+private:
+    void                SetTabBarPointer( TabBar* pTabBar );
+    void                ClearTabBarPointer();
+
+protected:
+    VCLExternalSolarLock* m_pExternalLock;
+    TabBar*             m_pTabBar;
+};
+
+// ============================================================================
+
+//.........................................................................
+}   // namespace accessibility
+//.........................................................................
+
+#endif
+
diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx b/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx
new file mode 100644
index 000000000000..9ddf20b6cc65
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessibletabbarpage.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 ACCESSIBILITY_EXT_ACCESSIBLETABBARPAGE_HXX_
+#define ACCESSIBILITY_EXT_ACCESSIBLETABBARPAGE_HXX_
+
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <cppuhelper/implbase2.hxx>
+#include "accessibility/extended/accessibletabbarbase.hxx"
+
+#include <vector>
+
+namespace utl {
+class AccessibleStateSetHelper;
+}
+
+//.........................................................................
+namespace accessibility
+{
+//.........................................................................
+
+    //  ----------------------------------------------------
+    //  class AccessibleTabBarPage
+    //  ----------------------------------------------------
+
+    typedef ::cppu::ImplHelper2<
+        ::com::sun::star::accessibility::XAccessible,
+        ::com::sun::star::lang::XServiceInfo > AccessibleTabBarPage_BASE;
+
+    class AccessibleTabBarPage :    public AccessibleTabBarBase,
+                                    public AccessibleTabBarPage_BASE
+    {
+        friend class AccessibleTabBarPageList;
+
+    private:
+        sal_uInt16              m_nPageId;
+        sal_Bool                m_bEnabled;
+        sal_Bool                m_bShowing;
+        sal_Bool                m_bSelected;
+        ::rtl::OUString         m_sPageText;
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >        m_xParent;
+
+    protected:
+        sal_Bool                IsEnabled();
+        sal_Bool                IsShowing();
+        sal_Bool                IsSelected();
+
+        void                    SetEnabled( sal_Bool bEnabled );
+        void                    SetShowing( sal_Bool bShowing );
+        void                    SetSelected( sal_Bool bSelected );
+        void                    SetPageText( const ::rtl::OUString& sPageText );
+
+        sal_uInt16              GetPageId() const { return m_nPageId; }
+
+        virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+        // OCommonAccessibleComponent
+        virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XComponent
+        virtual void SAL_CALL   disposing();
+
+    public:
+        AccessibleTabBarPage( TabBar* pTabBar, sal_uInt16 nPageId,
+                              const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent );
+        virtual ~AccessibleTabBarPage();
+
+        // XInterface
+        DECLARE_XINTERFACE()
+
+        // XTypeProvider
+        DECLARE_XTYPEPROVIDER()
+
+        // XServiceInfo
+        virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessible
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleComponent
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL grabFocus(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getForeground(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleExtendedComponent
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
+    };
+
+//.........................................................................
+}   // namespace accessibility
+//.........................................................................
+
+#endif // ACCESSIBILITY_EXT_ACCESSIBLETABBARPAGE_HXX_
+
diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx
new file mode 100644
index 000000000000..d834e3ef86c7
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.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 ACCESSIBILITY_EXT_ACCESSIBLETABBARPAGELIST_HXX_
+#define ACCESSIBILITY_EXT_ACCESSIBLETABBARPAGELIST_HXX_
+
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <cppuhelper/implbase3.hxx>
+#include "accessibility/extended/accessibletabbarbase.hxx"
+
+#include <vector>
+
+namespace utl {
+class AccessibleStateSetHelper;
+}
+
+//.........................................................................
+namespace accessibility
+{
+//.........................................................................
+
+    //  ----------------------------------------------------
+    //  class AccessibleTabBarPageList
+    //  ----------------------------------------------------
+
+    typedef ::cppu::ImplHelper3<
+        ::com::sun::star::accessibility::XAccessible,
+        ::com::sun::star::accessibility::XAccessibleSelection,
+        ::com::sun::star::lang::XServiceInfo > AccessibleTabBarPageList_BASE;
+
+    class AccessibleTabBarPageList :    public AccessibleTabBarBase,
+                                        public AccessibleTabBarPageList_BASE
+    {
+    private:
+        typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > AccessibleChildren;
+
+        AccessibleChildren      m_aAccessibleChildren;
+        sal_Int32               m_nIndexInParent;
+
+    protected:
+        void                    UpdateEnabled( sal_Int32 i, sal_Bool bEnabled );
+        void                    UpdateShowing( sal_Bool bShowing );
+        void                    UpdateSelected( sal_Int32 i, sal_Bool bSelected );
+        void                    UpdatePageText( sal_Int32 i );
+
+        void                    InsertChild( sal_Int32 i );
+        void                    RemoveChild( sal_Int32 i );
+        void                    MoveChild( sal_Int32 i, sal_Int32 j );
+
+        virtual void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+        virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+        // OCommonAccessibleComponent
+        virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XComponent
+        virtual void SAL_CALL   disposing();
+
+    public:
+        AccessibleTabBarPageList( TabBar* pTabBar, sal_Int32 nIndexInParent );
+        virtual ~AccessibleTabBarPageList();
+
+        // XInterface
+        DECLARE_XINTERFACE()
+
+        // XTypeProvider
+        DECLARE_XTYPEPROVIDER()
+
+        // XServiceInfo
+        virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessible
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleContext
+        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleComponent
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL grabFocus(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getForeground(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleExtendedComponent
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // XAccessibleSelection
+        virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL clearAccessibleSelection(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL selectAllAccessibleChildren(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    };
+
+//.........................................................................
+}   // namespace accessibility
+//.........................................................................
+
+#endif // ACCESSIBILITY_EXT_ACCESSIBLETABBARPAGELIST_HXX_
+
diff --git a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx
new file mode 100644
index 000000000000..b488e9c6068b
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessibletablistbox.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 ACCESSIBILITY_EXT_ACCESSIBLETABLISTBOX_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBLETABLISTBOX_HXX
+
+#include "AccessibleBrowseBox.hxx"
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+#include <svtools/accessibletableprovider.hxx>
+
+class SvHeaderTabListBox;
+
+// ============================================================================
+
+namespace accessibility {
+
+class AccessibleBrowseBoxTable;
+
+typedef ::cppu::ImplHelper1  <   ::com::sun::star::accessibility::XAccessible
+                            >   AccessibleTabListBox_Base;
+
+/** !!! */
+class AccessibleTabListBox
+                :public AccessibleBrowseBox
+                ,public AccessibleTabListBox_Base
+                ,public ::svt::IAccessibleTabListBox
+{
+private:
+    SvHeaderTabListBox*         m_pTabListBox;
+
+public:
+    /** ctor()
+        @param rxParent  XAccessible interface of the parent object.
+        @param rBox  The HeaderTabListBox control. */
+    AccessibleTabListBox(
+        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
+        SvHeaderTabListBox& rBox );
+
+public:
+    // XInterface
+    DECLARE_XINTERFACE( )
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER( )
+
+    // XAccessibleContext -----------------------------------------------------
+
+    /** @return  The count of visible children. */
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount()
+        throw ( ::com::sun::star::uno::RuntimeException );
+
+    /** @return  The XAccessible interface of the specified child. */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+    getAccessibleChild( sal_Int32 nChildIndex )
+        throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::uno::RuntimeException );
+
+    // XAccessibleContext
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException );
+
+    // IAccessibleTabListBox
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        getMyself()
+    {
+        return this;
+    }
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType )
+    {
+        return AccessibleBrowseBox::getHeaderBar( _eObjType );
+    }
+
+protected:
+    /** dtor() */
+    virtual ~AccessibleTabListBox();
+
+    /** This method creates and returns an accessible table.
+        @return  An AccessibleBrowseBoxTable. */
+    virtual AccessibleBrowseBoxTable*   createAccessibleTable();
+};
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
+#endif // ACCESSIBILITY_EXT_ACCESSIBLETABLISTBOX_HXX
+
diff --git a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
new file mode 100644
index 000000000000..7365a17e6138
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessibletablistboxtable.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 ACCESSIBILITY_EXT_ACCESSIBLETABLISTBOXTABLE_HXX
+#define ACCESSIBILITY_EXT_ACCESSIBLETABLISTBOXTABLE_HXX
+
+#include "AccessibleBrowseBoxTable.hxx"
+#include <comphelper/uno3.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+
+class SvHeaderTabListBox;
+
+// ============================================================================
+
+namespace accessibility {
+
+typedef ::cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleSelection >
+            AccessibleTabListBoxTableImplHelper;
+
+class AccessibleTabListBoxTable : public AccessibleBrowseBoxTable, public AccessibleTabListBoxTableImplHelper
+{
+private:
+    SvHeaderTabListBox*     m_pTabListBox;
+
+    void                    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    DECL_LINK(              WindowEventListener, VclSimpleEvent* );
+
+    // helpers ----------------------------------------------------------------
+
+    /** Throws an exception, if nIndex is not a valid child index. */
+    void ensureValidIndex( sal_Int32 _nIndex ) const
+        SAL_THROW( ( ::com::sun::star::lang::IndexOutOfBoundsException ) );
+
+    /** Returns true, if the specified row is selected. */
+    sal_Bool implIsRowSelected( sal_Int32 _nRow ) const;
+    /** Selects the specified row. */
+    void implSelectRow( sal_Int32 _nRow, sal_Bool _bSelect );
+
+    /** Returns the count of rows in the table. */
+    sal_Int32 implGetRowCount() const;
+    /** Returns the total column count in the table. */
+    sal_Int32 implGetColumnCount() const;
+    /** Returns the count of selected rows in the table. */
+    sal_Int32 implGetSelRowCount() const;
+    /** Returns the total cell count in the table (including header). */
+    inline sal_Int32 implGetCellCount() const { return implGetRowCount() * implGetColumnCount(); }
+
+    /** Returns the row index from cell index. */
+    inline sal_Int32 implGetRow( sal_Int32 _nIndex ) const { return _nIndex / implGetColumnCount(); }
+    /** Returns the column index from cell index. */
+    inline sal_Int32 implGetColumn( sal_Int32 _nIndex ) const { return _nIndex % implGetColumnCount(); }
+    /** Returns the absolute row index of the nSelRow-th selected row. */
+    sal_Int32 implGetSelRow( sal_Int32 _nSelRow ) const;
+    /** Returns the child index from cell position. */
+    inline sal_Int32 implGetIndex( sal_Int32 _nRow, sal_Int32 _nColumn ) const { return _nRow * implGetColumnCount() + _nColumn; }
+
+public:
+    /** ctor()
+        @param rxParent  XAccessible interface of the parent object.
+        @param rBox  The HeaderTabListBox control. */
+    AccessibleTabListBoxTable(
+        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
+        SvHeaderTabListBox& rBox );
+
+protected:
+    /** dtor() */
+    virtual ~AccessibleTabListBoxTable();
+
+public:
+    // XInterface
+    DECLARE_XINTERFACE( )
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER( )
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleSelection
+    void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    void SAL_CALL clearAccessibleSelection(  ) throw (::com::sun::star::uno::RuntimeException);
+    void SAL_CALL selectAllAccessibleChildren(  ) throw (::com::sun::star::uno::RuntimeException);
+    sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+};
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
+#endif // ACCESSIBILITY_EXT_ACCESSIBLETABLISTBOX_HXX
+
diff --git a/accessibility/inc/accessibility/extended/listboxaccessible.hxx b/accessibility/inc/accessibility/extended/listboxaccessible.hxx
new file mode 100644
index 000000000000..f05926f3abda
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/listboxaccessible.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 ACCESSIBILITY_EXT_LISTBOX_ACCESSIBLE
+#define ACCESSIBILITY_EXT_LISTBOX_ACCESSIBLE
+
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <tools/link.hxx>
+
+class SvTreeListBox;
+class VclSimpleEvent;
+class VclWindowEvent;
+
+//........................................................................
+namespace accessibility
+{
+//........................................................................
+
+    //====================================================================
+    //= ListBoxAccessibleBase
+    //====================================================================
+    /** helper class which couples it's life time to the life time of an
+        SvTreeListBox
+    */
+    class ListBoxAccessibleBase
+    {
+    private:
+        SvTreeListBox* m_pWindow;
+
+    protected:
+        inline SvTreeListBox*       getListBox() const
+        {
+            return  const_cast< ListBoxAccessibleBase* >( this )->m_pWindow;
+        }
+
+        inline  bool                    isAlive() const     { return NULL != m_pWindow; }
+
+    public:
+        ListBoxAccessibleBase( SvTreeListBox& _rWindow );
+
+    protected:
+        virtual ~ListBoxAccessibleBase( );
+
+        // own overridables
+        /// will be called for any VclWindowEvent events broadcasted by our VCL window
+        virtual void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent );
+
+        /** will be called when our window broadcasts the VCLEVENT_OBJECT_DYING event
+
+            <p>Usually, you derive your class from both ListBoxAccessibleBase and XComponent,
+            and call XComponent::dispose here.</p>
+        */
+        virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException ) = 0;
+
+        /// to be called in the dispose method of your derived class
+        void disposing();
+
+    private:
+        DECL_LINK( WindowEventListener, VclSimpleEvent* );
+
+    private:
+        ListBoxAccessibleBase( );                                           // never implemented
+        ListBoxAccessibleBase( const ListBoxAccessibleBase& );              // never implemented
+        ListBoxAccessibleBase& operator=( const ListBoxAccessibleBase& );   // never implemented
+    };
+
+//........................................................................
+}   // namespace accessibility
+//........................................................................
+
+#endif // ACCESSIBILITY_EXT_LISTBOX_ACCESSIBLE
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
new file mode 100644
index 000000000000..be6cffc22e8b
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -0,0 +1,711 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#if !defined INCLUDED_ACCESSIBILITY_TEXTWINDOWACCESSIBILITY_HXX
+#define INCLUDED_ACCESSIBILITY_TEXTWINDOWACCESSIBILITY_HXX
+
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+#include <svl/lstner.hxx>
+#include <svtools/textdata.hxx>
+#include <svtools/texteng.hxx>
+#include <svtools/textview.hxx>
+#include <svtools/txtattr.hxx>
+#include <com/sun/star/awt/FontWeight.hpp>
+#include <com/sun/star/lang/EventObject.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/util/Color.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/AccessibleTextType.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
+#include <com/sun/star/accessibility/XAccessibleMultiLineText.hpp>
+#include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
+#include <toolkit/awt/vclxwindow.hxx>
+#include <cppuhelper/compbase7.hxx>
+#include <comphelper/accessiblecontexthelper.hxx>
+#include <comphelper/accessibletexthelper.hxx>
+#include <rtl/ref.hxx>
+
+#include <memory>
+#include <queue>
+#include <hash_map>
+
+class TextEngine;
+class TextView;
+
+namespace css = ::com::sun::star;
+
+namespace accessibility
+{
+
+class Paragraph;
+class Document;
+
+class SfxListenerGuard
+{
+public:
+    inline SfxListenerGuard(::SfxListener & rListener):
+        m_rListener(rListener), m_pNotifier(0) {}
+
+    inline ~SfxListenerGuard() { endListening(); }
+
+    // Not thread safe:
+    void startListening(::SfxBroadcaster & rNotifier);
+
+    // Not thread safe:
+    void endListening();
+
+private:
+    ::SfxListener & m_rListener;
+    ::SfxBroadcaster * m_pNotifier;
+};
+
+class WindowListenerGuard
+{
+public:
+    inline WindowListenerGuard(::Link const & rListener):
+        m_aListener(rListener), m_pNotifier(0) {}
+
+    inline ~WindowListenerGuard() { endListening(); }
+
+    // Not thread safe:
+    void startListening(::Window & rNotifier);
+
+    // Not thread safe:
+    void endListening();
+
+private:
+    ::Link m_aListener;
+    ::Window * m_pNotifier;
+};
+
+class ParagraphInfo
+{
+public:
+    inline ParagraphInfo(::sal_Int32 nHeight): m_nHeight(nHeight) {}
+
+    inline
+    ::css::uno::WeakReference< ::css::accessibility::XAccessible > const &
+    getParagraph() const { return m_xParagraph; }
+
+    inline ::sal_Int32 getHeight() const { return m_nHeight; }
+
+    inline void setParagraph(
+        ::css::uno::Reference< ::css::accessibility::XAccessible > const &
+        rParagraph) { m_xParagraph = rParagraph; }
+
+    inline void changeHeight(::sal_Int32 nHeight) { m_nHeight = nHeight; }
+
+private:
+    ::css::uno::WeakReference< ::css::accessibility::XAccessible >
+    m_xParagraph;
+    ::sal_Int32 m_nHeight;
+};
+
+typedef ::std::vector< ParagraphInfo > Paragraphs;
+
+typedef ::cppu::WeakAggComponentImplHelper7<
+    ::css::accessibility::XAccessible,
+    ::css::accessibility::XAccessibleContext,
+    ::css::accessibility::XAccessibleComponent,
+    ::css::accessibility::XAccessibleEditableText,
+    ::css::accessibility::XAccessibleMultiLineText,
+    ::css::accessibility::XAccessibleTextAttributes,
+    ::css::accessibility::XAccessibleEventBroadcaster > ParagraphBase;
+
+// The Paragraph's number is the absolute position within the text engine (from
+// 0 to N - 1), whereas the Paragraph's index is the position within the text
+// view/accessible parent (from 0 to M - 1).  Paragraphs outside the currently
+// visible range have an index of -1.
+class ParagraphImpl:
+    public ParagraphBase, private ::comphelper::OCommonAccessibleText
+{
+public:
+    ParagraphImpl(::rtl::Reference< Document > const & rDocument,
+                  Paragraphs::size_type nNumber, ::osl::Mutex & rMutex);
+
+    // Not thread-safe.
+    inline Paragraphs::size_type getNumber() const { return m_nNumber; }
+
+    // Not thread-safe.
+    void numberChanged(bool bIncremented);
+
+    // Not thread-safe.
+    void textChanged();
+
+    // Thread-safe.
+    void notifyEvent(::sal_Int16 nEventId, ::css::uno::Any const & rOldValue,
+                     ::css::uno::Any const & rNewValue);
+
+protected:
+    // OCommonAccessibleText
+    virtual void implGetParagraphBoundary( ::css::i18n::Boundary& rBoundary,
+                                           ::sal_Int32 nIndex );
+    virtual void implGetLineBoundary( ::css::i18n::Boundary& rBoundary,
+                                      ::sal_Int32 nIndex );
+
+private:
+    virtual ::css::uno::Reference< ::css::accessibility::XAccessibleContext >
+    SAL_CALL getAccessibleContext() throw (::css::uno::RuntimeException);
+
+    virtual ::sal_Int32 SAL_CALL getAccessibleChildCount()
+        throw (::css::uno::RuntimeException);
+
+    virtual ::css::uno::Reference< ::css::accessibility::XAccessible > SAL_CALL
+    getAccessibleChild(::sal_Int32 i)
+        throw (::css::lang::IndexOutOfBoundsException,
+               ::css::uno::RuntimeException);
+
+    virtual ::css::uno::Reference< ::css::accessibility::XAccessible > SAL_CALL
+    getAccessibleParent() throw (::css::uno::RuntimeException);
+
+    virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent()
+        throw (::css::uno::RuntimeException);
+
+    virtual ::sal_Int16 SAL_CALL getAccessibleRole()
+        throw (::css::uno::RuntimeException);
+
+    virtual ::rtl::OUString SAL_CALL getAccessibleDescription()
+        throw (::css::uno::RuntimeException);
+
+    virtual ::rtl::OUString SAL_CALL getAccessibleName()
+        throw (::css::uno::RuntimeException);
+
+    virtual
+    ::css::uno::Reference< ::css::accessibility::XAccessibleRelationSet >
+    SAL_CALL getAccessibleRelationSet() throw (::css::uno::RuntimeException);
+
+    virtual
+    ::css::uno::Reference< ::css::accessibility::XAccessibleStateSet > SAL_CALL
+    getAccessibleStateSet() throw (::css::uno::RuntimeException);
+
+    virtual ::css::lang::Locale SAL_CALL getLocale()
+        throw (::css::accessibility::IllegalAccessibleComponentStateException,
+               ::css::uno::RuntimeException);
+
+    virtual ::sal_Bool SAL_CALL containsPoint(::css::awt::Point const & rPoint)
+        throw (::css::uno::RuntimeException);
+
+    virtual ::css::uno::Reference< ::css::accessibility::XAccessible > SAL_CALL
+    getAccessibleAtPoint(::css::awt::Point const & rPoint)
+        throw (::css::uno::RuntimeException);
+
+    virtual ::css::awt::Rectangle SAL_CALL getBounds()
+        throw (::css::uno::RuntimeException);
+
+    virtual ::css::awt::Point SAL_CALL getLocation()
+        throw (::css::uno::RuntimeException);
+
+    virtual ::css::awt::Point SAL_CALL getLocationOnScreen()
+        throw (::css::uno::RuntimeException);
+
+    virtual ::css::awt::Size SAL_CALL getSize()
+        throw (::css::uno::RuntimeException);
+
+    virtual void SAL_CALL grabFocus() throw (::css::uno::RuntimeException);
+
+    virtual ::css::uno::Any SAL_CALL getAccessibleKeyBinding()
+        throw (::css::uno::RuntimeException);
+
+    virtual ::css::util::Color SAL_CALL getForeground()
+        throw (::css::uno::RuntimeException);
+
+    virtual ::css::util::Color SAL_CALL getBackground()
+        throw (::css::uno::RuntimeException);
+
+    virtual ::sal_Int32 SAL_CALL getCaretPosition()
+        throw (::css::uno::RuntimeException);
+
+    virtual ::sal_Bool SAL_CALL setCaretPosition(::sal_Int32 nIndex)
+        throw (::css::lang::IndexOutOfBoundsException,
+               ::css::uno::RuntimeException);
+
+    virtual ::sal_Unicode SAL_CALL getCharacter(::sal_Int32 nIndex)
+        throw (::css::lang::IndexOutOfBoundsException,
+               ::css::uno::RuntimeException);
+
+    virtual ::css::uno::Sequence< ::css::beans::PropertyValue > SAL_CALL
+    getCharacterAttributes(::sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes )
+        throw (::css::lang::IndexOutOfBoundsException,
+               ::css::uno::RuntimeException);
+
+    virtual ::css::awt::Rectangle SAL_CALL
+    getCharacterBounds(::sal_Int32 nIndex)
+        throw (::css::lang::IndexOutOfBoundsException,
+               ::css::uno::RuntimeException);
+
+    virtual ::sal_Int32 SAL_CALL getCharacterCount()
+        throw (::css::uno::RuntimeException);
+
+    virtual ::sal_Int32 SAL_CALL
+    getIndexAtPoint(::css::awt::Point const & rPoint)
+        throw (::css::uno::RuntimeException);
+
+    virtual ::rtl::OUString SAL_CALL getSelectedText()
+        throw (::css::uno::RuntimeException);
+
+    virtual ::sal_Int32 SAL_CALL getSelectionStart()
+        throw (::css::uno::RuntimeException);
+
+    virtual ::sal_Int32 SAL_CALL getSelectionEnd()
+        throw (::css::uno::RuntimeException);
+
+    virtual ::sal_Bool SAL_CALL setSelection(::sal_Int32 nStartIndex,
+                                             ::sal_Int32 nEndIndex)
+        throw (::css::lang::IndexOutOfBoundsException,
+               ::css::uno::RuntimeException);
+
+    virtual ::rtl::OUString SAL_CALL getText()
+        throw (::css::uno::RuntimeException);
+
+    virtual ::rtl::OUString SAL_CALL getTextRange(::sal_Int32 nStartIndex,
+                                                  ::sal_Int32 nEndIndex)
+        throw (::css::lang::IndexOutOfBoundsException,
+               ::css::uno::RuntimeException);
+
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+
+    virtual ::sal_Bool SAL_CALL copyText(::sal_Int32 nStartIndex,
+                                         ::sal_Int32 nEndIndex)
+        throw (::css::lang::IndexOutOfBoundsException,
+               ::css::uno::RuntimeException);
+
+    virtual ::sal_Bool SAL_CALL cutText(::sal_Int32 nStartIndex,
+                                        ::sal_Int32 nEndIndex)
+        throw (::css::lang::IndexOutOfBoundsException,
+               ::css::uno::RuntimeException);
+
+    virtual ::sal_Bool SAL_CALL pasteText(::sal_Int32 nIndex)
+        throw (::css::lang::IndexOutOfBoundsException,
+               ::css::uno::RuntimeException);
+
+    virtual ::sal_Bool SAL_CALL deleteText(::sal_Int32 nStartIndex,
+                                           ::sal_Int32 nEndIndex)
+        throw (::css::lang::IndexOutOfBoundsException,
+               ::css::uno::RuntimeException);
+
+    virtual ::sal_Bool SAL_CALL insertText(::rtl::OUString const & rText,
+                                           ::sal_Int32 nIndex)
+        throw (::css::lang::IndexOutOfBoundsException,
+               ::css::uno::RuntimeException);
+
+    virtual ::sal_Bool SAL_CALL replaceText(
+        ::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex,
+        ::rtl::OUString const & rReplacement)
+        throw (::css::lang::IndexOutOfBoundsException,
+               ::css::uno::RuntimeException);
+
+    virtual ::sal_Bool SAL_CALL setAttributes(
+        ::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex,
+        ::css::uno::Sequence< ::css::beans::PropertyValue > const &
+        rAttributeSet)
+        throw (::css::lang::IndexOutOfBoundsException,
+               ::css::uno::RuntimeException);
+
+    virtual ::sal_Bool SAL_CALL setText(::rtl::OUString const & rText)
+        throw (::css::uno::RuntimeException);
+
+    virtual ::css::uno::Sequence< ::css::beans::PropertyValue > SAL_CALL
+    getDefaultAttributes(const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes)
+        throw (::css::uno::RuntimeException);
+
+    virtual ::css::uno::Sequence< ::css::beans::PropertyValue > SAL_CALL
+    getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes)
+        throw (::css::lang::IndexOutOfBoundsException,
+               ::css::uno::RuntimeException);
+
+    virtual ::sal_Int32 SAL_CALL getLineNumberAtIndex( ::sal_Int32 nIndex )
+        throw (::com::sun::star::lang::IndexOutOfBoundsException,
+               ::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtLineNumber( ::sal_Int32 nLineNo )
+        throw (::com::sun::star::lang::IndexOutOfBoundsException,
+               ::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtLineWithCaret(  )
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::sal_Int32 SAL_CALL getNumberOfLineWithCaret(  )
+        throw (::com::sun::star::uno::RuntimeException);
+
+    using cppu::WeakAggComponentImplHelperBase::addEventListener;
+    virtual void SAL_CALL addEventListener(
+        ::css::uno::Reference<
+        ::css::accessibility::XAccessibleEventListener > const & rListener)
+        throw (::css::uno::RuntimeException);
+
+    using cppu::WeakAggComponentImplHelperBase::removeEventListener;
+    virtual void SAL_CALL removeEventListener(
+        ::css::uno::Reference<
+        ::css::accessibility::XAccessibleEventListener > const & rListener)
+        throw (::css::uno::RuntimeException);
+
+    virtual void SAL_CALL disposing();
+
+    virtual ::rtl::OUString implGetText();
+
+    virtual ::css::lang::Locale implGetLocale();
+
+    virtual void implGetSelection(::sal_Int32 & rStartIndex,
+                                  ::sal_Int32 & rEndIndex);
+
+    // Throws ::css::lang::DisposedException:
+    void checkDisposed();
+
+    ::rtl::Reference< Document > m_xDocument;
+    Paragraphs::size_type m_nNumber;
+
+//    ::cppu::OInterfaceContainerHelper m_aListeners;
+    /// client id in the AccessibleEventNotifier queue
+    sal_uInt32 m_nClientId;
+
+    ::rtl::OUString m_aParagraphText;
+};
+
+
+typedef ::std::hash_map< ::rtl::OUString,
+                         ::css::beans::PropertyValue,
+                         ::rtl::OUStringHash,
+                         ::std::equal_to< ::rtl::OUString > > tPropValMap;
+
+class Document: public ::VCLXAccessibleComponent, public ::SfxListener
+{
+public:
+    Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine,
+             ::TextView & rView, bool bCompoundControlChild);
+
+    inline ::css::uno::Reference< ::css::accessibility::XAccessible >
+    getAccessible() { return m_xAccessible; }
+
+    // Must be called only after init has been called.
+    ::css::lang::Locale retrieveLocale();
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "ParagraphImpl const *" instead of a
+    // "::rtl::Reference< ParagraphImpl > const &".
+    ::sal_Int32 retrieveParagraphIndex(ParagraphImpl const * pParagraph);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "ParagraphImpl const *" instead of a
+    // "::rtl::Reference< ParagraphImpl > const &".
+    ::sal_Int64 retrieveParagraphState(ParagraphImpl const * pParagraph);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "ParagraphImpl const &" instead of a
+    // "::rtl::Reference< ParagraphImpl > const &".
+    ::css::awt::Rectangle
+    retrieveParagraphBounds(ParagraphImpl const * pParagraph, bool bAbsolute);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "ParagraphImpl const &" instead of a
+    // "::rtl::Reference< ParagraphImpl > const &".
+    ::rtl::OUString retrieveParagraphText(ParagraphImpl const * pParagraph);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "ParagraphImpl const &" instead of a
+    // "::rtl::Reference< ParagraphImpl > const &".
+    void retrieveParagraphSelection(ParagraphImpl const * pParagraph,
+                                    ::sal_Int32 * pBegin, ::sal_Int32 * pEnd);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "ParagraphImpl const *" instead of a
+    // "::rtl::Reference< ParagraphImpl > const &".
+    ::sal_Int32 retrieveParagraphCaretPosition(ParagraphImpl const * pParagraph);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "ParagraphImpl const &" instead of a
+    // "::rtl::Reference< ParagraphImpl > const &".
+    // Throws ::css::lang::IndexOutOfBoundsException.
+    ::css::awt::Rectangle
+    retrieveCharacterBounds(ParagraphImpl const * pParagraph,
+                            ::sal_Int32 nIndex);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "ParagraphImpl const &" instead of a
+    // "::rtl::Reference< ParagraphImpl > const &".
+    ::sal_Int32 retrieveCharacterIndex(ParagraphImpl const * pParagraph,
+                                       ::css::awt::Point const & rPoint);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "ParagraphImpl const &" instead of a
+    // "::rtl::Reference< ParagraphImpl > const &".
+    // Throws ::css::lang::IndexOutOfBoundsException.
+    ::css::uno::Sequence< ::css::beans::PropertyValue > retrieveCharacterAttributes(
+        ParagraphImpl const * pParagraph, ::sal_Int32 nIndex,
+        const ::css::uno::Sequence< ::rtl::OUString >& aRequestedAttributes);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "ParagraphImpl const &" instead of a
+    // "::rtl::Reference< ParagraphImpl > const &".
+    ::css::uno::Sequence< ::css::beans::PropertyValue > retrieveDefaultAttributes(
+        ParagraphImpl const * pParagraph,
+        const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "ParagraphImpl const &" instead of a
+    // "::rtl::Reference< ParagraphImpl > const &".
+    // Throws ::css::lang::IndexOutOfBoundsException.
+    ::css::uno::Sequence< ::css::beans::PropertyValue > retrieveRunAttributes(
+        ParagraphImpl const * pParagraph, ::sal_Int32 Index,
+        const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "ParagraphImpl const &" instead of a
+    // "::rtl::Reference< ParagraphImpl > const &".
+    void changeParagraphText(ParagraphImpl * pParagraph,
+                             ::rtl::OUString const & rText);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "ParagraphImpl const &" instead of a
+    // "::rtl::Reference< ParagraphImpl > const &".
+    // Throws ::css::lang::IndexOutOfBoundsException.
+    void changeParagraphText(ParagraphImpl * pParagraph, ::sal_Int32 nBegin,
+                             ::sal_Int32 nEnd, bool bCut, bool bPaste,
+                             ::rtl::OUString const & rText);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "ParagraphImpl const &" instead of a
+    // "::rtl::Reference< ParagraphImpl > const &".
+    // Throws ::css::lang::IndexOutOfBoundsException.
+    void copyParagraphText(ParagraphImpl const * pParagraph,
+                           ::sal_Int32 nBegin, ::sal_Int32 nEnd);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "ParagraphImpl const &" instead of a
+    // "::rtl::Reference< ParagraphImpl > const &".
+    // Throws ::css::lang::IndexOutOfBoundsException.
+    void changeParagraphAttributes(
+        ParagraphImpl * pParagraph, ::sal_Int32 nBegin, ::sal_Int32 nEnd,
+        ::css::uno::Sequence< ::css::beans::PropertyValue > const &
+        rAttributeSet);
+
+    // Must be called only after init has been called.
+    // To make it possible for this method to be (indirectly) called from
+    // within Paragraph's constructor (i.e., when the Paragraph's ref count is
+    // still zero), pass a "ParagraphImpl const &" instead of a
+    // "::rtl::Reference< ParagraphImpl > const &".
+    // Throws ::css::lang::IndexOutOfBoundsException.
+    void changeParagraphSelection(ParagraphImpl * pParagraph,
+                                  ::sal_Int32 nBegin, ::sal_Int32 nEnd);
+
+    ::css::i18n::Boundary
+    retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph,
+                                   ::sal_Int32 nIndex, ::sal_Int32 *pLineNo = NULL);
+
+    ::css::i18n::Boundary
+    retrieveParagraphBoundaryOfLine( ParagraphImpl const * pParagraph,
+                                     ::sal_Int32 nIndex );
+
+    sal_Int32 retrieveParagraphLineWithCursor( ParagraphImpl const * pParagraph );
+
+    ::css::uno::Reference< ::css::accessibility::XAccessibleRelationSet >
+    retrieveParagraphRelationSet( ParagraphImpl const * pParagraph );
+
+protected:
+    // window event listener from base class
+    virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+
+private:
+    virtual ::sal_Int32 SAL_CALL getAccessibleChildCount()
+        throw (::css::uno::RuntimeException);
+
+    virtual ::css::uno::Reference< ::css::accessibility::XAccessible >
+    SAL_CALL getAccessibleChild(::sal_Int32 i)
+        throw (::css::lang::IndexOutOfBoundsException,
+               ::css::uno::RuntimeException);
+
+    virtual ::sal_Int16 SAL_CALL getAccessibleRole()
+        throw (::css::uno::RuntimeException);
+
+    virtual ::css::uno::Reference< ::css::accessibility::XAccessible >
+    SAL_CALL getAccessibleAtPoint(::css::awt::Point const & rPoint)
+        throw (::css::uno::RuntimeException);
+
+    // ??? Will be called with both the external (Solar) and internal mutex
+    // locked:
+    virtual void SAL_CALL disposing();
+
+    // ??? Will be called with the external (Solar) mutex locked.
+    // init will already have been called.
+    virtual void Notify(::SfxBroadcaster & rBC, ::SfxHint const & rHint);
+
+    // Assuming that this will only be called with the external (Solar) mutex
+    // locked.
+    // init will already have been called.
+    DECL_LINK(WindowEventHandler, VclSimpleEvent *);
+
+    // Must be called with both the external (Solar) and internal mutex
+    // locked.
+    void init();
+
+    // Must be called with both the external (Solar) and internal mutex
+    // locked, and after init has been called:
+    ::rtl::Reference< ParagraphImpl >
+    getParagraph(Paragraphs::iterator const & rIt);
+
+    // Must be called with both the external (Solar) and internal mutex
+    // locked, and after init has been called.
+    // Throws ::css::uno::RuntimeException.
+    ::css::uno::Reference< ::css::accessibility::XAccessible >
+    getAccessibleChild(Paragraphs::iterator const & rIt);
+
+    // Must be called with both the external (Solar) and internal mutex
+    // locked, and after init has been called:
+    void determineVisibleRange();
+
+    // Must be called with both the external (Solar) and internal mutex
+    // locked, and after init has been called:
+    void notifyVisibleRangeChanges(
+        Paragraphs::iterator const & rOldVisibleBegin,
+        Paragraphs::iterator const & rOldVisibleEnd,
+        Paragraphs::iterator const & rInserted);
+
+    // Must be called with both the external (Solar) and internal mutex
+    // locked, and after init has been called:
+    void changeParagraphText(::sal_uLong nNumber, ::sal_uInt16 nBegin, ::sal_uInt16 nEnd,
+                             bool bCut, bool bPaste,
+                             ::rtl::OUString const & rText);
+
+    void
+    handleParagraphNotifications();
+
+    void handleSelectionChangeNotification();
+
+    void notifySelectionChange( sal_Int32 nFirst, sal_Int32 nLast );
+
+    void justifySelection( TextPaM& rTextStart, TextPaM& rTextEnd );
+
+    void disposeParagraphs();
+
+    static ::css::uno::Any mapFontColor(::Color const & rColor);
+
+    static ::Color mapFontColor(::css::uno::Any const & rColor);
+
+    static ::css::uno::Any mapFontWeight(::FontWeight nWeight);
+
+    static ::FontWeight mapFontWeight(::css::uno::Any const & rWeight);
+
+    void retrieveDefaultAttributesImpl(
+        ParagraphImpl const * pParagraph,
+        const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes,
+        tPropValMap& rDefAttrSeq);
+
+    void retrieveRunAttributesImpl(
+        ParagraphImpl const * pParagraph, ::sal_Int32 Index,
+        const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes,
+        tPropValMap& rRunAttrSeq);
+
+    static ::css::uno::Sequence< ::css::beans::PropertyValue >
+    convertHashMapToSequence(tPropValMap& rAttrSeq);
+
+    ::css::uno::Reference< ::css::accessibility::XAccessible > m_xAccessible;
+    ::TextEngine & m_rEngine;
+    ::TextView & m_rView;
+
+    SfxListenerGuard m_aEngineListener;
+    WindowListenerGuard m_aViewListener;
+
+    // All the following members have valid values only after calling init:
+
+    ::std::auto_ptr< Paragraphs > m_xParagraphs;
+
+    // m_nViewOffset is from the start of the document (0) to the start of the
+    // current view, and m_nViewHeight is the height of the view:
+    ::sal_Int32 m_nViewOffset;
+    ::sal_Int32 m_nViewHeight;
+
+    // m_aVisibleBegin points to the first Paragraph that is (partially)
+    // contained in the view, and m_aVisibleEnd points past the last Paragraph
+    // that is (partially) contained.  If no Paragraphs are (partially) in the
+    // view, both m_aVisibleBegin and m_aVisibleEnd are set to
+    // m_xParagraphs->end().  These values are only changed by
+    // determineVisibleRange.
+    Paragraphs::iterator m_aVisibleBegin;
+    Paragraphs::iterator m_aVisibleEnd;
+
+    // m_nVisibleBeginOffset is from m_nViewOffset back to the start of the
+    // Paragraph pointed to by m_aVisibleBegin (and always has a non-negative
+    // value).  If m_aVisibleBegin == m_xParagraphs->end(),
+    // m_nVisibleBeginOffset is set to 0.  These values are only changed by
+    // determineVisibleRange.
+    ::sal_Int32 m_nVisibleBeginOffset;
+
+    // If no selection has yet been set, all the following four variables are
+    // set to -1.  m_nSelectionLastPara/Pos is also the cursor position.
+    ::sal_Int32 m_nSelectionFirstPara;
+    ::sal_Int32 m_nSelectionFirstPos;
+    ::sal_Int32 m_nSelectionLastPara;
+    ::sal_Int32 m_nSelectionLastPos;
+
+    Paragraphs::iterator m_aFocused;
+
+    ::std::queue< ::TextHint > m_aParagraphNotifications;
+    bool m_bSelectionChangedNotification;
+    bool m_bCompoundControlChild;
+};
+
+}
+
+#endif // INCLUDED_ACCESSIBILITY_TEXTWINDOWACCESSIBILITY_HXX
diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
new file mode 100644
index 000000000000..0df5bd0fd1b4
--- /dev/null
+++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.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 ACCESSIBILITY_HELPER_COMBOLISTBOXHELPER_HXX
+#define ACCESSIBILITY_HELPER_COMBOLISTBOXHELPER_HXX
+
+#include <tools/gen.hxx>
+#include <tools/string.hxx>
+#include <tools/wintypes.hxx>
+
+namespace com { namespace sun { namespace star { namespace datatransfer { namespace clipboard {
+    class XClipboard;
+} } } } }
+
+class Window;
+namespace accessibility
+{
+    class SAL_NO_VTABLE IComboListBoxHelper
+    {
+    public:
+        virtual String          GetEntry( sal_uInt16 nPos ) const = 0;
+        virtual Rectangle       GetDropDownPosSizePixel( ) const = 0;
+        virtual Rectangle       GetBoundingRectangle( sal_uInt16 nItem ) const = 0;
+        virtual Rectangle       GetWindowExtentsRelative( Window* pRelativeWindow ) = 0;
+        virtual sal_Bool            IsActive() const = 0;
+        virtual sal_Bool            IsEntryVisible( sal_uInt16 nPos ) const = 0;
+        virtual sal_uInt16          GetDisplayLineCount() const = 0;
+        virtual void            GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const = 0;
+        virtual WinBits         GetStyle() const = 0;
+        virtual sal_Bool            IsMultiSelectionEnabled() const = 0;
+        virtual sal_uInt16          GetTopEntry() const = 0;
+        virtual sal_Bool            IsEntryPosSelected( sal_uInt16 nPos ) const = 0;
+        virtual sal_uInt16          GetEntryCount() const = 0;
+        virtual void            Select() = 0;
+        virtual void            SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect = sal_True ) = 0;
+        virtual sal_uInt16          GetSelectEntryCount() const = 0;
+        virtual void            SetNoSelection() = 0;
+        virtual sal_uInt16          GetSelectEntryPos( sal_uInt16 nSelIndex = 0 ) const = 0;
+        virtual sal_Bool            IsInDropDown() const = 0;
+        virtual Rectangle       GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const = 0;
+        virtual long            GetIndexForPoint( const Point& rPoint, sal_uInt16& nPos ) const = 0;
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >
+                                GetClipboard() = 0;
+    };
+}
+#endif // ACCESSIBILITY_HELPER_COMBOLISTBOXHELPER_HXX
diff --git a/accessibility/inc/accessibility/helper/acc_factory.hxx b/accessibility/inc/accessibility/helper/acc_factory.hxx
new file mode 100644
index 000000000000..21c5ce47e5c7
--- /dev/null
+++ b/accessibility/inc/accessibility/helper/acc_factory.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 ACCESSIBILITY_HELPER_FACTORY_HXX
+#define ACCESSIBILITY_HELPER_FACTORY_HXX
+
+#include <toolkit/helper/accessiblefactory.hxx>
+#include <svtools/accessiblefactory.hxx>
+
+/** this is the entry point to retrieve a factory for the toolkit-level Accessible/Contexts supplied
+    by this library
+
+    This function implements the factory function needed in toolkit
+    (of type GetStandardAccComponentFactory).
+*/
+extern "C" void* SAL_CALL getStandardAccessibleFactory();
+
+/** this is the entry point to retrieve a factory for the svtools-level Accessible/Contexts supplied
+    by this library
+
+    This function implements the factory function needed in svtools
+    (of type GetSvtAccessibilityComponentFactory).
+*/
+extern "C" void* SAL_CALL getSvtAccessibilityComponentFactory();
+
+#endif // ACCESSIBILITY_HELPER_FACTORY_HXX
diff --git a/accessibility/inc/accessibility/helper/accessiblestrings.hrc b/accessibility/inc/accessibility/helper/accessiblestrings.hrc
new file mode 100644
index 000000000000..1f936e678b98
--- /dev/null
+++ b/accessibility/inc/accessibility/helper/accessiblestrings.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.
+ *
+ ************************************************************************/
+
+#ifndef ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_
+#define ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_
+
+
+//------------------------------------------------------------------------------
+
+#define RID_TK_ACC_START        1000
+
+
+// Accessible Action Id's ------------------------------------------------------
+
+#define RID_STR_ACC_ACTION_CLICK            ( RID_TK_ACC_START +    0 )
+#define RID_STR_ACC_ACTION_TOGGLEPOPUP      ( RID_TK_ACC_START +    1 )
+#define RID_STR_ACC_ACTION_SELECT           ( RID_TK_ACC_START +    2 )
+#define RID_STR_ACC_ACTION_INCLINE          ( RID_TK_ACC_START +    3 )
+#define RID_STR_ACC_ACTION_DECLINE          ( RID_TK_ACC_START +    4 )
+#define RID_STR_ACC_ACTION_INCBLOCK         ( RID_TK_ACC_START +    5 )
+#define RID_STR_ACC_ACTION_DECBLOCK         ( RID_TK_ACC_START +    6 )
+
+
+#define RID_STR_ACC_NAME_BROWSEBUTTON       ( RID_TK_ACC_START + 100 )
+#define RID_STR_ACC_DESC_PANELDECL_TABBAR   ( RID_TK_ACC_START + 101 )
+
+// -----------------------------------------------------------------------------
+
+#endif          // ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_
diff --git a/accessibility/inc/accessibility/helper/accresmgr.hxx b/accessibility/inc/accessibility/helper/accresmgr.hxx
new file mode 100644
index 000000000000..add0aaced7e3
--- /dev/null
+++ b/accessibility/inc/accessibility/helper/accresmgr.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 ACCESSIBILITY_HELPER_TKARESMGR_HXX
+#define ACCESSIBILITY_HELPER_TKARESMGR_HXX
+
+#ifndef _RTL_USTRING_HXX
+#include <rtl/ustring.hxx>
+#endif
+
+class SimpleResMgr;
+
+#define TK_RES_STRING(id) TkResMgr::loadString(id)
+
+// -----------------------------------------------------------------------------
+// TkResMgr
+// -----------------------------------------------------------------------------
+
+class TkResMgr
+{
+    static SimpleResMgr* m_pImpl;
+
+private:
+    // no instantiation allowed
+    TkResMgr() { }
+    ~TkResMgr() { }
+
+    // we'll instantiate one static member of the following class,
+    // which in it's dtor ensures that m_pImpl will be deleted
+    class EnsureDelete
+    {
+    public:
+        EnsureDelete() { }
+        ~EnsureDelete();
+    };
+    friend class EnsureDelete;
+
+protected:
+    static void ensureImplExists();
+
+public:
+    // loads the string with the specified resource id
+    static ::rtl::OUString loadString( sal_uInt16 nResId );
+};
+
+
+#endif // ACCESSIBILITY_HELPER_TKARESMGR_HXX
+
diff --git a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx b/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
new file mode 100644
index 000000000000..25fb3ac121b3
--- /dev/null
+++ b/accessibility/inc/accessibility/helper/characterattributeshelper.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 ACCESSIBILITY_HELPER_CHARACTERATTRIBUTESHELPER_HXX
+#define ACCESSIBILITY_HELPER_CHARACTERATTRIBUTESHELPER_HXX
+
+#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX
+#include <com/sun/star/uno/Sequence.hxx>
+#endif
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <vcl/font.hxx>
+
+#include <map>
+
+// -----------------------------------------------------------------------------
+// class CharacterAttributesHelper
+// -----------------------------------------------------------------------------
+
+class CharacterAttributesHelper
+{
+private:
+
+    typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any, ::std::less< ::rtl::OUString > > AttributeMap;
+
+    AttributeMap    m_aAttributeMap;
+
+public:
+
+    CharacterAttributesHelper( const Font& rFont, sal_Int32 nBackColor, sal_Int32 nColor );
+    ~CharacterAttributesHelper();
+
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetCharacterAttributes();
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetCharacterAttributes( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes );
+};
+
+#endif  // ACCESSIBILITY_HELPER_CHARACTERATTRIBUTESHELPER_HXX
diff --git a/accessibility/inc/accessibility/helper/listboxhelper.hxx b/accessibility/inc/accessibility/helper/listboxhelper.hxx
new file mode 100644
index 000000000000..b1edb36893f0
--- /dev/null
+++ b/accessibility/inc/accessibility/helper/listboxhelper.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 ACCESSIBILITY_HELPER_LISTBOXHELPER_HXX
+#define ACCESSIBILITY_HELPER_LISTBOXHELPER_HXX
+
+#include <accessibility/helper/IComboListBoxHelper.hxx>
+#include <vcl/lstbox.hxx>
+#include <vcl/combobox.hxx>
+#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
+
+// -----------------------------------------------------------------------------
+// globals
+// -----------------------------------------------------------------------------
+
+const sal_Int32 DEFAULT_INDEX_IN_PARENT = -1;
+
+// -----------------------------------------------------------------------------
+// class VCLListBoxHelper
+// -----------------------------------------------------------------------------
+
+template< class T > class VCLListBoxHelper : public ::accessibility::IComboListBoxHelper
+{
+private:
+    T&  m_aComboListBox;
+
+public:
+    inline
+    VCLListBoxHelper( T& _pListBox ) :
+        m_aComboListBox( _pListBox ){}
+
+    // -----------------------------------------------------------------------------
+    virtual String          GetEntry( sal_uInt16 nPos ) const
+    {
+        return m_aComboListBox.GetEntry( nPos );
+    }
+    // -----------------------------------------------------------------------------
+    virtual Rectangle       GetDropDownPosSizePixel() const
+    {
+        Rectangle aTemp = m_aComboListBox.GetWindowExtentsRelative(NULL);
+        Rectangle aRet = m_aComboListBox.GetDropDownPosSizePixel();
+        aRet.Move(aTemp.TopLeft().X(),aTemp.TopLeft().Y());
+        return aRet;
+    }
+    // -----------------------------------------------------------------------------
+    virtual Rectangle       GetBoundingRectangle( sal_uInt16 nItem ) const
+    {
+        Rectangle aRect;
+        if ( m_aComboListBox.IsInDropDown() && IsEntryVisible( nItem ) )
+        {
+            Rectangle aTemp = m_aComboListBox.GetDropDownPosSizePixel();
+            Size aSize = aTemp.GetSize();
+            aSize.Height() /= m_aComboListBox.GetDisplayLineCount();
+            Point aTopLeft = aTemp.TopLeft();
+            aTopLeft.Y() += aSize.Height() * ( nItem - m_aComboListBox.GetTopEntry() );
+            aRect = Rectangle( aTopLeft, aSize );
+        }
+        else
+            aRect = m_aComboListBox.GetBoundingRectangle( nItem );
+        return aRect;
+    }
+    // -----------------------------------------------------------------------------
+    virtual Rectangle       GetWindowExtentsRelative( Window* pRelativeWindow )
+    {
+        return m_aComboListBox.GetWindowExtentsRelative( pRelativeWindow );
+    }
+    // -----------------------------------------------------------------------------
+    virtual sal_Bool            IsActive() const
+    {
+        return m_aComboListBox.IsActive();
+    }
+    // -----------------------------------------------------------------------------
+    virtual sal_Bool            IsEntryVisible( sal_uInt16 nPos ) const
+    {
+        sal_uInt16 nTopEntry = m_aComboListBox.GetTopEntry();
+        sal_uInt16 nLines = m_aComboListBox.GetDisplayLineCount();
+        return ( nPos >= nTopEntry && nPos < ( nTopEntry + nLines ) );
+    }
+    // -----------------------------------------------------------------------------
+    virtual sal_uInt16          GetDisplayLineCount() const
+    {
+        return m_aComboListBox.GetDisplayLineCount();
+    }
+    // -----------------------------------------------------------------------------
+    virtual void            GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const
+    {
+        m_aComboListBox.GetMaxVisColumnsAndLines(rnCols,rnLines);
+    }
+    // -----------------------------------------------------------------------------
+    virtual WinBits         GetStyle() const
+    {
+        return m_aComboListBox.GetStyle();
+    }
+    // -----------------------------------------------------------------------------
+    virtual sal_Bool            IsMultiSelectionEnabled() const
+    {
+        return m_aComboListBox.IsMultiSelectionEnabled();
+    }
+    // -----------------------------------------------------------------------------
+    virtual sal_uInt16          GetTopEntry() const
+    {
+        return m_aComboListBox.GetTopEntry();
+    }
+    // -----------------------------------------------------------------------------
+    virtual sal_Bool            IsEntryPosSelected( sal_uInt16 nPos ) const
+    {
+        return m_aComboListBox.IsEntryPosSelected(nPos);
+    }
+    // -----------------------------------------------------------------------------
+    virtual sal_uInt16          GetEntryCount() const
+    {
+        return m_aComboListBox.GetEntryCount();
+    }
+    // -----------------------------------------------------------------------------
+    virtual void    Select()
+    {
+        m_aComboListBox.Select();
+    }
+    // -----------------------------------------------------------------------------
+    virtual void    SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect = sal_True )
+    {
+        m_aComboListBox.SelectEntryPos(nPos,bSelect);
+    }
+    // -----------------------------------------------------------------------------
+    virtual sal_uInt16          GetSelectEntryCount() const
+    {
+        return m_aComboListBox.GetSelectEntryCount();
+    }
+    // -----------------------------------------------------------------------------
+    virtual void    SetNoSelection()
+    {
+        m_aComboListBox.SetNoSelection();
+    }
+    // -----------------------------------------------------------------------------
+    virtual sal_uInt16          GetSelectEntryPos( sal_uInt16 nSelIndex = 0 ) const
+    {
+        return m_aComboListBox.GetSelectEntryPos(nSelIndex);
+    }
+    // -----------------------------------------------------------------------------
+    virtual sal_Bool            IsInDropDown() const
+    {
+        return m_aComboListBox.IsInDropDown();
+    }
+    // -----------------------------------------------------------------------------
+    virtual Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const
+    {
+        Rectangle aRect;
+
+        Pair aEntryCharacterRange = m_aComboListBox.GetLineStartEnd( _nEntryPos );
+        if ( aEntryCharacterRange.A() + _nCharacterIndex <= aEntryCharacterRange.B() )
+        {
+            long nIndex = aEntryCharacterRange.A() + _nCharacterIndex;
+            aRect = m_aComboListBox.GetCharacterBounds( nIndex );
+        }
+        return aRect;
+    }
+    // -----------------------------------------------------------------------------
+    long GetIndexForPoint( const Point& rPoint, sal_uInt16& nPos ) const
+    {
+        return m_aComboListBox.GetIndexForPoint( rPoint, nPos );
+    }
+    // -----------------------------------------------------------------------------
+    ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >
+        GetClipboard()
+    {
+        return m_aComboListBox.GetClipboard();
+    }
+    // -----------------------------------------------------------------------------
+};
+
+#endif  // ACCESSIBILITY_HELPER_LISTBOXHELPER_HXX
+
diff --git a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx
new file mode 100644
index 000000000000..4555c91ebf75
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx
@@ -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.
+ *
+ ************************************************************************/
+
+#ifndef ACCESSIBILITY_STANDARD_ACCESSIBLEMENUBASECOMPONENT_HXX
+#define ACCESSIBILITY_STANDARD_ACCESSIBLEMENUBASECOMPONENT_HXX
+
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/awt/Point.hpp>
+#include <comphelper/accessiblecomponenthelper.hxx>
+#ifndef _CPPUHELPER_IMPLBASE2_HXX
+#include <cppuhelper/implbase2.hxx>
+#endif
+#include <tools/link.hxx>
+
+#include <vector>
+
+class Menu;
+class VclSimpleEvent;
+class VclMenuEvent;
+class VCLExternalSolarLock;
+
+namespace utl {
+class AccessibleStateSetHelper;
+}
+
+//  ----------------------------------------------------
+//  class OAccessibleMenuBaseComponent
+//  ----------------------------------------------------
+
+typedef ::comphelper::OAccessibleExtendedComponentHelper    AccessibleExtendedComponentHelper_BASE;
+
+typedef ::cppu::ImplHelper2<
+    ::com::sun::star::accessibility::XAccessible,
+    ::com::sun::star::lang::XServiceInfo > OAccessibleMenuBaseComponent_BASE;
+
+class OAccessibleMenuBaseComponent : public AccessibleExtendedComponentHelper_BASE,
+                                     public OAccessibleMenuBaseComponent_BASE
+{
+    friend class OAccessibleMenuItemComponent;
+    friend class VCLXAccessibleMenuItem;
+    friend class VCLXAccessibleMenu;
+
+private:
+    VCLExternalSolarLock*   m_pExternalLock;
+
+protected:
+    typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > AccessibleChildren;
+
+    AccessibleChildren      m_aAccessibleChildren;
+    Menu*                   m_pMenu;
+
+    sal_Bool                m_bEnabled;
+    sal_Bool                m_bFocused;
+    sal_Bool                m_bVisible;
+    sal_Bool                m_bSelected;
+    sal_Bool                m_bChecked;
+
+    Menu*                   GetMenu() { return m_pMenu; }
+
+    virtual sal_Bool        IsEnabled();
+    virtual sal_Bool        IsFocused();
+    virtual sal_Bool        IsVisible();
+    virtual sal_Bool        IsSelected();
+    virtual sal_Bool        IsChecked();
+
+    void                    SetEnabled( sal_Bool bEnabled );
+    void                    SetFocused( sal_Bool bFocused );
+    void                    SetVisible( sal_Bool bVisible );
+    void                    SetSelected( sal_Bool bSelected );
+    void                    SetChecked( sal_Bool bChecked );
+
+    void                    UpdateEnabled( sal_Int32 i, sal_Bool bEnabled );
+    void                    UpdateFocused( sal_Int32 i, sal_Bool bFocused );
+    void                    UpdateVisible();
+    void                    UpdateSelected( sal_Int32 i, sal_Bool bSelected );
+    void                    UpdateChecked( sal_Int32 i, sal_Bool bChecked );
+    void                    UpdateAccessibleName( sal_Int32 i );
+    void                    UpdateItemText( sal_Int32 i );
+
+    sal_Int32               GetChildCount();
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetChild( sal_Int32 i );
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetChildAt( const ::com::sun::star::awt::Point& rPoint );
+
+    void                    InsertChild( sal_Int32 i );
+    void                    RemoveChild( sal_Int32 i );
+
+    virtual sal_Bool        IsHighlighted();
+    sal_Bool                IsChildHighlighted();
+
+    void                    SelectChild( sal_Int32 i );
+    void                    DeSelectAll();
+    sal_Bool                IsChildSelected( sal_Int32 i );
+
+    virtual void            Select();
+    virtual void            DeSelect();
+    virtual void            Click();
+    virtual sal_Bool        IsPopupMenuOpen();
+
+    DECL_LINK( MenuEventListener, VclSimpleEvent* );
+
+    virtual void            ProcessMenuEvent( const VclMenuEvent& rVclMenuEvent );
+
+    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) = 0;
+
+    // XComponent
+    virtual void SAL_CALL   disposing();
+
+public:
+    OAccessibleMenuBaseComponent( Menu* pMenu );
+    virtual ~OAccessibleMenuBaseComponent();
+
+    void                    SetStates();
+
+    // XInterface
+    DECLARE_XINTERFACE()
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER()
+
+    // XServiceInfo
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessible
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleContext
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException);
+};
+
+#endif // ACCESSIBILITY_STANDARD_ACCESSIBLEMENUBASECOMPONENT_HXX
+
diff --git a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx
new file mode 100644
index 000000000000..8450be8f3a49
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/accessiblemenucomponent.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 ACCESSIBILITY_STANDARD_ACCESSIBLEMENUCOMPONENT_HXX
+#define ACCESSIBILITY_STANDARD_ACCESSIBLEMENUCOMPONENT_HXX
+
+#include <accessibility/standard/accessiblemenubasecomponent.hxx>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+#ifndef _CPPUHELPER_IMPLBASE1_HXX
+#include <cppuhelper/implbase1.hxx>
+#endif
+
+
+//  ----------------------------------------------------
+//  class OAccessibleMenuComponent
+//  ----------------------------------------------------
+
+typedef ::comphelper::OAccessibleExtendedComponentHelper    AccessibleExtendedComponentHelper_BASE;
+
+typedef ::cppu::ImplHelper1<
+    ::com::sun::star::accessibility::XAccessibleSelection > OAccessibleMenuComponent_BASE;
+
+class OAccessibleMenuComponent : public OAccessibleMenuBaseComponent,
+                                 public OAccessibleMenuComponent_BASE
+{
+protected:
+    virtual sal_Bool        IsEnabled();
+    virtual sal_Bool        IsVisible();
+
+    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+    // OCommonAccessibleComponent
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+
+public:
+    OAccessibleMenuComponent( Menu* pMenu );
+    virtual ~OAccessibleMenuComponent();
+
+    // XInterface
+    DECLARE_XINTERFACE()
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER()
+
+    // XAccessibleContext
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleComponent
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL grabFocus(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getForeground(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleExtendedComponent
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleSelection
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL clearAccessibleSelection(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+};
+
+#endif // ACCESSIBILITY_STANDARD_ACCESSIBLEMENUCOMPONENT_HXX
+
diff --git a/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx
new file mode 100644
index 000000000000..d5e513e555ea
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.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 ACCESSIBILITY_STANDARD_ACCESSIBLEMENUITEMCOMPONENT_HXX
+#define ACCESSIBILITY_STANDARD_ACCESSIBLEMENUITEMCOMPONENT_HXX
+
+#include <accessibility/standard/accessiblemenubasecomponent.hxx>
+
+
+//  ----------------------------------------------------
+//  class OAccessibleMenuItemComponent
+//  ----------------------------------------------------
+
+class OAccessibleMenuItemComponent : public OAccessibleMenuBaseComponent
+{
+    friend class OAccessibleMenuBaseComponent;
+
+protected:
+    Menu*                   m_pParent;
+    sal_uInt16              m_nItemPos;
+    ::rtl::OUString         m_sAccessibleName;
+    ::rtl::OUString         m_sItemText;
+
+    virtual sal_Bool        IsEnabled();
+    virtual sal_Bool        IsVisible();
+    virtual void            Select();
+    virtual void            DeSelect();
+    virtual void            Click();
+
+    void                    SetItemPos( sal_uInt16 nItemPos );
+    void                    SetAccessibleName( const ::rtl::OUString& sAccessibleName );
+    ::rtl::OUString         GetAccessibleName();
+    void                    SetItemText( const ::rtl::OUString& sItemText );
+    ::rtl::OUString         GetItemText();
+
+    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+    // OCommonAccessibleComponent
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XComponent
+    virtual void SAL_CALL   disposing();
+
+public:
+    OAccessibleMenuItemComponent( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu );
+    virtual ~OAccessibleMenuItemComponent();
+
+    // XAccessibleContext
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleComponent
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL grabFocus(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getForeground(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleExtendedComponent
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
+};
+
+#endif // ACCESSIBILITY_STANDARD_ACCESSIBLEMENUITEMCOMPONENT_HXX
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
new file mode 100644
index 000000000000..123016f070bd
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblebox.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLEBOX_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLEBOX_HXX
+
+#include <map>
+#include <accessibility/standard/vclxaccessibleedit.hxx>
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_STANDARD_ACCESSIBLEROLE_HPP_
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#endif
+#include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp>
+#ifndef _CPPUHELPER_IMPLBASE2_HXX
+#include <cppuhelper/implbase2.hxx>
+#endif
+
+
+typedef ::cppu::ImplHelper2<
+    ::com::sun::star::accessibility::XAccessible,
+    ::com::sun::star::accessibility::XAccessibleAction
+    > VCLXAccessibleBox_BASE;
+
+
+/** Base class for list- and combo boxes.  This class manages the box'
+    children.  The classed derived from this one have only to implement the
+    <member>IsValid</member> method and return the corrent implementation name.
+*/
+class VCLXAccessibleBox
+    : public VCLXAccessibleComponent,
+      public VCLXAccessibleBox_BASE
+{
+public:
+    enum BoxType {COMBOBOX, LISTBOX};
+
+    /** The constructor is initialized with the box type whitch may be
+        either <const>COMBOBOX</const> or <const>LISTBOX</const> and a flag
+        indicating whether the box is a drop down box.
+    */
+    VCLXAccessibleBox (VCLXWindow* pVCLXindow, BoxType aType, bool bIsDropDownBox);
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER()
+
+    // XInterface
+    DECLARE_XINTERFACE()
+
+
+
+    // XAccessible
+
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL
+            getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleContext
+
+    /** Each object has one or two children: an optional text field and the
+        actual list.  The text field is not provided for non drop down list
+        boxes.
+    */
+    sal_Int32 SAL_CALL getAccessibleChildCount (void)
+        throw (::com::sun::star::uno::RuntimeException);
+    /** For drop down list boxes the text field is a not editable
+        <type>VCLXAccessibleTextField</type>, for combo boxes it is an
+        editable <type>VLCAccessibleEdit</type>.
+    */
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
+        getAccessibleChild (sal_Int32 i)
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    /** The role is always <const
+        scope="com::sun::star::accessibility">AccessibleRole::COMBO_BOX</const>.
+    */
+    sal_Int16 SAL_CALL getAccessibleRole (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    sal_Int32 SAL_CALL getAccessibleIndexInParent (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleAction
+
+    /** There is one action for drop down boxes and none for others.
+    */
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount (void)
+        throw (::com::sun::star::uno::RuntimeException);
+    /** The action for drop down boxes lets the user toggle the visibility of the
+        popup menu.
+    */
+    virtual sal_Bool SAL_CALL doAccessibleAction (sal_Int32 nIndex)
+        throw (::com::sun::star::lang::IndexOutOfBoundsException,
+            ::com::sun::star::uno::RuntimeException);
+    /** The returned string is assoicated with resource
+        <const>RID_STR_ACC_ACTION_TOGGLEPOPUP</const>.
+    */
+    virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription (sal_Int32 nIndex)
+        throw (::com::sun::star::lang::IndexOutOfBoundsException,
+            ::com::sun::star::uno::RuntimeException);
+    /** No keybinding returned so far.
+    */
+    virtual ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL
+            getAccessibleActionKeyBinding( sal_Int32 nIndex )
+                throw (::com::sun::star::lang::IndexOutOfBoundsException,
+                       ::com::sun::star::uno::RuntimeException);
+
+    // XComponent
+
+    /** This method is called from the implementation helper during an
+        XComponent::dispose() call.
+    */
+    virtual void SAL_CALL disposing (void);
+
+
+protected:
+    /** Specifies whether the box is a combo box or a list box.  List boxes
+        have multi selection.
+    */
+    BoxType m_aBoxType;
+
+    /// Specifies whether the box is a drop down box and thus has an action.
+    bool m_bIsDropDownBox;
+
+    /// The child that represents the text field if there is one.
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>
+        m_xText;
+
+    /// The child that contains the items of this box.
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>
+        m_xList;
+
+    /** This flag specifies whether an object has a text field as child
+        regardless of whether that child being currently instantiated or
+        not.
+    */
+    bool m_bHasTextChild;
+
+    /** This flag specifies whether an object has a list as child regardless
+        of whether that child being currently instantiated or not.  This
+        flag is always true in the current implementation because the list
+        child is just another wrapper arround this object and thus has the
+        same life time.
+    */
+    bool m_bHasListChild;
+
+    virtual ~VCLXAccessibleBox (void);
+
+    /** Returns </true> when the object is valid.
+    */
+    virtual bool IsValid (void) const = 0;
+
+    virtual void ProcessWindowChildEvent (const VclWindowEvent& rVclWindowEvent);
+    virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent);
+
+
+private:
+    /// Index in parent.  This is settable from the outside.
+    sal_Int32 m_nIndexInParent;
+};
+
+#endif
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx
new file mode 100644
index 000000000000..76e8b3da9343
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblebutton.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLEBUTTON_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLEBUTTON_HXX
+
+#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
+
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#endif
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+
+#ifndef _CPPUHELPER_IMPLBASE2_HXX
+#include <cppuhelper/implbase2.hxx>
+#endif
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleButton
+//  ----------------------------------------------------
+
+typedef ::cppu::ImplHelper2<
+    ::com::sun::star::accessibility::XAccessibleAction,
+    ::com::sun::star::accessibility::XAccessibleValue > VCLXAccessibleButton_BASE;
+
+class VCLXAccessibleButton : public VCLXAccessibleTextComponent,
+                             public VCLXAccessibleButton_BASE
+{
+protected:
+    virtual ~VCLXAccessibleButton();
+
+    virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+public:
+    VCLXAccessibleButton( VCLXWindow* pVCLXindow );
+
+    // XInterface
+    DECLARE_XINTERFACE()
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER()
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleContext
+    virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleAction
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleValue
+    virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue(  ) throw (::com::sun::star::uno::RuntimeException);
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEBUTTON_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx
new file mode 100644
index 000000000000..a876a236455c
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLECHECKBOX_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLECHECKBOX_HXX
+
+#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
+
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#endif
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+
+#ifndef _CPPUHELPER_IMPLBASE2_HXX
+#include <cppuhelper/implbase2.hxx>
+#endif
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleCheckBox
+//  ----------------------------------------------------
+
+typedef ::cppu::ImplHelper2<
+    ::com::sun::star::accessibility::XAccessibleAction,
+    ::com::sun::star::accessibility::XAccessibleValue > VCLXAccessibleCheckBox_BASE;
+
+class VCLXAccessibleCheckBox : public VCLXAccessibleTextComponent,
+                               public VCLXAccessibleCheckBox_BASE
+{
+private:
+    bool    m_bChecked;
+    bool    m_bIndeterminate;
+
+protected:
+    virtual ~VCLXAccessibleCheckBox();
+
+    bool    IsChecked();
+    bool    IsIndeterminate();
+
+    void    SetChecked( bool bChecked );
+    void    SetIndeterminate( bool bIndeterminate );
+
+    virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+public:
+    VCLXAccessibleCheckBox( VCLXWindow* pVCLXindow );
+
+    // XInterface
+    DECLARE_XINTERFACE()
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER()
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleAction
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleValue
+    virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue(  ) throw (::com::sun::star::uno::RuntimeException);
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLECHECKBOX_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx
new file mode 100644
index 000000000000..ce62ea845b5c
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLECOMBOBOX_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLECOMBOBOX_HXX
+
+#include <map>
+#include <accessibility/standard/vclxaccessiblebox.hxx>
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_STANDARD_ACCESSIBLEROLE_HPP_
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#endif
+#ifndef _CPPUHELPER_IMPLBASE1_HXX
+#include <cppuhelper/implbase1.hxx>
+#endif
+
+
+/** The accessible combobox has two children.  The first is the text field
+    represented by an object of the <type>VCLXAccessibleEdit</type> class.
+    The second is the list containing all items and is represented by an
+    object of the <type>VCLXAccessibleList</type> class which does not
+    support selection at the moment.
+*/
+class VCLXAccessibleComboBox
+    : public VCLXAccessibleBox
+{
+public:
+    VCLXAccessibleComboBox (VCLXWindow* pVCLXindow);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName (void)
+        throw (::com::sun::star::uno::RuntimeException);
+    // Return combo box specific services.
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+        getSupportedServiceNames (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+protected:
+    virtual ~VCLXAccessibleComboBox (void);
+
+    virtual bool IsValid (void) const;
+    virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent);
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLECHECKBOX_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx
new file mode 100644
index 000000000000..6f54ede32d21
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNCOMBOBOX_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNCOMBOBOX_HXX
+
+#include <accessibility/standard/vclxaccessiblebox.hxx>
+#ifndef ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTEDIT_HXX
+#include <accessibility/standard/vclxaccessibleedit.hxx>
+#endif
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+
+#ifndef _CPPUHELPER_IMPLBASE1_HXX
+#include <cppuhelper/implbase1.hxx>
+#endif
+#ifndef _CPPUHELPER_WEAKREF_HXX
+#include <cppuhelper/weakref.hxx>
+#endif
+
+
+/** The accessible drop down combobox has two children.  The first is the
+    text field represented by an object of the
+    <type>VCLXAccessibleEdit</type> class.  The second is the list
+    containing all items and is represented by an object of the
+    <type>VCLXAccessibleList</type> class which does not support selection
+    at the moment.
+*/
+class VCLXAccessibleDropDownComboBox : public VCLXAccessibleBox
+{
+public:
+    VCLXAccessibleDropDownComboBox (VCLXWindow* pVCLXindow);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName (void)
+        throw (::com::sun::star::uno::RuntimeException);
+    // Return drop down combo box specific services.
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+        getSupportedServiceNames (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+protected:
+    virtual ~VCLXAccessibleDropDownComboBox (void);
+
+    virtual bool IsValid (void) const;
+    virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent);
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNCOMBOBOX_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx
new file mode 100644
index 000000000000..72289f210aa2
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNLISTBOX_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNLISTBOX_HXX
+
+#include <accessibility/standard/vclxaccessiblebox.hxx>
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+
+#ifndef _CPPUHELPER_IMPLBASE1_HXX
+#include <cppuhelper/implbase1.hxx>
+#endif
+#ifndef _CPPUHELPER_WEAKREF_HXX
+#include <cppuhelper/weakref.hxx>
+#endif
+
+
+/** The accessible drop down combobox has two children.  The first is the
+    text field represented by an object of the
+    <type>VCLXAccessibleTextField</type> class which can not be edited.  The
+    second is the list containing all items and is represented by an object
+    of the <type>VCLXAccessibleListBoxList</type> class which does support
+    selection.
+*/
+class VCLXAccessibleDropDownListBox : public VCLXAccessibleBox
+{
+public:
+    VCLXAccessibleDropDownListBox (VCLXWindow* pVCLXindow);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName (void)
+        throw (::com::sun::star::uno::RuntimeException);
+    // Return drop down list box specific services.
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+        getSupportedServiceNames (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+protected:
+    virtual ~VCLXAccessibleDropDownListBox (void);
+
+    virtual bool IsValid (void) const;
+    virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent);
+
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNLISTBOX_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx b/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx
new file mode 100644
index 000000000000..1e5bb36ec03d
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibleedit.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLEEDIT_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLEEDIT_HXX
+
+#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
+#include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#endif
+
+#ifndef _CPPUHELPER_IMPLBASE2_HXX
+#include <cppuhelper/implbase2.hxx>
+#endif
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleEdit
+//  ----------------------------------------------------
+
+typedef ::cppu::ImplHelper2<
+    ::com::sun::star::accessibility::XAccessibleAction,
+    ::com::sun::star::accessibility::XAccessibleEditableText > VCLXAccessibleEdit_BASE;
+
+class VCLXAccessibleEdit : public VCLXAccessibleTextComponent,
+                           public VCLXAccessibleEdit_BASE
+{
+    friend class VCLXAccessibleBox;
+
+private:
+    sal_Int32   m_nSelectionStart;
+    sal_Int32   m_nCaretPosition;
+
+protected:
+    virtual ~VCLXAccessibleEdit();
+
+    virtual void                ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void                FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+    // OCommonAccessibleText
+    virtual ::rtl::OUString     implGetText();
+    virtual void                implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+
+public:
+    VCLXAccessibleEdit( VCLXWindow* pVCLXindow );
+
+    // XInterface
+    DECLARE_XINTERFACE()
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER()
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleContext
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleAction
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleText
+    virtual sal_Int32 SAL_CALL getCaretPosition(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getCharacterCount(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getSelectedText(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getSelectionStart(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getSelectionEnd(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getText(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleEditableText
+    virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL insertText( const ::rtl::OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::rtl::OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aAttributeSet ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setText( const ::rtl::OUString& sText ) throw (::com::sun::star::uno::RuntimeException);
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEEDIT_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx
new file mode 100644
index 000000000000..250d5f7551f5
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDHYPERLINK_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDHYPERLINK_HXX
+
+#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleFixedHyperlink
+//  ----------------------------------------------------
+
+class VCLXAccessibleFixedHyperlink : public VCLXAccessibleTextComponent
+{
+protected:
+    virtual ~VCLXAccessibleFixedHyperlink();
+
+    virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+    virtual void implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
+
+public:
+    VCLXAccessibleFixedHyperlink( VCLXWindow* pVCLXindow );
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDHYPERLINK_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx
new file mode 100644
index 000000000000..e013fdc8d475
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDTEXT_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDTEXT_HXX
+
+#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleFixedText
+//  ----------------------------------------------------
+
+class VCLXAccessibleFixedText : public VCLXAccessibleTextComponent
+{
+protected:
+    virtual ~VCLXAccessibleFixedText();
+
+    virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+    virtual void implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
+
+public:
+    VCLXAccessibleFixedText( VCLXWindow* pVCLXindow );
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDTEXT_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
new file mode 100644
index 000000000000..f90cb286b4c4
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
@@ -0,0 +1,228 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ACCESSIBILITY_STANDARD_VCLXACCESSIBLELIST_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLELIST_HXX
+
+#include <vector>
+#include <functional>
+#include "accessibility/standard/vclxaccessiblelistitem.hxx"
+#include <accessibility/standard/vclxaccessibleedit.hxx>
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_STANDARD_ACCESSIBLEROLE_HPP_
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#endif
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+#ifndef _CPPUHELPER_IMPLBASE2_HXX
+#include <cppuhelper/implbase2.hxx>
+#endif
+
+typedef ::cppu::ImplHelper2<
+    ::com::sun::star::accessibility::XAccessible,
+    ::com::sun::star::accessibility::XAccessibleSelection
+    > VCLXAccessibleList_BASE;
+
+typedef std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible > >
+    ListItems;
+
+namespace accessibility
+{
+    class IComboListBoxHelper;
+}
+
+
+/** Base class for the list contained in list- and combo boxes.  This class
+    does not support selection because lists of combo boxes give no direct
+    access to their underlying list implementation.  Look into derived
+    classes for selection.
+*/
+class VCLXAccessibleList
+    : public VCLXAccessibleComponent,
+      public VCLXAccessibleList_BASE
+{
+public:
+    enum BoxType {COMBOBOX, LISTBOX};
+
+    VCLXAccessibleList (VCLXWindow* pVCLXindow, BoxType aBoxType,
+                        const ::com::sun::star::uno::Reference<
+                            ::com::sun::star::accessibility::XAccessible >& _xParent);
+
+    /** The index that is passed to this method is returned on following
+        calls to <member>getAccessibleIndexInParent</member>.
+    */
+    void SetIndexInParent (sal_Int32 nIndex);
+
+    /** Process some of the events and delegate the rest to the base classes.
+    */
+    virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent);
+
+    /** Called on reception of selection events this method checks all known
+        list items for a possible change in their selection state and
+        updates that accordingly.  No accessibility events are send because
+        the XAccessibleSelection interface is not supported and the items
+        are transient.
+        @param sTextOfSelectedItem
+            This string contains the text of the the currently selected
+            item.  It is used to retrieve the index of that item.
+    */
+    void UpdateSelection (::rtl::OUString sTextOfSelectedItem);
+
+    // XInterface
+    DECLARE_XINTERFACE()
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER()
+
+    // XAccessible
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL
+        getAccessibleContext (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleContext
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount (void)
+        throw (::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
+        getAccessibleChild (sal_Int32 i)
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
+        getAccessibleParent(  )
+        throw (::com::sun::star::uno::RuntimeException);
+
+    /** The index returned as index in parent is always the one set with the
+        <member>SetIndexInParent()</member> method.
+    */
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getAccessibleRole (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleComponent
+    virtual sal_Bool SAL_CALL contains (const ::com::sun::star::awt::Point& aPoint)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
+        getAccessibleAt (const ::com::sun::star::awt::Point& aPoint)
+        throw (::com::sun::star::uno::RuntimeException);
+
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName (void)
+        throw (::com::sun::star::uno::RuntimeException);
+    // Return list specific services.
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+        getSupportedServiceNames (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleSelection
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL clearAccessibleSelection(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(  ) throw (::com::sun::star::uno::RuntimeException);
+
+protected:
+    BoxType     m_aBoxType;
+    ::accessibility::IComboListBoxHelper* m_pListBoxHelper;
+    ListItems   m_aAccessibleChildren;
+    sal_Int32   m_nVisibleLineCount;
+    /// Index in parent.  This is settable from the outside.
+    sal_Int32   m_nIndexInParent;
+    sal_Int32   m_nLastTopEntry;
+    sal_uInt16      m_nLastSelectedPos;
+    bool        m_bDisableProcessEvent;
+    bool        m_bVisible;
+
+
+
+    /// The currently selected item.
+    ::com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible>
+        m_xSelectedItem;
+
+    virtual ~VCLXAccessibleList (void);
+
+    /** This function is called from the implementation helper during a
+        XComponent::dispose call.  Free the list of items and the items themselves.
+    */
+    virtual void SAL_CALL disposing (void);
+
+    /** This method adds the states
+        <const>AccessibleStateType::FOCUSABLE</const> and possibly
+        <const>AccessibleStateType::MULTI_SELECTABLE</const> to the state set
+        of the base classes.
+    */
+    virtual void FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet);
+
+    /** Create the specified child and insert it into the list of children.
+        Sets the child's states.
+    */
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+        CreateChild (sal_Int32 i);
+
+    /** Call this method when the item list has been changed, i.e. items
+        have been deleted or inserted.
+        @param bItemInserted
+            Indicate whether items have been inserted (<TRUE/>) or removed
+            (<FALSE/>).
+        @param nIndex
+            Index of the new or removed item.  A value of -1 indicates that
+            the whole list has been cleared.
+    */
+    virtual void HandleChangedItemList (bool bItemInserted, sal_Int32 nIndex);
+
+    // VCLXAccessibleComponent
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+
+private:
+    /** We need to save the accessible parent to return it in <type>getAccessibleParent()</type>,
+        because this method of the base class returns the wrong parent.
+    */
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible >  m_xParent;
+
+
+    /** dispose all items aand clears the container
+    */
+    void clearItems();
+
+    void adjustEntriesIndexInParent(ListItems::iterator& _aBegin,::std::mem_fun_t<bool,VCLXAccessibleListItem>& _rMemFun);
+    void UpdateEntryRange_Impl (void);
+protected:
+    void UpdateSelection_Impl (sal_uInt16 nPos = 0);
+    sal_Bool checkEntrySelected(sal_uInt16 _nPos,
+                            ::com::sun::star::uno::Any& _rNewValue,
+                            ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxNewAcc);
+private:
+    void notifyVisibleStates(sal_Bool _bSetNew );
+    void UpdateVisibleLineCount();
+};
+
+#endif
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx
new file mode 100644
index 000000000000..c814cb83d84a
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLELISTBOX_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLELISTBOX_HXX
+
+#include <accessibility/standard/vclxaccessiblebox.hxx>
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+
+
+/** The accessible drop down combobox has one children.  It is the list
+    containing all items and is represented by an object of the
+    <type>VCLXAccessibleListBoxList</type> class which does support
+    selection.
+*/
+class VCLXAccessibleListBox : public VCLXAccessibleBox
+{
+public:
+    VCLXAccessibleListBox (VCLXWindow* pVCLXindow);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName (void)
+        throw (::com::sun::star::uno::RuntimeException);
+    // Return list box specific services.
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+        getSupportedServiceNames (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+protected:
+    virtual ~VCLXAccessibleListBox (void);
+
+    virtual bool IsValid (void) const;
+    virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent);
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLELISTBOX_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
new file mode 100644
index 000000000000..ec07745bb0d4
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
@@ -0,0 +1,200 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef ACCESSIBILITY_STANDARD_VCLXACCESSIBLELISTITEM_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLELISTITEM_HXX
+
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
+#include <com/sun/star/accessibility/XAccessibleText.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#ifndef _CPPUHELPER_COMPBASE6_HXX
+#include <cppuhelper/compbase6.hxx>
+#endif
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX
+#include <comphelper/broadcasthelper.hxx>
+#endif
+#include <comphelper/accessibletexthelper.hxx>
+
+// forward ---------------------------------------------------------------
+
+namespace com { namespace sun { namespace star { namespace awt {
+    struct Point;
+    struct Rectangle;
+    struct Size;
+    class XFocusListener;
+} } } }
+
+namespace accessibility
+{
+    class IComboListBoxHelper;
+}
+
+// class VCLXAccessibleListItem ------------------------------------------
+
+typedef ::cppu::WeakAggComponentImplHelper6< ::com::sun::star::accessibility::XAccessible
+                                            , ::com::sun::star::accessibility::XAccessibleContext
+                                            , ::com::sun::star::accessibility::XAccessibleComponent
+                                            , ::com::sun::star::accessibility::XAccessibleEventBroadcaster
+                                            , ::com::sun::star::accessibility::XAccessibleText
+                                            , ::com::sun::star::lang::XServiceInfo > VCLXAccessibleListItem_BASE;
+
+/** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry
+*/
+class VCLXAccessibleListItem : public ::comphelper::OBaseMutex,
+                               public ::comphelper::OCommonAccessibleText,
+                               public VCLXAccessibleListItem_BASE
+{
+private:
+    ::rtl::OUString                     m_sEntryText;
+    sal_Int32                           m_nIndexInParent;
+    sal_Bool                            m_bSelected;
+    sal_Bool                            m_bVisible;
+
+protected:
+    /// client id in the AccessibleEventNotifier queue
+    sal_uInt32                          m_nClientId;
+    ::accessibility::IComboListBoxHelper*       m_pListBoxHelper;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >        m_xParent;
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > m_xParentContext;
+
+private:
+    /** notifies all listeners that this object has changed
+        @param  _nEventId
+            is the event id
+        @param  _aOldValue
+            is the old value
+        @param  _aNewValue
+            is the new value
+    */
+    void                    NotifyAccessibleEvent(  sal_Int16 _nEventId,
+                                                    const ::com::sun::star::uno::Any& _aOldValue,
+                                                    const ::com::sun::star::uno::Any& _aNewValue );
+
+protected:
+    virtual ~VCLXAccessibleListItem();
+    /** this function is called upon disposing the component
+    */
+    virtual void SAL_CALL   disposing();
+
+    // OCommonAccessibleText
+    virtual ::rtl::OUString                 implGetText();
+    virtual ::com::sun::star::lang::Locale  implGetLocale();
+    virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+
+public:
+    /** OAccessibleBase needs a valid view
+        @param  _pListBoxHelper
+            is the list- or combobox for which we implement an accessible object
+        @param  _nIndexInParent
+            is the position of the entry inside the listbox
+        @param  _xParent
+            is our parent accessible object
+    */
+    VCLXAccessibleListItem( ::accessibility::IComboListBoxHelper* _pListBoxHelper,
+                            sal_Int32 _nIndexInParent,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent );
+
+
+    inline sal_Bool         IsSelected() const { return m_bSelected; }
+    void                    SetSelected( sal_Bool _bSelected );
+    void                    SetVisible( sal_Bool _bVisible );
+    inline bool             DecrementIndexInParent() { OSL_ENSURE(m_nIndexInParent != 0,"Invalid call!");--m_nIndexInParent; return true;}
+    inline bool             IncrementIndexInParent() { ++m_nIndexInParent; return true;}
+
+    // XInterface
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL acquire(  ) throw();
+    virtual void SAL_CALL release(  ) throw();
+
+    // XTypeProvider
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() 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& rServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessible
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleContext
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleComponent
+    virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Point SAL_CALL getLocation(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Size SAL_CALL getSize(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL grabFocus(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleText
+    virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleEventBroadcaster
+    using cppu::WeakAggComponentImplHelperBase::addEventListener;
+    using cppu::WeakAggComponentImplHelperBase::removeEventListener;
+    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+};
+
+#endif // ACCESSIBILITY_STANDARD_ACCESSIBLELISTBOXENTRY_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
new file mode 100644
index 000000000000..35851788853b
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENU_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENU_HXX
+
+#include <accessibility/standard/vclxaccessiblemenuitem.hxx>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+
+#ifndef _CPPUHELPER_IMPLBASE1_HXX
+#include <cppuhelper/implbase1.hxx>
+#endif
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleMenu
+//  ----------------------------------------------------
+
+typedef ::cppu::ImplHelper1 <
+    ::com::sun::star::accessibility::XAccessibleSelection > VCLXAccessibleMenu_BASE;
+
+class VCLXAccessibleMenu :  public VCLXAccessibleMenuItem,
+                            public VCLXAccessibleMenu_BASE
+{
+protected:
+    virtual sal_Bool        IsFocused();
+    virtual sal_Bool        IsPopupMenuOpen();
+
+public:
+    VCLXAccessibleMenu( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu );
+    virtual ~VCLXAccessibleMenu();
+
+    // XInterface
+    DECLARE_XINTERFACE()
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER()
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleContext
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleComponent
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleSelection
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL clearAccessibleSelection(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENU_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
new file mode 100644
index 000000000000..d9899b52dc2f
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUBAR_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUBAR_HXX
+
+#include <accessibility/standard/accessiblemenucomponent.hxx>
+
+class VclSimpleEvent;
+class VclWindowEvent;
+class Window;
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleMenuBar
+//  ----------------------------------------------------
+
+class VCLXAccessibleMenuBar :   public OAccessibleMenuComponent
+{
+protected:
+    Window*                 m_pWindow;
+
+    virtual sal_Bool        IsFocused();
+
+    DECL_LINK( WindowEventListener, VclSimpleEvent* );
+
+    virtual void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+
+    // XComponent
+    virtual void SAL_CALL   disposing();
+
+public:
+    VCLXAccessibleMenuBar( Menu* pMenu );
+    virtual ~VCLXAccessibleMenuBar();
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleContext
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleExtendedComponent
+    virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUBAR_HXX
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
new file mode 100644
index 000000000000..e2e430d9300b
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUITEM_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUITEM_HXX
+
+#include <accessibility/standard/accessiblemenuitemcomponent.hxx>
+
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#endif
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+
+#ifndef _CPPUHELPER_IMPLBASE3_HXX
+#include <cppuhelper/implbase3.hxx>
+#endif
+#include <comphelper/accessibletexthelper.hxx>
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleMenuItem
+//  ----------------------------------------------------
+
+typedef ::cppu::ImplHelper3<
+    ::com::sun::star::accessibility::XAccessibleText,
+    ::com::sun::star::accessibility::XAccessibleAction,
+    ::com::sun::star::accessibility::XAccessibleValue > VCLXAccessibleMenuItem_BASE;
+
+class VCLXAccessibleMenuItem :  public OAccessibleMenuItemComponent,
+                                public ::comphelper::OCommonAccessibleText,
+                                public VCLXAccessibleMenuItem_BASE
+{
+protected:
+    virtual sal_Bool        IsFocused();
+    virtual sal_Bool        IsSelected();
+    virtual sal_Bool        IsChecked();
+
+    virtual sal_Bool        IsHighlighted();
+
+    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+    // OCommonAccessibleText
+    virtual ::rtl::OUString                     implGetText();
+    virtual ::com::sun::star::lang::Locale      implGetLocale();
+    virtual void                                implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+
+public:
+    VCLXAccessibleMenuItem( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu = 0 );
+    virtual ~VCLXAccessibleMenuItem();
+
+    // XInterface
+    DECLARE_XINTERFACE()
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER()
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleContext
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleText
+    virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleAction
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleValue
+    virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue(  ) throw (::com::sun::star::uno::RuntimeException);
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUITEM_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx
new file mode 100644
index 000000000000..30ae2e764cdb
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUSEPARATOR_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUSEPARATOR_HXX
+
+#include <accessibility/standard/accessiblemenuitemcomponent.hxx>
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleMenuSeparator
+//  ----------------------------------------------------
+
+class VCLXAccessibleMenuSeparator : public OAccessibleMenuItemComponent
+{
+public:
+    VCLXAccessibleMenuSeparator( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu = 0 );
+    virtual ~VCLXAccessibleMenuSeparator();
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleContext
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+};
+
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUSEPARATOR_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx
new file mode 100644
index 000000000000..d4ccd5f09ff5
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLEPOPUPMENU_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLEPOPUPMENU_HXX
+
+#include <accessibility/standard/accessiblemenucomponent.hxx>
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessiblePopupMenu
+//  ----------------------------------------------------
+
+class VCLXAccessiblePopupMenu : public OAccessibleMenuComponent
+{
+protected:
+    virtual sal_Bool        IsFocused();
+
+public:
+    VCLXAccessiblePopupMenu( Menu* pMenu );
+    virtual ~VCLXAccessiblePopupMenu();
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleContext
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleExtendedComponent
+    virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEPOPUPMENU_HXX
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx
new file mode 100644
index 000000000000..615ed08ca2da
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLERADIOBUTTON_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLERADIOBUTTON_HXX
+
+#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
+
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#endif
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+
+#ifndef _CPPUHELPER_IMPLBASE2_HXX
+#include <cppuhelper/implbase2.hxx>
+#endif
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleRadioButton
+//  ----------------------------------------------------
+
+typedef ::cppu::ImplHelper2<
+    ::com::sun::star::accessibility::XAccessibleAction,
+    ::com::sun::star::accessibility::XAccessibleValue > VCLXAccessibleRadioButton_BASE;
+
+class VCLXAccessibleRadioButton : public VCLXAccessibleTextComponent,
+                                  public VCLXAccessibleRadioButton_BASE
+{
+protected:
+    virtual ~VCLXAccessibleRadioButton();
+
+    virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet );
+    virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+public:
+    VCLXAccessibleRadioButton( VCLXWindow* pVCLXindow );
+
+    // XInterface
+    DECLARE_XINTERFACE()
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER()
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleAction
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleValue
+    virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue(  ) throw (::com::sun::star::uno::RuntimeException);
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLERADIOBUTTON_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx
new file mode 100644
index 000000000000..063204214a19
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLESCROLLBAR_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLESCROLLBAR_HXX
+
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#endif
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+
+#ifndef _CPPUHELPER_IMPLBASE2_HXX
+#include <cppuhelper/implbase2.hxx>
+#endif
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleScrollBar
+//  ----------------------------------------------------
+
+typedef ::cppu::ImplHelper2<
+    ::com::sun::star::accessibility::XAccessibleAction,
+    ::com::sun::star::accessibility::XAccessibleValue > VCLXAccessibleScrollBar_BASE;
+
+class VCLXAccessibleScrollBar : public VCLXAccessibleComponent,
+                                public VCLXAccessibleScrollBar_BASE
+{
+protected:
+    virtual ~VCLXAccessibleScrollBar();
+
+    virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+public:
+    VCLXAccessibleScrollBar( VCLXWindow* pVCLXindow );
+
+    // XInterface
+    DECLARE_XINTERFACE()
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER()
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleAction
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleValue
+    virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue(  ) throw (::com::sun::star::uno::RuntimeException);
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLESCROLLBAR_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx
new file mode 100644
index 000000000000..5243229b4902
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBAR_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBAR_HXX
+
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+
+#include <vector>
+
+class StatusBar;
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleStatusBar
+//  ----------------------------------------------------
+
+class VCLXAccessibleStatusBar : public VCLXAccessibleComponent
+{
+private:
+    typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > AccessibleChildren;
+
+    AccessibleChildren      m_aAccessibleChildren;
+    StatusBar*              m_pStatusBar;
+
+protected:
+    void                    UpdateShowing( sal_Int32 i, sal_Bool bShowing );
+    void                    UpdateItemName( sal_Int32 i );
+    void                    UpdateItemText( sal_Int32 i );
+
+    void                    InsertChild( sal_Int32 i );
+    void                    RemoveChild( sal_Int32 i );
+
+    virtual void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+
+    // XComponent
+    virtual void SAL_CALL   disposing();
+
+public:
+    VCLXAccessibleStatusBar( VCLXWindow* pVCLXWindow );
+    ~VCLXAccessibleStatusBar();
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleContext
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleComponent
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+};
+
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBAR_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx
new file mode 100644
index 000000000000..442645c6d88f
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBARITEM_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBARITEM_HXX
+
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <comphelper/accessibletexthelper.hxx>
+#ifndef _CPPUHELPER_IMPLBASE2_HXX
+#include <cppuhelper/implbase2.hxx>
+#endif
+
+
+class StatusBar;
+class VCLExternalSolarLock;
+
+namespace utl {
+class AccessibleStateSetHelper;
+}
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleStatusBarItem
+//  ----------------------------------------------------
+
+typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE;
+
+typedef ::cppu::ImplHelper2<
+    ::com::sun::star::accessibility::XAccessible,
+    ::com::sun::star::lang::XServiceInfo > VCLXAccessibleStatusBarItem_BASE;
+
+class VCLXAccessibleStatusBarItem : public AccessibleTextHelper_BASE,
+                                    public VCLXAccessibleStatusBarItem_BASE
+{
+    friend class VCLXAccessibleStatusBar;
+
+private:
+    VCLExternalSolarLock*   m_pExternalLock;
+    StatusBar*              m_pStatusBar;
+    sal_uInt16              m_nItemId;
+    ::rtl::OUString         m_sItemName;
+    ::rtl::OUString         m_sItemText;
+    sal_Bool                m_bShowing;
+
+protected:
+    sal_Bool                IsShowing();
+    void                    SetShowing( sal_Bool bShowing );
+    void                    SetItemName( const ::rtl::OUString& sItemName );
+    ::rtl::OUString         GetItemName();
+    void                    SetItemText( const ::rtl::OUString& sItemText );
+    ::rtl::OUString         GetItemText();
+    sal_uInt16              GetItemId() const { return m_nItemId; }
+
+    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+    // OCommonAccessibleComponent
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // OCommonAccessibleText
+    virtual ::rtl::OUString                 implGetText();
+    virtual ::com::sun::star::lang::Locale  implGetLocale();
+    virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+
+    // XComponent
+    virtual void SAL_CALL   disposing();
+
+public:
+    VCLXAccessibleStatusBarItem( StatusBar* pStatusBar, sal_uInt16 nItemId );
+    virtual ~VCLXAccessibleStatusBarItem();
+
+    // XInterface
+    DECLARE_XINTERFACE()
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER()
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessible
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleContext
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleComponent
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL grabFocus(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getForeground(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleExtendedComponent
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleText
+    virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBARITEM_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx
new file mode 100644
index 000000000000..f663ca3475fc
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABCONTROL_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABCONTROL_HXX
+
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+
+#include <vector>
+
+class TabControl;
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleTabControl
+//  ----------------------------------------------------
+
+typedef ::cppu::ImplHelper1 <
+    ::com::sun::star::accessibility::XAccessibleSelection > VCLXAccessibleTabControl_BASE;
+
+class VCLXAccessibleTabControl :    public VCLXAccessibleComponent,
+                                    public VCLXAccessibleTabControl_BASE
+{
+private:
+    typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > AccessibleChildren;
+
+    AccessibleChildren      m_aAccessibleChildren;
+    TabControl*             m_pTabControl;
+
+protected:
+    void                    UpdateFocused();
+    void                    UpdateSelected( sal_Int32 i, bool bSelected );
+    void                    UpdatePageText( sal_Int32 i );
+    void                    UpdateTabPage( sal_Int32 i, bool bNew );
+
+    void                    InsertChild( sal_Int32 i );
+    void                    RemoveChild( sal_Int32 i );
+
+    virtual void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void            ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+    // XComponent
+    virtual void SAL_CALL   disposing();
+
+public:
+    VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow );
+    ~VCLXAccessibleTabControl();
+
+    // XInterface
+    DECLARE_XINTERFACE()
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER()
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleContext
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleSelection
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL clearAccessibleSelection(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+};
+
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABCONTROL_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx
new file mode 100644
index 000000000000..ed47ce9f0e94
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGE_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGE_HXX
+
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <comphelper/accessibletexthelper.hxx>
+#ifndef _CPPUHELPER_IMPLBASE2_HXX
+#include <cppuhelper/implbase2.hxx>
+#endif
+
+
+class TabControl;
+class VCLExternalSolarLock;
+
+namespace utl {
+class AccessibleStateSetHelper;
+}
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleTabPage
+//  ----------------------------------------------------
+
+typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE;
+
+typedef ::cppu::ImplHelper2<
+    ::com::sun::star::accessibility::XAccessible,
+    ::com::sun::star::lang::XServiceInfo > VCLXAccessibleTabPage_BASE;
+
+class VCLXAccessibleTabPage :   public AccessibleTextHelper_BASE,
+                                public VCLXAccessibleTabPage_BASE
+{
+    friend class VCLXAccessibleTabControl;
+
+private:
+    VCLExternalSolarLock*   m_pExternalLock;
+    TabControl*             m_pTabControl;
+    sal_uInt16              m_nPageId;
+    bool                    m_bFocused;
+    bool                    m_bSelected;
+    ::rtl::OUString         m_sPageText;
+
+protected:
+    bool                    IsFocused();
+    bool                    IsSelected();
+
+    void                    SetFocused( bool bFocused );
+    void                    SetSelected( bool bSelected );
+    void                    SetPageText( const ::rtl::OUString& sPageText );
+    ::rtl::OUString         GetPageText();
+
+    void                    Update( bool bNew );
+
+    sal_uInt16              GetPageId() const { return m_nPageId; }
+
+    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+    // OCommonAccessibleComponent
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // OCommonAccessibleText
+    virtual ::rtl::OUString                 implGetText();
+    virtual ::com::sun::star::lang::Locale  implGetLocale();
+    virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+
+    // XComponent
+    virtual void SAL_CALL   disposing();
+
+public:
+    VCLXAccessibleTabPage( TabControl* pTabControl, sal_uInt16 nPageId );
+    virtual ~VCLXAccessibleTabPage();
+
+    // XInterface
+    DECLARE_XINTERFACE()
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER()
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessible
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleContext
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleComponent
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL grabFocus(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getForeground(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleExtendedComponent
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleText
+    virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGE_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx
new file mode 100644
index 000000000000..5ba980cc8c4f
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGEWINDOW_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGEWINDOW_HXX
+
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+
+
+class TabControl;
+class TabPage;
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleTabPageWindow
+//  ----------------------------------------------------
+
+class VCLXAccessibleTabPageWindow : public VCLXAccessibleComponent
+{
+private:
+    TabControl*             m_pTabControl;
+    TabPage*                m_pTabPage;
+    sal_uInt16              m_nPageId;
+
+protected:
+    // OCommonAccessibleComponent
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XComponent
+    virtual void SAL_CALL   disposing();
+
+public:
+    VCLXAccessibleTabPageWindow( VCLXWindow* pVCLXWindow );
+    ~VCLXAccessibleTabPageWindow();
+
+    // XAccessibleContext
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException);
+};
+
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGEWINDOW_HXX
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx
new file mode 100644
index 000000000000..47e7189cd95a
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTCOMPONENT_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTCOMPONENT_HXX
+
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+#include <comphelper/accessibletexthelper.hxx>
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleTextComponent
+//  ----------------------------------------------------
+
+typedef ::cppu::ImplHelper1 <
+    ::com::sun::star::accessibility::XAccessibleText >  VCLXAccessibleTextComponent_BASE;
+
+class VCLXAccessibleTextComponent : public VCLXAccessibleComponent,
+                                    public ::comphelper::OCommonAccessibleText,
+                                    public VCLXAccessibleTextComponent_BASE
+{
+protected:
+    ::rtl::OUString                         m_sText;
+
+    void                                    SetText( const ::rtl::OUString& sText );
+
+    virtual void                            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+
+    // OCommonAccessibleText
+    virtual ::rtl::OUString                 implGetText();
+    virtual ::com::sun::star::lang::Locale  implGetLocale();
+    virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+
+    // XComponent
+    virtual void SAL_CALL                   disposing();
+
+public:
+    VCLXAccessibleTextComponent( VCLXWindow* pVCLXWindow );
+    ~VCLXAccessibleTextComponent();
+
+    // XInterface
+    DECLARE_XINTERFACE()
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER()
+
+    // XAccessibleText
+    virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+};
+
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTCOMPONENT_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx
new file mode 100644
index 000000000000..70d35acb305a
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTFIELD_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTFIELD_HXX
+
+#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
+
+#ifndef _CPPUHELPER_IMPLBASE1_HXX
+#include <cppuhelper/implbase1.hxx>
+#endif
+
+typedef ::cppu::ImplHelper1<
+    ::com::sun::star::accessibility::XAccessible
+    > VCLXAccessible_BASE;
+
+
+/** This class represents non editable text fields.  The object passed to
+    the constructor is expected to be a list (a <type>ListBox</type> to be
+    more specific).  From this allways the selected item is token to be made
+    accessible by this class.  When the selected item changes then also the
+    exported text changes.
+*/
+class VCLXAccessibleTextField :
+    public VCLXAccessibleTextComponent,
+    public VCLXAccessible_BASE
+{
+public:
+    VCLXAccessibleTextField (VCLXWindow* pVCLXindow,
+                             const ::com::sun::star::uno::Reference<
+                                 ::com::sun::star::accessibility::XAccessible >& _xParent);
+
+    // XInterface
+    DECLARE_XINTERFACE()
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER()
+
+    // XAccessible
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL
+        getAccessibleContext (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleContext
+    sal_Int32 SAL_CALL getAccessibleChildCount (void)
+        throw (::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
+        getAccessibleChild (sal_Int32 i)
+        throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    sal_Int16 SAL_CALL getAccessibleRole (void)
+        throw (::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
+        getAccessibleParent(  )
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName (void)
+        throw (::com::sun::star::uno::RuntimeException);
+    // Return text field specific services.
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+        getSupportedServiceNames (void)
+        throw (::com::sun::star::uno::RuntimeException);
+
+protected:
+    virtual ~VCLXAccessibleTextField (void);
+
+    /** With this method the text of the currently selected item is made
+        available to the <type>VCLXAccessibleTextComponent</type> base class.
+    */
+    ::rtl::OUString implGetText (void);
+
+private:
+    /** We need to save the accessible parent to return it in <type>getAccessibleParent()</type>,
+        because this method of the base class returns the wrong parent.
+    */
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible >  m_xParent;
+};
+
+#endif
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
new file mode 100644
index 000000000000..7283cec6a95c
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOX_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOX_HXX
+
+#include <map>
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleToolBox
+//  ----------------------------------------------------
+
+typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessibleSelection > VCLXAccessibleToolBox_BASE;
+
+typedef std::map< sal_Int32, com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > ToolBoxItemsMap;
+
+class VCLXAccessibleToolBoxItem;
+class ToolBox;
+
+class VCLXAccessibleToolBox : public VCLXAccessibleComponent, public VCLXAccessibleToolBox_BASE
+{
+private:
+    ToolBoxItemsMap             m_aAccessibleChildren;
+
+    VCLXAccessibleToolBoxItem*  GetItem_Impl( sal_Int32 _nPos, bool _bMustHaveFocus );
+
+    void                        UpdateFocus_Impl();
+    void                        ReleaseFocus_Impl( sal_Int32 _nPos );
+    void                        UpdateChecked_Impl( sal_Int32 _nPos );
+    void                        UpdateIndeterminate_Impl( sal_Int32 _nPos );
+    void                        UpdateItem_Impl( sal_Int32 _nPos, sal_Bool _bItemAdded );
+    void                        UpdateAllItems_Impl();
+    void                        UpdateItemName_Impl( sal_Int32 _nPos );
+    void                        UpdateItemEnabled_Impl( sal_Int32 _nPos );
+    void                        UpdateCustomPopupItemp_Impl( Window* pWindow, bool bOpen );
+    void                        HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent, bool _bShow );
+    void                        ReleaseSubToolBox( ToolBox* _pSubToolBox );
+
+protected:
+    virtual ~VCLXAccessibleToolBox();
+
+    virtual void    FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+    virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void    ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent );
+
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetChildAccessible( const VclWindowEvent& rVclWindowEvent );
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetItemWindowAccessible( const VclWindowEvent& rVclWindowEvent );
+
+    // XComponent
+    virtual void SAL_CALL disposing();
+
+public:
+    VCLXAccessibleToolBox( VCLXWindow* pVCLXWindow );
+
+    // XInterface
+    DECLARE_XINTERFACE( )
+
+    // XTypeProvider
+    DECLARE_XTYPEPROVIDER( )
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleContext
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleSelection
+    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL clearAccessibleSelection(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL selectAllAccessibleChildren(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+private:
+    void implReleaseToolboxItem(
+            ToolBoxItemsMap::iterator& _rMapPos,
+            bool _bNotifyRemoval,
+            bool _bDispose
+        );
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOX_HXX
+
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
new file mode 100644
index 000000000000..2869e240227d
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.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 ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX
+#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX
+
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#endif
+#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
+#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
+#include <com/sun/star/accessibility/XAccessibleText.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#ifndef _CPPUHELPER_IMPLBASE4_HXX
+#include <cppuhelper/implbase4.hxx>
+#endif
+#include <comphelper/accessibletexthelper.hxx>
+#include <tools/solar.h>
+
+// class VCLXAccessibleToolBoxItem ---------------------------------------------
+
+class ToolBox;
+
+typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE;
+typedef ::cppu::ImplHelper4 < ::com::sun::star::accessibility::XAccessible,
+                              ::com::sun::star::accessibility::XAccessibleAction,
+                              ::com::sun::star::accessibility::XAccessibleValue,
+                              ::com::sun::star::lang::XServiceInfo > VCLXAccessibleToolBoxItem_BASE;
+
+class VCLExternalSolarLock;
+
+class VCLXAccessibleToolBoxItem : public AccessibleTextHelper_BASE,
+                                  public VCLXAccessibleToolBoxItem_BASE
+{
+private:
+    ::rtl::OUString         m_sOldName;
+    ToolBox*                m_pToolBox;
+    VCLExternalSolarLock*   m_pExternalLock;
+    sal_Int32               m_nIndexInParent;
+    sal_Int16               m_nRole;
+    sal_uInt16                  m_nItemId;
+    sal_Bool                m_bHasFocus;
+    sal_Bool                m_bIsChecked;
+    bool                    m_bIndeterminate;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >    m_xChild;
+
+public:
+    inline sal_Int32    getIndexInParent() const                    { return m_nIndexInParent; }
+    inline void         setIndexInParent( sal_Int32 _nNewIndex )    { m_nIndexInParent = _nNewIndex; }
+
+protected:
+    virtual ~VCLXAccessibleToolBoxItem();
+
+    virtual void SAL_CALL                   disposing();
+
+    /// implements the calculation of the bounding rectangle
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL   implGetBounds(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // OCommonAccessibleText
+    virtual ::rtl::OUString                             implGetText();
+    virtual ::com::sun::star::lang::Locale              implGetLocale();
+    virtual void                                        implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex );
+
+    ::rtl::OUString GetText( bool _bAsName );
+
+public:
+    VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_Int32 _nPos );
+
+    void                SetFocus( sal_Bool _bFocus );
+    inline sal_Bool     HasFocus() const { return m_bHasFocus; }
+    void                SetChecked( sal_Bool _bCheck );
+    inline sal_Bool     IsChecked() const { return m_bIsChecked; }
+    void                SetIndeterminate( bool _bIndeterminate );
+    inline bool         IsIndeterminate() const { return m_bIndeterminate; }
+    inline void         ReleaseToolBox() { m_pToolBox = NULL; }
+    void                NameChanged();
+    void                SetChild( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xChild );
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+                        GetChild() const { return m_xChild; }
+    void                NotifyChildEvent( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xChild, bool _bShow );
+
+    void                ToggleEnableState();
+
+    // XInterface
+    DECLARE_XINTERFACE( )
+    DECLARE_XTYPEPROVIDER( )
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessible
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleContext
+    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleText
+    virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleComponent
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL grabFocus(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getForeground(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getBackground(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleExtendedComponent
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getFontMetrics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& xFont ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getTitledBorderText(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getToolTipText(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleAction
+    virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleValue
+    virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue(  ) throw (::com::sun::star::uno::RuntimeException);
+};
+
+#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX
+
diff --git a/accessibility/inc/makefile.mk b/accessibility/inc/makefile.mk
new file mode 100644
index 000000000000..3afcad166928
--- /dev/null
+++ b/accessibility/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=accessibility
+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/accessibility/inc/pch/precompiled_accessibility.cxx b/accessibility/inc/pch/precompiled_accessibility.cxx
new file mode 100644
index 000000000000..de6282ce69cb
--- /dev/null
+++ b/accessibility/inc/pch/precompiled_accessibility.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_accessibility.hxx"
+
diff --git a/accessibility/inc/pch/precompiled_accessibility.hxx b/accessibility/inc/pch/precompiled_accessibility.hxx
new file mode 100644
index 000000000000..4d3020b4e289
--- /dev/null
+++ b/accessibility/inc/pch/precompiled_accessibility.hxx
@@ -0,0 +1,37 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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:28.952369
+
+#ifdef PRECOMPILED_HEADERS
+
+//---MARKER---
+
+#include "com/sun/star/accessibility/AccessibleRelationType.hpp"
+#include "unotools/accessiblerelationsethelper.hxx"
+#include "vcl/window.hxx"
+#endif
diff --git a/accessibility/prj/build.lst b/accessibility/prj/build.lst
new file mode 100755
index 000000000000..c9a8c345e056
--- /dev/null
+++ b/accessibility/prj/build.lst
@@ -0,0 +1,18 @@
+ac  accessibility	:    L10N:l10n tools jurt offuh unoil vcl javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL
+ac	accessibility                                         	usr1	-	all	ac_mkout NULL
+ac	accessibility\inc                                      	nmake	-	all	ac_inc NULL
+ac	accessibility\bridge\org\openoffice\java\accessibility	nmake	-	w	ac_ooja ac_inc NULL
+ac	accessibility\bridge\org\openoffice\accessibility   	nmake	-	w	ac_ooa ac_ooja.w ac_inc NULL
+ac	accessibility\bridge\source\java                      	nmake   -	w	ac_ooan ac_ooa.w ac_inc NULL
+ac  accessibility\inc                                       get     -   all ac_inc NULL
+ac  accessibility\source\helper                             nmake   -   all ac_helper ac_inc NULL
+ac  accessibility\source\standard                           nmake   -   all ac_standard ac_helper ac_inc NULL
+ac  accessibility\source\extended                           nmake   -   all ac_extended ac_inc NULL
+ac  accessibility\util                                      nmake   -   all ac_util ac_helper ac_standard ac_extended NULL
+ac accessibility\workben\org\openoffice\accessibility\awb           nmake   -   all ac_awb_main ac_awb_misc ac_awb_canvas ac_awb_view ac_awb_tree NULL
+ac accessibility\workben\org\openoffice\accessibility\misc          nmake   -   all ac_awb_misc NULL
+ac accessibility\workben\org\openoffice\accessibility\awb\canvas    nmake   -   all ac_awb_canvas ac_awb_tree NULL
+ac accessibility\workben\org\openoffice\accessibility\awb\tree      nmake   -   all ac_awb_tree ac_awb_misc NULL
+ac accessibility\workben\org\openoffice\accessibility\awb\view      nmake   -   all ac_awb_view ac_awb_view_text NULL
+# dependency on ac_awb_misc to avoid concurrent creation of java_ver.mk
+ac accessibility\workben\org\openoffice\accessibility\awb\view\text nmake   -   all ac_awb_view_text ac_awb_misc NULL
diff --git a/accessibility/prj/d.lst b/accessibility/prj/d.lst
new file mode 100644
index 000000000000..662373c7c487
--- /dev/null
+++ b/accessibility/prj/d.lst
@@ -0,0 +1,8 @@
+..\%__SRC%\class\java_uno_accessbridge.jar %_DEST%\bin%_EXT%\java_uno_accessbridge.jar
+..\%__SRC%\class\java_accessibility.jar %_DEST%\bin%_EXT%\java_accessibility.jar
+
+..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
+..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
+..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
+..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+..\%__SRC%\misc\java_uno_accessbridge.component %_DEST%\xml\java_uno_accessbridge.component
diff --git a/accessibility/prj/l10n b/accessibility/prj/l10n
new file mode 100644
index 000000000000..69f0d9e5e24e
--- /dev/null
+++ b/accessibility/prj/l10n
@@ -0,0 +1 @@
+#i49922#  In this module en-US and de are used as source language
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx
new file mode 100644
index 000000000000..677c15513d7a
--- /dev/null
+++ b/accessibility/source/extended/AccessibleBrowseBox.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_accessibility.hxx"
+#include "accessibility/extended/AccessibleBrowseBox.hxx"
+#include "accessibility/extended/AccessibleBrowseBoxTable.hxx"
+#include "accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx"
+#include <svtools/accessibletableprovider.hxx>
+#include <comphelper/types.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+
+// ============================================================================
+
+namespace accessibility
+{
+
+// ============================================================================
+
+using ::rtl::OUString;
+
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::accessibility;
+using namespace ::svt;
+
+// ============================================================================
+class AccessibleBrowseBoxImpl
+{
+public:
+    /// the XAccessible which created the AccessibleBrowseBox
+    WeakReference< XAccessible >                                m_aCreator;
+
+    /** The data table child. */
+    Reference<
+        ::com::sun::star::accessibility::XAccessible >          mxTable;
+    AccessibleBrowseBoxTable*                                   m_pTable;
+
+    /** The header bar for rows ("handle column"). */
+    Reference<
+        ::com::sun::star::accessibility::XAccessible >          mxRowHeaderBar;
+    AccessibleBrowseBoxHeaderBar*                               m_pRowHeaderBar;
+
+    /** The header bar for columns (first row of the table). */
+    Reference<
+        ::com::sun::star::accessibility::XAccessible >          mxColumnHeaderBar;
+    AccessibleBrowseBoxHeaderBar*                               m_pColumnHeaderBar;
+};
+
+// Ctor/Dtor/disposing --------------------------------------------------------
+
+DBG_NAME( AccessibleBrowseBox )
+
+AccessibleBrowseBox::AccessibleBrowseBox(
+            const Reference< XAccessible >& _rxParent, const Reference< XAccessible >& _rxCreator,
+            IAccessibleTableProvider& _rBrowseBox )
+    : AccessibleBrowseBoxBase( _rxParent, _rBrowseBox,NULL, BBTYPE_BROWSEBOX )
+{
+    DBG_CTOR( AccessibleBrowseBox, NULL );
+    m_pImpl.reset( new AccessibleBrowseBoxImpl() );
+    m_pImpl->m_aCreator = _rxCreator;
+
+    m_xFocusWindow = VCLUnoHelper::GetInterface(mpBrowseBox->GetWindowInstance());
+}
+// -----------------------------------------------------------------------------
+void AccessibleBrowseBox::setCreator( const Reference< XAccessible >& _rxCreator )
+{
+#if OSL_DEBUG_LEVEL > 0
+    Reference< XAccessible > xCreator = (Reference< XAccessible >)m_pImpl->m_aCreator;
+    DBG_ASSERT( !xCreator.is(), "accessibility/extended/AccessibleBrowseBox::setCreator: creator already set!" );
+#endif
+    m_pImpl->m_aCreator = _rxCreator;
+}
+
+// -----------------------------------------------------------------------------
+AccessibleBrowseBox::~AccessibleBrowseBox()
+{
+    DBG_DTOR( AccessibleBrowseBox, NULL );
+}
+// -----------------------------------------------------------------------------
+
+void SAL_CALL AccessibleBrowseBox::disposing()
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+
+    m_pImpl->m_pTable           = NULL;
+    m_pImpl->m_pColumnHeaderBar = NULL;
+    m_pImpl->m_pRowHeaderBar    = NULL;
+    m_pImpl->m_aCreator         = Reference< XAccessible >();
+
+    Reference< XAccessible >  xTable = m_pImpl->mxTable;
+
+    Reference< XComponent > xComp( m_pImpl->mxTable, UNO_QUERY );
+    if ( xComp.is() )
+    {
+        xComp->dispose();
+
+    }
+//!    ::comphelper::disposeComponent(m_pImpl->mxTable);
+    ::comphelper::disposeComponent(m_pImpl->mxRowHeaderBar);
+    ::comphelper::disposeComponent(m_pImpl->mxColumnHeaderBar);
+
+    AccessibleBrowseBoxBase::disposing();
+}
+// -----------------------------------------------------------------------------
+
+// XAccessibleContext ---------------------------------------------------------
+
+sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount()
+    throw ( uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return BBINDEX_FIRSTCONTROL + mpBrowseBox->GetAccessibleControlCount();
+}
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > SAL_CALL
+AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+
+    Reference< XAccessible > xRet;
+    if( nChildIndex >= 0 )
+    {
+        if( nChildIndex < BBINDEX_FIRSTCONTROL )
+            xRet = implGetFixedChild( nChildIndex );
+        else
+        {
+            // additional controls
+            nChildIndex -= BBINDEX_FIRSTCONTROL;
+            if( nChildIndex < mpBrowseBox->GetAccessibleControlCount() )
+                xRet = mpBrowseBox->CreateAccessibleControl( nChildIndex );
+        }
+    }
+
+    if( !xRet.is() )
+        throw lang::IndexOutOfBoundsException();
+    return xRet;
+}
+// -----------------------------------------------------------------------------
+
+//sal_Int16 SAL_CALL AccessibleBrowseBox::getAccessibleRole()
+//    throw ( uno::RuntimeException )
+//{
+//    ensureIsAlive();
+//    return AccessibleRole::PANEL;
+//}
+// -----------------------------------------------------------------------------
+
+// XAccessibleComponent -------------------------------------------------------
+
+Reference< XAccessible > SAL_CALL
+AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint )
+    throw ( uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+
+    Reference< XAccessible > xChild;
+    sal_Int32 nIndex = 0;
+    if( mpBrowseBox->ConvertPointToControlIndex( nIndex, VCLPoint( rPoint ) ) )
+        xChild = mpBrowseBox->CreateAccessibleControl( nIndex );
+    else
+    {
+        // try whether point is in one of the fixed children
+        // (table, header bars, corner control)
+        Point aPoint( VCLPoint( rPoint ) );
+        for( nIndex = 0; (nIndex < BBINDEX_FIRSTCONTROL) && !xChild.is(); ++nIndex )
+        {
+            Reference< XAccessible > xCurrChild( implGetFixedChild( nIndex ) );
+            Reference< XAccessibleComponent >
+                xCurrChildComp( xCurrChild, uno::UNO_QUERY );
+
+            if( xCurrChildComp.is() &&
+                    VCLRectangle( xCurrChildComp->getBounds() ).IsInside( aPoint ) )
+                xChild = xCurrChild;
+        }
+    }
+    return xChild;
+}
+// -----------------------------------------------------------------------------
+
+void SAL_CALL AccessibleBrowseBox::grabFocus()
+    throw ( uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    mpBrowseBox->GrabFocus();
+}
+// -----------------------------------------------------------------------------
+
+Any SAL_CALL AccessibleBrowseBox::getAccessibleKeyBinding()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return Any();
+}
+// -----------------------------------------------------------------------------
+
+// XServiceInfo ---------------------------------------------------------------
+
+OUString SAL_CALL AccessibleBrowseBox::getImplementationName()
+    throw ( uno::RuntimeException )
+{
+    return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleBrowseBox" ) );
+}
+// -----------------------------------------------------------------------------
+
+// internal virtual methods ---------------------------------------------------
+
+Rectangle AccessibleBrowseBox::implGetBoundingBox()
+{
+    Window* pParent = mpBrowseBox->GetAccessibleParentWindow();
+    DBG_ASSERT( pParent, "implGetBoundingBox - missing parent window" );
+    return mpBrowseBox->GetWindowExtentsRelative( pParent );
+}
+// -----------------------------------------------------------------------------
+
+Rectangle AccessibleBrowseBox::implGetBoundingBoxOnScreen()
+{
+    return mpBrowseBox->GetWindowExtentsRelative( NULL );
+}
+// -----------------------------------------------------------------------------
+
+// internal helper methods ----------------------------------------------------
+
+Reference< XAccessible > AccessibleBrowseBox::implGetTable()
+{
+    if( !m_pImpl->mxTable.is() )
+    {
+        m_pImpl->m_pTable = createAccessibleTable();
+        m_pImpl->mxTable  = m_pImpl->m_pTable;
+
+    }
+    return m_pImpl->mxTable;
+}
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible >
+AccessibleBrowseBox::implGetHeaderBar( AccessibleBrowseBoxObjType eObjType )
+{
+    Reference< XAccessible > xRet;
+    Reference< XAccessible >* pxMember = NULL;
+
+    if( eObjType == BBTYPE_ROWHEADERBAR )
+        pxMember = &m_pImpl->mxRowHeaderBar;
+    else if( eObjType ==  BBTYPE_COLUMNHEADERBAR )
+        pxMember = &m_pImpl->mxColumnHeaderBar;
+
+    if( pxMember )
+    {
+        if( !pxMember->is() )
+        {
+            AccessibleBrowseBoxHeaderBar* pHeaderBar = new AccessibleBrowseBoxHeaderBar(
+                (Reference< XAccessible >)m_pImpl->m_aCreator, *mpBrowseBox, eObjType );
+
+            if ( BBTYPE_COLUMNHEADERBAR == eObjType)
+                m_pImpl->m_pColumnHeaderBar = pHeaderBar;
+            else
+                m_pImpl->m_pRowHeaderBar    = pHeaderBar;
+
+            *pxMember = pHeaderBar;
+        }
+        xRet = *pxMember;
+    }
+    return xRet;
+}
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible >
+AccessibleBrowseBox::implGetFixedChild( sal_Int32 nChildIndex )
+{
+    Reference< XAccessible > xRet;
+    switch( nChildIndex )
+    {
+        case BBINDEX_COLUMNHEADERBAR:
+            xRet = implGetHeaderBar( BBTYPE_COLUMNHEADERBAR );
+        break;
+        case BBINDEX_ROWHEADERBAR:
+            xRet = implGetHeaderBar( BBTYPE_ROWHEADERBAR );
+        break;
+        case BBINDEX_TABLE:
+            xRet = implGetTable();
+        break;
+    }
+    return xRet;
+}
+// -----------------------------------------------------------------------------
+AccessibleBrowseBoxTable* AccessibleBrowseBox::createAccessibleTable()
+{
+    Reference< XAccessible > xCreator = (Reference< XAccessible >)m_pImpl->m_aCreator;
+    DBG_ASSERT( xCreator.is(), "accessibility/extended/AccessibleBrowseBox::createAccessibleTable: my creator died - how this?" );
+    return new AccessibleBrowseBoxTable( xCreator, *mpBrowseBox );
+}
+// -----------------------------------------------------------------------------
+void AccessibleBrowseBox::commitTableEvent(sal_Int16 _nEventId,const Any& _rNewValue,const Any& _rOldValue)
+{
+    if ( m_pImpl->mxTable.is() )
+    {
+        m_pImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue);
+    }
+}
+// -----------------------------------------------------------------------------
+void AccessibleBrowseBox::commitHeaderBarEvent( sal_Int16 _nEventId,
+                                                const Any& _rNewValue,
+                                                const Any& _rOldValue,sal_Bool _bColumnHeaderBar)
+{
+    Reference< XAccessible > xHeaderBar = _bColumnHeaderBar ? m_pImpl->mxColumnHeaderBar : m_pImpl->mxRowHeaderBar;
+    AccessibleBrowseBoxHeaderBar* pHeaderBar = _bColumnHeaderBar ? m_pImpl->m_pColumnHeaderBar : m_pImpl->m_pRowHeaderBar;
+    if ( xHeaderBar.is() )
+        pHeaderBar->commitEvent(_nEventId,_rNewValue,_rOldValue);
+}
+
+// ============================================================================
+// = AccessibleBrowseBoxAccess
+// ============================================================================
+DBG_NAME( AccessibleBrowseBoxAccess )
+// -----------------------------------------------------------------------------
+AccessibleBrowseBoxAccess::AccessibleBrowseBoxAccess( const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox )
+        :m_xParent( _rxParent )
+        ,m_rBrowseBox( _rBrowseBox )
+        ,m_pContext( NULL )
+{
+    DBG_CTOR( AccessibleBrowseBoxAccess, NULL );
+}
+
+// -----------------------------------------------------------------------------
+AccessibleBrowseBoxAccess::~AccessibleBrowseBoxAccess()
+{
+    DBG_DTOR( AccessibleBrowseBoxAccess, NULL );
+}
+
+// -----------------------------------------------------------------------------
+void AccessibleBrowseBoxAccess::dispose()
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    m_pContext = NULL;
+    ::comphelper::disposeComponent( m_xContext );
+}
+
+// -----------------------------------------------------------------------------
+Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibleContext() throw ( RuntimeException )
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    DBG_ASSERT( ( m_pContext && m_xContext.is() ) || ( !m_pContext && !m_xContext.is() ),
+        "accessibility/extended/AccessibleBrowseBoxAccess::getAccessibleContext: inconsistency!" );
+
+    // if the context died meanwhile (we're no listener, so it won't tell us explicitily when this happens),
+    // then reset an re-create.
+    if ( m_pContext && !m_pContext->isAlive() )
+        m_xContext = m_pContext = NULL;
+
+    if ( !m_xContext.is() )
+        m_xContext = m_pContext = new AccessibleBrowseBox( m_xParent, this, m_rBrowseBox );
+
+    return m_xContext;
+}
+
+// -----------------------------------------------------------------------------
+bool AccessibleBrowseBoxAccess::isContextAlive() const
+{
+    return  ( NULL != m_pContext ) && m_pContext->isAlive();
+}
+
+// ============================================================================
+
+}   // namespace accessibility
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
new file mode 100644
index 000000000000..f8b43ecdced2
--- /dev/null
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -0,0 +1,658 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+#include "accessibility/extended/AccessibleBrowseBoxBase.hxx"
+#include <svtools/accessibletableprovider.hxx>
+#include <rtl/uuid.h>
+//
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <unotools/accessiblerelationsethelper.hxx>
+
+// ============================================================================
+
+using ::rtl::OUString;
+
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::Any;
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
+using namespace ::comphelper;
+using namespace ::svt;
+
+
+// ============================================================================
+
+namespace accessibility {
+
+using namespace com::sun::star::accessibility::AccessibleStateType;
+// ============================================================================
+
+// Ctor/Dtor/disposing --------------------------------------------------------
+
+DBG_NAME( AccessibleBrowseBoxBase )
+
+AccessibleBrowseBoxBase::AccessibleBrowseBoxBase(
+        const Reference< XAccessible >& rxParent,
+        IAccessibleTableProvider&                      rBrowseBox,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+        AccessibleBrowseBoxObjType      eObjType ) :
+    AccessibleBrowseBoxImplHelper( m_aMutex ),
+    mxParent( rxParent ),
+    mpBrowseBox( &rBrowseBox ),
+    m_xFocusWindow(_xFocusWindow),
+    maName( rBrowseBox.GetAccessibleObjectName( eObjType ) ),
+    maDescription( rBrowseBox.GetAccessibleObjectDescription( eObjType ) ),
+    meObjType( eObjType ),
+    m_aClientId(0)
+{
+    DBG_CTOR( AccessibleBrowseBoxBase, NULL );
+    if ( m_xFocusWindow.is() )
+        m_xFocusWindow->addFocusListener( this );
+}
+
+AccessibleBrowseBoxBase::AccessibleBrowseBoxBase(
+        const Reference< XAccessible >& rxParent,
+        IAccessibleTableProvider&                      rBrowseBox,
+        const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+        AccessibleBrowseBoxObjType      eObjType,
+        const ::rtl::OUString&          rName,
+        const ::rtl::OUString&          rDescription ) :
+    AccessibleBrowseBoxImplHelper( m_aMutex ),
+    mxParent( rxParent ),
+    mpBrowseBox( &rBrowseBox ),
+    m_xFocusWindow(_xFocusWindow),
+    maName( rName ),
+    maDescription( rDescription ),
+    meObjType( eObjType ),
+    m_aClientId(0)
+{
+    DBG_CTOR( AccessibleBrowseBoxBase, NULL );
+    if ( m_xFocusWindow.is() )
+        m_xFocusWindow->addFocusListener( this );
+}
+
+AccessibleBrowseBoxBase::~AccessibleBrowseBoxBase()
+{
+    DBG_DTOR( AccessibleBrowseBoxBase, NULL );
+
+    if( isAlive() )
+    {
+        // increment ref count to prevent double call of Dtor
+        osl_incrementInterlockedCount( &m_refCount );
+        dispose();
+    }
+}
+
+void SAL_CALL AccessibleBrowseBoxBase::disposing()
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    if ( m_xFocusWindow.is() )
+    {
+        BBSolarGuard aSolarGuard;
+        m_xFocusWindow->removeFocusListener( this );
+    }
+
+    if ( getClientId( ) )
+    {
+        AccessibleEventNotifier::TClientId nId( getClientId( ) );
+        setClientId( 0 );
+        AccessibleEventNotifier::revokeClientNotifyDisposing( nId, *this );
+    }
+
+    mxParent = NULL;
+    mpBrowseBox = NULL;
+}
+
+// XAccessibleContext ---------------------------------------------------------
+
+Reference< XAccessible > SAL_CALL AccessibleBrowseBoxBase::getAccessibleParent()
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return mxParent;
+}
+
+sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getAccessibleIndexInParent()
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+
+    // -1 for child not found/no parent (according to specification)
+    sal_Int32 nRet = -1;
+
+    Reference< uno::XInterface > xMeMyselfAndI( static_cast< XAccessibleContext* >( this ), uno::UNO_QUERY );
+
+    //  iterate over parent's children and search for this object
+    if( mxParent.is() )
+    {
+        Reference< XAccessibleContext >
+            xParentContext( mxParent->getAccessibleContext() );
+        if( xParentContext.is() )
+        {
+            Reference< uno::XInterface > xChild;
+
+            sal_Int32 nChildCount = xParentContext->getAccessibleChildCount();
+            for( sal_Int32 nChild = 0; nChild < nChildCount; ++nChild )
+            {
+                xChild = xChild.query( xParentContext->getAccessibleChild( nChild ) );
+
+                if ( xMeMyselfAndI.get() == xChild.get() )
+                {
+                    nRet = nChild;
+                    break;
+                }
+            }
+        }
+   }
+   return nRet;
+}
+
+OUString SAL_CALL AccessibleBrowseBoxBase::getAccessibleDescription()
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return maDescription;
+}
+
+OUString SAL_CALL AccessibleBrowseBoxBase::getAccessibleName()
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return maName;
+}
+
+Reference< XAccessibleRelationSet > SAL_CALL
+AccessibleBrowseBoxBase::getAccessibleRelationSet()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    // BrowseBox does not have relations.
+       return new utl::AccessibleRelationSetHelper;
+}
+
+Reference< XAccessibleStateSet > SAL_CALL
+AccessibleBrowseBoxBase::getAccessibleStateSet()
+    throw ( uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    // don't check whether alive -> StateSet may contain DEFUNC
+    return implCreateStateSetHelper();
+}
+
+lang::Locale SAL_CALL AccessibleBrowseBoxBase::getLocale()
+    throw ( IllegalAccessibleComponentStateException, uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    if( mxParent.is() )
+    {
+        Reference< XAccessibleContext >
+            xParentContext( mxParent->getAccessibleContext() );
+        if( xParentContext.is() )
+            return xParentContext->getLocale();
+    }
+    throw IllegalAccessibleComponentStateException();
+}
+
+// XAccessibleComponent -------------------------------------------------------
+
+sal_Bool SAL_CALL AccessibleBrowseBoxBase::containsPoint( const awt::Point& rPoint )
+    throw ( uno::RuntimeException )
+{
+    return Rectangle( Point(), getBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
+}
+
+awt::Rectangle SAL_CALL AccessibleBrowseBoxBase::getBounds()
+    throw ( uno::RuntimeException )
+{
+    return AWTRectangle( getBoundingBox() );
+}
+
+awt::Point SAL_CALL AccessibleBrowseBoxBase::getLocation()
+    throw ( uno::RuntimeException )
+{
+    return AWTPoint( getBoundingBox().TopLeft() );
+}
+
+awt::Point SAL_CALL AccessibleBrowseBoxBase::getLocationOnScreen()
+    throw ( uno::RuntimeException )
+{
+    return AWTPoint( getBoundingBoxOnScreen().TopLeft() );
+}
+
+awt::Size SAL_CALL AccessibleBrowseBoxBase::getSize()
+    throw ( uno::RuntimeException )
+{
+    return AWTSize( getBoundingBox().GetSize() );
+}
+
+sal_Bool SAL_CALL AccessibleBrowseBoxBase::isShowing()
+    throw ( uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return implIsShowing();
+}
+
+sal_Bool SAL_CALL AccessibleBrowseBoxBase::isVisible()
+    throw ( uno::RuntimeException )
+{
+    Reference< XAccessibleStateSet > xStateSet = getAccessibleStateSet();
+    return xStateSet.is() ?
+        xStateSet->contains( AccessibleStateType::VISIBLE ) : sal_False;
+}
+
+sal_Bool SAL_CALL AccessibleBrowseBoxBase::isFocusTraversable()
+    throw ( uno::RuntimeException )
+{
+    Reference< XAccessibleStateSet > xStateSet = getAccessibleStateSet();
+    return xStateSet.is() ?
+        xStateSet->contains( AccessibleStateType::FOCUSABLE ) : sal_False;
+}
+
+void SAL_CALL AccessibleBrowseBoxBase::focusGained( const ::com::sun::star::awt::FocusEvent& ) throw (::com::sun::star::uno::RuntimeException)
+{
+    com::sun::star::uno::Any aFocused;
+    com::sun::star::uno::Any aEmpty;
+    aFocused <<= FOCUSED;
+
+    commitEvent(AccessibleEventId::STATE_CHANGED,aFocused,aEmpty);
+}
+// -----------------------------------------------------------------------------
+
+void SAL_CALL AccessibleBrowseBoxBase::focusLost( const ::com::sun::star::awt::FocusEvent& ) throw (::com::sun::star::uno::RuntimeException)
+{
+    com::sun::star::uno::Any aFocused;
+    com::sun::star::uno::Any aEmpty;
+    aFocused <<= FOCUSED;
+
+    commitEvent(AccessibleEventId::STATE_CHANGED,aEmpty,aFocused);
+}
+// XAccessibleEventBroadcaster ------------------------------------------------
+
+void SAL_CALL AccessibleBrowseBoxBase::addEventListener(
+        const Reference< XAccessibleEventListener>& _rxListener )
+    throw ( uno::RuntimeException )
+{
+    if ( _rxListener.is() )
+    {
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        if ( !getClientId( ) )
+            setClientId( AccessibleEventNotifier::registerClient( ) );
+
+        AccessibleEventNotifier::addEventListener( getClientId( ), _rxListener );
+    }
+}
+
+void SAL_CALL AccessibleBrowseBoxBase::removeEventListener(
+        const Reference< XAccessibleEventListener>& _rxListener )
+    throw ( uno::RuntimeException )
+{
+    if( _rxListener.is() && getClientId( ) )
+    {
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        sal_Int32 nListenerCount = AccessibleEventNotifier::removeEventListener( getClientId( ), _rxListener );
+        if ( !nListenerCount )
+        {
+            // no listeners anymore
+            // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
+            // and at least to us not firing any events anymore, in case somebody calls
+            // NotifyAccessibleEvent, again
+
+            AccessibleEventNotifier::TClientId nId( getClientId( ) );
+            setClientId( 0 );
+            AccessibleEventNotifier::revokeClient( nId );
+        }
+    }
+}
+
+// XTypeProvider --------------------------------------------------------------
+
+Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxBase::getImplementationId()
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslGlobalMutex() );
+    static Sequence< sal_Int8 > aId;
+    implCreateUuid( aId );
+    return aId;
+}
+
+// XServiceInfo ---------------------------------------------------------------
+
+sal_Bool SAL_CALL AccessibleBrowseBoxBase::supportsService(
+        const OUString& rServiceName )
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+
+    Sequence< OUString > aSupportedServices( getSupportedServiceNames() );
+    const OUString* pArrBegin = aSupportedServices.getConstArray();
+    const OUString* pArrEnd = pArrBegin + aSupportedServices.getLength();
+    const OUString* pString = pArrBegin;
+
+    for( ; ( pString != pArrEnd ) && ( rServiceName != *pString ); ++pString )
+        ;
+
+    return pString != pArrEnd;
+}
+
+Sequence< OUString > SAL_CALL AccessibleBrowseBoxBase::getSupportedServiceNames()
+    throw ( uno::RuntimeException )
+{
+    const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleContext" ) );
+    return Sequence< OUString >( &aServiceName, 1 );
+}
+
+// other public methods -------------------------------------------------------
+
+void AccessibleBrowseBoxBase::setAccessibleName( const OUString& rName )
+{
+    ::osl::ClearableMutexGuard aGuard( getOslMutex() );
+    Any aOld;
+    aOld <<= maName;
+    maName = rName;
+
+    aGuard.clear();
+
+    commitEvent(
+        AccessibleEventId::NAME_CHANGED,
+        uno::makeAny( maName ),
+        aOld );
+}
+
+void AccessibleBrowseBoxBase::setAccessibleDescription( const OUString& rDescription )
+{
+    ::osl::ClearableMutexGuard aGuard( getOslMutex() );
+    Any aOld;
+    aOld <<= maDescription;
+    maDescription = rDescription;
+
+    aGuard.clear();
+
+    commitEvent(
+        AccessibleEventId::DESCRIPTION_CHANGED,
+        uno::makeAny( maDescription ),
+        aOld );
+}
+
+// internal virtual methods ---------------------------------------------------
+
+sal_Bool AccessibleBrowseBoxBase::implIsShowing()
+{
+    sal_Bool bShowing = sal_False;
+    if( mxParent.is() )
+    {
+        Reference< XAccessibleComponent >
+            xParentComp( mxParent->getAccessibleContext(), uno::UNO_QUERY );
+        if( xParentComp.is() )
+            bShowing = implGetBoundingBox().IsOver(
+                VCLRectangle( xParentComp->getBounds() ) );
+    }
+    return bShowing;
+}
+
+::utl::AccessibleStateSetHelper* AccessibleBrowseBoxBase::implCreateStateSetHelper()
+{
+    ::utl::AccessibleStateSetHelper*
+        pStateSetHelper = new ::utl::AccessibleStateSetHelper;
+
+    if( isAlive() )
+    {
+        // SHOWING done with mxParent
+        if( implIsShowing() )
+            pStateSetHelper->AddState( AccessibleStateType::SHOWING );
+        // BrowseBox fills StateSet with states depending on object type
+        mpBrowseBox->FillAccessibleStateSet( *pStateSetHelper, getType() );
+    }
+    else
+        pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+
+    return pStateSetHelper;
+}
+
+// internal helper methods ----------------------------------------------------
+
+sal_Bool AccessibleBrowseBoxBase::isAlive() const
+{
+    return !rBHelper.bDisposed && !rBHelper.bInDispose && mpBrowseBox;
+}
+
+void AccessibleBrowseBoxBase::ensureIsAlive() const
+    throw ( lang::DisposedException )
+{
+    if( !isAlive() )
+        throw lang::DisposedException();
+}
+
+Rectangle AccessibleBrowseBoxBase::getBoundingBox()
+    throw ( lang::DisposedException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    Rectangle aRect = implGetBoundingBox();
+    if ( 0 == aRect.Left() && 0 == aRect.Top() && 0 == aRect.Right() && 0 == aRect.Bottom() )
+    {
+        DBG_ERRORFILE( "shit" );
+    }
+    return aRect;
+}
+
+Rectangle AccessibleBrowseBoxBase::getBoundingBoxOnScreen()
+    throw ( lang::DisposedException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    Rectangle aRect = implGetBoundingBoxOnScreen();
+    if ( 0 == aRect.Left() && 0 == aRect.Top() && 0 == aRect.Right() && 0 == aRect.Bottom() )
+    {
+        DBG_ERRORFILE( "shit" );
+    }
+    return aRect;
+}
+
+void AccessibleBrowseBoxBase::commitEvent(
+        sal_Int16 _nEventId, const Any& _rNewValue, const Any& _rOldValue )
+{
+    ::osl::ClearableMutexGuard aGuard( getOslMutex() );
+    if ( !getClientId( ) )
+            // if we don't have a client id for the notifier, then we don't have listeners, then
+            // we don't need to notify anything
+            return;
+
+    // build an event object
+    AccessibleEventObject aEvent;
+    aEvent.Source = *this;
+    aEvent.EventId = _nEventId;
+    aEvent.OldValue = _rOldValue;
+    aEvent.NewValue = _rNewValue;
+
+    // let the notifier handle this event
+
+    AccessibleEventNotifier::addEvent( getClientId( ), aEvent );
+}
+// -----------------------------------------------------------------------------
+
+void AccessibleBrowseBoxBase::implCreateUuid( Sequence< sal_Int8 >& rId )
+{
+    if( !rId.hasElements() )
+    {
+        rId.realloc( 16 );
+        rtl_createUuid( reinterpret_cast< sal_uInt8* >( rId.getArray() ), 0, sal_True );
+    }
+}
+// -----------------------------------------------------------------------------
+sal_Int16 SAL_CALL AccessibleBrowseBoxBase::getAccessibleRole()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    sal_Int16 nRole = AccessibleRole::UNKNOWN;
+    switch ( meObjType )
+    {
+        case BBTYPE_ROWHEADERCELL:
+            nRole = AccessibleRole::ROW_HEADER;
+            break;
+        case BBTYPE_COLUMNHEADERCELL:
+            nRole = AccessibleRole::COLUMN_HEADER;
+            break;
+        case BBTYPE_COLUMNHEADERBAR:
+        case BBTYPE_ROWHEADERBAR:
+        case BBTYPE_TABLE:
+            nRole = AccessibleRole::TABLE;
+            break;
+        case BBTYPE_TABLECELL:
+            nRole = AccessibleRole::TABLE_CELL;
+            break;
+        case BBTYPE_BROWSEBOX:
+            nRole = AccessibleRole::PANEL;
+            break;
+        case BBTYPE_CHECKBOXCELL:
+            nRole = AccessibleRole::CHECK_BOX;
+            break;
+    }
+    return nRole;
+}
+// -----------------------------------------------------------------------------
+Any SAL_CALL AccessibleBrowseBoxBase::getAccessibleKeyBinding()
+        throw ( uno::RuntimeException )
+{
+    return Any();
+}
+// -----------------------------------------------------------------------------
+Reference<XAccessible > SAL_CALL AccessibleBrowseBoxBase::getAccessibleAtPoint( const ::com::sun::star::awt::Point& )
+        throw ( uno::RuntimeException )
+{
+    return NULL;
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL AccessibleBrowseBoxBase::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException)
+{
+    m_xFocusWindow = NULL;
+}
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground(  ) throw (::com::sun::star::uno::RuntimeException)
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+
+    sal_Int32 nColor = 0;
+    Window* pInst = mpBrowseBox->GetWindowInstance();
+    if ( pInst )
+    {
+        if ( pInst->IsControlForeground() )
+            nColor = pInst->GetControlForeground().GetColor();
+        else
+        {
+            Font aFont;
+            if ( pInst->IsControlFont() )
+                aFont = pInst->GetControlFont();
+            else
+                aFont = pInst->GetFont();
+            nColor = aFont.GetColor().GetColor();
+        }
+    }
+
+    return nColor;
+}
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getBackground(  ) throw (::com::sun::star::uno::RuntimeException)
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    sal_Int32 nColor = 0;
+    Window* pInst = mpBrowseBox->GetWindowInstance();
+    if ( pInst )
+    {
+        if ( pInst->IsControlBackground() )
+            nColor = pInst->GetControlBackground().GetColor();
+        else
+            nColor = pInst->GetBackground().GetColor().GetColor();
+    }
+
+    return nColor;
+}
+
+// ============================================================================
+DBG_NAME( BrowseBoxAccessibleElement )
+
+// XInterface -----------------------------------------------------------------
+IMPLEMENT_FORWARD_XINTERFACE2( BrowseBoxAccessibleElement, AccessibleBrowseBoxBase, BrowseBoxAccessibleElement_Base )
+
+// XTypeProvider --------------------------------------------------------------
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( BrowseBoxAccessibleElement, AccessibleBrowseBoxBase, BrowseBoxAccessibleElement_Base )
+
+// XAccessible ----------------------------------------------------------------
+
+Reference< XAccessibleContext > SAL_CALL BrowseBoxAccessibleElement::getAccessibleContext() throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return this;
+}
+
+// ----------------------------------------------------------------------------
+BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const Reference< XAccessible >& rxParent, IAccessibleTableProvider& rBrowseBox,
+        const Reference< awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType  eObjType )
+    :AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType )
+{
+    DBG_CTOR( BrowseBoxAccessibleElement, NULL );
+}
+
+// ----------------------------------------------------------------------------
+BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const Reference< XAccessible >& rxParent, IAccessibleTableProvider& rBrowseBox,
+        const Reference< awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType  eObjType,
+        const ::rtl::OUString& rName, const ::rtl::OUString& rDescription )
+    :AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType, rName, rDescription )
+{
+    DBG_CTOR( BrowseBoxAccessibleElement, NULL );
+}
+
+// ----------------------------------------------------------------------------
+BrowseBoxAccessibleElement::~BrowseBoxAccessibleElement( )
+{
+    DBG_DTOR( BrowseBoxAccessibleElement, NULL );
+}
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
new file mode 100644
index 000000000000..560878b544f3
--- /dev/null
+++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
@@ -0,0 +1,172 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+#include <accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <svtools/accessibletableprovider.hxx>
+
+namespace accessibility
+{
+    using namespace com::sun::star::accessibility;
+    using namespace com::sun::star::uno;
+    using namespace com::sun::star::accessibility::AccessibleEventId;
+    using namespace ::svt;
+
+    AccessibleCheckBoxCell::AccessibleCheckBoxCell(const Reference<XAccessible >& _rxParent,
+                                IAccessibleTableProvider& _rBrowseBox,
+                                const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+                                sal_Int32 _nRowPos,
+                                sal_uInt16 _nColPos
+                                ,const TriState& _eState,
+                                sal_Bool _bEnabled,
+                                sal_Bool _bIsTriState)
+        :AccessibleBrowseBoxCell(_rxParent, _rBrowseBox, _xFocusWindow, _nRowPos, _nColPos, BBTYPE_CHECKBOXCELL)
+        ,m_eState(_eState)
+        ,m_bEnabled(_bEnabled)
+        ,m_bIsTriState(_bIsTriState)
+    {
+    }
+    // -----------------------------------------------------------------------------
+    IMPLEMENT_FORWARD_XINTERFACE2( AccessibleCheckBoxCell, AccessibleBrowseBoxCell, AccessibleCheckBoxCell_BASE )
+        // -----------------------------------------------------------------------------
+    IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleCheckBoxCell, AccessibleBrowseBoxCell, AccessibleCheckBoxCell_BASE )
+    //--------------------------------------------------------------------
+    Reference< XAccessibleContext > SAL_CALL AccessibleCheckBoxCell::getAccessibleContext(  ) throw (RuntimeException)
+    {
+        ensureIsAlive();
+        return this;
+    }
+    // -----------------------------------------------------------------------------
+    ::utl::AccessibleStateSetHelper* AccessibleCheckBoxCell::implCreateStateSetHelper()
+    {
+        ::utl::AccessibleStateSetHelper* pStateSetHelper =
+            AccessibleBrowseBoxCell::implCreateStateSetHelper();
+        if( isAlive() )
+        {
+            mpBrowseBox->FillAccessibleStateSetForCell(
+                *pStateSetHelper, getRowPos(), static_cast< sal_uInt16 >( getColumnPos() ) );
+            if ( m_eState == STATE_CHECK )
+                pStateSetHelper->AddState( AccessibleStateType::CHECKED );
+        }
+        return pStateSetHelper;
+    }
+    // -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    // XAccessibleValue
+    // -----------------------------------------------------------------------------
+
+    Any SAL_CALL AccessibleCheckBoxCell::getCurrentValue(  ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( getOslMutex() );
+
+        sal_Int32 nValue = 0;
+        switch( m_eState )
+        {
+            case STATE_NOCHECK:
+                nValue = 0;
+                break;
+            case STATE_CHECK:
+                nValue = 1;
+                break;
+            case STATE_DONTKNOW:
+                nValue = 2;
+                break;
+        }
+        return makeAny(nValue);
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Bool SAL_CALL AccessibleCheckBoxCell::setCurrentValue( const Any& ) throw (RuntimeException)
+    {
+        return sal_False;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Any SAL_CALL AccessibleCheckBoxCell::getMaximumValue(  ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( getOslMutex() );
+
+        Any aValue;
+
+        if ( m_bIsTriState )
+            aValue <<= (sal_Int32) 2;
+        else
+            aValue <<= (sal_Int32) 1;
+
+        return aValue;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Any SAL_CALL AccessibleCheckBoxCell::getMinimumValue(  ) throw (RuntimeException)
+    {
+        Any aValue;
+        aValue <<= (sal_Int32) 0;
+
+        return aValue;
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessibleContext
+    sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        return 0;
+    }
+    // -----------------------------------------------------------------------------
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL AccessibleCheckBoxCell::getAccessibleChild( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        throw ::com::sun::star::lang::IndexOutOfBoundsException();
+    }
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleCheckBoxCell::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException )
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.TableCheckBoxCell" ) );
+    }
+    // -----------------------------------------------------------------------------
+    sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleIndexInParent()
+            throw ( ::com::sun::star::uno::RuntimeException )
+    {
+        ::osl::MutexGuard aGuard( getOslMutex() );
+
+        return ( getRowPos() * mpBrowseBox->GetColumnCount() ) + getColumnPos();
+    }
+    // -----------------------------------------------------------------------------
+    void AccessibleCheckBoxCell::SetChecked( sal_Bool _bChecked )
+    {
+        m_eState = _bChecked ? STATE_CHECK : STATE_NOCHECK;
+        Any aOldValue, aNewValue;
+        if ( _bChecked )
+            aNewValue <<= AccessibleStateType::CHECKED;
+        else
+            aOldValue <<= AccessibleStateType::CHECKED;
+        commitEvent( AccessibleEventId::STATE_CHANGED, aNewValue, aOldValue );
+    }
+}
+
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
new file mode 100644
index 000000000000..43d016b86588
--- /dev/null
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -0,0 +1,419 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+
+
+#include "accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx"
+#include <svtools/accessibletableprovider.hxx>
+
+// ============================================================================
+
+using ::rtl::OUString;
+
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::Any;
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
+using namespace ::svt;
+
+// ============================================================================
+
+namespace accessibility {
+
+// ============================================================================
+
+// Ctor/Dtor/disposing --------------------------------------------------------
+
+DBG_NAME( AccessibleBrowseBoxHeaderBar )
+
+AccessibleBrowseBoxHeaderBar::AccessibleBrowseBoxHeaderBar(
+        const Reference< XAccessible >& rxParent,
+        IAccessibleTableProvider&                      rBrowseBox,
+        AccessibleBrowseBoxObjType      eObjType ) :
+    AccessibleBrowseBoxTableBase( rxParent, rBrowseBox,eObjType )
+{
+    DBG_CTOR( AccessibleBrowseBoxHeaderBar, NULL );
+
+    DBG_ASSERT( isRowBar() || isColumnBar(),
+        "accessibility/extended/AccessibleBrowseBoxHeaderBar - invalid object type" );
+}
+
+AccessibleBrowseBoxHeaderBar::~AccessibleBrowseBoxHeaderBar()
+{
+    DBG_DTOR( AccessibleBrowseBoxHeaderBar, NULL );
+}
+
+// XAccessibleContext ---------------------------------------------------------
+
+Reference< XAccessible > SAL_CALL
+AccessibleBrowseBoxHeaderBar::getAccessibleChild( sal_Int32 nChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidHeaderIndex( nChildIndex );
+    return implGetChild( nChildIndex, implToVCLColumnPos( nChildIndex ) );
+}
+
+sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleIndexInParent()
+    throw ( uno::RuntimeException )
+{
+    return isRowBar() ? BBINDEX_ROWHEADERBAR : BBINDEX_COLUMNHEADERBAR;
+}
+
+// XAccessibleComponent -------------------------------------------------------
+
+Reference< XAccessible > SAL_CALL
+AccessibleBrowseBoxHeaderBar::getAccessibleAtPoint( const awt::Point& rPoint )
+    throw ( uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+
+    sal_Int32 nRow = 0;
+    sal_uInt16 nColumnPos = 0;
+    sal_Bool bConverted = isRowBar() ?
+        mpBrowseBox->ConvertPointToRowHeader( nRow, VCLPoint( rPoint ) ) :
+        mpBrowseBox->ConvertPointToColumnHeader( nColumnPos, VCLPoint( rPoint ) );
+
+    return bConverted ? implGetChild( nRow, nColumnPos ) : Reference< XAccessible >();
+}
+
+void SAL_CALL AccessibleBrowseBoxHeaderBar::grabFocus()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    // focus on header not supported
+}
+
+Any SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleKeyBinding()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return Any();   // no special key bindings for header
+}
+
+// XAccessibleTable -----------------------------------------------------------
+
+OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleRowDescription( sal_Int32 nRow )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidRow( nRow );
+    return OUString();  // no headers in headers
+}
+
+OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleColumnDescription( sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidColumn( nColumn );
+    return OUString();  // no headers in headers
+}
+
+Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleRowHeaders()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return NULL;        // no headers in headers
+}
+
+Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleColumnHeaders()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return NULL;        // no headers in headers
+}
+
+Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleRows()
+    throw ( uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+
+    Sequence< sal_Int32 > aSelSeq;
+    // row of column header bar not selectable
+    if( isRowBar() )
+        implGetSelectedRows( aSelSeq );
+    return aSelSeq;
+}
+
+Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleColumns()
+    throw ( uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+
+    Sequence< sal_Int32 > aSelSeq;
+    // column of row header bar ("handle column") not selectable
+    if( isColumnBar() )
+        implGetSelectedColumns( aSelSeq );
+    return aSelSeq;
+}
+
+sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleRowSelected( sal_Int32 nRow )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidRow( nRow );
+    return isRowBar() ? implIsRowSelected( nRow ) : sal_False;
+}
+
+sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleColumnSelected( sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidColumn( nColumn );
+    return isColumnBar() ? implIsColumnSelected( nColumn ) : sal_False;
+}
+
+Reference< XAccessible > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleCellAt(
+        sal_Int32 nRow, sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidAddress( nRow, nColumn );
+    return implGetChild( nRow, implToVCLColumnPos( nColumn ) );
+}
+
+sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleSelected(
+        sal_Int32 nRow, sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidAddress( nRow, nColumn );
+    return isRowBar() ? implIsRowSelected( nRow ) : implIsColumnSelected( nColumn );
+}
+
+// XAccessibleSelection -------------------------------------------------------
+
+void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAccessibleChild( sal_Int32 nChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidHeaderIndex( nChildIndex );
+    if( isRowBar() )
+        implSelectRow( nChildIndex, sal_True );
+    else
+        implSelectColumn( implToVCLColumnPos( nChildIndex ), sal_True );
+}
+
+sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleChildSelected( sal_Int32 nChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    // using interface methods - no mutex
+    return isRowBar() ?
+        isAccessibleRowSelected( nChildIndex ) :
+        isAccessibleColumnSelected( nChildIndex );
+}
+
+void SAL_CALL AccessibleBrowseBoxHeaderBar::clearAccessibleSelection()
+    throw ( uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    mpBrowseBox->SetNoSelection();
+}
+
+void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAllAccessibleChildren()
+    throw ( uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    // no multiselection of columns possible
+    if( isRowBar() )
+        mpBrowseBox->SelectAll();
+    else
+        implSelectColumn( implToVCLColumnPos( 0 ), sal_True );
+}
+
+sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChildCount()
+    throw ( uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return isRowBar() ? implGetSelectedRowCount() : implGetSelectedColumnCount();
+}
+
+Reference< XAccessible > SAL_CALL
+AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+
+    // method may throw lang::IndexOutOfBoundsException
+    sal_Int32 nIndex = implGetChildIndexFromSelectedIndex( nSelectedChildIndex );
+    return implGetChild( nIndex, implToVCLColumnPos( nIndex ) );
+}
+
+void SAL_CALL AccessibleBrowseBoxHeaderBar::deselectAccessibleChild(
+        sal_Int32 nSelectedChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+
+    // method may throw lang::IndexOutOfBoundsException
+    if ( isAccessibleChildSelected(nSelectedChildIndex) )
+    {
+        if( isRowBar() )
+            implSelectRow( nSelectedChildIndex, sal_False );
+        else
+            implSelectColumn( implToVCLColumnPos( nSelectedChildIndex ), sal_False );
+    }
+}
+
+// XInterface -----------------------------------------------------------------
+
+Any SAL_CALL AccessibleBrowseBoxHeaderBar::queryInterface( const uno::Type& rType )
+    throw ( uno::RuntimeException )
+{
+    Any aAny( AccessibleBrowseBoxTableBase::queryInterface( rType ) );
+    return aAny.hasValue() ?
+        aAny : AccessibleBrowseBoxHeaderBarImplHelper::queryInterface( rType );
+}
+
+void SAL_CALL AccessibleBrowseBoxHeaderBar::acquire() throw ()
+{
+    AccessibleBrowseBoxTableBase::acquire();
+}
+
+void SAL_CALL AccessibleBrowseBoxHeaderBar::release() throw ()
+{
+    AccessibleBrowseBoxTableBase::release();
+}
+
+// XServiceInfo ---------------------------------------------------------------
+
+OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getImplementationName()
+    throw ( uno::RuntimeException )
+{
+    return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleBrowseBoxHeaderBar" ) );
+}
+
+Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxHeaderBar::getImplementationId()
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslGlobalMutex() );
+    static Sequence< sal_Int8 > aId;
+    implCreateUuid( aId );
+    return aId;
+}
+
+// internal virtual methods ---------------------------------------------------
+
+Rectangle AccessibleBrowseBoxHeaderBar::implGetBoundingBox()
+{
+    return mpBrowseBox->calcHeaderRect(isColumnBar(),sal_False);
+}
+
+Rectangle AccessibleBrowseBoxHeaderBar::implGetBoundingBoxOnScreen()
+{
+    return mpBrowseBox->calcHeaderRect(isColumnBar(),sal_True);
+}
+
+sal_Int32 AccessibleBrowseBoxHeaderBar::implGetRowCount() const
+{
+    // column header bar: only 1 row
+    return isRowBar() ? AccessibleBrowseBoxTableBase::implGetRowCount() : 1;
+}
+
+sal_Int32 AccessibleBrowseBoxHeaderBar::implGetColumnCount() const
+{
+    // row header bar ("handle column"): only 1 column
+    return isColumnBar() ? AccessibleBrowseBoxTableBase::implGetColumnCount() : 1;
+}
+
+// internal helper methods ----------------------------------------------------
+
+Reference< XAccessible > AccessibleBrowseBoxHeaderBar::implGetChild(
+        sal_Int32 nRow, sal_uInt16 nColumnPos )
+{
+    return isRowBar() ?
+        mpBrowseBox->CreateAccessibleRowHeader( nRow ) :
+        mpBrowseBox->CreateAccessibleColumnHeader( nColumnPos );
+}
+
+sal_Int32 AccessibleBrowseBoxHeaderBar::implGetChildIndexFromSelectedIndex(
+        sal_Int32 nSelectedChildIndex )
+    throw ( lang::IndexOutOfBoundsException )
+{
+    Sequence< sal_Int32 > aSelSeq;
+    if( isRowBar() )
+        implGetSelectedRows( aSelSeq );
+    else
+        implGetSelectedColumns( aSelSeq );
+
+    if( (nSelectedChildIndex < 0) || (nSelectedChildIndex >= aSelSeq.getLength()) )
+        throw lang::IndexOutOfBoundsException();
+
+    return aSelSeq[ nSelectedChildIndex ];
+}
+
+void AccessibleBrowseBoxHeaderBar::ensureIsValidHeaderIndex( sal_Int32 nIndex )
+    throw ( lang::IndexOutOfBoundsException )
+{
+    if( isRowBar() )
+        ensureIsValidRow( nIndex );
+    else
+        ensureIsValidColumn( nIndex );
+}
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
new file mode 100644
index 000000000000..44d547f8fd5b
--- /dev/null
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+
+#include "accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx"
+#include <svtools/accessibletableprovider.hxx>
+#include "accessibility/extended/AccessibleBrowseBox.hxx"
+
+namespace accessibility
+{
+    using namespace ::com::sun::star::accessibility;
+    using namespace ::com::sun::star::lang;
+    using namespace ::com::sun::star::uno;
+    using namespace ::svt;
+
+AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnRowId,
+                                  const Reference< XAccessible >& rxParent,
+                                  IAccessibleTableProvider&                  rBrowseBox,
+                                  const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+                                  AccessibleBrowseBoxObjType  eObjType)
+: BrowseBoxAccessibleElement(rxParent,
+                          rBrowseBox,
+                          _xFocusWindow,
+                          eObjType,
+                          rBrowseBox.GetAccessibleObjectName( eObjType ,_nColumnRowId),
+                          rBrowseBox.GetAccessibleObjectDescription( eObjType ,_nColumnRowId))
+, m_nColumnRowId(_nColumnRowId)
+{
+}
+/** Creates a new AccessibleStateSetHelper and fills it with states of the
+    current object.
+    @return
+        A filled AccessibleStateSetHelper.
+*/
+::utl::AccessibleStateSetHelper* AccessibleBrowseBoxHeaderCell::implCreateStateSetHelper()
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ::utl::AccessibleStateSetHelper*
+        pStateSetHelper = new ::utl::AccessibleStateSetHelper;
+
+    if( isAlive() )
+    {
+        // SHOWING done with mxParent
+        if( implIsShowing() )
+            pStateSetHelper->AddState( AccessibleStateType::SHOWING );
+
+        BBSolarGuard aSolarGuard;
+        pStateSetHelper->AddState( AccessibleStateType::VISIBLE );
+        pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE );
+        pStateSetHelper->AddState( AccessibleStateType::TRANSIENT );
+        pStateSetHelper->AddState( AccessibleStateType::SELECTABLE );
+
+        sal_Bool bSelected = isRowBarCell() ? mpBrowseBox->IsRowSelected(m_nColumnRowId) : mpBrowseBox->IsColumnSelected(m_nColumnRowId);
+        if ( bSelected )
+            pStateSetHelper->AddState( AccessibleStateType::SELECTED );
+    }
+    else
+        pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+
+    return pStateSetHelper;
+}
+// -----------------------------------------------------------------------------
+/** @return
+        The count of visible children.
+*/
+sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChildCount()
+    throw ( RuntimeException )
+{
+    return 0;
+}
+// -----------------------------------------------------------------------------
+
+/** @return
+        The XAccessible interface of the specified child.
+*/
+Reference<XAccessible > SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChild( sal_Int32 )
+    throw ( IndexOutOfBoundsException,RuntimeException )
+{
+    throw IndexOutOfBoundsException();
+}
+// -----------------------------------------------------------------------------
+
+/** Grabs the focus to the column header. */
+void SAL_CALL AccessibleBrowseBoxHeaderCell::grabFocus()
+    throw ( ::com::sun::star::uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    if ( isRowBarCell() )
+        mpBrowseBox->SelectRow(m_nColumnRowId);
+    else
+        mpBrowseBox->SelectColumn(static_cast<sal_uInt16>(m_nColumnRowId)); //!!!
+}
+// -----------------------------------------------------------------------------
+/** @return
+        The name of this class.
+*/
+::rtl::OUString SAL_CALL AccessibleBrowseBoxHeaderCell::getImplementationName()
+    throw ( ::com::sun::star::uno::RuntimeException )
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleBrowseBoxHeaderCell" ) );
+}
+// -----------------------------------------------------------------------------
+namespace
+{
+    Rectangle getRectangle(IAccessibleTableProvider* _pBrowseBox,sal_Int32 _nRowColIndex, sal_Bool _bOnScreen,sal_Bool _bRowBar)
+    {
+        sal_Int32 nRow  = 0;
+        sal_uInt16 nCol =  (sal_uInt16)_nRowColIndex;
+        if ( _bRowBar )
+        {
+            nRow = _nRowColIndex + 1;
+            nCol = 0;
+        }
+
+        Rectangle aRet(_pBrowseBox->GetFieldRectPixelAbs( nRow , nCol, sal_True, _bOnScreen));
+        return Rectangle(aRet.TopLeft() - Point(0,aRet.GetHeight()),aRet.GetSize());
+    }
+}
+
+Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBox()
+{
+    return getRectangle(mpBrowseBox,m_nColumnRowId,sal_False,isRowBarCell());
+}
+// -----------------------------------------------------------------------------
+
+Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBoxOnScreen()
+{
+    return getRectangle(mpBrowseBox,m_nColumnRowId,sal_True,isRowBarCell());
+}
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleIndexInParent()
+    throw ( RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    sal_Int32 nIndex = m_nColumnRowId;
+    if ( mpBrowseBox->HasRowHeader() )
+        --nIndex;
+    return nIndex;
+}
+// -----------------------------------------------------------------------------
+} // namespace accessibility
+// -----------------------------------------------------------------------------
+
+
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
new file mode 100644
index 000000000000..1ac635ec6230
--- /dev/null
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -0,0 +1,278 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+
+
+#include "accessibility/extended/AccessibleBrowseBoxTable.hxx"
+#include <svtools/accessibletableprovider.hxx>
+
+// ============================================================================
+
+using ::rtl::OUString;
+
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::Any;
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
+using namespace ::svt;
+
+// ============================================================================
+
+namespace accessibility {
+
+// ============================================================================
+
+// Ctor/Dtor/disposing --------------------------------------------------------
+
+DBG_NAME( AccessibleBrowseBoxTable )
+
+AccessibleBrowseBoxTable::AccessibleBrowseBoxTable(
+        const Reference< XAccessible >& rxParent,
+        IAccessibleTableProvider&                      rBrowseBox ) :
+    AccessibleBrowseBoxTableBase( rxParent, rBrowseBox, BBTYPE_TABLE )
+{
+    DBG_CTOR( AccessibleBrowseBoxTable, NULL );
+}
+
+AccessibleBrowseBoxTable::~AccessibleBrowseBoxTable()
+{
+    DBG_DTOR( AccessibleBrowseBoxTable, NULL );
+}
+
+// XAccessibleContext ---------------------------------------------------------
+
+Reference< XAccessible > SAL_CALL
+AccessibleBrowseBoxTable::getAccessibleChild( sal_Int32 nChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidIndex( nChildIndex );
+    return mpBrowseBox->CreateAccessibleCell(
+        implGetRow( nChildIndex ), (sal_Int16)implGetColumn( nChildIndex ) );
+}
+
+sal_Int32 SAL_CALL AccessibleBrowseBoxTable::getAccessibleIndexInParent()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return BBINDEX_TABLE;
+}
+
+// XAccessibleComponent -------------------------------------------------------
+
+Reference< XAccessible > SAL_CALL
+AccessibleBrowseBoxTable::getAccessibleAtPoint( const awt::Point& rPoint )
+    throw ( uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+
+    Reference< XAccessible > xChild;
+    sal_Int32 nRow = 0;
+    sal_uInt16 nColumnPos = 0;
+    if( mpBrowseBox->ConvertPointToCellAddress( nRow, nColumnPos, VCLPoint( rPoint ) ) )
+        xChild = mpBrowseBox->CreateAccessibleCell( nRow, nColumnPos );
+
+    return xChild;
+}
+
+void SAL_CALL AccessibleBrowseBoxTable::grabFocus()
+    throw ( uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    mpBrowseBox->GrabTableFocus();
+}
+
+Any SAL_CALL AccessibleBrowseBoxTable::getAccessibleKeyBinding()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return Any();   // no special key bindings for data table
+}
+
+// XAccessibleTable -----------------------------------------------------------
+
+OUString SAL_CALL AccessibleBrowseBoxTable::getAccessibleRowDescription( sal_Int32 nRow )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidRow( nRow );
+    return mpBrowseBox->GetRowDescription( nRow );
+}
+
+OUString SAL_CALL AccessibleBrowseBoxTable::getAccessibleColumnDescription( sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidColumn( nColumn );
+    return mpBrowseBox->GetColumnDescription( (sal_uInt16)nColumn );
+}
+
+Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleRowHeaders()
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return implGetHeaderBar( BBINDEX_ROWHEADERBAR );
+}
+
+Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleColumnHeaders()
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return implGetHeaderBar( BBINDEX_COLUMNHEADERBAR );
+}
+
+Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleRows()
+    throw ( uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+
+    Sequence< sal_Int32 > aSelSeq;
+    implGetSelectedRows( aSelSeq );
+    return aSelSeq;
+}
+
+Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleColumns()
+    throw ( uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+
+    Sequence< sal_Int32 > aSelSeq;
+    implGetSelectedColumns( aSelSeq );
+    return aSelSeq;
+}
+
+sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleRowSelected( sal_Int32 nRow )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidRow( nRow );
+    return implIsRowSelected( nRow );
+}
+
+sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleColumnSelected( sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidColumn( nColumn );
+    return implIsColumnSelected( nColumn );
+}
+
+Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTable::getAccessibleCellAt(
+        sal_Int32 nRow, sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidAddress( nRow, nColumn );
+    return mpBrowseBox->CreateAccessibleCell( nRow, (sal_Int16)nColumn );
+}
+
+sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleSelected(
+        sal_Int32 nRow, sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidAddress( nRow, nColumn );
+    return implIsRowSelected( nRow ) || implIsColumnSelected( nColumn );
+}
+
+// XServiceInfo ---------------------------------------------------------------
+
+OUString SAL_CALL AccessibleBrowseBoxTable::getImplementationName()
+    throw ( uno::RuntimeException )
+{
+    return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleBrowseBoxTable" ) );
+}
+
+// internal virtual methods ---------------------------------------------------
+
+Rectangle AccessibleBrowseBoxTable::implGetBoundingBox()
+{
+    return mpBrowseBox->calcTableRect(sal_False);
+}
+
+Rectangle AccessibleBrowseBoxTable::implGetBoundingBoxOnScreen()
+{
+    return mpBrowseBox->calcTableRect();
+}
+
+// internal helper methods ----------------------------------------------------
+
+Reference< XAccessibleTable > AccessibleBrowseBoxTable::implGetHeaderBar(
+        sal_Int32 nChildIndex )
+    throw ( uno::RuntimeException )
+{
+    Reference< XAccessible > xRet;
+    Reference< XAccessibleContext > xContext( mxParent, uno::UNO_QUERY );
+    if( xContext.is() )
+    {
+        try
+        {
+            xRet = xContext->getAccessibleChild( nChildIndex );
+        }
+        catch( lang::IndexOutOfBoundsException& )
+        {
+            DBG_ERROR( "implGetHeaderBar - wrong child index" );
+        }
+        // RuntimeException goes to caller
+    }
+    return Reference< XAccessibleTable >( xRet, uno::UNO_QUERY );
+}
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
new file mode 100644
index 000000000000..7a7aed644f5c
--- /dev/null
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+
+
+#include "accessibility/extended/AccessibleBrowseBoxTableBase.hxx"
+#include <svtools/accessibletableprovider.hxx>
+#include <tools/multisel.hxx>
+#include <comphelper/sequence.hxx>
+
+// ============================================================================
+
+using ::rtl::OUString;
+
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::Any;
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
+using namespace ::svt;
+
+// ============================================================================
+
+namespace accessibility {
+
+// ============================================================================
+
+// Ctor/Dtor/disposing --------------------------------------------------------
+
+DBG_NAME( AccessibleBrowseBoxTableBase )
+
+AccessibleBrowseBoxTableBase::AccessibleBrowseBoxTableBase(
+        const Reference< XAccessible >& rxParent,
+        IAccessibleTableProvider&                      rBrowseBox,
+        AccessibleBrowseBoxObjType      eObjType ) :
+    BrowseBoxAccessibleElement( rxParent, rBrowseBox,NULL, eObjType )
+{
+    DBG_CTOR( AccessibleBrowseBoxTableBase, NULL );
+}
+
+AccessibleBrowseBoxTableBase::~AccessibleBrowseBoxTableBase()
+{
+    DBG_DTOR( AccessibleBrowseBoxTableBase, NULL );
+}
+
+// XAccessibleContext ---------------------------------------------------------
+
+sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleChildCount()
+    throw ( uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return implGetChildCount();
+}
+
+sal_Int16 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRole()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return AccessibleRole::TABLE;
+}
+
+// XAccessibleTable -----------------------------------------------------------
+
+sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRowCount()
+    throw ( uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return implGetRowCount();
+}
+
+sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumnCount()
+    throw ( uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return implGetColumnCount();
+}
+
+sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRowExtentAt(
+        sal_Int32 nRow, sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidAddress( nRow, nColumn );
+    return 1;   // merged cells not supported
+}
+
+sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumnExtentAt(
+        sal_Int32 nRow, sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidAddress( nRow, nColumn );
+    return 1;   // merged cells not supported
+}
+
+Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleCaption()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return NULL;    // not supported
+}
+
+Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleSummary()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return NULL;    // not supported
+}
+
+sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleIndex(
+        sal_Int32 nRow, sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidAddress( nRow, nColumn );
+    return implGetChildIndex( nRow, nColumn );
+}
+
+sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRow( sal_Int32 nChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidIndex( nChildIndex );
+    return implGetRow( nChildIndex );
+}
+
+sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumn( sal_Int32 nChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    BBSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidIndex( nChildIndex );
+    return implGetColumn( nChildIndex );
+}
+
+// XInterface -----------------------------------------------------------------
+
+Any SAL_CALL AccessibleBrowseBoxTableBase::queryInterface( const uno::Type& rType )
+    throw ( uno::RuntimeException )
+{
+    Any aAny( BrowseBoxAccessibleElement::queryInterface( rType ) );
+    return aAny.hasValue() ?
+        aAny : AccessibleBrowseBoxTableImplHelper::queryInterface( rType );
+}
+
+void SAL_CALL AccessibleBrowseBoxTableBase::acquire() throw ()
+{
+    BrowseBoxAccessibleElement::acquire();
+}
+
+void SAL_CALL AccessibleBrowseBoxTableBase::release() throw ()
+{
+    BrowseBoxAccessibleElement::release();
+}
+
+// XTypeProvider --------------------------------------------------------------
+
+Sequence< uno::Type > SAL_CALL AccessibleBrowseBoxTableBase::getTypes()
+    throw ( uno::RuntimeException )
+{
+    return ::comphelper::concatSequences(
+        BrowseBoxAccessibleElement::getTypes(),
+        AccessibleBrowseBoxTableImplHelper::getTypes() );
+}
+
+Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxTableBase::getImplementationId()
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslGlobalMutex() );
+    static Sequence< sal_Int8 > aId;
+    implCreateUuid( aId );
+    return aId;
+}
+
+// internal virtual methods ---------------------------------------------------
+
+sal_Int32 AccessibleBrowseBoxTableBase::implGetRowCount() const
+{
+    return mpBrowseBox->GetRowCount();
+}
+
+sal_Int32 AccessibleBrowseBoxTableBase::implGetColumnCount() const
+{
+    sal_uInt16 nColumns = mpBrowseBox->GetColumnCount();
+    // do not count the "handle column"
+    if( nColumns && implHasHandleColumn() )
+        --nColumns;
+    return nColumns;
+}
+
+// internal helper methods ----------------------------------------------------
+
+sal_Bool AccessibleBrowseBoxTableBase::implHasHandleColumn() const
+{
+    return mpBrowseBox->HasRowHeader();
+}
+
+sal_uInt16 AccessibleBrowseBoxTableBase::implToVCLColumnPos( sal_Int32 nColumn ) const
+{
+    sal_uInt16 nVCLPos = 0;
+    if( (0 <= nColumn) && (nColumn < implGetColumnCount()) )
+    {
+        // regard "handle column"
+        if( implHasHandleColumn() )
+            ++nColumn;
+        nVCLPos = static_cast< sal_uInt16 >( nColumn );
+    }
+    return nVCLPos;
+}
+
+sal_Int32 AccessibleBrowseBoxTableBase::implGetChildCount() const
+{
+    return implGetRowCount() * implGetColumnCount();
+}
+
+sal_Int32 AccessibleBrowseBoxTableBase::implGetRow( sal_Int32 nChildIndex ) const
+{
+    sal_Int32 nColumns = implGetColumnCount();
+    return nColumns ? (nChildIndex / nColumns) : 0;
+}
+
+sal_Int32 AccessibleBrowseBoxTableBase::implGetColumn( sal_Int32 nChildIndex ) const
+{
+    sal_Int32 nColumns = implGetColumnCount();
+    return nColumns ? (nChildIndex % nColumns) : 0;
+}
+
+sal_Int32 AccessibleBrowseBoxTableBase::implGetChildIndex(
+        sal_Int32 nRow, sal_Int32 nColumn ) const
+{
+    return nRow * implGetColumnCount() + nColumn;
+}
+
+sal_Bool AccessibleBrowseBoxTableBase::implIsRowSelected( sal_Int32 nRow ) const
+{
+    return mpBrowseBox->IsRowSelected( nRow );
+}
+
+sal_Bool AccessibleBrowseBoxTableBase::implIsColumnSelected( sal_Int32 nColumn ) const
+{
+    if( implHasHandleColumn() )
+        --nColumn;
+    return mpBrowseBox->IsColumnSelected( nColumn );
+}
+
+void AccessibleBrowseBoxTableBase::implSelectRow( sal_Int32 nRow, sal_Bool bSelect )
+{
+    mpBrowseBox->SelectRow( nRow, bSelect, sal_True );
+}
+
+void AccessibleBrowseBoxTableBase::implSelectColumn( sal_Int32 nColumnPos, sal_Bool bSelect )
+{
+    mpBrowseBox->SelectColumn( (sal_uInt16)nColumnPos, bSelect );
+}
+
+sal_Int32 AccessibleBrowseBoxTableBase::implGetSelectedRowCount() const
+{
+    return mpBrowseBox->GetSelectedRowCount();
+}
+
+sal_Int32 AccessibleBrowseBoxTableBase::implGetSelectedColumnCount() const
+{
+    return mpBrowseBox->GetSelectedColumnCount();
+}
+
+void AccessibleBrowseBoxTableBase::implGetSelectedRows( Sequence< sal_Int32 >& rSeq )
+{
+    mpBrowseBox->GetAllSelectedRows( rSeq );
+}
+
+void AccessibleBrowseBoxTableBase::implGetSelectedColumns( Sequence< sal_Int32 >& rSeq )
+{
+    mpBrowseBox->GetAllSelectedColumns( rSeq );
+}
+
+void AccessibleBrowseBoxTableBase::ensureIsValidRow( sal_Int32 nRow )
+    throw ( lang::IndexOutOfBoundsException )
+{
+    if( nRow >= implGetRowCount() )
+        throw lang::IndexOutOfBoundsException(
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "row index is invalid" ) ), *this );
+}
+
+void AccessibleBrowseBoxTableBase::ensureIsValidColumn( sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException )
+{
+    if( nColumn >= implGetColumnCount() )
+        throw lang::IndexOutOfBoundsException(
+            OUString( RTL_CONSTASCII_USTRINGPARAM("column index is invalid") ), *this );
+}
+
+void AccessibleBrowseBoxTableBase::ensureIsValidAddress(
+        sal_Int32 nRow, sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException )
+{
+    ensureIsValidRow( nRow );
+    ensureIsValidColumn( nColumn );
+}
+
+void AccessibleBrowseBoxTableBase::ensureIsValidIndex( sal_Int32 nChildIndex )
+    throw ( lang::IndexOutOfBoundsException )
+{
+    if( nChildIndex >= implGetChildCount() )
+        throw lang::IndexOutOfBoundsException(
+            OUString( RTL_CONSTASCII_USTRINGPARAM("child index is invalid") ), *this );
+}
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
new file mode 100644
index 000000000000..a7392ff46e4a
--- /dev/null
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+
+#include "accessibility/extended/AccessibleBrowseBoxTableCell.hxx"
+#include <svtools/accessibletableprovider.hxx>
+#include "accessibility/extended/AccessibleBrowseBox.hxx"
+#include <tools/gen.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+
+namespace accessibility
+{
+    namespace
+    {
+        void checkIndex_Impl( sal_Int32 _nIndex, const ::rtl::OUString& _sText ) throw (::com::sun::star::lang::IndexOutOfBoundsException)
+        {
+            if ( _nIndex >= _sText.getLength() )
+                throw ::com::sun::star::lang::IndexOutOfBoundsException();
+        }
+
+        sal_Int32 getIndex_Impl( sal_Int32 _nRow, sal_uInt16 _nColumn, sal_uInt16 _nColumnCount )
+        {
+            return _nRow * _nColumnCount + _nColumn;
+        }
+    }
+    using namespace ::com::sun::star::lang;
+    using namespace utl;
+    using namespace comphelper;
+    using ::rtl::OUString;
+    using ::accessibility::AccessibleBrowseBox;
+    using namespace ::com::sun::star::uno;
+    using ::com::sun::star::accessibility::XAccessible;
+    using namespace ::com::sun::star::accessibility;
+    using namespace ::svt;
+
+
+    // implementation of a table cell
+    ::rtl::OUString AccessibleBrowseBoxTableCell::implGetText()
+    {
+        ensureIsAlive();
+        return mpBrowseBox->GetAccessibleCellText( getRowPos(), static_cast< sal_uInt16 >( getColumnPos() ) );
+    }
+
+    ::com::sun::star::lang::Locale AccessibleBrowseBoxTableCell::implGetLocale()
+    {
+        ensureIsAlive();
+        return mpBrowseBox->GetAccessible()->getAccessibleContext()->getLocale();
+    }
+
+    void AccessibleBrowseBoxTableCell::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
+    {
+        nStartIndex = 0;
+        nEndIndex = 0;
+    }
+
+    AccessibleBrowseBoxTableCell::AccessibleBrowseBoxTableCell(const Reference<XAccessible >& _rxParent,
+                                IAccessibleTableProvider& _rBrowseBox,
+                                const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+                                sal_Int32 _nRowPos,
+                                sal_uInt16 _nColPos,
+                                sal_Int32 _nOffset )
+        :AccessibleBrowseBoxCell( _rxParent, _rBrowseBox, _xFocusWindow, _nRowPos, _nColPos )
+    {
+        m_nOffset = ( OFFSET_DEFAULT == _nOffset ) ? (sal_Int32)BBINDEX_FIRSTCONTROL : _nOffset;
+        sal_Int32 nIndex = getIndex_Impl( _nRowPos, _nColPos, _rBrowseBox.GetColumnCount() );
+       setAccessibleName( _rBrowseBox.GetAccessibleObjectName( BBTYPE_TABLECELL, nIndex ) );
+       setAccessibleDescription( _rBrowseBox.GetAccessibleObjectDescription( BBTYPE_TABLECELL, nIndex ) );
+        // Need to register as event listener
+        Reference< XComponent > xComponent(_rxParent, UNO_QUERY);
+        if( xComponent.is() )
+            xComponent->addEventListener(static_cast< XEventListener *> (this));
+    }
+
+    void AccessibleBrowseBoxTableCell::nameChanged( const ::rtl::OUString& rNewName, const ::rtl::OUString& rOldName )
+    {
+        implSetName( rNewName );
+        Any aOldValue, aNewValue;
+        aOldValue <<= rOldName;
+        aNewValue <<= rNewName;
+        commitEvent( AccessibleEventId::NAME_CHANGED, aOldValue, aNewValue );
+    }
+
+    // XInterface -------------------------------------------------------------
+
+    /** Queries for a new interface. */
+    ::com::sun::star::uno::Any SAL_CALL AccessibleBrowseBoxTableCell::queryInterface(
+            const ::com::sun::star::uno::Type& rType )
+        throw ( ::com::sun::star::uno::RuntimeException )
+    {
+        Any aRet = AccessibleBrowseBoxCell::queryInterface(rType);
+        if ( !aRet.hasValue() )
+            aRet = AccessibleTextHelper_BASE::queryInterface(rType);
+        return aRet;
+    }
+
+    /** Aquires the object (calls acquire() on base class). */
+    void SAL_CALL AccessibleBrowseBoxTableCell::acquire() throw ()
+    {
+        AccessibleBrowseBoxCell::acquire();
+    }
+
+    /** Releases the object (calls release() on base class). */
+    void SAL_CALL AccessibleBrowseBoxTableCell::release() throw ()
+    {
+        AccessibleBrowseBoxCell::release();
+    }
+
+    ::com::sun::star::awt::Rectangle SAL_CALL AccessibleBrowseBoxTableCell::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        BBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+
+        ensureIsAlive();
+        if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
+            throw IndexOutOfBoundsException();
+
+        ::com::sun::star::awt::Rectangle aRect;
+
+        if ( mpBrowseBox )
+        {
+            aRect = AWTRectangle( mpBrowseBox->GetFieldCharacterBounds( getRowPos(), getColumnPos(), nIndex ) );
+        }
+
+        return aRect;
+    }
+
+    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getIndexAtPoint( const ::com::sun::star::awt::Point& _aPoint ) throw (RuntimeException)
+    {
+        //! TODO CTL bidi
+        // DBG_ASSERT(0,"Need to be done by base class!");
+        BBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        ensureIsAlive();
+
+        return mpBrowseBox->GetFieldIndexAtPoint( getRowPos(), getColumnPos(), VCLPoint( _aPoint ) );
+    }
+
+    /** @return
+            The name of this class.
+    */
+    ::rtl::OUString SAL_CALL AccessibleBrowseBoxTableCell::getImplementationName()
+        throw ( ::com::sun::star::uno::RuntimeException )
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.AccessibleBrowseBoxTableCell" ) );
+    }
+
+    /** @return  The count of visible children. */
+    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleChildCount()
+        throw ( ::com::sun::star::uno::RuntimeException )
+    {
+        return 0;
+    }
+
+    /** @return  The XAccessible interface of the specified child. */
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+        AccessibleBrowseBoxTableCell::getAccessibleChild( sal_Int32 )
+            throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                    ::com::sun::star::uno::RuntimeException )
+    {
+        throw ::com::sun::star::lang::IndexOutOfBoundsException();
+    }
+
+    /** Creates a new AccessibleStateSetHelper and fills it with states of the
+        current object.
+        @return
+            A filled AccessibleStateSetHelper.
+    */
+    ::utl::AccessibleStateSetHelper* AccessibleBrowseBoxTableCell::implCreateStateSetHelper()
+    {
+        BBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+
+        ::utl::AccessibleStateSetHelper* pStateSetHelper = new ::utl::AccessibleStateSetHelper;
+
+        if( isAlive() )
+        {
+            // SHOWING done with mxParent
+            if( implIsShowing() )
+                pStateSetHelper->AddState( AccessibleStateType::SHOWING );
+
+            mpBrowseBox->FillAccessibleStateSetForCell( *pStateSetHelper, getRowPos(), static_cast< sal_uInt16 >( getColumnPos() ) );
+        }
+        else
+            pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+
+        return pStateSetHelper;
+    }
+
+
+    // XAccessible ------------------------------------------------------------
+
+    /** @return  The XAccessibleContext interface of this object. */
+    Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleContext() throw ( RuntimeException )
+    {
+        ensureIsAlive();
+        return this;
+    }
+
+    // XAccessibleContext -----------------------------------------------------
+
+    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleIndexInParent()
+            throw ( ::com::sun::star::uno::RuntimeException )
+    {
+        BBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        ensureIsAlive();
+
+        return /*BBINDEX_FIRSTCONTROL*/ m_nOffset + ( getRowPos() * mpBrowseBox->GetColumnCount() ) + getColumnPos();
+    }
+
+    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCaretPosition(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        return -1;
+    }
+    sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        BBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+
+        if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
+            throw IndexOutOfBoundsException();
+
+        return sal_False;
+    }
+    sal_Unicode SAL_CALL AccessibleBrowseBoxTableCell::getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        BBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getCharacter( nIndex );
+    }
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleBrowseBoxTableCell::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        BBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+
+        ::rtl::OUString sText( implGetText() );
+
+        if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+            throw IndexOutOfBoundsException();
+
+        return ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >();
+    }
+    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCharacterCount(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        BBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getCharacterCount(  );
+    }
+
+    ::rtl::OUString SAL_CALL AccessibleBrowseBoxTableCell::getSelectedText(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        BBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getSelectedText(  );
+    }
+    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getSelectionStart(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        BBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getSelectionStart(  );
+    }
+    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getSelectionEnd(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        BBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getSelectionEnd(  );
+    }
+    sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        BBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) )
+            throw IndexOutOfBoundsException();
+
+        return sal_False;
+    }
+    ::rtl::OUString SAL_CALL AccessibleBrowseBoxTableCell::getText(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        BBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getText(  );
+    }
+    ::rtl::OUString SAL_CALL AccessibleBrowseBoxTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        BBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
+    }
+    ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+    {
+        BBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType);
+    }
+    ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+    {
+        BBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType);
+    }
+    ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+    {
+        BBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getTextBehindIndex( nIndex ,aTextType);
+    }
+    sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        BBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        ::rtl::OUString sText = implGetText();
+        checkIndex_Impl( nStartIndex, sText );
+        checkIndex_Impl( nEndIndex, sText );
+
+        //!!! don't know how to put a string into the clipboard
+        return sal_False;
+    }
+    void AccessibleBrowseBoxTableCell::disposing( const EventObject& _rSource ) throw (RuntimeException)
+    {
+            if ( _rSource.Source == mxParent )
+            {
+                    dispose();
+            }
+    }
+
+}
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
new file mode 100755
index 000000000000..f0aa406b62bf
--- /dev/null
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -0,0 +1,372 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+#include "accessibility/extended/AccessibleGridControl.hxx"
+#include "accessibility/extended/AccessibleGridControlTable.hxx"
+#include "accessibility/extended/AccessibleGridControlHeader.hxx"
+#include <svtools/accessibletable.hxx>
+#include <comphelper/types.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+
+// ============================================================================
+
+namespace accessibility
+{
+
+// ============================================================================
+
+using ::rtl::OUString;
+
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::accessibility;
+using namespace ::svt;
+using namespace ::svt::table;
+
+// ============================================================================
+class AccessibleGridControl_Impl
+{
+public:
+    /// the XAccessible which created the AccessibleGridControl
+    WeakReference< XAccessible >                                m_aCreator;
+
+    /** The data table child. */
+    Reference<
+        ::com::sun::star::accessibility::XAccessible >          m_xTable;
+    AccessibleGridControlTable*             m_pTable;
+
+    /** The header bar for rows. */
+    Reference<
+        ::com::sun::star::accessibility::XAccessible >          m_xRowHeaderBar;
+    AccessibleGridControlHeader*                m_pRowHeaderBar;
+
+    /** The header bar for columns (first row of the table). */
+    Reference<
+        ::com::sun::star::accessibility::XAccessible >          m_xColumnHeaderBar;
+    AccessibleGridControlHeader*                m_pColumnHeaderBar;
+};
+
+DBG_NAME( AccessibleGridControl )
+
+AccessibleGridControl::AccessibleGridControl(
+            const Reference< XAccessible >& _rxParent, const Reference< XAccessible >& _rxCreator,
+            IAccessibleTable& _rTable )
+    : AccessibleGridControlBase( _rxParent, _rTable, TCTYPE_GRIDCONTROL )
+{
+    m_pImpl.reset( new AccessibleGridControl_Impl() );
+    m_pImpl->m_aCreator = _rxCreator;
+}
+
+// -----------------------------------------------------------------------------
+AccessibleGridControl::~AccessibleGridControl()
+{
+}
+// -----------------------------------------------------------------------------
+
+void SAL_CALL AccessibleGridControl::disposing()
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+
+    m_pImpl->m_pTable       = NULL;
+    m_pImpl->m_pColumnHeaderBar = NULL;
+    m_pImpl->m_pRowHeaderBar    = NULL;
+    m_pImpl->m_aCreator         = Reference< XAccessible >();
+
+    Reference< XAccessible >  xTable = m_pImpl->m_xTable;
+
+    Reference< XComponent > xComp( m_pImpl->m_xTable, UNO_QUERY );
+    if ( xComp.is() )
+    {
+        xComp->dispose();
+    }
+
+    AccessibleGridControlBase::disposing();
+}
+// -----------------------------------------------------------------------------
+
+// XAccessibleContext ---------------------------------------------------------
+
+sal_Int32 SAL_CALL AccessibleGridControl::getAccessibleChildCount()
+    throw ( uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return m_aTable.GetAccessibleControlCount();
+}
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > SAL_CALL
+AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+
+    if (nChildIndex<0 || nChildIndex>=getAccessibleChildCount())
+        throw IndexOutOfBoundsException();
+
+    Reference< XAccessible > xChild;
+    if (isAlive())
+    {
+        if(nChildIndex == 0 && m_aTable.HasColHeader())
+        {
+            if(!m_pImpl->m_xColumnHeaderBar.is())
+            {
+                AccessibleGridControlHeader* pColHeaderBar = new AccessibleGridControlHeader(m_pImpl->m_aCreator, m_aTable, svt::table::TCTYPE_COLUMNHEADERBAR);
+                m_pImpl->m_xColumnHeaderBar = pColHeaderBar;
+            }
+            xChild = m_pImpl->m_xColumnHeaderBar;
+        }
+        else if(m_aTable.HasRowHeader() && (nChildIndex == 1 || nChildIndex == 0))
+        {
+            if(!m_pImpl->m_xRowHeaderBar.is())
+            {
+                AccessibleGridControlHeader* pRowHeaderBar = new AccessibleGridControlHeader(m_pImpl->m_aCreator, m_aTable, svt::table::TCTYPE_ROWHEADERBAR);
+                m_pImpl->m_xRowHeaderBar = pRowHeaderBar;
+            }
+            xChild = m_pImpl->m_xRowHeaderBar;
+        }
+        else
+        {
+            AccessibleGridControlTable* pTable = new AccessibleGridControlTable(m_pImpl->m_aCreator, m_aTable, svt::table::TCTYPE_TABLE);
+            m_pImpl->m_xTable = pTable;
+            xChild = m_pImpl->m_xTable;
+        }
+    }
+    return xChild;
+}
+// -----------------------------------------------------------------------------
+
+sal_Int16 SAL_CALL AccessibleGridControl::getAccessibleRole()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return AccessibleRole::PANEL;
+}
+// -----------------------------------------------------------------------------
+
+// XAccessibleComponent -------------------------------------------------------
+
+Reference< XAccessible > SAL_CALL
+AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint )
+    throw ( uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+
+    Reference< XAccessible > xChild;
+    sal_Int32 nIndex = 0;
+    if( m_aTable.ConvertPointToControlIndex( nIndex, VCLPoint( rPoint ) ) )
+        xChild = m_aTable.CreateAccessibleControl( nIndex );
+    else
+    {
+        // try whether point is in one of the fixed children
+        // (table, header bars, corner control)
+        Point aPoint( VCLPoint( rPoint ) );
+        for( nIndex = 0; (nIndex < 3) && !xChild.is(); ++nIndex )
+        {
+            Reference< XAccessible > xCurrChild( implGetFixedChild( nIndex ) );
+            Reference< XAccessibleComponent >
+            xCurrChildComp( xCurrChild, uno::UNO_QUERY );
+
+            if( xCurrChildComp.is() &&
+                VCLRectangle( xCurrChildComp->getBounds() ).IsInside( aPoint ) )
+            xChild = xCurrChild;
+        }
+    }
+    return xChild;
+}
+// -----------------------------------------------------------------------------
+
+void SAL_CALL AccessibleGridControl::grabFocus()
+    throw ( uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+        m_aTable.GrabFocus();
+}
+// -----------------------------------------------------------------------------
+
+Any SAL_CALL AccessibleGridControl::getAccessibleKeyBinding()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return Any();
+}
+// -----------------------------------------------------------------------------
+
+// XServiceInfo ---------------------------------------------------------------
+
+OUString SAL_CALL AccessibleGridControl::getImplementationName()
+    throw ( uno::RuntimeException )
+{
+    return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleGridControl" ) );
+}
+// -----------------------------------------------------------------------------
+
+// internal virtual methods ---------------------------------------------------
+
+Rectangle AccessibleGridControl::implGetBoundingBox()
+{
+    Window* pParent = m_aTable.GetAccessibleParentWindow();
+    DBG_ASSERT( pParent, "implGetBoundingBox - missing parent window" );
+    return m_aTable.GetWindowExtentsRelative( pParent );
+}
+// -----------------------------------------------------------------------------
+
+Rectangle AccessibleGridControl::implGetBoundingBoxOnScreen()
+{
+    return m_aTable.GetWindowExtentsRelative( NULL );
+}
+// internal helper methods ----------------------------------------------------
+
+Reference< XAccessible > AccessibleGridControl::implGetTable()
+{
+    if( !m_pImpl->m_xTable.is() )
+    {
+        m_pImpl->m_pTable = createAccessibleTable();
+        m_pImpl->m_xTable  = m_pImpl->m_pTable;
+    }
+    return m_pImpl->m_xTable;
+}
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible >
+AccessibleGridControl::implGetHeaderBar( AccessibleTableControlObjType eObjType )
+{
+    Reference< XAccessible > xRet;
+    Reference< XAccessible >* pxMember = NULL;
+
+    if( eObjType == TCTYPE_ROWHEADERBAR )
+        pxMember = &m_pImpl->m_xRowHeaderBar;
+    else if( eObjType ==  TCTYPE_COLUMNHEADERBAR )
+        pxMember = &m_pImpl->m_xColumnHeaderBar;
+
+    if( pxMember )
+    {
+        if( !pxMember->is() )
+        {
+            AccessibleGridControlHeader* pHeaderBar = new AccessibleGridControlHeader(
+                (Reference< XAccessible >)m_pImpl->m_aCreator, m_aTable, eObjType );
+
+            if ( TCTYPE_COLUMNHEADERBAR == eObjType)
+                m_pImpl->m_pColumnHeaderBar = pHeaderBar;
+            else
+                m_pImpl->m_pRowHeaderBar    = pHeaderBar;
+
+            *pxMember = pHeaderBar;
+        }
+        xRet = *pxMember;
+    }
+    return xRet;
+}
+// -----------------------------------------------------------------------------
+Reference< XAccessible >
+AccessibleGridControl::implGetFixedChild( sal_Int32 nChildIndex )
+{
+    Reference< XAccessible > xRet;
+    switch( nChildIndex )
+    {
+          case TCINDEX_COLUMNHEADERBAR:
+            xRet = implGetHeaderBar( TCTYPE_COLUMNHEADERBAR );
+        break;
+        case TCINDEX_ROWHEADERBAR:
+            xRet = implGetHeaderBar( TCTYPE_ROWHEADERBAR );
+        break;
+        case TCINDEX_TABLE:
+            xRet = implGetTable();
+        break;
+    }
+    return xRet;
+}
+// -----------------------------------------------------------------------------
+AccessibleGridControlTable* AccessibleGridControl::createAccessibleTable()
+{
+    Reference< XAccessible > xCreator = (Reference< XAccessible >)m_pImpl->m_aCreator;
+        DBG_ASSERT( xCreator.is(), "accessibility/extended/AccessibleGirdControl::createAccessibleTable: my creator died - how this?" );
+    return new AccessibleGridControlTable( xCreator, m_aTable, TCTYPE_TABLE );
+}
+// ============================================================================
+// = AccessibleGridControlAccess
+// ============================================================================
+DBG_NAME( AccessibleGridControlAccess )
+// -----------------------------------------------------------------------------
+AccessibleGridControlAccess::AccessibleGridControlAccess( const Reference< XAccessible >& _rxParent, IAccessibleTable& _rTable )
+        :m_xParent( _rxParent )
+        ,m_rTable( _rTable )
+        ,m_pContext( NULL )
+{
+}
+
+// -----------------------------------------------------------------------------
+AccessibleGridControlAccess::~AccessibleGridControlAccess()
+{
+}
+
+// -----------------------------------------------------------------------------
+void AccessibleGridControlAccess::dispose()
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    m_pContext = NULL;
+    ::comphelper::disposeComponent( m_xContext );
+}
+
+// -----------------------------------------------------------------------------
+Reference< XAccessibleContext > SAL_CALL AccessibleGridControlAccess::getAccessibleContext() throw ( RuntimeException )
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    DBG_ASSERT( ( m_pContext && m_xContext.is() ) || ( !m_pContext && !m_xContext.is() ),
+        "accessibility/extended/AccessibleGridControlAccess::getAccessibleContext: inconsistency!" );
+
+    // if the context died meanwhile (we're no listener, so it won't tell us explicitily when this happens),
+    // then reset an re-create.
+    if ( m_pContext && !m_pContext->isAlive() )
+        m_xContext = m_pContext = NULL;
+
+    if ( !m_xContext.is() )
+        m_xContext = m_pContext = new AccessibleGridControl( m_xParent, this, m_rTable );
+
+    return m_xContext;
+}
+
+// -----------------------------------------------------------------------------
+bool AccessibleGridControlAccess::isContextAlive() const
+{
+    return  ( NULL != m_pContext ) && m_pContext->isAlive();
+}
+
+// ============================================================================
+
+}   // namespace accessibility
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
new file mode 100755
index 000000000000..ea81bd350426
--- /dev/null
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -0,0 +1,535 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+#include "accessibility/extended/AccessibleGridControlBase.hxx"
+#include <svtools/accessibletable.hxx>
+#include <rtl/uuid.h>
+//
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <unotools/accessiblerelationsethelper.hxx>
+
+// ============================================================================
+
+using ::rtl::OUString;
+
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::Any;
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
+using namespace ::comphelper;
+using namespace ::svt;
+using namespace ::svt::table;
+
+
+// ============================================================================
+
+namespace accessibility {
+
+using namespace com::sun::star::accessibility::AccessibleStateType;
+// ============================================================================
+
+DBG_NAME( AccessibleGridControlBase )
+
+AccessibleGridControlBase::AccessibleGridControlBase(
+        const Reference< XAccessible >& rxParent,
+        svt::table::IAccessibleTable& rTable,
+        AccessibleTableControlObjType      eObjType ) :
+    AccessibleGridControlImplHelper( m_aMutex ),
+    m_xParent( rxParent ),
+    m_aTable( rTable),
+    m_eObjType( eObjType ),
+    m_aName( rTable.GetAccessibleObjectName( eObjType, 0, 0 ) ),
+    m_aDescription( rTable.GetAccessibleObjectDescription( eObjType ) ),
+    m_aClientId(0)
+{
+}
+
+AccessibleGridControlBase::~AccessibleGridControlBase()
+{
+    if( isAlive() )
+    {
+        // increment ref count to prevent double call of Dtor
+        osl_incrementInterlockedCount( &m_refCount );
+        dispose();
+    }
+}
+
+void SAL_CALL AccessibleGridControlBase::disposing()
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    m_xParent = NULL;
+}
+
+// XAccessibleContext ---------------------------------------------------------
+
+Reference< XAccessible > SAL_CALL AccessibleGridControlBase::getAccessibleParent()
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return m_xParent;
+}
+
+sal_Int32 SAL_CALL AccessibleGridControlBase::getAccessibleIndexInParent()
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+
+    // -1 for child not found/no parent (according to specification)
+    sal_Int32 nRet = -1;
+
+    Reference< uno::XInterface > xMeMyselfAndI( static_cast< XAccessibleContext* >( this ), uno::UNO_QUERY );
+
+    //  iterate over parent's children and search for this object
+    if( m_xParent.is() )
+    {
+        Reference< XAccessibleContext >
+            xParentContext( m_xParent->getAccessibleContext() );
+        if( xParentContext.is() )
+        {
+        Reference< uno::XInterface > xChild;
+
+            sal_Int32 nChildCount = xParentContext->getAccessibleChildCount();
+            for( sal_Int32 nChild = 0; nChild < nChildCount; ++nChild )
+            {
+            xChild = xChild.query( xParentContext->getAccessibleChild( nChild ) );
+            if ( xMeMyselfAndI.get() == xChild.get() )
+            {
+                nRet = nChild;
+                break;
+            }
+        }
+        }
+   }
+   return nRet;
+}
+
+OUString SAL_CALL AccessibleGridControlBase::getAccessibleDescription()
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return m_aDescription;
+}
+
+OUString SAL_CALL AccessibleGridControlBase::getAccessibleName()
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return m_aName;
+}
+
+Reference< XAccessibleRelationSet > SAL_CALL
+AccessibleGridControlBase::getAccessibleRelationSet()
+    throw ( uno::RuntimeException )
+{
+   ensureIsAlive();
+   // GridControl does not have relations.
+   return new utl::AccessibleRelationSetHelper;
+}
+
+Reference< XAccessibleStateSet > SAL_CALL
+AccessibleGridControlBase::getAccessibleStateSet()
+    throw ( uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    // don't check whether alive -> StateSet may contain DEFUNC
+    return implCreateStateSetHelper();
+}
+
+lang::Locale SAL_CALL AccessibleGridControlBase::getLocale()
+    throw ( IllegalAccessibleComponentStateException, uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    if( m_xParent.is() )
+    {
+        Reference< XAccessibleContext >
+            xParentContext( m_xParent->getAccessibleContext() );
+        if( xParentContext.is() )
+        return xParentContext->getLocale();
+    }
+    throw IllegalAccessibleComponentStateException();
+}
+
+// XAccessibleComponent -------------------------------------------------------
+
+sal_Bool SAL_CALL AccessibleGridControlBase::containsPoint( const awt::Point& rPoint )
+    throw ( uno::RuntimeException )
+{
+   return Rectangle( Point(), getBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
+}
+
+awt::Rectangle SAL_CALL AccessibleGridControlBase::getBounds()
+    throw ( uno::RuntimeException )
+{
+   return AWTRectangle( getBoundingBox() );
+}
+
+awt::Point SAL_CALL AccessibleGridControlBase::getLocation()
+    throw ( uno::RuntimeException )
+{
+    return AWTPoint( getBoundingBox().TopLeft() );
+}
+
+awt::Point SAL_CALL AccessibleGridControlBase::getLocationOnScreen()
+    throw ( uno::RuntimeException )
+{
+    return AWTPoint( getBoundingBoxOnScreen().TopLeft() );
+}
+
+awt::Size SAL_CALL AccessibleGridControlBase::getSize()
+    throw ( uno::RuntimeException )
+{
+    return AWTSize( getBoundingBox().GetSize() );
+}
+
+sal_Bool SAL_CALL AccessibleGridControlBase::isShowing()
+    throw ( uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return implIsShowing();
+}
+
+sal_Bool SAL_CALL AccessibleGridControlBase::isVisible()
+    throw ( uno::RuntimeException )
+{
+    Reference< XAccessibleStateSet > xStateSet = getAccessibleStateSet();
+    return xStateSet.is() ?
+        xStateSet->contains( AccessibleStateType::VISIBLE ) : sal_False;
+}
+
+sal_Bool SAL_CALL AccessibleGridControlBase::isFocusTraversable()
+    throw ( uno::RuntimeException )
+{
+    Reference< XAccessibleStateSet > xStateSet = getAccessibleStateSet();
+    return xStateSet.is() ?
+        xStateSet->contains( AccessibleStateType::FOCUSABLE ) : sal_False;
+}
+// XAccessibleEventBroadcaster ------------------------------------------------
+
+void SAL_CALL AccessibleGridControlBase::addEventListener(
+        const Reference< XAccessibleEventListener>& _rxListener )
+    throw ( uno::RuntimeException )
+{
+    if ( _rxListener.is() )
+    {
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        if ( !getClientId( ) )
+            setClientId( AccessibleEventNotifier::registerClient( ) );
+
+        AccessibleEventNotifier::addEventListener( getClientId( ), _rxListener );
+    }
+}
+
+void SAL_CALL AccessibleGridControlBase::removeEventListener(
+        const Reference< XAccessibleEventListener>& _rxListener )
+    throw ( uno::RuntimeException )
+{
+    if( _rxListener.is() && getClientId( ) )
+    {
+    ::osl::MutexGuard aGuard( getOslMutex() );
+        sal_Int32 nListenerCount = AccessibleEventNotifier::removeEventListener( getClientId( ), _rxListener );
+    if ( !nListenerCount )
+    {
+        // no listeners anymore
+        // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
+        // and at least to us not firing any events anymore, in case somebody calls
+        // NotifyAccessibleEvent, again
+        AccessibleEventNotifier::TClientId nId( getClientId( ) );
+        setClientId( 0 );
+        AccessibleEventNotifier::revokeClient( nId );
+    }
+    }
+}
+
+// XTypeProvider --------------------------------------------------------------
+
+Sequence< sal_Int8 > SAL_CALL AccessibleGridControlBase::getImplementationId()
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslGlobalMutex() );
+    static Sequence< sal_Int8 > aId;
+    implCreateUuid( aId );
+    return aId;
+}
+
+// XServiceInfo ---------------------------------------------------------------
+
+sal_Bool SAL_CALL AccessibleGridControlBase::supportsService(
+        const OUString& rServiceName )
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+
+    Sequence< OUString > aSupportedServices( getSupportedServiceNames() );
+    const OUString* pArrBegin = aSupportedServices.getConstArray();
+    const OUString* pArrEnd = pArrBegin + aSupportedServices.getLength();
+    const OUString* pString = pArrBegin;
+
+    for( ; ( pString != pArrEnd ) && ( rServiceName != *pString ); ++pString )
+        ;
+    return pString != pArrEnd;
+}
+
+Sequence< OUString > SAL_CALL AccessibleGridControlBase::getSupportedServiceNames()
+    throw ( uno::RuntimeException )
+{
+    const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleContext" ) );
+    return Sequence< OUString >( &aServiceName, 1 );
+}
+// internal virtual methods ---------------------------------------------------
+
+sal_Bool AccessibleGridControlBase::implIsShowing()
+{
+    sal_Bool bShowing = sal_False;
+    if( m_xParent.is() )
+    {
+        Reference< XAccessibleComponent >
+            xParentComp( m_xParent->getAccessibleContext(), uno::UNO_QUERY );
+        if( xParentComp.is() )
+            bShowing = implGetBoundingBox().IsOver(
+                VCLRectangle( xParentComp->getBounds() ) );
+    }
+    return bShowing;
+}
+
+::utl::AccessibleStateSetHelper* AccessibleGridControlBase::implCreateStateSetHelper()
+{
+    ::utl::AccessibleStateSetHelper*
+        pStateSetHelper = new ::utl::AccessibleStateSetHelper;
+
+    if( isAlive() )
+    {
+        // SHOWING done with m_xParent
+        if( implIsShowing() )
+            pStateSetHelper->AddState( AccessibleStateType::SHOWING );
+        // GridControl fills StateSet with states depending on object type
+        m_aTable.FillAccessibleStateSet( *pStateSetHelper, getType() );
+    }
+    else
+        pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+    return pStateSetHelper;
+}
+
+// internal helper methods ----------------------------------------------------
+
+sal_Bool AccessibleGridControlBase::isAlive() const
+{
+    return !rBHelper.bDisposed && !rBHelper.bInDispose && &m_aTable;
+}
+
+void AccessibleGridControlBase::ensureIsAlive() const
+    throw ( lang::DisposedException )
+{
+    if( !isAlive() )
+        throw lang::DisposedException();
+}
+
+Rectangle AccessibleGridControlBase::getBoundingBox()
+    throw ( lang::DisposedException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    Rectangle aRect = implGetBoundingBox();
+    if ( 0 == aRect.Left() && 0 == aRect.Top() && 0 == aRect.Right() && 0 == aRect.Bottom() )
+    {
+        DBG_ERRORFILE( "rectangle doesn't exist" );
+    }
+    return aRect;
+}
+
+Rectangle AccessibleGridControlBase::getBoundingBoxOnScreen()
+    throw ( lang::DisposedException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    Rectangle aRect = implGetBoundingBoxOnScreen();
+    if ( 0 == aRect.Left() && 0 == aRect.Top() && 0 == aRect.Right() && 0 == aRect.Bottom() )
+    {
+        DBG_ERRORFILE( "rectangle doesn't exist" );
+    }
+    return aRect;
+}
+
+void AccessibleGridControlBase::commitEvent(
+        sal_Int16 _nEventId, const Any& _rNewValue, const Any& _rOldValue )
+{
+    ::osl::ClearableMutexGuard aGuard( getOslMutex() );
+    if ( !getClientId( ) )
+            // if we don't have a client id for the notifier, then we don't have listeners, then
+            // we don't need to notify anything
+            return;
+
+    // build an event object
+    AccessibleEventObject aEvent;
+    aEvent.Source = *this;
+    aEvent.EventId = _nEventId;
+    aEvent.OldValue = _rOldValue;
+    aEvent.NewValue = _rNewValue;
+
+    // let the notifier handle this event
+
+    AccessibleEventNotifier::addEvent( getClientId( ), aEvent );
+}
+// -----------------------------------------------------------------------------
+
+void AccessibleGridControlBase::implCreateUuid( Sequence< sal_Int8 >& rId )
+{
+    if( !rId.hasElements() )
+    {
+        rId.realloc( 16 );
+        rtl_createUuid( reinterpret_cast< sal_uInt8* >( rId.getArray() ), 0, sal_True );
+    }
+}
+// -----------------------------------------------------------------------------
+sal_Int16 SAL_CALL AccessibleGridControlBase::getAccessibleRole()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    sal_Int16 nRole = AccessibleRole::UNKNOWN;
+    switch ( m_eObjType )
+    {
+        case TCTYPE_ROWHEADERCELL:
+        nRole = AccessibleRole::ROW_HEADER;
+        break;
+    case TCTYPE_COLUMNHEADERCELL:
+        nRole = AccessibleRole::COLUMN_HEADER;
+        break;
+    case TCTYPE_COLUMNHEADERBAR:
+    case TCTYPE_ROWHEADERBAR:
+    case TCTYPE_TABLE:
+        nRole = AccessibleRole::TABLE;
+        break;
+    case TCTYPE_TABLECELL:
+        nRole = AccessibleRole::TABLE_CELL;
+        break;
+    case TCTYPE_GRIDCONTROL:
+        nRole = AccessibleRole::PANEL;
+        break;
+    }
+    return nRole;
+}
+// -----------------------------------------------------------------------------
+Any SAL_CALL AccessibleGridControlBase::getAccessibleKeyBinding()
+        throw ( uno::RuntimeException )
+{
+    return Any();
+}
+// -----------------------------------------------------------------------------
+Reference<XAccessible > SAL_CALL AccessibleGridControlBase::getAccessibleAtPoint( const ::com::sun::star::awt::Point& )
+        throw ( uno::RuntimeException )
+{
+    return NULL;
+}
+//// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground(  ) throw (::com::sun::star::uno::RuntimeException)
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+
+    sal_Int32 nColor = 0;
+    Window* pInst = m_aTable.GetWindowInstance();
+    if ( pInst )
+    {
+        if ( pInst->IsControlForeground() )
+            nColor = pInst->GetControlForeground().GetColor();
+    else
+    {
+        Font aFont;
+        if ( pInst->IsControlFont() )
+            aFont = pInst->GetControlFont();
+        else
+            aFont = pInst->GetFont();
+        nColor = aFont.GetColor().GetColor();
+    }
+    }
+    return nColor;
+}
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground(  ) throw (::com::sun::star::uno::RuntimeException)
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    sal_Int32 nColor = 0;
+    Window* pInst = m_aTable.GetWindowInstance();
+    if ( pInst )
+    {
+        if ( pInst->IsControlBackground() )
+            nColor = pInst->GetControlBackground().GetColor();
+    else
+            nColor = pInst->GetBackground().GetColor().GetColor();
+    }
+    return nColor;
+}
+
+//// ============================================================================
+GridControlAccessibleElement::GridControlAccessibleElement( const Reference< XAccessible >& rxParent,
+                        IAccessibleTable& rTable,
+                        AccessibleTableControlObjType  eObjType )
+    :AccessibleGridControlBase( rxParent, rTable, eObjType )
+{
+}
+
+// XInterface -----------------------------------------------------------------
+IMPLEMENT_FORWARD_XINTERFACE2( GridControlAccessibleElement, AccessibleGridControlBase, GridControlAccessibleElement_Base)
+
+// XTypeProvider --------------------------------------------------------------
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( GridControlAccessibleElement, AccessibleGridControlBase, GridControlAccessibleElement_Base )
+
+// XAccessible ----------------------------------------------------------------
+
+Reference< XAccessibleContext > SAL_CALL GridControlAccessibleElement::getAccessibleContext() throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return this;
+}
+// ----------------------------------------------------------------------------
+GridControlAccessibleElement::~GridControlAccessibleElement( )
+{
+}
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
new file mode 100755
index 000000000000..1870eebc8e3e
--- /dev/null
+++ b/accessibility/source/extended/AccessibleGridControlHeader.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+
+
+#include "accessibility/extended/AccessibleGridControlHeader.hxx"
+#include "accessibility/extended/AccessibleGridControlHeaderCell.hxx"
+#include "accessibility/extended/AccessibleGridControlTableCell.hxx"
+#include <svtools/accessibletable.hxx>
+
+
+// ============================================================================
+
+using ::rtl::OUString;
+
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::Any;
+
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::accessibility;
+using namespace ::svt;
+using namespace ::svt::table;
+
+// ============================================================================
+
+namespace accessibility {
+
+// ============================================================================
+
+DBG_NAME( AccessibleGridControlHeader )
+
+AccessibleGridControlHeader::AccessibleGridControlHeader(
+        const Reference< XAccessible >& rxParent,
+        ::svt::table::IAccessibleTable&                      rTable,
+        ::svt::table::AccessibleTableControlObjType      eObjType):
+        AccessibleGridControlTableBase( rxParent, rTable, eObjType )
+{
+    DBG_ASSERT( isRowBar() || isColumnBar(),
+        "accessibility/extended/AccessibleGridControlHeaderBar - invalid object type" );
+}
+
+AccessibleGridControlHeader::~AccessibleGridControlHeader()
+{
+}
+
+// XAccessibleContext ---------------------------------------------------------
+
+Reference< XAccessible > SAL_CALL
+AccessibleGridControlHeader::getAccessibleChild( sal_Int32 nChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+
+    if (nChildIndex<0 || nChildIndex>=getAccessibleChildCount())
+    throw IndexOutOfBoundsException();
+    ensureIsAlive();
+    Reference< XAccessible > xChild;
+    if(m_eObjType == svt::table::TCTYPE_COLUMNHEADERBAR)
+    {
+        AccessibleGridControlHeaderCell* pColHeaderCell = new AccessibleGridControlHeaderCell(nChildIndex, this, m_aTable, svt::table::TCTYPE_COLUMNHEADERCELL);
+        xChild = pColHeaderCell;
+    }
+    else if(m_eObjType == svt::table::TCTYPE_ROWHEADERBAR)
+    {
+        AccessibleGridControlHeaderCell* pRowHeaderCell = new AccessibleGridControlHeaderCell(nChildIndex, this, m_aTable, svt::table::TCTYPE_ROWHEADERCELL);
+        xChild = pRowHeaderCell;
+    }
+    return xChild;
+}
+
+sal_Int32 SAL_CALL AccessibleGridControlHeader::getAccessibleIndexInParent()
+    throw ( uno::RuntimeException )
+{
+     ensureIsAlive();
+     if(m_eObjType == svt::table::TCTYPE_ROWHEADERBAR && m_aTable.HasColHeader())
+         return 1;
+     else
+         return 0;
+}
+
+// XAccessibleComponent -------------------------------------------------------
+
+Reference< XAccessible > SAL_CALL
+AccessibleGridControlHeader::getAccessibleAtPoint( const awt::Point& rPoint )
+    throw ( uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+
+    sal_Int32 nRow = 0;
+    sal_Int32 nColumnPos = 0;
+    sal_Bool bConverted = isRowBar() ?
+    m_aTable.ConvertPointToCellAddress( nRow, nColumnPos, VCLPoint( rPoint ) ) :
+    m_aTable.ConvertPointToCellAddress( nRow, nColumnPos, VCLPoint( rPoint ) );
+
+    return bConverted ? implGetChild( nRow, nColumnPos ) : Reference< XAccessible >();
+}
+
+void SAL_CALL AccessibleGridControlHeader::grabFocus()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    // focus on header not supported
+}
+
+Any SAL_CALL AccessibleGridControlHeader::getAccessibleKeyBinding()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return Any();   // no special key bindings for header
+}
+
+// XAccessibleTable -----------------------------------------------------------
+
+OUString SAL_CALL AccessibleGridControlHeader::getAccessibleRowDescription( sal_Int32 nRow )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidRow( nRow );
+    return OUString();  // no headers in headers
+}
+
+OUString SAL_CALL AccessibleGridControlHeader::getAccessibleColumnDescription( sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidColumn( nColumn );
+    return OUString();  // no headers in headers
+}
+
+Reference< XAccessibleTable > SAL_CALL AccessibleGridControlHeader::getAccessibleRowHeaders()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return NULL;        // no headers in headers
+}
+
+Reference< XAccessibleTable > SAL_CALL AccessibleGridControlHeader::getAccessibleColumnHeaders()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return NULL;        // no headers in headers
+}
+//not selectable
+Sequence< sal_Int32 > SAL_CALL AccessibleGridControlHeader::getSelectedAccessibleRows()
+    throw ( uno::RuntimeException )
+{
+    Sequence< sal_Int32 > aSelSeq(0);
+    return aSelSeq;
+}
+//columns aren't selectable
+Sequence< sal_Int32 > SAL_CALL AccessibleGridControlHeader::getSelectedAccessibleColumns()
+    throw ( uno::RuntimeException )
+{
+    Sequence< sal_Int32 > aSelSeq(0);
+    return aSelSeq;
+}
+//row headers not selectable
+sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleRowSelected( sal_Int32 /*nRow*/ )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    return sal_False;
+}
+//columns aren't selectable
+sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleColumnSelected( sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    (void)nColumn;
+    return sal_False;
+}
+//not implemented
+Reference< XAccessible > SAL_CALL AccessibleGridControlHeader::getAccessibleCellAt(
+        sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    return NULL;
+}
+// not selectable
+sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleSelected(
+        sal_Int32 /*nRow*/, sal_Int32 /*nColumn */)
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    return sal_False;
+}
+
+// XServiceInfo ---------------------------------------------------------------
+
+OUString SAL_CALL AccessibleGridControlHeader::getImplementationName()
+    throw ( uno::RuntimeException )
+{
+    return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleGridControlHeader" ) );
+}
+
+Sequence< sal_Int8 > SAL_CALL AccessibleGridControlHeader::getImplementationId()
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslGlobalMutex() );
+    static Sequence< sal_Int8 > aId;
+    implCreateUuid( aId );
+    return aId;
+}
+
+// internal virtual methods ---------------------------------------------------
+
+Rectangle AccessibleGridControlHeader::implGetBoundingBox()
+{
+    return m_aTable.calcHeaderRect(isColumnBar());
+}
+
+Rectangle AccessibleGridControlHeader::implGetBoundingBoxOnScreen()
+{
+    return m_aTable.calcHeaderRect(isColumnBar());
+}
+
+sal_Int32 AccessibleGridControlHeader::implGetRowCount() const
+{
+    return 1;
+}
+
+sal_Int32 AccessibleGridControlHeader::implGetColumnCount() const
+{
+    return 1;
+}
+
+// internal helper methods ----------------------------------------------------
+
+Reference< XAccessible > AccessibleGridControlHeader::implGetChild(
+        sal_Int32 nRow, sal_uInt32 nColumnPos )
+{
+    Reference< XAccessible > xChild;
+    if(m_eObjType == svt::table::TCTYPE_COLUMNHEADERBAR)
+    {
+        AccessibleGridControlHeaderCell* pColHeaderCell = new AccessibleGridControlHeaderCell(nColumnPos, this, m_aTable, svt::table::TCTYPE_COLUMNHEADERCELL);
+        xChild = pColHeaderCell;
+    }
+    else if(m_eObjType == svt::table::TCTYPE_ROWHEADERBAR)
+    {
+        AccessibleGridControlHeaderCell* pRowHeaderCell = new AccessibleGridControlHeaderCell(nRow, this, m_aTable, svt::table::TCTYPE_ROWHEADERCELL);
+        xChild = pRowHeaderCell;
+    }
+    return xChild;
+}
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
new file mode 100755
index 000000000000..485c57c40ae1
--- /dev/null
+++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+
+#include "accessibility/extended/AccessibleGridControlHeaderCell.hxx"
+#include <svtools/accessibletable.hxx>
+#include "accessibility/extended/AccessibleGridControl.hxx"
+
+namespace accessibility
+{
+    using namespace ::com::sun::star::accessibility;
+    using namespace ::com::sun::star::lang;
+    using namespace ::com::sun::star::uno;
+    using namespace ::svt;
+    using namespace ::svt::table;
+
+AccessibleGridControlHeaderCell::AccessibleGridControlHeaderCell(sal_Int32 _nColumnRowId,
+                                  const Reference< XAccessible >& rxParent,
+                                  IAccessibleTable& rTable,
+                                  AccessibleTableControlObjType  eObjType)
+: AccessibleGridControlCell( rxParent, rTable, _nColumnRowId, 0, eObjType)
+, m_nColumnRowId(_nColumnRowId)
+{
+}
+/** Creates a new AccessibleStateSetHelper and fills it with states of the
+    current object.
+    @return
+        A filled AccessibleStateSetHelper.
+*/
+::utl::AccessibleStateSetHelper* AccessibleGridControlHeaderCell::implCreateStateSetHelper()
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ::utl::AccessibleStateSetHelper*
+        pStateSetHelper = new ::utl::AccessibleStateSetHelper;
+
+    if( isAlive() )
+    {
+        // SHOWING done with mxParent
+        if( implIsShowing() )
+            pStateSetHelper->AddState( AccessibleStateType::SHOWING );
+
+        TCSolarGuard aSolarGuard;
+        pStateSetHelper->AddState( AccessibleStateType::VISIBLE );
+        pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE );
+        pStateSetHelper->AddState( AccessibleStateType::TRANSIENT );
+        pStateSetHelper->AddState( AccessibleStateType::SELECTABLE );
+
+        if ( m_aTable.IsRowSelected(m_nColumnRowId) )
+            pStateSetHelper->AddState( AccessibleStateType::SELECTED );
+    }
+    else
+        pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+
+    return pStateSetHelper;
+}
+// -----------------------------------------------------------------------------
+/** @return
+        The count of visible children.
+*/
+sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleChildCount()
+    throw ( RuntimeException )
+{
+    return 0;
+}
+// -----------------------------------------------------------------------------
+
+/** @return
+        The XAccessible interface of the specified child.
+*/
+Reference<XAccessible > SAL_CALL AccessibleGridControlHeaderCell::getAccessibleChild( sal_Int32 )
+    throw ( IndexOutOfBoundsException,RuntimeException )
+{
+    throw IndexOutOfBoundsException();
+}
+// XInterface -------------------------------------------------------------
+
+    /** Queries for a new interface. */
+    ::com::sun::star::uno::Any SAL_CALL AccessibleGridControlHeaderCell::queryInterface(
+            const ::com::sun::star::uno::Type& rType )
+        throw ( ::com::sun::star::uno::RuntimeException )
+    {
+        Any aRet = AccessibleGridControlCell::queryInterface(rType);
+        return aRet;
+    }
+
+    /** Aquires the object (calls acquire() on base class). */
+    void SAL_CALL AccessibleGridControlHeaderCell::acquire() throw ()
+    {
+        AccessibleGridControlCell::acquire();
+    }
+
+    /** Releases the object (calls release() on base class). */
+    void SAL_CALL AccessibleGridControlHeaderCell::release() throw ()
+    {
+        AccessibleGridControlCell::release();
+    }
+        /** @return  The XAccessibleContext interface of this object. */
+    Reference< com::sun::star::accessibility::XAccessibleContext > SAL_CALL AccessibleGridControlHeaderCell::getAccessibleContext() throw ( RuntimeException )
+    {
+        ensureIsAlive();
+        return this;
+    }
+
+// -----------------------------------------------------------------------------
+
+/** Grabs the focus to the column header. */
+void SAL_CALL AccessibleGridControlHeaderCell::grabFocus()
+    throw ( ::com::sun::star::uno::RuntimeException )
+{
+}
+// -----------------------------------------------------------------------------
+/** @return
+        The name of this class.
+*/
+::rtl::OUString SAL_CALL AccessibleGridControlHeaderCell::getImplementationName()
+    throw ( ::com::sun::star::uno::RuntimeException )
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleGridControlHeaderCell" ) );
+}
+// -----------------------------------------------------------------------------
+Rectangle AccessibleGridControlHeaderCell::implGetBoundingBox()
+{
+    return Rectangle(Point(0,0),Point(0,0));//To Do - return headercell rectangle
+}
+// -----------------------------------------------------------------------------
+
+Rectangle AccessibleGridControlHeaderCell::implGetBoundingBoxOnScreen()
+{
+    return Rectangle(Point(0,0),Point(0,0));//To Do - return headercell rectangle
+}
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleIndexInParent()
+    throw ( RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    sal_Int32 nIndex = m_nColumnRowId;
+    return nIndex;
+}
+// -----------------------------------------------------------------------------
+} // namespace accessibility
+// -----------------------------------------------------------------------------
+
+
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
new file mode 100755
index 000000000000..406baeb2973c
--- /dev/null
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -0,0 +1,376 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+
+
+#include "accessibility/extended/AccessibleGridControlTable.hxx"
+#include "accessibility/extended/AccessibleGridControlTableCell.hxx"
+#include <svtools/accessibletable.hxx>
+
+// ============================================================================
+
+using ::rtl::OUString;
+
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::Any;
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
+using namespace ::svt;
+using namespace ::svt::table;
+// ============================================================================
+
+namespace accessibility {
+
+// ============================================================================
+
+DBG_NAME( AccessibleGridControlTable )
+
+AccessibleGridControlTable::AccessibleGridControlTable(
+        const Reference< XAccessible >& rxParent,
+        IAccessibleTable& rTable,
+        AccessibleTableControlObjType _eType) :
+    AccessibleGridControlTableBase( rxParent, rTable, _eType )
+{
+}
+
+AccessibleGridControlTable::~AccessibleGridControlTable()
+{
+}
+
+// XAccessibleContext ---------------------------------------------------------
+
+Reference< XAccessible > SAL_CALL
+AccessibleGridControlTable::getAccessibleChild( sal_Int32 nChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidIndex( nChildIndex );
+    return new AccessibleGridControlTableCell(this, m_aTable, nChildIndex/m_aTable.GetColumnCount(), nChildIndex%m_aTable.GetColumnCount(), TCTYPE_TABLECELL);
+}
+
+sal_Int32 SAL_CALL AccessibleGridControlTable::getAccessibleIndexInParent()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    if(m_aTable.HasRowHeader() && m_aTable.HasColHeader())
+        return 0;
+    else if((!m_aTable.HasRowHeader() && m_aTable.HasColHeader()) || (m_aTable.HasRowHeader() && !m_aTable.HasColHeader()) )
+        return 1;
+    else
+        return 2;
+}
+
+// XAccessibleComponent -------------------------------------------------------
+
+Reference< XAccessible > SAL_CALL
+AccessibleGridControlTable::getAccessibleAtPoint( const awt::Point& rPoint )
+    throw ( uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+
+    Reference< XAccessible > xChild;
+    sal_Int32 nRow = 0;
+    sal_Int32 nColumnPos = 0;
+    if( m_aTable.ConvertPointToCellAddress( nRow, nColumnPos, VCLPoint( rPoint ) ) )
+        xChild = new AccessibleGridControlTableCell(this, m_aTable, nRow, nColumnPos, TCTYPE_TABLECELL);
+
+    return xChild;
+}
+
+void SAL_CALL AccessibleGridControlTable::grabFocus()
+    throw ( uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    m_aTable.GrabFocus();
+}
+
+Any SAL_CALL AccessibleGridControlTable::getAccessibleKeyBinding()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return Any();   // no special key bindings for data table
+}
+
+// XAccessibleTable -----------------------------------------------------------
+
+OUString SAL_CALL AccessibleGridControlTable::getAccessibleRowDescription( sal_Int32 nRow )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidRow( nRow );
+    return m_aTable.GetRowDescription( nRow );
+}
+
+OUString SAL_CALL AccessibleGridControlTable::getAccessibleColumnDescription( sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidColumn( nColumn );
+    return m_aTable.GetColumnDescription( (sal_uInt16)nColumn );
+}
+
+Reference< XAccessibleTable > SAL_CALL AccessibleGridControlTable::getAccessibleRowHeaders()
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    if(m_aTable.HasColHeader())
+        return implGetHeaderBar( 1 );
+    else
+        return implGetHeaderBar( 0 );
+}
+
+Reference< XAccessibleTable > SAL_CALL AccessibleGridControlTable::getAccessibleColumnHeaders()
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return implGetHeaderBar( 0 );
+}
+
+Sequence< sal_Int32 > SAL_CALL AccessibleGridControlTable::getSelectedAccessibleRows()
+    throw ( uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    Sequence< sal_Int32 > aSelSeq;
+    implGetSelectedRows( aSelSeq );
+    return aSelSeq;
+}
+
+//columns aren't selectable
+Sequence< sal_Int32 > SAL_CALL AccessibleGridControlTable::getSelectedAccessibleColumns()
+    throw ( uno::RuntimeException )
+{
+    Sequence< sal_Int32 > aSelSeq(0);
+    return aSelSeq;
+}
+
+sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleRowSelected( sal_Int32 nRow )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidRow( nRow );
+    sal_Bool bSelected = sal_False;
+    Sequence< sal_Int32 > selectedRows = getSelectedAccessibleRows();
+    for(int i=0; i<selectedRows.getLength(); i++)
+    {
+        if(nRow == selectedRows[i])
+        {
+            bSelected = sal_True;
+            continue;
+        }
+    }
+    return bSelected;
+}
+
+//columns aren't selectable
+sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleColumnSelected( sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    (void) nColumn;
+    return sal_False;
+}
+
+Reference< XAccessible > SAL_CALL AccessibleGridControlTable::getAccessibleCellAt(
+        sal_Int32 nRow, sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidAddress( nRow, nColumn );
+    return new AccessibleGridControlTableCell(this, m_aTable, nRow, nColumn, TCTYPE_TABLECELL);
+}
+
+sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleSelected(
+        sal_Int32 nRow, sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidAddress( nRow, nColumn );
+    (void) nColumn;
+    //selection of single cells not possible, so if row is selected, the cell will be selected too
+    return isAccessibleRowSelected(nRow);
+}
+void SAL_CALL AccessibleGridControlTable::selectAccessibleChild( sal_Int32 nChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidIndex( nChildIndex );
+    sal_Int32 nColumns = m_aTable.GetColumnCount();
+    sal_Int32 nRow = (nChildIndex / nColumns);
+    m_aTable.SelectRow( nRow, sal_True );
+}
+sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleChildSelected( sal_Int32 nChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidIndex( nChildIndex );
+    sal_Int32 nColumns = m_aTable.GetColumnCount();
+    sal_Int32 nRow = (nChildIndex / nColumns);
+    return isAccessibleRowSelected(nRow);
+}
+void SAL_CALL AccessibleGridControlTable::clearAccessibleSelection()
+    throw ( uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    m_aTable.SelectAllRows( false );
+}
+void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren()
+    throw ( uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    Sequence< sal_Int32 > selectedRows = getSelectedAccessibleRows();
+    for(int i=0;i<m_aTable.GetRowCount();i++)
+        selectedRows[i]=i;
+}
+sal_Int32 SAL_CALL AccessibleGridControlTable::getSelectedAccessibleChildCount()
+    throw ( uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    Sequence< sal_Int32 > selectedRows = getSelectedAccessibleRows();
+    sal_Int32 nColumns = m_aTable.GetColumnCount();
+    return selectedRows.getLength()*nColumns;
+}
+Reference< XAccessible > SAL_CALL
+AccessibleGridControlTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    if(isAccessibleChildSelected(nSelectedChildIndex))
+        return getAccessibleChild(nSelectedChildIndex);
+    else
+        return NULL;
+}
+//not implemented yet, because only row selection possible
+void SAL_CALL AccessibleGridControlTable::deselectAccessibleChild(
+        sal_Int32 nSelectedChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    (void)nSelectedChildIndex;
+}
+// XInterface -----------------------------------------------------------------
+
+Any SAL_CALL AccessibleGridControlTable::queryInterface( const uno::Type& rType )
+    throw ( uno::RuntimeException )
+{
+    Any aAny( AccessibleGridControlTableBase::queryInterface( rType ) );
+    return aAny.hasValue() ?
+        aAny : AccessibleGridControlTableImplHelper1::queryInterface( rType );
+}
+
+void SAL_CALL AccessibleGridControlTable::acquire() throw ()
+{
+    AccessibleGridControlTableBase::acquire();
+}
+
+void SAL_CALL AccessibleGridControlTable::release() throw ()
+{
+    AccessibleGridControlTableBase::release();
+}
+// XServiceInfo ---------------------------------------------------------------
+
+OUString SAL_CALL AccessibleGridControlTable::getImplementationName()
+    throw ( uno::RuntimeException )
+{
+    return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleGridControlTable" ) );
+}
+
+// internal virtual methods ---------------------------------------------------
+
+Rectangle AccessibleGridControlTable::implGetBoundingBox()
+{
+    return m_aTable.calcTableRect();
+}
+
+Rectangle AccessibleGridControlTable::implGetBoundingBoxOnScreen()
+{
+    return m_aTable.calcTableRect();
+}
+// internal helper methods ----------------------------------------------------
+Reference< XAccessibleTable > AccessibleGridControlTable::implGetHeaderBar(
+        sal_Int32 nChildIndex )
+    throw ( uno::RuntimeException )
+{
+    Reference< XAccessible > xRet;
+    Reference< XAccessibleContext > xContext( m_xParent, uno::UNO_QUERY );
+    if( xContext.is() )
+    {
+        try
+        {
+            xRet = xContext->getAccessibleChild( nChildIndex );
+        }
+        catch( lang::IndexOutOfBoundsException& )
+        {
+            DBG_ERROR( "implGetHeaderBar - wrong child index" );
+        }
+        // RuntimeException goes to caller
+    }
+    return Reference< XAccessibleTable >( xRet, uno::UNO_QUERY );
+}
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
new file mode 100644
index 000000000000..d97feb1277ec
--- /dev/null
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -0,0 +1,291 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+
+
+#include "accessibility/extended/AccessibleGridControlTableBase.hxx"
+#include <svtools/accessibletable.hxx>
+#include <tools/multisel.hxx>
+#include <comphelper/sequence.hxx>
+
+// ============================================================================
+
+using ::rtl::OUString;
+
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::Any;
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::accessibility;
+using namespace ::svt;
+using namespace ::svt::table;
+
+// ============================================================================
+
+namespace accessibility {
+
+// ============================================================================
+
+DBG_NAME( AccessibleGridControlTableBase )
+
+AccessibleGridControlTableBase::AccessibleGridControlTableBase(
+        const Reference< XAccessible >& rxParent,
+        IAccessibleTable& rTable,
+        AccessibleTableControlObjType eObjType ) :
+    GridControlAccessibleElement( rxParent, rTable, eObjType )
+{
+}
+
+AccessibleGridControlTableBase::~AccessibleGridControlTableBase()
+{
+}
+
+// XAccessibleContext ---------------------------------------------------------
+
+sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleChildCount()
+    throw ( uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    sal_Int32 nChildren = 0;
+    if(m_eObjType == TCTYPE_ROWHEADERBAR)
+        nChildren = m_aTable.GetRowCount();
+    else if(m_eObjType == TCTYPE_TABLE)
+        nChildren = m_aTable.GetRowCount()*m_aTable.GetColumnCount();
+    else if(m_eObjType == TCTYPE_COLUMNHEADERBAR)
+        nChildren = m_aTable.GetColumnCount();
+    return nChildren;
+}
+
+sal_Int16 SAL_CALL AccessibleGridControlTableBase::getAccessibleRole()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return AccessibleRole::TABLE;
+}
+
+// XAccessibleTable -----------------------------------------------------------
+
+sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRowCount()
+    throw ( uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return  m_aTable.GetRowCount();
+}
+
+sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumnCount()
+    throw ( uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return m_aTable.GetColumnCount();
+}
+
+sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRowExtentAt(
+        sal_Int32 nRow, sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidAddress( nRow, nColumn );
+    return 1;   // merged cells not supported
+}
+
+sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumnExtentAt(
+        sal_Int32 nRow, sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidAddress( nRow, nColumn );
+    return 1;   // merged cells not supported
+}
+
+Reference< XAccessible > SAL_CALL AccessibleGridControlTableBase::getAccessibleCaption()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return NULL;    // not supported
+}
+
+Reference< XAccessible > SAL_CALL AccessibleGridControlTableBase::getAccessibleSummary()
+    throw ( uno::RuntimeException )
+{
+    ensureIsAlive();
+    return NULL;    // not supported
+}
+
+sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleIndex(
+        sal_Int32 nRow, sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidAddress( nRow, nColumn );
+    return implGetChildIndex( nRow, nColumn );
+}
+
+sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRow( sal_Int32 nChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidIndex( nChildIndex );
+    return implGetRow( nChildIndex );
+}
+
+sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumn( sal_Int32 nChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    TCSolarGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    ensureIsValidIndex( nChildIndex );
+    return implGetColumn( nChildIndex );
+}
+
+// XInterface -----------------------------------------------------------------
+
+Any SAL_CALL AccessibleGridControlTableBase::queryInterface( const uno::Type& rType )
+    throw ( uno::RuntimeException )
+{
+    Any aAny( GridControlAccessibleElement::queryInterface( rType ) );
+    return aAny.hasValue() ?
+        aAny : AccessibleGridControlTableImplHelper::queryInterface( rType );
+}
+
+void SAL_CALL AccessibleGridControlTableBase::acquire() throw ()
+{
+    GridControlAccessibleElement::acquire();
+}
+
+void SAL_CALL AccessibleGridControlTableBase::release() throw ()
+{
+    GridControlAccessibleElement::release();
+}
+
+// XTypeProvider --------------------------------------------------------------
+
+Sequence< uno::Type > SAL_CALL AccessibleGridControlTableBase::getTypes()
+    throw ( uno::RuntimeException )
+{
+    return ::comphelper::concatSequences(
+        GridControlAccessibleElement::getTypes(),
+        AccessibleGridControlTableImplHelper::getTypes() );
+}
+
+Sequence< sal_Int8 > SAL_CALL AccessibleGridControlTableBase::getImplementationId()
+    throw ( uno::RuntimeException )
+{
+    ::osl::MutexGuard aGuard( getOslGlobalMutex() );
+    static Sequence< sal_Int8 > aId;
+    implCreateUuid( aId );
+    return aId;
+}
+
+// internal helper methods ----------------------------------------------------
+
+sal_Int32 AccessibleGridControlTableBase::implGetChildCount() const
+{
+    return m_aTable.GetRowCount()*m_aTable.GetColumnCount();
+}
+
+sal_Int32 AccessibleGridControlTableBase::implGetRow( sal_Int32 nChildIndex ) const
+{
+    sal_Int32 nColumns = m_aTable.GetColumnCount();
+    return nColumns ? (nChildIndex / nColumns) : 0;
+}
+
+sal_Int32 AccessibleGridControlTableBase::implGetColumn( sal_Int32 nChildIndex ) const
+{
+    sal_Int32 nColumns = m_aTable.GetColumnCount();
+    return nColumns ? (nChildIndex % nColumns) : 0;
+}
+
+sal_Int32 AccessibleGridControlTableBase::implGetChildIndex(
+        sal_Int32 nRow, sal_Int32 nColumn ) const
+{
+    return nRow * m_aTable.GetColumnCount() + nColumn;
+}
+
+void AccessibleGridControlTableBase::implGetSelectedRows( Sequence< sal_Int32 >& rSeq )
+{
+    sal_Int32 const selectionCount( m_aTable.GetSelectedRowCount() );
+    rSeq.realloc( selectionCount );
+    for ( sal_Int32 i=0; i<selectionCount; ++i )
+        rSeq[i] = m_aTable.GetSelectedRowIndex(i);
+}
+
+void AccessibleGridControlTableBase::ensureIsValidRow( sal_Int32 nRow )
+    throw ( lang::IndexOutOfBoundsException )
+{
+    if( nRow >= m_aTable.GetRowCount() )
+        throw lang::IndexOutOfBoundsException(
+            OUString( RTL_CONSTASCII_USTRINGPARAM( "row index is invalid" ) ), *this );
+}
+
+void AccessibleGridControlTableBase::ensureIsValidColumn( sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException )
+{
+    if( nColumn >= m_aTable.GetColumnCount() )
+        throw lang::IndexOutOfBoundsException(
+            OUString( RTL_CONSTASCII_USTRINGPARAM("column index is invalid") ), *this );
+}
+
+void AccessibleGridControlTableBase::ensureIsValidAddress(
+        sal_Int32 nRow, sal_Int32 nColumn )
+    throw ( lang::IndexOutOfBoundsException )
+{
+    ensureIsValidRow( nRow );
+    ensureIsValidColumn( nColumn );
+}
+
+void AccessibleGridControlTableBase::ensureIsValidIndex( sal_Int32 nChildIndex )
+    throw ( lang::IndexOutOfBoundsException )
+{
+    if( nChildIndex >= implGetChildCount() )
+        throw lang::IndexOutOfBoundsException(
+            OUString( RTL_CONSTASCII_USTRINGPARAM("child index is invalid") ), *this );
+}
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
new file mode 100755
index 000000000000..43b9400e9050
--- /dev/null
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -0,0 +1,370 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+
+#include "accessibility/extended/AccessibleGridControlTableCell.hxx"
+#include <svtools/accessibletable.hxx>
+#include "accessibility/extended/AccessibleGridControl.hxx"
+#include <tools/gen.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+
+namespace accessibility
+{
+    namespace
+    {
+        void checkIndex_Impl( sal_Int32 _nIndex, const ::rtl::OUString& _sText ) throw (::com::sun::star::lang::IndexOutOfBoundsException)
+        {
+            if ( _nIndex >= _sText.getLength() )
+                throw ::com::sun::star::lang::IndexOutOfBoundsException();
+        }
+
+        sal_Int32 getIndex_Impl( sal_Int32 _nRow, sal_uInt16 _nColumn, sal_uInt16 _nColumnCount )
+        {
+            return _nRow * _nColumnCount + _nColumn;
+        }
+    }
+    using namespace ::com::sun::star::lang;
+    using namespace utl;
+    using namespace comphelper;
+    using ::rtl::OUString;
+    using ::accessibility::AccessibleGridControl;
+    using namespace ::com::sun::star::uno;
+    using ::com::sun::star::accessibility::XAccessible;
+    using namespace ::com::sun::star::accessibility;
+    using namespace ::svt;
+    using namespace ::svt::table;
+
+
+    // =============================================================================
+    // = AccessibleGridControlCell
+    // =============================================================================
+    // -----------------------------------------------------------------------------
+    AccessibleGridControlCell::AccessibleGridControlCell(
+            const Reference< XAccessible >& _rxParent, IAccessibleTable& _rTable,
+            sal_Int32 _nRowPos, sal_uInt16 _nColPos, AccessibleTableControlObjType _eType )
+        :AccessibleGridControlBase( _rxParent, _rTable, _eType )
+        ,m_nRowPos( _nRowPos )
+        ,m_nColPos( _nColPos )
+    {
+        // set accessible name here, because for that we need the position of the cell
+        // and so the base class isn't capable of doing this
+        ::rtl::OUString aAccName;
+        if(_eType == TCTYPE_TABLECELL)
+            aAccName = _rTable.GetAccessibleObjectName( TCTYPE_TABLECELL, _nRowPos, _nColPos );
+        else if(_eType == TCTYPE_ROWHEADERCELL)
+            aAccName = _rTable.GetAccessibleObjectName( TCTYPE_ROWHEADERCELL, _nRowPos, 0 );
+        else if(_eType == TCTYPE_COLUMNHEADERCELL)
+            aAccName = _rTable.GetAccessibleObjectName( TCTYPE_COLUMNHEADERCELL, 0, _nRowPos );
+        implSetName( aAccName );
+    }
+
+    // -----------------------------------------------------------------------------
+    AccessibleGridControlCell::~AccessibleGridControlCell()
+    {
+    }
+
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleGridControlCell::grabFocus() throw ( RuntimeException )
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        m_aTable.GoToCell( m_nColPos, m_nRowPos );
+    }
+    //// -----------------------------------------------------------------------------
+    // implementation of a table cell
+    ::rtl::OUString AccessibleGridControlTableCell::implGetText()
+    {
+        ensureIsAlive();
+        return m_aTable.GetAccessibleCellText( getRowPos(),  getColumnPos() );
+    }
+
+    ::com::sun::star::lang::Locale AccessibleGridControlTableCell::implGetLocale()
+    {
+        ensureIsAlive();
+        return m_aTable.GetAccessible()->getAccessibleContext()->getLocale();
+    }
+
+    void AccessibleGridControlTableCell::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
+    {
+        nStartIndex = 0;
+        nEndIndex = 0;
+    }
+
+    AccessibleGridControlTableCell::AccessibleGridControlTableCell(const Reference<XAccessible >& _rxParent,
+                                IAccessibleTable& _rTable,
+                                sal_Int32 _nRowPos,
+                                sal_uInt16 _nColPos,
+                                AccessibleTableControlObjType  eObjType)
+        :AccessibleGridControlCell( _rxParent, _rTable, _nRowPos, _nColPos, eObjType )
+    {
+    }
+
+    // XInterface -------------------------------------------------------------
+
+    /** Queries for a new interface. */
+    ::com::sun::star::uno::Any SAL_CALL AccessibleGridControlTableCell::queryInterface(
+            const ::com::sun::star::uno::Type& rType )
+        throw ( ::com::sun::star::uno::RuntimeException )
+    {
+        Any aRet = AccessibleGridControlCell::queryInterface(rType);
+        if ( !aRet.hasValue() )
+            aRet = AccessibleTextHelper_BASE::queryInterface(rType);
+        return aRet;
+    }
+
+    /** Aquires the object (calls acquire() on base class). */
+    void SAL_CALL AccessibleGridControlTableCell::acquire() throw ()
+    {
+        AccessibleGridControlCell::acquire();
+    }
+
+    /** Releases the object (calls release() on base class). */
+    void SAL_CALL AccessibleGridControlTableCell::release() throw ()
+    {
+        AccessibleGridControlCell::release();
+    }
+
+    ::com::sun::star::awt::Rectangle SAL_CALL AccessibleGridControlTableCell::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+
+        ensureIsAlive();
+        if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
+            throw IndexOutOfBoundsException();
+
+        ::com::sun::star::awt::Rectangle aRect;
+
+        if ( &m_aTable )
+            aRect = AWTRectangle( m_aTable.GetFieldCharacterBounds( getRowPos(), getColumnPos(), nIndex ) );
+        return aRect;
+    }
+
+    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getIndexAtPoint( const ::com::sun::star::awt::Point& _aPoint ) throw (RuntimeException)
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        ensureIsAlive();
+
+        return m_aTable.GetFieldIndexAtPoint( getRowPos(), getColumnPos(), VCLPoint( _aPoint ) );
+    }
+
+    /** @return
+            The name of this class.
+    */
+    ::rtl::OUString SAL_CALL AccessibleGridControlTableCell::getImplementationName()
+        throw ( ::com::sun::star::uno::RuntimeException )
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.accessibility.AccessibleGridControlTableCell" ) );
+    }
+
+    /** @return  The count of visible children. */
+    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getAccessibleChildCount()
+        throw ( ::com::sun::star::uno::RuntimeException )
+    {
+        return 0;
+    }
+
+    /** @return  The XAccessible interface of the specified child. */
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::accessibility::XAccessible > SAL_CALL
+        AccessibleGridControlTableCell::getAccessibleChild( sal_Int32 )
+            throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
+                    ::com::sun::star::uno::RuntimeException )
+    {
+        throw ::com::sun::star::lang::IndexOutOfBoundsException();
+    }
+
+    /** Creates a new AccessibleStateSetHelper and fills it with states of the
+        current object.
+        @return
+            A filled AccessibleStateSetHelper.
+    */
+    ::utl::AccessibleStateSetHelper* AccessibleGridControlTableCell::implCreateStateSetHelper()
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+
+        ::utl::AccessibleStateSetHelper* pStateSetHelper = new ::utl::AccessibleStateSetHelper;
+
+        if( isAlive() )
+        {
+            // SHOWING done with mxParent
+            if( implIsShowing() )
+                pStateSetHelper->AddState( AccessibleStateType::SHOWING );
+
+            m_aTable.FillAccessibleStateSetForCell( *pStateSetHelper, getRowPos(), static_cast< sal_uInt16 >( getColumnPos() ) );
+        }
+        else
+            pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+
+        return pStateSetHelper;
+    }
+
+
+    // XAccessible ------------------------------------------------------------
+
+    /** @return  The XAccessibleContext interface of this object. */
+    Reference< XAccessibleContext > SAL_CALL AccessibleGridControlTableCell::getAccessibleContext() throw ( RuntimeException )
+    {
+        ensureIsAlive();
+        return this;
+    }
+
+    // XAccessibleContext -----------------------------------------------------
+
+    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getAccessibleIndexInParent()
+            throw ( ::com::sun::star::uno::RuntimeException )
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        ensureIsAlive();
+
+        return ( getRowPos() * m_aTable.GetColumnCount() ) + getColumnPos();
+    }
+
+    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getCaretPosition(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        return -1;
+    }
+    sal_Bool SAL_CALL AccessibleGridControlTableCell::setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+
+        if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
+            throw IndexOutOfBoundsException();
+
+        return sal_False;
+    }
+    sal_Unicode SAL_CALL AccessibleGridControlTableCell::getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getCharacter( nIndex );
+    }
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleGridControlTableCell::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+
+        ::rtl::OUString sText( implGetText() );
+
+        if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+            throw IndexOutOfBoundsException();
+
+        return ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >();
+    }
+    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getCharacterCount(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getCharacterCount(  );
+    }
+
+    ::rtl::OUString SAL_CALL AccessibleGridControlTableCell::getSelectedText(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getSelectedText(  );
+    }
+    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionStart(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getSelectionStart(  );
+    }
+    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionEnd(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getSelectionEnd(  );
+    }
+    sal_Bool SAL_CALL AccessibleGridControlTableCell::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) )
+            throw IndexOutOfBoundsException();
+
+        return sal_False;
+    }
+    ::rtl::OUString SAL_CALL AccessibleGridControlTableCell::getText(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getText(  );
+    }
+    ::rtl::OUString SAL_CALL AccessibleGridControlTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
+    }
+    ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType);
+    }
+    ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType);
+    }
+    ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getTextBehindIndex( nIndex ,aTextType);
+    }
+    sal_Bool SAL_CALL AccessibleGridControlTableCell::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        TCSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        ::rtl::OUString sText = implGetText();
+        checkIndex_Impl( nStartIndex, sText );
+        checkIndex_Impl( nEndIndex, sText );
+
+        //!!! don't know how to put a string into the clipboard
+        return sal_False;
+    }
+
+    Rectangle AccessibleGridControlTableCell::implGetBoundingBox()
+    {
+        return Rectangle(Point(0,0),Point(0,0));//To Do - return headercell rectangle
+    }
+    // -----------------------------------------------------------------------------
+    Rectangle AccessibleGridControlTableCell::implGetBoundingBoxOnScreen()
+    {
+        return Rectangle(Point(0,0),Point(0,0));//To Do - return headercell rectangle
+    }
+}
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
new file mode 100755
index 000000000000..6976b221a8b5
--- /dev/null
+++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include "precompiled_accessibility.hxx"
+
+#include "accessibility/extended/AccessibleToolPanelDeck.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+/** === end UNO includes === **/
+
+#include <svtools/toolpanel/toolpaneldeck.hxx>
+#include <toolkit/awt/vclxwindow.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/svapp.hxx>
+#include <vos/mutex.hxx>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <tools/diagnose_ex.h>
+
+#include <boost/noncopyable.hpp>
+#include <vector>
+
+//......................................................................................................................
+namespace accessibility
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::accessibility::XAccessible;
+    using ::com::sun::star::accessibility::XAccessibleContext;
+    using ::com::sun::star::lang::DisposedException;
+    using ::com::sun::star::lang::IndexOutOfBoundsException;
+    using ::com::sun::star::lang::Locale;
+    using ::com::sun::star::accessibility::XAccessibleRelationSet;
+    using ::com::sun::star::accessibility::XAccessibleStateSet;
+    using ::com::sun::star::accessibility::IllegalAccessibleComponentStateException;
+    using ::com::sun::star::awt::XFont;
+    /** === end UNO using === **/
+    namespace AccessibleRole = ::com::sun::star::accessibility::AccessibleRole;
+    namespace AccessibleEventId = ::com::sun::star::accessibility::AccessibleEventId;
+    namespace AccessibleStateType = ::com::sun::star::accessibility::AccessibleStateType;
+
+    typedef ::com::sun::star::awt::Rectangle    UnoRectangle;
+    typedef ::com::sun::star::awt::Point        UnoPoint;
+
+    //==================================================================================================================
+    //= AccessibleToolPanelDeck_Impl - declaration
+    //==================================================================================================================
+    class AccessibleToolPanelDeck_Impl  :public ::boost::noncopyable
+                                        ,public ::svt::IToolPanelDeckListener
+    {
+    public:
+        AccessibleToolPanelDeck_Impl(
+            AccessibleToolPanelDeck& i_rAntiImpl,
+            const Reference< XAccessible >& i_rAccessibleParent,
+            ::svt::ToolPanelDeck& i_rPanelDeck
+        );
+
+        void    checkDisposed();
+        bool    isDisposed() const { return m_pPanelDeck == NULL; }
+        void    dispose();
+
+        ~AccessibleToolPanelDeck_Impl();
+
+        Reference< XAccessible >    getOwnAccessible() const;
+        Reference< XAccessible >    getActivePanelAccessible();
+
+    protected:
+        // IToolPanelDeckListener
+        virtual void PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition );
+        virtual void PanelRemoved( const size_t i_nPosition );
+        virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive );
+        virtual void LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter );
+        virtual void Dying();
+
+    public:
+        AccessibleToolPanelDeck&    m_rAntiImpl;
+        Reference< XAccessible >    m_xAccessibleParent;
+        ::svt::ToolPanelDeck*       m_pPanelDeck;
+
+        typedef ::std::vector< Reference< XAccessible > > AccessibleChildren;
+        Reference< XAccessible >        m_xActivePanelAccessible;
+    };
+
+    //==================================================================================================================
+    //= MethodGuard
+    //==================================================================================================================
+    namespace
+    {
+        class MethodGuard
+        {
+        public:
+            MethodGuard( AccessibleToolPanelDeck_Impl& i_rImpl )
+                :m_aGuard( Application::GetSolarMutex() )
+            {
+                i_rImpl.checkDisposed();
+            }
+            ~MethodGuard()
+            {
+            }
+
+            void clear()
+            {
+                m_aGuard.clear();
+            }
+
+        private:
+            ::vos::OClearableGuard  m_aGuard;
+        };
+    }
+
+    //==================================================================================================================
+    //= AccessibleToolPanelDeck_Impl - implementation
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    AccessibleToolPanelDeck_Impl::AccessibleToolPanelDeck_Impl( AccessibleToolPanelDeck& i_rAntiImpl, const Reference< XAccessible >& i_rAccessibleParent,
+            ::svt::ToolPanelDeck& i_rPanelDeck )
+        :m_rAntiImpl( i_rAntiImpl )
+        ,m_xAccessibleParent( i_rAccessibleParent )
+        ,m_pPanelDeck( &i_rPanelDeck )
+        ,m_xActivePanelAccessible()
+    {
+        m_pPanelDeck->AddListener( *this );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    AccessibleToolPanelDeck_Impl::~AccessibleToolPanelDeck_Impl()
+    {
+        if ( !isDisposed() )
+            dispose();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelDeck_Impl::dispose()
+    {
+        ENSURE_OR_RETURN_VOID( !isDisposed(), "disposed twice" );
+        m_pPanelDeck->RemoveListener( *this );
+        m_pPanelDeck = NULL;
+        m_xAccessibleParent.clear();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelDeck_Impl::checkDisposed()
+    {
+        if ( isDisposed() )
+            throw DisposedException( ::rtl::OUString(), *&m_rAntiImpl );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XAccessible > AccessibleToolPanelDeck_Impl::getOwnAccessible() const
+    {
+        Reference< XAccessible > xOwnAccessible( static_cast< XAccessible* >( m_rAntiImpl.GetVCLXWindow() ) );
+        OSL_ENSURE( xOwnAccessible->getAccessibleContext() == Reference< XAccessibleContext >( &m_rAntiImpl ),
+            "AccessibleToolPanelDeck_Impl::getOwnAccessible: could not retrieve proper XAccessible for /myself!" );
+        return xOwnAccessible;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XAccessible > AccessibleToolPanelDeck_Impl::getActivePanelAccessible()
+    {
+        ENSURE_OR_RETURN( !isDisposed(), "AccessibleToolPanelDeck_Impl::getActivePanelAccessible: already disposed!", NULL );
+
+        if ( !m_xActivePanelAccessible.is() )
+        {
+            ::boost::optional< size_t > aActivePanel( m_pPanelDeck->GetActivePanel() );
+            ENSURE_OR_RETURN( !!aActivePanel, "AccessibleToolPanelDeck_Impl::getActivePanelAccessible: this should not be called without an active panel!", NULL );
+            ::svt::PToolPanel pActivePanel( m_pPanelDeck->GetPanel( *aActivePanel ) );
+            ENSURE_OR_RETURN( pActivePanel.get() != NULL, "AccessibleToolPanelDeck_Impl::getActivePanelAccessible: no active panel!", NULL );
+            m_xActivePanelAccessible = pActivePanel->CreatePanelAccessible( getOwnAccessible() );
+            OSL_ENSURE( m_xActivePanelAccessible.is(), "AccessibleToolPanelDeck_Impl::getActivePanelAccessible: illegal accessible returned by the panel!" );
+        }
+
+        return m_xActivePanelAccessible;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelDeck_Impl::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition )
+    {
+        (void)i_pPanel;
+        (void)i_nPosition;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelDeck_Impl::PanelRemoved( const size_t i_nPosition )
+    {
+        (void)i_nPosition;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelDeck_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive )
+    {
+        if ( !!i_rOldActive )
+        {
+            if ( !m_xActivePanelAccessible.is() )
+            {
+                // again, this might in theory happen if the XAccessible for the active panel has never before been requested.
+                // In this case, just say that all our children are invalid, so they all must be re-requested.
+                m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::INVALIDATE_ALL_CHILDREN, Any(), Any() );
+            }
+            else
+            {
+                m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::CHILD, makeAny( m_xActivePanelAccessible ), Any() );
+            }
+        }
+
+        m_xActivePanelAccessible.clear();
+
+        if ( !!i_rNewActive )
+        {
+            m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), makeAny( getActivePanelAccessible() ) );
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelDeck_Impl::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter )
+    {
+        MethodGuard aGuard( *this );
+
+        (void)i_rNewLayouter;
+        m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::INVALIDATE_ALL_CHILDREN, Any(), Any() );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelDeck_Impl::Dying()
+    {
+        // the tool panel deck is dying, so dispose ourself
+        m_rAntiImpl.dispose();
+    }
+
+    //==================================================================================================================
+    //= AccessibleToolPanelDeck
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    AccessibleToolPanelDeck::AccessibleToolPanelDeck( const Reference< XAccessible >& i_rAccessibleParent,
+            ::svt::ToolPanelDeck& i_rPanelDeck )
+        :AccessibleToolPanelDeck_Base( i_rPanelDeck.GetWindowPeer() )
+        ,m_pImpl( new AccessibleToolPanelDeck_Impl( *this, i_rAccessibleParent, i_rPanelDeck ) )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    AccessibleToolPanelDeck::~AccessibleToolPanelDeck()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Int32 SAL_CALL AccessibleToolPanelDeck::getAccessibleChildCount(  ) throw (RuntimeException)
+    {
+        MethodGuard aGuard( *m_pImpl );
+
+        sal_Int32 nChildCount( m_pImpl->m_pPanelDeck->GetLayouter()->GetAccessibleChildCount() );
+
+        ::boost::optional< size_t > aActivePanel( m_pImpl->m_pPanelDeck->GetActivePanel() );
+        if ( !!aActivePanel )
+            return ++nChildCount;
+
+        return nChildCount;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleChild( sal_Int32 i_nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        MethodGuard aGuard( *m_pImpl );
+
+        const sal_Int32 nChildCount( getAccessibleChildCount() );
+        if ( ( i_nIndex < 0 ) || ( i_nIndex >= nChildCount ) )
+            throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
+
+        // first "n" children are provided by the layouter
+        const size_t nLayouterCount( m_pImpl->m_pPanelDeck->GetLayouter()->GetAccessibleChildCount() );
+        if ( size_t( i_nIndex ) < nLayouterCount )
+            return m_pImpl->m_pPanelDeck->GetLayouter()->GetAccessibleChild(
+                size_t( i_nIndex ),
+                m_pImpl->getOwnAccessible()
+            );
+
+        // the last child is the XAccessible of the active panel
+        return m_pImpl->getActivePanelAccessible();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleParent(  ) throw (RuntimeException)
+    {
+        MethodGuard aGuard( *m_pImpl );
+        const Reference< XAccessible > xParent = implGetForeignControlledParent();
+        if ( xParent.is() )
+            return xParent;
+        return m_pImpl->m_xAccessibleParent;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Int16 SAL_CALL AccessibleToolPanelDeck::getAccessibleRole(  ) throw (RuntimeException)
+    {
+        MethodGuard aGuard( *m_pImpl );
+        return AccessibleRole::PANEL;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleAtPoint( const UnoPoint& i_rPoint ) throw (RuntimeException)
+    {
+        MethodGuard aGuard( *m_pImpl );
+
+        const ::Point aRequestedPoint( VCLUnoHelper::ConvertToVCLPoint( i_rPoint ) );
+        // check the panel window itself
+        const ::Window& rActivePanelAnchor( m_pImpl->m_pPanelDeck->GetPanelWindowAnchor() );
+        const Rectangle aPanelAnchorArea( rActivePanelAnchor.GetPosPixel(), rActivePanelAnchor.GetOutputSizePixel() );
+        if ( aPanelAnchorArea.IsInside( aRequestedPoint ) )
+            // note that this assumes that the Window which actually implements the concrete panel covers
+            // the complete area of its "anchor" Window. But this is ensured by the ToolPanelDeck implementation.
+            return m_pImpl->getActivePanelAccessible();
+
+        // check the XAccessible instances provided by the layouter
+        try
+        {
+            const ::svt::PDeckLayouter pLayouter( m_pImpl->m_pPanelDeck->GetLayouter() );
+            ENSURE_OR_THROW( pLayouter.get() != NULL, "invalid layouter" );
+
+            const size_t nLayouterChildren = pLayouter->GetAccessibleChildCount();
+            for ( size_t i=0; i<nLayouterChildren; ++i )
+            {
+                const Reference< XAccessible > xLayoutItemAccessible( pLayouter->GetAccessibleChild( i, m_pImpl->getOwnAccessible() ), UNO_SET_THROW );
+                const Reference< XAccessibleComponent > xLayoutItemComponent( xLayoutItemAccessible->getAccessibleContext(), UNO_QUERY_THROW );
+                const ::Rectangle aLayoutItemBounds( VCLUnoHelper::ConvertToVCLRect( xLayoutItemComponent->getBounds() ) );
+                if ( aLayoutItemBounds.IsInside( aRequestedPoint ) )
+                    return xLayoutItemAccessible;
+            }
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+
+        return NULL;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL AccessibleToolPanelDeck::grabFocus(  ) throw (RuntimeException)
+    {
+        MethodGuard aGuard( *m_pImpl );
+        m_pImpl->m_pPanelDeck->GrabFocus();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL AccessibleToolPanelDeck::disposing()
+    {
+        AccessibleToolPanelDeck_Base::disposing();
+        m_pImpl->dispose();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XAccessible > AccessibleToolPanelDeck::GetChildAccessible( const VclWindowEvent& i_rVclWindowEvent )
+    {
+        // don't let the base class generate any A11Y events from VclWindowEvent, we completely manage those
+        // A11Y events ourself
+        (void)i_rVclWindowEvent;
+        return NULL;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelDeck::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet )
+    {
+        AccessibleToolPanelDeck_Base::FillAccessibleStateSet( i_rStateSet );
+        if ( m_pImpl->isDisposed() )
+        {
+            i_rStateSet.AddState( AccessibleStateType::DEFUNC );
+        }
+        else
+        {
+            i_rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+        }
+    }
+
+//......................................................................................................................
+} // namespace accessibility
+//......................................................................................................................
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
new file mode 100644
index 000000000000..7e97e3714172
--- /dev/null
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -0,0 +1,459 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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_accessibility.hxx"
+
+#include "accessibility/extended/AccessibleToolPanelDeckTabBar.hxx"
+#include "accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx"
+#include "accessibility/helper/accresmgr.hxx"
+#include "accessibility/helper/accessiblestrings.hrc"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+/** === end UNO includes === **/
+
+#include <svtools/toolpanel/toolpaneldeck.hxx>
+#include <svtools/toolpanel/paneltabbar.hxx>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <toolkit/awt/vclxwindow.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/button.hxx>
+#include <vos/mutex.hxx>
+#include <tools/diagnose_ex.h>
+
+#include <vector>
+
+//......................................................................................................................
+namespace accessibility
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::accessibility::XAccessible;
+    using ::com::sun::star::lang::DisposedException;
+    using ::com::sun::star::lang::IndexOutOfBoundsException;
+    using ::com::sun::star::accessibility::XAccessibleContext;
+    /** === end UNO using === **/
+
+    namespace AccessibleRole = ::com::sun::star::accessibility::AccessibleRole;
+    namespace AccessibleEventId = ::com::sun::star::accessibility::AccessibleEventId;
+    namespace AccessibleStateType = ::com::sun::star::accessibility::AccessibleStateType;
+
+    typedef ::com::sun::star::awt::Point        UnoPoint;
+    typedef ::com::sun::star::awt::Size         UnoSize;
+    typedef ::com::sun::star::awt::Rectangle    UnoRectangle;
+
+    //==================================================================================================================
+    //= AccessibleWrapper
+    //==================================================================================================================
+    typedef ::cppu::WeakImplHelper1< XAccessible > AccessibleWrapper_Base;
+    class AccessibleWrapper : public AccessibleWrapper_Base
+    {
+    public:
+        AccessibleWrapper( const Reference< XAccessibleContext >& i_rContext )
+            :m_xContext( i_rContext )
+        {
+        }
+
+        // XAccessible
+        virtual Reference< XAccessibleContext > SAL_CALL getAccessibleContext(  ) throw (RuntimeException)
+        {
+            return m_xContext;
+        }
+
+    private:
+        const Reference< XAccessibleContext >   m_xContext;
+    };
+
+    //==================================================================================================================
+    //= AccessibleToolPanelTabBar_Impl
+    //==================================================================================================================
+    class AccessibleToolPanelTabBar_Impl    :public ::boost::noncopyable
+                                            ,public ::svt::IToolPanelDeckListener
+    {
+    public:
+        AccessibleToolPanelTabBar_Impl(
+            AccessibleToolPanelTabBar& i_rAntiImpl,
+            const Reference< XAccessible >& i_rAccessibleParent,
+            ::svt::IToolPanelDeck& i_rPanelDeck,
+            ::svt::PanelTabBar& i_rTabBar
+        );
+        ~AccessibleToolPanelTabBar_Impl();
+
+        void    checkDisposed();
+        bool    isDisposed() const { return m_pPanelDeck == NULL; }
+        void    dispose();
+
+        ::svt::IToolPanelDeck*          getPanelDeck() const { return m_pPanelDeck; }
+        ::svt::PanelTabBar*             getTabBar() const { return m_pTabBar; }
+        const Reference< XAccessible >& getAccessibleParent() const { return m_xAccessibleParent; }
+        Reference< XAccessible >        getAccessiblePanelItem( size_t i_nPosition );
+        Reference< XAccessible >        getOwnAccessible() const;
+
+    protected:
+        // IToolPanelDeckListener
+        virtual void PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition );
+        virtual void PanelRemoved( const size_t i_nPosition );
+        virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive );
+        virtual void LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter );
+        virtual void Dying();
+
+        DECL_LINK( OnWindowEvent, const VclSimpleEvent* );
+
+    private:
+        AccessibleToolPanelTabBar&                  m_rAntiImpl;
+        Reference< XAccessible >                    m_xAccessibleParent;
+        ::svt::IToolPanelDeck*                      m_pPanelDeck;
+        ::svt::PanelTabBar*                         m_pTabBar;
+        ::std::vector< Reference< XAccessible > >   m_aChildren;
+    };
+
+    //------------------------------------------------------------------------------------------------------------------
+    AccessibleToolPanelTabBar_Impl::AccessibleToolPanelTabBar_Impl( AccessibleToolPanelTabBar& i_rAntiImpl,
+            const Reference< XAccessible >& i_rAccessibleParent, ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar )
+        :m_rAntiImpl( i_rAntiImpl )
+        ,m_xAccessibleParent( i_rAccessibleParent )
+        ,m_pPanelDeck( &i_rPanelDeck )
+        ,m_pTabBar( &i_rTabBar )
+        ,m_aChildren()
+    {
+        m_pPanelDeck->AddListener( *this );
+        m_aChildren.resize( m_pPanelDeck->GetPanelCount() );
+
+        const String sAccessibleDescription( TK_RES_STRING( RID_STR_ACC_DESC_PANELDECL_TABBAR ) );
+        i_rTabBar.SetAccessibleName( sAccessibleDescription );
+        i_rTabBar.SetAccessibleDescription( sAccessibleDescription );
+
+        i_rTabBar.GetScrollButton( true ).AddEventListener( LINK( this, AccessibleToolPanelTabBar_Impl, OnWindowEvent ) );
+        i_rTabBar.GetScrollButton( false ).AddEventListener( LINK( this, AccessibleToolPanelTabBar_Impl, OnWindowEvent ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelTabBar_Impl::checkDisposed()
+    {
+        if ( isDisposed() )
+            throw DisposedException( ::rtl::OUString(), *&m_rAntiImpl );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    AccessibleToolPanelTabBar_Impl::~AccessibleToolPanelTabBar_Impl()
+    {
+        if ( !isDisposed() )
+            dispose();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelTabBar_Impl::dispose()
+    {
+        ENSURE_OR_RETURN_VOID( !isDisposed(), "disposed twice" );
+        m_pPanelDeck->RemoveListener( *this );
+        m_pPanelDeck = NULL;
+
+        m_pTabBar->GetScrollButton( true ).RemoveEventListener( LINK( this, AccessibleToolPanelTabBar_Impl, OnWindowEvent ) );
+        m_pTabBar->GetScrollButton( false ).RemoveEventListener( LINK( this, AccessibleToolPanelTabBar_Impl, OnWindowEvent ) );
+        m_pTabBar = NULL;
+
+        m_xAccessibleParent.clear();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XAccessible > AccessibleToolPanelTabBar_Impl::getAccessiblePanelItem( size_t i_nPosition )
+    {
+        ENSURE_OR_RETURN( !isDisposed(), "AccessibleToolPanelTabBar_Impl::getAccessiblePanelItem: already disposed!", NULL );
+        ENSURE_OR_RETURN( i_nPosition < m_aChildren.size(), "AccessibleToolPanelTabBar_Impl::getAccessiblePanelItem: invalid index!", NULL );
+
+        Reference< XAccessible >& rAccessibleChild( m_aChildren[ i_nPosition ] );
+        if ( !rAccessibleChild.is() )
+        {
+            ::rtl::Reference< AccessibleToolPanelDeckTabBarItem > pAccesibleItemContext( new AccessibleToolPanelDeckTabBarItem(
+                getOwnAccessible(), *m_pPanelDeck, *m_pTabBar, i_nPosition ) );
+            rAccessibleChild.set( new AccessibleWrapper( pAccesibleItemContext.get() ) );
+            pAccesibleItemContext->lateInit( rAccessibleChild );
+        }
+        return rAccessibleChild;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XAccessible > AccessibleToolPanelTabBar_Impl::getOwnAccessible() const
+    {
+        Reference< XAccessible > xOwnAccessible( static_cast< XAccessible* >( m_rAntiImpl.GetVCLXWindow() ) );
+        OSL_ENSURE( xOwnAccessible->getAccessibleContext() == Reference< XAccessibleContext >( &m_rAntiImpl ),
+            "AccessibleToolPanelTabBar_Impl::getOwnAccessible: could not retrieve proper XAccessible for /myself!" );
+        return xOwnAccessible;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelTabBar_Impl::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition )
+    {
+        ENSURE_OR_RETURN_VOID( i_nPosition <= m_aChildren.size(), "AccessibleToolPanelTabBar_Impl::PanelInserted: illegal position (or invalid cache!)" );
+        (void)i_pPanel;
+        m_aChildren.insert( m_aChildren.begin() + i_nPosition, NULL );
+        m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), makeAny( getAccessiblePanelItem( i_nPosition ) ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelTabBar_Impl::PanelRemoved( const size_t i_nPosition )
+    {
+        ENSURE_OR_RETURN_VOID( i_nPosition < m_aChildren.size(), "AccessibleToolPanelTabBar_Impl::PanelInserted: illegal position (or invalid cache!)" );
+
+        const Reference< XAccessible > xOldChild( getAccessiblePanelItem( i_nPosition ) );
+        m_aChildren.erase( m_aChildren.begin() + i_nPosition );
+        m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::CHILD, makeAny( xOldChild ), Any() );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelTabBar_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive )
+    {
+        (void)i_rOldActive;
+        (void)i_rNewActive;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelTabBar_Impl::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter )
+    {
+        (void)i_rNewLayouter;
+        m_rAntiImpl.dispose();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelTabBar_Impl::Dying()
+    {
+        m_rAntiImpl.dispose();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    IMPL_LINK( AccessibleToolPanelTabBar_Impl, OnWindowEvent, const VclSimpleEvent*, i_pEvent )
+    {
+        ENSURE_OR_RETURN( !isDisposed(), "AccessibleToolPanelTabBar_Impl::OnWindowEvent: already disposed!", 0L );
+
+        const VclWindowEvent* pWindowEvent( dynamic_cast< const VclWindowEvent* >( i_pEvent ) );
+        if ( !pWindowEvent )
+            return 0L;
+
+        const bool bForwardButton = ( pWindowEvent->GetWindow() == &m_pTabBar->GetScrollButton( true ) );
+        const bool bBackwardButton = ( pWindowEvent->GetWindow() == &m_pTabBar->GetScrollButton( false ) );
+        ENSURE_OR_RETURN( bForwardButton || bBackwardButton, "AccessibleToolPanelTabBar_Impl::OnWindowEvent: where does this come from?", 0L );
+
+        const bool bShow = ( i_pEvent->GetId() == VCLEVENT_WINDOW_SHOW );
+        const bool bHide = ( i_pEvent->GetId() == VCLEVENT_WINDOW_HIDE );
+        if ( !bShow && !bHide )
+            // not interested in events other than visibility changes
+            return 0L;
+
+        const Reference< XAccessible > xButtonAccessible( m_pTabBar->GetScrollButton( bForwardButton ).GetAccessible() );
+        const Any aOldChild( bHide ? xButtonAccessible : Reference< XAccessible >() );
+        const Any aNewChild( bShow ? xButtonAccessible : Reference< XAccessible >() );
+        m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldChild, aNewChild );
+
+        return 1L;
+    }
+
+    //==================================================================================================================
+    //= MethodGuard
+    //==================================================================================================================
+    namespace
+    {
+        class MethodGuard
+        {
+        public:
+            MethodGuard( AccessibleToolPanelTabBar_Impl& i_rImpl )
+                :m_aGuard( Application::GetSolarMutex() )
+            {
+                i_rImpl.checkDisposed();
+            }
+            ~MethodGuard()
+            {
+            }
+
+            void clear()
+            {
+                m_aGuard.clear();
+            }
+
+        private:
+            ::vos::OClearableGuard  m_aGuard;
+        };
+    }
+
+    //==================================================================================================================
+    //= AccessibleToolPanelTabBar
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    AccessibleToolPanelTabBar::AccessibleToolPanelTabBar( const Reference< XAccessible >& i_rAccessibleParent,
+            ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar )
+        :AccessibleToolPanelTabBar_Base( i_rTabBar.GetWindowPeer() )
+        ,m_pImpl( new AccessibleToolPanelTabBar_Impl( *this, i_rAccessibleParent, i_rPanelDeck, i_rTabBar ) )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    AccessibleToolPanelTabBar::~AccessibleToolPanelTabBar()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Int32 SAL_CALL AccessibleToolPanelTabBar::getAccessibleChildCount(  ) throw (RuntimeException)
+    {
+        MethodGuard aGuard( *m_pImpl );
+
+        const bool bHasScrollBack = m_pImpl->getTabBar()->GetScrollButton( false ).IsVisible();
+        const bool bHasScrollForward = m_pImpl->getTabBar()->GetScrollButton( true ).IsVisible();
+
+        return  m_pImpl->getPanelDeck()->GetPanelCount()
+            +   ( bHasScrollBack ? 1 : 0 )
+            +   ( bHasScrollForward ? 1 : 0 );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleChild( sal_Int32 i_nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        MethodGuard aGuard( *m_pImpl );
+
+        const bool bHasScrollBack = m_pImpl->getTabBar()->GetScrollButton( false ).IsVisible();
+        const bool bHasScrollForward = m_pImpl->getTabBar()->GetScrollButton( true ).IsVisible();
+
+        const bool bScrollBackRequested = ( bHasScrollBack && ( i_nIndex == 0 ) );
+        const bool bScrollForwardRequested = ( bHasScrollForward && ( i_nIndex == getAccessibleChildCount() - 1 ) );
+        OSL_ENSURE( !( bScrollBackRequested && bScrollForwardRequested ), "AccessibleToolPanelTabBar::getAccessibleChild: ouch!" );
+
+        if ( bScrollBackRequested || bScrollForwardRequested )
+        {
+            Reference< XAccessible > xScrollButtonAccessible( m_pImpl->getTabBar()->GetScrollButton( bScrollForwardRequested ).GetAccessible() );
+            ENSURE_OR_RETURN( xScrollButtonAccessible.is(), "AccessibleToolPanelTabBar::getAccessibleChild: invalid button accessible!", NULL );
+        #if OSL_DEBUG_LEVEL > 0
+            Reference< XAccessibleContext > xScrollButtonContext( xScrollButtonAccessible->getAccessibleContext() );
+            ENSURE_OR_RETURN( xScrollButtonContext.is(), "AccessibleToolPanelTabBar::getAccessibleChild: invalid button accessible context!", xScrollButtonAccessible );
+            OSL_ENSURE( xScrollButtonContext->getAccessibleParent() == m_pImpl->getOwnAccessible(),
+                "AccessibleToolPanelTabBar::getAccessibleChild: wrong parent at the button's accesible!" );
+        #endif
+            return xScrollButtonAccessible;
+        }
+
+        return m_pImpl->getAccessiblePanelItem( i_nIndex - ( bHasScrollBack ? 1 : 0 ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleParent(  ) throw (RuntimeException)
+    {
+        MethodGuard aGuard( *m_pImpl );
+        return m_pImpl->getAccessibleParent();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Int16 SAL_CALL AccessibleToolPanelTabBar::getAccessibleRole(  ) throw (RuntimeException)
+    {
+        MethodGuard aGuard( *m_pImpl );
+        return AccessibleRole::PAGE_TAB_LIST;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    namespace
+    {
+        bool lcl_covers( const ::Window& i_rWindow, const ::Point& i_rPoint )
+        {
+            const Rectangle aWindowBounds( i_rWindow.GetWindowExtentsRelative( i_rWindow.GetParent() ) );
+            return aWindowBounds.IsInside( i_rPoint );
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleAtPoint( const UnoPoint& i_rPoint ) throw (RuntimeException)
+    {
+        MethodGuard aGuard( *m_pImpl );
+
+        // check the tab items
+        const UnoPoint aOwnScreenPos( getLocationOnScreen() );
+        const ::Point aRequestedScreenPoint( i_rPoint.X + aOwnScreenPos.X, i_rPoint.Y + aOwnScreenPos.Y );
+
+        for ( size_t i=0; i<m_pImpl->getPanelDeck()->GetPanelCount(); ++i )
+        {
+            const ::Rectangle aItemScreenRect( m_pImpl->getTabBar()->GetItemScreenRect(i) );
+            if ( aItemScreenRect.IsInside( aRequestedScreenPoint ) )
+                return m_pImpl->getAccessiblePanelItem(i);
+        }
+
+        // check the scroll buttons
+        const ::Point aRequestedClientPoint( VCLUnoHelper::ConvertToVCLPoint( i_rPoint ) );
+
+        const bool bHasScrollBack = m_pImpl->getTabBar()->GetScrollButton( false ).IsVisible();
+        if ( bHasScrollBack && lcl_covers( m_pImpl->getTabBar()->GetScrollButton( false ), aRequestedClientPoint ) )
+            return m_pImpl->getTabBar()->GetScrollButton( false ).GetAccessible();
+
+        const bool bHasScrollForward = m_pImpl->getTabBar()->GetScrollButton( true ).IsVisible();
+        if ( bHasScrollForward && lcl_covers( m_pImpl->getTabBar()->GetScrollButton( true ), aRequestedClientPoint ) )
+            return m_pImpl->getTabBar()->GetScrollButton( true ).GetAccessible();
+
+        // no hit
+        return NULL;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL AccessibleToolPanelTabBar::disposing()
+    {
+        AccessibleToolPanelTabBar_Base::disposing();
+        m_pImpl->dispose();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XAccessible > AccessibleToolPanelTabBar::GetChildAccessible( const VclWindowEvent& i_rVclWindowEvent )
+    {
+        // don't let the base class generate any A11Y events from VclWindowEvent, we completely manage those
+        // A11Y events ourself
+        (void)i_rVclWindowEvent;
+        return NULL;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelTabBar::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet )
+    {
+        AccessibleToolPanelTabBar_Base::FillAccessibleStateSet( i_rStateSet );
+        i_rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+
+        ENSURE_OR_RETURN_VOID( !m_pImpl->isDisposed(), "AccessibleToolPanelTabBar::FillAccessibleStateSet: already disposed!" );
+        if ( m_pImpl->getTabBar()->IsVertical() )
+            i_rStateSet.AddState( AccessibleStateType::VERTICAL );
+        else
+            i_rStateSet.AddState( AccessibleStateType::HORIZONTAL );
+    }
+
+//......................................................................................................................
+} // namespace accessibility
+//......................................................................................................................
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
new file mode 100644
index 000000000000..0cdfd8480457
--- /dev/null
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
@@ -0,0 +1,455 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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_accessibility.hxx"
+
+#include "accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/lang/DisposedException.hpp>
+/** === end UNO includes === **/
+
+#include <svtools/toolpanel/toolpaneldeck.hxx>
+#include <svtools/toolpanel/paneltabbar.hxx>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <unotools/accessiblerelationsethelper.hxx>
+#include <tools/diagnose_ex.h>
+#include <vcl/svapp.hxx>
+#include <vos/mutex.hxx>
+
+//......................................................................................................................
+namespace accessibility
+{
+//......................................................................................................................
+
+    typedef ::com::sun::star::awt::Rectangle    UnoRectangle;
+    typedef ::com::sun::star::awt::Point        UnoPoint;
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::accessibility::XAccessible;
+    using ::com::sun::star::lang::DisposedException;
+    using ::com::sun::star::lang::IndexOutOfBoundsException;
+    using ::com::sun::star::accessibility::XAccessibleRelationSet;
+    using ::com::sun::star::accessibility::XAccessibleStateSet;
+    using ::com::sun::star::accessibility::XAccessibleComponent;
+    using ::com::sun::star::accessibility::XAccessibleExtendedComponent;
+    using ::com::sun::star::awt::XFont;
+    /** === end UNO using === **/
+
+    namespace AccessibleRole = ::com::sun::star::accessibility::AccessibleRole;
+    namespace AccessibleStateType = ::com::sun::star::accessibility::AccessibleStateType;
+    namespace AccessibleEventId = ::com::sun::star::accessibility::AccessibleEventId;
+
+    //==================================================================================================================
+    //= AccessibleToolPanelDeckTabBarItem_Impl
+    //==================================================================================================================
+    class AccessibleToolPanelDeckTabBarItem_Impl : public ::svt::IToolPanelDeckListener
+    {
+    public:
+        AccessibleToolPanelDeckTabBarItem_Impl(
+            AccessibleToolPanelDeckTabBarItem& i_rAntiImpl,
+            const Reference< XAccessible >& i_rAccessibleParent,
+            ::svt::IToolPanelDeck& i_rPanelDeck,
+            ::svt::PanelTabBar& i_rTabBar,
+            const size_t i_nItemPos
+        );
+        ~AccessibleToolPanelDeckTabBarItem_Impl();
+
+        ::svt::PanelTabBar* getTabBar() const { return m_pTabBar; }
+
+        // IToolPanelDeckListener
+        virtual void PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition );
+        virtual void PanelRemoved( const size_t i_nPosition );
+        virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive );
+        virtual void LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter );
+        virtual void Dying();
+
+    public:
+        bool    isDisposed() const { return m_pPanelDeck == NULL; }
+        void    checkDisposed() const;
+        void    dispose();
+
+        const Reference< XAccessible >&
+                getAccessibleParent() const { return m_xAccessibleParent; }
+        size_t  getItemPos() const { return m_nItemPos; }
+
+        Reference< XAccessibleComponent >   getParentAccessibleComponent() const;
+        ::svt::IToolPanelDeck*              getPanelDeck() const { return m_pPanelDeck; }
+        ::rtl::OUString                     getPanelDisplayName();
+
+    private:
+        void impl_notifyBoundRectChanges();
+        void impl_notifyStateChange( const sal_Int16 i_nLostState, const sal_Int16 i_nGainedState );
+
+    private:
+        AccessibleToolPanelDeckTabBarItem&  m_rAntiImpl;
+        Reference< XAccessible >            m_xAccessibleParent;
+        ::svt::IToolPanelDeck*              m_pPanelDeck;
+        ::svt::PanelTabBar*                 m_pTabBar;
+        size_t                              m_nItemPos;
+    };
+
+    //==================================================================================================================
+    //= AccessibleToolPanelDeckTabBarItem_Impl
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    AccessibleToolPanelDeckTabBarItem_Impl::AccessibleToolPanelDeckTabBarItem_Impl( AccessibleToolPanelDeckTabBarItem& i_rAntiImpl,
+            const Reference< XAccessible >& i_rAccessibleParent, ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar,
+            const size_t i_nItemPos )
+        :m_rAntiImpl( i_rAntiImpl )
+        ,m_xAccessibleParent( i_rAccessibleParent )
+        ,m_pPanelDeck( &i_rPanelDeck )
+        ,m_pTabBar( &i_rTabBar )
+        ,m_nItemPos( i_nItemPos )
+    {
+        m_pPanelDeck->AddListener( *this );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    AccessibleToolPanelDeckTabBarItem_Impl::~AccessibleToolPanelDeckTabBarItem_Impl()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelDeckTabBarItem_Impl::checkDisposed() const
+    {
+        if ( isDisposed() )
+            throw DisposedException( ::rtl::OUString(), *&m_rAntiImpl );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelDeckTabBarItem_Impl::dispose()
+    {
+        ENSURE_OR_RETURN_VOID( !isDisposed(), "AccessibleToolPanelDeckTabBarItem_Impl::dispose: disposed twice!" );
+
+        m_xAccessibleParent.clear();
+        m_pPanelDeck->RemoveListener( *this );
+        m_pPanelDeck = NULL;
+        m_pTabBar = NULL;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XAccessibleComponent > AccessibleToolPanelDeckTabBarItem_Impl::getParentAccessibleComponent() const
+    {
+        Reference< XAccessible > xAccessibleParent( m_rAntiImpl.getAccessibleParent(), UNO_QUERY_THROW );
+        return Reference< XAccessibleComponent >( xAccessibleParent->getAccessibleContext(), UNO_QUERY );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString AccessibleToolPanelDeckTabBarItem_Impl::getPanelDisplayName()
+    {
+        const ::svt::PToolPanel pPanel( m_pPanelDeck->GetPanel( getItemPos() ) );
+        if ( pPanel.get() == NULL )
+            throw DisposedException();
+        return pPanel->GetDisplayName();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelDeckTabBarItem_Impl::impl_notifyBoundRectChanges()
+    {
+        m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::BOUNDRECT_CHANGED, Any(), Any() );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelDeckTabBarItem_Impl::impl_notifyStateChange( const sal_Int16 i_nLostState, const sal_Int16 i_nGainedState )
+    {
+        m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED,
+            i_nLostState > -1 ? makeAny( i_nLostState ) : Any(),
+            i_nGainedState > -1 ? makeAny( i_nGainedState ) : Any()
+        );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelDeckTabBarItem_Impl::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition )
+    {
+        (void)i_pPanel;
+        if ( i_nPosition <= m_nItemPos )
+            ++m_nItemPos;
+        impl_notifyBoundRectChanges();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelDeckTabBarItem_Impl::PanelRemoved( const size_t i_nPosition )
+    {
+        if ( i_nPosition == m_nItemPos )
+        {
+            m_rAntiImpl.dispose();
+        }
+        else if ( i_nPosition < m_nItemPos )
+        {
+            --m_nItemPos;
+            impl_notifyBoundRectChanges();
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelDeckTabBarItem_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive )
+    {
+        if ( m_nItemPos == i_rOldActive )
+        {
+            impl_notifyStateChange( AccessibleStateType::ACTIVE, -1 );
+            impl_notifyStateChange( AccessibleStateType::SELECTED, -1 );
+        }
+        else if ( m_nItemPos == i_rNewActive )
+        {
+            impl_notifyStateChange( -1, AccessibleStateType::ACTIVE );
+            impl_notifyStateChange( -1, AccessibleStateType::SELECTED );
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelDeckTabBarItem_Impl::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter )
+    {
+        (void)i_rNewLayouter;
+        // if the tool panel deck has a new layouter, then the old layouter, and thus all items it was
+        // responsible for, died. So do we.
+        dispose();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void AccessibleToolPanelDeckTabBarItem_Impl::Dying()
+    {
+        // if the tool panel deck is dying, then its layouter dies, so should we.
+        dispose();
+    }
+
+    //==================================================================================================================
+    //= ItemMethodGuard
+    //==================================================================================================================
+    class ItemMethodGuard
+    {
+    public:
+        ItemMethodGuard( AccessibleToolPanelDeckTabBarItem_Impl& i_rImpl )
+            :m_aGuard( Application::GetSolarMutex() )
+        {
+            i_rImpl.checkDisposed();
+        }
+        ~ItemMethodGuard()
+        {
+        }
+
+        void clear()
+        {
+            m_aGuard.clear();
+        }
+
+    private:
+        ::vos::OClearableGuard  m_aGuard;
+    };
+
+    //==================================================================================================================
+    //= AccessibleToolPanelDeckTabBarItem
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    AccessibleToolPanelDeckTabBarItem::AccessibleToolPanelDeckTabBarItem( const Reference< XAccessible >& i_rAccessibleParent,
+            ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar, const size_t i_nItemPos )
+        :m_pImpl( new AccessibleToolPanelDeckTabBarItem_Impl( *this, i_rAccessibleParent, i_rPanelDeck, i_rTabBar, i_nItemPos ) )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    AccessibleToolPanelDeckTabBarItem::~AccessibleToolPanelDeckTabBarItem()
+    {
+    }
+
+    //--------------------------------------------------------------------
+    sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleChildCount(  ) throw (RuntimeException)
+    {
+        return 0;
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        (void)i;
+        throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleParent(  ) throw (RuntimeException)
+    {
+        ItemMethodGuard aGuard( *m_pImpl );
+        return m_pImpl->getAccessibleParent();
+    }
+
+    //--------------------------------------------------------------------
+    sal_Int16 SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleRole(  ) throw (RuntimeException)
+    {
+        return AccessibleRole::PAGE_TAB;
+    }
+
+    //--------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleDescription(  ) throw (RuntimeException)
+    {
+        ItemMethodGuard aGuard( *m_pImpl );
+        return m_pImpl->getPanelDisplayName();
+    }
+
+    //--------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleName(  ) throw (RuntimeException)
+    {
+        ItemMethodGuard aGuard( *m_pImpl );
+        return m_pImpl->getPanelDisplayName();
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessibleRelationSet > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleRelationSet(  ) throw (RuntimeException)
+    {
+        ItemMethodGuard aGuard( *m_pImpl );
+        ::utl::AccessibleRelationSetHelper* pRelationSet = new utl::AccessibleRelationSetHelper;
+        return pRelationSet;
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessibleStateSet > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleStateSet(  ) throw (RuntimeException)
+    {
+        ItemMethodGuard aGuard( *m_pImpl );
+
+        ::utl::AccessibleStateSetHelper* pStateSet( new ::utl::AccessibleStateSetHelper );
+        pStateSet->AddState( AccessibleStateType::FOCUSABLE );
+        pStateSet->AddState( AccessibleStateType::SELECTABLE );
+        pStateSet->AddState( AccessibleStateType::ICONIFIED );
+
+        if ( m_pImpl->getItemPos() == m_pImpl->getPanelDeck()->GetActivePanel() )
+        {
+            pStateSet->AddState( AccessibleStateType::ACTIVE );
+            pStateSet->AddState( AccessibleStateType::SELECTED );
+        }
+
+        if ( m_pImpl->getItemPos() == m_pImpl->getTabBar()->GetFocusedPanelItem() )
+            pStateSet->AddState( AccessibleStateType::FOCUSED );
+
+        if ( m_pImpl->getTabBar()->IsEnabled() )
+            pStateSet->AddState( AccessibleStateType::ENABLED );
+
+        if ( m_pImpl->getTabBar()->IsVisible() )
+        {
+            pStateSet->AddState( AccessibleStateType::SHOWING );
+            pStateSet->AddState( AccessibleStateType::VISIBLE );
+        }
+
+        return pStateSet;
+    }
+
+
+    //--------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleAtPoint( const UnoPoint& i_rLocation ) throw (RuntimeException)
+    {
+        ItemMethodGuard aGuard( *m_pImpl );
+        // we do not have children ...
+        (void)i_rLocation;
+        return NULL;
+    }
+
+    //--------------------------------------------------------------------
+    void SAL_CALL AccessibleToolPanelDeckTabBarItem::grabFocus(  ) throw (RuntimeException)
+    {
+        ItemMethodGuard aGuard( *m_pImpl );
+        m_pImpl->getTabBar()->FocusPanelItem( m_pImpl->getItemPos() );
+    }
+
+    //--------------------------------------------------------------------
+    ::sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getForeground(  ) throw (RuntimeException)
+    {
+        ItemMethodGuard aGuard( *m_pImpl );
+        Reference< XAccessibleComponent > xParentComponent( m_pImpl->getParentAccessibleComponent(), UNO_SET_THROW );
+        return xParentComponent->getForeground();
+    }
+
+    //--------------------------------------------------------------------
+    ::sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getBackground(  ) throw (RuntimeException)
+    {
+        ItemMethodGuard aGuard( *m_pImpl );
+        Reference< XAccessibleComponent > xParentComponent( m_pImpl->getParentAccessibleComponent(), UNO_SET_THROW );
+        return xParentComponent->getBackground();
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XFont > SAL_CALL AccessibleToolPanelDeckTabBarItem::getFont(  ) throw (RuntimeException)
+    {
+        ItemMethodGuard aGuard( *m_pImpl );
+        Reference< XAccessibleExtendedComponent > xParentComponent( m_pImpl->getParentAccessibleComponent(), UNO_QUERY_THROW );
+        // TODO: strictly, this is not correct: The TabBar implementation of the TabLayouter might use
+        // a different font ...
+        return xParentComponent->getFont();
+    }
+
+    //--------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getTitledBorderText(  ) throw (RuntimeException)
+    {
+        ItemMethodGuard aGuard( *m_pImpl );
+        // no support
+        return ::rtl::OUString();
+    }
+
+    //--------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getToolTipText(  ) throw (RuntimeException)
+    {
+        ItemMethodGuard aGuard( *m_pImpl );
+        return m_pImpl->getPanelDisplayName();
+    }
+
+    //--------------------------------------------------------------------
+    UnoRectangle SAL_CALL AccessibleToolPanelDeckTabBarItem::implGetBounds() throw (RuntimeException)
+    {
+        ItemMethodGuard aGuard( *m_pImpl );
+
+        const ::Rectangle aItemScreenRect( m_pImpl->getTabBar()->GetItemScreenRect( m_pImpl->getItemPos() ) );
+
+        Reference< XAccessibleComponent > xParentComponent( m_pImpl->getParentAccessibleComponent(), UNO_SET_THROW );
+        const UnoPoint aParentLocation( xParentComponent->getLocationOnScreen() );
+        return UnoRectangle(
+            aItemScreenRect.Left() - aParentLocation.X,
+            aItemScreenRect.Top() - aParentLocation.Y,
+            aItemScreenRect.GetWidth(),
+            aItemScreenRect.GetHeight()
+        );
+    }
+
+    //--------------------------------------------------------------------
+    void SAL_CALL AccessibleToolPanelDeckTabBarItem::disposing()
+    {
+        ItemMethodGuard aGuard( *m_pImpl );
+        m_pImpl->dispose();
+    }
+
+//......................................................................................................................
+} // namespace accessibility
+//......................................................................................................................
diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx
new file mode 100644
index 000000000000..87e47d83c600
--- /dev/null
+++ b/accessibility/source/extended/accessiblebrowseboxcell.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+#include "accessibility/extended/accessiblebrowseboxcell.hxx"
+#include <svtools/accessibletableprovider.hxx>
+
+// .................................................................................
+namespace accessibility
+{
+// .................................................................................
+
+    using namespace ::com::sun::star::uno;
+    using namespace ::com::sun::star::awt;
+    using namespace ::com::sun::star::accessibility;
+    using namespace ::svt;
+
+    // =============================================================================
+    // = AccessibleBrowseBoxCell
+    // =============================================================================
+    DBG_NAME( svt_AccessibleBrowseBoxCell )
+    // -----------------------------------------------------------------------------
+    AccessibleBrowseBoxCell::AccessibleBrowseBoxCell(
+            const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox,
+            const Reference< XWindow >& _xFocusWindow,
+            sal_Int32 _nRowPos, sal_uInt16 _nColPos, AccessibleBrowseBoxObjType _eType )
+        :AccessibleBrowseBoxBase( _rxParent, _rBrowseBox, _xFocusWindow, _eType )
+        ,m_nRowPos( _nRowPos )
+        ,m_nColPos( _nColPos )
+    {
+        DBG_CTOR( svt_AccessibleBrowseBoxCell, NULL );
+        // set accessible name here, because for that we need the position of the cell
+        // and so the base class isn't capable of doing this
+        sal_Int32 nPos = _nRowPos * _rBrowseBox.GetColumnCount() + _nColPos;
+        ::rtl::OUString aAccName = _rBrowseBox.GetAccessibleObjectName( BBTYPE_TABLECELL, nPos );
+        implSetName( aAccName );
+    }
+
+    // -----------------------------------------------------------------------------
+    AccessibleBrowseBoxCell::~AccessibleBrowseBoxCell()
+    {
+        DBG_DTOR( svt_AccessibleBrowseBoxCell, NULL );
+    }
+
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleBrowseBoxCell::grabFocus() throw ( RuntimeException )
+    {
+        SolarMethodGuard aGuard( *this );
+        mpBrowseBox->GoToCell( m_nRowPos, m_nColPos );
+    }
+    // -----------------------------------------------------------------------------
+    ::Rectangle AccessibleBrowseBoxCell::implGetBoundingBox()
+    {
+        return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, sal_False, sal_False );
+    }
+
+    // -----------------------------------------------------------------------------
+    ::Rectangle AccessibleBrowseBoxCell::implGetBoundingBoxOnScreen()
+    {
+        return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, sal_False );
+    }
+
+// .................................................................................
+}   // namespace accessibility
+// .................................................................................
+
+
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
new file mode 100644
index 000000000000..5f5472d04050
--- /dev/null
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+#include <accessibility/extended/accessibleeditbrowseboxcell.hxx>
+#include <svtools/editbrowsebox.hxx>
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/accessibility/XAccessibleText.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+
+
+// .................................................................................
+namespace accessibility
+{
+// .................................................................................
+
+    using namespace com::sun::star::accessibility;
+    using namespace ::com::sun::star::uno;
+    using namespace ::com::sun::star::lang;
+    using namespace ::com::sun::star::awt;
+    using namespace ::comphelper;
+    using namespace ::svt;
+
+    DBG_NAME( acc_EditBrowseBoxTableCell )
+    // -----------------------------------------------------------------------------
+    EditBrowseBoxTableCell::EditBrowseBoxTableCell(
+                const com::sun::star::uno::Reference< XAccessible >& _rxParent,
+                const com::sun::star::uno::Reference< XAccessible >& _rxOwningAccessible,
+                const com::sun::star::uno::Reference< XAccessibleContext >& _xControlChild,
+                IAccessibleTableProvider& _rBrowseBox,
+                const Reference< XWindow >& _xFocusWindow,
+                sal_Int32 _nRowPos,
+                sal_uInt16 _nColPos)
+        :AccessibleBrowseBoxCell( _rxParent, _rBrowseBox, _xFocusWindow, _nRowPos, _nColPos )
+        ,OAccessibleContextWrapperHelper( ::comphelper::getProcessServiceFactory(), rBHelper, _xControlChild, _rxOwningAccessible, _rxParent )
+    {
+        DBG_CTOR( acc_EditBrowseBoxTableCell, NULL );
+
+        aggregateProxy( m_refCount, *this );
+    }
+
+    // -----------------------------------------------------------------------------
+    EditBrowseBoxTableCell::~EditBrowseBoxTableCell()
+    {
+        if ( !rBHelper.bDisposed )
+        {
+            acquire();  // to prevent duplicate dtor calls
+            dispose();
+        }
+
+        DBG_DTOR( acc_EditBrowseBoxTableCell, NULL );
+    }
+
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL EditBrowseBoxTableCell::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException )
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.TableCellProxy" ) );
+    }
+
+    // -----------------------------------------------------------------------------
+    IMPLEMENT_FORWARD_XINTERFACE2( EditBrowseBoxTableCell, AccessibleBrowseBoxCell, OAccessibleContextWrapperHelper )
+
+    // -----------------------------------------------------------------------------
+    IMPLEMENT_FORWARD_XTYPEPROVIDER2( EditBrowseBoxTableCell, AccessibleBrowseBoxCell, OAccessibleContextWrapperHelper )
+
+    // -----------------------------------------------------------------------------
+    void EditBrowseBoxTableCell::notifyTranslatedEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException)
+    {
+        commitEvent( _rEvent.EventId, _rEvent.NewValue, _rEvent.OldValue );
+    }
+
+    // XAccessibleComponent
+    // -----------------------------------------------------------------------------
+    sal_Int32 SAL_CALL EditBrowseBoxTableCell::getForeground(  ) throw (RuntimeException)
+    {
+        SolarMethodGuard aGuard( *this );
+        Reference< XAccessibleComponent > xAccComp( m_xInnerContext, UNO_QUERY );
+        if ( xAccComp.is() )
+            return xAccComp->getForeground();
+        return 0;
+    }
+
+    // -----------------------------------------------------------------------------
+    sal_Int32 SAL_CALL EditBrowseBoxTableCell::getBackground(  ) throw (RuntimeException)
+    {
+        SolarMethodGuard aGuard( *this );
+        Reference< XAccessibleComponent > xAccComp( m_xInnerContext, UNO_QUERY );
+        if ( xAccComp.is() )
+            return xAccComp->getBackground();
+        return 0;
+    }
+
+    // -----------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleParent(  ) throw (RuntimeException)
+    {
+        return m_xParentAccessible;
+    }
+
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleDescription() throw ( RuntimeException )
+    {
+        SolarMethodGuard aGuard( *this );
+        return m_xInnerContext->getAccessibleDescription();
+    }
+
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleName() throw ( RuntimeException )
+    {
+        SolarMethodGuard aGuard( *this );
+
+        // TODO: localize this!
+        String sName = mpBrowseBox->GetColumnDescription( ::sal::static_int_cast< sal_uInt16 >( getColumnPos() ) );
+        if ( 0 == sName.Len() )
+        {
+            sName = String::CreateFromAscii( "Column " );
+            sName += String::CreateFromInt32( getColumnPos( ) );
+        }
+
+        sName += String::CreateFromAscii( ", Row " );
+        sName += String::CreateFromInt32( getRowPos( ) );
+
+        return ::rtl::OUString( sName );
+    }
+
+    // -----------------------------------------------------------------------------
+    Reference< XAccessibleRelationSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleRelationSet() throw ( RuntimeException )
+    {
+        SolarMethodGuard aGuard( *this );
+        return OAccessibleContextWrapperHelper::getAccessibleRelationSet( );
+    }
+
+    // -----------------------------------------------------------------------------
+    Reference<XAccessibleStateSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleStateSet() throw ( RuntimeException )
+    {
+        SolarMethodGuard aGuard( *this );
+        return m_xInnerContext->getAccessibleStateSet();
+            // TODO: shouldn't we add an ACTIVE here? Isn't the EditBrowseBoxTableCell always ACTIVE?
+    }
+
+    // -----------------------------------------------------------------------------
+    sal_Int32 SAL_CALL EditBrowseBoxTableCell::getAccessibleChildCount(  ) throw (RuntimeException)
+    {
+        SolarMethodGuard aGuard( *this );
+        return OAccessibleContextWrapperHelper::getAccessibleChildCount();
+    }
+
+    // -----------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException)
+    {
+        SolarMethodGuard aGuard( *this );
+        return OAccessibleContextWrapperHelper::getAccessibleChild( i );
+    }
+
+    // -----------------------------------------------------------------------------
+    sal_Int16 SAL_CALL EditBrowseBoxTableCell::getAccessibleRole() throw ( RuntimeException )
+    {
+        SolarMethodGuard aGuard( *this );
+        return m_xInnerContext->getAccessibleRole( );
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL EditBrowseBoxTableCell::dispose() throw( RuntimeException )
+    {
+        // simply disambiguate. Note that the OComponentHelper base in AccessibleBrowseBoxCell
+        // will call our "disposing()", which will call "dispose()" on the OAccessibleContextWrapperHelper
+        // so there is no need to do this here.
+        AccessibleBrowseBoxCell::dispose();
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL EditBrowseBoxTableCell::disposing( const EventObject& _rSource ) throw (RuntimeException)
+    {
+        AccessibleBrowseBoxCell::disposing( _rSource );
+        OAccessibleContextWrapperHelper::disposing( _rSource );
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL EditBrowseBoxTableCell::disposing()
+    {
+        SolarMethodGuard aGuard( *this, false );
+        OAccessibleContextWrapperHelper::dispose();
+            // TODO: do we need to dispose our inner object? The base class does this, but is it a good idea?
+        AccessibleBrowseBoxCell::disposing();
+    }
+    // =============================================================================
+    // = EditBrowseBoxTableCell
+    // =============================================================================
+    DBG_NAME( EditBrowseBoxTableCellAccess )
+    // -----------------------------------------------------------------------------
+    EditBrowseBoxTableCellAccess::EditBrowseBoxTableCellAccess(
+            const Reference< XAccessible >& _rxParent, const Reference< XAccessible > _rxControlAccessible,
+            const Reference< XWindow >& _rxFocusWindow,
+            IAccessibleTableProvider& _rBrowseBox, sal_Int32 _nRowPos, sal_uInt16 _nColPos )
+        :EditBrowseBoxTableCellAccess_Base( m_aMutex )
+        ,m_xParent( _rxParent )
+        ,m_xControlAccessible( _rxControlAccessible )
+        ,m_xFocusWindow( _rxFocusWindow )
+        ,m_pBrowseBox( &_rBrowseBox )
+        ,m_nRowPos( _nRowPos )
+        ,m_nColPos( _nColPos )
+    {
+        DBG_CTOR( EditBrowseBoxTableCellAccess, NULL );
+    }
+    // -----------------------------------------------------------------------------
+    EditBrowseBoxTableCellAccess::~EditBrowseBoxTableCellAccess( )
+    {
+        DBG_DTOR( EditBrowseBoxTableCellAccess, NULL );
+    }
+    //--------------------------------------------------------------------
+    Reference< XAccessibleContext > SAL_CALL EditBrowseBoxTableCellAccess::getAccessibleContext(  ) throw (RuntimeException)
+    {
+        if ( !m_pBrowseBox || !m_xControlAccessible.is() )
+            throw DisposedException();
+            Reference< XAccessibleContext > xMyContext( m_aContext );
+            if ( !xMyContext.is() )
+            {
+            Reference< XAccessibleContext > xInnerContext = m_xControlAccessible->getAccessibleContext();
+            Reference< XAccessible > xMe( this );
+
+                xMyContext = new EditBrowseBoxTableCell( m_xParent, xMe, xInnerContext, *m_pBrowseBox, m_xFocusWindow, m_nRowPos, m_nColPos );
+                m_aContext = xMyContext;
+            }
+        return xMyContext;
+    }
+    //--------------------------------------------------------------------
+    void SAL_CALL EditBrowseBoxTableCellAccess::disposing()
+    {
+        // dispose our context, if it still alive
+        Reference< XComponent > xMyContext( (Reference< XAccessibleContext >)m_aContext, UNO_QUERY );
+        if ( xMyContext.is() )
+        {
+            try
+            {
+                xMyContext->dispose();
+            }
+            catch( const Exception& e )
+            {
+                (void)e;
+                OSL_ENSURE( false, "EditBrowseBoxTableCellAccess::disposing: caught an exception while disposing the context!" );
+            }
+        }
+
+        m_pBrowseBox = NULL;
+        m_xControlAccessible.clear();
+        m_aContext = Reference< XAccessibleContext >( );
+        // NO dispose of the inner object there: it is the XAccessible of an window, and disposing
+        // it would delete the respective VCL window
+    }
+// .................................................................................
+} // namespace accessibility
+// .................................................................................
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
new file mode 100644
index 000000000000..3a98169c620a
--- /dev/null
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -0,0 +1,372 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+#include "accessibility/extended/accessibleiconchoicectrl.hxx"
+#include "accessibility/extended/accessibleiconchoicectrlentry.hxx"
+#include <svtools/ivctrl.hxx>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <tools/debug.hxx>
+#include <vcl/svapp.hxx>
+#include <cppuhelper/typeprovider.hxx>
+
+//........................................................................
+namespace accessibility
+{
+//........................................................................
+
+    // class AccessibleIconChoiceCtrl ----------------------------------------------
+
+    using namespace ::com::sun::star::accessibility;
+    using namespace ::com::sun::star::uno;
+    using namespace ::com::sun::star::lang;
+    using namespace ::com::sun::star;
+
+    DBG_NAME(AccessibleIconChoiceCtrl)
+
+    // -----------------------------------------------------------------------------
+    // Ctor() and Dtor()
+    // -----------------------------------------------------------------------------
+    AccessibleIconChoiceCtrl::AccessibleIconChoiceCtrl( SvtIconChoiceCtrl& _rIconCtrl, const Reference< XAccessible >& _xParent ) :
+
+        VCLXAccessibleComponent( _rIconCtrl.GetWindowPeer() ),
+        m_xParent       ( _xParent )
+    {
+        DBG_CTOR( AccessibleIconChoiceCtrl, NULL );
+    }
+    // -----------------------------------------------------------------------------
+    AccessibleIconChoiceCtrl::~AccessibleIconChoiceCtrl()
+    {
+        DBG_DTOR( AccessibleIconChoiceCtrl, NULL );
+    }
+    // -----------------------------------------------------------------------------
+    IMPLEMENT_FORWARD_XINTERFACE2(AccessibleIconChoiceCtrl, VCLXAccessibleComponent, AccessibleIconChoiceCtrl_BASE)
+    IMPLEMENT_FORWARD_XTYPEPROVIDER2(AccessibleIconChoiceCtrl, VCLXAccessibleComponent, AccessibleIconChoiceCtrl_BASE)
+    // -----------------------------------------------------------------------------
+    void AccessibleIconChoiceCtrl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+    {
+        if ( isAlive() )
+        {
+            switch ( rVclWindowEvent.GetId() )
+            {
+                case VCLEVENT_LISTBOX_SELECT :
+                {
+                    // First send an event that tells the listeners of a
+                    // modified selection.  The active descendant event is
+                    // send after that so that the receiving AT has time to
+                    // read the text or name of the active child.
+                    NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
+                    SvtIconChoiceCtrl* pCtrl = getCtrl();
+                    if ( pCtrl && pCtrl->HasFocus() )
+                    {
+                        SvxIconChoiceCtrlEntry* pEntry = static_cast< SvxIconChoiceCtrlEntry* >( rVclWindowEvent.GetData() );
+                        if ( pEntry )
+                        {
+                            sal_uLong nPos = pCtrl->GetEntryListPos( pEntry );
+                            Reference< XAccessible > xChild = new AccessibleIconChoiceCtrlEntry( *pCtrl, nPos, this );
+                            uno::Any aOldValue, aNewValue;
+                            aNewValue <<= xChild;
+                            NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldValue, aNewValue );
+                        }
+                    }
+                    break;
+                }
+                default:
+                    VCLXAccessibleComponent::ProcessWindowChildEvent (rVclWindowEvent);
+            }
+        }
+    }
+    // -----------------------------------------------------------------------------
+    // XComponent
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleIconChoiceCtrl::disposing()
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        m_xParent = NULL;
+    }
+    // -----------------------------------------------------------------------------
+    // XServiceInfo
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrl::getImplementationName() throw (RuntimeException)
+    {
+        return getImplementationName_Static();
+    }
+    // -----------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL AccessibleIconChoiceCtrl::getSupportedServiceNames() throw (RuntimeException)
+    {
+        return getSupportedServiceNames_Static();
+    }
+    // -----------------------------------------------------------------------------
+    sal_Bool SAL_CALL AccessibleIconChoiceCtrl::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
+    {
+        Sequence< ::rtl::OUString > aSupported( getSupportedServiceNames() );
+        const ::rtl::OUString* pSupported = aSupported.getConstArray();
+        const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+        for ( ; pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported )
+            ;
+
+        return pSupported != pEnd;
+    }
+    // -----------------------------------------------------------------------------
+    // XServiceInfo - static methods
+    // -----------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > AccessibleIconChoiceCtrl::getSupportedServiceNames_Static(void) throw (RuntimeException)
+    {
+        Sequence< ::rtl::OUString > aSupported(3);
+        aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleContext") );
+        aSupported[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleComponent") );
+        aSupported[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleIconChoiceControl") );
+        return aSupported;
+    }
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString AccessibleIconChoiceCtrl::getImplementationName_Static(void) throw (RuntimeException)
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.svtools.AccessibleIconChoiceControl") );
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessible
+    // -----------------------------------------------------------------------------
+    Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleContext(  ) throw (RuntimeException)
+    {
+        ensureAlive();
+        return this;
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessibleContext
+    // -----------------------------------------------------------------------------
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChildCount(  ) throw (RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+        return getCtrl()->GetEntryCount();
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChild( sal_Int32 i ) throw (RuntimeException, IndexOutOfBoundsException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+        SvtIconChoiceCtrl* pCtrl = getCtrl();
+        SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry(i);
+        if ( !pEntry )
+            throw RuntimeException();
+
+        return new AccessibleIconChoiceCtrlEntry( *pCtrl, i, this );
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleParent(  ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        ensureAlive();
+        return m_xParent;
+    }
+    // -----------------------------------------------------------------------------
+    sal_Int16 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleRole(  ) throw (RuntimeException)
+    {
+        return AccessibleRole::TREE;
+    }
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleDescription(  ) throw (RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+        return getCtrl()->GetAccessibleDescription();
+    }
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleName(  ) throw (RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+
+        ::rtl::OUString sName = getCtrl()->GetAccessibleName();
+        if ( sName.getLength() == 0 )
+            sName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IconChoiceControl" ) );
+        return sName;
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessibleSelection
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleIconChoiceCtrl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+
+        SvtIconChoiceCtrl* pCtrl = getCtrl();
+        SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry( nChildIndex );
+        if ( !pEntry )
+            throw IndexOutOfBoundsException();
+
+        pCtrl->SetCursor( pEntry );
+    }
+    // -----------------------------------------------------------------------------
+    sal_Bool SAL_CALL AccessibleIconChoiceCtrl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+
+        SvtIconChoiceCtrl* pCtrl = getCtrl();
+        SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry( nChildIndex );
+        if ( !pEntry )
+            throw IndexOutOfBoundsException();
+
+        return ( pCtrl->GetCursor() == pEntry );
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleIconChoiceCtrl::clearAccessibleSelection(  ) throw (RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+        getCtrl()->SetNoSelection();
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleIconChoiceCtrl::selectAllAccessibleChildren(  ) throw (RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+
+        sal_Int32 i, nCount = 0;
+        SvtIconChoiceCtrl* pCtrl = getCtrl();
+        nCount = pCtrl->GetEntryCount();
+        for ( i = 0; i < nCount; ++i )
+        {
+            SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry( i );
+            if ( pCtrl->GetCursor() != pEntry )
+                pCtrl->SetCursor( pEntry );
+        }
+    }
+    // -----------------------------------------------------------------------------
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+
+        sal_Int32 i, nSelCount = 0, nCount = 0;
+        SvtIconChoiceCtrl* pCtrl = getCtrl();
+        nCount = pCtrl->GetEntryCount();
+        for ( i = 0; i < nCount; ++i )
+        {
+            SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry( i );
+            if ( pCtrl->GetCursor() == pEntry )
+                ++nSelCount;
+        }
+
+        return nSelCount;
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+
+        if ( nSelectedChildIndex < 0 || nSelectedChildIndex >= getSelectedAccessibleChildCount() )
+            throw IndexOutOfBoundsException();
+
+        Reference< XAccessible > xChild;
+        sal_Int32 i, nSelCount = 0, nCount = 0;
+        SvtIconChoiceCtrl* pCtrl = getCtrl();
+        nCount = pCtrl->GetEntryCount();
+        for ( i = 0; i < nCount; ++i )
+        {
+            SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry( i );
+            if ( pCtrl->GetCursor() == pEntry )
+                ++nSelCount;
+
+            if ( nSelCount == ( nSelectedChildIndex + 1 ) )
+            {
+                xChild = new AccessibleIconChoiceCtrlEntry( *pCtrl, i, this );
+                break;
+            }
+        }
+
+        return xChild;
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleIconChoiceCtrl::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+
+        if ( nSelectedChildIndex < 0 || nSelectedChildIndex >= getAccessibleChildCount() )
+            throw IndexOutOfBoundsException();
+
+        Reference< XAccessible > xChild;
+        sal_Int32 i, nSelCount = 0, nCount = 0;
+        SvtIconChoiceCtrl* pCtrl = getCtrl();
+        nCount = pCtrl->GetEntryCount();
+        bool bFound = false;
+        for ( i = 0; i < nCount; ++i )
+        {
+            SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry( i );
+            if ( pEntry->IsSelected() )
+            {
+                ++nSelCount;
+                if ( i == nSelectedChildIndex )
+                    bFound = true;
+            }
+        }
+
+        // if only one entry is selected and its index is choosen to deselect -> no selection anymore
+        if ( 1 == nSelCount && bFound )
+            pCtrl->SetNoSelection();
+    }
+    // -----------------------------------------------------------------------------
+    void AccessibleIconChoiceCtrl::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+    {
+        VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet );
+        if ( isAlive() )
+        {
+            rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+            rStateSet.AddState( AccessibleStateType::MANAGES_DESCENDANTS );
+            rStateSet.AddState( AccessibleStateType::SELECTABLE );
+        }
+    }
+    // -----------------------------------------------------------------------------
+    SvtIconChoiceCtrl* AccessibleIconChoiceCtrl::getCtrl()
+    {
+        return static_cast<SvtIconChoiceCtrl*>(GetWindow());
+    }
+
+//........................................................................
+}// namespace accessibility
+//........................................................................
+
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
new file mode 100644
index 000000000000..e910b503ad1c
--- /dev/null
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -0,0 +1,756 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+#include <accessibility/extended/accessibleiconchoicectrlentry.hxx>
+#include <svtools/ivctrl.hxx>
+#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <tools/debug.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/controllayout.hxx>
+#include <toolkit/awt/vclxwindow.hxx>
+#include <toolkit/helper/convert.hxx>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <unotools/accessiblerelationsethelper.hxx>
+#include <cppuhelper/typeprovider.hxx>
+#include <comphelper/sequence.hxx>
+#include <svtools/stringtransfer.hxx>
+#include <comphelper/accessibleeventnotifier.hxx>
+
+#define ACCESSIBLE_ACTION_COUNT     1
+#define AID_EXPAND                  0
+#define AID_COLLAPSE                1
+
+namespace
+{
+    void checkActionIndex_Impl( sal_Int32 _nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException)
+    {
+        if ( _nIndex < 0 || _nIndex >= ACCESSIBLE_ACTION_COUNT )
+            // only three actions
+            throw ::com::sun::star::lang::IndexOutOfBoundsException();
+    }
+}
+
+//........................................................................
+namespace accessibility
+{
+    //........................................................................
+    // class ALBSolarGuard ---------------------------------------------------------
+
+    /** Aquire the solar mutex. */
+    class ALBSolarGuard : public ::vos::OGuard
+    {
+    public:
+        inline ALBSolarGuard() : ::vos::OGuard( Application::GetSolarMutex() ) {}
+    };
+
+    // class AccessibleIconChoiceCtrlEntry -----------------------------------------------------
+
+    using namespace ::com::sun::star::accessibility;
+    using namespace ::com::sun::star::uno;
+    using namespace ::com::sun::star::lang;
+    using namespace ::com::sun::star;
+
+    DBG_NAME(AccessibleIconChoiceCtrlEntry)
+
+    // -----------------------------------------------------------------------------
+    // Ctor() and Dtor()
+    // -----------------------------------------------------------------------------
+    AccessibleIconChoiceCtrlEntry::AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl,
+                                                                  sal_uLong _nPos,
+                                                                  const Reference< XAccessible >& _xParent ) :
+
+        AccessibleIconChoiceCtrlEntry_BASE  ( m_aMutex ),
+
+        m_pIconCtrl     ( &_rIconCtrl ),
+        m_nIndex        ( _nPos ),
+        m_nClientId     ( 0 ),
+        m_xParent       ( _xParent )
+
+    {
+        osl_incrementInterlockedCount( &m_refCount );
+        {
+            Reference< XComponent > xComp( m_xParent, UNO_QUERY );
+            if ( xComp.is() )
+                xComp->addEventListener( this );
+        }
+        osl_decrementInterlockedCount( &m_refCount );
+
+        DBG_CTOR( AccessibleIconChoiceCtrlEntry, NULL );
+    }
+    // -----------------------------------------------------------------------------
+    void AccessibleIconChoiceCtrlEntry::disposing( const EventObject& _rSource )
+throw(RuntimeException)
+    {
+        if ( _rSource.Source == m_xParent )
+        {
+            dispose();
+            DBG_ASSERT( !m_xParent.is() && ( NULL == m_pIconCtrl ), "" );
+        }
+    }
+    // -----------------------------------------------------------------------------
+    AccessibleIconChoiceCtrlEntry::~AccessibleIconChoiceCtrlEntry()
+    {
+        DBG_DTOR( AccessibleIconChoiceCtrlEntry, NULL );
+
+        if ( IsAlive_Impl() )
+        {
+            // increment ref count to prevent double call of Dtor
+            osl_incrementInterlockedCount( &m_refCount );
+            dispose();
+        }
+    }
+    #ifdef ACCESSIBLE_EVENT_NOTIFICATION_ENABLED
+    // (the following method is unused currently. If you need it, simply remove the #ifdef thing here and
+    // in the hxx)
+    // -----------------------------------------------------------------------------
+    void AccessibleIconChoiceCtrlEntry::NotifyAccessibleEvent( sal_Int16 _nEventId,
+                                                   const ::com::sun::star::uno::Any& _aOldValue,
+                                                   const ::com::sun::star::uno::Any& _aNewValue )
+    {
+        Reference< uno::XInterface > xSource( *this );
+        AccessibleEventObject aEventObj( xSource, _nEventId, _aNewValue, _aOldValue );
+
+        if (m_nClientId)
+            comphelper::AccessibleEventNotifier::addEvent( m_nClientId, aEventObj );
+    }
+    #endif
+    // -----------------------------------------------------------------------------
+    Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox_Impl() const
+    {
+        Rectangle aRect;
+        SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry( m_nIndex );
+        if ( pEntry )
+            aRect = m_pIconCtrl->GetBoundingBox( pEntry );
+
+        return aRect;
+    }
+    // -----------------------------------------------------------------------------
+    Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen_Impl() const
+    {
+        Rectangle aRect;
+        SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry( m_nIndex );
+        if ( pEntry )
+        {
+            aRect = m_pIconCtrl->GetBoundingBox( pEntry );
+            Point aTopLeft = aRect.TopLeft();
+            aTopLeft += m_pIconCtrl->GetWindowExtentsRelative( NULL ).TopLeft();
+            aRect = Rectangle( aTopLeft, aRect.GetSize() );
+        }
+
+        return aRect;
+    }
+    // -----------------------------------------------------------------------------
+    sal_Bool AccessibleIconChoiceCtrlEntry::IsAlive_Impl() const
+    {
+        return ( !rBHelper.bDisposed && !rBHelper.bInDispose && m_pIconCtrl );
+    }
+    // -----------------------------------------------------------------------------
+    sal_Bool AccessibleIconChoiceCtrlEntry::IsShowing_Impl() const
+    {
+        sal_Bool bShowing = sal_False;
+        Reference< XAccessibleContext > m_xParentContext =
+            m_xParent.is() ? m_xParent->getAccessibleContext() : Reference< XAccessibleContext >();
+        if( m_xParentContext.is() )
+        {
+            Reference< XAccessibleComponent > xParentComp( m_xParentContext, uno::UNO_QUERY );
+            if( xParentComp.is() )
+                bShowing = GetBoundingBox_Impl().IsOver( VCLRectangle( xParentComp->getBounds() ) );
+        }
+
+        return bShowing;
+    }
+    // -----------------------------------------------------------------------------
+    Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox() throw ( lang::DisposedException )
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+        return GetBoundingBox_Impl();
+    }
+    // -----------------------------------------------------------------------------
+    Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen() throw ( lang::DisposedException )
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+        return GetBoundingBoxOnScreen_Impl();
+    }
+    // -----------------------------------------------------------------------------
+    void AccessibleIconChoiceCtrlEntry::EnsureIsAlive() const throw ( lang::DisposedException )
+    {
+        if ( !IsAlive_Impl() )
+            throw lang::DisposedException();
+    }
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString AccessibleIconChoiceCtrlEntry::implGetText()
+    {
+        ::rtl::OUString sRet;
+        SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry( m_nIndex );
+        if ( pEntry )
+            sRet = pEntry->GetDisplayText();
+        return sRet;
+    }
+    // -----------------------------------------------------------------------------
+    Locale AccessibleIconChoiceCtrlEntry::implGetLocale()
+    {
+        Locale aLocale;
+        aLocale = Application::GetSettings().GetUILocale();
+
+        return aLocale;
+    }
+    void AccessibleIconChoiceCtrlEntry::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
+    {
+        nStartIndex = 0;
+        nEndIndex = 0;
+    }
+    // -----------------------------------------------------------------------------
+    // XTypeProvider
+    // -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    Sequence< sal_Int8 > AccessibleIconChoiceCtrlEntry::getImplementationId() throw (RuntimeException)
+    {
+        static ::cppu::OImplementationId* pId = NULL;
+
+        if ( !pId )
+        {
+            ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex );
+
+            if ( !pId )
+            {
+                static ::cppu::OImplementationId aId;
+                pId = &aId;
+            }
+        }
+        return pId->getImplementationId();
+    }
+    // -----------------------------------------------------------------------------
+    // XComponent
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleIconChoiceCtrlEntry::disposing()
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        // Send a disposing to all listeners.
+        if ( m_nClientId )
+        {
+            sal_uInt32 nId = m_nClientId;
+            m_nClientId =  0;
+            comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nId, *this );
+        }
+
+        Reference< XComponent > xComp( m_xParent, UNO_QUERY );
+        if ( xComp.is() )
+            xComp->removeEventListener( this );
+
+        m_pIconCtrl = NULL;
+        m_xParent = NULL;
+    }
+    // -----------------------------------------------------------------------------
+    // XServiceInfo
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getImplementationName() throw(RuntimeException)
+    {
+        return getImplementationName_Static();
+    }
+    // -----------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL AccessibleIconChoiceCtrlEntry::getSupportedServiceNames() throw(RuntimeException)
+    {
+        return getSupportedServiceNames_Static();
+    }
+    // -----------------------------------------------------------------------------
+    sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
+    {
+        Sequence< ::rtl::OUString > aSupported( getSupportedServiceNames() );
+        const ::rtl::OUString* pSupported = aSupported.getConstArray();
+        const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+        for ( ; pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported )
+            ;
+
+        return pSupported != pEnd;
+    }
+    // -----------------------------------------------------------------------------
+    // XServiceInfo - static methods
+    // -----------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > AccessibleIconChoiceCtrlEntry::getSupportedServiceNames_Static(void) throw( RuntimeException )
+    {
+        Sequence< ::rtl::OUString > aSupported(3);
+        aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleContext") );
+        aSupported[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleComponent") );
+        aSupported[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleIconChoiceControlEntry") );
+        return aSupported;
+    }
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString AccessibleIconChoiceCtrlEntry::getImplementationName_Static(void) throw( RuntimeException )
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.svtools.AccessibleIconChoiceControlEntry") );
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessible
+    // -----------------------------------------------------------------------------
+    Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleContext(  ) throw (RuntimeException)
+    {
+        EnsureIsAlive();
+        return this;
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessibleContext
+    // -----------------------------------------------------------------------------
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChildCount(  ) throw (RuntimeException)
+    {
+        return 0; // no children
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException,RuntimeException)
+    {
+        throw IndexOutOfBoundsException();
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleParent(  ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+        return m_xParent;
+    }
+    // -----------------------------------------------------------------------------
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleIndexInParent(  ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        return m_nIndex;
+    }
+    // -----------------------------------------------------------------------------
+    sal_Int16 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRole(  ) throw (RuntimeException)
+    {
+        return AccessibleRole::LABEL;
+    }
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleDescription(  ) throw (RuntimeException)
+    {
+        // no description for every item
+        return ::rtl::OUString();
+    }
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleName(  ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+        return implGetText();
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessibleRelationSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRelationSet(  ) throw (RuntimeException)
+    {
+        return new utl::AccessibleRelationSetHelper;
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessibleStateSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleStateSet(  ) throw (RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper;
+        Reference< XAccessibleStateSet > xStateSet = pStateSetHelper;
+
+        if ( IsAlive_Impl() )
+        {
+               pStateSetHelper->AddState( AccessibleStateType::TRANSIENT );
+               pStateSetHelper->AddState( AccessibleStateType::SELECTABLE );
+               pStateSetHelper->AddState( AccessibleStateType::ENABLED );
+            pStateSetHelper->AddState( AccessibleStateType::SENSITIVE );
+            if ( IsShowing_Impl() )
+            {
+                pStateSetHelper->AddState( AccessibleStateType::SHOWING );
+                pStateSetHelper->AddState( AccessibleStateType::VISIBLE );
+            }
+
+            if ( m_pIconCtrl && m_pIconCtrl->GetCursor() == m_pIconCtrl->GetEntry( m_nIndex ) )
+                pStateSetHelper->AddState( AccessibleStateType::SELECTED );
+        }
+        else
+            pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+
+        return xStateSet;
+    }
+    // -----------------------------------------------------------------------------
+    Locale SAL_CALL AccessibleIconChoiceCtrlEntry::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        return implGetLocale();
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessibleComponent
+    // -----------------------------------------------------------------------------
+    sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::containsPoint( const awt::Point& rPoint ) throw (RuntimeException)
+    {
+        return Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException)
+    {
+        return Reference< XAccessible >();
+    }
+    // -----------------------------------------------------------------------------
+    awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getBounds(  ) throw (RuntimeException)
+    {
+        return AWTRectangle( GetBoundingBox() );
+    }
+    // -----------------------------------------------------------------------------
+    awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocation(  ) throw (RuntimeException)
+    {
+        return AWTPoint( GetBoundingBox().TopLeft() );
+    }
+    // -----------------------------------------------------------------------------
+    awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocationOnScreen(  ) throw (RuntimeException)
+    {
+        return AWTPoint( GetBoundingBoxOnScreen().TopLeft() );
+    }
+    // -----------------------------------------------------------------------------
+    awt::Size SAL_CALL AccessibleIconChoiceCtrlEntry::getSize(  ) throw (RuntimeException)
+    {
+        return AWTSize( GetBoundingBox().GetSize() );
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleIconChoiceCtrlEntry::grabFocus(  ) throw (RuntimeException)
+    {
+        // do nothing, because no focus for each item
+    }
+    // -----------------------------------------------------------------------------
+    sal_Int32 AccessibleIconChoiceCtrlEntry::getForeground( ) throw (RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        sal_Int32 nColor = 0;
+        Reference< XAccessible > xParent = getAccessibleParent();
+        if ( xParent.is() )
+        {
+            Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+            if ( xParentComp.is() )
+                nColor = xParentComp->getForeground();
+        }
+
+        return nColor;
+    }
+    // -----------------------------------------------------------------------------
+    sal_Int32 AccessibleIconChoiceCtrlEntry::getBackground(  ) throw (RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        sal_Int32 nColor = 0;
+        Reference< XAccessible > xParent = getAccessibleParent();
+        if ( xParent.is() )
+        {
+            Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+            if ( xParentComp.is() )
+                nColor = xParentComp->getBackground();
+        }
+
+        return nColor;
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessibleText
+    // -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterBounds( sal_Int32 _nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        if ( ( 0 > _nIndex ) || ( getCharacterCount() <= _nIndex ) )
+            throw IndexOutOfBoundsException();
+
+        awt::Rectangle aBounds( 0, 0, 0, 0 );
+        if ( m_pIconCtrl )
+        {
+            Rectangle aItemRect = GetBoundingBox_Impl();
+            Rectangle aCharRect = m_pIconCtrl->GetEntryCharacterBounds( m_nIndex, _nIndex );
+            aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
+            aBounds = AWTRectangle( aCharRect );
+        }
+
+        return aBounds;
+    }
+    // -----------------------------------------------------------------------------
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        sal_Int32 nIndex = -1;
+        if ( m_pIconCtrl )
+        {
+            ::vcl::ControlLayoutData aLayoutData;
+            Rectangle aItemRect = GetBoundingBox_Impl();
+            m_pIconCtrl->RecordLayoutData( &aLayoutData, aItemRect );
+            Point aPnt( VCLPoint( aPoint ) );
+            aPnt += aItemRect.TopLeft();
+            nIndex = aLayoutData.GetIndexForPoint( aPnt );
+
+            long nLen = aLayoutData.m_aUnicodeBoundRects.size();
+            for ( long i = 0; i < nLen; ++i )
+            {
+                Rectangle aRect = aLayoutData.GetCharacterBounds(i);
+                sal_Bool bInside = aRect.IsInside( aPnt );
+
+                if ( bInside )
+                    break;
+            }
+        }
+
+        return nIndex;
+    }
+    // -----------------------------------------------------------------------------
+    sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        String sText = getText();
+        if  ( ( 0 > nStartIndex ) || ( sText.Len() <= nStartIndex )
+            || ( 0 > nEndIndex ) || ( sText.Len() <= nEndIndex ) )
+            throw IndexOutOfBoundsException();
+
+        sal_Int32 nLen = nEndIndex - nStartIndex + 1;
+        ::svt::OStringTransfer::CopyString( sText.Copy( (sal_uInt16)nStartIndex, (sal_uInt16)nLen ), m_pIconCtrl );
+
+        return sal_True;
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessibleEventBroadcaster
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleIconChoiceCtrlEntry::addEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
+    {
+        if (xListener.is())
+        {
+            ::osl::MutexGuard aGuard( m_aMutex );
+            if (!m_nClientId)
+                m_nClientId = comphelper::AccessibleEventNotifier::registerClient( );
+            comphelper::AccessibleEventNotifier::addEventListener( m_nClientId, xListener );
+        }
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleIconChoiceCtrlEntry::removeEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
+    {
+        if (xListener.is())
+        {
+            ::osl::MutexGuard aGuard( m_aMutex );
+
+            sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( m_nClientId, xListener );
+            if ( !nListenerCount )
+            {
+                // no listeners anymore
+                // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
+                // and at least to us not firing any events anymore, in case somebody calls
+                // NotifyAccessibleEvent, again
+                sal_Int32 nId = m_nClientId;
+                m_nClientId = 0;
+                comphelper::AccessibleEventNotifier::revokeClient( nId );
+            }
+        }
+    }
+
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getCaretPosition(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        return -1;
+    }
+    sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+
+        if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
+            throw IndexOutOfBoundsException();
+
+        return sal_False;
+    }
+    sal_Unicode SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getCharacter( nIndex );
+    }
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+
+        ::rtl::OUString sText( implGetText() );
+
+        if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+            throw IndexOutOfBoundsException();
+
+        return ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >();
+    }
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterCount(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getCharacterCount(  );
+    }
+
+    ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectedText(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getSelectedText(  );
+    }
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectionStart(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getSelectionStart(  );
+    }
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectionEnd(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getSelectionEnd(  );
+    }
+    sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+
+        if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) )
+            throw IndexOutOfBoundsException();
+
+        return sal_False;
+    }
+    ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getText(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getText(  );
+    }
+    ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
+    }
+    ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType);
+    }
+    ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType);
+    }
+    ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+
+        return OCommonAccessibleText::getTextBehindIndex( nIndex ,aTextType);
+    }
+
+    // -----------------------------------------------------------------------------
+    // XAccessibleAction
+    // -----------------------------------------------------------------------------
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionCount(  ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        // three actions supported
+        return ACCESSIBLE_ACTION_COUNT;
+    }
+    // -----------------------------------------------------------------------------
+    sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::doAccessibleAction( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        sal_Bool bRet = sal_False;
+        checkActionIndex_Impl( nIndex );
+        EnsureIsAlive();
+
+        SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry( m_nIndex );
+        if ( pEntry && !pEntry->IsSelected() )
+        {
+            m_pIconCtrl->SetNoSelection();
+            m_pIconCtrl->SetCursor( pEntry );
+            bRet = sal_True;
+        }
+
+        return bRet;
+    }
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        checkActionIndex_Impl( nIndex );
+        EnsureIsAlive();
+
+        static const ::rtl::OUString sActionDesc( RTL_CONSTASCII_USTRINGPARAM( "Select" ) );
+        return sActionDesc;
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessibleKeyBinding > AccessibleIconChoiceCtrlEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        Reference< XAccessibleKeyBinding > xRet;
+        checkActionIndex_Impl( nIndex );
+        // ... which key?
+        return xRet;
+    }
+//........................................................................
+}// namespace accessibility
+//........................................................................
+
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
new file mode 100644
index 000000000000..b95643670985
--- /dev/null
+++ b/accessibility/source/extended/accessiblelistbox.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_accessibility.hxx"
+#include <accessibility/extended/accessiblelistbox.hxx>
+#include <accessibility/extended/accessiblelistboxentry.hxx>
+#include <svtools/svtreebx.hxx>
+#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <tools/debug.hxx>
+#include <vcl/svapp.hxx>
+#include <toolkit/awt/vclxwindow.hxx>
+#include <toolkit/helper/convert.hxx>
+#include <unotools/accessiblestatesethelper.hxx>
+
+//........................................................................
+namespace accessibility
+{
+//........................................................................
+
+    // class AccessibleListBox -----------------------------------------------------
+
+    using namespace ::com::sun::star::accessibility;
+    using namespace ::com::sun::star::uno;
+    using namespace ::com::sun::star::lang;
+    using namespace ::com::sun::star;
+
+    DBG_NAME(AccessibleListBox)
+
+    // -----------------------------------------------------------------------------
+    // Ctor() and Dtor()
+    // -----------------------------------------------------------------------------
+    AccessibleListBox::AccessibleListBox( SvTreeListBox& _rListBox, const Reference< XAccessible >& _xParent ) :
+
+        VCLXAccessibleComponent( _rListBox.GetWindowPeer() ),
+        m_xParent( _xParent )
+    {
+        DBG_CTOR( AccessibleListBox, NULL );
+    }
+    // -----------------------------------------------------------------------------
+    AccessibleListBox::~AccessibleListBox()
+    {
+        DBG_DTOR( AccessibleListBox, NULL );
+        if ( isAlive() )
+        {
+            // increment ref count to prevent double call of Dtor
+            osl_incrementInterlockedCount( &m_refCount );
+            dispose();
+        }
+    }
+    IMPLEMENT_FORWARD_XINTERFACE2(AccessibleListBox, VCLXAccessibleComponent, AccessibleListBox_BASE)
+    IMPLEMENT_FORWARD_XTYPEPROVIDER2(AccessibleListBox, VCLXAccessibleComponent, AccessibleListBox_BASE)
+    // -----------------------------------------------------------------------------
+    SvTreeListBox* AccessibleListBox::getListBox() const
+    {
+        return  static_cast< SvTreeListBox* >( const_cast<AccessibleListBox*>(this)->GetWindow() );
+    }
+    // -----------------------------------------------------------------------------
+    void AccessibleListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+    {
+        if ( isAlive() )
+        {
+            switch ( rVclWindowEvent.GetId() )
+            {
+                case  VCLEVENT_CHECKBOX_TOGGLE :
+                {
+                    if ( getListBox() && getListBox()->HasFocus() )
+                    {
+                        SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
+                        if ( !pEntry )
+                            pEntry = getListBox()->GetCurEntry();
+
+                        if ( pEntry )
+                        {
+                            Reference< XAccessible > xChild = new AccessibleListBoxEntry( *getListBox(), pEntry, this );
+                            uno::Any aOldValue, aNewValue;
+                            aNewValue <<= xChild;
+                            NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldValue, aNewValue );
+                        }
+                    }
+                    break;
+                }
+
+                case VCLEVENT_LISTBOX_SELECT :
+                {
+                    // First send an event that tells the listeners of a
+                    // modified selection.  The active descendant event is
+                    // send after that so that the receiving AT has time to
+                    // read the text or name of the active child.
+                    NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
+                    if ( getListBox() && getListBox()->HasFocus() )
+                    {
+                        SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
+                        if ( pEntry )
+                        {
+                            Reference< XAccessible > xChild = new AccessibleListBoxEntry( *getListBox(), pEntry, this );
+                            uno::Any aOldValue, aNewValue;
+                            aNewValue <<= xChild;
+                            NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldValue, aNewValue );
+                        }
+                    }
+                    break;
+
+                // --> OD 2009-04-01 #i92103#
+                case VCLEVENT_ITEM_EXPANDED :
+                case VCLEVENT_ITEM_COLLAPSED :
+                {
+                    SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
+                    if ( pEntry )
+                    {
+                        AccessibleListBoxEntry* pAccListBoxEntry =
+                            new AccessibleListBoxEntry( *getListBox(), pEntry, this );
+                        Reference< XAccessible > xChild = pAccListBoxEntry;
+                        const short nAccEvent =
+                                ( rVclWindowEvent.GetId() == VCLEVENT_ITEM_EXPANDED )
+                                ? AccessibleEventId::LISTBOX_ENTRY_EXPANDED
+                                : AccessibleEventId::LISTBOX_ENTRY_COLLAPSED;
+                        uno::Any aListBoxEntry;
+                        aListBoxEntry <<= xChild;
+                        NotifyAccessibleEvent( nAccEvent, Any(), aListBoxEntry );
+                        if ( getListBox() && getListBox()->HasFocus() )
+                        {
+                            NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, Any(), aListBoxEntry );
+                        }
+                    }
+                    break;
+                }
+                // <--
+                }
+                default:
+                    VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent);
+            }
+        }
+    }
+    // -----------------------------------------------------------------------------
+    void AccessibleListBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent )
+    {
+        switch ( rVclWindowEvent.GetId() )
+        {
+            case VCLEVENT_WINDOW_SHOW:
+            case VCLEVENT_WINDOW_HIDE:
+            {
+            }
+            break;
+            default:
+            {
+                VCLXAccessibleComponent::ProcessWindowChildEvent( rVclWindowEvent );
+            }
+            break;
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+    // XComponent
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleListBox::disposing()
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        VCLXAccessibleComponent::disposing();
+        m_xParent = NULL;
+    }
+    // -----------------------------------------------------------------------------
+    // XServiceInfo
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleListBox::getImplementationName() throw(RuntimeException)
+    {
+        return getImplementationName_Static();
+    }
+    // -----------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL AccessibleListBox::getSupportedServiceNames() throw(RuntimeException)
+    {
+        return getSupportedServiceNames_Static();
+    }
+    // -----------------------------------------------------------------------------
+    sal_Bool SAL_CALL AccessibleListBox::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
+    {
+        Sequence< ::rtl::OUString > aSupported( getSupportedServiceNames() );
+        const ::rtl::OUString* pSupported = aSupported.getConstArray();
+        const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+        for ( ; pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported )
+            ;
+
+        return pSupported != pEnd;
+    }
+    // -----------------------------------------------------------------------------
+    // XServiceInfo - static methods
+    // -----------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > AccessibleListBox::getSupportedServiceNames_Static(void) throw( RuntimeException )
+    {
+        Sequence< ::rtl::OUString > aSupported(3);
+        aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleContext") );
+        aSupported[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleComponent") );
+        aSupported[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleTreeListBox") );
+        return aSupported;
+    }
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString AccessibleListBox::getImplementationName_Static(void) throw( RuntimeException )
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.svtools.AccessibleTreeListBox") );
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessible
+    // -----------------------------------------------------------------------------
+    Reference< XAccessibleContext > SAL_CALL AccessibleListBox::getAccessibleContext(  ) throw (RuntimeException)
+    {
+        ensureAlive();
+        return this;
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessibleContext
+    // -----------------------------------------------------------------------------
+    sal_Int32 SAL_CALL AccessibleListBox::getAccessibleChildCount(  ) throw (RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+
+        sal_Int32 nCount = 0;
+        SvTreeListBox* pSvTreeListBox = getListBox();
+        if ( pSvTreeListBox )
+            nCount = pSvTreeListBox->GetLevelChildCount( NULL );
+
+        return nCount;
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException,RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+        SvLBoxEntry* pEntry = getListBox()->GetEntry(i);
+        if ( !pEntry )
+            throw IndexOutOfBoundsException();
+
+        return new AccessibleListBoxEntry( *getListBox(), pEntry, this );
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleParent(  ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        ensureAlive();
+        return m_xParent;
+    }
+    // -----------------------------------------------------------------------------
+    sal_Int16 SAL_CALL AccessibleListBox::getAccessibleRole(  ) throw (RuntimeException)
+    {
+        return AccessibleRole::TREE;
+    }
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleListBox::getAccessibleDescription(  ) throw (RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+        return getListBox()->GetAccessibleDescription();
+    }
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleListBox::getAccessibleName(  ) throw (RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+        return getListBox()->GetAccessibleName();
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessibleSelection
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleListBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+
+        SvLBoxEntry* pEntry = getListBox()->GetEntry( nChildIndex );
+        if ( !pEntry )
+            throw IndexOutOfBoundsException();
+
+        getListBox()->Select( pEntry, sal_True );
+    }
+    // -----------------------------------------------------------------------------
+    sal_Bool SAL_CALL AccessibleListBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+
+        SvLBoxEntry* pEntry = getListBox()->GetEntry( nChildIndex );
+        if ( !pEntry )
+            throw IndexOutOfBoundsException();
+
+        return getListBox()->IsSelected( pEntry );
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleListBox::clearAccessibleSelection(  ) throw (RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+
+        sal_Int32 i, nCount = 0;
+        nCount = getListBox()->GetLevelChildCount( NULL );
+        for ( i = 0; i < nCount; ++i )
+        {
+            SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
+            if ( getListBox()->IsSelected( pEntry ) )
+                getListBox()->Select( pEntry, sal_False );
+        }
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleListBox::selectAllAccessibleChildren(  ) throw (RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+
+        sal_Int32 i, nCount = 0;
+        nCount = getListBox()->GetLevelChildCount( NULL );
+        for ( i = 0; i < nCount; ++i )
+        {
+            SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
+            if ( !getListBox()->IsSelected( pEntry ) )
+                getListBox()->Select( pEntry, sal_True );
+        }
+    }
+    // -----------------------------------------------------------------------------
+    sal_Int32 SAL_CALL AccessibleListBox::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+
+        sal_Int32 i, nSelCount = 0, nCount = 0;
+        nCount = getListBox()->GetLevelChildCount( NULL );
+        for ( i = 0; i < nCount; ++i )
+        {
+            SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
+            if ( getListBox()->IsSelected( pEntry ) )
+                ++nSelCount;
+        }
+
+        return nSelCount;
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleListBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+
+        if ( nSelectedChildIndex < 0 || nSelectedChildIndex >= getSelectedAccessibleChildCount() )
+            throw IndexOutOfBoundsException();
+
+        Reference< XAccessible > xChild;
+        sal_Int32 i, nSelCount = 0, nCount = 0;
+        nCount = getListBox()->GetLevelChildCount( NULL );
+        for ( i = 0; i < nCount; ++i )
+        {
+            SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
+            if ( getListBox()->IsSelected( pEntry ) )
+                ++nSelCount;
+
+            if ( nSelCount == ( nSelectedChildIndex + 1 ) )
+            {
+                xChild = new AccessibleListBoxEntry( *getListBox(), pEntry, this );
+                break;
+            }
+        }
+
+        return xChild;
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleListBox::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ::comphelper::OExternalLockGuard aGuard( this );
+
+        ensureAlive();
+
+        SvLBoxEntry* pEntry = getListBox()->GetEntry( nSelectedChildIndex );
+        if ( !pEntry )
+            throw IndexOutOfBoundsException();
+
+        getListBox()->Select( pEntry, sal_False );
+    }
+    // -----------------------------------------------------------------------------
+    void AccessibleListBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+    {
+        VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet );
+        if ( getListBox() && isAlive() )
+        {
+            rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+            rStateSet.AddState( AccessibleStateType::MANAGES_DESCENDANTS );
+            if ( getListBox()->GetSelectionMode() == MULTIPLE_SELECTION )
+                rStateSet.AddState( AccessibleStateType::MULTI_SELECTABLE );
+        }
+    }
+
+
+//........................................................................
+}// namespace accessibility
+//........................................................................
+
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
new file mode 100644
index 000000000000..939e99b10fbb
--- /dev/null
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -0,0 +1,970 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+#include "accessibility/extended/accessiblelistboxentry.hxx"
+#include <svtools/svtreebx.hxx>
+#include <svtools/stringtransfer.hxx>
+#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <tools/debug.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/controllayout.hxx>
+#include <toolkit/awt/vclxwindow.hxx>
+#include <toolkit/helper/convert.hxx>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <unotools/accessiblerelationsethelper.hxx>
+#include <cppuhelper/typeprovider.hxx>
+#include <comphelper/sequence.hxx>
+#include <comphelper/accessibleeventnotifier.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+
+#define ACCESSIBLE_ACTION_COUNT 1
+
+namespace
+{
+    void checkActionIndex_Impl( sal_Int32 _nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException)
+    {
+        if ( _nIndex < 0 || _nIndex >= ACCESSIBLE_ACTION_COUNT )
+            // only three actions
+            throw ::com::sun::star::lang::IndexOutOfBoundsException();
+    }
+}
+
+//........................................................................
+namespace accessibility
+{
+    //........................................................................
+    // class ALBSolarGuard ---------------------------------------------------------
+
+    /** Aquire the solar mutex. */
+    class ALBSolarGuard : public ::vos::OGuard
+    {
+    public:
+        inline ALBSolarGuard() : ::vos::OGuard( Application::GetSolarMutex() ) {}
+    };
+
+    // class AccessibleListBoxEntry -----------------------------------------------------
+
+    using namespace ::com::sun::star::accessibility;
+    using namespace ::com::sun::star::uno;
+    using namespace ::com::sun::star::lang;
+    using namespace ::com::sun::star;
+
+    DBG_NAME(AccessibleListBoxEntry)
+
+    // -----------------------------------------------------------------------------
+    // Ctor() and Dtor()
+    // -----------------------------------------------------------------------------
+    AccessibleListBoxEntry::AccessibleListBoxEntry( SvTreeListBox& _rListBox,
+                                                    SvLBoxEntry* _pEntry,
+                                                    const Reference< XAccessible >& _xParent ) :
+
+        AccessibleListBoxEntry_BASE ( m_aMutex ),
+        ListBoxAccessibleBase( _rListBox ),
+
+        m_nClientId     ( 0 ),
+        m_aParent       ( _xParent )
+
+    {
+        DBG_CTOR( AccessibleListBoxEntry, NULL );
+
+        _rListBox.FillEntryPath( _pEntry, m_aEntryPath );
+    }
+    // -----------------------------------------------------------------------------
+    AccessibleListBoxEntry::~AccessibleListBoxEntry()
+    {
+        DBG_DTOR( AccessibleListBoxEntry, NULL );
+
+        if ( IsAlive_Impl() )
+        {
+            // increment ref count to prevent double call of Dtor
+            osl_incrementInterlockedCount( &m_refCount );
+            dispose();
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+    Rectangle AccessibleListBoxEntry::GetBoundingBox_Impl() const
+    {
+        Rectangle aRect;
+        SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+        if ( pEntry )
+        {
+            aRect = getListBox()->GetBoundingRect( pEntry );
+            SvLBoxEntry* pParent = getListBox()->GetParent( pEntry );
+            if ( pParent )
+            {
+                // position relative to parent entry
+                Point aTopLeft = aRect.TopLeft();
+                aTopLeft -= getListBox()->GetBoundingRect( pParent ).TopLeft();
+                aRect = Rectangle( aTopLeft, aRect.GetSize() );
+            }
+        }
+
+        return aRect;
+    }
+    // -----------------------------------------------------------------------------
+    Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen_Impl() const
+    {
+        Rectangle aRect;
+        SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+        if ( pEntry )
+        {
+            aRect = getListBox()->GetBoundingRect( pEntry );
+            Point aTopLeft = aRect.TopLeft();
+            aTopLeft += getListBox()->GetWindowExtentsRelative( NULL ).TopLeft();
+            aRect = Rectangle( aTopLeft, aRect.GetSize() );
+        }
+
+        return aRect;
+    }
+    // -----------------------------------------------------------------------------
+    sal_Bool AccessibleListBoxEntry::IsAlive_Impl() const
+    {
+        return ( !rBHelper.bDisposed && !rBHelper.bInDispose && isAlive() );
+    }
+    // -----------------------------------------------------------------------------
+    sal_Bool AccessibleListBoxEntry::IsShowing_Impl() const
+    {
+        Reference< XAccessible > xParent = implGetParentAccessible( );
+
+        sal_Bool bShowing = sal_False;
+        Reference< XAccessibleContext > m_xParentContext =
+            xParent.is() ? xParent->getAccessibleContext() : Reference< XAccessibleContext >();
+        if( m_xParentContext.is() )
+        {
+            Reference< XAccessibleComponent > xParentComp( m_xParentContext, uno::UNO_QUERY );
+            if( xParentComp.is() )
+                bShowing = GetBoundingBox_Impl().IsOver( VCLRectangle( xParentComp->getBounds() ) );
+        }
+
+        return bShowing;
+    }
+    // -----------------------------------------------------------------------------
+    Rectangle AccessibleListBoxEntry::GetBoundingBox() throw ( lang::DisposedException )
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+        return GetBoundingBox_Impl();
+    }
+    // -----------------------------------------------------------------------------
+    Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen() throw ( lang::DisposedException )
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+        return GetBoundingBoxOnScreen_Impl();
+    }
+    // -----------------------------------------------------------------------------
+    void AccessibleListBoxEntry::EnsureIsAlive() const throw ( lang::DisposedException )
+    {
+        if ( !IsAlive_Impl() )
+            throw lang::DisposedException();
+    }
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString AccessibleListBoxEntry::implGetText()
+    {
+        ::rtl::OUString sRet;
+        SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+        if ( pEntry )
+            sRet = getListBox()->SearchEntryText( pEntry );
+        return sRet;
+    }
+    // -----------------------------------------------------------------------------
+    Locale AccessibleListBoxEntry::implGetLocale()
+    {
+        Locale aLocale;
+        aLocale = Application::GetSettings().GetUILocale();
+
+        return aLocale;
+    }
+    void AccessibleListBoxEntry::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
+    {
+        nStartIndex = 0;
+        nEndIndex = 0;
+    }
+    // -----------------------------------------------------------------------------
+    // XTypeProvider
+    // -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    Sequence< sal_Int8 > AccessibleListBoxEntry::getImplementationId() throw (RuntimeException)
+    {
+        static ::cppu::OImplementationId* pId = NULL;
+
+        if ( !pId )
+        {
+            ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex );
+
+            if ( !pId )
+            {
+                static ::cppu::OImplementationId aId;
+                pId = &aId;
+            }
+        }
+        return pId->getImplementationId();
+    }
+
+    // -----------------------------------------------------------------------------
+    // XComponent/ListBoxAccessibleBase
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleListBoxEntry::dispose() throw ( uno::RuntimeException )
+    {
+        AccessibleListBoxEntry_BASE::dispose();
+    }
+
+    // -----------------------------------------------------------------------------
+    // XComponent
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleListBoxEntry::disposing()
+    {
+        ALBSolarGuard();
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        Reference< XAccessible > xKeepAlive( this );
+
+        // Send a disposing to all listeners.
+        if ( m_nClientId )
+        {
+            ::comphelper::AccessibleEventNotifier::TClientId nId = m_nClientId;
+            m_nClientId =  0;
+            ::comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nId, *this );
+        }
+
+        // clean up
+        {
+
+            ListBoxAccessibleBase::disposing();
+        }
+        m_aParent = WeakReference< XAccessible >();
+    }
+    // -----------------------------------------------------------------------------
+    // XServiceInfo
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getImplementationName() throw(RuntimeException)
+    {
+        return getImplementationName_Static();
+    }
+    // -----------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL AccessibleListBoxEntry::getSupportedServiceNames() throw(RuntimeException)
+    {
+        return getSupportedServiceNames_Static();
+    }
+    // -----------------------------------------------------------------------------
+    sal_Bool SAL_CALL AccessibleListBoxEntry::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException)
+    {
+        Sequence< ::rtl::OUString > aSupported( getSupportedServiceNames() );
+        const ::rtl::OUString* pSupported = aSupported.getConstArray();
+        const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+        for ( ; pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported )
+            ;
+
+        return pSupported != pEnd;
+    }
+    // -----------------------------------------------------------------------------
+    // XServiceInfo - static methods
+    // -----------------------------------------------------------------------------
+    Sequence< ::rtl::OUString > AccessibleListBoxEntry::getSupportedServiceNames_Static(void) throw( RuntimeException )
+    {
+        Sequence< ::rtl::OUString > aSupported(3);
+        aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleContext") );
+        aSupported[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleComponent") );
+        aSupported[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AccessibleTreeListBoxEntry") );
+        return aSupported;
+    }
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString AccessibleListBoxEntry::getImplementationName_Static(void) throw( RuntimeException )
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.svtools.AccessibleTreeListBoxEntry") );
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessible
+    // -----------------------------------------------------------------------------
+    Reference< XAccessibleContext > SAL_CALL AccessibleListBoxEntry::getAccessibleContext(  ) throw (RuntimeException)
+    {
+        EnsureIsAlive();
+        return this;
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessibleContext
+    // -----------------------------------------------------------------------------
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleChildCount(  ) throw (RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+        SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+        sal_Int32 nCount = 0;
+        if ( pEntry )
+            nCount = getListBox()->GetLevelChildCount( pEntry );
+
+        return nCount;
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException,RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+
+        SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvLBoxEntry* pEntry = pParent ? getListBox()->GetEntry( pParent, i ) : NULL;
+        if ( !pEntry )
+            throw IndexOutOfBoundsException();
+
+        return new AccessibleListBoxEntry( *getListBox(), pEntry, this );
+    }
+
+    // -----------------------------------------------------------------------------
+    Reference< XAccessible > AccessibleListBoxEntry::implGetParentAccessible( ) const
+    {
+        Reference< XAccessible > xParent = (Reference< XAccessible >)m_aParent;
+        if ( !xParent.is() )
+        {
+            DBG_ASSERT( m_aEntryPath.size(), "AccessibleListBoxEntry::getAccessibleParent: invalid path!" );
+            if ( 1 == m_aEntryPath.size() )
+            {   // we're a top level entry
+                // -> our parent is the tree listbox itself
+                if ( getListBox() )
+                    xParent = getListBox()->GetAccessible( );
+            }
+            else
+            {   // we have a entry as parent -> get it's accessible
+
+                // shorten our access path by one
+                ::std::deque< sal_Int32 > aParentPath( m_aEntryPath );
+                aParentPath.pop_back();
+
+                // get the entry for this shortened access path
+                SvLBoxEntry* pParentEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+                DBG_ASSERT( pParentEntry, "AccessibleListBoxEntry::implGetParentAccessible: could not obtain a parent entry!" );
+
+                if ( pParentEntry )
+                    xParent = new AccessibleListBoxEntry( *getListBox(), pParentEntry, NULL );
+                    // note that we pass NULL here as parent-accessible:
+                    // this is allowed, as the AccessibleListBoxEntry class will create it's parent
+                    // when needed
+            }
+        }
+
+        return xParent;
+    }
+
+    // -----------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleParent(  ) throw (RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+
+        return implGetParentAccessible( );
+    }
+    // -----------------------------------------------------------------------------
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleIndexInParent(  ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        DBG_ASSERT( !m_aEntryPath.empty(), "empty path" );
+        return m_aEntryPath.empty() ? -1 : m_aEntryPath.back();
+    }
+    // -----------------------------------------------------------------------------
+    sal_Int16 SAL_CALL AccessibleListBoxEntry::getAccessibleRole(  ) throw (RuntimeException)
+    {
+        return AccessibleRole::LABEL;
+    }
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getAccessibleDescription(  ) throw (RuntimeException)
+    {
+        // no description for every item
+        return ::rtl::OUString();
+    }
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getAccessibleName(  ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+        return implGetText();
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessibleRelationSet > SAL_CALL AccessibleListBoxEntry::getAccessibleRelationSet(  ) throw (RuntimeException)
+    {
+        Reference< XAccessibleRelationSet > xRelSet;
+        Reference< XAccessible > xParent;
+        if ( m_aEntryPath.size() > 1 ) // not a root entry
+            xParent = implGetParentAccessible();
+        if ( xParent.is() )
+        {
+            utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
+            Sequence< Reference< XInterface > > aSequence(1);
+            aSequence[0] = xParent;
+            pRelationSetHelper->AddRelation(
+                AccessibleRelation( AccessibleRelationType::NODE_CHILD_OF, aSequence ) );
+            xRelSet = pRelationSetHelper;
+        }
+        return xRelSet;
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessibleStateSet > SAL_CALL AccessibleListBoxEntry::getAccessibleStateSet(  ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper;
+        Reference< XAccessibleStateSet > xStateSet = pStateSetHelper;
+
+        if ( IsAlive_Impl() )
+        {
+               pStateSetHelper->AddState( AccessibleStateType::TRANSIENT );
+               pStateSetHelper->AddState( AccessibleStateType::SELECTABLE );
+               pStateSetHelper->AddState( AccessibleStateType::ENABLED );
+            pStateSetHelper->AddState( AccessibleStateType::SENSITIVE );
+            if ( getListBox()->IsInplaceEditingEnabled() )
+                   pStateSetHelper->AddState( AccessibleStateType::EDITABLE );
+            if ( IsShowing_Impl() )
+                pStateSetHelper->AddState( AccessibleStateType::SHOWING );
+            getListBox()->FillAccessibleEntryStateSet(
+                getListBox()->GetEntryFromPath( m_aEntryPath ), *pStateSetHelper );
+        }
+        else
+            pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+
+        return xStateSet;
+    }
+    // -----------------------------------------------------------------------------
+    Locale SAL_CALL AccessibleListBoxEntry::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        return implGetLocale();
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessibleComponent
+    // -----------------------------------------------------------------------------
+    sal_Bool SAL_CALL AccessibleListBoxEntry::containsPoint( const awt::Point& rPoint ) throw (RuntimeException)
+    {
+        return Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleAtPoint( const awt::Point& _aPoint ) throw (RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+        SvLBoxEntry* pEntry = getListBox()->GetEntry( VCLPoint( _aPoint ) );
+        if ( !pEntry )
+            throw RuntimeException();
+
+        Reference< XAccessible > xAcc;
+        AccessibleListBoxEntry* pAccEntry = new AccessibleListBoxEntry( *getListBox(), pEntry, this );
+        Rectangle aRect = pAccEntry->GetBoundingBox_Impl();
+        if ( aRect.IsInside( VCLPoint( _aPoint ) ) )
+            xAcc = pAccEntry;
+        return xAcc;
+    }
+    // -----------------------------------------------------------------------------
+    awt::Rectangle SAL_CALL AccessibleListBoxEntry::getBounds(  ) throw (RuntimeException)
+    {
+        return AWTRectangle( GetBoundingBox() );
+    }
+    // -----------------------------------------------------------------------------
+    awt::Point SAL_CALL AccessibleListBoxEntry::getLocation(  ) throw (RuntimeException)
+    {
+        return AWTPoint( GetBoundingBox().TopLeft() );
+    }
+    // -----------------------------------------------------------------------------
+    awt::Point SAL_CALL AccessibleListBoxEntry::getLocationOnScreen(  ) throw (RuntimeException)
+    {
+        return AWTPoint( GetBoundingBoxOnScreen().TopLeft() );
+    }
+    // -----------------------------------------------------------------------------
+    awt::Size SAL_CALL AccessibleListBoxEntry::getSize(  ) throw (RuntimeException)
+    {
+        return AWTSize( GetBoundingBox().GetSize() );
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleListBoxEntry::grabFocus(  ) throw (RuntimeException)
+    {
+        // do nothing, because no focus for each item
+    }
+    // -----------------------------------------------------------------------------
+    sal_Int32 AccessibleListBoxEntry::getForeground(    ) throw (RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        sal_Int32 nColor = 0;
+        Reference< XAccessible > xParent = getAccessibleParent();
+        if ( xParent.is() )
+        {
+            Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+            if ( xParentComp.is() )
+                nColor = xParentComp->getForeground();
+        }
+
+        return nColor;
+    }
+    // -----------------------------------------------------------------------------
+    sal_Int32 AccessibleListBoxEntry::getBackground(  ) throw (RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        sal_Int32 nColor = 0;
+        Reference< XAccessible > xParent = getAccessibleParent();
+        if ( xParent.is() )
+        {
+            Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+            if ( xParentComp.is() )
+                nColor = xParentComp->getBackground();
+        }
+
+        return nColor;
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessibleText
+    // -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    awt::Rectangle SAL_CALL AccessibleListBoxEntry::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+
+        if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
+            throw IndexOutOfBoundsException();
+
+        awt::Rectangle aBounds( 0, 0, 0, 0 );
+        SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+        if ( pEntry )
+        {
+            ::vcl::ControlLayoutData aLayoutData;
+            Rectangle aItemRect = GetBoundingBox();
+            getListBox()->RecordLayoutData( &aLayoutData, aItemRect );
+            Rectangle aCharRect = aLayoutData.GetCharacterBounds( nIndex );
+            aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
+            aBounds = AWTRectangle( aCharRect );
+        }
+
+        return aBounds;
+    }
+    // -----------------------------------------------------------------------------
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+
+        sal_Int32 nIndex = -1;
+        SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+        if ( pEntry )
+        {
+            ::vcl::ControlLayoutData aLayoutData;
+            Rectangle aItemRect = GetBoundingBox();
+            getListBox()->RecordLayoutData( &aLayoutData, aItemRect );
+            Point aPnt( VCLPoint( aPoint ) );
+            aPnt += aItemRect.TopLeft();
+            nIndex = aLayoutData.GetIndexForPoint( aPnt );
+        }
+
+        return nIndex;
+    }
+    // -----------------------------------------------------------------------------
+    sal_Bool SAL_CALL AccessibleListBoxEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+
+        String sText = getText();
+        if  ( ( 0 > nStartIndex ) || ( sText.Len() <= nStartIndex )
+            || ( 0 > nEndIndex ) || ( sText.Len() <= nEndIndex ) )
+            throw IndexOutOfBoundsException();
+
+        sal_Int32 nLen = nEndIndex - nStartIndex + 1;
+        ::svt::OStringTransfer::CopyString( sText.Copy( (sal_uInt16)nStartIndex, (sal_uInt16)nLen ), getListBox() );
+
+        return sal_True;
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessibleEventBroadcaster
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleListBoxEntry::addEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
+    {
+        if (xListener.is())
+        {
+            ::osl::MutexGuard aGuard( m_aMutex );
+            if (!m_nClientId)
+                m_nClientId = comphelper::AccessibleEventNotifier::registerClient( );
+            comphelper::AccessibleEventNotifier::addEventListener( m_nClientId, xListener );
+        }
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleListBoxEntry::removeEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
+    {
+        if (xListener.is())
+        {
+            ::osl::MutexGuard aGuard( m_aMutex );
+
+            sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( m_nClientId, xListener );
+            if ( !nListenerCount )
+            {
+                // no listeners anymore
+                // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
+                // and at least to us not firing any events anymore, in case somebody calls
+                // NotifyAccessibleEvent, again
+                sal_Int32 nId = m_nClientId;
+                m_nClientId = 0;
+                comphelper::AccessibleEventNotifier::revokeClient( nId );
+
+            }
+        }
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessibleAction
+    // -----------------------------------------------------------------------------
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleActionCount(  ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        // three actions supported
+        return ACCESSIBLE_ACTION_COUNT;
+    }
+    // -----------------------------------------------------------------------------
+    sal_Bool SAL_CALL AccessibleListBoxEntry::doAccessibleAction( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        sal_Bool bRet = sal_False;
+        checkActionIndex_Impl( nIndex );
+        EnsureIsAlive();
+
+        SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
+        if ( pEntry )
+        {
+            if ( getListBox()->IsExpanded( pEntry ) )
+                getListBox()->Collapse( pEntry );
+            else
+                getListBox()->Expand( pEntry );
+            bRet = sal_True;
+        }
+
+        return bRet;
+    }
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        checkActionIndex_Impl( nIndex );
+        EnsureIsAlive();
+
+        static const ::rtl::OUString sActionDesc( RTL_CONSTASCII_USTRINGPARAM( "toggleExpand" ) );
+        return sActionDesc;
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessibleKeyBinding > AccessibleListBoxEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        Reference< XAccessibleKeyBinding > xRet;
+        checkActionIndex_Impl( nIndex );
+        // ... which key?
+        return xRet;
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessibleSelection
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleListBoxEntry::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+
+        SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, nChildIndex );
+        if ( !pEntry )
+            throw IndexOutOfBoundsException();
+
+        getListBox()->Select( pEntry, sal_True );
+    }
+    // -----------------------------------------------------------------------------
+    sal_Bool SAL_CALL AccessibleListBoxEntry::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+
+        SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, nChildIndex );
+        if ( !pEntry )
+            throw IndexOutOfBoundsException();
+
+        return getListBox()->IsSelected( pEntry );
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleListBoxEntry::clearAccessibleSelection(  ) throw (RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+
+        SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+        if ( !pParent )
+            throw RuntimeException();
+        sal_Int32 i, nCount = 0;
+        nCount = getListBox()->GetLevelChildCount( pParent );
+        for ( i = 0; i < nCount; ++i )
+        {
+            SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i );
+            if ( getListBox()->IsSelected( pEntry ) )
+                getListBox()->Select( pEntry, sal_False );
+        }
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleListBoxEntry::selectAllAccessibleChildren(  ) throw (RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+
+        SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+        if ( !pParent )
+            throw RuntimeException();
+        sal_Int32 i, nCount = 0;
+        nCount = getListBox()->GetLevelChildCount( pParent );
+        for ( i = 0; i < nCount; ++i )
+        {
+            SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i );
+            if ( !getListBox()->IsSelected( pEntry ) )
+                getListBox()->Select( pEntry, sal_True );
+        }
+    }
+    // -----------------------------------------------------------------------------
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+
+        sal_Int32 i, nSelCount = 0, nCount = 0;
+
+        SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+        if ( !pParent )
+            throw RuntimeException();
+        nCount = getListBox()->GetLevelChildCount( pParent );
+        for ( i = 0; i < nCount; ++i )
+        {
+            SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i );
+            if ( getListBox()->IsSelected( pEntry ) )
+                ++nSelCount;
+        }
+
+        return nSelCount;
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+
+        if ( nSelectedChildIndex < 0 || nSelectedChildIndex >= getSelectedAccessibleChildCount() )
+            throw IndexOutOfBoundsException();
+
+        Reference< XAccessible > xChild;
+        sal_Int32 i, nSelCount = 0, nCount = 0;
+
+        SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+        if ( !pParent )
+            throw RuntimeException();
+        nCount = getListBox()->GetLevelChildCount( pParent );
+        for ( i = 0; i < nCount; ++i )
+        {
+            SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i );
+            if ( getListBox()->IsSelected( pEntry ) )
+                ++nSelCount;
+
+            if ( nSelCount == ( nSelectedChildIndex + 1 ) )
+            {
+                xChild = new AccessibleListBoxEntry( *getListBox(), pEntry, this );
+                break;
+            }
+        }
+
+        return xChild;
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleListBoxEntry::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+
+        SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
+        SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, nSelectedChildIndex );
+        if ( !pEntry )
+            throw IndexOutOfBoundsException();
+
+        getListBox()->Select( pEntry, sal_False );
+    }
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getCaretPosition(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        return -1;
+    }
+    sal_Bool SAL_CALL AccessibleListBoxEntry::setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+
+        if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
+            throw IndexOutOfBoundsException();
+
+        return sal_False;
+    }
+    sal_Unicode SAL_CALL AccessibleListBoxEntry::getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getCharacter( nIndex );
+    }
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleListBoxEntry::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+
+        ::rtl::OUString sText( implGetText() );
+
+        if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+            throw IndexOutOfBoundsException();
+
+        return ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >();
+    }
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getCharacterCount(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getCharacterCount(  );
+    }
+
+    ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getSelectedText(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getSelectedText(  );
+    }
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectionStart(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getSelectionStart(  );
+    }
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectionEnd(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getSelectionEnd(  );
+    }
+    sal_Bool SAL_CALL AccessibleListBoxEntry::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+
+        if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) )
+            throw IndexOutOfBoundsException();
+
+        return sal_False;
+    }
+    ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getText(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getText(  );
+    }
+    ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
+    }
+    ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType);
+    }
+    ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType);
+    }
+    ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+    {
+        ALBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+
+        return OCommonAccessibleText::getTextBehindIndex( nIndex ,aTextType);
+    }
+//........................................................................
+}// namespace accessibility
+//........................................................................
+
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
new file mode 100644
index 000000000000..34fd7ef88d1f
--- /dev/null
+++ b/accessibility/source/extended/accessibletabbar.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+#include <accessibility/extended/accessibletabbar.hxx>
+#include <svtools/tabbar.hxx>
+#include <accessibility/extended/accessibletabbarpagelist.hxx>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <unotools/accessiblerelationsethelper.hxx>
+#include <vcl/svapp.hxx>
+#include <toolkit/awt/vclxfont.hxx>
+#include <toolkit/helper/convert.hxx>
+
+#include <vector>
+
+
+//.........................................................................
+namespace accessibility
+{
+//.........................................................................
+
+    using namespace ::com::sun::star;
+    using namespace ::com::sun::star::uno;
+    using namespace ::com::sun::star::lang;
+    using namespace ::com::sun::star::accessibility;
+    using namespace ::comphelper;
+
+    DBG_NAME( AccessibleTabBar )
+
+    //  ----------------------------------------------------
+    //  class AccessibleTabBar
+    //  ----------------------------------------------------
+
+    AccessibleTabBar::AccessibleTabBar( TabBar* pTabBar )
+        :AccessibleTabBarBase( pTabBar )
+    {
+        DBG_CTOR( AccessibleTabBar, NULL );
+
+        if ( m_pTabBar )
+            m_aAccessibleChildren.assign( m_pTabBar->GetAccessibleChildWindowCount() + 1, Reference< XAccessible >() );
+    }
+
+    // -----------------------------------------------------------------------------
+
+    AccessibleTabBar::~AccessibleTabBar()
+    {
+        DBG_DTOR( AccessibleTabBar, NULL );
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+    {
+        Any aOldValue, aNewValue;
+
+        switch ( rVclWindowEvent.GetId() )
+        {
+            case VCLEVENT_WINDOW_ENABLED:
+            {
+                aNewValue <<= AccessibleStateType::SENSITIVE;
+                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+                aNewValue <<= AccessibleStateType::ENABLED;
+                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+            }
+            break;
+            case VCLEVENT_WINDOW_DISABLED:
+            {
+                aOldValue <<= AccessibleStateType::ENABLED;
+                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+                aOldValue <<= AccessibleStateType::SENSITIVE;
+                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+            }
+            break;
+            case VCLEVENT_WINDOW_GETFOCUS:
+            {
+                aNewValue <<= AccessibleStateType::FOCUSED;
+                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+            }
+            break;
+            case VCLEVENT_WINDOW_LOSEFOCUS:
+            {
+                aOldValue <<= AccessibleStateType::FOCUSED;
+                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+            }
+            break;
+            case VCLEVENT_WINDOW_SHOW:
+            {
+                aNewValue <<= AccessibleStateType::SHOWING;
+                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+            }
+            break;
+            case VCLEVENT_WINDOW_HIDE:
+            {
+                aOldValue <<= AccessibleStateType::SHOWING;
+                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+            }
+            break;
+            default:
+            {
+                AccessibleTabBarBase::ProcessWindowEvent( rVclWindowEvent );
+            }
+            break;
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBar::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+    {
+        if ( m_pTabBar )
+        {
+            if ( m_pTabBar->IsEnabled() )
+            {
+                rStateSet.AddState( AccessibleStateType::ENABLED );
+                rStateSet.AddState( AccessibleStateType::SENSITIVE );
+            }
+
+            rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+
+            if ( m_pTabBar->HasFocus() )
+                rStateSet.AddState( AccessibleStateType::FOCUSED );
+
+            rStateSet.AddState( AccessibleStateType::VISIBLE );
+
+            if ( m_pTabBar->IsVisible() )
+                rStateSet.AddState( AccessibleStateType::SHOWING );
+
+            if ( m_pTabBar->GetStyle() & WB_SIZEABLE )
+                rStateSet.AddState( AccessibleStateType::RESIZABLE );
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+    // OCommonAccessibleComponent
+    // -----------------------------------------------------------------------------
+
+    awt::Rectangle AccessibleTabBar::implGetBounds() throw (RuntimeException)
+    {
+        awt::Rectangle aBounds;
+        if ( m_pTabBar )
+            aBounds = AWTRectangle( Rectangle( m_pTabBar->GetPosPixel(), m_pTabBar->GetSizePixel() ) );
+
+        return aBounds;
+    }
+
+    // -----------------------------------------------------------------------------
+    // XInterface
+    // -----------------------------------------------------------------------------
+
+    IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBar, AccessibleExtendedComponentHelper_BASE, AccessibleTabBar_BASE )
+
+    // -----------------------------------------------------------------------------
+    // XTypeProvider
+    // -----------------------------------------------------------------------------
+
+    IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBar, AccessibleExtendedComponentHelper_BASE, AccessibleTabBar_BASE )
+
+    // -----------------------------------------------------------------------------
+    // XComponent
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBar::disposing()
+    {
+        AccessibleTabBarBase::disposing();
+
+        // dispose all children
+        for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+        {
+            Reference< XComponent > xComponent( m_aAccessibleChildren[i], UNO_QUERY );
+            if ( xComponent.is() )
+                xComponent->dispose();
+        }
+        m_aAccessibleChildren.clear();
+    }
+
+    // -----------------------------------------------------------------------------
+    // XServiceInfo
+    // -----------------------------------------------------------------------------
+
+    ::rtl::OUString AccessibleTabBar::getImplementationName() throw (RuntimeException)
+    {
+        return ::rtl::OUString::createFromAscii( "com.sun.star.comp.svtools.AccessibleTabBar" );
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Bool AccessibleTabBar::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException)
+    {
+        Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() );
+        const ::rtl::OUString* pNames = aNames.getConstArray();
+        const ::rtl::OUString* pEnd = pNames + aNames.getLength();
+        for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames )
+            ;
+
+        return pNames != pEnd;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Sequence< ::rtl::OUString > AccessibleTabBar::getSupportedServiceNames() throw (RuntimeException)
+    {
+        Sequence< ::rtl::OUString > aNames(1);
+        aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleTabBar" );
+        return aNames;
+    }
+
+    // -----------------------------------------------------------------------------
+    // XAccessible
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessibleContext > AccessibleTabBar::getAccessibleContext(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return this;
+    }
+
+    // -----------------------------------------------------------------------------
+    // XAccessibleContext
+    // -----------------------------------------------------------------------------
+
+    sal_Int32 AccessibleTabBar::getAccessibleChildCount() throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return m_aAccessibleChildren.size();
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessible > AccessibleTabBar::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        if ( i < 0 || i >= getAccessibleChildCount() )
+            throw IndexOutOfBoundsException();
+
+        Reference< XAccessible > xChild = m_aAccessibleChildren[i];
+        if ( !xChild.is() )
+        {
+            if ( m_pTabBar )
+            {
+                sal_Int32 nCount = m_pTabBar->GetAccessibleChildWindowCount();
+
+                if ( i < nCount )
+                {
+                    Window* pChild = m_pTabBar->GetAccessibleChildWindow( (sal_uInt16)i );
+                    if ( pChild )
+                        xChild = pChild->GetAccessible();
+                }
+                else if ( i == nCount )
+                {
+                    xChild = new AccessibleTabBarPageList( m_pTabBar, i );
+                }
+
+                // insert into child list
+                m_aAccessibleChildren[i] = xChild;
+            }
+        }
+
+        return xChild;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessible > AccessibleTabBar::getAccessibleParent(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        Reference< XAccessible > xParent;
+        if ( m_pTabBar )
+        {
+            Window* pParent = m_pTabBar->GetAccessibleParentWindow();
+            if ( pParent )
+                xParent = pParent->GetAccessible();
+        }
+
+        return xParent;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Int32 AccessibleTabBar::getAccessibleIndexInParent(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        sal_Int32 nIndexInParent = -1;
+        if ( m_pTabBar )
+        {
+            Window* pParent = m_pTabBar->GetAccessibleParentWindow();
+            if ( pParent )
+            {
+                for ( sal_uInt16 i = 0, nCount = pParent->GetAccessibleChildWindowCount(); i < nCount; ++i )
+                {
+                    Window* pChild = pParent->GetAccessibleChildWindow( i );
+                    if ( pChild == static_cast< Window* >( m_pTabBar ) )
+                    {
+                        nIndexInParent = i;
+                        break;
+                    }
+                }
+            }
+        }
+
+        return nIndexInParent;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Int16 AccessibleTabBar::getAccessibleRole(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return AccessibleRole::PANEL;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    ::rtl::OUString AccessibleTabBar::getAccessibleDescription( ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        ::rtl::OUString sDescription;
+        if ( m_pTabBar )
+            sDescription = m_pTabBar->GetAccessibleDescription();
+
+        return sDescription;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    ::rtl::OUString AccessibleTabBar::getAccessibleName(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        ::rtl::OUString sName;
+        if ( m_pTabBar )
+            sName = m_pTabBar->GetAccessibleName();
+
+        return sName;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessibleRelationSet > AccessibleTabBar::getAccessibleRelationSet(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
+        Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
+        return xSet;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessibleStateSet > AccessibleTabBar::getAccessibleStateSet(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper;
+        Reference< XAccessibleStateSet > xSet = pStateSetHelper;
+
+        if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
+        {
+            FillAccessibleStateSet( *pStateSetHelper );
+        }
+        else
+        {
+            pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+        }
+
+        return xSet;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Locale AccessibleTabBar::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return Application::GetSettings().GetLocale();
+    }
+
+    // -----------------------------------------------------------------------------
+    // XAccessibleComponent
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessible > AccessibleTabBar::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        Reference< XAccessible > xChild;
+        for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+        {
+            Reference< XAccessible > xAcc = getAccessibleChild( i );
+            if ( xAcc.is() )
+            {
+                Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
+                if ( xComp.is() )
+                {
+                    Rectangle aRect = VCLRectangle( xComp->getBounds() );
+                    Point aPos = VCLPoint( rPoint );
+                    if ( aRect.IsInside( aPos ) )
+                    {
+                        xChild = xAcc;
+                        break;
+                    }
+                }
+            }
+        }
+
+        return xChild;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBar::grabFocus(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        if ( m_pTabBar )
+            m_pTabBar->GrabFocus();
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Int32 AccessibleTabBar::getForeground(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        sal_Int32 nColor = 0;
+        if ( m_pTabBar )
+        {
+            if ( m_pTabBar->IsControlForeground() )
+                nColor = m_pTabBar->GetControlForeground().GetColor();
+            else
+            {
+                Font aFont;
+                if ( m_pTabBar->IsControlFont() )
+                    aFont = m_pTabBar->GetControlFont();
+                else
+                    aFont = m_pTabBar->GetFont();
+                nColor = aFont.GetColor().GetColor();
+            }
+        }
+
+        return nColor;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Int32 AccessibleTabBar::getBackground(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        sal_Int32 nColor = 0;
+        if ( m_pTabBar )
+        {
+            if ( m_pTabBar->IsControlBackground() )
+                nColor = m_pTabBar->GetControlBackground().GetColor();
+            else
+                nColor = m_pTabBar->GetBackground().GetColor().GetColor();
+        }
+
+        return nColor;
+    }
+
+    // -----------------------------------------------------------------------------
+    // XAccessibleExtendedComponent
+    // -----------------------------------------------------------------------------
+
+    Reference< awt::XFont > AccessibleTabBar::getFont(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        Reference< awt::XFont > xFont;
+        if ( m_pTabBar )
+        {
+            Reference< awt::XDevice > xDev( m_pTabBar->GetComponentInterface(), UNO_QUERY );
+            if ( xDev.is() )
+            {
+                Font aFont;
+                if ( m_pTabBar->IsControlFont() )
+                    aFont = m_pTabBar->GetControlFont();
+                else
+                    aFont = m_pTabBar->GetFont();
+                VCLXFont* pVCLXFont = new VCLXFont;
+                pVCLXFont->Init( *xDev.get(), aFont );
+                xFont = pVCLXFont;
+            }
+        }
+
+        return xFont;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    ::rtl::OUString AccessibleTabBar::getTitledBorderText(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        ::rtl::OUString sText;
+        if ( m_pTabBar )
+            sText = m_pTabBar->GetText();
+
+        return sText;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    ::rtl::OUString AccessibleTabBar::getToolTipText(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        ::rtl::OUString sText;
+        if ( m_pTabBar )
+            sText = m_pTabBar->GetQuickHelpText();
+
+        return sText;
+    }
+
+    // -----------------------------------------------------------------------------
+
+//.........................................................................
+}   // namespace accessibility
+//.........................................................................
diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx
new file mode 100644
index 000000000000..5c26185f6b03
--- /dev/null
+++ b/accessibility/source/extended/accessibletabbarbase.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+#include "accessibility/extended/accessibletabbarbase.hxx"
+#ifndef ACCESSIBILITY_EXT_ACCESSIBLETABBARPAGELIST
+#include "accessibility/extended/accessibletabbarpagelist.hxx"
+#endif
+#include <toolkit/helper/externallock.hxx>
+#include <svtools/tabbar.hxx>
+
+//.........................................................................
+namespace accessibility
+{
+//.........................................................................
+
+AccessibleTabBarBase::AccessibleTabBarBase( TabBar* pTabBar ) :
+    AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() ),
+    m_pTabBar( 0 )
+{
+    m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() );
+    SetTabBarPointer( pTabBar );
+}
+
+AccessibleTabBarBase::~AccessibleTabBarBase()
+{
+    ClearTabBarPointer();
+    DELETEZ( m_pExternalLock );
+}
+
+IMPL_LINK( AccessibleTabBarBase, WindowEventListener, VclSimpleEvent*, pEvent )
+{
+    VclWindowEvent* pWinEvent = dynamic_cast< VclWindowEvent* >( pEvent );
+    DBG_ASSERT( pWinEvent, "AccessibleTabBarBase::WindowEventListener - unknown window event" );
+    if( pWinEvent )
+    {
+        Window* pEventWindow = pWinEvent->GetWindow();
+        DBG_ASSERT( pEventWindow, "AccessibleTabBarBase::WindowEventListener: no window!" );
+
+        if( ( pWinEvent->GetId() == VCLEVENT_TABBAR_PAGEREMOVED ) &&
+            ( (sal_uInt16)(sal_IntPtr) pWinEvent->GetData() == TabBar::PAGE_NOT_FOUND ) &&
+            ( dynamic_cast< AccessibleTabBarPageList *> (this) != NULL ) )
+        {
+            return 0;
+        }
+
+        if ( !pEventWindow->IsAccessibilityEventsSuppressed() || (pWinEvent->GetId() == VCLEVENT_OBJECT_DYING) )
+            ProcessWindowEvent( *pWinEvent );
+    }
+    return 0;
+}
+
+void AccessibleTabBarBase::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+{
+    if( rVclWindowEvent.GetId() == VCLEVENT_OBJECT_DYING )
+        ClearTabBarPointer();
+}
+
+// XComponent
+
+void AccessibleTabBarBase::disposing()
+{
+    AccessibleExtendedComponentHelper_BASE::disposing();
+    ClearTabBarPointer();
+}
+
+// private
+
+void AccessibleTabBarBase::SetTabBarPointer( TabBar* pTabBar )
+{
+    DBG_ASSERT( !m_pTabBar, "AccessibleTabBarBase::SetTabBarPointer - multiple call" );
+    m_pTabBar = pTabBar;
+    if( m_pTabBar )
+        m_pTabBar->AddEventListener( LINK( this, AccessibleTabBarBase, WindowEventListener ) );
+}
+
+void AccessibleTabBarBase::ClearTabBarPointer()
+{
+    if( m_pTabBar )
+    {
+        m_pTabBar->RemoveEventListener( LINK( this, AccessibleTabBarBase, WindowEventListener ) );
+        m_pTabBar = 0;
+    }
+}
+
+//.........................................................................
+}   // namespace accessibility
+//.........................................................................
+
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx
new file mode 100644
index 000000000000..32dfb591a3ad
--- /dev/null
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -0,0 +1,511 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+#include <accessibility/extended/accessibletabbarpage.hxx>
+#include <svtools/tabbar.hxx>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <unotools/accessiblerelationsethelper.hxx>
+#include <vcl/svapp.hxx>
+#include <toolkit/helper/convert.hxx>
+
+
+//.........................................................................
+namespace accessibility
+{
+//.........................................................................
+
+    using namespace ::com::sun::star::accessibility;
+    using namespace ::com::sun::star::uno;
+    using namespace ::com::sun::star::lang;
+    using namespace ::com::sun::star;
+    using namespace ::comphelper;
+
+    // -----------------------------------------------------------------------------
+    // class AccessibleTabBarPage
+    // -----------------------------------------------------------------------------
+
+    AccessibleTabBarPage::AccessibleTabBarPage( TabBar* pTabBar, sal_uInt16 nPageId, const Reference< XAccessible >& rxParent )
+        :AccessibleTabBarBase( pTabBar )
+        ,m_nPageId( nPageId )
+        ,m_xParent( rxParent )
+    {
+        m_bEnabled  = IsEnabled();
+        m_bShowing  = IsShowing();
+        m_bSelected = IsSelected();
+
+        if ( m_pTabBar )
+            m_sPageText = m_pTabBar->GetPageText( m_nPageId );
+    }
+
+    // -----------------------------------------------------------------------------
+
+    AccessibleTabBarPage::~AccessibleTabBarPage()
+    {
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Bool AccessibleTabBarPage::IsEnabled()
+    {
+        OExternalLockGuard aGuard( this );
+
+        sal_Bool bEnabled = sal_False;
+        if ( m_pTabBar )
+            bEnabled = m_pTabBar->IsPageEnabled( m_nPageId );
+
+        return bEnabled;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Bool AccessibleTabBarPage::IsShowing()
+    {
+        sal_Bool bShowing = sal_False;
+
+        if ( m_pTabBar && m_pTabBar->IsVisible() )
+            bShowing = sal_True;
+
+        return bShowing;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Bool AccessibleTabBarPage::IsSelected()
+    {
+        sal_Bool bSelected = sal_False;
+
+        if ( m_pTabBar && m_pTabBar->GetCurPageId() == m_nPageId )
+            bSelected = sal_True;
+
+        return bSelected;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPage::SetEnabled( sal_Bool bEnabled )
+    {
+        if ( m_bEnabled != bEnabled )
+        {
+            Any aOldValue[2], aNewValue[2];
+            if ( m_bEnabled )
+            {
+                aOldValue[0] <<= AccessibleStateType::SENSITIVE;
+                aOldValue[1] <<= AccessibleStateType::ENABLED;
+            }
+            else
+            {
+
+                aNewValue[0] <<= AccessibleStateType::ENABLED;
+                aNewValue[1] <<= AccessibleStateType::SENSITIVE;
+            }
+            m_bEnabled = bEnabled;
+            NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[0], aNewValue[0] );
+            NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[1], aNewValue[1] );
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPage::SetShowing( sal_Bool bShowing )
+    {
+        if ( m_bShowing != bShowing )
+        {
+            Any aOldValue, aNewValue;
+            if ( m_bShowing )
+                aOldValue <<= AccessibleStateType::SHOWING;
+            else
+                aNewValue <<= AccessibleStateType::SHOWING;
+            m_bShowing = bShowing;
+            NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPage::SetSelected( sal_Bool bSelected )
+    {
+        if ( m_bSelected != bSelected )
+        {
+            Any aOldValue, aNewValue;
+            if ( m_bSelected )
+                aOldValue <<= AccessibleStateType::SELECTED;
+            else
+                aNewValue <<= AccessibleStateType::SELECTED;
+            m_bSelected = bSelected;
+            NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPage::SetPageText( const ::rtl::OUString& sPageText )
+    {
+        if ( !m_sPageText.equals( sPageText ) )
+        {
+            Any aOldValue, aNewValue;
+            aOldValue <<= m_sPageText;
+            aNewValue <<= sPageText;
+            m_sPageText = sPageText;
+            NotifyAccessibleEvent( AccessibleEventId::NAME_CHANGED, aOldValue, aNewValue );
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPage::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+    {
+        if ( IsEnabled() )
+        {
+            rStateSet.AddState( AccessibleStateType::ENABLED );
+            rStateSet.AddState( AccessibleStateType::SENSITIVE );
+        }
+
+        rStateSet.AddState( AccessibleStateType::VISIBLE );
+
+        if ( IsShowing() )
+            rStateSet.AddState( AccessibleStateType::SHOWING );
+
+        rStateSet.AddState( AccessibleStateType::SELECTABLE );
+
+        if ( IsSelected() )
+            rStateSet.AddState( AccessibleStateType::SELECTED );
+    }
+
+    // -----------------------------------------------------------------------------
+    // OCommonAccessibleComponent
+    // -----------------------------------------------------------------------------
+
+    awt::Rectangle AccessibleTabBarPage::implGetBounds() throw (RuntimeException)
+    {
+        awt::Rectangle aBounds;
+        if ( m_pTabBar )
+        {
+            // get bounding rectangle relative to the AccessibleTabBar
+            aBounds = AWTRectangle( m_pTabBar->GetPageRect( m_nPageId ) );
+
+            // get position of the AccessibleTabBarPageList relative to the AccessibleTabBar
+            Reference< XAccessible > xParent = getAccessibleParent();
+            if ( xParent.is() )
+            {
+                Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), UNO_QUERY );
+                if ( xParentComponent.is() )
+                {
+                    awt::Point aParentLoc = xParentComponent->getLocation();
+
+                    // calculate bounding rectangle relative to the AccessibleTabBarPageList
+                    aBounds.X -= aParentLoc.X;
+                    aBounds.Y -= aParentLoc.Y;
+                }
+            }
+        }
+
+        return aBounds;
+    }
+
+    // -----------------------------------------------------------------------------
+    // XInterface
+    // -----------------------------------------------------------------------------
+
+    IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBarPage, AccessibleExtendedComponentHelper_BASE, AccessibleTabBarPage_BASE )
+
+    // -----------------------------------------------------------------------------
+    // XTypeProvider
+    // -----------------------------------------------------------------------------
+
+    IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBarPage, AccessibleExtendedComponentHelper_BASE, AccessibleTabBarPage_BASE )
+
+    // -----------------------------------------------------------------------------
+    // XComponent
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPage::disposing()
+    {
+        AccessibleTabBarBase::disposing();
+        m_sPageText = ::rtl::OUString();
+    }
+
+    // -----------------------------------------------------------------------------
+    // XServiceInfo
+    // -----------------------------------------------------------------------------
+
+    ::rtl::OUString AccessibleTabBarPage::getImplementationName() throw (RuntimeException)
+    {
+        return ::rtl::OUString::createFromAscii( "com.sun.star.comp.svtools.AccessibleTabBarPage" );
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Bool AccessibleTabBarPage::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException)
+    {
+        Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() );
+        const ::rtl::OUString* pNames = aNames.getConstArray();
+        const ::rtl::OUString* pEnd = pNames + aNames.getLength();
+        for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames )
+            ;
+
+        return pNames != pEnd;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Sequence< ::rtl::OUString > AccessibleTabBarPage::getSupportedServiceNames() throw (RuntimeException)
+    {
+        Sequence< ::rtl::OUString > aNames(1);
+        aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleTabBarPage" );
+        return aNames;
+    }
+
+    // -----------------------------------------------------------------------------
+    // XAccessible
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessibleContext > AccessibleTabBarPage::getAccessibleContext(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return this;
+    }
+
+    // -----------------------------------------------------------------------------
+    // XAccessibleContext
+    // -----------------------------------------------------------------------------
+
+    sal_Int32 AccessibleTabBarPage::getAccessibleChildCount() throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return 0;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessible > AccessibleTabBarPage::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        if ( i < 0 || i >= getAccessibleChildCount() )
+            throw IndexOutOfBoundsException();
+
+        return Reference< XAccessible >();
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessible > AccessibleTabBarPage::getAccessibleParent(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return m_xParent;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Int32 AccessibleTabBarPage::getAccessibleIndexInParent(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        sal_Int32 nIndexInParent = -1;
+        if ( m_pTabBar )
+            nIndexInParent = m_pTabBar->GetPagePos( m_nPageId );
+
+        return nIndexInParent;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Int16 AccessibleTabBarPage::getAccessibleRole(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return AccessibleRole::PAGE_TAB;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    ::rtl::OUString AccessibleTabBarPage::getAccessibleDescription( ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        ::rtl::OUString sDescription;
+        if ( m_pTabBar )
+            sDescription = m_pTabBar->GetHelpText( m_nPageId );
+
+        return sDescription;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    ::rtl::OUString AccessibleTabBarPage::getAccessibleName(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return m_sPageText;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessibleRelationSet > AccessibleTabBarPage::getAccessibleRelationSet(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
+        Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
+        return xSet;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessibleStateSet > AccessibleTabBarPage::getAccessibleStateSet(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper;
+        Reference< XAccessibleStateSet > xSet = pStateSetHelper;
+
+        if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
+        {
+            FillAccessibleStateSet( *pStateSetHelper );
+        }
+        else
+        {
+            pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+        }
+
+        return xSet;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Locale AccessibleTabBarPage::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return Application::GetSettings().GetLocale();
+    }
+
+    // -----------------------------------------------------------------------------
+    // XAccessibleComponent
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessible > AccessibleTabBarPage::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return Reference< XAccessible >();
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPage::grabFocus(  ) throw (RuntimeException)
+    {
+        // no focus
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Int32 AccessibleTabBarPage::getForeground(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        sal_Int32 nColor = 0;
+        Reference< XAccessible > xParent = getAccessibleParent();
+        if ( xParent.is() )
+        {
+            Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+            if ( xParentComp.is() )
+                nColor = xParentComp->getForeground();
+        }
+
+        return nColor;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Int32 AccessibleTabBarPage::getBackground(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        sal_Int32 nColor = 0;
+        Reference< XAccessible > xParent = getAccessibleParent();
+        if ( xParent.is() )
+        {
+            Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+            if ( xParentComp.is() )
+                nColor = xParentComp->getBackground();
+        }
+
+        return nColor;
+    }
+
+    // -----------------------------------------------------------------------------
+    // XAccessibleExtendedComponent
+    // -----------------------------------------------------------------------------
+
+    Reference< awt::XFont > AccessibleTabBarPage::getFont(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        Reference< awt::XFont > xFont;
+        Reference< XAccessible > xParent = getAccessibleParent();
+        if ( xParent.is() )
+        {
+            Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+            if ( xParentComp.is() )
+                xFont = xParentComp->getFont();
+        }
+
+        return xFont;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    ::rtl::OUString AccessibleTabBarPage::getTitledBorderText(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return m_sPageText;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    ::rtl::OUString AccessibleTabBarPage::getToolTipText(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return ::rtl::OUString();
+    }
+
+    // -----------------------------------------------------------------------------
+
+//.........................................................................
+}   // namespace accessibility
+//.........................................................................
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
new file mode 100644
index 000000000000..a8fce05dcff0
--- /dev/null
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -0,0 +1,805 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+#include <accessibility/extended/accessibletabbarpagelist.hxx>
+#include <svtools/tabbar.hxx>
+#include <accessibility/extended/accessibletabbarpage.hxx>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <unotools/accessiblerelationsethelper.hxx>
+#include <tools/debug.hxx>
+#include <vcl/svapp.hxx>
+#include <toolkit/helper/convert.hxx>
+
+
+//.........................................................................
+namespace accessibility
+{
+//.........................................................................
+
+    using namespace ::com::sun::star::accessibility;
+    using namespace ::com::sun::star::uno;
+    using namespace ::com::sun::star::lang;
+    using namespace ::com::sun::star;
+    using namespace ::comphelper;
+
+    DBG_NAME( AccessibleTabBarPageList )
+
+    // -----------------------------------------------------------------------------
+    // class AccessibleTabBarPageList
+    // -----------------------------------------------------------------------------
+
+    AccessibleTabBarPageList::AccessibleTabBarPageList( TabBar* pTabBar, sal_Int32 nIndexInParent )
+        :AccessibleTabBarBase( pTabBar )
+        ,m_nIndexInParent( nIndexInParent )
+    {
+        DBG_CTOR( AccessibleTabBarPageList, NULL );
+        if ( m_pTabBar )
+            m_aAccessibleChildren.assign( m_pTabBar->GetPageCount(), Reference< XAccessible >() );
+    }
+
+    // -----------------------------------------------------------------------------
+
+    AccessibleTabBarPageList::~AccessibleTabBarPageList()
+    {
+        DBG_DTOR( AccessibleTabBarPageList, NULL );
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPageList::UpdateEnabled( sal_Int32 i, sal_Bool bEnabled )
+    {
+        if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+        {
+            Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+            if ( xChild.is() )
+            {
+                AccessibleTabBarPage* pAccessibleTabBarPage = static_cast< AccessibleTabBarPage* >( xChild.get() );
+                if ( pAccessibleTabBarPage )
+                    pAccessibleTabBarPage->SetEnabled( bEnabled );
+            }
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPageList::UpdateShowing( sal_Bool bShowing )
+    {
+        for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+        {
+            Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+            if ( xChild.is() )
+            {
+                AccessibleTabBarPage* pAccessibleTabBarPage = static_cast< AccessibleTabBarPage* >( xChild.get() );
+                if ( pAccessibleTabBarPage )
+                    pAccessibleTabBarPage->SetShowing( bShowing );
+            }
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPageList::UpdateSelected( sal_Int32 i, sal_Bool bSelected )
+    {
+        NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
+
+        if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+        {
+            Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+            if ( xChild.is() )
+            {
+                AccessibleTabBarPage* pAccessibleTabBarPage = static_cast< AccessibleTabBarPage* >( xChild.get() );
+                if ( pAccessibleTabBarPage )
+                    pAccessibleTabBarPage->SetSelected( bSelected );
+            }
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPageList::UpdatePageText( sal_Int32 i )
+    {
+        if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+        {
+            Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+            if ( xChild.is() )
+            {
+                AccessibleTabBarPage* pAccessibleTabBarPage = static_cast< AccessibleTabBarPage* >( xChild.get() );
+                if ( pAccessibleTabBarPage )
+                {
+                    if ( m_pTabBar )
+                    {
+                        ::rtl::OUString sPageText = m_pTabBar->GetPageText( m_pTabBar->GetPageId( (sal_uInt16)i ) );
+                        pAccessibleTabBarPage->SetPageText( sPageText );
+                    }
+                }
+            }
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPageList::InsertChild( sal_Int32 i )
+    {
+        if ( i >= 0 && i <= (sal_Int32)m_aAccessibleChildren.size() )
+        {
+            // insert entry in child list
+            m_aAccessibleChildren.insert( m_aAccessibleChildren.begin() + i, Reference< XAccessible >() );
+
+            // send accessible child event
+            Reference< XAccessible > xChild( getAccessibleChild( i ) );
+            if ( xChild.is() )
+            {
+                Any aOldValue, aNewValue;
+                aNewValue <<= xChild;
+                NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldValue, aNewValue );
+            }
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPageList::RemoveChild( sal_Int32 i )
+    {
+        if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+        {
+            // get the accessible of the removed page
+            Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+
+            // remove entry in child list
+            m_aAccessibleChildren.erase( m_aAccessibleChildren.begin() + i );
+
+            // send accessible child event
+            if ( xChild.is() )
+            {
+                Any aOldValue, aNewValue;
+                aOldValue <<= xChild;
+                NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldValue, aNewValue );
+
+                Reference< XComponent > xComponent( xChild, UNO_QUERY );
+                if ( xComponent.is() )
+                    xComponent->dispose();
+            }
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPageList::MoveChild( sal_Int32 i, sal_Int32 j )
+    {
+        if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() &&
+             j >= 0 && j <= (sal_Int32)m_aAccessibleChildren.size() )
+        {
+            if ( i < j )
+                --j;
+
+            // get the accessible of the moved page
+            Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+
+            // remove entry in child list at old position
+            m_aAccessibleChildren.erase( m_aAccessibleChildren.begin() + i );
+
+            // insert entry in child list at new position
+            m_aAccessibleChildren.insert( m_aAccessibleChildren.begin() + j, xChild );
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPageList::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+    {
+         switch ( rVclWindowEvent.GetId() )
+         {
+            case VCLEVENT_WINDOW_ENABLED:
+            {
+               Any aNewValue;
+                aNewValue <<= AccessibleStateType::SENSITIVE;
+                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, Any(), aNewValue );
+                aNewValue <<= AccessibleStateType::ENABLED;
+                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, Any(), aNewValue );
+            }
+            break;
+            case VCLEVENT_WINDOW_DISABLED:
+            {
+               Any aOldValue;
+                aOldValue <<= AccessibleStateType::ENABLED;
+                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, Any() );
+                aOldValue <<= AccessibleStateType::SENSITIVE;
+                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, Any() );
+            }
+            break;
+            case VCLEVENT_WINDOW_SHOW:
+            {
+                Any aOldValue, aNewValue;
+                aNewValue <<= AccessibleStateType::SHOWING;
+                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+                UpdateShowing( sal_True );
+            }
+            break;
+            case VCLEVENT_WINDOW_HIDE:
+            {
+                Any aOldValue, aNewValue;
+                aOldValue <<= AccessibleStateType::SHOWING;
+                NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+                UpdateShowing( sal_False );
+            }
+            break;
+            case VCLEVENT_TABBAR_PAGEENABLED:
+            {
+                if ( m_pTabBar )
+                {
+                    sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
+                    sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId );
+                    UpdateEnabled( nPagePos, sal_True );
+                }
+            }
+            break;
+            case VCLEVENT_TABBAR_PAGEDISABLED:
+            {
+                if ( m_pTabBar )
+                {
+                    sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
+                    sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId );
+                    UpdateEnabled( nPagePos, sal_False );
+                }
+            }
+            break;
+            case VCLEVENT_TABBAR_PAGESELECTED:
+            {
+                // do nothing
+            }
+            break;
+            case VCLEVENT_TABBAR_PAGEACTIVATED:
+            {
+                if ( m_pTabBar )
+                {
+                    sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
+                    sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId );
+                    UpdateSelected( nPagePos, sal_True );
+                }
+            }
+            break;
+            case VCLEVENT_TABBAR_PAGEDEACTIVATED:
+            {
+                if ( m_pTabBar )
+                {
+                    sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
+                    sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId );
+                    UpdateSelected( nPagePos, sal_False );
+                }
+            }
+            break;
+            case VCLEVENT_TABBAR_PAGEINSERTED:
+            {
+                if ( m_pTabBar )
+                {
+                    sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
+                    sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId );
+                    InsertChild( nPagePos );
+                }
+            }
+            break;
+            case VCLEVENT_TABBAR_PAGEREMOVED:
+            {
+                if ( m_pTabBar )
+                {
+                    sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
+
+                    if ( nPageId == TabBar::PAGE_NOT_FOUND )
+                    {
+                        for ( sal_Int32 i = m_aAccessibleChildren.size() - 1; i >= 0; --i )
+                            RemoveChild( i );
+                    }
+                    else
+                    {
+                        for ( sal_Int32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i )
+                        {
+                            Reference< XAccessible > xChild( getAccessibleChild( i ) );
+                            if ( xChild.is() )
+                            {
+                                AccessibleTabBarPage* pAccessibleTabBarPage = static_cast< AccessibleTabBarPage* >( xChild.get() );
+                                if ( pAccessibleTabBarPage && pAccessibleTabBarPage->GetPageId() == nPageId )
+                                {
+                                    RemoveChild( i );
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            break;
+            case VCLEVENT_TABBAR_PAGEMOVED:
+            {
+                Pair* pPair = (Pair*) rVclWindowEvent.GetData();
+                if ( pPair )
+                    MoveChild( pPair->A(), pPair->B() );
+            }
+            break;
+            case VCLEVENT_TABBAR_PAGETEXTCHANGED:
+            {
+                sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
+                sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId );
+                UpdatePageText( nPagePos );
+            }
+            break;
+            default:
+            {
+                AccessibleTabBarBase::ProcessWindowEvent( rVclWindowEvent );
+            }
+            break;
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPageList::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+    {
+        if ( m_pTabBar )
+        {
+            if ( m_pTabBar->IsEnabled() )
+            {
+                rStateSet.AddState( AccessibleStateType::ENABLED );
+                rStateSet.AddState( AccessibleStateType::SENSITIVE );
+            }
+
+            rStateSet.AddState( AccessibleStateType::VISIBLE );
+
+            if ( m_pTabBar->IsVisible() )
+                rStateSet.AddState( AccessibleStateType::SHOWING );
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+    // OCommonAccessibleComponent
+    // -----------------------------------------------------------------------------
+
+    awt::Rectangle AccessibleTabBarPageList::implGetBounds() throw (RuntimeException)
+    {
+        awt::Rectangle aBounds;
+        if ( m_pTabBar )
+            aBounds = AWTRectangle( m_pTabBar->GetPageArea() );
+
+        return aBounds;
+    }
+
+    // -----------------------------------------------------------------------------
+    // XInterface
+    // -----------------------------------------------------------------------------
+
+    IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBarPageList, AccessibleExtendedComponentHelper_BASE, AccessibleTabBarPageList_BASE )
+
+    // -----------------------------------------------------------------------------
+    // XTypeProvider
+    // -----------------------------------------------------------------------------
+
+    IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBarPageList, AccessibleExtendedComponentHelper_BASE, AccessibleTabBarPageList_BASE )
+
+    // -----------------------------------------------------------------------------
+    // XComponent
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPageList::disposing()
+    {
+        AccessibleTabBarBase::disposing();
+
+        // dispose all children
+        for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+        {
+            Reference< XComponent > xComponent( m_aAccessibleChildren[i], UNO_QUERY );
+            if ( xComponent.is() )
+                xComponent->dispose();
+        }
+        m_aAccessibleChildren.clear();
+    }
+
+    // -----------------------------------------------------------------------------
+    // XServiceInfo
+    // -----------------------------------------------------------------------------
+
+    ::rtl::OUString AccessibleTabBarPageList::getImplementationName() throw (RuntimeException)
+    {
+        return ::rtl::OUString::createFromAscii( "com.sun.star.comp.svtools.AccessibleTabBarPageList" );
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Bool AccessibleTabBarPageList::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException)
+    {
+        Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() );
+        const ::rtl::OUString* pNames = aNames.getConstArray();
+        const ::rtl::OUString* pEnd = pNames + aNames.getLength();
+        for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames )
+            ;
+
+        return pNames != pEnd;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Sequence< ::rtl::OUString > AccessibleTabBarPageList::getSupportedServiceNames() throw (RuntimeException)
+    {
+        Sequence< ::rtl::OUString > aNames(1);
+        aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleTabBarPageList" );
+        return aNames;
+    }
+
+    // -----------------------------------------------------------------------------
+    // XAccessible
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessibleContext > AccessibleTabBarPageList::getAccessibleContext(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return this;
+    }
+
+    // -----------------------------------------------------------------------------
+    // XAccessibleContext
+    // -----------------------------------------------------------------------------
+
+    sal_Int32 AccessibleTabBarPageList::getAccessibleChildCount() throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return m_aAccessibleChildren.size();
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessible > AccessibleTabBarPageList::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        if ( i < 0 || i >= getAccessibleChildCount() )
+            throw IndexOutOfBoundsException();
+
+        Reference< XAccessible > xChild = m_aAccessibleChildren[i];
+        if ( !xChild.is() )
+        {
+            if ( m_pTabBar )
+            {
+                sal_uInt16 nPageId = m_pTabBar->GetPageId( (sal_uInt16)i );
+
+                xChild = new AccessibleTabBarPage( m_pTabBar, nPageId, this );
+
+                // insert into child list
+                m_aAccessibleChildren[i] = xChild;
+            }
+        }
+
+        return xChild;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessible > AccessibleTabBarPageList::getAccessibleParent(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        Reference< XAccessible > xParent;
+        if ( m_pTabBar )
+            xParent = m_pTabBar->GetAccessible();
+
+        return xParent;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Int32 AccessibleTabBarPageList::getAccessibleIndexInParent(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return m_nIndexInParent;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Int16 AccessibleTabBarPageList::getAccessibleRole(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return AccessibleRole::PAGE_TAB_LIST;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    ::rtl::OUString AccessibleTabBarPageList::getAccessibleDescription( ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return ::rtl::OUString();
+    }
+
+    // -----------------------------------------------------------------------------
+
+    ::rtl::OUString AccessibleTabBarPageList::getAccessibleName(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return ::rtl::OUString();
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessibleRelationSet > AccessibleTabBarPageList::getAccessibleRelationSet(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
+        Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
+        return xSet;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessibleStateSet > AccessibleTabBarPageList::getAccessibleStateSet(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper;
+        Reference< XAccessibleStateSet > xSet = pStateSetHelper;
+
+        if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
+        {
+            FillAccessibleStateSet( *pStateSetHelper );
+        }
+        else
+        {
+            pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+        }
+
+        return xSet;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Locale AccessibleTabBarPageList::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return Application::GetSettings().GetLocale();
+    }
+
+    // -----------------------------------------------------------------------------
+    // XAccessibleComponent
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessible > AccessibleTabBarPageList::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        Reference< XAccessible > xChild;
+        for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+        {
+            Reference< XAccessible > xAcc = getAccessibleChild( i );
+            if ( xAcc.is() )
+            {
+                Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
+                if ( xComp.is() )
+                {
+                    Rectangle aRect = VCLRectangle( xComp->getBounds() );
+                    Point aPos = VCLPoint( rPoint );
+                    if ( aRect.IsInside( aPos ) )
+                    {
+                        xChild = xAcc;
+                        break;
+                    }
+                }
+            }
+        }
+
+        return xChild;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPageList::grabFocus(  ) throw (RuntimeException)
+    {
+        // no focus
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Int32 AccessibleTabBarPageList::getForeground(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        sal_Int32 nColor = 0;
+        Reference< XAccessible > xParent = getAccessibleParent();
+        if ( xParent.is() )
+        {
+            Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+            if ( xParentComp.is() )
+                nColor = xParentComp->getForeground();
+        }
+
+        return nColor;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Int32 AccessibleTabBarPageList::getBackground(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        sal_Int32 nColor = 0;
+        Reference< XAccessible > xParent = getAccessibleParent();
+        if ( xParent.is() )
+        {
+            Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+            if ( xParentComp.is() )
+                nColor = xParentComp->getBackground();
+        }
+
+        return nColor;
+    }
+
+    // -----------------------------------------------------------------------------
+    // XAccessibleExtendedComponent
+    // -----------------------------------------------------------------------------
+
+    Reference< awt::XFont > AccessibleTabBarPageList::getFont(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        Reference< awt::XFont > xFont;
+        Reference< XAccessible > xParent = getAccessibleParent();
+        if ( xParent.is() )
+        {
+            Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+            if ( xParentComp.is() )
+                xFont = xParentComp->getFont();
+        }
+
+        return xFont;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    ::rtl::OUString AccessibleTabBarPageList::getTitledBorderText(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return ::rtl::OUString();
+    }
+
+    // -----------------------------------------------------------------------------
+
+    ::rtl::OUString AccessibleTabBarPageList::getToolTipText(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return ::rtl::OUString();
+    }
+
+    // -----------------------------------------------------------------------------
+    // XAccessibleSelection
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPageList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
+            throw IndexOutOfBoundsException();
+
+        if ( m_pTabBar )
+        {
+            m_pTabBar->SetCurPageId( m_pTabBar->GetPageId( (sal_uInt16)nChildIndex ) );
+            m_pTabBar->Update();
+            m_pTabBar->ActivatePage();
+            m_pTabBar->Select();
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Bool AccessibleTabBarPageList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
+            throw IndexOutOfBoundsException();
+
+        sal_Bool bSelected = sal_False;
+        if ( m_pTabBar && m_pTabBar->GetCurPageId() == m_pTabBar->GetPageId( (sal_uInt16)nChildIndex ) )
+            bSelected = sal_True;
+
+        return bSelected;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPageList::clearAccessibleSelection(  ) throw (RuntimeException)
+    {
+        // This method makes no sense in a TabBar, and so does nothing.
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPageList::selectAllAccessibleChildren(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        selectAccessibleChild( 0 );
+    }
+
+    // -----------------------------------------------------------------------------
+
+    sal_Int32 AccessibleTabBarPageList::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        return 1;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    Reference< XAccessible > AccessibleTabBarPageList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        if ( nSelectedChildIndex < 0 || nSelectedChildIndex >= getSelectedAccessibleChildCount() )
+            throw IndexOutOfBoundsException();
+
+        Reference< XAccessible > xChild;
+
+        for ( sal_Int32 i = 0, j = 0, nCount = getAccessibleChildCount(); i < nCount; i++ )
+        {
+            if ( isAccessibleChildSelected( i ) && ( j++ == nSelectedChildIndex ) )
+            {
+                xChild = getAccessibleChild( i );
+                break;
+            }
+        }
+
+        return xChild;
+    }
+
+    // -----------------------------------------------------------------------------
+
+    void AccessibleTabBarPageList::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        OExternalLockGuard aGuard( this );
+
+        if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
+            throw IndexOutOfBoundsException();
+
+        // This method makes no sense in a TabBar, and so does nothing.
+    }
+
+    // -----------------------------------------------------------------------------
+
+//.........................................................................
+}   // namespace accessibility
+//.........................................................................
diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx
new file mode 100644
index 000000000000..aed68e55e482
--- /dev/null
+++ b/accessibility/source/extended/accessibletablistbox.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+
+#ifndef ACCESSIBILITY_EXT_ACCESSIBLETABLISTBOX_HXX_
+#include "accessibility/extended/accessibletablistbox.hxx"
+#endif
+#include "accessibility/extended/accessibletablistboxtable.hxx"
+#include <svtools/svtabbx.hxx>
+#include <comphelper/sequence.hxx>
+
+//........................................................................
+namespace accessibility
+{
+//........................................................................
+
+    // class TLBSolarGuard ---------------------------------------------------------
+
+    /** Aquire the solar mutex. */
+    class TLBSolarGuard : public ::vos::OGuard
+    {
+    public:
+        inline TLBSolarGuard() : ::vos::OGuard( Application::GetSolarMutex() ) {}
+    };
+
+    // class AccessibleTabListBox -----------------------------------------------------
+
+    using namespace ::com::sun::star::accessibility;
+    using namespace ::com::sun::star::uno;
+    using namespace ::com::sun::star::lang;
+    using namespace ::com::sun::star;
+
+    DBG_NAME(AccessibleTabListBox)
+
+    // -----------------------------------------------------------------------------
+    // Ctor() and Dtor()
+    // -----------------------------------------------------------------------------
+    AccessibleTabListBox::AccessibleTabListBox( const Reference< XAccessible >& rxParent, SvHeaderTabListBox& rBox )
+        :AccessibleBrowseBox( rxParent, NULL, rBox )
+        ,m_pTabListBox( &rBox )
+
+    {
+        DBG_CTOR( AccessibleTabListBox, NULL );
+
+        osl_incrementInterlockedCount( &m_refCount );
+        {
+            setCreator( this );
+        }
+        osl_decrementInterlockedCount( &m_refCount );
+    }
+
+    // -----------------------------------------------------------------------------
+    AccessibleTabListBox::~AccessibleTabListBox()
+    {
+        DBG_DTOR( AccessibleTabListBox, NULL );
+
+        if ( isAlive() )
+        {
+            // increment ref count to prevent double call of Dtor
+            osl_incrementInterlockedCount( &m_refCount );
+            dispose();
+        }
+    }
+    // -----------------------------------------------------------------------------
+    AccessibleBrowseBoxTable* AccessibleTabListBox::createAccessibleTable()
+    {
+        return new AccessibleTabListBoxTable( this, *m_pTabListBox );
+    }
+
+    // XInterface -----------------------------------------------------------------
+    IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabListBox, AccessibleBrowseBox, AccessibleTabListBox_Base )
+
+    // XTypeProvider --------------------------------------------------------------
+    IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabListBox, AccessibleBrowseBox, AccessibleTabListBox_Base )
+
+    // XAccessibleContext ---------------------------------------------------------
+
+    sal_Int32 SAL_CALL AccessibleTabListBox::getAccessibleChildCount()
+        throw ( uno::RuntimeException )
+    {
+        return 2; // header and table
+    }
+
+    // -----------------------------------------------------------------------------
+    Reference< XAccessibleContext > SAL_CALL AccessibleTabListBox::getAccessibleContext() throw ( RuntimeException )
+    {
+        return this;
+    }
+
+    // -----------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL
+    AccessibleTabListBox::getAccessibleChild( sal_Int32 nChildIndex )
+        throw ( IndexOutOfBoundsException, RuntimeException )
+    {
+        TLBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        ensureIsAlive();
+
+        if ( nChildIndex < 0 || nChildIndex > 1 )
+            throw IndexOutOfBoundsException();
+
+        Reference< XAccessible > xRet;
+        if (nChildIndex == 0)
+        {
+            //! so far the actual implementation object only supports column headers
+            xRet = implGetFixedChild( ::svt::BBINDEX_COLUMNHEADERBAR );
+        }
+        else if (nChildIndex == 1)
+            xRet = implGetFixedChild( ::svt::BBINDEX_TABLE );
+
+        if ( !xRet.is() )
+            throw RuntimeException();
+
+        return xRet;
+    }
+
+//........................................................................
+}// namespace accessibility
+//........................................................................
+
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
new file mode 100644
index 000000000000..a87ba9586098
--- /dev/null
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -0,0 +1,383 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+
+#ifndef ACCESSIBILITY_EXT_ACCESSIBLETABLISTBOXTABLE_HXX_
+#include "accessibility/extended/accessibletablistboxtable.hxx"
+#endif
+#include "accessibility/extended/AccessibleBrowseBoxTableCell.hxx"
+#include "accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx"
+#include <svtools/svtabbx.hxx>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+
+//........................................................................
+namespace accessibility
+{
+//........................................................................
+
+    // class TLBSolarGuard ---------------------------------------------------------
+
+    /** Aquire the solar mutex. */
+    class TLBSolarGuard : public ::vos::OGuard
+    {
+    public:
+        inline TLBSolarGuard() : ::vos::OGuard( Application::GetSolarMutex() ) {}
+    };
+
+    // class AccessibleTabListBoxTable ---------------------------------------------
+
+    using namespace ::com::sun::star::accessibility;
+    using namespace ::com::sun::star::uno;
+    using namespace ::com::sun::star::lang;
+    using namespace ::com::sun::star;
+
+    DBG_NAME(AccessibleTabListBoxTable)
+
+    // -----------------------------------------------------------------------------
+    // Ctor() and Dtor()
+    // -----------------------------------------------------------------------------
+    AccessibleTabListBoxTable::AccessibleTabListBoxTable( const Reference< XAccessible >& rxParent, SvHeaderTabListBox& rBox ) :
+
+        AccessibleBrowseBoxTable( rxParent, rBox ),
+
+        m_pTabListBox   ( &rBox )
+
+    {
+        DBG_CTOR( AccessibleTabListBoxTable, NULL );
+
+        m_pTabListBox->AddEventListener( LINK( this, AccessibleTabListBoxTable, WindowEventListener ) );
+    }
+    // -----------------------------------------------------------------------------
+    AccessibleTabListBoxTable::~AccessibleTabListBoxTable()
+    {
+        DBG_DTOR( AccessibleTabListBoxTable, NULL );
+
+        if ( isAlive() )
+        {
+            m_pTabListBox = NULL;
+
+            // increment ref count to prevent double call of Dtor
+            osl_incrementInterlockedCount( &m_refCount );
+            dispose();
+        }
+    }
+    // -----------------------------------------------------------------------------
+    void AccessibleTabListBoxTable::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+    {
+        if ( isAlive() )
+        {
+            sal_uLong nEventId = rVclWindowEvent.GetId();
+            switch ( nEventId )
+            {
+                case  VCLEVENT_OBJECT_DYING :
+                {
+                    m_pTabListBox->RemoveEventListener( LINK( this, AccessibleTabListBoxTable, WindowEventListener ) );
+                    m_pTabListBox = NULL;
+                    break;
+                }
+
+                case VCLEVENT_CONTROL_GETFOCUS :
+                case VCLEVENT_CONTROL_LOSEFOCUS :
+                {
+                    uno::Any aOldValue, aNewValue;
+                    if ( VCLEVENT_CONTROL_GETFOCUS == nEventId )
+                        aNewValue <<= AccessibleStateType::FOCUSED;
+                    else
+                        aOldValue <<= AccessibleStateType::FOCUSED;
+                    commitEvent( AccessibleEventId::STATE_CHANGED, aNewValue, aOldValue );
+                    break;
+                }
+
+                case VCLEVENT_LISTBOX_SELECT :
+                {
+                    // First send an event that tells the listeners of a
+                    // modified selection.  The active descendant event is
+                    // send after that so that the receiving AT has time to
+                    // read the text or name of the active child.
+                    commitEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
+                    if ( m_pTabListBox && m_pTabListBox->HasFocus() )
+                    {
+                        SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
+                        if ( pEntry )
+                        {
+                            sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry );
+                            sal_uInt16 nCol = m_pTabListBox->GetCurrColumn();
+                            Reference< XAccessible > xChild =
+                                m_pTabListBox->CreateAccessibleCell( nRow, nCol );
+                            uno::Any aOldValue, aNewValue;
+
+                            if ( m_pTabListBox->IsTransientChildrenDisabled() )
+                            {
+                                aNewValue <<= AccessibleStateType::FOCUSED;
+                                TriState eState = STATE_DONTKNOW;
+                                if ( m_pTabListBox->IsCellCheckBox( nRow, nCol, eState ) )
+                                {
+                                    AccessibleCheckBoxCell* pCell =
+                                        static_cast< AccessibleCheckBoxCell* >( xChild.get() );
+                                    pCell->commitEvent( AccessibleEventId::STATE_CHANGED, aNewValue, aOldValue );
+                                }
+                                else
+                                {
+                                    AccessibleBrowseBoxTableCell* pCell =
+                                        static_cast< AccessibleBrowseBoxTableCell* >( xChild.get() );
+                                    pCell->commitEvent( AccessibleEventId::STATE_CHANGED, aNewValue, aOldValue );
+                                }
+                            }
+                            else
+                            {
+                                aNewValue <<= xChild;
+                                commitEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aNewValue, aOldValue );
+                            }
+                        }
+                    }
+                    break;
+                }
+
+                case VCLEVENT_CHECKBOX_TOGGLE :
+                {
+                    if ( m_pTabListBox && m_pTabListBox->HasFocus() )
+                    {
+                        SvLBoxEntry* pEntry = static_cast< SvLBoxEntry* >( rVclWindowEvent.GetData() );
+                        if ( pEntry )
+                        {
+                            sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry );
+                            sal_uInt16 nCol = m_pTabListBox->GetCurrColumn();
+                            TriState eState = STATE_DONTKNOW;
+                            if ( m_pTabListBox->IsCellCheckBox( nRow, nCol, eState ) )
+                            {
+                                Reference< XAccessible > xChild =
+                                    m_pTabListBox->CreateAccessibleCell( nRow, nCol );
+                                AccessibleCheckBoxCell* pCell =
+                                    static_cast< AccessibleCheckBoxCell* >( xChild.get() );
+                                pCell->SetChecked( m_pTabListBox->IsItemChecked( pEntry, nCol ) );
+                            }
+                        }
+                    }
+                    break;
+                }
+
+                case VCLEVENT_TABLECELL_NAMECHANGED :
+                {
+                    if ( m_pTabListBox->IsTransientChildrenDisabled() )
+                    {
+                        commitEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
+                        TabListBoxEventData* pData = static_cast< TabListBoxEventData* >( rVclWindowEvent.GetData() );
+                        SvLBoxEntry* pEntry = pData != NULL ? pData->m_pEntry : NULL;
+                        if ( pEntry )
+                        {
+                            sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry );
+                            sal_uInt16 nCol = pData->m_nColumn;
+                            Reference< XAccessible > xChild =
+                                m_pTabListBox->CreateAccessibleCell( nRow, nCol );
+                            uno::Any aOldValue, aNewValue;
+                            aOldValue <<= ::rtl::OUString( pData->m_sOldText );
+                            ::rtl::OUString sNewText( m_pTabListBox->GetCellText( nRow, nCol ) );
+                            aNewValue <<= sNewText;
+                            TriState eState = STATE_DONTKNOW;
+
+                            if ( m_pTabListBox->IsCellCheckBox( nRow, nCol, eState ) )
+                            {
+                                AccessibleCheckBoxCell* pCell =
+                                    static_cast< AccessibleCheckBoxCell* >( xChild.get() );
+                                pCell->commitEvent( AccessibleEventId::NAME_CHANGED, aOldValue, aNewValue );
+                            }
+                            else
+                            {
+                                AccessibleBrowseBoxTableCell* pCell =
+                                    static_cast< AccessibleBrowseBoxTableCell* >( xChild.get() );
+                                pCell->nameChanged( sNewText, pData->m_sOldText );
+                            }
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+    }
+    // -----------------------------------------------------------------------------
+    IMPL_LINK( AccessibleTabListBoxTable, WindowEventListener, VclSimpleEvent*, pEvent )
+    {
+        DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown WindowEvent!" );
+        if ( pEvent && pEvent->ISA( VclWindowEvent ) )
+        {
+            DBG_ASSERT( ( (VclWindowEvent*)pEvent )->GetWindow() && m_pTabListBox, "no event window" );
+            ProcessWindowEvent( *(VclWindowEvent*)pEvent );
+        }
+        return 0;
+    }
+    // helpers --------------------------------------------------------------------
+
+    void AccessibleTabListBoxTable::ensureValidIndex( sal_Int32 _nIndex ) const
+            SAL_THROW( ( IndexOutOfBoundsException ) )
+    {
+        if ( ( _nIndex < 0 ) || ( _nIndex >= implGetCellCount() ) )
+            throw IndexOutOfBoundsException();
+    }
+
+    sal_Bool AccessibleTabListBoxTable::implIsRowSelected( sal_Int32 _nRow ) const
+    {
+        return m_pTabListBox ? m_pTabListBox->IsSelected( m_pTabListBox->GetEntry( _nRow ) ) : sal_False;
+    }
+
+    void AccessibleTabListBoxTable::implSelectRow( sal_Int32 _nRow, sal_Bool _bSelect )
+    {
+        if ( m_pTabListBox )
+            m_pTabListBox->Select( m_pTabListBox->GetEntry( _nRow ), _bSelect );
+    }
+
+    sal_Int32 AccessibleTabListBoxTable::implGetRowCount() const
+    {
+        return m_pTabListBox ? m_pTabListBox->GetEntryCount() : 0;
+    }
+
+    sal_Int32 AccessibleTabListBoxTable::implGetColumnCount() const
+    {
+        return m_pTabListBox ? m_pTabListBox->GetColumnCount() : 0;
+    }
+
+    sal_Int32 AccessibleTabListBoxTable::implGetSelRowCount() const
+    {
+        return m_pTabListBox ? m_pTabListBox->GetSelectionCount() : 0;
+    }
+
+    sal_Int32 AccessibleTabListBoxTable::implGetSelRow( sal_Int32 nSelRow ) const
+    {
+        if ( m_pTabListBox )
+        {
+            sal_Int32 nRow = 0;
+            SvLBoxEntry* pEntry = m_pTabListBox->FirstSelected();
+            while ( pEntry )
+            {
+                ++nRow;
+                if ( nRow == nSelRow )
+                    return m_pTabListBox->GetEntryPos( pEntry );
+                pEntry = m_pTabListBox->NextSelected( pEntry );
+            }
+        }
+
+        return 0;
+    }
+    // -----------------------------------------------------------------------------
+    // XInterface & XTypeProvider
+    // -----------------------------------------------------------------------------
+    IMPLEMENT_FORWARD_XINTERFACE2(AccessibleTabListBoxTable, AccessibleBrowseBoxTable, AccessibleTabListBoxTableImplHelper)
+    IMPLEMENT_FORWARD_XTYPEPROVIDER2(AccessibleTabListBoxTable, AccessibleBrowseBoxTable, AccessibleTabListBoxTableImplHelper)
+    // -----------------------------------------------------------------------------
+    // XServiceInfo
+    // -----------------------------------------------------------------------------
+    ::rtl::OUString AccessibleTabListBoxTable::getImplementationName (void) throw (RuntimeException)
+    {
+        return ::rtl::OUString::createFromAscii("com.sun.star.comp.svtools.AccessibleTabListBoxTable");
+    }
+    // -----------------------------------------------------------------------------
+    // XAccessibleSelection
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleTabListBoxTable::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        TLBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+
+        ensureIsAlive();
+        ensureValidIndex( nChildIndex );
+
+        implSelectRow( implGetRow( nChildIndex ), sal_True );
+    }
+    // -----------------------------------------------------------------------------
+    sal_Bool SAL_CALL AccessibleTabListBoxTable::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        TLBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+
+        ensureIsAlive();
+        ensureValidIndex( nChildIndex );
+
+        return implIsRowSelected( implGetRow( nChildIndex ) );
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleTabListBoxTable::clearAccessibleSelection(  ) throw (RuntimeException)
+    {
+        TLBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+
+        ensureIsAlive();
+
+        m_pTabListBox->SetNoSelection();
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleTabListBoxTable::selectAllAccessibleChildren(  ) throw (RuntimeException)
+    {
+        TLBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+
+        ensureIsAlive();
+
+        m_pTabListBox->SelectAll();
+    }
+    // -----------------------------------------------------------------------------
+    sal_Int32 SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
+    {
+        TLBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+
+        ensureIsAlive();
+
+        return implGetColumnCount() * implGetSelRowCount();
+    }
+    // -----------------------------------------------------------------------------
+    Reference< XAccessible > SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        TLBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+
+        ensureIsAlive();
+
+        sal_Int32 nRows = implGetSelRowCount();
+        if ( nRows == 0 )
+            throw IndexOutOfBoundsException();
+
+        sal_Int32 nRow = implGetSelRow( nSelectedChildIndex % nRows );
+        sal_Int32 nColumn = nSelectedChildIndex / nRows;
+        return getAccessibleCellAt( nRow, nColumn );
+    }
+    // -----------------------------------------------------------------------------
+    void SAL_CALL AccessibleTabListBoxTable::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    {
+        TLBSolarGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+
+        ensureIsAlive();
+        ensureValidIndex( nSelectedChildIndex );
+
+        implSelectRow( implGetRow( nSelectedChildIndex ), sal_False );
+    }
+
+//........................................................................
+}// namespace accessibility
+//........................................................................
+
diff --git a/accessibility/source/extended/listboxaccessible.cxx b/accessibility/source/extended/listboxaccessible.cxx
new file mode 100644
index 000000000000..8600003c2bff
--- /dev/null
+++ b/accessibility/source/extended/listboxaccessible.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+#include <accessibility/extended/listboxaccessible.hxx>
+#include <svtools/svtreebx.hxx>
+
+//........................................................................
+namespace accessibility
+{
+//........................................................................
+
+    //====================================================================
+    //= ListBoxAccessibleBase
+    //====================================================================
+    //--------------------------------------------------------------------
+    ListBoxAccessibleBase::ListBoxAccessibleBase( SvTreeListBox& _rWindow )
+        :m_pWindow( &_rWindow )
+    {
+        m_pWindow->AddEventListener( LINK( this, ListBoxAccessibleBase, WindowEventListener ) );
+    }
+
+    //--------------------------------------------------------------------
+    ListBoxAccessibleBase::~ListBoxAccessibleBase( )
+    {
+        if ( m_pWindow )
+        {
+            // cannot call "dispose" here, as it is abstract, so the VTABLE of the derived class
+            // is not intact anymore
+            // so we call our "disposing" only
+            disposing();
+        }
+    }
+
+    //--------------------------------------------------------------------
+    IMPL_LINK( ListBoxAccessibleBase, WindowEventListener, VclSimpleEvent*, pEvent )
+    {
+        DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ), "ListBoxAccessibleBase::WindowEventListener: unexpected WindowEvent!" );
+        if ( pEvent && pEvent->ISA( VclWindowEvent ) )
+        {
+            DBG_ASSERT( static_cast< VclWindowEvent* >( pEvent )->GetWindow() , "ListBoxAccessibleBase::WindowEventListener: no event window!" );
+            DBG_ASSERT( static_cast< VclWindowEvent* >( pEvent )->GetWindow() == m_pWindow, "ListBoxAccessibleBase::WindowEventListener: where did this come from?" );
+
+            ProcessWindowEvent( *static_cast< VclWindowEvent* >( pEvent ) );
+        }
+        return 0;
+    }
+
+    // -----------------------------------------------------------------------------
+    void ListBoxAccessibleBase::disposing()
+    {
+        if ( m_pWindow )
+            m_pWindow->RemoveEventListener( LINK( this, ListBoxAccessibleBase, WindowEventListener ) );
+        m_pWindow = NULL;
+    }
+
+    // -----------------------------------------------------------------------------
+    void ListBoxAccessibleBase::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
+    {
+        if ( isAlive() )
+        {
+            switch ( _rVclWindowEvent.GetId() )
+            {
+                case  VCLEVENT_OBJECT_DYING :
+                {
+                    if ( m_pWindow )
+                        m_pWindow->RemoveEventListener( LINK( this, ListBoxAccessibleBase, WindowEventListener ) );
+                    m_pWindow = NULL;
+                    dispose();
+                    break;
+                }
+            }
+        }
+    }
+
+//........................................................................
+}   // namespace accessibility
+//........................................................................
diff --git a/accessibility/source/extended/makefile.mk b/accessibility/source/extended/makefile.mk
new file mode 100755
index 000000000000..27f4403c8210
--- /dev/null
+++ b/accessibility/source/extended/makefile.mk
@@ -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.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=accessibility
+TARGET=extended
+
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+.IF "$(OS)$(COM)"=="SOLARISI"
+NOOPTFILES=$(SLO)$/accessibletabbarpagelist.obj
+.ENDIF # "$(OS)$(COM)"=="SOLARISI"
+
+SLOFILES=\
+    $(SLO)$/AccessibleBrowseBoxCheckBoxCell.obj		\
+    $(SLO)$/AccessibleBrowseBoxBase.obj		\
+    $(SLO)$/AccessibleBrowseBox.obj			\
+    $(SLO)$/AccessibleBrowseBoxTableCell.obj	\
+    $(SLO)$/AccessibleBrowseBoxHeaderCell.obj	\
+    $(SLO)$/AccessibleBrowseBoxTableBase.obj	\
+    $(SLO)$/AccessibleBrowseBoxTable.obj		\
+    $(SLO)$/AccessibleBrowseBoxHeaderBar.obj	\
+    $(SLO)$/accessibleiconchoicectrl.obj		\
+    $(SLO)$/accessibleiconchoicectrlentry.obj	\
+    $(SLO)$/accessiblelistbox.obj			\
+    $(SLO)$/accessiblelistboxentry.obj		\
+    $(SLO)$/accessibletabbarbase.obj            \
+    $(SLO)$/accessibletabbar.obj			\
+    $(SLO)$/accessibletabbarpage.obj		\
+    $(SLO)$/accessibletabbarpagelist.obj		\
+    $(SLO)$/accessibletablistbox.obj		\
+    $(SLO)$/accessibletablistboxtable.obj	\
+    $(SLO)$/listboxaccessible.obj			\
+    $(SLO)$/accessiblebrowseboxcell.obj     \
+    $(SLO)$/accessibleeditbrowseboxcell.obj \
+    $(SLO)$/textwindowaccessibility.obj \
+    $(SLO)$/AccessibleGridControlBase.obj \
+    $(SLO)$/AccessibleGridControl.obj \
+    $(SLO)$/AccessibleGridControlTableBase.obj	\
+    $(SLO)$/AccessibleGridControlHeader.obj \
+    $(SLO)$/AccessibleGridControlTableCell.obj	\
+    $(SLO)$/AccessibleGridControlHeaderCell.obj	\
+    $(SLO)$/AccessibleGridControlTable.obj  \
+    $(SLO)$/AccessibleToolPanelDeck.obj \
+    $(SLO)$/AccessibleToolPanelDeckTabBar.obj \
+    $(SLO)$/AccessibleToolPanelDeckTabBarItem.obj
+
+# --- Targets -------------------------------------------------------
+
+.INCLUDE :  target.mk
+
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
new file mode 100644
index 000000000000..5b669033fcfd
--- /dev/null
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -0,0 +1,2254 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+
+#ifndef _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_
+#include <accessibility/extended/textwindowaccessibility.hxx>
+#endif
+#include "comphelper/accessibleeventnotifier.hxx"
+#include "unotools/accessiblerelationsethelper.hxx"
+#include <unotools/accessiblestatesethelper.hxx>
+#include <vcl/window.hxx>
+#include <toolkit/helper/convert.hxx>
+
+#include <algorithm>
+#include <vector>
+#include <hash_map>
+
+namespace css = ::com::sun::star;
+
+namespace accessibility
+{
+
+// Both ::osl::Mutex and ParagraphBase implement acquire and release, and thus
+// ::rtl::Reference< Paragraph > does not work.  So ParagraphImpl was factored
+// out and ::rtl::Reference< ParagraphImpl > is used instead.
+class Paragraph: private ::osl::Mutex, public ParagraphImpl
+{
+public:
+    inline Paragraph(::rtl::Reference< Document > const & rDocument,
+                     Paragraphs::size_type nNumber):
+        ParagraphImpl(rDocument, nNumber, *this) {}
+};
+
+void SfxListenerGuard::startListening(::SfxBroadcaster & rNotifier)
+{
+    OSL_ENSURE(m_pNotifier == 0, "called more than once");
+    m_pNotifier = &rNotifier;
+    m_rListener.StartListening(*m_pNotifier, true);
+}
+
+void SfxListenerGuard::endListening()
+{
+    if (m_pNotifier != 0)
+    {
+        m_rListener.EndListening(*m_pNotifier);
+        m_pNotifier = 0;
+    }
+}
+
+void WindowListenerGuard::startListening(::Window & rNotifier)
+{
+    OSL_ENSURE(m_pNotifier == 0, "called more than once");
+    m_pNotifier = &rNotifier;
+    m_pNotifier->AddEventListener(m_aListener);
+}
+
+void WindowListenerGuard::endListening()
+{
+    if (m_pNotifier != 0)
+    {
+        m_pNotifier->RemoveEventListener(m_aListener);
+        m_pNotifier = 0;
+    }
+}
+
+ParagraphImpl::ParagraphImpl(::rtl::Reference< Document > const & rDocument,
+                             Paragraphs::size_type nNumber,
+                             ::osl::Mutex & rMutex):
+    ParagraphBase(rMutex),
+    m_xDocument(rDocument),
+    m_nNumber(nNumber),
+    m_nClientId(0)
+{
+    m_aParagraphText = m_xDocument->retrieveParagraphText(this);
+}
+
+void
+ParagraphImpl::numberChanged(bool bIncremented)
+{
+    if (bIncremented)
+        ++m_nNumber;
+    else
+        --m_nNumber;
+}
+
+void ParagraphImpl::textChanged()
+{
+    ::rtl::OUString aParagraphText = implGetText();
+    ::css::uno::Any aOldValue, aNewValue;
+    if ( implInitTextChangedEvent( m_aParagraphText, aParagraphText, aOldValue, aNewValue ) )
+    {
+        m_aParagraphText = aParagraphText;
+        notifyEvent(::css::accessibility::AccessibleEventId::
+                    TEXT_CHANGED,
+                    aOldValue, aNewValue);
+    }
+}
+
+void ParagraphImpl::notifyEvent(::sal_Int16 nEventId,
+                                ::css::uno::Any const & rOldValue,
+                                ::css::uno::Any const & rNewValue)
+{
+    if (m_nClientId)
+        comphelper::AccessibleEventNotifier::addEvent( m_nClientId, ::css::accessibility::AccessibleEventObject(
+                             static_cast< ::cppu::OWeakObject * >(this),
+                             nEventId, rNewValue, rOldValue) );
+}
+
+// virtual
+::css::uno::Reference< ::css::accessibility::XAccessibleContext > SAL_CALL
+ParagraphImpl::getAccessibleContext() throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return this;
+}
+
+// virtual
+::sal_Int32 SAL_CALL ParagraphImpl::getAccessibleChildCount()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return 0;
+}
+
+// virtual
+::css::uno::Reference< ::css::accessibility::XAccessible > SAL_CALL
+ParagraphImpl::getAccessibleChild(::sal_Int32)
+    throw (::css::lang::IndexOutOfBoundsException,
+           ::css::uno::RuntimeException)
+{
+    checkDisposed();
+    throw ::css::lang::IndexOutOfBoundsException(
+        ::rtl::OUString(
+            RTL_CONSTASCII_USTRINGPARAM(
+                "textwindowaccessibility.cxx:"
+                " ParagraphImpl::getAccessibleChild")),
+        static_cast< ::css::uno::XWeak * >(this));
+}
+
+// virtual
+::css::uno::Reference< ::css::accessibility::XAccessible > SAL_CALL
+ParagraphImpl::getAccessibleParent()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return m_xDocument->getAccessible();
+}
+
+// virtual
+::sal_Int32 SAL_CALL ParagraphImpl::getAccessibleIndexInParent()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return m_xDocument->retrieveParagraphIndex(this);
+}
+
+// virtual
+::sal_Int16 SAL_CALL ParagraphImpl::getAccessibleRole()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return ::css::accessibility::AccessibleRole::PARAGRAPH;
+}
+
+// virtual
+::rtl::OUString SAL_CALL ParagraphImpl::getAccessibleDescription()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return ::rtl::OUString();
+}
+
+// virtual
+::rtl::OUString SAL_CALL ParagraphImpl::getAccessibleName()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return ::rtl::OUString();
+}
+
+// virtual
+::css::uno::Reference< ::css::accessibility::XAccessibleRelationSet >
+SAL_CALL ParagraphImpl::getAccessibleRelationSet()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return m_xDocument->retrieveParagraphRelationSet( this );
+}
+
+// virtual
+::css::uno::Reference< ::css::accessibility::XAccessibleStateSet >
+SAL_CALL ParagraphImpl::getAccessibleStateSet()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+
+    // FIXME  Notification of changes (STATE_CHANGED) missing when
+    // m_rView.IsReadOnly() changes:
+    return new ::utl::AccessibleStateSetHelper(
+        m_xDocument->retrieveParagraphState(this));
+}
+
+// virtual
+::css::lang::Locale SAL_CALL ParagraphImpl::getLocale()
+    throw (::css::accessibility::IllegalAccessibleComponentStateException,
+           ::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return m_xDocument->retrieveLocale();
+}
+
+// virtual
+::sal_Bool SAL_CALL ParagraphImpl::containsPoint(::css::awt::Point const & rPoint)
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    ::css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this,
+                                                                     false));
+    return rPoint.X >= 0 && rPoint.X < aRect.Width
+        && rPoint.Y >= 0 && rPoint.Y < aRect.Height;
+}
+
+// virtual
+::css::uno::Reference< ::css::accessibility::XAccessible > SAL_CALL
+ParagraphImpl::getAccessibleAtPoint(::css::awt::Point const &)
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return 0;
+}
+
+// virtual
+::css::awt::Rectangle SAL_CALL ParagraphImpl::getBounds()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return m_xDocument->retrieveParagraphBounds(this, false);
+}
+
+// virtual
+::css::awt::Point SAL_CALL ParagraphImpl::getLocation()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    ::css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this,
+                                                                     false));
+    return ::css::awt::Point(aRect.X, aRect.Y);
+}
+
+// virtual
+::css::awt::Point SAL_CALL ParagraphImpl::getLocationOnScreen()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    ::css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this,
+                                                                     true));
+    return ::css::awt::Point(aRect.X, aRect.Y);
+}
+
+// virtual
+::css::awt::Size SAL_CALL ParagraphImpl::getSize()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    ::css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this,
+                                                                     false));
+    return ::css::awt::Size(aRect.Width, aRect.Height);
+}
+
+// virtual
+void SAL_CALL ParagraphImpl::grabFocus() throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    Window* pWindow = m_xDocument->GetWindow();
+    if ( pWindow )
+    {
+        pWindow->GrabFocus();
+    }
+    try
+    {
+        m_xDocument->changeParagraphSelection(this, 0, 0);
+    }
+    catch (::css::lang::IndexOutOfBoundsException & rEx)
+    {
+        OSL_TRACE(
+            "textwindowaccessibility.cxx: ParagraphImpl::grabFocus:"
+            " caught unexpected %s\n",
+            ::rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_UTF8).
+            getStr());
+    }
+}
+
+// virtual
+::css::uno::Any SAL_CALL ParagraphImpl::getAccessibleKeyBinding()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return ::css::uno::Any();
+}
+
+// virtual
+::css::util::Color SAL_CALL ParagraphImpl::getForeground()
+    throw (::css::uno::RuntimeException)
+{
+    return 0; // TODO
+}
+
+// virtual
+::css::util::Color SAL_CALL ParagraphImpl::getBackground()
+    throw (::css::uno::RuntimeException)
+{
+    return 0; // TODO
+}
+
+// virtual
+::sal_Int32 SAL_CALL ParagraphImpl::getCaretPosition()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return m_xDocument->retrieveParagraphCaretPosition(this);
+}
+
+// virtual
+::sal_Bool SAL_CALL ParagraphImpl::setCaretPosition(::sal_Int32 nIndex)
+    throw (::css::lang::IndexOutOfBoundsException,
+           ::css::uno::RuntimeException)
+{
+    checkDisposed();
+    m_xDocument->changeParagraphSelection(this, nIndex, nIndex);
+    return true;
+}
+
+// virtual
+::sal_Unicode SAL_CALL ParagraphImpl::getCharacter(::sal_Int32 nIndex)
+    throw (::css::lang::IndexOutOfBoundsException,
+           ::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return OCommonAccessibleText::getCharacter(nIndex);
+}
+
+// virtual
+::css::uno::Sequence< ::css::beans::PropertyValue > SAL_CALL
+ParagraphImpl::getCharacterAttributes(::sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes)
+    throw (::css::lang::IndexOutOfBoundsException,
+           ::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return m_xDocument->retrieveCharacterAttributes( this, nIndex, aRequestedAttributes );
+}
+
+// virtual
+::css::awt::Rectangle SAL_CALL
+ParagraphImpl::getCharacterBounds(::sal_Int32 nIndex)
+    throw (::css::lang::IndexOutOfBoundsException,
+           ::css::uno::RuntimeException)
+{
+    checkDisposed();
+    ::css::awt::Rectangle aBounds(m_xDocument->retrieveCharacterBounds(this, nIndex));
+    ::css::awt::Rectangle aParaBounds(m_xDocument->retrieveParagraphBounds(this, false));
+    aBounds.X -= aParaBounds.X;
+    aBounds.Y -= aParaBounds.Y;
+    return aBounds;
+}
+
+// virtual
+::sal_Int32 SAL_CALL ParagraphImpl::getCharacterCount()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return OCommonAccessibleText::getCharacterCount();
+}
+
+// virtual
+::sal_Int32 SAL_CALL
+ParagraphImpl::getIndexAtPoint(::css::awt::Point const & rPoint)
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    ::css::awt::Point aPoint(rPoint);
+    ::css::awt::Rectangle aParaBounds(m_xDocument->retrieveParagraphBounds(this, false));
+    aPoint.X += aParaBounds.X;
+    aPoint.Y += aParaBounds.Y;
+    return m_xDocument->retrieveCharacterIndex(this, aPoint);
+}
+
+// virtual
+::rtl::OUString SAL_CALL ParagraphImpl::getSelectedText()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+
+    return OCommonAccessibleText::getSelectedText();
+}
+
+// virtual
+::sal_Int32 SAL_CALL ParagraphImpl::getSelectionStart()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return OCommonAccessibleText::getSelectionStart();
+}
+
+// virtual
+::sal_Int32 SAL_CALL ParagraphImpl::getSelectionEnd()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return OCommonAccessibleText::getSelectionEnd();
+}
+
+// virtual
+::sal_Bool SAL_CALL ParagraphImpl::setSelection(::sal_Int32 nStartIndex,
+                                                ::sal_Int32 nEndIndex)
+    throw (::css::lang::IndexOutOfBoundsException,
+           ::css::uno::RuntimeException)
+{
+    checkDisposed();
+    m_xDocument->changeParagraphSelection(this, nStartIndex, nEndIndex);
+    return true;
+}
+
+// virtual
+::rtl::OUString SAL_CALL ParagraphImpl::getText()
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return OCommonAccessibleText::getText();
+}
+
+// virtual
+::rtl::OUString SAL_CALL ParagraphImpl::getTextRange(::sal_Int32 nStartIndex,
+                                                     ::sal_Int32 nEndIndex)
+    throw (::css::lang::IndexOutOfBoundsException,
+           ::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return OCommonAccessibleText::getTextRange(nStartIndex, nEndIndex);
+}
+
+// virtual
+::com::sun::star::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    checkDisposed();
+    return OCommonAccessibleText::getTextAtIndex(nIndex, aTextType);
+}
+
+// virtual
+::com::sun::star::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    checkDisposed();
+    return OCommonAccessibleText::getTextBeforeIndex(nIndex, aTextType);
+}
+
+// virtual
+::com::sun::star::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    checkDisposed();
+    return OCommonAccessibleText::getTextBehindIndex(nIndex, aTextType);
+}
+
+// virtual
+::sal_Bool SAL_CALL ParagraphImpl::copyText(::sal_Int32 nStartIndex,
+                                            ::sal_Int32 nEndIndex)
+    throw (::css::lang::IndexOutOfBoundsException,
+           ::css::uno::RuntimeException)
+{
+    checkDisposed();
+    m_xDocument->copyParagraphText(this, nStartIndex, nEndIndex);
+    return true;
+}
+
+// virtual
+::sal_Bool SAL_CALL ParagraphImpl::cutText(::sal_Int32 nStartIndex,
+                                           ::sal_Int32 nEndIndex)
+    throw (::css::lang::IndexOutOfBoundsException,
+           ::css::uno::RuntimeException)
+{
+    checkDisposed();
+    m_xDocument->changeParagraphText(this, nStartIndex, nEndIndex, true, false,
+                                     ::rtl::OUString());
+    return true;
+}
+
+// virtual
+::sal_Bool SAL_CALL ParagraphImpl::pasteText(::sal_Int32 nIndex)
+    throw (::css::lang::IndexOutOfBoundsException,
+           ::css::uno::RuntimeException)
+{
+    checkDisposed();
+    m_xDocument->changeParagraphText(this, nIndex, nIndex, false, true,
+                                     ::rtl::OUString());
+    return true;
+}
+
+// virtual
+::sal_Bool SAL_CALL ParagraphImpl::deleteText(::sal_Int32 nStartIndex,
+                                          ::sal_Int32 nEndIndex)
+    throw (::css::lang::IndexOutOfBoundsException,
+           ::css::uno::RuntimeException)
+{
+    checkDisposed();
+    m_xDocument->changeParagraphText(this, nStartIndex, nEndIndex, false, false,
+                                     ::rtl::OUString());
+    return true;
+}
+
+// virtual
+::sal_Bool SAL_CALL ParagraphImpl::insertText(::rtl::OUString const & rText,
+                                              ::sal_Int32 nIndex)
+    throw (::css::lang::IndexOutOfBoundsException,
+           ::css::uno::RuntimeException)
+{
+    checkDisposed();
+    m_xDocument->changeParagraphText(this, nIndex, nIndex, false, false, rText);
+    return true;
+}
+
+// virtual
+::sal_Bool SAL_CALL
+ParagraphImpl::replaceText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex,
+                           ::rtl::OUString const & rReplacement)
+    throw (::css::lang::IndexOutOfBoundsException,
+           ::css::uno::RuntimeException)
+{
+    checkDisposed();
+    m_xDocument->changeParagraphText(this, nStartIndex, nEndIndex, false, false,
+                                     rReplacement);
+    return true;
+}
+
+// virtual
+::sal_Bool SAL_CALL ParagraphImpl::setAttributes(
+    ::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex,
+    ::css::uno::Sequence< ::css::beans::PropertyValue > const & rAttributeSet)
+    throw (::css::lang::IndexOutOfBoundsException,
+           ::css::uno::RuntimeException)
+{
+    checkDisposed();
+    m_xDocument->changeParagraphAttributes(this, nStartIndex, nEndIndex,
+                                           rAttributeSet);
+    return true;
+}
+
+// virtual
+::sal_Bool SAL_CALL ParagraphImpl::setText(::rtl::OUString const & rText)
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    m_xDocument->changeParagraphText(this, rText);
+    return true;
+}
+
+// virtual
+::css::uno::Sequence< ::css::beans::PropertyValue > SAL_CALL
+ParagraphImpl::getDefaultAttributes(const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes)
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return m_xDocument->retrieveDefaultAttributes( this, RequestedAttributes );
+}
+
+// virtual
+::css::uno::Sequence< ::css::beans::PropertyValue > SAL_CALL
+ParagraphImpl::getRunAttributes(::sal_Int32 Index, const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes)
+    throw (::css::lang::IndexOutOfBoundsException,
+           ::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return m_xDocument->retrieveRunAttributes( this, Index, RequestedAttributes );
+}
+
+// virtual
+::sal_Int32 SAL_CALL ParagraphImpl::getLineNumberAtIndex( ::sal_Int32 nIndex )
+    throw (::css::lang::IndexOutOfBoundsException,
+           ::css::uno::RuntimeException)
+{
+    checkDisposed();
+
+    ::sal_Int32 nLineNo = -1;
+    ::css::i18n::Boundary aBoundary =
+        m_xDocument->retrieveParagraphLineBoundary( this, nIndex, &nLineNo );
+
+    return nLineNo;
+}
+
+// virtual
+::css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineNumber( ::sal_Int32 nLineNo )
+    throw (::css::lang::IndexOutOfBoundsException,
+           ::css::uno::RuntimeException)
+{
+    checkDisposed();
+
+    ::css::i18n::Boundary aBoundary =
+        m_xDocument->retrieveParagraphBoundaryOfLine( this, nLineNo );
+
+    return ::css::accessibility::TextSegment( getTextRange(aBoundary.startPos, aBoundary.endPos),
+        aBoundary.startPos, aBoundary.endPos);
+}
+
+// virtual
+::css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineWithCaret(  )
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+
+    sal_Int32 nLineNo = getNumberOfLineWithCaret();
+
+    try {
+        return ( nLineNo >= 0 ) ?
+            getTextAtLineNumber( nLineNo ) :
+            ::css::accessibility::TextSegment();
+    } catch (const ::css::lang::IndexOutOfBoundsException&) {
+        throw ::css::uno::RuntimeException(
+            ::rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "textwindowaccessibility.cxx:"
+                    " ParagraphImpl::getTextAtLineWithCaret") ),
+            static_cast< ::css::uno::XWeak * >( this ) );
+    }
+}
+
+// virtual
+::sal_Int32 SAL_CALL ParagraphImpl::getNumberOfLineWithCaret(  )
+    throw (::css::uno::RuntimeException)
+{
+    checkDisposed();
+    return m_xDocument->retrieveParagraphLineWithCursor(this);
+}
+
+
+// virtual
+void SAL_CALL ParagraphImpl::addEventListener(
+    ::css::uno::Reference<
+    ::css::accessibility::XAccessibleEventListener > const & rListener)
+    throw (::css::uno::RuntimeException)
+{
+    if (rListener.is())
+    {
+        ::osl::ClearableMutexGuard aGuard(rBHelper.rMutex);
+        if (rBHelper.bDisposed || rBHelper.bInDispose)
+        {
+            aGuard.clear();
+            rListener->disposing(::css::lang::EventObject(
+                                    static_cast< ::cppu::OWeakObject * >(this)));
+        }
+        else
+        {
+            if (!m_nClientId)
+                m_nClientId = comphelper::AccessibleEventNotifier::registerClient( );
+            comphelper::AccessibleEventNotifier::addEventListener( m_nClientId, rListener );
+        }
+    }
+}
+
+// virtual
+void SAL_CALL ParagraphImpl::removeEventListener(
+    ::css::uno::Reference<
+    ::css::accessibility::XAccessibleEventListener > const & rListener)
+    throw (::css::uno::RuntimeException)
+{
+    comphelper::AccessibleEventNotifier::TClientId nId = 0;
+    {
+        ::osl::ClearableMutexGuard aGuard(rBHelper.rMutex);
+        if (rListener.is() && m_nClientId != 0
+            && comphelper::AccessibleEventNotifier::removeEventListener( m_nClientId, rListener ) == 0)
+        {
+            nId = m_nClientId;
+            m_nClientId = 0;
+        }
+    }
+    if (nId != 0)
+    {
+        // no listeners anymore
+        // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
+        // and at least to us not firing any events anymore, in case somebody calls
+        // NotifyAccessibleEvent, again
+        comphelper::AccessibleEventNotifier::revokeClient(nId);
+    }
+}
+
+// virtual
+void SAL_CALL ParagraphImpl::disposing()
+{
+    comphelper::AccessibleEventNotifier::TClientId nId = 0;
+    {
+        ::osl::ClearableMutexGuard aGuard(rBHelper.rMutex);
+        nId = m_nClientId;
+        m_nClientId = 0;
+    }
+    if (nId != 0)
+        comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing(nId, *this);
+}
+
+// virtual
+::rtl::OUString ParagraphImpl::implGetText()
+{
+    return m_xDocument->retrieveParagraphText(this);
+}
+
+// virtual
+::css::lang::Locale ParagraphImpl::implGetLocale()
+{
+    return m_xDocument->retrieveLocale();
+}
+
+// virtual
+void ParagraphImpl::implGetSelection(::sal_Int32 & rStartIndex,
+                                     ::sal_Int32 & rEndIndex)
+{
+    m_xDocument->retrieveParagraphSelection(this, &rStartIndex, &rEndIndex);
+}
+
+// virtual
+void ParagraphImpl::implGetParagraphBoundary( ::css::i18n::Boundary& rBoundary,
+                                              ::sal_Int32 nIndex )
+{
+    ::rtl::OUString sText( implGetText() );
+    ::sal_Int32 nLength = sText.getLength();
+
+    if ( implIsValidIndex( nIndex, nLength ) )
+    {
+        rBoundary.startPos = 0;
+        rBoundary.endPos = nLength;
+    }
+    else
+    {
+        rBoundary.startPos = nIndex;
+        rBoundary.endPos = nIndex;
+    }
+}
+
+// virtual
+void ParagraphImpl::implGetLineBoundary( ::css::i18n::Boundary& rBoundary,
+                                         ::sal_Int32 nIndex )
+{
+    ::rtl::OUString sText( implGetText() );
+    ::sal_Int32 nLength = sText.getLength();
+
+    if ( implIsValidIndex( nIndex, nLength ) || nIndex == nLength )
+    {
+        ::css::i18n::Boundary aBoundary =
+            m_xDocument->retrieveParagraphLineBoundary( this, nIndex );
+        rBoundary.startPos = aBoundary.startPos;
+        rBoundary.endPos = aBoundary.endPos;
+    }
+    else
+    {
+        rBoundary.startPos = nIndex;
+        rBoundary.endPos = nIndex;
+    }
+}
+
+
+void ParagraphImpl::checkDisposed()
+{
+    ::osl::MutexGuard aGuard(rBHelper.rMutex);
+    if (!(rBHelper.bDisposed || rBHelper.bInDispose))
+        return;
+    throw ::css::lang::DisposedException(
+        ::rtl::OUString(), static_cast< ::css::uno::XWeak * >(this));
+}
+
+Document::Document(::VCLXWindow * pVclXWindow, ::TextEngine & rEngine,
+                   ::TextView & rView, bool bCompoundControlChild):
+    VCLXAccessibleComponent(pVclXWindow),
+    m_xAccessible(pVclXWindow),
+    m_rEngine(rEngine),
+    m_rView(rView),
+    m_aEngineListener(*this),
+    m_aViewListener(LINK(this, Document, WindowEventHandler)),
+    m_bCompoundControlChild(bCompoundControlChild)
+{}
+
+::css::lang::Locale Document::retrieveLocale()
+{
+    ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
+    return m_rEngine.GetLocale();
+}
+
+::sal_Int32 Document::retrieveParagraphIndex(ParagraphImpl const * pParagraph)
+{
+    ::osl::MutexGuard aInternalGuard(GetMutex());
+
+    // If a client holds on to a Paragraph that is no longer visible, it can
+    // happen that this Paragraph lies outside the range from m_aVisibleBegin
+    // to m_aVisibleEnd.  In that case, return -1 instead of a valid index:
+    Paragraphs::iterator aPara(m_xParagraphs->begin()
+                               + pParagraph->getNumber());
+    return aPara < m_aVisibleBegin || aPara >= m_aVisibleEnd
+        ? -1 : static_cast< ::sal_Int32 >(aPara - m_aVisibleBegin);
+        // XXX  numeric overflow
+}
+
+::sal_Int64 Document::retrieveParagraphState(ParagraphImpl const * pParagraph)
+{
+    ::osl::MutexGuard aInternalGuard(GetMutex());
+
+    // If a client holds on to a Paragraph that is no longer visible, it can
+    // happen that this Paragraph lies outside the range from m_aVisibleBegin
+    // to m_aVisibleEnd.  In that case, it is neither VISIBLE nor SHOWING:
+    ::sal_Int64 nState
+          = (static_cast< ::sal_Int64 >(1)
+             << ::css::accessibility::AccessibleStateType::ENABLED)
+          | (static_cast< ::sal_Int64 >(1)
+             << ::css::accessibility::AccessibleStateType::SENSITIVE)
+          | (static_cast< ::sal_Int64 >(1)
+             << ::css::accessibility::AccessibleStateType::FOCUSABLE)
+          | (static_cast< ::sal_Int64 >(1)
+             << ::css::accessibility::AccessibleStateType::MULTI_LINE);
+    if (!m_rView.IsReadOnly())
+        nState |= (static_cast< ::sal_Int64 >(1)
+                   << ::css::accessibility::AccessibleStateType::EDITABLE);
+    Paragraphs::iterator aPara(m_xParagraphs->begin()
+                               + pParagraph->getNumber());
+    if (aPara >= m_aVisibleBegin && aPara < m_aVisibleEnd)
+    {
+        nState
+            |= (static_cast< ::sal_Int64 >(1)
+                << ::css::accessibility::AccessibleStateType::VISIBLE)
+            | (static_cast< ::sal_Int64 >(1)
+               << ::css::accessibility::AccessibleStateType::SHOWING);
+        if (aPara == m_aFocused)
+            nState |= (static_cast< ::sal_Int64 >(1)
+                       << ::css::accessibility::AccessibleStateType::FOCUSED);
+    }
+    return nState;
+};
+
+::css::awt::Rectangle
+Document::retrieveParagraphBounds(ParagraphImpl const * pParagraph,
+                                  bool bAbsolute)
+{
+    ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
+    ::osl::MutexGuard aInternalGuard(GetMutex());
+
+    // If a client holds on to a Paragraph that is no longer visible (as it
+    // scrolled out the top of the view), it can happen that this Paragraph
+    // lies before m_aVisibleBegin.  In that case, calculate the vertical
+    // position of the Paragraph starting at paragraph 0, otherwise optimize
+    // and start at m_aVisibleBegin:
+    Paragraphs::iterator aPara(m_xParagraphs->begin()
+                               + pParagraph->getNumber());
+    ::sal_Int32 nPos;
+    Paragraphs::iterator aIt;
+    if (aPara < m_aVisibleBegin)
+    {
+        nPos = 0;
+        aIt = m_xParagraphs->begin();
+    }
+    else
+    {
+        nPos = m_nViewOffset - m_nVisibleBeginOffset;
+        aIt = m_aVisibleBegin;
+    }
+    for (; aIt != aPara; ++aIt)
+        nPos += aIt->getHeight();
+
+    Point aOrig(0, 0);
+    if (bAbsolute)
+        aOrig = m_rView.GetWindow()->OutputToAbsoluteScreenPixel(aOrig);
+
+    return ::css::awt::Rectangle(
+        static_cast< ::sal_Int32 >(aOrig.X()),
+        static_cast< ::sal_Int32 >(aOrig.Y()) + nPos - m_nViewOffset,
+        m_rView.GetWindow()->GetOutputSizePixel().Width(), aPara->getHeight());
+        // XXX  numeric overflow (3x)
+}
+
+::rtl::OUString
+Document::retrieveParagraphText(ParagraphImpl const * pParagraph)
+{
+    ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
+    ::osl::MutexGuard aInternalGuard(GetMutex());
+    return m_rEngine.GetText(static_cast< ::sal_uLong >(pParagraph->getNumber()));
+        // numeric overflow cannot happen here
+}
+
+void Document::retrieveParagraphSelection(ParagraphImpl const * pParagraph,
+                                          ::sal_Int32 * pBegin,
+                                          ::sal_Int32 * pEnd)
+{
+    ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
+    ::osl::MutexGuard aInternalGuard(GetMutex());
+    ::TextSelection const & rSelection = m_rView.GetSelection();
+    Paragraphs::size_type nNumber = pParagraph->getNumber();
+    TextPaM aStartPaM( rSelection.GetStart() );
+    TextPaM aEndPaM( rSelection.GetEnd() );
+    TextPaM aMinPaM( ::std::min( aStartPaM, aEndPaM ) );
+    TextPaM aMaxPaM( ::std::max( aStartPaM, aEndPaM ) );
+
+    if ( nNumber >= aMinPaM.GetPara() && nNumber <= aMaxPaM.GetPara() )
+    {
+        *pBegin = nNumber > aMinPaM.GetPara()
+            ? 0
+            : static_cast< ::sal_Int32 >( aMinPaM.GetIndex() );
+            // XXX numeric overflow
+        *pEnd = nNumber < aMaxPaM.GetPara()
+            ? static_cast< ::sal_Int32 >( m_rEngine.GetText(static_cast< ::sal_uLong >(nNumber)).Len() )
+            : static_cast< ::sal_Int32 >( aMaxPaM.GetIndex() );
+            // XXX  numeric overflow (3x)
+
+        if ( aStartPaM > aEndPaM )
+            ::std::swap( *pBegin, *pEnd );
+    }
+    else
+    {
+        *pBegin = 0;
+        *pEnd = 0;
+    }
+}
+
+::sal_Int32 Document::retrieveParagraphCaretPosition(ParagraphImpl const * pParagraph)
+{
+    ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
+    ::osl::MutexGuard aInternalGuard(GetMutex());
+    ::TextSelection const & rSelection = m_rView.GetSelection();
+    Paragraphs::size_type nNumber = pParagraph->getNumber();
+    TextPaM aEndPaM( rSelection.GetEnd() );
+
+    return aEndPaM.GetPara() == nNumber
+        ? static_cast< ::sal_Int32 >(aEndPaM.GetIndex()) : -1;
+}
+
+::css::awt::Rectangle
+Document::retrieveCharacterBounds(ParagraphImpl const * pParagraph,
+                                  ::sal_Int32 nIndex)
+{
+    ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
+    ::osl::MutexGuard aInternalGuard(GetMutex());
+    ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
+    sal_Int32 nLength = m_rEngine.GetText(nNumber).Len();
+        // XXX  numeric overflow
+    if (nIndex < 0 || nIndex > nLength)
+        throw ::css::lang::IndexOutOfBoundsException(
+            ::rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "textwindowaccessibility.cxx:"
+                    " Document::retrieveCharacterAttributes")),
+            static_cast< ::css::uno::XWeak * >(this));
+    ::css::awt::Rectangle aBounds( 0, 0, 0, 0 );
+    if ( nIndex == nLength )
+    {
+        aBounds = AWTRectangle(
+            m_rEngine.PaMtoEditCursor(::TextPaM(nNumber,
+                                                static_cast< ::sal_uInt16 >(nIndex))));
+    }
+    else
+    {
+        ::Rectangle aLeft(
+            m_rEngine.PaMtoEditCursor(::TextPaM(nNumber,
+                                                static_cast< ::sal_uInt16 >(nIndex))));
+            // XXX  numeric overflow
+        ::Rectangle aRight(
+            m_rEngine.PaMtoEditCursor(::TextPaM(nNumber,
+                                                static_cast< ::sal_uInt16 >(nIndex)
+                                                + 1)));
+            // XXX  numeric overflow (2x)
+        // FIXME  If the vertical extends of the two cursors do not match, assume
+        // nIndex is the last character on the line; the bounding box will then
+        // extend to m_rEnginge.GetMaxTextWidth():
+        ::sal_Int32 nWidth = (aLeft.Top() == aRight.Top()
+                            && aLeft.Bottom() == aRight.Bottom())
+            ? static_cast< ::sal_Int32 >(aRight.Left() - aLeft.Left())
+            : static_cast< ::sal_Int32 >(m_rEngine.GetMaxTextWidth()
+                                        - aLeft.Left());
+            // XXX  numeric overflow (4x)
+        aBounds = ::css::awt::Rectangle(static_cast< ::sal_Int32 >(aLeft.Left()),
+                                        static_cast< ::sal_Int32 >(aLeft.Top() - m_nViewOffset),
+                                        nWidth,
+                                        static_cast< ::sal_Int32 >(aLeft.Bottom()
+                                                                    - aLeft.Top()));
+            // XXX  numeric overflow (4x)
+    }
+    return aBounds;
+}
+
+::sal_Int32 Document::retrieveCharacterIndex(ParagraphImpl const * pParagraph,
+                                             ::css::awt::Point const & rPoint)
+{
+    ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
+    ::osl::MutexGuard aInternalGuard(GetMutex());
+    ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
+        // XXX  numeric overflow
+    ::TextPaM aPaM(m_rEngine.GetPaM(::Point(static_cast< long >(rPoint.X),
+                                            static_cast< long >(rPoint.Y))));
+        // XXX  numeric overflow (2x)
+    return aPaM.GetPara() == nNumber
+        ? static_cast< ::sal_Int32 >(aPaM.GetIndex()) : -1;
+        // XXX  numeric overflow
+}
+
+::css::uno::Sequence< ::css::beans::PropertyValue >
+Document::retrieveCharacterAttributes(
+    ParagraphImpl const * pParagraph, ::sal_Int32 nIndex,
+    const ::css::uno::Sequence< ::rtl::OUString >& aRequestedAttributes)
+{
+    ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
+    ::osl::MutexGuard aInternalGuard(GetMutex());
+    ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
+        // XXX  numeric overflow
+    if (nIndex < 0 || nIndex >= m_rEngine.GetText(nNumber).Len())
+        throw ::css::lang::IndexOutOfBoundsException(
+            ::rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "textwindowaccessibility.cxx:"
+                    " Document::retrieveCharacterAttributes")),
+            static_cast< ::css::uno::XWeak * >(this));
+
+    // retrieve default attributes
+    tPropValMap aCharAttrSeq;
+    retrieveDefaultAttributesImpl( pParagraph, aRequestedAttributes, aCharAttrSeq );
+
+    // retrieve run attributes
+    tPropValMap aRunAttrSeq;
+    retrieveRunAttributesImpl( pParagraph, nIndex, aRequestedAttributes, aRunAttrSeq );
+
+    // merge default and run attributes
+    for ( tPropValMap::const_iterator aRunIter  = aRunAttrSeq.begin();
+          aRunIter != aRunAttrSeq.end();
+          ++aRunIter )
+    {
+        aCharAttrSeq[ aRunIter->first ] = aRunIter->second;
+    }
+
+    return convertHashMapToSequence( aCharAttrSeq );
+}
+
+void Document::retrieveDefaultAttributesImpl(
+    ParagraphImpl const * pParagraph,
+    const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes,
+    tPropValMap& rDefAttrSeq)
+{
+    // default attributes are not supported by text engine
+    (void) pParagraph;
+    (void) RequestedAttributes;
+    (void) rDefAttrSeq;
+}
+
+::css::uno::Sequence< ::css::beans::PropertyValue >
+Document::retrieveDefaultAttributes(
+    ParagraphImpl const * pParagraph,
+    const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes)
+{
+    ::osl::Guard< ::comphelper::IMutex > aExternalGuard( getExternalLock() );
+    ::osl::MutexGuard aInternalGuard( GetMutex() );
+
+    tPropValMap aDefAttrSeq;
+    retrieveDefaultAttributesImpl( pParagraph, RequestedAttributes, aDefAttrSeq );
+    return convertHashMapToSequence( aDefAttrSeq );
+}
+
+// static
+::css::uno::Sequence< ::css::beans::PropertyValue >
+Document::convertHashMapToSequence(tPropValMap& rAttrSeq)
+{
+    ::css::uno::Sequence< ::css::beans::PropertyValue > aValues( rAttrSeq.size() );
+    ::css::beans::PropertyValue* pValues = aValues.getArray();
+    ::sal_Int32 i = 0;
+    for ( tPropValMap::const_iterator aIter  = rAttrSeq.begin();
+          aIter != rAttrSeq.end();
+          ++aIter )
+    {
+        pValues[i] = aIter->second;
+        ++i;
+    }
+    return aValues;
+}
+
+void Document::retrieveRunAttributesImpl(
+    ParagraphImpl const * pParagraph, ::sal_Int32 Index,
+    const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes,
+    tPropValMap& rRunAttrSeq)
+{
+    ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() );
+    ::TextPaM aPaM( nNumber, static_cast< ::sal_uInt16 >( Index ) );
+        // XXX  numeric overflow
+    // FIXME  TEXTATTR_HYPERLINK ignored:
+    ::TextAttribFontColor const * pColor
+          = static_cast< ::TextAttribFontColor const * >(
+              m_rEngine.FindAttrib( aPaM, TEXTATTR_FONTCOLOR ) );
+    ::TextAttribFontWeight const * pWeight
+          = static_cast< ::TextAttribFontWeight const * >(
+              m_rEngine.FindAttrib( aPaM, TEXTATTR_FONTWEIGHT ) );
+    tPropValMap aRunAttrSeq;
+    if ( pColor )
+    {
+        ::css::beans::PropertyValue aPropVal;
+        aPropVal.Name =
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColor" ) );
+        aPropVal.Handle = -1;
+        aPropVal.Value = mapFontColor( pColor->GetColor() );
+        aPropVal.State = ::css::beans::PropertyState_DIRECT_VALUE;
+        aRunAttrSeq[ aPropVal.Name ] = aPropVal;
+    }
+    if ( pWeight )
+    {
+        ::css::beans::PropertyValue aPropVal;
+        aPropVal.Name =
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharWeight" ) );
+        aPropVal.Handle = -1;
+        aPropVal.Value = mapFontWeight( pWeight->getFontWeight() );
+        aPropVal.State = ::css::beans::PropertyState_DIRECT_VALUE;
+        aRunAttrSeq[ aPropVal.Name ] = aPropVal;
+    }
+    if ( RequestedAttributes.getLength() == 0 )
+    {
+        rRunAttrSeq = aRunAttrSeq;
+    }
+    else
+    {
+        const ::rtl::OUString* pReqAttrs = RequestedAttributes.getConstArray();
+        const ::sal_Int32 nLength = RequestedAttributes.getLength();
+        for ( ::sal_Int32 i = 0; i < nLength; ++i )
+        {
+            tPropValMap::iterator aIter = aRunAttrSeq.find( pReqAttrs[i] );
+            if ( aIter != aRunAttrSeq.end() )
+            {
+                rRunAttrSeq[ (*aIter).first ] = (*aIter).second;
+            }
+        }
+    }
+}
+
+::css::uno::Sequence< ::css::beans::PropertyValue >
+Document::retrieveRunAttributes(
+    ParagraphImpl const * pParagraph, ::sal_Int32 Index,
+    const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes)
+{
+    ::osl::Guard< ::comphelper::IMutex > aExternalGuard( getExternalLock() );
+    ::osl::MutexGuard aInternalGuard( GetMutex() );
+    ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() );
+        // XXX  numeric overflow
+    if ( Index < 0 || Index >= m_rEngine.GetText(nNumber).Len() )
+        throw ::css::lang::IndexOutOfBoundsException(
+            ::rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "textwindowaccessibility.cxx:"
+                    " Document::retrieveRunAttributes") ),
+            static_cast< ::css::uno::XWeak * >( this ) );
+
+    tPropValMap aRunAttrSeq;
+    retrieveRunAttributesImpl( pParagraph, Index, RequestedAttributes, aRunAttrSeq );
+    return convertHashMapToSequence( aRunAttrSeq );
+}
+
+void Document::changeParagraphText(ParagraphImpl * pParagraph,
+                                   ::rtl::OUString const & rText)
+{
+    ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
+    {
+        ::osl::MutexGuard aInternalGuard(GetMutex());
+        ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
+            // XXX  numeric overflow
+        changeParagraphText(nNumber, 0, m_rEngine.GetTextLen(nNumber), false,
+                            false, rText);
+    }
+}
+
+void Document::changeParagraphText(ParagraphImpl * pParagraph,
+                                   ::sal_Int32 nBegin, ::sal_Int32 nEnd,
+                                   bool bCut, bool bPaste,
+                                   ::rtl::OUString const & rText)
+{
+    ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
+    {
+        ::osl::MutexGuard aInternalGuard(GetMutex());
+        ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
+            // XXX  numeric overflow
+        if (nBegin < 0 || nBegin > nEnd
+            || nEnd > m_rEngine.GetText(nNumber).Len())
+            throw ::css::lang::IndexOutOfBoundsException(
+                ::rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "textwindowaccessibility.cxx:"
+                        " Document::changeParagraphText")),
+                static_cast< ::css::uno::XWeak * >(this));
+        changeParagraphText(nNumber, static_cast< ::sal_uInt16 >(nBegin),
+                            static_cast< ::sal_uInt16 >(nEnd), bCut, bPaste, rText);
+            // XXX  numeric overflow (2x)
+    }
+}
+
+void Document::copyParagraphText(ParagraphImpl const * pParagraph,
+                                 ::sal_Int32 nBegin, ::sal_Int32 nEnd)
+{
+    ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
+    {
+        ::osl::MutexGuard aInternalGuard(GetMutex());
+        ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
+            // XXX  numeric overflow
+        if (nBegin < 0 || nBegin > nEnd
+            || nEnd > m_rEngine.GetText(nNumber).Len())
+            throw ::css::lang::IndexOutOfBoundsException(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "textwindowaccessibility.cxx:"
+                                    " Document::copyParagraphText")),
+                static_cast< ::css::uno::XWeak * >(this));
+        m_rView.SetSelection(
+            ::TextSelection(::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nBegin)),
+                            ::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nEnd))));
+            // XXX  numeric overflow (2x)
+        m_rView.Copy();
+    }
+}
+
+void Document::changeParagraphAttributes(
+    ParagraphImpl * pParagraph, ::sal_Int32 nBegin, ::sal_Int32 nEnd,
+    ::css::uno::Sequence< ::css::beans::PropertyValue > const & rAttributeSet)
+{
+    ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
+    {
+        ::osl::MutexGuard aInternalGuard(GetMutex());
+        ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
+        // XXX  numeric overflow
+        if (nBegin < 0 || nBegin > nEnd
+            || nEnd > m_rEngine.GetText(nNumber).Len())
+            throw ::css::lang::IndexOutOfBoundsException(
+                ::rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "textwindowaccessibility.cxx:"
+                        " Document::changeParagraphAttributes")),
+                static_cast< ::css::uno::XWeak * >(this));
+
+        // FIXME  The new attributes are added to any attributes already set,
+        // they do not replace the old attributes as required by
+        // XAccessibleEditableText.setAttributes:
+        for (::sal_Int32 i = 0; i < rAttributeSet.getLength(); ++i)
+            if (rAttributeSet[i].Name.equalsAsciiL(
+                    RTL_CONSTASCII_STRINGPARAM("CharColor")))
+                m_rEngine.SetAttrib(::TextAttribFontColor(
+                                        mapFontColor(rAttributeSet[i].Value)),
+                                    nNumber, static_cast< ::sal_uInt16 >(nBegin),
+                                    static_cast< ::sal_uInt16 >(nEnd));
+                    // XXX  numeric overflow (2x)
+            else if (rAttributeSet[i].Name.equalsAsciiL(
+                         RTL_CONSTASCII_STRINGPARAM("CharWeight")))
+                m_rEngine.SetAttrib(::TextAttribFontWeight(
+                                        mapFontWeight(rAttributeSet[i].Value)),
+                                    nNumber, static_cast< ::sal_uInt16 >(nBegin),
+                                    static_cast< ::sal_uInt16 >(nEnd));
+                    // XXX  numeric overflow (2x)
+    }
+}
+
+void Document::changeParagraphSelection(ParagraphImpl * pParagraph,
+                                        ::sal_Int32 nBegin, ::sal_Int32 nEnd)
+{
+    ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
+    {
+        ::osl::MutexGuard aInternalGuard(GetMutex());
+        ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
+            // XXX  numeric overflow
+        if (nBegin < 0 || nBegin > nEnd
+            || nEnd > m_rEngine.GetText(nNumber).Len())
+            throw ::css::lang::IndexOutOfBoundsException(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "textwindowaccessibility.cxx:"
+                                    " Document::changeParagraphSelection")),
+                static_cast< ::css::uno::XWeak * >(this));
+        m_rView.SetSelection(
+            ::TextSelection(::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nBegin)),
+                            ::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nEnd))));
+            // XXX  numeric overflow (2x)
+    }
+}
+
+::css::i18n::Boundary
+Document::retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph,
+                                         ::sal_Int32 nIndex, ::sal_Int32 *pLineNo )
+{
+    ::css::i18n::Boundary aBoundary;
+    aBoundary.startPos = nIndex;
+    aBoundary.endPos = nIndex;
+
+    ::osl::Guard< ::comphelper::IMutex > aExternalGuard( getExternalLock() );
+    {
+        ::osl::MutexGuard aInternalGuard( GetMutex() );
+        ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() );
+        if ( nIndex < 0 || nIndex > m_rEngine.GetText( nNumber ).Len() )
+            throw ::css::lang::IndexOutOfBoundsException(
+                ::rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "textwindowaccessibility.cxx:"
+                        " Document::retrieveParagraphLineBoundary" ) ),
+                static_cast< ::css::uno::XWeak * >( this ) );
+        ::sal_Int32 nLineStart = 0;
+        ::sal_Int32 nLineEnd = 0;
+        ::sal_uInt16 nLineCount = m_rEngine.GetLineCount( nNumber );
+        for ( ::sal_uInt16 nLine = 0; nLine < nLineCount; ++nLine )
+        {
+            ::sal_Int32 nLineLength = static_cast< ::sal_Int32 >(
+                m_rEngine.GetLineLen( nNumber, nLine ) );
+            nLineStart = nLineEnd;
+            nLineEnd += nLineLength;
+            if ( nIndex >= nLineStart && ( ( nLine == nLineCount - 1 ) ? nIndex <= nLineEnd : nIndex < nLineEnd ) )
+            {
+                aBoundary.startPos = nLineStart;
+                aBoundary.endPos = nLineEnd;
+                if( pLineNo )
+                    pLineNo[0] = nLine;
+                break;
+            }
+        }
+    }
+
+    return aBoundary;
+}
+
+::css::i18n::Boundary
+Document::retrieveParagraphBoundaryOfLine( ParagraphImpl const * pParagraph,
+                                           ::sal_Int32 nLineNo )
+{
+    ::css::i18n::Boundary aBoundary;
+    aBoundary.startPos = 0;
+    aBoundary.endPos = 0;
+
+    ::osl::Guard< ::comphelper::IMutex > aExternalGuard( getExternalLock() );
+    {
+        ::osl::MutexGuard aInternalGuard( GetMutex() );
+        ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() );
+        if ( nLineNo >= m_rEngine.GetLineCount( nNumber ) )
+            throw ::css::lang::IndexOutOfBoundsException(
+                ::rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "textwindowaccessibility.cxx:"
+                        " Document::retrieveParagraphBoundaryOfLine" ) ),
+                static_cast< ::css::uno::XWeak * >( this ) );
+        ::sal_Int32 nLineStart = 0;
+        ::sal_Int32 nLineEnd = 0;
+        for ( ::sal_uInt16 nLine = 0; nLine <= nLineNo; ++nLine )
+        {
+            ::sal_Int32 nLineLength = static_cast< ::sal_Int32 >(
+                m_rEngine.GetLineLen( nNumber, nLine ) );
+            nLineStart = nLineEnd;
+            nLineEnd += nLineLength;
+        }
+
+        aBoundary.startPos = nLineStart;
+        aBoundary.endPos = nLineEnd;
+    }
+
+    return aBoundary;
+}
+
+sal_Int32 Document::retrieveParagraphLineWithCursor( ParagraphImpl const * pParagraph )
+{
+    ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
+    ::osl::MutexGuard aInternalGuard(GetMutex());
+    ::TextSelection const & rSelection = m_rView.GetSelection();
+    Paragraphs::size_type nNumber = pParagraph->getNumber();
+    TextPaM aEndPaM( rSelection.GetEnd() );
+
+    return aEndPaM.GetPara() == nNumber
+        ? m_rView.GetLineNumberOfCursorInSelection() : -1;
+}
+
+
+::css::uno::Reference< ::css::accessibility::XAccessibleRelationSet >
+Document::retrieveParagraphRelationSet( ParagraphImpl const * pParagraph )
+{
+    ::osl::MutexGuard aInternalGuard( GetMutex() );
+
+    ::utl::AccessibleRelationSetHelper* pRelationSetHelper = new ::utl::AccessibleRelationSetHelper();
+    ::css::uno::Reference< ::css::accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper;
+
+    Paragraphs::iterator aPara( m_xParagraphs->begin() + pParagraph->getNumber() );
+
+    if ( aPara > m_aVisibleBegin && aPara < m_aVisibleEnd )
+    {
+        ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > aSequence(1);
+        aSequence[0] = getAccessibleChild( aPara - 1 );
+        ::css::accessibility::AccessibleRelation aRelation( ::css::accessibility::AccessibleRelationType::CONTENT_FLOWS_FROM, aSequence );
+        pRelationSetHelper->AddRelation( aRelation );
+    }
+
+    if ( aPara >= m_aVisibleBegin && aPara < m_aVisibleEnd -1 )
+    {
+        ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > aSequence(1);
+        aSequence[0] = getAccessibleChild( aPara + 1 );
+        ::css::accessibility::AccessibleRelation aRelation( ::css::accessibility::AccessibleRelationType::CONTENT_FLOWS_TO, aSequence );
+        pRelationSetHelper->AddRelation( aRelation );
+    }
+
+    return xSet;
+}
+
+void Document::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+{
+    switch ( rVclWindowEvent.GetId() )
+    {
+        case VCLEVENT_WINDOW_GETFOCUS:
+        case VCLEVENT_WINDOW_LOSEFOCUS:
+        {
+            // #107179# if our parent is a compound control (e.g. MultiLineEdit),
+            // suppress the window focus events here
+            if ( !m_bCompoundControlChild )
+                VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
+        }
+        break;
+        default:
+            VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
+    }
+}
+
+// virtual
+::sal_Int32 SAL_CALL Document::getAccessibleChildCount()
+    throw (::css::uno::RuntimeException)
+{
+    ::comphelper::OExternalLockGuard aGuard(this);
+    init();
+    return m_aVisibleEnd - m_aVisibleBegin;
+}
+
+// virtual
+::css::uno::Reference< ::css::accessibility::XAccessible > SAL_CALL
+Document::getAccessibleChild(::sal_Int32 i)
+    throw (::css::lang::IndexOutOfBoundsException,
+           ::css::uno::RuntimeException)
+{
+    ::comphelper::OExternalLockGuard aGuard(this);
+    init();
+    if (i < 0 || i >= m_aVisibleEnd - m_aVisibleBegin)
+        throw ::css::lang::IndexOutOfBoundsException(
+            ::rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "textwindowaccessibility.cxx:"
+                    " Document::getAccessibleChild")),
+            static_cast< ::css::uno::XWeak * >(this));
+    return getAccessibleChild(m_aVisibleBegin
+                              + static_cast< Paragraphs::size_type >(i));
+}
+
+// virtual
+::sal_Int16 SAL_CALL Document::getAccessibleRole()
+    throw (::css::uno::RuntimeException)
+{
+    return ::css::accessibility::AccessibleRole::TEXT_FRAME;
+}
+
+// virtual
+::css::uno::Reference< ::css::accessibility::XAccessible > SAL_CALL
+Document::getAccessibleAtPoint(::css::awt::Point const & rPoint)
+    throw (::css::uno::RuntimeException)
+{
+    ::comphelper::OExternalLockGuard aGuard(this);
+    init();
+    if (rPoint.X >= 0
+        && rPoint.X < m_rView.GetWindow()->GetOutputSizePixel().Width()
+        && rPoint.Y >= 0 && rPoint.Y < m_nViewHeight)
+    {
+        ::sal_Int32 nOffset = m_nViewOffset + rPoint.Y; // XXX  numeric overflow
+        ::sal_Int32 nPos = m_nViewOffset - m_nVisibleBeginOffset;
+        for (Paragraphs::iterator aIt(m_aVisibleBegin); aIt != m_aVisibleEnd;
+             ++aIt)
+        {
+            nPos += aIt->getHeight(); // XXX  numeric overflow
+            if (nOffset < nPos)
+                return getAccessibleChild(aIt);
+        }
+    }
+    return 0;
+}
+
+// virtual
+void SAL_CALL Document::disposing()
+{
+    m_aEngineListener.endListening();
+    m_aViewListener.endListening();
+    if (m_xParagraphs.get() != 0)
+        disposeParagraphs();
+    VCLXAccessibleComponent::disposing();
+}
+
+// virtual
+void Document::Notify(::SfxBroadcaster &, ::SfxHint const & rHint)
+{
+    if (rHint.ISA(::TextHint))
+    {
+        ::TextHint const & rTextHint
+              = static_cast< ::TextHint const & >(rHint);
+        switch (rTextHint.GetId())
+        {
+        case TEXT_HINT_PARAINSERTED:
+        case TEXT_HINT_PARAREMOVED:
+            // TEXT_HINT_PARAINSERTED and TEXT_HINT_PARAREMOVED are sent at
+            // "unsafe" times (when the text engine has not yet re-formatted its
+            // content), so that for example calling ::TextEngine::GetTextHeight
+            // from within the code that handles TEXT_HINT_PARAINSERTED causes
+            // trouble within the text engine.  Therefore, these hints are just
+            // buffered until a following ::TextEngine::FormatDoc causes a
+            // TEXT_HINT_TEXTFORMATTED to come in:
+        case TEXT_HINT_FORMATPARA:
+            // ::TextEngine::FormatDoc sends a sequence of
+            // TEXT_HINT_FORMATPARAs, followed by an optional
+            // TEXT_HINT_TEXTHEIGHTCHANGED, followed in all cases by one
+            // TEXT_HINT_TEXTFORMATTED.  Only the TEXT_HINT_FORMATPARAs contain
+            // the the numbers of the affected paragraphs, but they are sent
+            // before the changes are applied.  Therefore, TEXT_HINT_FORMATPARAs
+            // are just buffered until another hint comes in:
+            {
+                ::osl::MutexGuard aInternalGuard(GetMutex());
+                if (!isAlive())
+                    break;
+
+                m_aParagraphNotifications.push(rTextHint);
+                break;
+            }
+        case TEXT_HINT_TEXTFORMATTED:
+        case TEXT_HINT_TEXTHEIGHTCHANGED:
+        case TEXT_HINT_MODIFIED:
+            {
+                ::osl::MutexGuard aInternalGuard(GetMutex());
+                if (!isAlive())
+                    break;
+                handleParagraphNotifications();
+                break;
+            }
+        case TEXT_HINT_VIEWSCROLLED:
+            {
+                ::osl::MutexGuard aInternalGuard(GetMutex());
+                if (!isAlive())
+                    break;
+                handleParagraphNotifications();
+
+                ::sal_Int32 nOffset = static_cast< ::sal_Int32 >(
+                    m_rView.GetStartDocPos().Y());
+                    // XXX  numeric overflow
+                if (nOffset != m_nViewOffset)
+                {
+                    m_nViewOffset = nOffset;
+
+                    Paragraphs::iterator aOldVisibleBegin(
+                        m_aVisibleBegin);
+                    Paragraphs::iterator aOldVisibleEnd(m_aVisibleEnd);
+
+                    determineVisibleRange();
+
+                    notifyVisibleRangeChanges(aOldVisibleBegin,
+                                                aOldVisibleEnd,
+                                                m_xParagraphs->end());
+                }
+                break;
+            }
+        case TEXT_HINT_VIEWSELECTIONCHANGED:
+            {
+                ::osl::MutexGuard aInternalGuard(GetMutex());
+                if (!isAlive())
+                    break;
+
+                if (m_aParagraphNotifications.empty())
+                {
+                    handleSelectionChangeNotification();
+                }
+                else
+                {
+                    // TEXT_HINT_VIEWSELECTIONCHANGED is sometimes sent at
+                    // "unsafe" times (when the text engine has not yet re-
+                    // formatted its content), so that for example calling
+                    // ::TextEngine::GetTextHeight from within the code that
+                    // handles a previous TEXT_HINT_PARAINSERTED causes
+                    // trouble within the text engine.  Therefore, these
+                    // hints are just buffered (along with
+                    // TEXT_HINT_PARAINSERTED/REMOVED/FORMATPARA) until a
+                    // following ::TextEngine::FormatDoc causes a
+                    // TEXT_HINT_TEXTFORMATTED to come in:
+                    m_bSelectionChangedNotification = true;
+                }
+                break;
+            }
+        }
+    }
+}
+
+IMPL_LINK(Document, WindowEventHandler, ::VclSimpleEvent *, pEvent)
+{
+    switch (pEvent->GetId())
+    {
+    case VCLEVENT_WINDOW_RESIZE:
+        {
+            ::osl::MutexGuard aInternalGuard(GetMutex());
+            if (!isAlive())
+                break;
+
+            ::sal_Int32 nHeight = static_cast< ::sal_Int32 >(
+                m_rView.GetWindow()->GetOutputSizePixel().Height());
+                // XXX  numeric overflow
+            if (nHeight != m_nViewHeight)
+            {
+                m_nViewHeight = nHeight;
+
+                Paragraphs::iterator aOldVisibleBegin(m_aVisibleBegin);
+                Paragraphs::iterator aOldVisibleEnd(m_aVisibleEnd);
+
+                determineVisibleRange();
+
+                notifyVisibleRangeChanges(aOldVisibleBegin, aOldVisibleEnd,
+                                            m_xParagraphs->end());
+            }
+            break;
+        }
+    case VCLEVENT_WINDOW_GETFOCUS:
+        {
+            ::osl::MutexGuard aInternalGuard(GetMutex());
+            if (!isAlive())
+                break;
+
+            if (m_aFocused >= m_aVisibleBegin && m_aFocused < m_aVisibleEnd)
+            {
+                ::rtl::Reference< ParagraphImpl > xParagraph(
+                    getParagraph(m_aFocused));
+                if (xParagraph.is())
+                    xParagraph->notifyEvent(
+                        ::css::accessibility::AccessibleEventId::
+                        STATE_CHANGED,
+                        ::css::uno::Any(),
+                        ::css::uno::makeAny(
+                            ::css::accessibility::AccessibleStateType::
+                            FOCUSED));
+            }
+            break;
+        }
+    case VCLEVENT_WINDOW_LOSEFOCUS:
+        {
+            ::osl::MutexGuard aInternalGuard(GetMutex());
+            if (!isAlive())
+                break;
+
+            if (m_aFocused >= m_aVisibleBegin && m_aFocused < m_aVisibleEnd)
+            {
+                ::rtl::Reference< ParagraphImpl > xParagraph(
+                    getParagraph(m_aFocused));
+                if (xParagraph.is())
+                    xParagraph->notifyEvent(
+                        ::css::accessibility::AccessibleEventId::
+                        STATE_CHANGED,
+                        ::css::uno::makeAny(
+                            ::css::accessibility::AccessibleStateType::
+                            FOCUSED),
+                        ::css::uno::Any());
+            }
+            break;
+        }
+    }
+    return 0;
+}
+
+void Document::init()
+{
+    if (m_xParagraphs.get() == 0)
+    {
+        ::sal_uLong nCount = m_rEngine.GetParagraphCount();
+        ::std::auto_ptr< Paragraphs > p(new Paragraphs);
+        p->reserve(static_cast< Paragraphs::size_type >(nCount));
+            // numeric overflow is harmless here
+        for (::sal_uLong i = 0; i < nCount; ++i)
+            p->push_back(ParagraphInfo(static_cast< ::sal_Int32 >(
+                                           m_rEngine.GetTextHeight(i))));
+                // XXX  numeric overflow
+        m_nViewOffset = static_cast< ::sal_Int32 >(
+            m_rView.GetStartDocPos().Y()); // XXX  numeric overflow
+        m_nViewHeight = static_cast< ::sal_Int32 >(
+            m_rView.GetWindow()->GetOutputSizePixel().Height());
+            // XXX  numeric overflow
+        m_xParagraphs = p;
+        determineVisibleRange();
+        m_nSelectionFirstPara = -1;
+        m_nSelectionFirstPos = -1;
+        m_nSelectionLastPara = -1;
+        m_nSelectionLastPos = -1;
+        m_aFocused = m_xParagraphs->end();
+        m_bSelectionChangedNotification = false;
+        m_aEngineListener.startListening(m_rEngine);
+        m_aViewListener.startListening(*m_rView.GetWindow());
+    }
+}
+
+::rtl::Reference< ParagraphImpl >
+Document::getParagraph(Paragraphs::iterator const & rIt)
+{
+    return static_cast< ParagraphImpl * >(
+        ::css::uno::Reference< ::css::accessibility::XAccessible >(
+            rIt->getParagraph()).get());
+}
+
+::css::uno::Reference< ::css::accessibility::XAccessible >
+Document::getAccessibleChild(Paragraphs::iterator const & rIt)
+{
+    ::css::uno::Reference< ::css::accessibility::XAccessible > xParagraph(
+        rIt->getParagraph());
+    if (!xParagraph.is())
+    {
+        xParagraph = new Paragraph(this, rIt - m_xParagraphs->begin());
+        rIt->setParagraph(xParagraph);
+    }
+    return xParagraph;
+}
+
+void Document::determineVisibleRange()
+{
+    m_aVisibleBegin = m_xParagraphs->end();
+    m_aVisibleEnd = m_aVisibleBegin;
+    ::sal_Int32 nPos = 0;
+    for (Paragraphs::iterator aIt = m_xParagraphs->begin();;)
+    {
+        if (aIt == m_xParagraphs->end())
+        {
+            m_nVisibleBeginOffset = 0;
+            break;
+        }
+        ::sal_Int32 nOldPos = nPos;
+        nPos += aIt->getHeight(); // XXX  numeric overflow
+        if (m_aVisibleBegin == m_xParagraphs->end() && nPos >= m_nViewOffset)
+        {
+            m_aVisibleBegin = aIt;
+            m_nVisibleBeginOffset = m_nViewOffset - nOldPos;
+        }
+        ++aIt;
+        if (m_aVisibleBegin != m_xParagraphs->end()
+            && (aIt == m_xParagraphs->end()
+                || nPos >= m_nViewOffset + m_nViewHeight))
+            // XXX  numeric overflow
+        {
+            m_aVisibleEnd = aIt;
+            break;
+        }
+    }
+}
+
+void Document::notifyVisibleRangeChanges(
+    Paragraphs::iterator const & rOldVisibleBegin,
+    Paragraphs::iterator const & rOldVisibleEnd,
+    Paragraphs::iterator const & rInserted)
+{
+    // XXX  Replace this code that determines which paragraphs have changed from
+    // invisible to visible or vice versa with a better algorithm.
+    {for (Paragraphs::iterator aIt(rOldVisibleBegin); aIt != rOldVisibleEnd;
+          ++aIt)
+        if (aIt != rInserted
+            && (aIt < m_aVisibleBegin || aIt >= m_aVisibleEnd))
+            NotifyAccessibleEvent(
+                ::css::accessibility::AccessibleEventId::
+                CHILD,
+                ::css::uno::makeAny(getAccessibleChild(aIt)),
+                ::css::uno::Any());
+    }
+    {for (Paragraphs::iterator aIt(m_aVisibleBegin); aIt != m_aVisibleEnd;
+          ++aIt)
+        if (aIt == rInserted
+            || aIt < rOldVisibleBegin || aIt >= rOldVisibleEnd)
+            NotifyAccessibleEvent(
+                ::css::accessibility::AccessibleEventId::
+                CHILD,
+                ::css::uno::Any(),
+                ::css::uno::makeAny(getAccessibleChild(aIt)));
+    }
+}
+
+void
+Document::changeParagraphText(::sal_uLong nNumber, ::sal_uInt16 nBegin, ::sal_uInt16 nEnd,
+                              bool bCut, bool bPaste,
+                              ::rtl::OUString const & rText)
+{
+    m_rView.SetSelection(::TextSelection(::TextPaM(nNumber, nBegin),
+                                         ::TextPaM(nNumber, nEnd)));
+    if (bCut)
+        m_rView.Cut();
+    else if (nBegin != nEnd)
+        m_rView.DeleteSelected();
+    if (bPaste)
+        m_rView.Paste();
+    else if (rText.getLength() != 0)
+        m_rView.InsertText(rText);
+}
+
+void Document::handleParagraphNotifications()
+{
+    while (!m_aParagraphNotifications.empty())
+    {
+        ::TextHint aHint(m_aParagraphNotifications.front());
+        m_aParagraphNotifications.pop();
+        switch (aHint.GetId())
+        {
+        case TEXT_HINT_PARAINSERTED:
+            {
+                ::sal_uLong n = aHint.GetValue();
+                OSL_ENSURE(n <= m_xParagraphs->size(),
+                           "bad TEXT_HINT_PARAINSERTED event");
+
+                // Save the values of old iterators (the iterators themselves
+                // will get invalidated), and adjust the old values so that they
+                // reflect the insertion of the new paragraph:
+                Paragraphs::size_type nOldVisibleBegin
+                    = m_aVisibleBegin - m_xParagraphs->begin();
+                Paragraphs::size_type nOldVisibleEnd
+                    = m_aVisibleEnd - m_xParagraphs->begin();
+                Paragraphs::size_type nOldFocused
+                    = m_aFocused - m_xParagraphs->begin();
+                if (n <= nOldVisibleBegin)
+                    ++nOldVisibleBegin; // XXX  numeric overflow
+                if (n <= nOldVisibleEnd)
+                    ++nOldVisibleEnd; // XXX  numeric overflow
+                if (n <= nOldFocused)
+                    ++nOldFocused; // XXX  numeric overflow
+                if (sal::static_int_cast<sal_Int32>(n) <= m_nSelectionFirstPara)
+                    ++m_nSelectionFirstPara; // XXX  numeric overflow
+                if (sal::static_int_cast<sal_Int32>(n) <= m_nSelectionLastPara)
+                    ++m_nSelectionLastPara; // XXX  numeric overflow
+
+                Paragraphs::iterator aIns(
+                    m_xParagraphs->insert(
+                        m_xParagraphs->begin() + n,
+                        ParagraphInfo(static_cast< ::sal_Int32 >(
+                                          m_rEngine.GetTextHeight(n)))));
+                    // XXX  numeric overflow (2x)
+
+                determineVisibleRange();
+                m_aFocused = m_xParagraphs->begin() + nOldFocused;
+
+                for (Paragraphs::iterator aIt(aIns);;)
+                {
+                    ++aIt;
+                    if (aIt == m_xParagraphs->end())
+                        break;
+                    ::rtl::Reference< ParagraphImpl > xParagraph(
+                        getParagraph(aIt));
+                    if (xParagraph.is())
+                        xParagraph->numberChanged(true);
+                }
+
+                notifyVisibleRangeChanges(
+                    m_xParagraphs->begin() + nOldVisibleBegin,
+                    m_xParagraphs->begin() + nOldVisibleEnd, aIns);
+                break;
+            }
+        case TEXT_HINT_PARAREMOVED:
+            {
+                ::sal_uLong n = aHint.GetValue();
+                if (n == TEXT_PARA_ALL)
+                {
+                    {for (Paragraphs::iterator aIt(m_aVisibleBegin);
+                          aIt != m_aVisibleEnd; ++aIt)
+                        NotifyAccessibleEvent(
+                            ::css::accessibility::AccessibleEventId::
+                            CHILD,
+                            ::css::uno::makeAny(getAccessibleChild(aIt)),
+                            ::css::uno::Any());
+                    }
+                    disposeParagraphs();
+                    m_xParagraphs->clear();
+                    determineVisibleRange();
+                    m_nSelectionFirstPara = -1;
+                    m_nSelectionFirstPos = -1;
+                    m_nSelectionLastPara = -1;
+                    m_nSelectionLastPos = -1;
+                    m_aFocused = m_xParagraphs->end();
+                }
+                else
+                {
+                    OSL_ENSURE(n < m_xParagraphs->size(),
+                               "Bad TEXT_HINT_PARAREMOVED event");
+
+                    Paragraphs::iterator aIt(m_xParagraphs->begin() + n);
+                        // numeric overflow cannot occur
+
+                    // Save the values of old iterators (the iterators
+                    // themselves will get invalidated), and adjust the old
+                    // values so that they reflect the removal of the paragraph:
+                    Paragraphs::size_type nOldVisibleBegin
+                        = m_aVisibleBegin - m_xParagraphs->begin();
+                    Paragraphs::size_type nOldVisibleEnd
+                        = m_aVisibleEnd - m_xParagraphs->begin();
+                    bool bWasVisible
+                        = nOldVisibleBegin <= n && n < nOldVisibleEnd;
+                    Paragraphs::size_type nOldFocused
+                        = m_aFocused - m_xParagraphs->begin();
+                    bool bWasFocused = aIt == m_aFocused;
+                    if (n < nOldVisibleBegin)
+                        --nOldVisibleBegin;
+                    if (n < nOldVisibleEnd)
+                        --nOldVisibleEnd;
+                    if (n < nOldFocused)
+                        --nOldFocused;
+                    if (sal::static_int_cast<sal_Int32>(n) < m_nSelectionFirstPara)
+                        --m_nSelectionFirstPara;
+                    else if (sal::static_int_cast<sal_Int32>(n) == m_nSelectionFirstPara)
+                    {
+                        if (m_nSelectionFirstPara == m_nSelectionLastPara)
+                        {
+                            m_nSelectionFirstPara = -1;
+                            m_nSelectionFirstPos = -1;
+                            m_nSelectionLastPara = -1;
+                            m_nSelectionLastPos = -1;
+                        }
+                        else
+                        {
+                            ++m_nSelectionFirstPara;
+                            m_nSelectionFirstPos = 0;
+                        }
+                    }
+                    if (sal::static_int_cast<sal_Int32>(n) < m_nSelectionLastPara)
+                        --m_nSelectionLastPara;
+                    else if (sal::static_int_cast<sal_Int32>(n) == m_nSelectionLastPara)
+                    {
+                        OSL_ENSURE(m_nSelectionFirstPara < m_nSelectionLastPara,
+                                   "logic error");
+                        --m_nSelectionLastPara;
+                        m_nSelectionLastPos = 0x7FFFFFFF;
+                    }
+
+                    ::css::uno::Reference< ::css::accessibility::XAccessible >
+                          xStrong;
+                    if (bWasVisible)
+                        xStrong = getAccessibleChild(aIt);
+                    ::css::uno::WeakReference<
+                          ::css::accessibility::XAccessible > xWeak(
+                              aIt->getParagraph());
+                    aIt = m_xParagraphs->erase(aIt);
+
+                    determineVisibleRange();
+                    m_aFocused = bWasFocused ? m_xParagraphs->end()
+                        : m_xParagraphs->begin() + nOldFocused;
+
+                    for (; aIt != m_xParagraphs->end(); ++aIt)
+                    {
+                        ::rtl::Reference< ParagraphImpl > xParagraph(
+                            getParagraph(aIt));
+                        if (xParagraph.is())
+                            xParagraph->numberChanged(false);
+                    }
+
+                    if (bWasVisible)
+                        NotifyAccessibleEvent(
+                            ::css::accessibility::AccessibleEventId::
+                            CHILD,
+                            ::css::uno::makeAny(getAccessibleChild(aIt)),
+                            ::css::uno::Any());
+
+                    ::css::uno::Reference< ::css::lang::XComponent > xComponent(
+                        xWeak.get(), ::css::uno::UNO_QUERY);
+                    if (xComponent.is())
+                        xComponent->dispose();
+
+                    notifyVisibleRangeChanges(
+                        m_xParagraphs->begin() + nOldVisibleBegin,
+                        m_xParagraphs->begin() + nOldVisibleEnd,
+                        m_xParagraphs->end());
+                }
+                break;
+            }
+        case TEXT_HINT_FORMATPARA:
+            {
+                ::sal_uLong n = aHint.GetValue();
+                OSL_ENSURE(n < m_xParagraphs->size(),
+                           "Bad TEXT_HINT_FORMATPARA event");
+
+                (*m_xParagraphs)[static_cast< Paragraphs::size_type >(n)].
+                    changeHeight(static_cast< ::sal_Int32 >(
+                                     m_rEngine.GetTextHeight(n)));
+                    // XXX  numeric overflow
+                Paragraphs::iterator aOldVisibleBegin(m_aVisibleBegin);
+                Paragraphs::iterator aOldVisibleEnd(m_aVisibleEnd);
+                determineVisibleRange();
+                notifyVisibleRangeChanges(aOldVisibleBegin, aOldVisibleEnd,
+                                          m_xParagraphs->end());
+
+                if (n < m_xParagraphs->size())
+                {
+                    Paragraphs::iterator aIt(m_xParagraphs->begin() + n);
+                    ::rtl::Reference< ParagraphImpl > xParagraph(getParagraph(aIt));
+                    if (xParagraph.is())
+                        xParagraph->textChanged();
+                }
+                break;
+            }
+        default:
+            OSL_ENSURE(false, "bad buffered hint");
+            break;
+        }
+    }
+    if (m_bSelectionChangedNotification)
+    {
+        m_bSelectionChangedNotification = false;
+        handleSelectionChangeNotification();
+    }
+}
+
+void Document::handleSelectionChangeNotification()
+{
+    ::TextSelection const & rSelection = m_rView.GetSelection();
+    OSL_ENSURE(rSelection.GetStart().GetPara() < m_xParagraphs->size()
+               && rSelection.GetEnd().GetPara() < m_xParagraphs->size(),
+               "bad TEXT_HINT_VIEWSELECTIONCHANGED event");
+    ::sal_Int32 nNewFirstPara
+          = static_cast< ::sal_Int32 >(rSelection.GetStart().GetPara());
+    ::sal_Int32 nNewFirstPos
+          = static_cast< ::sal_Int32 >(rSelection.GetStart().GetIndex());
+        // XXX  numeric overflow
+    ::sal_Int32 nNewLastPara
+          = static_cast< ::sal_Int32 >(rSelection.GetEnd().GetPara());
+    ::sal_Int32 nNewLastPos
+          = static_cast< ::sal_Int32 >(rSelection.GetEnd().GetIndex());
+        // XXX  numeric overflow
+
+    // Lose focus:
+    Paragraphs::iterator aIt(m_xParagraphs->begin() + nNewLastPara);
+    if (m_aFocused != m_xParagraphs->end() && m_aFocused != aIt
+        && m_aFocused >= m_aVisibleBegin && m_aFocused < m_aVisibleEnd)
+    {
+        ::rtl::Reference< ParagraphImpl > xParagraph(getParagraph(m_aFocused));
+        if (xParagraph.is())
+            xParagraph->notifyEvent(
+                ::css::accessibility::AccessibleEventId::
+                STATE_CHANGED,
+                ::css::uno::makeAny(
+                    ::css::accessibility::AccessibleStateType::FOCUSED),
+                ::css::uno::Any());
+    }
+
+    // Gain focus and update cursor position:
+    if (aIt >= m_aVisibleBegin && aIt < m_aVisibleEnd
+        && (aIt != m_aFocused
+            || nNewLastPara != m_nSelectionLastPara
+            || nNewLastPos != m_nSelectionLastPos))
+    {
+        ::rtl::Reference< ParagraphImpl > xParagraph(getParagraph(aIt));
+        if (xParagraph.is())
+        {
+            if (aIt != m_aFocused)
+                xParagraph->notifyEvent(
+                    ::css::accessibility::AccessibleEventId::
+                    STATE_CHANGED,
+                    ::css::uno::Any(),
+                    ::css::uno::makeAny(
+                        ::css::accessibility::AccessibleStateType::FOCUSED));
+            if (nNewLastPara != m_nSelectionLastPara
+                || nNewLastPos != m_nSelectionLastPos)
+                xParagraph->notifyEvent(
+                    ::css::accessibility::AccessibleEventId::
+                    CARET_CHANGED,
+                    ::css::uno::makeAny< ::sal_Int32 >(
+                        nNewLastPara == m_nSelectionLastPara
+                        ? m_nSelectionLastPos : 0),
+                    ::css::uno::makeAny(nNewLastPos));
+        }
+    }
+    m_aFocused = aIt;
+
+    // Update both old and new selection.  (Regardless of how the two selections
+    // look like, there will always be two ranges to the left and right of the
+    // overlap---the overlap and/or the range to the right of it possibly being
+    // empty.  Only for these two ranges notifications have to be sent.)
+
+    TextPaM aOldTextStart( static_cast< sal_uLong >( m_nSelectionFirstPara ), static_cast< sal_uInt16 >( m_nSelectionFirstPos ) );
+    TextPaM aOldTextEnd( static_cast< sal_uLong >( m_nSelectionLastPara ), static_cast< sal_uInt16 >( m_nSelectionLastPos ) );
+    TextPaM aNewTextStart( static_cast< sal_uLong >( nNewFirstPara ), static_cast< sal_uInt16 >( nNewFirstPos ) );
+    TextPaM aNewTextEnd( static_cast< sal_uLong >( nNewLastPara ), static_cast< sal_uInt16 >( nNewLastPos ) );
+
+    // justify selections
+    justifySelection( aOldTextStart, aOldTextEnd );
+    justifySelection( aNewTextStart, aNewTextEnd );
+
+    sal_Int32 nFirst1;
+    sal_Int32 nLast1;
+    sal_Int32 nFirst2;
+    sal_Int32 nLast2;
+
+    if ( m_nSelectionFirstPara == -1 )
+    {
+        // old selection not initialized yet => notify events only for new selection (if not empty)
+        nFirst1 = aNewTextStart.GetPara();
+        nLast1 = aNewTextEnd.GetPara() + ( aNewTextStart != aNewTextEnd ? 1 : 0 );
+        nFirst2 = 0;
+        nLast2 = 0;
+    }
+    else if ( aOldTextStart == aOldTextEnd && aNewTextStart == aNewTextEnd )
+    {
+        // old an new selection empty => no events
+        nFirst1 = 0;
+        nLast1 = 0;
+        nFirst2 = 0;
+        nLast2 = 0;
+    }
+    else if ( aOldTextStart != aOldTextEnd && aNewTextStart == aNewTextEnd )
+    {
+        // old selection not empty + new selection empty => notify events only for old selection
+        nFirst1 = aOldTextStart.GetPara();
+        nLast1 = aOldTextEnd.GetPara() + 1;
+        nFirst2 = 0;
+        nLast2 = 0;
+    }
+    else if ( aOldTextStart == aOldTextEnd && aNewTextStart != aNewTextEnd )
+    {
+        // old selection empty + new selection not empty => notify events only for new selection
+        nFirst1 = aNewTextStart.GetPara();
+        nLast1 = aNewTextEnd.GetPara() + 1;
+        nFirst2 = 0;
+        nLast2 = 0;
+    }
+    else
+    {
+        // old and new selection not empty => notify events for the two ranges left and right of the overlap
+        ::std::vector< TextPaM > aTextPaMs(4);
+        aTextPaMs[0] = aOldTextStart;
+        aTextPaMs[1] = aOldTextEnd;
+        aTextPaMs[2] = aNewTextStart;
+        aTextPaMs[3] = aNewTextEnd;
+        ::std::sort( aTextPaMs.begin(), aTextPaMs.end() );
+
+        nFirst1 = aTextPaMs[0].GetPara();
+        nLast1 = aTextPaMs[1].GetPara() + ( aTextPaMs[0] != aTextPaMs[1] ? 1 : 0 );
+
+        nFirst2 = aTextPaMs[2].GetPara();
+        nLast2 = aTextPaMs[3].GetPara() + ( aTextPaMs[2] != aTextPaMs[3] ? 1 : 0 );
+
+        // adjust overlapping ranges
+        if ( nLast1 > nFirst2 )
+            nLast1 = nFirst2;
+    }
+
+    // notify selection changes
+    notifySelectionChange( nFirst1, nLast1 );
+    notifySelectionChange( nFirst2, nLast2 );
+
+    m_nSelectionFirstPara = nNewFirstPara;
+    m_nSelectionFirstPos = nNewFirstPos;
+    m_nSelectionLastPara = nNewLastPara;
+    m_nSelectionLastPos = nNewLastPos;
+}
+
+void Document::notifySelectionChange( sal_Int32 nFirst, sal_Int32 nLast )
+{
+    if ( nFirst < nLast )
+    {
+        Paragraphs::iterator aEnd( ::std::min( m_xParagraphs->begin() + nLast, m_aVisibleEnd ) );
+        for ( Paragraphs::iterator aIt = ::std::max( m_xParagraphs->begin() + nFirst, m_aVisibleBegin ); aIt < aEnd; ++aIt )
+        {
+            ::rtl::Reference< ParagraphImpl > xParagraph( getParagraph( aIt ) );
+            if ( xParagraph.is() )
+            {
+                xParagraph->notifyEvent(
+                    ::css::accessibility::AccessibleEventId::SELECTION_CHANGED,
+                    ::css::uno::Any(), ::css::uno::Any() );
+                xParagraph->notifyEvent(
+                    ::css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED,
+                    ::css::uno::Any(), ::css::uno::Any() );
+            }
+        }
+    }
+}
+
+void Document::justifySelection( TextPaM& rTextStart, TextPaM& rTextEnd )
+{
+    if ( rTextStart > rTextEnd )
+    {
+        TextPaM aTextPaM( rTextStart );
+        rTextStart = rTextEnd;
+        rTextEnd = aTextPaM;
+    }
+}
+
+void Document::disposeParagraphs()
+{
+    for (Paragraphs::iterator aIt(m_xParagraphs->begin());
+         aIt != m_xParagraphs->end(); ++aIt)
+    {
+        ::css::uno::Reference< ::css::lang::XComponent > xComponent(
+            aIt->getParagraph().get(), ::css::uno::UNO_QUERY);
+        if (xComponent.is())
+            xComponent->dispose();
+    }
+}
+
+// static
+::css::uno::Any Document::mapFontColor(::Color const & rColor)
+{
+    return ::css::uno::makeAny(
+        static_cast< ::sal_Int32 >(COLORDATA_RGB(rColor.GetColor())));
+        // FIXME  keep transparency?
+}
+
+// static
+::Color Document::mapFontColor(::css::uno::Any const & rColor)
+{
+    ::sal_Int32 nColor = 0;
+    rColor >>= nColor;
+    return ::Color(static_cast< ::ColorData >(nColor));
+}
+
+// static
+::css::uno::Any Document::mapFontWeight(::FontWeight nWeight)
+{
+    // Map from ::FontWeight to ::css:awt::FontWeight, depends on order of
+    // elements in ::FontWeight (vcl/vclenum.hxx):
+    static float const aWeight[]
+        = { ::css::awt::FontWeight::DONTKNOW, // WEIGHT_DONTKNOW
+            ::css::awt::FontWeight::THIN, // WEIGHT_THIN
+            ::css::awt::FontWeight::ULTRALIGHT, // WEIGHT_ULTRALIGHT
+            ::css::awt::FontWeight::LIGHT, // WEIGHT_LIGHT
+            ::css::awt::FontWeight::SEMILIGHT, // WEIGHT_SEMILIGHT
+            ::css::awt::FontWeight::NORMAL, // WEIGHT_NORMAL
+            ::css::awt::FontWeight::NORMAL, // WEIGHT_MEDIUM
+            ::css::awt::FontWeight::SEMIBOLD, // WEIGHT_SEMIBOLD
+            ::css::awt::FontWeight::BOLD, // WEIGHT_BOLD
+            ::css::awt::FontWeight::ULTRABOLD, // WEIGHT_ULTRABOLD
+            ::css::awt::FontWeight::BLACK }; // WEIGHT_BLACK
+    return ::css::uno::makeAny(aWeight[nWeight]);
+}
+
+// static
+::FontWeight Document::mapFontWeight(::css::uno::Any const & rWeight)
+{
+    float nWeight = ::css::awt::FontWeight::NORMAL;
+    rWeight >>= nWeight;
+    return nWeight <= ::css::awt::FontWeight::DONTKNOW ? WEIGHT_DONTKNOW
+        : nWeight <= ::css::awt::FontWeight::THIN ? WEIGHT_THIN
+        : nWeight <= ::css::awt::FontWeight::ULTRALIGHT ? WEIGHT_ULTRALIGHT
+        : nWeight <= ::css::awt::FontWeight::LIGHT ? WEIGHT_LIGHT
+        : nWeight <= ::css::awt::FontWeight::SEMILIGHT ? WEIGHT_SEMILIGHT
+        : nWeight <= ::css::awt::FontWeight::NORMAL ? WEIGHT_NORMAL
+        : nWeight <= ::css::awt::FontWeight::SEMIBOLD ? WEIGHT_SEMIBOLD
+        : nWeight <= ::css::awt::FontWeight::BOLD ? WEIGHT_BOLD
+        : nWeight <= ::css::awt::FontWeight::ULTRABOLD ? WEIGHT_ULTRABOLD
+        : WEIGHT_BLACK;
+}
+
+}
+
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
new file mode 100755
index 000000000000..7279b5e2ff60
--- /dev/null
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -0,0 +1,552 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+#include <accessibility/helper/acc_factory.hxx>
+
+#include <toolkit/awt/vclxwindows.hxx>
+#include <accessibility/standard/vclxaccessiblebutton.hxx>
+#include <accessibility/standard/vclxaccessiblecheckbox.hxx>
+#include <accessibility/standard/vclxaccessibledropdowncombobox.hxx>
+#include <accessibility/standard/vclxaccessiblecombobox.hxx>
+#include <accessibility/standard/vclxaccessibledropdownlistbox.hxx>
+#include <accessibility/standard/vclxaccessibleedit.hxx>
+#include <accessibility/standard/vclxaccessiblefixedhyperlink.hxx>
+#include <accessibility/standard/vclxaccessiblefixedtext.hxx>
+#include <accessibility/standard/vclxaccessiblelistbox.hxx>
+#include <accessibility/standard/vclxaccessiblemenu.hxx>
+#include <accessibility/standard/vclxaccessibleradiobutton.hxx>
+#include <accessibility/standard/vclxaccessiblescrollbar.hxx>
+#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
+#include <accessibility/standard/vclxaccessibletoolbox.hxx>
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+#include <accessibility/standard/vclxaccessiblestatusbar.hxx>
+#include <accessibility/standard/vclxaccessibletabcontrol.hxx>
+#include <accessibility/standard/vclxaccessibletabpagewindow.hxx>
+#include <accessibility/standard/vclxaccessiblemenubar.hxx>
+#include <accessibility/standard/vclxaccessiblepopupmenu.hxx>
+#include <accessibility/extended/accessibletablistbox.hxx>
+#include <accessibility/extended/AccessibleBrowseBox.hxx>
+#include <accessibility/extended/accessibleiconchoicectrl.hxx>
+#include <accessibility/extended/accessibletabbar.hxx>
+#include <accessibility/extended/accessiblelistbox.hxx>
+#include <accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx>
+#include <accessibility/extended/textwindowaccessibility.hxx>
+#include <accessibility/extended/AccessibleBrowseBoxTableCell.hxx>
+#include <accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx>
+#include <accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx>
+#include <accessibility/extended/accessibleeditbrowseboxcell.hxx>
+#include <accessibility/extended/AccessibleToolPanelDeck.hxx>
+#include <accessibility/extended/AccessibleToolPanelDeckTabBar.hxx>
+#include <accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx>
+#include <vcl/lstbox.hxx>
+#include <vcl/combobox.hxx>
+#include <accessibility/extended/AccessibleGridControl.hxx>
+#include <svtools/accessibletable.hxx>
+#include <vcl/popupmenuwindow.hxx>
+#include <cppuhelper/implbase1.hxx>
+
+#include "floatingwindowaccessible.hxx"
+
+//........................................................................
+namespace accessibility
+{
+
+inline bool hasFloatingChild(Window *pWindow)
+{
+    Window * pChild = pWindow->GetAccessibleChildWindow(0);
+    if( pChild && WINDOW_FLOATINGWINDOW == pChild->GetType() )
+        return true;
+
+    return false;
+}
+
+//........................................................................
+
+    using namespace ::com::sun::star::uno;
+    using namespace ::com::sun::star::awt;
+    using namespace ::com::sun::star::accessibility;
+    using namespace ::svt;
+    using namespace ::svt::table;
+
+    //================================================================
+    //= IAccessibleFactory
+    //================================================================
+    class AccessibleFactory :public ::toolkit::IAccessibleFactory
+                            ,public ::svt::IAccessibleFactory
+    {
+    private:
+        oslInterlockedCount m_refCount;
+
+    public:
+        AccessibleFactory();
+
+        // IReference
+        virtual oslInterlockedCount SAL_CALL acquire();
+        virtual oslInterlockedCount SAL_CALL release();
+
+        // ::toolkit::IAccessibleFactory
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+            createAccessibleContext( VCLXButton* _pXWindow );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+            createAccessibleContext( VCLXCheckBox* _pXWindow );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+            createAccessibleContext( VCLXRadioButton* _pXWindow );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+            createAccessibleContext( VCLXListBox* _pXWindow );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+            createAccessibleContext( VCLXFixedText* _pXWindow );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+            createAccessibleContext( VCLXFixedHyperlink* _pXWindow );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+            createAccessibleContext( VCLXScrollBar* _pXWindow );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+            createAccessibleContext( VCLXEdit* _pXWindow );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+            createAccessibleContext( VCLXComboBox* _pXWindow );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+            createAccessibleContext( VCLXToolBox* _pXWindow );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+            createAccessibleContext( VCLXWindow* _pXWindow );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+            createAccessible( Menu* _pMenu, sal_Bool _bIsMenuBar );
+
+        // ::svt::IAccessibleFactory
+        virtual IAccessibleTabListBox*
+            createAccessibleTabListBox(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
+                SvHeaderTabListBox& rBox
+            ) const;
+
+        virtual IAccessibleBrowseBox*
+            createAccessibleBrowseBox(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+                IAccessibleTableProvider& _rBrowseBox
+            ) const;
+
+        virtual IAccessibleTableControl*
+            createAccessibleTableControl(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+                IAccessibleTable& _rTable
+            ) const;
+
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+            createAccessibleIconChoiceCtrl(
+                SvtIconChoiceCtrl& _rIconCtrl,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent
+            ) const;
+
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+            createAccessibleTabBar(
+                TabBar& _rTabBar
+            ) const;
+
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+            createAccessibleTextWindowContext(
+                VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView, bool bCompoundControlChild
+            ) const;
+
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+            createAccessibleTreeListBox(
+                SvTreeListBox& _rListBox,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent
+            ) const;
+
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+            createAccessibleBrowseBoxHeaderBar(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
+                IAccessibleTableProvider& _rOwningTable,
+                AccessibleBrowseBoxObjType _eObjType
+            ) const;
+
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+            createAccessibleBrowseBoxTableCell(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+                IAccessibleTableProvider& _rBrowseBox,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+                sal_Int32 _nRowId,
+                sal_uInt16 _nColId,
+                sal_Int32 _nOffset
+            ) const;
+
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+            createAccessibleBrowseBoxHeaderCell(
+                sal_Int32 _nColumnRowId,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxParent,
+                IAccessibleTableProvider& _rBrowseBox,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+                AccessibleBrowseBoxObjType  _eObjType
+            ) const;
+
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+            createAccessibleCheckBoxCell(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParent,
+                IAccessibleTableProvider& _rBrowseBox,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow,
+                sal_Int32 _nRowPos,
+                sal_uInt16 _nColPos,
+                const TriState& _eState,
+                sal_Bool _bEnabled,
+                sal_Bool _bIsTriState
+            ) const;
+
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+            createEditBrowseBoxTableCellAccess(
+                const ::com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible >& _rxParent,
+                const ::com::sun::star::uno::Reference< com::sun::star::accessibility::XAccessible >& _rxControlAccessible,
+                const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _rxFocusWindow,
+                IAccessibleTableProvider& _rBrowseBox,
+                sal_Int32 _nRowPos,
+                sal_uInt16 _nColPos
+            ) const;
+
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+            createAccessibleToolPanelDeck(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rAccessibleParent,
+                ::svt::ToolPanelDeck& i_rPanelDeck
+            );
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >
+            createAccessibleToolPanelTabBar(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rAccessibleParent,
+                ::svt::IToolPanelDeck& i_rPanelDeck,
+                ::svt::PanelTabBar& i_rTabBar
+            );
+
+    protected:
+        virtual ~AccessibleFactory();
+    };
+
+
+    //--------------------------------------------------------------------
+    AccessibleFactory::AccessibleFactory()
+        :m_refCount( 0 )
+    {
+    }
+
+    //--------------------------------------------------------------------
+    AccessibleFactory::~AccessibleFactory()
+    {
+    }
+
+    //--------------------------------------------------------------------
+    oslInterlockedCount SAL_CALL AccessibleFactory::acquire()
+    {
+        return osl_incrementInterlockedCount( &m_refCount );
+    }
+
+    //--------------------------------------------------------------------
+    oslInterlockedCount SAL_CALL AccessibleFactory::release()
+    {
+        if ( 0 == osl_decrementInterlockedCount( &m_refCount ) )
+        {
+            delete this;
+            return 0;
+        }
+        return m_refCount;
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessible > AccessibleFactory::createAccessible( Menu* _pMenu, sal_Bool _bIsMenuBar )
+    {
+        OAccessibleMenuBaseComponent* pAccessible;
+        if ( _bIsMenuBar )
+            pAccessible = new VCLXAccessibleMenuBar( _pMenu );
+        else
+            pAccessible = new VCLXAccessiblePopupMenu( _pMenu );
+        pAccessible->SetStates();
+        return pAccessible;
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXButton* _pXWindow )
+    {
+        return new VCLXAccessibleButton( _pXWindow );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXCheckBox* _pXWindow )
+    {
+        return new VCLXAccessibleCheckBox( _pXWindow );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXRadioButton* _pXWindow )
+    {
+        return new VCLXAccessibleRadioButton( _pXWindow );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXListBox* _pXWindow )
+    {
+        sal_Bool bIsDropDownBox = sal_False;
+        ListBox* pBox = static_cast< ListBox* >( _pXWindow->GetWindow() );
+        if ( pBox )
+            bIsDropDownBox = ( ( pBox->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN );
+
+        if ( bIsDropDownBox )
+            return new VCLXAccessibleDropDownListBox( _pXWindow );
+        else
+            return new VCLXAccessibleListBox( _pXWindow );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXFixedText* _pXWindow )
+    {
+        return new VCLXAccessibleFixedText( _pXWindow );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXFixedHyperlink* _pXWindow )
+    {
+        return new VCLXAccessibleFixedHyperlink( _pXWindow );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXScrollBar* _pXWindow )
+    {
+        return new VCLXAccessibleScrollBar( _pXWindow );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXEdit* _pXWindow )
+    {
+        return new VCLXAccessibleEdit( _pXWindow );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXComboBox* _pXWindow )
+    {
+        sal_Bool bIsDropDownBox = sal_False;
+        ComboBox* pBox = static_cast< ComboBox* >( _pXWindow->GetWindow() );
+        if ( pBox )
+            bIsDropDownBox = ( ( pBox->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN );
+
+        if ( bIsDropDownBox )
+            return new VCLXAccessibleDropDownComboBox( _pXWindow );
+        else
+            return new VCLXAccessibleComboBox( _pXWindow );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXWindow* _pXWindow )
+    {
+        Reference< XAccessibleContext > xContext;
+
+        Window* pWindow = _pXWindow->GetWindow();
+        if ( pWindow )
+        {
+            WindowType nType = pWindow->GetType();
+
+            if ( nType == WINDOW_MENUBARWINDOW || pWindow->IsMenuFloatingWindow() || pWindow->IsToolbarFloatingWindow() )
+            {
+                Reference< XAccessible > xAcc( pWindow->GetAccessible() );
+                if ( xAcc.is() )
+                {
+                    Reference< XAccessibleContext > xCont( xAcc->getAccessibleContext() );
+                    if ( pWindow->GetType() == WINDOW_MENUBARWINDOW ||
+                        ( xCont.is() && xCont->getAccessibleRole() == AccessibleRole::POPUP_MENU ) )
+                    {
+                        xContext = xCont;
+                    }
+                }
+            }
+            else if ( nType == WINDOW_STATUSBAR )
+            {
+                xContext = (XAccessibleContext*) new VCLXAccessibleStatusBar( _pXWindow );
+            }
+            else if ( nType == WINDOW_TABCONTROL )
+            {
+                xContext = (XAccessibleContext*) new VCLXAccessibleTabControl( _pXWindow );
+            }
+            else if ( nType == WINDOW_TABPAGE && pWindow->GetAccessibleParentWindow() && pWindow->GetAccessibleParentWindow()->GetType() == WINDOW_TABCONTROL )
+            {
+                xContext = new VCLXAccessibleTabPageWindow( _pXWindow );
+            }
+            else if ( nType == WINDOW_FLOATINGWINDOW )
+            {
+                xContext = new FloatingWindowAccessible( _pXWindow );
+            }
+            else if ( nType == WINDOW_BORDERWINDOW && hasFloatingChild( pWindow ) )
+            {
+                PopupMenuFloatingWindow* pChild = dynamic_cast<PopupMenuFloatingWindow*>(
+                    pWindow->GetAccessibleChildWindow(0));
+                if ( pChild && pChild->IsPopupMenu() )
+                {
+                    // Get the accessible context from the child window.
+                    Reference<XAccessible> xAccessible = pChild->CreateAccessible();
+                    if (xAccessible.is())
+                        xContext = xAccessible->getAccessibleContext();
+                }
+                else
+                    xContext = new FloatingWindowAccessible( _pXWindow );
+            }
+            else if ( ( nType == WINDOW_HELPTEXTWINDOW ) || ( nType == WINDOW_FIXEDLINE ) )
+            {
+               xContext = (accessibility::XAccessibleContext*) new VCLXAccessibleFixedText( _pXWindow );
+            }
+            else
+            {
+               xContext = (accessibility::XAccessibleContext*) new VCLXAccessibleComponent( _pXWindow );
+            }
+        }
+
+        return xContext;
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXToolBox* _pXWindow )
+    {
+        return new VCLXAccessibleToolBox( _pXWindow );
+    }
+
+    //--------------------------------------------------------------------
+    IAccessibleTabListBox* AccessibleFactory::createAccessibleTabListBox(
+        const Reference< XAccessible >& rxParent, SvHeaderTabListBox& rBox ) const
+    {
+        return new AccessibleTabListBox( rxParent, rBox );
+    }
+
+    //--------------------------------------------------------------------
+    IAccessibleBrowseBox* AccessibleFactory::createAccessibleBrowseBox(
+        const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox ) const
+    {
+        return new AccessibleBrowseBoxAccess( _rxParent, _rBrowseBox );
+    }
+
+    //--------------------------------------------------------------------
+    IAccessibleTableControl* AccessibleFactory::createAccessibleTableControl(
+        const Reference< XAccessible >& _rxParent, IAccessibleTable& _rTable ) const
+    {
+        return new AccessibleGridControlAccess( _rxParent, _rTable );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessible > AccessibleFactory::createAccessibleIconChoiceCtrl(
+        SvtIconChoiceCtrl& _rIconCtrl, const Reference< XAccessible >& _xParent ) const
+    {
+        return new AccessibleIconChoiceCtrl( _rIconCtrl, _xParent );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessible > AccessibleFactory::createAccessibleTabBar( TabBar& _rTabBar ) const
+    {
+        return new AccessibleTabBar( &_rTabBar );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessibleContext > AccessibleFactory::createAccessibleTextWindowContext(
+        VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView, bool bCompoundControlChild ) const
+    {
+        return new Document( pVclXWindow, rEngine, rView, bCompoundControlChild );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessible > AccessibleFactory::createAccessibleTreeListBox(
+        SvTreeListBox& _rListBox, const Reference< XAccessible >& _xParent ) const
+    {
+        return new AccessibleListBox( _rListBox, _xParent );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderBar(
+        const Reference< XAccessible >& rxParent, IAccessibleTableProvider& _rOwningTable,
+        AccessibleBrowseBoxObjType _eObjType ) const
+    {
+        return new AccessibleBrowseBoxHeaderBar( rxParent, _rOwningTable, _eObjType );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxTableCell(
+        const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox,
+        const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowId, sal_uInt16 _nColId, sal_Int32 _nOffset ) const
+    {
+        return new AccessibleBrowseBoxTableCell( _rxParent, _rBrowseBox, _xFocusWindow,
+            _nRowId, _nColId, _nOffset );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderCell(
+        sal_Int32 _nColumnRowId, const Reference< XAccessible >& rxParent, IAccessibleTableProvider& _rBrowseBox,
+        const Reference< XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType  _eObjType ) const
+    {
+        return new AccessibleBrowseBoxHeaderCell( _nColumnRowId, rxParent, _rBrowseBox,
+            _xFocusWindow, _eObjType );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessible > AccessibleFactory::createAccessibleCheckBoxCell(
+        const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox,
+        const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos,
+        const TriState& _eState, sal_Bool _bEnabled, sal_Bool _bIsTriState ) const
+    {
+        return new AccessibleCheckBoxCell( _rxParent, _rBrowseBox, _xFocusWindow,
+            _nRowPos, _nColPos, _eState, _bEnabled, _bIsTriState );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessible > AccessibleFactory::createEditBrowseBoxTableCellAccess(
+        const Reference< XAccessible >& _rxParent, const Reference< XAccessible >& _rxControlAccessible,
+        const Reference< XWindow >& _rxFocusWindow, IAccessibleTableProvider& _rBrowseBox,
+        sal_Int32 _nRowPos, sal_uInt16 _nColPos ) const
+    {
+        return new EditBrowseBoxTableCellAccess( _rxParent, _rxControlAccessible,
+            _rxFocusWindow, _rBrowseBox, _nRowPos, _nColPos );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessibleContext > AccessibleFactory::createAccessibleToolPanelDeck(
+            const Reference< XAccessible >& i_rAccessibleParent, ::svt::ToolPanelDeck& i_rPanelDeck )
+    {
+        return new AccessibleToolPanelDeck( i_rAccessibleParent, i_rPanelDeck );
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XAccessibleContext > AccessibleFactory::createAccessibleToolPanelTabBar(
+        const Reference< XAccessible >& i_rAccessibleParent, ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar )
+    {
+        return new AccessibleToolPanelTabBar( i_rAccessibleParent, i_rPanelDeck, i_rTabBar );
+    }
+
+//........................................................................
+}   // namespace accessibility
+//........................................................................
+
+//========================================================================
+extern "C" void* SAL_CALL getStandardAccessibleFactory()
+{
+    ::toolkit::IAccessibleFactory* pFactory = new ::accessibility::AccessibleFactory;
+    pFactory->acquire();
+    return pFactory;
+}
+
+extern "C" void* SAL_CALL getSvtAccessibilityComponentFactory()
+{
+    ::svt::IAccessibleFactory* pFactory = new ::accessibility::AccessibleFactory;
+    pFactory->acquire();
+    return pFactory;
+}
diff --git a/accessibility/source/helper/accessiblestrings.src b/accessibility/source/helper/accessiblestrings.src
new file mode 100644
index 000000000000..ee7f77f9b502
--- /dev/null
+++ b/accessibility/source/helper/accessiblestrings.src
@@ -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 ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_
+#include <accessibility/helper/accessiblestrings.hrc>
+#endif
+
+
+String RID_STR_ACC_ACTION_CLICK
+{
+    Text = "click";
+};
+
+String RID_STR_ACC_ACTION_TOGGLEPOPUP
+{
+    Text = "togglePopup";
+};
+
+String RID_STR_ACC_ACTION_SELECT
+{
+    Text = "select";
+};
+
+String RID_STR_ACC_ACTION_INCLINE
+{
+    Text = "incrementLine";
+};
+
+String RID_STR_ACC_ACTION_DECLINE
+{
+    Text = "decrementLine";
+};
+
+String RID_STR_ACC_ACTION_INCBLOCK
+{
+    Text = "incrementBlock";
+};
+
+String RID_STR_ACC_ACTION_DECBLOCK
+{
+    Text = "decrementBlock";
+};
+
+String RID_STR_ACC_NAME_BROWSEBUTTON
+{
+    Text [ en-US ] = "Browse";
+};
+
+String RID_STR_ACC_DESC_PANELDECL_TABBAR
+{
+    Text [ en-US ] = "Panel Deck Tab Bar";
+};
diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx
new file mode 100644
index 000000000000..41647837df4e
--- /dev/null
+++ b/accessibility/source/helper/accresmgr.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_accessibility.hxx"
+#include <accessibility/helper/accresmgr.hxx>
+
+#ifndef _TOOLS_SIMPLERESMGR_HXX
+#include <tools/simplerm.hxx>
+#endif
+#include <vcl/svapp.hxx>
+
+
+// -----------------------------------------------------------------------------
+// TkResMgr
+// -----------------------------------------------------------------------------
+
+SimpleResMgr* TkResMgr::m_pImpl = NULL;
+
+// -----------------------------------------------------------------------------
+
+TkResMgr::EnsureDelete::~EnsureDelete()
+{
+    delete TkResMgr::m_pImpl;
+}
+
+// -----------------------------------------------------------------------------
+
+void TkResMgr::ensureImplExists()
+{
+    if (m_pImpl)
+        return;
+
+    ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();
+
+    ByteString sResMgrName( "acc" );
+
+    m_pImpl = SimpleResMgr::Create( sResMgrName.GetBuffer(), aLocale );
+
+    if (m_pImpl)
+    {
+        // now that we have a impl class, make sure it's deleted on unloading the library
+        static TkResMgr::EnsureDelete s_aDeleteTheImplClass;
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString TkResMgr::loadString( sal_uInt16 nResId )
+{
+    ::rtl::OUString sReturn;
+
+    ensureImplExists();
+    if ( m_pImpl )
+        sReturn = m_pImpl->ReadString( nResId );
+
+    return sReturn;
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/helper/characterattributeshelper.cxx b/accessibility/source/helper/characterattributeshelper.cxx
new file mode 100644
index 000000000000..6444925dfbac
--- /dev/null
+++ b/accessibility/source/helper/characterattributeshelper.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+#include <accessibility/helper/characterattributeshelper.hxx>
+
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
+
+
+// -----------------------------------------------------------------------------
+// CharacterAttributesHelper
+// -----------------------------------------------------------------------------
+
+CharacterAttributesHelper::CharacterAttributesHelper( const Font& rFont, sal_Int32 nBackColor, sal_Int32 nColor )
+{
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharBackColor" ), makeAny( (sal_Int32) nBackColor ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharColor" ), makeAny( (sal_Int32) nColor ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharFontCharSet" ), makeAny( (sal_Int16) rFont.GetCharSet() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharFontFamily" ), makeAny( (sal_Int16) rFont.GetFamily() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharFontName" ), makeAny( (::rtl::OUString) rFont.GetName() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharFontPitch" ), makeAny( (sal_Int16) rFont.GetPitch() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharFontStyleName" ), makeAny( (::rtl::OUString) rFont.GetStyleName() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharHeight" ), makeAny( (sal_Int16) rFont.GetSize().Height() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharScaleWidth" ), makeAny( (sal_Int16) rFont.GetSize().Width() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharStrikeout" ), makeAny( (sal_Int16) rFont.GetStrikeout() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharUnderline" ), makeAny( (sal_Int16) rFont.GetUnderline() ) ) );
+    m_aAttributeMap.insert( AttributeMap::value_type( ::rtl::OUString::createFromAscii( "CharWeight" ), makeAny( (float) rFont.GetWeight() ) ) );
+}
+
+// -----------------------------------------------------------------------------
+
+CharacterAttributesHelper::~CharacterAttributesHelper()
+{
+    m_aAttributeMap.clear();
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< PropertyValue > CharacterAttributesHelper::GetCharacterAttributes()
+{
+    Sequence< PropertyValue > aValues( m_aAttributeMap.size() );
+    PropertyValue* pValues = aValues.getArray();
+
+    for ( AttributeMap::iterator aIt = m_aAttributeMap.begin(); aIt != m_aAttributeMap.end(); ++aIt, ++pValues )
+    {
+        pValues->Name   = aIt->first;
+        pValues->Handle = (sal_Int32) -1;
+        pValues->Value  = aIt->second;
+        pValues->State  = PropertyState_DIRECT_VALUE;
+    }
+
+    return aValues;
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< PropertyValue > CharacterAttributesHelper::GetCharacterAttributes( const Sequence< ::rtl::OUString >& aRequestedAttributes )
+{
+    Sequence< PropertyValue > aValues;
+    sal_Int32 nLength = aRequestedAttributes.getLength();
+
+    if ( nLength != 0 )
+    {
+        const ::rtl::OUString* pNames = aRequestedAttributes.getConstArray();
+        AttributeMap aAttributeMap;
+
+        for ( sal_Int32 i = 0; i < nLength; ++i )
+        {
+            AttributeMap::iterator aFound = m_aAttributeMap.find( pNames[i] );
+            if ( aFound != m_aAttributeMap.end() )
+                aAttributeMap.insert( *aFound );
+        }
+
+        aValues.realloc( aAttributeMap.size() );
+        PropertyValue* pValues = aValues.getArray();
+
+        for ( AttributeMap::iterator aIt = aAttributeMap.begin(); aIt != aAttributeMap.end(); ++aIt, ++pValues )
+        {
+            pValues->Name   = aIt->first;
+            pValues->Handle = (sal_Int32) -1;
+            pValues->Value  = aIt->second;
+            pValues->State  = PropertyState_DIRECT_VALUE;
+        }
+    }
+    else
+    {
+        aValues = GetCharacterAttributes();
+    }
+
+    return aValues;
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/helper/makefile.mk b/accessibility/source/helper/makefile.mk
new file mode 100644
index 000000000000..72284e38f3bc
--- /dev/null
+++ b/accessibility/source/helper/makefile.mk
@@ -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.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=accessibility
+TARGET=helper
+
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+SLOFILES=   \
+            $(SLO)$/acc_factory.obj                 \
+            $(SLO)$/accresmgr.obj                   \
+            $(SLO)$/characterattributeshelper.obj   \
+
+SRS1NAME=$(TARGET)
+SRC1FILES=\
+            accessiblestrings.src
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :	target.mk
+
diff --git a/accessibility/source/inc/floatingwindowaccessible.hxx b/accessibility/source/inc/floatingwindowaccessible.hxx
new file mode 100644
index 000000000000..2d5e0e603f5a
--- /dev/null
+++ b/accessibility/source/inc/floatingwindowaccessible.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 ACCESSIBILITY_FLOATINGWINDOWACCESSIBLE_HXX
+#define ACCESSIBILITY_FLOATINGWINDOWACCESSIBLE_HXX
+
+#ifndef _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_
+#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+#endif
+
+class FloatingWindowAccessible : public VCLXAccessibleComponent
+{
+public:
+    FloatingWindowAccessible( VCLXWindow* pWindow );
+    virtual ~FloatingWindowAccessible();
+
+    virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet );
+};
+
+#endif // ACCESSIBILITY_FLOATINGWINDOWACCESSIBLE_HXX
+
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx
new file mode 100644
index 000000000000..5ebb06dc9db1
--- /dev/null
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -0,0 +1,783 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+
+// includes --------------------------------------------------------------
+#include <accessibility/standard/accessiblemenubasecomponent.hxx>
+#include <accessibility/standard/vclxaccessiblemenu.hxx>
+#include <accessibility/standard/vclxaccessiblemenuitem.hxx>
+#include <accessibility/standard/vclxaccessiblemenuseparator.hxx>
+#include <toolkit/helper/externallock.hxx>
+#include <toolkit/helper/convert.hxx>
+
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+
+#include <unotools/accessiblestatesethelper.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
+#include <vcl/menu.hxx>
+#include <tools/debug.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::accessibility;
+using namespace ::comphelper;
+
+
+// -----------------------------------------------------------------------------
+// OAccessibleMenuBaseComponent
+// -----------------------------------------------------------------------------
+
+OAccessibleMenuBaseComponent::OAccessibleMenuBaseComponent( Menu* pMenu )
+    :AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() )
+    ,m_pMenu( pMenu )
+    ,m_bEnabled( sal_False )
+    ,m_bFocused( sal_False )
+    ,m_bVisible( sal_False )
+    ,m_bSelected( sal_False )
+    ,m_bChecked( sal_False )
+{
+    m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() );
+
+    if ( m_pMenu )
+    {
+        m_aAccessibleChildren.assign( m_pMenu->GetItemCount(), Reference< XAccessible >() );
+        m_pMenu->AddEventListener( LINK( this, OAccessibleMenuBaseComponent, MenuEventListener ) );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+OAccessibleMenuBaseComponent::~OAccessibleMenuBaseComponent()
+{
+    if ( m_pMenu )
+        m_pMenu->RemoveEventListener( LINK( this, OAccessibleMenuBaseComponent, MenuEventListener ) );
+
+    delete m_pExternalLock;
+    m_pExternalLock = NULL;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool OAccessibleMenuBaseComponent::IsEnabled()
+{
+    return sal_False;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool OAccessibleMenuBaseComponent::IsFocused()
+{
+    return sal_False;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool OAccessibleMenuBaseComponent::IsVisible()
+{
+    return sal_False;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool OAccessibleMenuBaseComponent::IsSelected()
+{
+    return sal_False;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool OAccessibleMenuBaseComponent::IsChecked()
+{
+    return sal_False;
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::SetStates()
+{
+    m_bEnabled = IsEnabled();
+    m_bFocused = IsFocused();
+    m_bVisible = IsVisible();
+    m_bSelected = IsSelected();
+    m_bChecked = IsChecked();
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::SetEnabled( sal_Bool bEnabled )
+{
+    if ( m_bEnabled != bEnabled )
+    {
+        Any aOldValue[2], aNewValue[2];
+        if ( m_bEnabled )
+        {
+            aOldValue[0] <<= AccessibleStateType::SENSITIVE;
+            aOldValue[1] <<= AccessibleStateType::ENABLED;
+        }
+        else
+        {
+            aNewValue[0] <<= AccessibleStateType::ENABLED;
+            aNewValue[1] <<= AccessibleStateType::SENSITIVE;
+        }
+        m_bEnabled = bEnabled;
+        NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[0], aNewValue[0] );
+        NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[1], aNewValue[1] );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::SetFocused( sal_Bool bFocused )
+{
+    if ( m_bFocused != bFocused )
+    {
+        Any aOldValue, aNewValue;
+        if ( m_bFocused )
+            aOldValue <<= AccessibleStateType::FOCUSED;
+        else
+            aNewValue <<= AccessibleStateType::FOCUSED;
+        m_bFocused = bFocused;
+        NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::SetVisible( sal_Bool bVisible )
+{
+    if ( m_bVisible != bVisible )
+    {
+        Any aOldValue, aNewValue;
+        if ( m_bVisible )
+            aOldValue <<= AccessibleStateType::VISIBLE;
+        else
+            aNewValue <<= AccessibleStateType::VISIBLE;
+        m_bVisible = bVisible;
+        NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::SetSelected( sal_Bool bSelected )
+{
+    if ( m_bSelected != bSelected )
+    {
+        Any aOldValue, aNewValue;
+        if ( m_bSelected )
+            aOldValue <<= AccessibleStateType::SELECTED;
+        else
+            aNewValue <<= AccessibleStateType::SELECTED;
+        m_bSelected = bSelected;
+        NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::SetChecked( sal_Bool bChecked )
+{
+    if ( m_bChecked != bChecked )
+    {
+        Any aOldValue, aNewValue;
+        if ( m_bChecked )
+            aOldValue <<= AccessibleStateType::CHECKED;
+        else
+            aNewValue <<= AccessibleStateType::CHECKED;
+        m_bChecked = bChecked;
+        NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::UpdateEnabled( sal_Int32 i, sal_Bool bEnabled )
+{
+    if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+    {
+        Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+        if ( xChild.is() )
+        {
+            OAccessibleMenuBaseComponent* pComp = static_cast< OAccessibleMenuBaseComponent* >( xChild.get() );
+            if ( pComp )
+                pComp->SetEnabled( bEnabled );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::UpdateFocused( sal_Int32 i, sal_Bool bFocused )
+{
+    if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+    {
+        Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+        if ( xChild.is() )
+        {
+            OAccessibleMenuBaseComponent* pComp = static_cast< OAccessibleMenuBaseComponent* >( xChild.get() );
+            if ( pComp )
+                pComp->SetFocused( bFocused );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::UpdateVisible()
+{
+    SetVisible( IsVisible() );
+    for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+    {
+        Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+        if ( xChild.is() )
+        {
+            OAccessibleMenuBaseComponent* pComp = static_cast< OAccessibleMenuBaseComponent* >( xChild.get() );
+            if ( pComp )
+                pComp->SetVisible( pComp->IsVisible() );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::UpdateSelected( sal_Int32 i, sal_Bool bSelected )
+{
+    NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
+
+    if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+    {
+        Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+        if ( xChild.is() )
+        {
+            OAccessibleMenuBaseComponent* pComp = static_cast< OAccessibleMenuBaseComponent* >( xChild.get() );
+            if ( pComp )
+                pComp->SetSelected( bSelected );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::UpdateChecked( sal_Int32 i, sal_Bool bChecked )
+{
+    if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+    {
+        Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+        if ( xChild.is() )
+        {
+            OAccessibleMenuBaseComponent* pComp = static_cast< OAccessibleMenuBaseComponent* >( xChild.get() );
+            if ( pComp )
+                pComp->SetChecked( bChecked );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::UpdateAccessibleName( sal_Int32 i )
+{
+    if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+    {
+        Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+        if ( xChild.is() )
+        {
+            OAccessibleMenuItemComponent* pComp = static_cast< OAccessibleMenuItemComponent* >( xChild.get() );
+            if ( pComp )
+                pComp->SetAccessibleName( pComp->GetAccessibleName() );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::UpdateItemText( sal_Int32 i )
+{
+    if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+    {
+        Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+        if ( xChild.is() )
+        {
+            OAccessibleMenuItemComponent* pComp = static_cast< OAccessibleMenuItemComponent* >( xChild.get() );
+            if ( pComp )
+                pComp->SetItemText( pComp->GetItemText() );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 OAccessibleMenuBaseComponent::GetChildCount()
+{
+    return m_aAccessibleChildren.size();
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > OAccessibleMenuBaseComponent::GetChild( sal_Int32 i )
+{
+    Reference< XAccessible > xChild = m_aAccessibleChildren[i];
+    if ( !xChild.is() )
+    {
+        if ( m_pMenu )
+        {
+            // create a new child
+            OAccessibleMenuBaseComponent* pChild;
+
+            if ( m_pMenu->GetItemType( (sal_uInt16)i ) == MENUITEM_SEPARATOR )
+            {
+                pChild = new VCLXAccessibleMenuSeparator( m_pMenu, (sal_uInt16)i );
+            }
+            else
+            {
+                PopupMenu* pPopupMenu = m_pMenu->GetPopupMenu( m_pMenu->GetItemId( (sal_uInt16)i ) );
+                if ( pPopupMenu )
+                {
+                    pChild = new VCLXAccessibleMenu( m_pMenu, (sal_uInt16)i, pPopupMenu );
+                    pPopupMenu->SetAccessible( pChild );
+                }
+                else
+                {
+                    pChild = new VCLXAccessibleMenuItem( m_pMenu, (sal_uInt16)i );
+                }
+            }
+
+            // set states
+            pChild->SetStates();
+
+            xChild = pChild;
+
+            // insert into menu item list
+            m_aAccessibleChildren[i] = xChild;
+        }
+    }
+
+    return xChild;
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > OAccessibleMenuBaseComponent::GetChildAt( const awt::Point& rPoint )
+{
+    Reference< XAccessible > xChild;
+    for ( sal_uInt32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i )
+    {
+        Reference< XAccessible > xAcc = getAccessibleChild( i );
+        if ( xAcc.is() )
+        {
+            Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
+            if ( xComp.is() )
+            {
+                Rectangle aRect = VCLRectangle( xComp->getBounds() );
+                Point aPos = VCLPoint( rPoint );
+                if ( aRect.IsInside( aPos ) )
+                {
+                    xChild = xAcc;
+                    break;
+                }
+            }
+        }
+    }
+
+    return xChild;
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::InsertChild( sal_Int32 i )
+{
+    if ( i > (sal_Int32)m_aAccessibleChildren.size() )
+        i = m_aAccessibleChildren.size();
+
+    if ( i >= 0 )
+    {
+        // insert entry in child list
+        m_aAccessibleChildren.insert( m_aAccessibleChildren.begin() + i, Reference< XAccessible >() );
+
+        // update item position of accessible children
+        for ( sal_uInt32 j = i, nCount = m_aAccessibleChildren.size(); j < nCount; ++j )
+        {
+            Reference< XAccessible > xAcc( m_aAccessibleChildren[j] );
+            if ( xAcc.is() )
+            {
+                OAccessibleMenuItemComponent* pComp = static_cast< OAccessibleMenuItemComponent* >( xAcc.get() );
+                if ( pComp )
+                    pComp->SetItemPos( (sal_uInt16)j );
+            }
+        }
+
+        // send accessible child event
+        Reference< XAccessible > xChild( GetChild( i ) );
+        if ( xChild.is() )
+        {
+            Any aOldValue, aNewValue;
+            aNewValue <<= xChild;
+            NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldValue, aNewValue );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::RemoveChild( sal_Int32 i )
+{
+    if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+    {
+        // keep the accessible of the removed item
+        Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+
+        // remove entry in child list
+        m_aAccessibleChildren.erase( m_aAccessibleChildren.begin() + i );
+
+        // update item position of accessible children
+        for ( sal_uInt32 j = i, nCount = m_aAccessibleChildren.size(); j < nCount; ++j )
+        {
+            Reference< XAccessible > xAcc( m_aAccessibleChildren[j] );
+            if ( xAcc.is() )
+            {
+                OAccessibleMenuItemComponent* pComp = static_cast< OAccessibleMenuItemComponent* >( xAcc.get() );
+                if ( pComp )
+                    pComp->SetItemPos( (sal_uInt16)j );
+            }
+        }
+
+        // send accessible child event
+        if ( xChild.is() )
+        {
+            Any aOldValue, aNewValue;
+            aOldValue <<= xChild;
+            NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldValue, aNewValue );
+
+            Reference< XComponent > xComponent( xChild, UNO_QUERY );
+            if ( xComponent.is() )
+                xComponent->dispose();
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool OAccessibleMenuBaseComponent::IsHighlighted()
+{
+    return sal_False;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool OAccessibleMenuBaseComponent::IsChildHighlighted()
+{
+    sal_Bool bChildHighlighted = sal_False;
+
+    for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+    {
+        Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+        if ( xChild.is() )
+        {
+            OAccessibleMenuBaseComponent* pComp = static_cast< OAccessibleMenuBaseComponent* >( xChild.get() );
+            if ( pComp && pComp->IsHighlighted() )
+            {
+                bChildHighlighted = sal_True;
+                break;
+            }
+        }
+    }
+
+    return bChildHighlighted;
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::SelectChild( sal_Int32 i )
+{
+    // open the menu
+    if ( getAccessibleRole() == AccessibleRole::MENU && !IsPopupMenuOpen() )
+        Click();
+
+    // highlight the child
+    if ( m_pMenu )
+        m_pMenu->HighlightItem( (sal_uInt16)i );
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::DeSelectAll()
+{
+    if ( m_pMenu )
+        m_pMenu->DeHighlight();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool OAccessibleMenuBaseComponent::IsChildSelected( sal_Int32 i )
+{
+    sal_Bool bSelected = sal_False;
+
+    if ( m_pMenu && m_pMenu->IsHighlighted( (sal_uInt16)i ) )
+        bSelected = sal_True;
+
+    return bSelected;
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::Select()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::DeSelect()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::Click()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool OAccessibleMenuBaseComponent::IsPopupMenuOpen()
+{
+    return sal_False;
+}
+
+// -----------------------------------------------------------------------------
+
+IMPL_LINK( OAccessibleMenuBaseComponent, MenuEventListener, VclSimpleEvent*, pEvent )
+{
+    DBG_ASSERT( pEvent && pEvent->ISA( VclMenuEvent ), "OAccessibleMenuBaseComponent - Unknown MenuEvent!" );
+    if ( pEvent && pEvent->ISA( VclMenuEvent ) )
+    {
+        DBG_ASSERT( ((VclMenuEvent*)pEvent)->GetMenu(), "OAccessibleMenuBaseComponent - Menu?" );
+        ProcessMenuEvent( *(VclMenuEvent*)pEvent );
+    }
+    return 0;
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMenuEvent )
+{
+    sal_uInt16 nItemPos = rVclMenuEvent.GetItemPos();
+
+    switch ( rVclMenuEvent.GetId() )
+    {
+        case VCLEVENT_MENU_SHOW:
+        case VCLEVENT_MENU_HIDE:
+        {
+            UpdateVisible();
+        }
+        break;
+        case VCLEVENT_MENU_HIGHLIGHT:
+        {
+            SetFocused( sal_False );
+            UpdateFocused( nItemPos, sal_True );
+            UpdateSelected( nItemPos, sal_True );
+        }
+        break;
+        case VCLEVENT_MENU_DEHIGHLIGHT:
+        {
+            UpdateFocused( nItemPos, sal_False );
+            UpdateSelected( nItemPos, sal_False );
+        }
+        break;
+        case VCLEVENT_MENU_SUBMENUACTIVATE:
+        {
+        }
+        break;
+        case VCLEVENT_MENU_SUBMENUDEACTIVATE:
+        {
+            UpdateFocused( nItemPos, sal_True );
+        }
+        break;
+        case VCLEVENT_MENU_ENABLE:
+        {
+            UpdateEnabled( nItemPos, sal_True );
+        }
+        break;
+        case VCLEVENT_MENU_DISABLE:
+        {
+            UpdateEnabled( nItemPos, sal_False );
+        }
+        break;
+        case VCLEVENT_MENU_SUBMENUCHANGED:
+        {
+            RemoveChild( nItemPos );
+            InsertChild( nItemPos );
+        }
+        break;
+        case VCLEVENT_MENU_INSERTITEM:
+        {
+            InsertChild( nItemPos );
+        }
+        break;
+        case VCLEVENT_MENU_REMOVEITEM:
+        {
+            RemoveChild( nItemPos );
+        }
+        break;
+        case VCLEVENT_MENU_ACCESSIBLENAMECHANGED:
+        {
+            UpdateAccessibleName( nItemPos );
+        }
+        break;
+        case VCLEVENT_MENU_ITEMTEXTCHANGED:
+        {
+            UpdateAccessibleName( nItemPos );
+            UpdateItemText( nItemPos );
+        }
+        break;
+        case VCLEVENT_MENU_ITEMCHECKED:
+        {
+            UpdateChecked( nItemPos, sal_True );
+        }
+        break;
+        case VCLEVENT_MENU_ITEMUNCHECKED:
+        {
+            UpdateChecked( nItemPos, sal_False );
+        }
+        break;
+        case VCLEVENT_OBJECT_DYING:
+        {
+            if ( m_pMenu )
+            {
+                m_pMenu->RemoveEventListener( LINK( this, OAccessibleMenuBaseComponent, MenuEventListener ) );
+
+                m_pMenu = NULL;
+
+                // dispose all menu items
+                for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+                {
+                    Reference< XComponent > xComponent( m_aAccessibleChildren[i], UNO_QUERY );
+                    if ( xComponent.is() )
+                        xComponent->dispose();
+                }
+                m_aAccessibleChildren.clear();
+            }
+        }
+        break;
+        default:
+        {
+        }
+        break;
+    }
+}
+
+// -----------------------------------------------------------------------------
+// XInterface
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleMenuBaseComponent, AccessibleExtendedComponentHelper_BASE, OAccessibleMenuBaseComponent_BASE )
+
+// -----------------------------------------------------------------------------
+// XTypeProvider
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleMenuBaseComponent, AccessibleExtendedComponentHelper_BASE, OAccessibleMenuBaseComponent_BASE )
+
+// -----------------------------------------------------------------------------
+// XComponent
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuBaseComponent::disposing()
+{
+    AccessibleExtendedComponentHelper_BASE::disposing();
+
+    if ( m_pMenu )
+    {
+        m_pMenu->RemoveEventListener( LINK( this, OAccessibleMenuBaseComponent, MenuEventListener ) );
+
+        m_pMenu = NULL;
+
+        // dispose all menu items
+        for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+        {
+            Reference< XComponent > xComponent( m_aAccessibleChildren[i], UNO_QUERY );
+            if ( xComponent.is() )
+                xComponent->dispose();
+        }
+        m_aAccessibleChildren.clear();
+    }
+}
+
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+
+sal_Bool OAccessibleMenuBaseComponent::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() );
+    const ::rtl::OUString* pNames = aNames.getConstArray();
+    const ::rtl::OUString* pEnd = pNames + aNames.getLength();
+    for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames )
+        ;
+
+    return pNames != pEnd;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessible
+// -----------------------------------------------------------------------------
+
+Reference< XAccessibleContext > OAccessibleMenuBaseComponent::getAccessibleContext(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return this;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleContext
+// -----------------------------------------------------------------------------
+
+Reference< XAccessibleStateSet > OAccessibleMenuBaseComponent::getAccessibleStateSet(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper;
+    Reference< XAccessibleStateSet > xSet = pStateSetHelper;
+
+    if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
+    {
+        FillAccessibleStateSet( *pStateSetHelper );
+    }
+    else
+    {
+        pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+    }
+
+    return xSet;
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx
new file mode 100644
index 000000000000..05ba722a9453
--- /dev/null
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -0,0 +1,471 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+#include <accessibility/standard/accessiblemenucomponent.hxx>
+
+#include <toolkit/awt/vclxfont.hxx>
+#include <toolkit/helper/convert.hxx>
+
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+
+#include <unotools/accessiblestatesethelper.hxx>
+#include <unotools/accessiblerelationsethelper.hxx>
+#include <cppuhelper/typeprovider.hxx>
+#include <comphelper/sequence.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
+#include <vcl/menu.hxx>
+#include <vcl/unohelp2.hxx>
+
+
+using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star;
+using namespace ::comphelper;
+
+
+// -----------------------------------------------------------------------------
+// class OAccessibleMenuComponent
+// -----------------------------------------------------------------------------
+
+OAccessibleMenuComponent::OAccessibleMenuComponent( Menu* pMenu )
+    :OAccessibleMenuBaseComponent( pMenu )
+{
+}
+
+// -----------------------------------------------------------------------------
+
+OAccessibleMenuComponent::~OAccessibleMenuComponent()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool OAccessibleMenuComponent::IsEnabled()
+{
+    return sal_True;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool OAccessibleMenuComponent::IsVisible()
+{
+    sal_Bool bVisible = sal_False;
+
+    if ( m_pMenu )
+        bVisible = m_pMenu->IsMenuVisible();
+
+    return bVisible;
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuComponent::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+{
+    if ( IsEnabled() )
+    {
+        rStateSet.AddState( AccessibleStateType::ENABLED );
+        rStateSet.AddState( AccessibleStateType::SENSITIVE );
+    }
+
+    rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+
+    if ( IsFocused() )
+        rStateSet.AddState( AccessibleStateType::FOCUSED );
+
+    if ( IsVisible() )
+    {
+        rStateSet.AddState( AccessibleStateType::VISIBLE );
+        rStateSet.AddState( AccessibleStateType::SHOWING );
+    }
+
+    rStateSet.AddState( AccessibleStateType::OPAQUE );
+}
+
+// -----------------------------------------------------------------------------
+// OCommonAccessibleComponent
+// -----------------------------------------------------------------------------
+
+awt::Rectangle OAccessibleMenuComponent::implGetBounds() throw (RuntimeException)
+{
+    awt::Rectangle aBounds( 0, 0, 0, 0 );
+
+    if ( m_pMenu )
+    {
+        Window* pWindow = m_pMenu->GetWindow();
+        if ( pWindow )
+        {
+            // get bounding rectangle of the window in screen coordinates
+            Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL );
+            aBounds = AWTRectangle( aRect );
+
+            // get position of the accessible parent in screen coordinates
+            Reference< XAccessible > xParent = getAccessibleParent();
+            if ( xParent.is() )
+            {
+                Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), UNO_QUERY );
+                if ( xParentComponent.is() )
+                {
+                    awt::Point aParentScreenLoc = xParentComponent->getLocationOnScreen();
+
+                    // calculate position of the window relative to the accessible parent
+                    aBounds.X -= aParentScreenLoc.X;
+                    aBounds.Y -= aParentScreenLoc.Y;
+                }
+            }
+        }
+    }
+
+    return aBounds;
+}
+
+// -----------------------------------------------------------------------------
+// XInterface
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleMenuComponent, OAccessibleMenuBaseComponent, OAccessibleMenuComponent_BASE )
+
+// -----------------------------------------------------------------------------
+// XTypeProvider
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleMenuComponent, OAccessibleMenuBaseComponent, OAccessibleMenuComponent_BASE )
+
+// -----------------------------------------------------------------------------
+// XAccessibleContext
+// -----------------------------------------------------------------------------
+
+sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return GetChildCount();
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > OAccessibleMenuComponent::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( i < 0 || i >= GetChildCount() )
+        throw IndexOutOfBoundsException();
+
+    return GetChild( i );
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Reference< XAccessible > xParent;
+
+    if ( m_pMenu )
+    {
+        Window* pWindow = m_pMenu->GetWindow();
+        if ( pWindow )
+        {
+            Window* pParent = pWindow->GetAccessibleParentWindow();
+            if ( pParent )
+                xParent = pParent->GetAccessible();
+        }
+    }
+
+    return xParent;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int16 OAccessibleMenuComponent::getAccessibleRole(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return AccessibleRole::UNKNOWN;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    ::rtl::OUString sDescription;
+    if ( m_pMenu )
+    {
+        Window* pWindow = m_pMenu->GetWindow();
+        if ( pWindow )
+            sDescription = pWindow->GetAccessibleDescription();
+    }
+
+    return sDescription;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString OAccessibleMenuComponent::getAccessibleName(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return ::rtl::OUString();
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessibleRelationSet > OAccessibleMenuComponent::getAccessibleRelationSet(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
+    Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
+    return xSet;
+}
+
+// -----------------------------------------------------------------------------
+
+Locale OAccessibleMenuComponent::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return Application::GetSettings().GetLocale();
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleComponent
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > OAccessibleMenuComponent::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return GetChildAt( rPoint );
+}
+
+// -----------------------------------------------------------------------------
+
+awt::Point OAccessibleMenuComponent::getLocationOnScreen(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    awt::Point aPos;
+
+    if ( m_pMenu )
+    {
+        Window* pWindow = m_pMenu->GetWindow();
+        if ( pWindow )
+        {
+            Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL );
+            aPos = AWTPoint( aRect.TopLeft() );
+        }
+    }
+
+    return aPos;
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuComponent::grabFocus(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( m_pMenu )
+    {
+        Window* pWindow = m_pMenu->GetWindow();
+        if ( pWindow )
+            pWindow->GrabFocus();
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 OAccessibleMenuComponent::getForeground(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
+    sal_Int32 nColor = rStyleSettings.GetMenuTextColor().GetColor();
+
+    return nColor;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 OAccessibleMenuComponent::getBackground(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return 0;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleExtendedComponent
+// -----------------------------------------------------------------------------
+
+Reference< awt::XFont > OAccessibleMenuComponent::getFont(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Reference< awt::XFont > xFont;
+
+    if ( m_pMenu )
+    {
+        Window* pWindow = m_pMenu->GetWindow();
+        if ( pWindow )
+        {
+            Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(), UNO_QUERY );
+            if ( xDev.is() )
+            {
+                const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
+                VCLXFont* pVCLXFont = new VCLXFont;
+                pVCLXFont->Init( *xDev.get(), rStyleSettings.GetMenuFont() );
+                xFont = pVCLXFont;
+            }
+        }
+    }
+
+    return xFont;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString OAccessibleMenuComponent::getTitledBorderText(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return ::rtl::OUString();
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString OAccessibleMenuComponent::getToolTipText(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return ::rtl::OUString();
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleSelection
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nChildIndex < 0 || nChildIndex >= GetChildCount() )
+        throw IndexOutOfBoundsException();
+
+    SelectChild( nChildIndex );
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nChildIndex < 0 || nChildIndex >= GetChildCount() )
+        throw IndexOutOfBoundsException();
+
+    return IsChildSelected( nChildIndex );
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuComponent::clearAccessibleSelection(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    DeSelectAll();
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuComponent::selectAllAccessibleChildren(  ) throw (RuntimeException)
+{
+    // This method makes no sense in a menu, and so does nothing.
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nRet = 0;
+
+    for ( sal_Int32 i = 0, nCount = GetChildCount(); i < nCount; i++ )
+    {
+        if ( IsChildSelected( i ) )
+            ++nRet;
+    }
+
+    return nRet;
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nSelectedChildIndex < 0 || nSelectedChildIndex >= getSelectedAccessibleChildCount() )
+        throw IndexOutOfBoundsException();
+
+    Reference< XAccessible > xChild;
+
+    for ( sal_Int32 i = 0, j = 0, nCount = GetChildCount(); i < nCount; i++ )
+    {
+        if ( IsChildSelected( i ) && ( j++ == nSelectedChildIndex ) )
+        {
+            xChild = GetChild( i );
+            break;
+        }
+    }
+
+    return xChild;
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuComponent::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nChildIndex < 0 || nChildIndex >= GetChildCount() )
+        throw IndexOutOfBoundsException();
+
+    DeSelectAll();
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
new file mode 100644
index 000000000000..9ac93cedd299
--- /dev/null
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+#include <accessibility/standard/accessiblemenuitemcomponent.hxx>
+
+
+#include <accessibility/helper/accresmgr.hxx>
+#include <accessibility/helper/accessiblestrings.hrc>
+#include <toolkit/awt/vclxwindows.hxx>
+#include <toolkit/helper/externallock.hxx>
+#include <toolkit/helper/convert.hxx>
+
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
+#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
+
+#include <unotools/accessiblestatesethelper.hxx>
+#include <unotools/accessiblerelationsethelper.hxx>
+#include <cppuhelper/typeprovider.hxx>
+#include <comphelper/sequence.hxx>
+#include <comphelper/accessibletexthelper.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
+#include <vcl/menu.hxx>
+#include <vcl/unohelp2.hxx>
+
+
+using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star;
+using namespace ::comphelper;
+
+
+// -----------------------------------------------------------------------------
+// class OAccessibleMenuItemComponent
+// -----------------------------------------------------------------------------
+
+OAccessibleMenuItemComponent::OAccessibleMenuItemComponent( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu )
+    :OAccessibleMenuBaseComponent( pMenu )
+    ,m_pParent( pParent )
+    ,m_nItemPos( nItemPos )
+{
+    m_sAccessibleName = GetAccessibleName();
+    m_sItemText = GetItemText();
+}
+
+// -----------------------------------------------------------------------------
+
+OAccessibleMenuItemComponent::~OAccessibleMenuItemComponent()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool OAccessibleMenuItemComponent::IsEnabled()
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Bool bEnabled = sal_False;
+    if ( m_pParent )
+        bEnabled = m_pParent->IsItemEnabled( m_pParent->GetItemId( m_nItemPos ) );
+
+    return bEnabled;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool OAccessibleMenuItemComponent::IsVisible()
+{
+    sal_Bool bVisible = sal_False;
+
+    if ( m_pParent )
+        bVisible = m_pParent->IsItemPosVisible( m_nItemPos );
+
+    return bVisible;
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuItemComponent::Select()
+{
+    // open the parent menu
+    Reference< XAccessible > xParent( getAccessibleParent() );
+    if ( xParent.is() )
+    {
+        OAccessibleMenuBaseComponent* pComp = static_cast< OAccessibleMenuBaseComponent* >( xParent.get() );
+        if ( pComp && pComp->getAccessibleRole() == AccessibleRole::MENU && !pComp->IsPopupMenuOpen() )
+            pComp->Click();
+    }
+
+    // highlight the menu item
+    if ( m_pParent )
+        m_pParent->HighlightItem( m_nItemPos );
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuItemComponent::DeSelect()
+{
+    if ( m_pParent && IsSelected() )
+        m_pParent->DeHighlight();
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuItemComponent::Click()
+{
+    // open the parent menu
+    Reference< XAccessible > xParent( getAccessibleParent() );
+    if ( xParent.is() )
+    {
+        OAccessibleMenuBaseComponent* pComp = static_cast< OAccessibleMenuBaseComponent* >( xParent.get() );
+        if ( pComp && pComp->getAccessibleRole() == AccessibleRole::MENU && !pComp->IsPopupMenuOpen() )
+            pComp->Click();
+    }
+
+    // click the menu item
+    if ( m_pParent )
+    {
+        Window* pWindow = m_pParent->GetWindow();
+        if ( pWindow )
+        {
+            // #102438# Menu items are not selectable
+            // Popup menus are executed asynchronously, triggered by a timer.
+            // As Menu::SelectItem only works, if the corresponding menu window is
+            // already created, we have to set the menu delay to 0, so
+            // that the popup menus are executed synchronously.
+            AllSettings aSettings = pWindow->GetSettings();
+            MouseSettings aMouseSettings = aSettings.GetMouseSettings();
+            sal_uLong nDelay = aMouseSettings.GetMenuDelay();
+            aMouseSettings.SetMenuDelay( 0 );
+            aSettings.SetMouseSettings( aMouseSettings );
+            pWindow->SetSettings( aSettings );
+
+            m_pParent->SelectItem( m_pParent->GetItemId( m_nItemPos ) );
+
+            // meanwhile the window pointer may be invalid
+            pWindow = m_pParent->GetWindow();
+            if ( pWindow )
+            {
+                // set the menu delay back to the old value
+                aSettings = pWindow->GetSettings();
+                aMouseSettings = aSettings.GetMouseSettings();
+                aMouseSettings.SetMenuDelay( nDelay );
+                aSettings.SetMouseSettings( aMouseSettings );
+                pWindow->SetSettings( aSettings );
+            }
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuItemComponent::SetItemPos( sal_uInt16 nItemPos )
+{
+    m_nItemPos = nItemPos;
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuItemComponent::SetAccessibleName( const ::rtl::OUString& sAccessibleName )
+{
+    if ( !m_sAccessibleName.equals( sAccessibleName ) )
+    {
+        Any aOldValue, aNewValue;
+        aOldValue <<= m_sAccessibleName;
+        aNewValue <<= sAccessibleName;
+        m_sAccessibleName = sAccessibleName;
+        NotifyAccessibleEvent( AccessibleEventId::NAME_CHANGED, aOldValue, aNewValue );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString OAccessibleMenuItemComponent::GetAccessibleName()
+{
+    ::rtl::OUString sName;
+    if ( m_pParent )
+    {
+        sal_uInt16 nItemId = m_pParent->GetItemId( m_nItemPos );
+        sName = m_pParent->GetAccessibleName( nItemId );
+        if ( sName.getLength() == 0 )
+            sName = m_pParent->GetItemText( nItemId );
+        sName = OutputDevice::GetNonMnemonicString( sName );
+    }
+
+    return sName;
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuItemComponent::SetItemText( const ::rtl::OUString& sItemText )
+{
+    Any aOldValue, aNewValue;
+    if ( OCommonAccessibleText::implInitTextChangedEvent( m_sItemText, sItemText, aOldValue, aNewValue ) )
+    {
+        m_sItemText = sItemText;
+        NotifyAccessibleEvent( AccessibleEventId::TEXT_CHANGED, aOldValue, aNewValue );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString OAccessibleMenuItemComponent::GetItemText()
+{
+    ::rtl::OUString sText;
+    if ( m_pParent )
+        sText = OutputDevice::GetNonMnemonicString( m_pParent->GetItemText( m_pParent->GetItemId( m_nItemPos ) ) );
+
+    return sText;
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuItemComponent::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+{
+    if ( IsEnabled() )
+    {
+        rStateSet.AddState( AccessibleStateType::ENABLED );
+        rStateSet.AddState( AccessibleStateType::SENSITIVE );
+    }
+
+    if ( IsVisible() )
+    {
+        rStateSet.AddState( AccessibleStateType::VISIBLE );
+        rStateSet.AddState( AccessibleStateType::SHOWING );
+    }
+
+    rStateSet.AddState( AccessibleStateType::OPAQUE );
+}
+
+// -----------------------------------------------------------------------------
+// OCommonAccessibleComponent
+// -----------------------------------------------------------------------------
+
+awt::Rectangle OAccessibleMenuItemComponent::implGetBounds() throw (RuntimeException)
+{
+    awt::Rectangle aBounds( 0, 0, 0, 0 );
+
+    if ( m_pParent )
+    {
+        // get bounding rectangle of the item relative to the containing window
+        aBounds = AWTRectangle( m_pParent->GetBoundingRectangle( m_nItemPos ) );
+
+        // get position of containing window in screen coordinates
+        Window* pWindow = m_pParent->GetWindow();
+        if ( pWindow )
+        {
+            Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL );
+            awt::Point aWindowScreenLoc = AWTPoint( aRect.TopLeft() );
+
+            // get position of accessible parent in screen coordinates
+            Reference< XAccessible > xParent = getAccessibleParent();
+            if ( xParent.is() )
+            {
+                Reference< XAccessibleComponent > xParentComponent( xParent->getAccessibleContext(), UNO_QUERY );
+                if ( xParentComponent.is() )
+                {
+                    awt::Point aParentScreenLoc = xParentComponent->getLocationOnScreen();
+
+                    // calculate bounding rectangle of the item relative to the accessible parent
+                    aBounds.X += aWindowScreenLoc.X - aParentScreenLoc.X;
+                    aBounds.Y += aWindowScreenLoc.Y - aParentScreenLoc.Y;
+                }
+            }
+        }
+    }
+
+    return aBounds;
+}
+
+// -----------------------------------------------------------------------------
+// XComponent
+// -----------------------------------------------------------------------------
+
+void SAL_CALL OAccessibleMenuItemComponent::disposing()
+{
+    OAccessibleMenuBaseComponent::disposing();
+
+    m_pParent = NULL;
+    m_sAccessibleName = ::rtl::OUString();
+    m_sItemText = ::rtl::OUString();
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleContext
+// -----------------------------------------------------------------------------
+
+sal_Int32 OAccessibleMenuItemComponent::getAccessibleChildCount() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return 0;
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( i < 0 || i >= getAccessibleChildCount() )
+        throw IndexOutOfBoundsException();
+
+    return Reference< XAccessible >();
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleParent(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return m_pParent->GetAccessible();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 OAccessibleMenuItemComponent::getAccessibleIndexInParent(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return m_nItemPos;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int16 OAccessibleMenuItemComponent::getAccessibleRole(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return AccessibleRole::UNKNOWN;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString OAccessibleMenuItemComponent::getAccessibleDescription( ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    ::rtl::OUString sDescription;
+    if ( m_pParent )
+        sDescription = m_pParent->GetHelpText( m_pParent->GetItemId( m_nItemPos ) );
+
+    return sDescription;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString OAccessibleMenuItemComponent::getAccessibleName(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return m_sAccessibleName;
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessibleRelationSet > OAccessibleMenuItemComponent::getAccessibleRelationSet(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
+    Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
+    return xSet;
+}
+
+// -----------------------------------------------------------------------------
+
+Locale OAccessibleMenuItemComponent::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return Application::GetSettings().GetLocale();
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleComponent
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return Reference< XAccessible >();
+}
+
+// -----------------------------------------------------------------------------
+
+void OAccessibleMenuItemComponent::grabFocus(  ) throw (RuntimeException)
+{
+    // no focus for items
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 OAccessibleMenuItemComponent::getForeground(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nColor = 0;
+    Reference< XAccessible > xParent = getAccessibleParent();
+    if ( xParent.is() )
+    {
+        Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+        if ( xParentComp.is() )
+            nColor = xParentComp->getForeground();
+    }
+
+    return nColor;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 OAccessibleMenuItemComponent::getBackground(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nColor = 0;
+    Reference< XAccessible > xParent = getAccessibleParent();
+    if ( xParent.is() )
+    {
+        Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+        if ( xParentComp.is() )
+            nColor = xParentComp->getBackground();
+    }
+
+    return nColor;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleExtendedComponent
+// -----------------------------------------------------------------------------
+
+Reference< awt::XFont > OAccessibleMenuItemComponent::getFont(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Reference< awt::XFont > xFont;
+    Reference< XAccessible > xParent = getAccessibleParent();
+    if ( xParent.is() )
+    {
+        Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+        if ( xParentComp.is() )
+            xFont = xParentComp->getFont();
+    }
+
+    return xFont;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString OAccessibleMenuItemComponent::getTitledBorderText(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return ::rtl::OUString();
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString OAccessibleMenuItemComponent::getToolTipText(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    ::rtl::OUString sRet;
+    if ( m_pParent )
+        sRet = m_pParent->GetTipHelpText( m_pParent->GetItemId( m_nItemPos ) );
+
+    return sRet;
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/floatingwindowaccessible.cxx b/accessibility/source/standard/floatingwindowaccessible.cxx
new file mode 100644
index 000000000000..5286bfd387ba
--- /dev/null
+++ b/accessibility/source/standard/floatingwindowaccessible.cxx
@@ -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.
+ *
+ ************************************************************************/
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+
+#include <floatingwindowaccessible.hxx>
+
+
+#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
+#include <unotools/accessiblerelationsethelper.hxx>
+#include <vcl/window.hxx>
+
+namespace uno = ::com::sun::star::uno;
+
+using ::com::sun::star::accessibility::AccessibleRelation;
+namespace AccessibleRelationType = ::com::sun::star::accessibility::AccessibleRelationType;
+
+//-------------------------------------------------------------------
+
+FloatingWindowAccessible::FloatingWindowAccessible(VCLXWindow* pWindow) :
+    VCLXAccessibleComponent(pWindow)
+{
+}
+
+//-------------------------------------------------------------------
+
+FloatingWindowAccessible::~FloatingWindowAccessible()
+{
+}
+
+//-------------------------------------------------------------------
+
+void FloatingWindowAccessible::FillAccessibleRelationSet(utl::AccessibleRelationSetHelper& rRelationSet)
+{
+    Window* pWindow = GetWindow();
+    if ( pWindow )
+    {
+        Window* pParentWindow = pWindow->GetParent();
+        if( pParentWindow )
+        {
+            uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
+            aSequence[0] = pParentWindow->GetAccessible();
+            rRelationSet.AddRelation( AccessibleRelation( AccessibleRelationType::SUB_WINDOW_OF, aSequence ) );
+        }
+    }
+}
diff --git a/accessibility/source/standard/makefile.mk b/accessibility/source/standard/makefile.mk
new file mode 100644
index 000000000000..b79d98f659e5
--- /dev/null
+++ b/accessibility/source/standard/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=accessibility
+TARGET=standard
+
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+SLOFILES=   \
+    $(SLO)$/accessiblemenubasecomponent.obj	\
+    $(SLO)$/accessiblemenucomponent.obj \
+    $(SLO)$/accessiblemenuitemcomponent.obj \
+    $(SLO)$/floatingwindowaccessible.obj \
+    $(SLO)$/vclxaccessiblebox.obj \
+    $(SLO)$/vclxaccessiblebutton.obj \
+    $(SLO)$/vclxaccessiblecheckbox.obj \
+    $(SLO)$/vclxaccessiblecombobox.obj \
+    $(SLO)$/vclxaccessibledropdowncombobox.obj \
+    $(SLO)$/vclxaccessibledropdownlistbox.obj \
+    $(SLO)$/vclxaccessibleedit.obj \
+    $(SLO)$/vclxaccessiblefixedhyperlink.obj \
+    $(SLO)$/vclxaccessiblefixedtext.obj \
+    $(SLO)$/vclxaccessiblelist.obj \
+    $(SLO)$/vclxaccessiblelistbox.obj \
+    $(SLO)$/vclxaccessiblelistitem.obj \
+    $(SLO)$/vclxaccessiblemenu.obj \
+    $(SLO)$/vclxaccessiblemenubar.obj \
+    $(SLO)$/vclxaccessiblemenuitem.obj \
+    $(SLO)$/vclxaccessiblemenuseparator.obj \
+    $(SLO)$/vclxaccessiblepopupmenu.obj \
+    $(SLO)$/vclxaccessibleradiobutton.obj \
+    $(SLO)$/vclxaccessiblescrollbar.obj \
+    $(SLO)$/vclxaccessiblestatusbar.obj \
+    $(SLO)$/vclxaccessiblestatusbaritem.obj \
+    $(SLO)$/vclxaccessibletabcontrol.obj \
+    $(SLO)$/vclxaccessibletabpage.obj \
+    $(SLO)$/vclxaccessibletabpagewindow.obj \
+    $(SLO)$/vclxaccessibletextcomponent.obj \
+    $(SLO)$/vclxaccessibletextfield.obj \
+    $(SLO)$/vclxaccessibletoolbox.obj \
+    $(SLO)$/vclxaccessibletoolboxitem.obj 
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :	target.mk
+
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
new file mode 100644
index 000000000000..86b98768736a
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -0,0 +1,373 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+#include <accessibility/standard/vclxaccessiblebox.hxx>
+#include <accessibility/standard/vclxaccessibletextfield.hxx>
+#include <accessibility/standard/vclxaccessibleedit.hxx>
+#include <accessibility/standard/vclxaccessiblelist.hxx>
+#include <accessibility/helper/listboxhelper.hxx>
+
+#include <unotools/accessiblestatesethelper.hxx>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <vcl/svapp.hxx>
+#include <vcl/combobox.hxx>
+#include <vcl/lstbox.hxx>
+#include <accessibility/helper/accresmgr.hxx>
+#include <accessibility/helper/accessiblestrings.hrc>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::accessibility;
+
+VCLXAccessibleBox::VCLXAccessibleBox (VCLXWindow* pVCLWindow, BoxType aType, bool bIsDropDownBox)
+    : VCLXAccessibleComponent (pVCLWindow),
+      m_aBoxType (aType),
+      m_bIsDropDownBox (bIsDropDownBox),
+      m_nIndexInParent (DEFAULT_INDEX_IN_PARENT)
+{
+    // Set up the flags that indicate which children this object has.
+    m_bHasListChild = true;
+
+    // A text field is not present for non drop down list boxes.
+    if ((m_aBoxType==LISTBOX) && ! m_bIsDropDownBox)
+        m_bHasTextChild = false;
+    else
+        m_bHasTextChild = true;
+}
+
+VCLXAccessibleBox::~VCLXAccessibleBox (void)
+{
+}
+
+void VCLXAccessibleBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent )
+{
+       uno::Any aOldValue, aNewValue;
+    uno::Reference<XAccessible> xAcc;
+
+    switch ( rVclWindowEvent.GetId() )
+    {
+        case VCLEVENT_WINDOW_SHOW:
+        case VCLEVENT_WINDOW_HIDE:
+        {
+            Window* pChildWindow = (Window *) rVclWindowEvent.GetData();
+            // Just compare to the combo box text field.  All other children
+            // are identical to this object in which case this object will
+            // be removed in a short time.
+            if (m_aBoxType==COMBOBOX)
+            {
+                ComboBox* pComboBox = static_cast<ComboBox*>(GetWindow());
+                if ( ( pComboBox != NULL ) && ( pChildWindow != NULL ) )
+                    if (pChildWindow == pComboBox->GetSubEdit())
+                    {
+                        if (rVclWindowEvent.GetId() == VCLEVENT_WINDOW_SHOW)
+                        {
+                            // Instantiate text field.
+                            getAccessibleChild (0);
+                            aNewValue <<= m_xText;
+                        }
+                        else
+                        {
+                            // Release text field.
+                            aOldValue <<= m_xText;
+                            m_xText = NULL;
+                        }
+                        // Tell the listeners about the new/removed child.
+                        NotifyAccessibleEvent (
+                            AccessibleEventId::CHILD,
+                            aOldValue, aNewValue);
+                    }
+
+            }
+        }
+        break;
+
+        default:
+            VCLXAccessibleComponent::ProcessWindowChildEvent (rVclWindowEvent);
+    }
+}
+
+void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent)
+{
+    switch ( rVclWindowEvent.GetId() )
+    {
+        case VCLEVENT_DROPDOWN_OPEN:
+        case VCLEVENT_DROPDOWN_CLOSE:
+        case VCLEVENT_LISTBOX_DOUBLECLICK:
+        case VCLEVENT_LISTBOX_SCROLLED:
+        case VCLEVENT_LISTBOX_SELECT:
+        case VCLEVENT_LISTBOX_ITEMADDED:
+        case VCLEVENT_LISTBOX_ITEMREMOVED:
+        case VCLEVENT_COMBOBOX_ITEMADDED:
+        case VCLEVENT_COMBOBOX_ITEMREMOVED:
+        case VCLEVENT_COMBOBOX_SCROLLED:
+        {
+            // Forward the call to the list child.
+            VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
+            if ( pList == NULL )
+            {
+                getAccessibleChild ( m_bHasTextChild ? 1 : 0 );
+                pList = static_cast<VCLXAccessibleList*>(m_xList.get());
+            }
+            if ( pList != NULL )
+                pList->ProcessWindowEvent (rVclWindowEvent);
+            break;
+        }
+
+        case VCLEVENT_COMBOBOX_SELECT:
+        case VCLEVENT_COMBOBOX_DESELECT:
+        {
+            // Selection is handled by VCLXAccessibleList which operates on
+            // the same VCL object as this box does.  In case of the
+            // combobox, however, we have to help the list with providing
+            // the text of the currently selected item.
+            VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
+            if (pList != NULL && m_xText.is())
+            {
+                Reference<XAccessibleText> xText (m_xText->getAccessibleContext(), UNO_QUERY);
+                if ( xText.is() )
+                {
+                    ::rtl::OUString sText = xText->getSelectedText();
+                    if ( !sText.getLength() )
+                        sText = xText->getText();
+                    pList->UpdateSelection (sText);
+                }
+            }
+            break;
+        }
+
+        case VCLEVENT_EDIT_MODIFY:
+        case VCLEVENT_EDIT_SELECTIONCHANGED:
+            // Modify/Selection events are handled by the combo box instead of
+            // directly by the edit field (Why?).  Therefore, delegate this
+            // call to the edit field.
+            if (m_aBoxType==COMBOBOX)
+            {
+                if (m_xText.is())
+                {
+                    Reference<XAccessibleContext> xContext = m_xText->getAccessibleContext();
+                    VCLXAccessibleEdit* pEdit = static_cast<VCLXAccessibleEdit*>(xContext.get());
+                    if (pEdit != NULL)
+                        pEdit->ProcessWindowEvent (rVclWindowEvent);
+                }
+            }
+            break;
+
+        default:
+            VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
+    }
+}
+
+IMPLEMENT_FORWARD_XINTERFACE2(VCLXAccessibleBox, VCLXAccessibleComponent, VCLXAccessibleBox_BASE)
+IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleBox, VCLXAccessibleComponent, VCLXAccessibleBox_BASE)
+
+//=====  XAccessible  =========================================================
+
+Reference< XAccessibleContext > SAL_CALL VCLXAccessibleBox::getAccessibleContext(  )
+    throw (RuntimeException)
+{
+    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+    return this;
+}
+
+//=====  XAccessibleContext  ==================================================
+
+sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleChildCount (void)
+    throw (RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+    // Usually a box has a text field and a list of items as its children.
+    // Non drop down list boxes have no text field.  Additionally check
+    // whether the object is valid.
+    sal_Int32 nCount = 0;
+    if (IsValid())
+        nCount += (m_bHasTextChild?1:0) + (m_bHasListChild?1:0);
+    else
+    {
+        // Object not valid anymore.  Release references to children.
+        m_bHasTextChild = false;
+        m_xText = NULL;
+        m_bHasListChild = false;
+        m_xList = NULL;
+    }
+
+    return nCount;
+}
+
+Reference<XAccessible> SAL_CALL VCLXAccessibleBox::getAccessibleChild (sal_Int32 i)
+    throw (IndexOutOfBoundsException, RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+    if (i<0 || i>=getAccessibleChildCount())
+        throw IndexOutOfBoundsException();
+
+    Reference< XAccessible > xChild;
+    if (IsValid())
+    {
+        if (i==1 || ! m_bHasTextChild)
+        {
+            // List.
+            if ( ! m_xList.is())
+            {
+                VCLXAccessibleList* pList = new VCLXAccessibleList ( GetVCLXWindow(),
+                    (m_aBoxType == LISTBOX ? VCLXAccessibleList::LISTBOX : VCLXAccessibleList::COMBOBOX),
+                                                                    this);
+                pList->SetIndexInParent (i);
+                m_xList = pList;
+            }
+            xChild = m_xList;
+        }
+        else
+        {
+            // Text Field.
+            if ( ! m_xText.is())
+            {
+                if (m_aBoxType==COMBOBOX)
+                {
+                    ComboBox* pComboBox = static_cast<ComboBox*>(GetWindow());
+                    if (pComboBox!=NULL && pComboBox->GetSubEdit()!=NULL)
+                        m_xText = pComboBox->GetSubEdit()->GetAccessible();
+                }
+                else if (m_bIsDropDownBox)
+                    m_xText = new VCLXAccessibleTextField (GetVCLXWindow(),this);
+            }
+            xChild = m_xText;
+        }
+    }
+
+    return xChild;
+}
+
+sal_Int16 SAL_CALL VCLXAccessibleBox::getAccessibleRole (void) throw (RuntimeException)
+{
+    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+    // Return the role <const>COMBO_BOX</const> for both VCL combo boxes and
+    // VCL list boxes in DropDown-Mode else <const>PANEL</const>.
+    // This way the Java bridge has not to handle both independently.
+    return m_bIsDropDownBox ? AccessibleRole::COMBO_BOX : AccessibleRole::PANEL;
+}
+
+sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleIndexInParent (void)
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    if (m_nIndexInParent != DEFAULT_INDEX_IN_PARENT)
+        return m_nIndexInParent;
+    else
+        return VCLXAccessibleComponent::getAccessibleIndexInParent();
+}
+
+//=====  XAccessibleAction  ===================================================
+
+sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleActionCount (void)
+    throw (RuntimeException)
+{
+    ::osl::Guard< ::osl::Mutex> aGuard (GetMutex());
+
+    // There is one action for drop down boxes (toggle popup) and none for
+    // the other boxes.
+    return m_bIsDropDownBox ? 1 : 0;
+}
+
+sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex)
+    throw (IndexOutOfBoundsException, RuntimeException)
+{
+    sal_Bool bNotify = sal_False;
+
+    {
+        vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+        if (nIndex<0 || nIndex>=getAccessibleActionCount())
+            throw ::com::sun::star::lang::IndexOutOfBoundsException();
+
+        if (m_aBoxType == COMBOBOX)
+        {
+            ComboBox* pComboBox = static_cast< ComboBox* >( GetWindow() );
+            if (pComboBox != NULL)
+            {
+                pComboBox->ToggleDropDown();
+                bNotify = sal_True;
+            }
+        }
+        else if (m_aBoxType == LISTBOX)
+        {
+            ListBox* pListBox = static_cast< ListBox* >( GetWindow() );
+            if (pListBox != NULL)
+            {
+                pListBox->ToggleDropDown();
+                bNotify = sal_True;
+            }
+        }
+    }
+
+    if (bNotify)
+        NotifyAccessibleEvent (AccessibleEventId::ACTION_CHANGED, Any(), Any());
+
+    return bNotify;
+}
+
+::rtl::OUString SAL_CALL VCLXAccessibleBox::getAccessibleActionDescription (sal_Int32 nIndex)
+    throw (IndexOutOfBoundsException, RuntimeException)
+{
+    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+    if (nIndex<0 || nIndex>=getAccessibleActionCount())
+        throw ::com::sun::star::lang::IndexOutOfBoundsException();
+    return TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP);
+}
+
+Reference< XAccessibleKeyBinding > VCLXAccessibleBox::getAccessibleActionKeyBinding( sal_Int32 nIndex )
+    throw (IndexOutOfBoundsException, RuntimeException)
+{
+    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+    Reference< XAccessibleKeyBinding > xRet;
+
+    if (nIndex<0 || nIndex>=getAccessibleActionCount())
+        throw ::com::sun::star::lang::IndexOutOfBoundsException();
+
+    // ... which key?
+    return xRet;
+}
+
+//=====  XComponent  ==========================================================
+
+void SAL_CALL VCLXAccessibleBox::disposing (void)
+{
+    VCLXAccessibleComponent::disposing();
+}
+
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
new file mode 100644
index 000000000000..e133579922b3
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -0,0 +1,326 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+
+// includes --------------------------------------------------------------
+#include <accessibility/standard/vclxaccessiblebutton.hxx>
+#include <accessibility/helper/accresmgr.hxx>
+#include <accessibility/helper/accessiblestrings.hrc>
+
+#include <unotools/accessiblestatesethelper.hxx>
+#include <comphelper/accessiblekeybindinghelper.hxx>
+#include <com/sun/star/awt/KeyModifier.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <cppuhelper/typeprovider.hxx>
+#include <comphelper/sequence.hxx>
+
+#include <vcl/button.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::accessibility;
+using namespace ::comphelper;
+
+
+// -----------------------------------------------------------------------------
+// VCLXAccessibleButton
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleButton::VCLXAccessibleButton( VCLXWindow* pVCLWindow )
+    :VCLXAccessibleTextComponent( pVCLWindow )
+{
+}
+
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleButton::~VCLXAccessibleButton()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+{
+    switch ( rVclWindowEvent.GetId() )
+    {
+        case VCLEVENT_PUSHBUTTON_TOGGLE:
+        {
+            Any aOldValue;
+            Any aNewValue;
+
+            PushButton* pButton = (PushButton*) GetWindow();
+            if ( pButton && pButton->GetState() == STATE_CHECK )
+                aNewValue <<= AccessibleStateType::CHECKED;
+            else
+                aOldValue <<= AccessibleStateType::CHECKED;
+
+            NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+        }
+        break;
+        default:
+            VCLXAccessibleTextComponent::ProcessWindowEvent( rVclWindowEvent );
+   }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleButton::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+{
+    VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet );
+
+    PushButton* pButton = (PushButton*) GetWindow();
+    if ( pButton )
+    {
+        rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+
+        if ( pButton->GetState() == STATE_CHECK )
+            rStateSet.AddState( AccessibleStateType::CHECKED );
+
+        if ( pButton->IsPressed() )
+            rStateSet.AddState( AccessibleStateType::PRESSED );
+    }
+}
+
+// -----------------------------------------------------------------------------
+// XInterface
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleButton, VCLXAccessibleTextComponent, VCLXAccessibleButton_BASE )
+
+// -----------------------------------------------------------------------------
+// XTypeProvider
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleButton, VCLXAccessibleTextComponent, VCLXAccessibleButton_BASE )
+
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleButton::getImplementationName() throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleButton" );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< ::rtl::OUString > VCLXAccessibleButton::getSupportedServiceNames() throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames(1);
+    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleButton" );
+    return aNames;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleContext
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleButton::getAccessibleName(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    ::rtl::OUString aName( VCLXAccessibleTextComponent::getAccessibleName() );
+    sal_Int32 nLength = aName.getLength();
+
+    if ( nLength >= 3 && aName.matchAsciiL( RTL_CONSTASCII_STRINGPARAM("..."), nLength - 3 ) )
+    {
+        if ( nLength == 3 )
+        {
+            // it's a browse button
+            aName = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_NAME_BROWSEBUTTON ) );
+        }
+        else
+        {
+            // remove the three trailing dots
+            aName = aName.copy( 0, nLength - 3 );
+        }
+    }
+    else if ( nLength >= 3 && aName.matchAsciiL( RTL_CONSTASCII_STRINGPARAM("<< "), 0 ) )
+    {
+        // remove the leading symbols
+        aName = aName.copy( 3, nLength - 3 );
+    }
+    else if ( nLength >= 3 && aName.matchAsciiL( RTL_CONSTASCII_STRINGPARAM(" >>"), nLength - 3 ) )
+    {
+        // remove the trailing symbols
+        aName = aName.copy( 0, nLength - 3 );
+    }
+
+    return aName;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleAction
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleButton::getAccessibleActionCount( ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return 1;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    PushButton* pButton = (PushButton*) GetWindow();
+    if ( pButton )
+        pButton->Click();
+
+    return sal_True;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) );
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper();
+    Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
+
+    Window* pWindow = GetWindow();
+    if ( pWindow )
+    {
+        KeyEvent aKeyEvent = pWindow->GetActivationKey();
+        KeyCode aKeyCode = aKeyEvent.GetKeyCode();
+        if ( aKeyCode.GetCode() != 0 )
+        {
+            awt::KeyStroke aKeyStroke;
+            aKeyStroke.Modifiers = 0;
+            if ( aKeyCode.IsShift() )
+                aKeyStroke.Modifiers |= awt::KeyModifier::SHIFT;
+            if ( aKeyCode.IsMod1() )
+                aKeyStroke.Modifiers |= awt::KeyModifier::MOD1;
+            if ( aKeyCode.IsMod2() )
+                aKeyStroke.Modifiers |= awt::KeyModifier::MOD2;
+            if ( aKeyCode.IsMod3() )
+                aKeyStroke.Modifiers |= awt::KeyModifier::MOD3;
+            aKeyStroke.KeyCode = aKeyCode.GetCode();
+            aKeyStroke.KeyChar = aKeyEvent.GetCharCode();
+            aKeyStroke.KeyFunc = static_cast< sal_Int16 >( aKeyCode.GetFunction() );
+            pKeyBindingHelper->AddKeyBinding( aKeyStroke );
+        }
+    }
+
+    return xKeyBinding;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleValue
+// -----------------------------------------------------------------------------
+
+Any VCLXAccessibleButton::getCurrentValue(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Any aValue;
+
+    PushButton* pButton = (PushButton*) GetWindow();
+    if ( pButton )
+        aValue <<= (sal_Int32) pButton->IsPressed();
+
+    return aValue;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Bool bReturn = sal_False;
+
+    PushButton* pButton = (PushButton*) GetWindow();
+    if ( pButton )
+    {
+        sal_Int32 nValue = 0;
+        OSL_VERIFY( aNumber >>= nValue );
+
+        if ( nValue < 0 )
+            nValue = 0;
+        else if ( nValue > 1 )
+            nValue = 1;
+
+        pButton->SetPressed( (sal_Bool) nValue );
+        bReturn = sal_True;
+    }
+
+    return bReturn;
+}
+
+// -----------------------------------------------------------------------------
+
+Any VCLXAccessibleButton::getMaximumValue(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Any aValue;
+    aValue <<= (sal_Int32) 1;
+
+    return aValue;
+}
+
+// -----------------------------------------------------------------------------
+
+Any VCLXAccessibleButton::getMinimumValue(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Any aValue;
+    aValue <<= (sal_Int32) 0;
+
+    return aValue;
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
new file mode 100644
index 000000000000..18a7be8bf810
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -0,0 +1,361 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+
+// includes --------------------------------------------------------------
+#include <accessibility/standard/vclxaccessiblecheckbox.hxx>
+
+#include <toolkit/awt/vclxwindows.hxx>
+#include <accessibility/helper/accresmgr.hxx>
+#include <accessibility/helper/accessiblestrings.hrc>
+
+#include <unotools/accessiblestatesethelper.hxx>
+#include <comphelper/accessiblekeybindinghelper.hxx>
+#include <com/sun/star/awt/KeyModifier.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <cppuhelper/typeprovider.hxx>
+#include <comphelper/sequence.hxx>
+
+#include <vcl/button.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::accessibility;
+using namespace ::comphelper;
+
+
+// -----------------------------------------------------------------------------
+// VCLXAccessibleCheckBox
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleCheckBox::VCLXAccessibleCheckBox( VCLXWindow* pVCLWindow )
+    :VCLXAccessibleTextComponent( pVCLWindow )
+{
+    m_bChecked = IsChecked();
+    m_bIndeterminate = IsIndeterminate();
+}
+
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleCheckBox::~VCLXAccessibleCheckBox()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+bool VCLXAccessibleCheckBox::IsChecked()
+{
+    bool bChecked = false;
+
+    VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() );
+    if ( pVCLXCheckBox && pVCLXCheckBox->getState() == (sal_Int16) 1 )
+        bChecked = true;
+
+    return bChecked;
+}
+
+// -----------------------------------------------------------------------------
+
+bool VCLXAccessibleCheckBox::IsIndeterminate()
+{
+    bool bIndeterminate = false;
+
+    VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() );
+    if ( pVCLXCheckBox && pVCLXCheckBox->getState() == (sal_Int16) 2 )
+        bIndeterminate = true;
+
+    return bIndeterminate;
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleCheckBox::SetChecked( bool bChecked )
+{
+    if ( m_bChecked != bChecked )
+    {
+        Any aOldValue, aNewValue;
+        if ( m_bChecked )
+            aOldValue <<= AccessibleStateType::CHECKED;
+        else
+            aNewValue <<= AccessibleStateType::CHECKED;
+        m_bChecked = bChecked;
+        NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleCheckBox::SetIndeterminate( bool bIndeterminate )
+{
+    if ( m_bIndeterminate != bIndeterminate )
+    {
+        Any aOldValue, aNewValue;
+        if ( m_bIndeterminate )
+            aOldValue <<= AccessibleStateType::INDETERMINATE;
+        else
+            aNewValue <<= AccessibleStateType::INDETERMINATE;
+        m_bIndeterminate = bIndeterminate;
+        NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+{
+    switch ( rVclWindowEvent.GetId() )
+    {
+        case VCLEVENT_CHECKBOX_TOGGLE:
+        {
+            SetChecked( IsChecked() );
+            SetIndeterminate( IsIndeterminate() );
+        }
+        break;
+        default:
+            VCLXAccessibleTextComponent::ProcessWindowEvent( rVclWindowEvent );
+   }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleCheckBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+{
+    VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet );
+
+    rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+
+    if ( IsChecked() )
+        rStateSet.AddState( AccessibleStateType::CHECKED );
+
+    if ( IsIndeterminate() )
+        rStateSet.AddState( AccessibleStateType::INDETERMINATE );
+}
+
+// -----------------------------------------------------------------------------
+// XInterface
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleCheckBox, VCLXAccessibleTextComponent, VCLXAccessibleCheckBox_BASE )
+
+// -----------------------------------------------------------------------------
+// XTypeProvider
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleCheckBox, VCLXAccessibleTextComponent, VCLXAccessibleCheckBox_BASE )
+
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleCheckBox::getImplementationName() throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleCheckBox" );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< ::rtl::OUString > VCLXAccessibleCheckBox::getSupportedServiceNames() throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames(1);
+    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleCheckBox" );
+    return aNames;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleAction
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleCheckBox::getAccessibleActionCount( ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return 1;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    CheckBox* pCheckBox = (CheckBox*) GetWindow();
+    VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() );
+    if ( pCheckBox && pVCLXCheckBox )
+    {
+        sal_Int32 nValueMin = (sal_Int32) 0;
+        sal_Int32 nValueMax = (sal_Int32) 1;
+
+        if ( pCheckBox->IsTriStateEnabled() )
+            nValueMax = (sal_Int32) 2;
+
+        sal_Int32 nValue = (sal_Int32) pVCLXCheckBox->getState();
+
+        ++nValue;
+
+        if ( nValue > nValueMax )
+            nValue = nValueMin;
+
+        pVCLXCheckBox->setState( (sal_Int16) nValue );
+    }
+
+    return sal_True;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) );
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper();
+    Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
+
+    Window* pWindow = GetWindow();
+    if ( pWindow )
+    {
+        KeyEvent aKeyEvent = pWindow->GetActivationKey();
+        KeyCode aKeyCode = aKeyEvent.GetKeyCode();
+        if ( aKeyCode.GetCode() != 0 )
+        {
+            awt::KeyStroke aKeyStroke;
+            aKeyStroke.Modifiers = 0;
+            if ( aKeyCode.IsShift() )
+                aKeyStroke.Modifiers |= awt::KeyModifier::SHIFT;
+            if ( aKeyCode.IsMod1() )
+                aKeyStroke.Modifiers |= awt::KeyModifier::MOD1;
+            if ( aKeyCode.IsMod2() )
+                aKeyStroke.Modifiers |= awt::KeyModifier::MOD2;
+            if ( aKeyCode.IsMod3() )
+                aKeyStroke.Modifiers |= awt::KeyModifier::MOD3;
+            aKeyStroke.KeyCode = aKeyCode.GetCode();
+            aKeyStroke.KeyChar = aKeyEvent.GetCharCode();
+            aKeyStroke.KeyFunc = static_cast< sal_Int16 >( aKeyCode.GetFunction() );
+            pKeyBindingHelper->AddKeyBinding( aKeyStroke );
+        }
+    }
+
+    return xKeyBinding;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleValue
+// -----------------------------------------------------------------------------
+
+Any VCLXAccessibleCheckBox::getCurrentValue(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Any aValue;
+
+    VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() );
+    if ( pVCLXCheckBox )
+        aValue <<= (sal_Int32) pVCLXCheckBox->getState();
+
+    return aValue;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Bool bReturn = sal_False;
+
+    VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() );
+    if ( pVCLXCheckBox )
+    {
+        sal_Int32 nValue = 0, nValueMin = 0, nValueMax = 0;
+        OSL_VERIFY( aNumber >>= nValue );
+        OSL_VERIFY( getMinimumValue() >>= nValueMin );
+        OSL_VERIFY( getMaximumValue() >>= nValueMax );
+
+        if ( nValue < nValueMin )
+            nValue = nValueMin;
+        else if ( nValue > nValueMax )
+            nValue = nValueMax;
+
+        pVCLXCheckBox->setState( (sal_Int16) nValue );
+        bReturn = sal_True;
+    }
+
+    return bReturn;
+}
+
+// -----------------------------------------------------------------------------
+
+Any VCLXAccessibleCheckBox::getMaximumValue(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Any aValue;
+
+    CheckBox* pCheckBox = (CheckBox*) GetWindow();
+    if ( pCheckBox && pCheckBox->IsTriStateEnabled() )
+        aValue <<= (sal_Int32) 2;
+    else
+        aValue <<= (sal_Int32) 1;
+
+    return aValue;
+}
+
+// -----------------------------------------------------------------------------
+
+Any VCLXAccessibleCheckBox::getMinimumValue(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Any aValue;
+    aValue <<= (sal_Int32) 0;
+
+    return aValue;
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx
new file mode 100644
index 000000000000..9ac9a13591e1
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessiblecombobox.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+#include <accessibility/standard/vclxaccessiblecombobox.hxx>
+#include <accessibility/standard/vclxaccessiblelist.hxx>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <vcl/svapp.hxx>
+#include <vcl/combobox.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::accessibility;
+
+
+VCLXAccessibleComboBox::VCLXAccessibleComboBox (VCLXWindow* pVCLWindow)
+    : VCLXAccessibleBox (pVCLWindow, VCLXAccessibleBox::COMBOBOX, false)
+{
+}
+
+
+
+
+VCLXAccessibleComboBox::~VCLXAccessibleComboBox (void)
+{
+}
+
+
+
+
+bool VCLXAccessibleComboBox::IsValid (void) const
+{
+    return static_cast<ComboBox*>(GetWindow()) != NULL;
+
+}
+
+
+
+
+void VCLXAccessibleComboBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent)
+{
+    VCLXAccessibleBox::ProcessWindowEvent( rVclWindowEvent );
+}
+
+
+
+
+//=====  XServiceInfo  ========================================================
+
+::rtl::OUString VCLXAccessibleComboBox::getImplementationName (void)
+    throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii ("com.sun.star.comp.toolkit.AccessibleComboBox");
+}
+
+
+
+
+Sequence< ::rtl::OUString > VCLXAccessibleComboBox::getSupportedServiceNames (void)
+    throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
+    sal_Int32 nLength = aNames.getLength();
+    aNames.realloc( nLength + 1 );
+    aNames[nLength] = ::rtl::OUString::createFromAscii(
+        "com.sun.star.accessibility.AccessibleComboBox" );
+    return aNames;
+}
diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
new file mode 100644
index 000000000000..f396ff422947
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.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_accessibility.hxx"
+#include <accessibility/standard/vclxaccessibledropdowncombobox.hxx>
+#include <accessibility/standard/vclxaccessiblecombobox.hxx>
+#include <accessibility/standard/vclxaccessibletextfield.hxx>
+#include <accessibility/standard/vclxaccessiblelist.hxx>
+#include <accessibility/helper/accresmgr.hxx>
+#include <accessibility/helper/accessiblestrings.hrc>
+
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <tools/debug.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/combobox.hxx>
+#include <vcl/unohelp.hxx>
+
+#include <toolkit/awt/vclxwindow.hxx>
+#include <toolkit/helper/convert.hxx>
+
+#include <comphelper/sequence.hxx>
+#include <cppuhelper/typeprovider.hxx>
+#include <unotools/accessiblestatesethelper.hxx>
+
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::accessibility;
+
+
+VCLXAccessibleDropDownComboBox::VCLXAccessibleDropDownComboBox (VCLXWindow* pVCLWindow)
+    : VCLXAccessibleBox (pVCLWindow, VCLXAccessibleBox::COMBOBOX, true)
+{
+}
+
+
+
+
+VCLXAccessibleDropDownComboBox::~VCLXAccessibleDropDownComboBox (void)
+{
+}
+
+
+
+bool VCLXAccessibleDropDownComboBox::IsValid (void) const
+{
+    return static_cast<ComboBox*>(GetWindow()) != NULL;
+
+}
+
+
+
+
+void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent)
+{
+    switch ( rVclWindowEvent.GetId() )
+    {
+        case VCLEVENT_DROPDOWN_OPEN:
+        case VCLEVENT_DROPDOWN_CLOSE:
+        {
+            /*          // child count changed
+            Any aOldValue, aNewValue;
+            // get the listbox child
+            Reference< XAccessible > xChild;
+            if ( !xChild.is() )
+            {
+                try
+                {
+                    // the listbox is the second child
+                    xChild = getAccessibleChild(1);
+                }
+                catch ( IndexOutOfBoundsException& ) {}
+                catch ( RuntimeException& ) {}
+            }
+            if ( rVclWindowEvent.GetId() == VCLEVENT_DROPDOWN_OPEN )
+                aNewValue <<= xChild;
+            else
+                aOldValue <<= xChild;
+            NotifyAccessibleEvent(
+            AccessibleEventId::CHILD, aOldValue, aNewValue
+            );
+            */
+            break;
+        }
+
+        default:
+            VCLXAccessibleBox::ProcessWindowEvent( rVclWindowEvent );
+    }
+}
+
+
+
+
+//=====  XServiceInfo  ========================================================
+
+::rtl::OUString VCLXAccessibleDropDownComboBox::getImplementationName()
+    throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleDropDownComboBox");
+}
+
+
+
+
+Sequence< ::rtl::OUString > VCLXAccessibleDropDownComboBox::getSupportedServiceNames (void)
+    throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
+    sal_Int32 nLength = aNames.getLength();
+    aNames.realloc( nLength + 1 );
+    aNames[nLength] = ::rtl::OUString::createFromAscii(
+        "com.sun.star.accessibility.AccessibleDropDownComboBox" );
+    return aNames;
+}
diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
new file mode 100644
index 000000000000..4d08d40245fb
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+
+#include <accessibility/standard/vclxaccessibledropdownlistbox.hxx>
+#include <accessibility/standard/vclxaccessiblelistbox.hxx>
+#include <accessibility/helper/accresmgr.hxx>
+#include <accessibility/helper/accessiblestrings.hrc>
+
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <tools/debug.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/lstbox.hxx>
+#include <vcl/unohelp.hxx>
+
+#include <toolkit/awt/vclxwindow.hxx>
+#include <toolkit/helper/convert.hxx>
+
+#include <comphelper/sequence.hxx>
+#include <cppuhelper/typeprovider.hxx>
+#include <unotools/accessiblestatesethelper.hxx>
+
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::accessibility;
+
+
+VCLXAccessibleDropDownListBox::VCLXAccessibleDropDownListBox (VCLXWindow* pVCLWindow)
+    : VCLXAccessibleBox (pVCLWindow,  VCLXAccessibleBox::LISTBOX, true)
+{
+}
+
+
+
+
+VCLXAccessibleDropDownListBox::~VCLXAccessibleDropDownListBox()
+{
+}
+
+
+
+
+bool VCLXAccessibleDropDownListBox::IsValid (void) const
+{
+    return static_cast<ListBox*>(GetWindow()) != NULL;
+
+}
+
+
+
+
+void VCLXAccessibleDropDownListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+{
+    VCLXAccessibleBox::ProcessWindowEvent (rVclWindowEvent);
+}
+
+
+
+
+//=====  XServiceInfo  ========================================================
+
+::rtl::OUString VCLXAccessibleDropDownListBox::getImplementationName()
+    throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleDropDownListBox");
+}
+
+
+
+
+Sequence< ::rtl::OUString > VCLXAccessibleDropDownListBox::getSupportedServiceNames (void)
+    throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
+    sal_Int32 nLength = aNames.getLength();
+    aNames.realloc( nLength + 1 );
+    aNames[nLength] = ::rtl::OUString::createFromAscii(
+        "com.sun.star.accessibility.AccessibleDropDownListBox" );
+    return aNames;
+}
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
new file mode 100644
index 000000000000..b806e308bc28
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -0,0 +1,626 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+
+// includes --------------------------------------------------------------
+#include <accessibility/standard/vclxaccessibleedit.hxx>
+
+#include <toolkit/awt/vclxwindows.hxx>
+#include <toolkit/helper/convert.hxx>
+#include <accessibility/helper/accresmgr.hxx>
+#include <accessibility/helper/accessiblestrings.hrc>
+
+#include <unotools/accessiblestatesethelper.hxx>
+#include <unotools/accessiblerelationsethelper.hxx>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
+#include <cppuhelper/typeprovider.hxx>
+#include <comphelper/sequence.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
+#include <vcl/edit.hxx>
+#include <sot/exchange.hxx>
+#include <sot/formats.hxx>
+
+#include <algorithm>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::accessibility;
+using namespace ::comphelper;
+
+
+// -----------------------------------------------------------------------------
+// VCLXAccessibleEdit
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleEdit::VCLXAccessibleEdit( VCLXWindow* pVCLWindow )
+    :VCLXAccessibleTextComponent( pVCLWindow )
+{
+    m_nSelectionStart = getSelectionStart();
+    m_nCaretPosition = getCaretPosition();
+}
+
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleEdit::~VCLXAccessibleEdit()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+{
+    switch ( rVclWindowEvent.GetId() )
+    {
+        case VCLEVENT_EDIT_MODIFY:
+        {
+            SetText( implGetText() );
+        }
+        break;
+        case VCLEVENT_EDIT_SELECTIONCHANGED:
+        {
+            sal_Int32 nOldCaretPosition = m_nCaretPosition;
+            sal_Int32 nOldSelectionStart = m_nSelectionStart;
+
+            m_nCaretPosition = getCaretPosition();
+            m_nSelectionStart = getSelectionStart();
+
+            Window* pWindow = GetWindow();
+            if ( pWindow && pWindow->HasChildPathFocus() )
+            {
+                if ( m_nCaretPosition != nOldCaretPosition )
+                {
+                    Any aOldValue, aNewValue;
+                    aOldValue <<= (sal_Int32) nOldCaretPosition;
+                    aNewValue <<= (sal_Int32) m_nCaretPosition;
+                    NotifyAccessibleEvent( AccessibleEventId::CARET_CHANGED, aOldValue, aNewValue );
+                }
+
+                // #i104470# VCL only has SELECTION_CHANGED, but UAA distinguishes between SELECTION_CHANGED and CARET_CHANGED
+                sal_Bool bHasSelection = ( m_nSelectionStart != m_nCaretPosition );
+                sal_Bool bHadSelection = ( nOldSelectionStart != nOldCaretPosition );
+                if ( ( bHasSelection != bHadSelection ) || ( bHasSelection && ( ( m_nCaretPosition != nOldCaretPosition ) || ( m_nSelectionStart != nOldSelectionStart ) ) ) )
+                {
+                    NotifyAccessibleEvent( AccessibleEventId::TEXT_SELECTION_CHANGED, Any(), Any() );
+                }
+
+            }
+        }
+        break;
+        default:
+            VCLXAccessibleTextComponent::ProcessWindowEvent( rVclWindowEvent );
+   }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleEdit::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+{
+    VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet );
+
+    VCLXEdit* pVCLXEdit = static_cast< VCLXEdit* >( GetVCLXWindow() );
+    if ( pVCLXEdit )
+    {
+        rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+        rStateSet.AddState( AccessibleStateType::SINGLE_LINE );
+        if ( pVCLXEdit->isEditable() )
+            rStateSet.AddState( AccessibleStateType::EDITABLE );
+    }
+}
+
+// -----------------------------------------------------------------------------
+// OCommonAccessibleText
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleEdit::implGetText()
+{
+    ::rtl::OUString aText;
+
+    Edit* pEdit = static_cast< Edit* >( GetWindow() );
+    if ( pEdit )
+    {
+        aText = OutputDevice::GetNonMnemonicString( pEdit->GetText() );
+
+        if ( getAccessibleRole() == AccessibleRole::PASSWORD_TEXT )
+        {
+            xub_Unicode cEchoChar = pEdit->GetEchoChar();
+            if ( !cEchoChar )
+                cEchoChar = '*';
+            XubString sTmp;
+            aText = sTmp.Fill( (sal_uInt16)aText.getLength(), cEchoChar );
+        }
+    }
+
+    return aText;
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleEdit::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
+{
+    awt::Selection aSelection;
+    VCLXEdit* pVCLXEdit = static_cast< VCLXEdit* >( GetVCLXWindow() );
+    if ( pVCLXEdit )
+        aSelection = pVCLXEdit->getSelection();
+
+    nStartIndex = aSelection.Min;
+    nEndIndex = aSelection.Max;
+}
+
+// -----------------------------------------------------------------------------
+// XInterface
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleEdit, VCLXAccessibleTextComponent, VCLXAccessibleEdit_BASE )
+
+// -----------------------------------------------------------------------------
+// XTypeProvider
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleEdit, VCLXAccessibleTextComponent, VCLXAccessibleEdit_BASE )
+
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleEdit::getImplementationName() throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleEdit" );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< ::rtl::OUString > VCLXAccessibleEdit::getSupportedServiceNames() throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames(1);
+    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleEdit" );
+    return aNames;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleContext
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleEdit::getAccessibleChildCount() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return 0;
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( i < 0 || i >= getAccessibleChildCount() )
+        throw IndexOutOfBoundsException();
+
+    return Reference< XAccessible >();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int16 VCLXAccessibleEdit::getAccessibleRole(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int16 nRole;
+    Edit* pEdit = static_cast< Edit* >( GetWindow() );
+    if ( pEdit && ( ( pEdit->GetStyle() & WB_PASSWORD ) || pEdit->GetEchoChar() ) )
+        nRole = AccessibleRole::PASSWORD_TEXT;
+    else
+        nRole = AccessibleRole::TEXT;
+
+    return nRole;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleAction
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleEdit::getAccessibleActionCount( ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    // There is one action: activate
+    return 1;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    sal_Bool bDoAction = sal_False;
+    Window* pWindow = GetWindow();
+    if ( pWindow )
+    {
+        pWindow->GrabFocus();
+        bDoAction = sal_True;
+    }
+
+    return bDoAction;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    static const ::rtl::OUString sAction( RTL_CONSTASCII_USTRINGPARAM( "activate" ) );
+    return sAction;
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessibleKeyBinding > VCLXAccessibleEdit::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    return Reference< XAccessibleKeyBinding >();
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleText
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleEdit::getCaretPosition(  ) throw (RuntimeException)
+{
+    return getSelectionEnd();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleEdit::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    return setSelection( nIndex, nIndex );
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Unicode VCLXAccessibleEdit::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return VCLXAccessibleTextComponent::getCharacter( nIndex );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32 nIndex, const Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return VCLXAccessibleTextComponent::getCharacterAttributes( nIndex, aRequestedAttributes );
+}
+
+// -----------------------------------------------------------------------------
+
+awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    awt::Rectangle aBounds( 0, 0, 0, 0 );
+    sal_Int32 nLength = implGetText().getLength();
+
+    if ( !implIsValidRange( nIndex, nIndex, nLength ) )
+        throw IndexOutOfBoundsException();
+
+    Control* pControl = static_cast< Control* >( GetWindow() );
+    if ( pControl )
+    {
+        if ( nIndex == nLength )
+        {
+            // #108914# calculate virtual bounding rectangle
+            for ( sal_Int32 i = 0; i < nLength; ++i )
+            {
+                Rectangle aRect = pControl->GetCharacterBounds( i );
+                sal_Int32 nHeight = aRect.GetHeight();
+                if ( aBounds.Height < nHeight )
+                {
+                    aBounds.Y = aRect.Top();
+                    aBounds.Height = nHeight;
+                }
+                if ( i == nLength - 1 )
+                {
+                    aBounds.X = aRect.Right() + 1;
+                    aBounds.Width = 1;
+                }
+            }
+        }
+        else
+        {
+            aBounds = AWTRectangle( pControl->GetCharacterBounds( nIndex ) );
+        }
+    }
+
+    return aBounds;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleEdit::getCharacterCount(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return VCLXAccessibleTextComponent::getCharacterCount();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleEdit::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return VCLXAccessibleTextComponent::getIndexAtPoint( aPoint );
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleEdit::getSelectedText(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return VCLXAccessibleTextComponent::getSelectedText();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleEdit::getSelectionStart(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return VCLXAccessibleTextComponent::getSelectionStart();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleEdit::getSelectionEnd(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return VCLXAccessibleTextComponent::getSelectionEnd();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Bool bReturn = sal_False;
+    ::rtl::OUString sText( implGetText() );
+
+    if ( !implIsValidRange( nStartIndex, nEndIndex, sText.getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    VCLXEdit* pVCLXEdit = static_cast< VCLXEdit* >( GetVCLXWindow() );
+    Edit* pEdit = static_cast< Edit* >( GetWindow() );
+    if ( pVCLXEdit && pEdit && pEdit->IsEnabled() )
+    {
+        pVCLXEdit->setSelection( awt::Selection( nStartIndex, nEndIndex ) );
+        bReturn = sal_True;
+    }
+
+    return bReturn;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleEdit::getText(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return VCLXAccessibleTextComponent::getText();
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return VCLXAccessibleTextComponent::getTextRange( nStartIndex, nEndIndex );
+}
+
+// -----------------------------------------------------------------------------
+
+::com::sun::star::accessibility::TextSegment VCLXAccessibleEdit::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return VCLXAccessibleTextComponent::getTextAtIndex( nIndex, aTextType );
+}
+
+// -----------------------------------------------------------------------------
+
+::com::sun::star::accessibility::TextSegment VCLXAccessibleEdit::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return VCLXAccessibleTextComponent::getTextBeforeIndex( nIndex, aTextType );
+}
+
+// -----------------------------------------------------------------------------
+
+::com::sun::star::accessibility::TextSegment VCLXAccessibleEdit::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return VCLXAccessibleTextComponent::getTextBehindIndex( nIndex, aTextType );
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleEdit::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return VCLXAccessibleTextComponent::copyText( nStartIndex, nEndIndex );
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleEditableText
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleEdit::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return copyText( nStartIndex, nEndIndex ) && deleteText( nStartIndex, nEndIndex );
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Bool bReturn = sal_False;
+
+    if ( GetWindow() )
+    {
+        Reference< datatransfer::clipboard::XClipboard > xClipboard = GetWindow()->GetClipboard();
+        if ( xClipboard.is() )
+        {
+            const sal_uInt32 nRef = Application::ReleaseSolarMutex();
+            Reference< datatransfer::XTransferable > xDataObj = xClipboard->getContents();
+            Application::AcquireSolarMutex( nRef );
+            if ( xDataObj.is() )
+            {
+                datatransfer::DataFlavor aFlavor;
+                SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aFlavor );
+                if ( xDataObj->isDataFlavorSupported( aFlavor ) )
+                {
+                    Any aData = xDataObj->getTransferData( aFlavor );
+                    ::rtl::OUString sText;
+                    aData >>= sText;
+                    bReturn = replaceText( nIndex, nIndex, sText );
+                }
+            }
+        }
+    }
+
+    return bReturn;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleEdit::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return replaceText( nStartIndex, nEndIndex, ::rtl::OUString() );
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleEdit::insertText( const ::rtl::OUString& sText, sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return replaceText( nIndex, nIndex, sText );
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::rtl::OUString& sReplacement ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Bool bReturn = sal_False;
+    ::rtl::OUString sText( implGetText() );
+
+    if ( !implIsValidRange( nStartIndex, nEndIndex, sText.getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    sal_Int32 nMinIndex = ::std::min( nStartIndex, nEndIndex );
+    sal_Int32 nMaxIndex = ::std::max( nStartIndex, nEndIndex );
+
+    VCLXEdit* pVCLXEdit = static_cast< VCLXEdit* >( GetVCLXWindow() );
+    if ( pVCLXEdit && pVCLXEdit->isEditable() )
+    {
+        pVCLXEdit->setText( sText.replaceAt( nMinIndex, nMaxIndex - nMinIndex, sReplacement ) );
+        sal_Int32 nIndex = nMinIndex + sReplacement.getLength();
+        setSelection( nIndex, nIndex );
+        bReturn = sal_True;
+    }
+
+    return bReturn;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleEdit::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const Sequence<PropertyValue>& ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    return sal_False;   // attributes cannot be set for an edit
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleEdit::setText( const ::rtl::OUString& sText ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Bool bSuccess = sal_False;
+    try
+    {
+        bSuccess = replaceText( 0, implGetText().getLength(), sText );
+    }
+    catch( const IndexOutOfBoundsException& )
+    {
+        OSL_ENSURE( sal_False, "VCLXAccessibleText::setText: caught an exception!" );
+    }
+    return bSuccess;
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
new file mode 100644
index 000000000000..90218e629669
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessiblefixedhyperlink.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_accessibility.hxx"
+
+// includes --------------------------------------------------------------
+#include <accessibility/standard/vclxaccessiblefixedhyperlink.hxx>
+
+using namespace ::com::sun::star;
+
+// -----------------------------------------------------------------------------
+// VCLXAccessibleFixedHyperlink
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleFixedHyperlink::VCLXAccessibleFixedHyperlink( VCLXWindow* pVCLWindow )
+    :VCLXAccessibleTextComponent( pVCLWindow )
+{
+}
+
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleFixedHyperlink::~VCLXAccessibleFixedHyperlink()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleFixedHyperlink::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+{
+    VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet );
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleFixedHyperlink::implGetLineBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex )
+{
+    // TODO
+    OCommonAccessibleText::implGetLineBoundary( rBoundary, nIndex );
+}
+
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleFixedHyperlink::getImplementationName() throw (uno::RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleFixedHyperlink" );
+}
+
+// -----------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > VCLXAccessibleFixedHyperlink::getSupportedServiceNames() throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aNames(1);
+    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleFixedHyperlink" );
+    return aNames;
+}
+
+// -----------------------------------------------------------------------------
+
diff --git a/accessibility/source/standard/vclxaccessiblefixedtext.cxx b/accessibility/source/standard/vclxaccessiblefixedtext.cxx
new file mode 100644
index 000000000000..ca89fa0417ab
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessiblefixedtext.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+
+// includes --------------------------------------------------------------
+#include <accessibility/standard/vclxaccessiblefixedtext.hxx>
+
+#include <unotools/accessiblestatesethelper.hxx>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <vcl/fixed.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::accessibility;
+
+
+// -----------------------------------------------------------------------------
+// VCLXAccessibleFixedText
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleFixedText::VCLXAccessibleFixedText( VCLXWindow* pVCLWindow )
+    :VCLXAccessibleTextComponent( pVCLWindow )
+{
+}
+
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleFixedText::~VCLXAccessibleFixedText()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleFixedText::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+{
+    VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet );
+
+    if ( GetWindow() && GetWindow()->GetStyle() & WB_WORDBREAK )
+        rStateSet.AddState( AccessibleStateType::MULTI_LINE );
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleFixedText::implGetLineBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex )
+{
+    // TODO
+    OCommonAccessibleText::implGetLineBoundary( rBoundary, nIndex );
+}
+
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleFixedText::getImplementationName() throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleFixedText" );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< ::rtl::OUString > VCLXAccessibleFixedText::getSupportedServiceNames() throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames(1);
+    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleFixedText" );
+    return aNames;
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
new file mode 100644
index 000000000000..03fde2b0dc28
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -0,0 +1,854 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+#include <accessibility/standard/vclxaccessiblelist.hxx>
+#include <accessibility/standard/vclxaccessiblelistitem.hxx>
+#include <accessibility/helper/listboxhelper.hxx>
+
+#include <unotools/accessiblestatesethelper.hxx>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <vcl/svapp.hxx>
+#include <vcl/combobox.hxx>
+#include <vcl/lstbox.hxx>
+#include <toolkit/helper/convert.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::accessibility;
+using namespace ::accessibility;
+
+namespace
+{
+    void checkSelection_Impl( sal_Int32 _nIndex, const IComboListBoxHelper& _rListBox, sal_Bool bSelected )
+        throw (::com::sun::star::lang::IndexOutOfBoundsException)
+    {
+        sal_Int32 nCount = bSelected ? (sal_Int32)_rListBox.GetSelectEntryCount()
+                                     : (sal_Int32)_rListBox.GetEntryCount();
+        if ( _nIndex < 0 || _nIndex >= nCount )
+            throw ::com::sun::star::lang::IndexOutOfBoundsException();
+    }
+}
+
+VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType,
+                                        const Reference< XAccessible >& _xParent)
+    : VCLXAccessibleComponent   (pVCLWindow),
+      m_aBoxType                (aBoxType),
+      m_nVisibleLineCount       (0),
+      m_nIndexInParent          (DEFAULT_INDEX_IN_PARENT),
+      m_nLastTopEntry           ( 0 ),
+      m_nLastSelectedPos        ( LISTBOX_ENTRY_NOTFOUND ),
+      m_bDisableProcessEvent    ( false ),
+      m_bVisible                ( true ),
+      m_xParent                 ( _xParent )
+{
+    // Because combo boxes and list boxes have the no common interface for
+    // methods with identical signature we have to write down twice the
+    // same code.
+    switch (m_aBoxType)
+    {
+        case COMBOBOX:
+        {
+            ComboBox* pBox = static_cast<ComboBox*>(GetWindow());
+            if ( pBox != NULL )
+                m_pListBoxHelper = new VCLListBoxHelper<ComboBox> (*pBox);
+            break;
+        }
+
+        case LISTBOX:
+        {
+            ListBox* pBox = static_cast<ListBox*>(GetWindow());
+            if ( pBox != NULL )
+                m_pListBoxHelper = new VCLListBoxHelper<ListBox> (*pBox);
+            break;
+        }
+    }
+    UpdateVisibleLineCount();
+
+    sal_uInt16 nCount = static_cast<sal_uInt16>(getAccessibleChildCount());
+    m_aAccessibleChildren.reserve(nCount);
+}
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleList::~VCLXAccessibleList (void)
+{
+    delete m_pListBoxHelper;
+}
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleList::SetIndexInParent (sal_Int32 nIndex)
+{
+    m_nIndexInParent = nIndex;
+}
+// -----------------------------------------------------------------------------
+
+void SAL_CALL VCLXAccessibleList::disposing (void)
+{
+    VCLXAccessibleComponent::disposing();
+
+    // Dispose all items in the list.
+    clearItems();
+
+    delete m_pListBoxHelper;
+    m_pListBoxHelper = NULL;
+}
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleList::clearItems()
+{
+//  ListItems::iterator aEnd = m_aAccessibleChildren.end();
+//  for (ListItems::iterator aIter = m_aAccessibleChildren.begin(); aIter != aEnd; ++aIter)
+//      ::comphelper::disposeComponent(*aIter);
+
+    // Clear the list itself and delete all the rest.
+    ListItems().swap(m_aAccessibleChildren); // clear and minimize
+}
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleList::FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+
+    VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet );
+    // check if our list should be visible
+    if (    m_pListBoxHelper
+        && (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN
+        && !m_pListBoxHelper->IsInDropDown() )
+    {
+        rStateSet.RemoveState (AccessibleStateType::VISIBLE);
+        rStateSet.RemoveState (AccessibleStateType::SHOWING);
+        m_bVisible = false;
+    }
+
+    // Both the combo box and list box are handled identical in the
+    // following but for some reason they don't have a common interface for
+    // the methods used.
+    if ( m_pListBoxHelper )
+    {
+        if ( m_pListBoxHelper->IsMultiSelectionEnabled() )
+            rStateSet.AddState( AccessibleStateType::MULTI_SELECTABLE);
+        rStateSet.AddState (AccessibleStateType::FOCUSABLE);
+        // All children are transient.
+        rStateSet.AddState (AccessibleStateType::MANAGES_DESCENDANTS);
+    }
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleList::notifyVisibleStates(sal_Bool _bSetNew )
+{
+    m_bVisible = _bSetNew ? true : false;
+    Any aOldValue, aNewValue;
+    (_bSetNew ? aNewValue : aOldValue ) <<= AccessibleStateType::VISIBLE;
+    NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+    (_bSetNew ? aNewValue : aOldValue ) <<= AccessibleStateType::SHOWING;
+    NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+
+    ListItems::iterator aIter = m_aAccessibleChildren.begin();
+    ListItems::iterator aEnd = m_aAccessibleChildren.end();
+    UpdateVisibleLineCount();
+    // adjust the index inside the VCLXAccessibleListItem
+    for (;aIter != aEnd ; ++aIter)
+    {
+        Reference< XAccessible > xHold = *aIter;
+        VCLXAccessibleListItem* pItem = static_cast<VCLXAccessibleListItem*>(xHold.get());
+        if ( pItem )
+        {
+            sal_uInt16 nTopEntry = 0;
+            if ( m_pListBoxHelper )
+                nTopEntry = m_pListBoxHelper->GetTopEntry();
+            sal_uInt16 nPos = (sal_uInt16)(aIter - m_aAccessibleChildren.begin());
+            sal_Bool bVisible = ( nPos>=nTopEntry && nPos<( nTopEntry + m_nVisibleLineCount ) );
+            pItem->SetVisible( m_bVisible && bVisible );
+        }
+
+    }
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent)
+{
+    // Create a reference to this object to prevent an early release of the
+    // listbox (VCLEVENT_OBJECT_DYING).
+    Reference< XAccessible > xTemp = this;
+
+    switch ( rVclWindowEvent.GetId() )
+    {
+        case VCLEVENT_DROPDOWN_OPEN:
+            notifyVisibleStates(sal_True);
+            break;
+        case VCLEVENT_DROPDOWN_CLOSE:
+            notifyVisibleStates(sal_False);
+            break;
+        case VCLEVENT_LISTBOX_SCROLLED:
+        case VCLEVENT_COMBOBOX_SCROLLED:
+            UpdateEntryRange_Impl();
+            break;
+
+        case VCLEVENT_LISTBOX_SELECT:
+            if ( !m_bDisableProcessEvent )
+                UpdateSelection_Impl();
+            break;
+        // The selection events VCLEVENT_COMBOBOX_SELECT and
+        // VCLEVENT_COMBOBOX_DESELECT are not handled here because here we
+        // have no access to the edit field.  Its text is necessary to
+        // identify the currently selected item.
+
+        case VCLEVENT_OBJECT_DYING:
+        {
+            dispose();
+
+            VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent);
+            break;
+        }
+
+        case VCLEVENT_LISTBOX_ITEMREMOVED:
+        case VCLEVENT_COMBOBOX_ITEMREMOVED:
+            HandleChangedItemList (false, reinterpret_cast<sal_IntPtr>(
+                rVclWindowEvent.GetData()));
+            break;
+
+        case VCLEVENT_LISTBOX_ITEMADDED:
+        case VCLEVENT_COMBOBOX_ITEMADDED:
+            HandleChangedItemList (true, reinterpret_cast<sal_IntPtr>(
+                rVclWindowEvent.GetData()));
+            break;
+        case VCLEVENT_CONTROL_GETFOCUS:
+            VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent);
+            if ( m_pListBoxHelper )
+            {
+                uno::Any    aOldValue,
+                            aNewValue;
+                sal_uInt16 nPos = m_pListBoxHelper->GetSelectEntryPos();
+                if ( nPos == LISTBOX_ENTRY_NOTFOUND )
+                    nPos = m_pListBoxHelper->GetTopEntry();
+                if ( nPos != LISTBOX_ENTRY_NOTFOUND )
+                    aNewValue <<= CreateChild(nPos);
+
+                NotifyAccessibleEvent(  AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
+                                        aOldValue,
+                                        aNewValue );
+            }
+            break;
+
+        default:
+            VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent);
+    }
+}
+// -----------------------------------------------------------------------------
+
+/** To find out which item is currently selected and to update the SELECTED
+    state of the associated accessibility objects accordingly we exploit the
+    fact that the
+*/
+void VCLXAccessibleList::UpdateSelection (::rtl::OUString sTextOfSelectedItem)
+{
+    if ( m_aBoxType == COMBOBOX )
+    {
+        ComboBox* pBox = static_cast<ComboBox*>(GetWindow());
+        if ( pBox != NULL )
+        {
+            // Find the index of the selected item inside the VCL control...
+            sal_uInt16 nIndex = pBox->GetEntryPos (XubString(sTextOfSelectedItem));
+            // ...and then find the associated accessibility object.
+            if ( nIndex == LISTBOX_ENTRY_NOTFOUND )
+                nIndex = 0;
+            UpdateSelection_Impl(nIndex);
+        }
+    }
+}
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleList::adjustEntriesIndexInParent(ListItems::iterator& _aBegin,::std::mem_fun_t<bool,VCLXAccessibleListItem>& _rMemFun)
+{
+    ListItems::iterator aIter = _aBegin;
+    ListItems::iterator aEnd = m_aAccessibleChildren.end();
+    // adjust the index inside the VCLXAccessibleListItem
+    for (;aIter != aEnd ; ++aIter)
+    {
+        Reference< XAccessible > xHold = *aIter;
+        VCLXAccessibleListItem* pItem = static_cast<VCLXAccessibleListItem*>(xHold.get());
+        if ( pItem )
+            _rMemFun(pItem);
+    }
+}
+// -----------------------------------------------------------------------------
+
+Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 i)
+{
+    Reference<XAccessible> xChild;
+
+    sal_uInt16 nPos = static_cast<sal_uInt16>(i);
+    if ( nPos >= m_aAccessibleChildren.size() )
+    {
+        m_aAccessibleChildren.resize(nPos + 1);
+
+        // insert into the container
+        xChild = new VCLXAccessibleListItem(m_pListBoxHelper, i, this);
+        m_aAccessibleChildren[nPos] = xChild;
+    }
+    else
+    {
+        xChild = m_aAccessibleChildren[nPos];
+        // check if position is empty and can be used else we have to adjust all entries behind this
+        if ( xChild.is() )
+        {
+            ListItems::iterator aIter = m_aAccessibleChildren.begin() + nPos;
+            ::std::mem_fun_t<bool, VCLXAccessibleListItem> aTemp(&VCLXAccessibleListItem::IncrementIndexInParent);
+            adjustEntriesIndexInParent( aIter, aTemp);
+        }
+        else
+        {
+            xChild = new VCLXAccessibleListItem(m_pListBoxHelper, i, this);
+            m_aAccessibleChildren[nPos] = xChild;
+        }
+    }
+
+    if ( xChild.is() )
+    {
+        // Just add the SELECTED state.
+        sal_Bool bNowSelected = sal_False;
+        if ( m_pListBoxHelper )
+            bNowSelected = m_pListBoxHelper->IsEntryPosSelected ((sal_uInt16)i);
+        VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >(xChild.get());
+        pItem->SetSelected( bNowSelected );
+
+        // Set the child's VISIBLE state.
+        UpdateVisibleLineCount();
+        sal_uInt16 nTopEntry = 0;
+        if ( m_pListBoxHelper )
+            nTopEntry = m_pListBoxHelper->GetTopEntry();
+        sal_Bool bVisible = ( nPos>=nTopEntry && nPos<( nTopEntry + m_nVisibleLineCount ) );
+        pItem->SetVisible( m_bVisible && bVisible );
+    }
+
+    return xChild;
+}
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleList::HandleChangedItemList (bool bItemInserted, sal_Int32 nIndex)
+{
+    if ( !bItemInserted )
+    {
+        if ( nIndex == -1 ) // special handling here
+        {
+            clearItems();
+        }
+        else
+        {
+            if ( nIndex >= 0 && static_cast<sal_uInt16>(nIndex) < m_aAccessibleChildren.size() )
+            {
+                ListItems::iterator aIter = m_aAccessibleChildren.erase(m_aAccessibleChildren.begin()+nIndex);
+            ::std::mem_fun_t<bool, VCLXAccessibleListItem> aTemp(&VCLXAccessibleListItem::DecrementIndexInParent);
+                adjustEntriesIndexInParent( aIter, aTemp );
+            }
+        }
+    }
+    else
+        getAccessibleChild(nIndex);
+
+    NotifyAccessibleEvent (
+        AccessibleEventId::INVALIDATE_ALL_CHILDREN,
+        Any(), Any());
+}
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XINTERFACE2(VCLXAccessibleList, VCLXAccessibleComponent, VCLXAccessibleList_BASE)
+IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleList, VCLXAccessibleComponent, VCLXAccessibleList_BASE)
+
+//=====  XAccessible  =========================================================
+
+Reference<XAccessibleContext> SAL_CALL
+    VCLXAccessibleList::getAccessibleContext (void)
+    throw (RuntimeException)
+{
+    return this;
+}
+// -----------------------------------------------------------------------------
+
+//=====  XAccessibleContext  ==================================================
+
+sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleChildCount (void)
+    throw (RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+    sal_Int32 nCount = 0;
+    if ( m_pListBoxHelper )
+        nCount = m_pListBoxHelper->GetEntryCount();
+
+    return nCount;
+}
+// -----------------------------------------------------------------------------
+
+Reference<XAccessible> SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int32 i)
+    throw (IndexOutOfBoundsException, RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+    if ( i < 0 || i >= getAccessibleChildCount() )
+        throw IndexOutOfBoundsException();
+
+    Reference< XAccessible > xChild;
+    // search for the child
+    if ( static_cast<sal_uInt16>(i) >= m_aAccessibleChildren.size() )
+        xChild = CreateChild (i);
+    else
+    {
+        xChild = m_aAccessibleChildren[i];
+        if ( !xChild.is() )
+            xChild = CreateChild (i);
+    }
+    OSL_ENSURE( xChild.is(), "VCLXAccessibleList::getAccessibleChild: returning empty child!" );
+    return xChild;
+}
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleParent(  )
+    throw (RuntimeException)
+{
+    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+    return m_xParent;
+}
+// -----------------------------------------------------------------------------
+
+sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleIndexInParent (void)
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    if (m_nIndexInParent != DEFAULT_INDEX_IN_PARENT)
+        return m_nIndexInParent;
+    else
+        return VCLXAccessibleComponent::getAccessibleIndexInParent();
+}
+// -----------------------------------------------------------------------------
+
+sal_Int16 SAL_CALL VCLXAccessibleList::getAccessibleRole (void)
+    throw (RuntimeException)
+{
+    return AccessibleRole::LIST;
+}
+// -----------------------------------------------------------------------------
+
+//=====  XAccessibleComponent  ================================================
+
+sal_Bool SAL_CALL VCLXAccessibleList::contains( const awt::Point& rPoint ) throw (RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+    sal_Bool bInside = sal_False;
+
+    Window* pListBox = GetWindow();
+    if ( pListBox )
+    {
+        Rectangle aRect( Point(0,0), pListBox->GetSizePixel() );
+        bInside = aRect.IsInside( VCLPoint( rPoint ) );
+    }
+
+    return bInside;
+}
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleAt( const awt::Point& rPoint )
+    throw (RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+    Reference< XAccessible > xChild;
+    if ( m_pListBoxHelper )
+    {
+        UpdateVisibleLineCount();
+        if ( contains( rPoint ) && m_nVisibleLineCount > 0 )
+        {
+            Point aPos = VCLPoint( rPoint );
+            sal_uInt16 nEndPos = m_pListBoxHelper->GetTopEntry() + (sal_uInt16)m_nVisibleLineCount;
+            for ( sal_uInt16 i = m_pListBoxHelper->GetTopEntry(); i < nEndPos; ++i )
+            {
+                if ( m_pListBoxHelper->GetBoundingRectangle(i).IsInside( aPos ) )
+                {
+                    xChild = getAccessibleChild(i);
+                    break;
+                }
+            }
+        }
+    }
+
+    return xChild;
+}
+// -----------------------------------------------------------------------------
+
+//===== XServiceInfo ==========================================================
+
+::rtl::OUString VCLXAccessibleList::getImplementationName (void)
+    throw (RuntimeException)
+{
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.toolkit.AccessibleList"));
+}
+// -----------------------------------------------------------------------------
+
+Sequence< ::rtl::OUString > VCLXAccessibleList::getSupportedServiceNames (void)
+    throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames = VCLXAccessibleComponent::getSupportedServiceNames();
+    sal_Int32 nLength = aNames.getLength();
+    aNames.realloc( nLength + 1 );
+    aNames[nLength] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleList"));
+    return aNames;
+}
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleList::UpdateVisibleLineCount()
+{
+    if ( m_pListBoxHelper )
+    {
+        if ( (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN )
+            m_nVisibleLineCount = m_pListBoxHelper->GetDisplayLineCount();
+        else
+        {
+            sal_uInt16 nCols = 0,
+                nLines = 0;
+            m_pListBoxHelper->GetMaxVisColumnsAndLines (nCols, nLines);
+            m_nVisibleLineCount = nLines;
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+void VCLXAccessibleList::UpdateEntryRange_Impl()
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+    sal_Int32 nTop = m_nLastTopEntry;
+
+    if ( m_pListBoxHelper )
+        nTop = m_pListBoxHelper->GetTopEntry();
+    if ( nTop != m_nLastTopEntry )
+    {
+        UpdateVisibleLineCount();
+        sal_Int32 nBegin = Min( m_nLastTopEntry, nTop );
+        sal_Int32 nEnd = Max( m_nLastTopEntry + m_nVisibleLineCount, nTop + m_nVisibleLineCount );
+        for (sal_uInt16 i = static_cast<sal_uInt16>(nBegin); (i <= static_cast<sal_uInt16>(nEnd)); ++i)
+        {
+            sal_Bool bVisible = ( i >= nTop && i < ( nTop + m_nVisibleLineCount ) );
+            Reference< XAccessible > xHold;
+            if ( i < m_aAccessibleChildren.size() )
+                xHold = m_aAccessibleChildren[i];
+            else if ( bVisible )
+                xHold = CreateChild(i);
+
+            if ( xHold.is() )
+                static_cast< VCLXAccessibleListItem* >( xHold.get() )->SetVisible( m_bVisible && bVisible );
+        }
+    }
+
+    m_nLastTopEntry = nTop;
+}
+// -----------------------------------------------------------------------------
+sal_Bool VCLXAccessibleList::checkEntrySelected(sal_uInt16 _nPos,Any& _rNewValue,Reference< XAccessible >& _rxNewAcc)
+{
+    OSL_ENSURE(m_pListBoxHelper,"Helper is not valid!");
+    sal_Bool bNowSelected = sal_False;
+    if ( m_pListBoxHelper )
+    {
+        bNowSelected = m_pListBoxHelper->IsEntryPosSelected (_nPos);
+        if ( bNowSelected )
+        {
+            _rxNewAcc = CreateChild(_nPos);
+            _rNewValue <<= _rxNewAcc;
+        }
+    }
+    return bNowSelected;
+}
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleList::UpdateSelection_Impl(sal_uInt16)
+{
+    uno::Any aOldValue, aNewValue;
+
+    {
+        vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+        Reference< XAccessible > xNewAcc;
+
+        if ( m_pListBoxHelper )
+        {
+            sal_uInt16 i=0;
+            for ( ListItems::iterator aIter = m_aAccessibleChildren.begin();
+                  aIter != m_aAccessibleChildren.end(); ++aIter,++i)
+            {
+                Reference< XAccessible > xHold = *aIter;
+                if ( xHold.is() )
+                {
+                    VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >( xHold.get() );
+                    // Retrieve the item's index from the list entry.
+                    sal_Bool bNowSelected = m_pListBoxHelper->IsEntryPosSelected (i);
+
+                    if ( bNowSelected && !pItem->IsSelected() )
+                    {
+                        xNewAcc = *aIter;
+                        aNewValue <<= xNewAcc;
+                    }
+                    else if ( pItem->IsSelected() )
+                        m_nLastSelectedPos = i;
+
+                    pItem->SetSelected( bNowSelected );
+                }
+                else
+                { // it could happen that a child was not created before
+                    checkEntrySelected(i,aNewValue,xNewAcc);
+                }
+            }
+            sal_uInt16 nCount = m_pListBoxHelper->GetEntryCount();
+            if ( i < nCount ) // here we have to check the if any other listbox entry is selected
+            {
+                for (; i < nCount && !checkEntrySelected(i,aNewValue,xNewAcc) ;++i )
+                    ;
+            }
+            if ( xNewAcc.is() && GetWindow()->HasFocus() )
+            {
+                if ( m_nLastSelectedPos != LISTBOX_ENTRY_NOTFOUND )
+                    aOldValue <<= getAccessibleChild( (sal_Int32)m_nLastSelectedPos );
+                aNewValue <<= xNewAcc;
+            }
+        }
+    }
+
+    if ( aNewValue.hasValue() || aOldValue.hasValue() )
+        NotifyAccessibleEvent(
+            AccessibleEventId::ACTIVE_DESCENDANT_CHANGED,
+            aOldValue,
+            aNewValue );
+
+    NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleSelection
+// -----------------------------------------------------------------------------
+void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    sal_Bool bNotify = sal_False;
+
+    {
+        vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+        if ( m_pListBoxHelper )
+        {
+            checkSelection_Impl(nChildIndex,*m_pListBoxHelper,sal_False);
+
+            m_pListBoxHelper->SelectEntryPos( (sal_uInt16)nChildIndex, sal_True );
+            // call the select handler, don't handle events in this time
+            m_bDisableProcessEvent = true;
+            m_pListBoxHelper->Select();
+            m_bDisableProcessEvent = false;
+            bNotify = sal_True;
+        }
+    }
+
+    if ( bNotify )
+        UpdateSelection_Impl();
+}
+// -----------------------------------------------------------------------------
+sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+    sal_Bool bRet = sal_False;
+    if ( m_pListBoxHelper )
+    {
+        checkSelection_Impl(nChildIndex,*m_pListBoxHelper,sal_False);
+
+        bRet = m_pListBoxHelper->IsEntryPosSelected( (sal_uInt16)nChildIndex );
+    }
+    return bRet;
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL VCLXAccessibleList::clearAccessibleSelection(  ) throw (RuntimeException)
+{
+    sal_Bool bNotify = sal_False;
+
+    {
+        vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+        if ( m_pListBoxHelper )
+        {
+            m_pListBoxHelper->SetNoSelection();
+            bNotify = sal_True;
+        }
+    }
+
+    if ( bNotify )
+        UpdateSelection_Impl();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren(  ) throw (RuntimeException)
+{
+    sal_Bool bNotify = sal_False;
+
+    {
+        vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+        if ( m_pListBoxHelper )
+        {
+            sal_uInt16 nCount = m_pListBoxHelper->GetEntryCount();
+            for ( sal_uInt16 i = 0; i < nCount; ++i )
+                m_pListBoxHelper->SelectEntryPos( i, sal_True );
+            // call the select handler, don't handle events in this time
+            m_bDisableProcessEvent = true;
+            m_pListBoxHelper->Select();
+            m_bDisableProcessEvent = false;
+            bNotify = sal_True;
+        }
+    }
+
+    if ( bNotify )
+        UpdateSelection_Impl();
+}
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+    sal_Int32 nCount = 0;
+    if ( m_pListBoxHelper )
+           nCount = m_pListBoxHelper->GetSelectEntryCount();
+    return nCount;
+}
+// -----------------------------------------------------------------------------
+Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+    if ( m_pListBoxHelper )
+    {
+        checkSelection_Impl(nSelectedChildIndex,*m_pListBoxHelper,sal_True);
+        return getAccessibleChild( (sal_Int32)m_pListBoxHelper->GetSelectEntryPos( (sal_uInt16)nSelectedChildIndex ) );
+    }
+
+    return NULL;
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    sal_Bool bNotify = sal_False;
+
+    {
+        vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+        if ( m_pListBoxHelper )
+        {
+            checkSelection_Impl(nSelectedChildIndex,*m_pListBoxHelper,sal_False);
+
+            m_pListBoxHelper->SelectEntryPos( (sal_uInt16)nSelectedChildIndex, sal_False );
+            // call the select handler, don't handle events in this time
+            m_bDisableProcessEvent = true;
+            m_pListBoxHelper->Select();
+            m_bDisableProcessEvent = false;
+            bNotify = sal_True;
+        }
+    }
+
+    if ( bNotify )
+        UpdateSelection_Impl();
+}
+// -----------------------------------------------------------------------------
+// accessibility::XAccessibleComponent
+awt::Rectangle VCLXAccessibleList::implGetBounds() throw (uno::RuntimeException)
+{
+    awt::Rectangle aBounds ( 0, 0, 0, 0 );
+    if ( m_pListBoxHelper
+        && (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN )
+    {
+        if ( m_pListBoxHelper->IsInDropDown() )
+            aBounds = AWTRectangle(m_pListBoxHelper->GetDropDownPosSizePixel());
+    }
+    else
+    {
+        // a list has the same bounds as his parent but starts at (0,0)
+        aBounds = VCLXAccessibleComponent::implGetBounds();
+        aBounds.X = 0;
+        aBounds.Y = 0;
+        if ( m_aBoxType == COMBOBOX )
+        {
+            ComboBox* pBox = static_cast<ComboBox*>(GetWindow());
+            if ( pBox )
+            {
+                Size aSize = pBox->GetSubEdit()->GetSizePixel();
+                aBounds.X += aSize.Height();
+                aBounds.Y += aSize.Width();
+                aBounds.Height -= aSize.Height();
+                aBounds.Width  -= aSize.Width();
+            }
+        }
+    }
+    return aBounds;
+}
+// -----------------------------------------------------------------------------
+
+awt::Point VCLXAccessibleList::getLocationOnScreen(  ) throw (uno::RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+    awt::Point aPos;
+    if ( m_pListBoxHelper
+        && (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN )
+    {
+        if ( m_pListBoxHelper->IsInDropDown() )
+            aPos = AWTPoint(m_pListBoxHelper->GetDropDownPosSizePixel().TopLeft());
+    }
+    else
+    {
+        aPos = VCLXAccessibleComponent::getLocationOnScreen();
+        if ( m_aBoxType == COMBOBOX )
+        {
+            ComboBox* pBox = static_cast<ComboBox*>(GetWindow());
+            if ( pBox )
+            {
+                aPos.X += pBox->GetSubEdit()->GetSizePixel().Height();
+                aPos.Y += pBox->GetSubEdit()->GetSizePixel().Width();
+            }
+        }
+    }
+    return aPos;
+}
+// -----------------------------------------------------------------------------
+
diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx
new file mode 100644
index 000000000000..7645d2067c1a
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessiblelistbox.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+#include <accessibility/standard/vclxaccessiblelistbox.hxx>
+#include <accessibility/standard/vclxaccessiblelistitem.hxx>
+#include <accessibility/helper/listboxhelper.hxx>
+
+#include <algorithm>
+
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <tools/debug.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/lstbox.hxx>
+#include <vcl/unohelp.hxx>
+
+#include <toolkit/awt/vclxwindow.hxx>
+#include <toolkit/helper/convert.hxx>
+
+#include <comphelper/sequence.hxx>
+#include <cppuhelper/typeprovider.hxx>
+#include <unotools/accessiblestatesethelper.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::accessibility;
+
+VCLXAccessibleListBox::VCLXAccessibleListBox (VCLXWindow* pVCLWindow)
+    : VCLXAccessibleBox (pVCLWindow, VCLXAccessibleBox::LISTBOX, false)
+{
+}
+
+
+
+
+VCLXAccessibleListBox::~VCLXAccessibleListBox (void)
+{
+}
+
+
+
+
+bool VCLXAccessibleListBox::IsValid (void) const
+{
+    return static_cast<ListBox*>(GetWindow()) != NULL;
+
+}
+
+
+
+
+void VCLXAccessibleListBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent)
+{
+    VCLXAccessibleBox::ProcessWindowEvent( rVclWindowEvent );
+}
+
+
+
+
+//=====  XServiceInfo  ========================================================
+
+::rtl::OUString VCLXAccessibleListBox::getImplementationName (void)
+    throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleListBox");
+}
+
+
+
+
+Sequence< ::rtl::OUString > VCLXAccessibleListBox::getSupportedServiceNames (void)
+    throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames();
+    sal_Int32 nLength = aNames.getLength();
+    aNames.realloc( nLength + 1 );
+    aNames[nLength] = ::rtl::OUString::createFromAscii(
+        "com.sun.star.accessibility.AccessibleListBox" );
+    return aNames;
+}
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
new file mode 100644
index 000000000000..66a819bdf036
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessiblelistitem.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_accessibility.hxx"
+#include <accessibility/standard/vclxaccessiblelistitem.hxx>
+#include <toolkit/helper/convert.hxx>
+#include <accessibility/helper/listboxhelper.hxx>
+#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/Size.hpp>
+
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
+#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
+#include <tools/debug.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/controllayout.hxx>
+#include <vcl/unohelp2.hxx>
+#include <toolkit/awt/vclxwindow.hxx>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <unotools/accessiblerelationsethelper.hxx>
+#include <cppuhelper/typeprovider.hxx>
+#include <comphelper/sequence.hxx>
+#include <comphelper/accessibleeventnotifier.hxx>
+
+namespace
+{
+    void checkIndex_Impl( sal_Int32 _nIndex, const ::rtl::OUString& _sText ) throw (::com::sun::star::lang::IndexOutOfBoundsException)
+    {
+        if ( _nIndex < 0 || _nIndex > _sText.getLength() )
+            throw ::com::sun::star::lang::IndexOutOfBoundsException();
+    }
+}
+
+// class VCLXAccessibleListItem ------------------------------------------
+
+using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star;
+
+DBG_NAME(VCLXAccessibleListItem)
+
+// -----------------------------------------------------------------------------
+// Ctor() and Dtor()
+// -----------------------------------------------------------------------------
+VCLXAccessibleListItem::VCLXAccessibleListItem( ::accessibility::IComboListBoxHelper* _pListBoxHelper, sal_Int32 _nIndexInParent, const Reference< XAccessible >& _xParent ) :
+
+    VCLXAccessibleListItem_BASE ( m_aMutex ),
+
+    m_nIndexInParent( _nIndexInParent ),
+    m_bSelected     ( sal_False ),
+    m_bVisible      ( sal_False ),
+    m_nClientId     ( 0 ),
+    m_pListBoxHelper( _pListBoxHelper ),
+    m_xParent       ( _xParent )
+
+{
+    DBG_CTOR( VCLXAccessibleListItem, NULL );
+
+    if ( m_xParent.is() )
+        m_xParentContext = m_xParent->getAccessibleContext();
+
+    if ( m_pListBoxHelper )
+        m_sEntryText = m_pListBoxHelper->GetEntry( (sal_uInt16)_nIndexInParent );
+}
+// -----------------------------------------------------------------------------
+VCLXAccessibleListItem::~VCLXAccessibleListItem()
+{
+    DBG_DTOR( VCLXAccessibleListItem, NULL );
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleListItem::SetSelected( sal_Bool _bSelected )
+{
+    if ( m_bSelected != _bSelected )
+    {
+        Any aOldValue;
+        Any aNewValue;
+        if ( m_bSelected )
+            aOldValue <<= AccessibleStateType::SELECTED;
+        else
+            aNewValue <<= AccessibleStateType::SELECTED;
+        m_bSelected = _bSelected;
+        NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+    }
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleListItem::SetVisible( sal_Bool _bVisible )
+{
+    if ( m_bVisible != _bVisible )
+    {
+        Any aOldValue, aNewValue;
+        m_bVisible = _bVisible;
+        (_bVisible ? aNewValue : aOldValue ) <<= AccessibleStateType::VISIBLE;
+        NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+        (_bVisible ? aNewValue : aOldValue ) <<= AccessibleStateType::SHOWING;
+        NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+    }
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleListItem::NotifyAccessibleEvent( sal_Int16 _nEventId,
+                                                    const ::com::sun::star::uno::Any& _aOldValue,
+                                                    const ::com::sun::star::uno::Any& _aNewValue )
+{
+    AccessibleEventObject aEvt;
+    aEvt.Source = *this;
+    aEvt.EventId = _nEventId;
+    aEvt.OldValue = _aOldValue;
+    aEvt.NewValue = _aNewValue;
+
+    if (m_nClientId)
+        comphelper::AccessibleEventNotifier::addEvent( m_nClientId, aEvt );
+}
+// -----------------------------------------------------------------------------
+// OCommonAccessibleText
+// -----------------------------------------------------------------------------
+::rtl::OUString VCLXAccessibleListItem::implGetText()
+{
+    return m_sEntryText;
+}
+// -----------------------------------------------------------------------------
+Locale VCLXAccessibleListItem::implGetLocale()
+{
+    return Application::GetSettings().GetLocale();
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleListItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
+{
+    nStartIndex = 0;
+    nEndIndex = 0;
+}
+// -----------------------------------------------------------------------------
+// XInterface
+// -----------------------------------------------------------------------------
+Any SAL_CALL VCLXAccessibleListItem::queryInterface( Type const & rType ) throw (RuntimeException)
+{
+    return VCLXAccessibleListItem_BASE::queryInterface( rType );
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL VCLXAccessibleListItem::acquire() throw ()
+{
+    VCLXAccessibleListItem_BASE::acquire();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL VCLXAccessibleListItem::release() throw ()
+{
+    VCLXAccessibleListItem_BASE::release();
+}
+// -----------------------------------------------------------------------------
+// XTypeProvider
+// -----------------------------------------------------------------------------
+Sequence< Type > SAL_CALL VCLXAccessibleListItem::getTypes(  ) throw (RuntimeException)
+{
+    return VCLXAccessibleListItem_BASE::getTypes();
+}
+// -----------------------------------------------------------------------------
+Sequence< sal_Int8 > VCLXAccessibleListItem::getImplementationId() throw (RuntimeException)
+{
+    static ::cppu::OImplementationId* pId = NULL;
+
+    if ( !pId )
+    {
+        ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex );
+
+        if ( !pId )
+        {
+            static ::cppu::OImplementationId aId;
+            pId = &aId;
+        }
+    }
+    return pId->getImplementationId();
+}
+// -----------------------------------------------------------------------------
+// XComponent
+// -----------------------------------------------------------------------------
+void SAL_CALL VCLXAccessibleListItem::disposing()
+{
+    comphelper::AccessibleEventNotifier::TClientId nId( 0 );
+    Reference< XInterface > xEventSource;
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        VCLXAccessibleListItem_BASE::disposing();
+        m_sEntryText        = ::rtl::OUString();
+        m_pListBoxHelper    = NULL;
+        m_xParent           = NULL;
+        m_xParentContext    = NULL;
+
+        nId = m_nClientId;
+        m_nClientId =  0;
+        if ( nId )
+            xEventSource = *this;
+    }
+
+    // Send a disposing to all listeners.
+    if ( nId )
+            comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nId, *this );
+}
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+::rtl::OUString VCLXAccessibleListItem::getImplementationName() throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleListItem" );
+}
+// -----------------------------------------------------------------------------
+sal_Bool VCLXAccessibleListItem::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() );
+    const ::rtl::OUString* pNames = aNames.getConstArray();
+    const ::rtl::OUString* pEnd = pNames + aNames.getLength();
+    for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames )
+        ;
+
+    return pNames != pEnd;
+}
+// -----------------------------------------------------------------------------
+Sequence< ::rtl::OUString > VCLXAccessibleListItem::getSupportedServiceNames() throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames(3);
+    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.accessibility.AccessibleContext" );
+    aNames[1] = ::rtl::OUString::createFromAscii( "com.sun.star.accessibility.AccessibleComponent" );
+    aNames[2] = ::rtl::OUString::createFromAscii( "com.sun.star.accessibility.AccessibleListItem" );
+    return aNames;
+}
+// -----------------------------------------------------------------------------
+// XAccessible
+// -----------------------------------------------------------------------------
+Reference< XAccessibleContext > SAL_CALL VCLXAccessibleListItem::getAccessibleContext(  ) throw (RuntimeException)
+{
+    return this;
+}
+// -----------------------------------------------------------------------------
+// XAccessibleContext
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleChildCount(  ) throw (RuntimeException)
+{
+    return 0;
+}
+// -----------------------------------------------------------------------------
+Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleChild( sal_Int32 ) throw (RuntimeException)
+{
+    return Reference< XAccessible >();
+}
+// -----------------------------------------------------------------------------
+Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleParent(  ) throw (RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    return m_xParent;
+}
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleIndexInParent(  ) throw (RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    return m_nIndexInParent;
+}
+// -----------------------------------------------------------------------------
+sal_Int16 SAL_CALL VCLXAccessibleListItem::getAccessibleRole(  ) throw (RuntimeException)
+{
+    return AccessibleRole::LIST_ITEM;
+    //  return AccessibleRole::LABEL;
+}
+// -----------------------------------------------------------------------------
+::rtl::OUString SAL_CALL VCLXAccessibleListItem::getAccessibleDescription(  ) throw (RuntimeException)
+{
+    // no description for every item
+    return ::rtl::OUString();
+}
+// -----------------------------------------------------------------------------
+::rtl::OUString SAL_CALL VCLXAccessibleListItem::getAccessibleName(  ) throw (RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    // entry text == accessible name
+    return implGetText();
+}
+// -----------------------------------------------------------------------------
+Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleListItem::getAccessibleRelationSet(  ) throw (RuntimeException)
+{
+    utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
+    Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
+    return xSet;
+}
+// -----------------------------------------------------------------------------
+Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleListItem::getAccessibleStateSet(  ) throw (RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper;
+    Reference< XAccessibleStateSet > xStateSet = pStateSetHelper;
+
+    if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
+    {
+        pStateSetHelper->AddState( AccessibleStateType::TRANSIENT );
+        pStateSetHelper->AddState( AccessibleStateType::SELECTABLE );
+        pStateSetHelper->AddState( AccessibleStateType::ENABLED );
+        pStateSetHelper->AddState( AccessibleStateType::SENSITIVE );
+        if ( m_bSelected )
+            pStateSetHelper->AddState( AccessibleStateType::SELECTED );
+        if ( m_bVisible )
+        {
+            pStateSetHelper->AddState( AccessibleStateType::VISIBLE );
+            pStateSetHelper->AddState( AccessibleStateType::SHOWING );
+        }
+    }
+    else
+        pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+
+    return xStateSet;
+}
+// -----------------------------------------------------------------------------
+Locale SAL_CALL VCLXAccessibleListItem::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    return implGetLocale();
+}
+// -----------------------------------------------------------------------------
+// XAccessibleComponent
+// -----------------------------------------------------------------------------
+sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoint ) throw (RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    sal_Bool bInside = sal_False;
+    if ( m_pListBoxHelper )
+    {
+        Rectangle aRect( m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent ) );
+        aRect.Move(-aRect.TopLeft().X(),-aRect.TopLeft().Y());
+        bInside = aRect.IsInside( VCLPoint( _aPoint ) );
+    }
+    return bInside;
+}
+// -----------------------------------------------------------------------------
+Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException)
+{
+    return Reference< XAccessible >();
+}
+// -----------------------------------------------------------------------------
+awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds(  ) throw (RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    awt::Rectangle aRect;
+    if ( m_pListBoxHelper )
+        aRect = AWTRectangle( m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent ) );
+
+    return aRect;
+}
+// -----------------------------------------------------------------------------
+awt::Point SAL_CALL VCLXAccessibleListItem::getLocation(  ) throw (RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    Point aPoint(0,0);
+    if ( m_pListBoxHelper )
+    {
+        Rectangle aRect = m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
+        aPoint = aRect.TopLeft();
+    }
+    return AWTPoint( aPoint );
+}
+// -----------------------------------------------------------------------------
+awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen(  ) throw (RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    Point aPoint(0,0);
+    if ( m_pListBoxHelper )
+    {
+        Rectangle aRect = m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
+        aPoint = aRect.TopLeft();
+        aPoint += m_pListBoxHelper->GetWindowExtentsRelative( NULL ).TopLeft();
+    }
+    return AWTPoint( aPoint );
+}
+// -----------------------------------------------------------------------------
+awt::Size SAL_CALL VCLXAccessibleListItem::getSize(  ) throw (RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    Size aSize;
+    if ( m_pListBoxHelper )
+        aSize = m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent ).GetSize();
+
+    return AWTSize( aSize );
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL VCLXAccessibleListItem::grabFocus(  ) throw (RuntimeException)
+{
+    // no focus for each item
+}
+// -----------------------------------------------------------------------------
+// XAccessibleText
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL VCLXAccessibleListItem::getCaretPosition() throw (RuntimeException)
+{
+    return -1;
+}
+// -----------------------------------------------------------------------------
+sal_Bool SAL_CALL VCLXAccessibleListItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    return sal_False;
+}
+// -----------------------------------------------------------------------------
+sal_Unicode SAL_CALL VCLXAccessibleListItem::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    return OCommonAccessibleText::getCharacter( nIndex );
+}
+// -----------------------------------------------------------------------------
+Sequence< PropertyValue > SAL_CALL VCLXAccessibleListItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< ::rtl::OUString >& ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    ::rtl::OUString sText( implGetText() );
+    if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    return Sequence< PropertyValue >();
+}
+// -----------------------------------------------------------------------------
+awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    ::rtl::OUString sText( implGetText() );
+    if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    awt::Rectangle aBounds( 0, 0, 0, 0 );
+    if ( m_pListBoxHelper )
+    {
+        Rectangle aCharRect = m_pListBoxHelper->GetEntryCharacterBounds( m_nIndexInParent, nIndex );
+        Rectangle aItemRect = m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
+        aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
+        aBounds = AWTRectangle( aCharRect );
+    }
+
+    return aBounds;
+}
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL VCLXAccessibleListItem::getCharacterCount() throw (RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    return OCommonAccessibleText::getCharacterCount();
+}
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    sal_Int32 nIndex = -1;
+    if ( m_pListBoxHelper )
+    {
+        sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND;
+        Rectangle aItemRect = m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
+        Point aPnt( VCLPoint( aPoint ) );
+        aPnt += aItemRect.TopLeft();
+        sal_Int32 nI = m_pListBoxHelper->GetIndexForPoint( aPnt, nPos );
+        if ( nI != -1 && (sal_uInt16)m_nIndexInParent == nPos )
+            nIndex = nI;
+    }
+    return nIndex;
+}
+// -----------------------------------------------------------------------------
+::rtl::OUString SAL_CALL VCLXAccessibleListItem::getSelectedText() throw (RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    return OCommonAccessibleText::getSelectedText();
+}
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionStart() throw (RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    return OCommonAccessibleText::getSelectionStart();
+}
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionEnd() throw (RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    return OCommonAccessibleText::getSelectionEnd();
+}
+// -----------------------------------------------------------------------------
+sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    return sal_False;
+}
+// -----------------------------------------------------------------------------
+::rtl::OUString SAL_CALL VCLXAccessibleListItem::getText() throw (RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    return OCommonAccessibleText::getText();
+}
+// -----------------------------------------------------------------------------
+::rtl::OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
+}
+// -----------------------------------------------------------------------------
+::com::sun::star::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType );
+}
+// -----------------------------------------------------------------------------
+::com::sun::star::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType );
+}
+// -----------------------------------------------------------------------------
+::com::sun::star::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType );
+}
+// -----------------------------------------------------------------------------
+sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    checkIndex_Impl( nStartIndex, m_sEntryText );
+    checkIndex_Impl( nEndIndex, m_sEntryText );
+
+    sal_Bool bRet = sal_False;
+    if ( m_pListBoxHelper )
+    {
+        Reference< datatransfer::clipboard::XClipboard > xClipboard = m_pListBoxHelper->GetClipboard();
+        if ( xClipboard.is() )
+        {
+            ::rtl::OUString sText( getTextRange( nStartIndex, nEndIndex ) );
+            ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText );
+
+            const sal_uInt32 nRef = Application::ReleaseSolarMutex();
+            xClipboard->setContents( pDataObj, NULL );
+            Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY );
+            if( xFlushableClipboard.is() )
+                xFlushableClipboard->flushClipboard();
+            Application::AcquireSolarMutex( nRef );
+
+            bRet = sal_True;
+        }
+    }
+
+    return bRet;
+}
+// -----------------------------------------------------------------------------
+// XAccessibleEventBroadcaster
+// -----------------------------------------------------------------------------
+void SAL_CALL VCLXAccessibleListItem::addEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
+{
+    if (xListener.is())
+    {
+        if (!m_nClientId)
+            m_nClientId = comphelper::AccessibleEventNotifier::registerClient( );
+        comphelper::AccessibleEventNotifier::addEventListener( m_nClientId, xListener );
+    }
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL VCLXAccessibleListItem::removeEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
+{
+    if ( xListener.is() && m_nClientId )
+    {
+        sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( m_nClientId, xListener );
+        if ( !nListenerCount )
+        {
+            // no listeners anymore
+            // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
+            // and at least to us not firing any events anymore, in case somebody calls
+            // NotifyAccessibleEvent, again
+            if ( m_nClientId )
+            {
+                comphelper::AccessibleEventNotifier::TClientId nId( m_nClientId );
+                m_nClientId = 0;
+                comphelper::AccessibleEventNotifier::revokeClient( nId );
+            }
+        }
+    }
+}
+// -----------------------------------------------------------------------------
+
+
+
+// AF (Oct. 29 2002): Return black as constant foreground color.  This is an
+// initial implementation and has to be substituted by code that determines
+// the color that is actually used.
+sal_Int32 SAL_CALL VCLXAccessibleListItem::getForeground (void)
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    return COL_BLACK;
+}
+
+// AF (Oct. 29 2002): Return white as constant background color.  This is an
+// initial implementation and has to be substituted by code that determines
+// the color that is actually used.
+sal_Int32 SAL_CALL VCLXAccessibleListItem::getBackground (void)
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    return COL_WHITE;
+}
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx
new file mode 100644
index 000000000000..f7e77f3fb8e2
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessiblemenu.cxx
@@ -0,0 +1,255 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+
+// includes --------------------------------------------------------------
+#include <accessibility/standard/vclxaccessiblemenu.hxx>
+
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <vcl/menu.hxx>
+
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::accessibility;
+using namespace ::comphelper;
+
+
+// -----------------------------------------------------------------------------
+// VCLXAccessibleMenu
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleMenu::VCLXAccessibleMenu( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu )
+    :VCLXAccessibleMenuItem( pParent, nItemPos, pMenu )
+{
+}
+
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleMenu::~VCLXAccessibleMenu()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleMenu::IsFocused()
+{
+    sal_Bool bFocused = sal_False;
+
+    if ( IsHighlighted() && !IsChildHighlighted() )
+        bFocused = sal_True;
+
+    return bFocused;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleMenu::IsPopupMenuOpen()
+{
+    sal_Bool bPopupMenuOpen = sal_False;
+
+    if ( m_pParent )
+    {
+        PopupMenu* pPopupMenu = m_pParent->GetPopupMenu( m_pParent->GetItemId( m_nItemPos ) );
+        if ( pPopupMenu && pPopupMenu->IsMenuVisible() )
+            bPopupMenuOpen = sal_True;
+    }
+
+    return bPopupMenuOpen;
+}
+
+// -----------------------------------------------------------------------------
+// XInterface
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleMenu, VCLXAccessibleMenuItem, VCLXAccessibleMenu_BASE )
+
+// -----------------------------------------------------------------------------
+// XTypeProvider
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenu, VCLXAccessibleMenuItem, VCLXAccessibleMenu_BASE )
+
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleMenu::getImplementationName() throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleMenu" );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< ::rtl::OUString > VCLXAccessibleMenu::getSupportedServiceNames() throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames(1);
+    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleMenu" );
+    return aNames;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleContext
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return GetChildCount();
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > VCLXAccessibleMenu::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( i < 0 || i >= GetChildCount() )
+        throw IndexOutOfBoundsException();
+
+    return GetChild( i );
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int16 VCLXAccessibleMenu::getAccessibleRole(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return AccessibleRole::MENU;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleComponent
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > VCLXAccessibleMenu::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return GetChildAt( rPoint );
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleSelection
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nChildIndex < 0 || nChildIndex >= GetChildCount() )
+        throw IndexOutOfBoundsException();
+
+    SelectChild( nChildIndex );
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nChildIndex < 0 || nChildIndex >= GetChildCount() )
+        throw IndexOutOfBoundsException();
+
+    return IsChildSelected( nChildIndex );
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleMenu::clearAccessibleSelection(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    DeSelectAll();
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleMenu::selectAllAccessibleChildren(  ) throw (RuntimeException)
+{
+    // This method makes no sense in a menu, and so does nothing.
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nRet = 0;
+
+    for ( sal_Int32 i = 0, nCount = GetChildCount(); i < nCount; i++ )
+    {
+        if ( IsChildSelected( i ) )
+            ++nRet;
+    }
+
+    return nRet;
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nSelectedChildIndex < 0 || nSelectedChildIndex >= getSelectedAccessibleChildCount() )
+        throw IndexOutOfBoundsException();
+
+    Reference< XAccessible > xChild;
+
+    for ( sal_Int32 i = 0, j = 0, nCount = GetChildCount(); i < nCount; i++ )
+    {
+        if ( IsChildSelected( i ) && ( j++ == nSelectedChildIndex ) )
+        {
+            xChild = GetChild( i );
+            break;
+        }
+    }
+
+    return xChild;
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nChildIndex < 0 || nChildIndex >= GetChildCount() )
+        throw IndexOutOfBoundsException();
+
+    DeSelectAll();
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx
new file mode 100644
index 000000000000..a3e2f8cd6ae4
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessiblemenubar.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+#include <accessibility/standard/vclxaccessiblemenubar.hxx>
+
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
+#include <vcl/menu.hxx>
+
+
+using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star;
+using namespace ::comphelper;
+
+
+// -----------------------------------------------------------------------------
+// class VCLXAccessibleMenuBar
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleMenuBar::VCLXAccessibleMenuBar( Menu* pMenu )
+    :OAccessibleMenuComponent( pMenu )
+{
+    if ( pMenu )
+    {
+        m_pWindow = pMenu->GetWindow();
+
+        if ( m_pWindow )
+            m_pWindow->AddEventListener( LINK( this, VCLXAccessibleMenuBar, WindowEventListener ) );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleMenuBar::~VCLXAccessibleMenuBar()
+{
+    if ( m_pWindow )
+        m_pWindow->RemoveEventListener( LINK( this, VCLXAccessibleMenuBar, WindowEventListener ) );
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleMenuBar::IsFocused()
+{
+    sal_Bool bFocused = sal_False;
+
+    if ( m_pWindow && m_pWindow->HasFocus() && !IsChildHighlighted() )
+        bFocused = sal_True;
+
+    return bFocused;
+}
+
+// -----------------------------------------------------------------------------
+
+IMPL_LINK( VCLXAccessibleMenuBar, WindowEventListener, VclSimpleEvent*, pEvent )
+{
+    DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ), "VCLXAccessibleMenuBar::WindowEventListener: unknown window event!" );
+    if ( pEvent && pEvent->ISA( VclWindowEvent ) )
+    {
+        DBG_ASSERT( ((VclWindowEvent*)pEvent)->GetWindow(), "VCLXAccessibleMenuBar::WindowEventListener: no window!" );
+        if ( !((VclWindowEvent*)pEvent)->GetWindow()->IsAccessibilityEventsSuppressed() || ( pEvent->GetId() == VCLEVENT_OBJECT_DYING ) )
+        {
+            ProcessWindowEvent( *(VclWindowEvent*)pEvent );
+        }
+    }
+    return 0;
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleMenuBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+{
+    switch ( rVclWindowEvent.GetId() )
+    {
+        case VCLEVENT_WINDOW_GETFOCUS:
+        case VCLEVENT_WINDOW_LOSEFOCUS:
+        {
+            SetFocused( rVclWindowEvent.GetId() == VCLEVENT_WINDOW_GETFOCUS );
+        }
+        break;
+        case VCLEVENT_OBJECT_DYING:
+        {
+            if ( m_pWindow )
+            {
+                m_pWindow->RemoveEventListener( LINK( this, VCLXAccessibleMenuBar, WindowEventListener ) );
+                m_pWindow = NULL;
+            }
+        }
+        break;
+        default:
+        {
+        }
+        break;
+    }
+}
+
+// -----------------------------------------------------------------------------
+// XComponent
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleMenuBar::disposing()
+{
+    OAccessibleMenuComponent::disposing();
+
+    if ( m_pWindow )
+    {
+        m_pWindow->RemoveEventListener( LINK( this, VCLXAccessibleMenuBar, WindowEventListener ) );
+        m_pWindow = NULL;
+    }
+}
+
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleMenuBar::getImplementationName() throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleMenuBar" );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< ::rtl::OUString > VCLXAccessibleMenuBar::getSupportedServiceNames() throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames(1);
+    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleMenuBar" );
+    return aNames;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleContext
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nIndexInParent = -1;
+
+    if ( m_pMenu )
+    {
+        Window* pWindow = m_pMenu->GetWindow();
+        if ( pWindow )
+        {
+            Window* pParent = pWindow->GetAccessibleParentWindow();
+            if ( pParent )
+            {
+                for ( sal_uInt16 n = pParent->GetAccessibleChildWindowCount(); n; )
+                {
+                    Window* pChild = pParent->GetAccessibleChildWindow( --n );
+                    if ( pChild == pWindow )
+                    {
+                        nIndexInParent = n;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    return nIndexInParent;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int16 VCLXAccessibleMenuBar::getAccessibleRole(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return AccessibleRole::MENU_BAR;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleExtendedComponent
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleMenuBar::getBackground(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return Application::GetSettings().GetStyleSettings().GetMenuBarColor().GetColor();
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
new file mode 100644
index 000000000000..7332386e4303
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -0,0 +1,607 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+#include <accessibility/standard/vclxaccessiblemenuitem.hxx>
+#include <accessibility/helper/accresmgr.hxx>
+#include <accessibility/helper/accessiblestrings.hrc>
+#include <toolkit/helper/convert.hxx>
+#include <accessibility/helper/characterattributeshelper.hxx>
+#include <comphelper/accessiblekeybindinghelper.hxx>
+#include <com/sun/star/awt/KeyModifier.hpp>
+
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
+#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <comphelper/sequence.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
+#include <vcl/menu.hxx>
+#include <vcl/unohelp2.hxx>
+
+#include <memory>
+
+
+using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star;
+using namespace ::comphelper;
+
+
+// -----------------------------------------------------------------------------
+// class VCLXAccessibleMenuItem
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleMenuItem::VCLXAccessibleMenuItem( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu )
+    :OAccessibleMenuItemComponent( pParent, nItemPos, pMenu )
+{
+}
+
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleMenuItem::~VCLXAccessibleMenuItem()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleMenuItem::IsFocused()
+{
+    return IsHighlighted();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleMenuItem::IsSelected()
+{
+    return IsHighlighted();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleMenuItem::IsChecked()
+{
+    sal_Bool bChecked = sal_False;
+
+    if ( m_pParent )
+    {
+        sal_uInt16 nItemId = m_pParent->GetItemId( m_nItemPos );
+        if ( m_pParent->IsItemChecked( nItemId ) )
+            bChecked = sal_True;
+    }
+
+    return bChecked;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleMenuItem::IsHighlighted()
+{
+    sal_Bool bHighlighted = sal_False;
+
+    if ( m_pParent && m_pParent->IsHighlighted( m_nItemPos ) )
+        bHighlighted = sal_True;
+
+    return bHighlighted;
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleMenuItem::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+{
+    OAccessibleMenuItemComponent::FillAccessibleStateSet( rStateSet );
+
+    rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+
+    if ( IsFocused() )
+        rStateSet.AddState( AccessibleStateType::FOCUSED );
+
+    rStateSet.AddState( AccessibleStateType::SELECTABLE );
+
+    if ( IsSelected() )
+        rStateSet.AddState( AccessibleStateType::SELECTED );
+
+    if ( IsChecked() )
+        rStateSet.AddState( AccessibleStateType::CHECKED );
+}
+
+// -----------------------------------------------------------------------------
+// OCommonAccessibleText
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleMenuItem::implGetText()
+{
+    return m_sItemText;
+}
+
+// -----------------------------------------------------------------------------
+
+Locale VCLXAccessibleMenuItem::implGetLocale()
+{
+    return Application::GetSettings().GetLocale();
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleMenuItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
+{
+    nStartIndex = 0;
+    nEndIndex = 0;
+}
+
+// -----------------------------------------------------------------------------
+// XInterface
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleMenuItem, OAccessibleMenuItemComponent, VCLXAccessibleMenuItem_BASE )
+
+// -----------------------------------------------------------------------------
+// XTypeProvider
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenuItem, OAccessibleMenuItemComponent, VCLXAccessibleMenuItem_BASE )
+
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleMenuItem::getImplementationName() throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleMenuItem" );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< ::rtl::OUString > VCLXAccessibleMenuItem::getSupportedServiceNames() throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames(1);
+    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleMenuItem" );
+    return aNames;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleContext
+// -----------------------------------------------------------------------------
+
+sal_Int16 VCLXAccessibleMenuItem::getAccessibleRole(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return AccessibleRole::MENU_ITEM;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleText
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleMenuItem::getCaretPosition() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return -1;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleMenuItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+
+    OExternalLockGuard aGuard( this );
+
+    if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    return sal_False;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Unicode VCLXAccessibleMenuItem::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getCharacter( nIndex );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Sequence< PropertyValue > aValues;
+    ::rtl::OUString sText( implGetText() );
+
+    if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    Font aFont = Application::GetSettings().GetStyleSettings().GetMenuFont();
+    sal_Int32 nBackColor = getBackground();
+    sal_Int32 nColor = getForeground();
+    ::std::auto_ptr< CharacterAttributesHelper > pHelper( new CharacterAttributesHelper( aFont, nBackColor, nColor ) );
+    aValues = pHelper->GetCharacterAttributes( aRequestedAttributes );
+
+    return aValues;
+}
+
+// -----------------------------------------------------------------------------
+
+awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    awt::Rectangle aBounds( 0, 0, 0, 0 );
+    if ( m_pParent )
+    {
+        sal_uInt16 nItemId = m_pParent->GetItemId( m_nItemPos );
+        Rectangle aItemRect = m_pParent->GetBoundingRectangle( m_nItemPos );
+        Rectangle aCharRect = m_pParent->GetCharacterBounds( nItemId, nIndex );
+        aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
+        aBounds = AWTRectangle( aCharRect );
+    }
+
+    return aBounds;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleMenuItem::getCharacterCount() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getCharacterCount();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nIndex = -1;
+    if ( m_pParent )
+    {
+        sal_uInt16 nItemId = 0;
+        Rectangle aItemRect = m_pParent->GetBoundingRectangle( m_nItemPos );
+        Point aPnt( VCLPoint( aPoint ) );
+        aPnt += aItemRect.TopLeft();
+        sal_Int32 nI = m_pParent->GetIndexForPoint( aPnt, nItemId );
+        if ( nI != -1 && m_pParent->GetItemId( m_nItemPos ) == nItemId )
+            nIndex = nI;
+    }
+
+    return nIndex;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleMenuItem::getSelectedText() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getSelectedText();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getSelectionStart();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getSelectionEnd();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    return sal_False;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleMenuItem::getText() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getText();
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
+}
+
+// -----------------------------------------------------------------------------
+
+::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType );
+}
+
+// -----------------------------------------------------------------------------
+
+::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType );
+}
+
+// -----------------------------------------------------------------------------
+
+::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType );
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Bool bReturn = sal_False;
+
+    if ( m_pParent )
+    {
+        Window* pWindow = m_pParent->GetWindow();
+        if ( pWindow )
+        {
+            Reference< datatransfer::clipboard::XClipboard > xClipboard = pWindow->GetClipboard();
+            if ( xClipboard.is() )
+            {
+                ::rtl::OUString sText( getTextRange( nStartIndex, nEndIndex ) );
+
+                ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText );
+                const sal_uInt32 nRef = Application::ReleaseSolarMutex();
+                xClipboard->setContents( pDataObj, NULL );
+
+                Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY );
+                if( xFlushableClipboard.is() )
+                    xFlushableClipboard->flushClipboard();
+
+                Application::AcquireSolarMutex( nRef );
+
+                bReturn = sal_True;
+            }
+        }
+    }
+
+    return bReturn;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleAction
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleMenuItem::getAccessibleActionCount( ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return 1;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleMenuItem::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    Click();
+
+    return sal_True;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleMenuItem::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) );
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper();
+    Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
+
+    if ( m_pParent )
+    {
+        // create auto mnemonics
+        if ( Application::GetSettings().GetStyleSettings().GetAutoMnemonic() && !( m_pParent->GetMenuFlags() & MENU_FLAG_NOAUTOMNEMONICS ) )
+            m_pParent->CreateAutoMnemonics();
+
+        // activation key
+        KeyEvent aKeyEvent = m_pParent->GetActivationKey( m_pParent->GetItemId( m_nItemPos ) );
+        KeyCode aKeyCode = aKeyEvent.GetKeyCode();
+        Sequence< awt::KeyStroke > aSeq1(1);
+        aSeq1[0].Modifiers = 0;
+        Reference< XAccessible > xParent( getAccessibleParent() );
+        if ( xParent.is() )
+        {
+            Reference< XAccessibleContext > xParentContext( xParent->getAccessibleContext() );
+            if ( xParentContext.is() && xParentContext->getAccessibleRole() == AccessibleRole::MENU_BAR )
+                aSeq1[0].Modifiers |= awt::KeyModifier::MOD2;
+        }
+        aSeq1[0].KeyCode = aKeyCode.GetCode();
+        aSeq1[0].KeyChar = aKeyEvent.GetCharCode();
+        aSeq1[0].KeyFunc = static_cast< sal_Int16 >( aKeyCode.GetFunction() );
+        pKeyBindingHelper->AddKeyBinding( aSeq1 );
+
+        // complete menu activation key sequence
+        Sequence< awt::KeyStroke > aSeq;
+        if ( xParent.is() )
+        {
+            Reference< XAccessibleContext > xParentContext( xParent->getAccessibleContext() );
+            if ( xParentContext.is() && xParentContext->getAccessibleRole() == AccessibleRole::MENU )
+            {
+                Reference< XAccessibleAction > xAction( xParentContext, UNO_QUERY );
+                if ( xAction.is() && xAction->getAccessibleActionCount() > 0 )
+                {
+                    Reference< XAccessibleKeyBinding > xKeyB( xAction->getAccessibleActionKeyBinding( 0 ) );
+                    if ( xKeyB.is() && xKeyB->getAccessibleKeyBindingCount() > 1 )
+                        aSeq = xKeyB->getAccessibleKeyBinding( 1 );
+                }
+            }
+        }
+        Sequence< awt::KeyStroke > aSeq2 = ::comphelper::concatSequences( aSeq, aSeq1 );
+        pKeyBindingHelper->AddKeyBinding( aSeq2 );
+
+        // accelerator key
+        KeyCode aAccelKeyCode = m_pParent->GetAccelKey( m_pParent->GetItemId( m_nItemPos ) );
+        if ( aAccelKeyCode.GetCode() != 0 )
+        {
+            Sequence< awt::KeyStroke > aSeq3(1);
+            aSeq3[0].Modifiers = 0;
+            if ( aAccelKeyCode.IsShift() )
+                aSeq3[0].Modifiers |= awt::KeyModifier::SHIFT;
+            if ( aAccelKeyCode.IsMod1() )
+                aSeq3[0].Modifiers |= awt::KeyModifier::MOD1;
+            if ( aAccelKeyCode.IsMod2() )
+                aSeq3[0].Modifiers |= awt::KeyModifier::MOD2;
+            if ( aAccelKeyCode.IsMod3() )
+                aSeq3[0].Modifiers |= awt::KeyModifier::MOD3;
+            aSeq3[0].KeyCode = aAccelKeyCode.GetCode();
+            aSeq3[0].KeyFunc = static_cast< sal_Int16 >( aAccelKeyCode.GetFunction() );
+            pKeyBindingHelper->AddKeyBinding( aSeq3 );
+        }
+    }
+
+    return xKeyBinding;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleValue
+// -----------------------------------------------------------------------------
+
+Any VCLXAccessibleMenuItem::getCurrentValue(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Any aValue;
+    if ( IsSelected() )
+        aValue <<= (sal_Int32) 1;
+    else
+        aValue <<= (sal_Int32) 0;
+
+    return aValue;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleMenuItem::setCurrentValue( const Any& aNumber ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Bool bReturn = sal_False;
+    sal_Int32 nValue = 0;
+    OSL_VERIFY( aNumber >>= nValue );
+
+    if ( nValue <= 0 )
+    {
+        DeSelect();
+        bReturn = sal_True;
+    }
+    else if ( nValue >= 1 )
+    {
+        Select();
+        bReturn = sal_True;
+    }
+
+    return bReturn;
+}
+
+// -----------------------------------------------------------------------------
+
+Any VCLXAccessibleMenuItem::getMaximumValue(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Any aValue;
+    aValue <<= (sal_Int32) 1;
+
+    return aValue;
+}
+
+// -----------------------------------------------------------------------------
+
+Any VCLXAccessibleMenuItem::getMinimumValue(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Any aValue;
+    aValue <<= (sal_Int32) 0;
+
+    return aValue;
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx
new file mode 100644
index 000000000000..07c8c0f2a3d4
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessiblemenuseparator.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_accessibility.hxx"
+#include <accessibility/standard/vclxaccessiblemenuseparator.hxx>
+
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+
+
+using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star;
+using namespace ::comphelper;
+
+
+// -----------------------------------------------------------------------------
+// class VCLXAccessibleMenuSeparator
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleMenuSeparator::VCLXAccessibleMenuSeparator( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu )
+    :OAccessibleMenuItemComponent( pParent, nItemPos, pMenu )
+{
+}
+
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleMenuSeparator::~VCLXAccessibleMenuSeparator()
+{
+}
+
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleMenuSeparator::getImplementationName() throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleMenuSeparator" );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< ::rtl::OUString > VCLXAccessibleMenuSeparator::getSupportedServiceNames() throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames(1);
+    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleMenuSeparator" );
+    return aNames;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleContext
+// -----------------------------------------------------------------------------
+
+sal_Int16 VCLXAccessibleMenuSeparator::getAccessibleRole(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return AccessibleRole::SEPARATOR;
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx
new file mode 100644
index 000000000000..328e015c60e5
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessiblepopupmenu.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+#include <accessibility/standard/vclxaccessiblepopupmenu.hxx>
+
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <vcl/svapp.hxx>
+
+using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star::uno;
+using namespace ::comphelper;
+
+
+// -----------------------------------------------------------------------------
+// class VCLXAccessiblePopupMenu
+// -----------------------------------------------------------------------------
+
+VCLXAccessiblePopupMenu::VCLXAccessiblePopupMenu( Menu* pMenu )
+    :OAccessibleMenuComponent( pMenu )
+{
+}
+
+// -----------------------------------------------------------------------------
+
+VCLXAccessiblePopupMenu::~VCLXAccessiblePopupMenu()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessiblePopupMenu::IsFocused()
+{
+    return !IsChildHighlighted();
+}
+
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessiblePopupMenu::getImplementationName() throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessiblePopupMenu" );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< ::rtl::OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames() throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames(1);
+    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessiblePopupMenu" );
+    return aNames;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleContext
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessiblePopupMenu::getAccessibleIndexInParent(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return 0;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int16 VCLXAccessiblePopupMenu::getAccessibleRole(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return AccessibleRole::POPUP_MENU;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleExtendedComponent
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessiblePopupMenu::getBackground(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return Application::GetSettings().GetStyleSettings().GetMenuColor().GetColor();
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
new file mode 100644
index 000000000000..76940967fcce
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+
+// includes --------------------------------------------------------------
+#include <accessibility/standard/vclxaccessibleradiobutton.hxx>
+
+#include <toolkit/awt/vclxwindows.hxx>
+#include <accessibility/helper/accresmgr.hxx>
+#include <accessibility/helper/accessiblestrings.hrc>
+
+#include <unotools/accessiblerelationsethelper.hxx>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <comphelper/accessiblekeybindinghelper.hxx>
+#include <com/sun/star/awt/KeyModifier.hpp>
+#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <cppuhelper/typeprovider.hxx>
+#include <comphelper/sequence.hxx>
+#include <vcl/window.hxx>
+#include <vcl/button.hxx>
+
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::accessibility;
+using namespace ::comphelper;
+
+
+// -----------------------------------------------------------------------------
+// VCLXAccessibleRadioButton
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleRadioButton::VCLXAccessibleRadioButton( VCLXWindow* pVCLWindow )
+    :VCLXAccessibleTextComponent( pVCLWindow )
+{
+}
+
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleRadioButton::~VCLXAccessibleRadioButton()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleRadioButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+{
+    switch ( rVclWindowEvent.GetId() )
+    {
+        case VCLEVENT_RADIOBUTTON_TOGGLE:
+        {
+            Any aOldValue;
+            Any aNewValue;
+
+            VCLXRadioButton* pVCLXRadioButton = static_cast< VCLXRadioButton* >( GetVCLXWindow() );
+            if ( pVCLXRadioButton && pVCLXRadioButton->getState() )
+                aNewValue <<= AccessibleStateType::CHECKED;
+            else
+                aOldValue <<= AccessibleStateType::CHECKED;
+
+            NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+        }
+        break;
+        default:
+            VCLXAccessibleTextComponent::ProcessWindowEvent( rVclWindowEvent );
+   }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleRadioButton::FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet )
+{
+    VCLXAccessibleTextComponent::FillAccessibleRelationSet( rRelationSet );
+
+    RadioButton* pRadioButton = dynamic_cast< RadioButton* >( GetWindow() );
+    if ( pRadioButton )
+    {
+        ::std::vector< RadioButton* > aGroup;
+        pRadioButton->GetRadioButtonGroup( aGroup, true );
+        if ( !aGroup.empty() )
+        {
+            sal_Int32 i = 0;
+            Sequence< Reference< XInterface > > aSequence( static_cast< sal_Int32 >( aGroup.size() ) );
+            ::std::vector< RadioButton* >::const_iterator aEndItr = aGroup.end();
+            for ( ::std::vector< RadioButton* >::const_iterator aItr = aGroup.begin(); aItr < aEndItr; ++aItr )
+            {
+                aSequence[i++] = (*aItr)->GetAccessible();
+            }
+            rRelationSet.AddRelation( AccessibleRelation( AccessibleRelationType::MEMBER_OF, aSequence ) );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleRadioButton::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+{
+    VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet );
+
+    VCLXRadioButton* pVCLXRadioButton = static_cast< VCLXRadioButton* >( GetVCLXWindow() );
+    if ( pVCLXRadioButton )
+    {
+        rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+        if ( pVCLXRadioButton->getState() )
+            rStateSet.AddState( AccessibleStateType::CHECKED );
+    }
+}
+
+// -----------------------------------------------------------------------------
+// XInterface
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleRadioButton, VCLXAccessibleTextComponent, VCLXAccessibleRadioButton_BASE )
+
+// -----------------------------------------------------------------------------
+// XTypeProvider
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleRadioButton, VCLXAccessibleTextComponent, VCLXAccessibleRadioButton_BASE )
+
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleRadioButton::getImplementationName() throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleRadioButton" );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< ::rtl::OUString > VCLXAccessibleRadioButton::getSupportedServiceNames() throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames(1);
+    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleRadioButton" );
+    return aNames;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleAction
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleRadioButton::getAccessibleActionCount( ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return 1;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleRadioButton::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    VCLXRadioButton* pVCLXRadioButton = static_cast< VCLXRadioButton* >( GetVCLXWindow() );
+    if ( pVCLXRadioButton && !pVCLXRadioButton->getState() )
+        pVCLXRadioButton->setState( sal_True );
+
+    return sal_True;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) );
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper();
+    Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper;
+
+    Window* pWindow = GetWindow();
+    if ( pWindow )
+    {
+        KeyEvent aKeyEvent = pWindow->GetActivationKey();
+        KeyCode aKeyCode = aKeyEvent.GetKeyCode();
+        if ( aKeyCode.GetCode() != 0 )
+        {
+            awt::KeyStroke aKeyStroke;
+            aKeyStroke.Modifiers = 0;
+            if ( aKeyCode.IsShift() )
+                aKeyStroke.Modifiers |= awt::KeyModifier::SHIFT;
+            if ( aKeyCode.IsMod1() )
+                aKeyStroke.Modifiers |= awt::KeyModifier::MOD1;
+            if ( aKeyCode.IsMod2() )
+                aKeyStroke.Modifiers |= awt::KeyModifier::MOD2;
+            if ( aKeyCode.IsMod3() )
+                aKeyStroke.Modifiers |= awt::KeyModifier::MOD3;
+            aKeyStroke.KeyCode = aKeyCode.GetCode();
+            aKeyStroke.KeyChar = aKeyEvent.GetCharCode();
+            aKeyStroke.KeyFunc = static_cast< sal_Int16 >( aKeyCode.GetFunction() );
+            pKeyBindingHelper->AddKeyBinding( aKeyStroke );
+        }
+    }
+
+    return xKeyBinding;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleValue
+// -----------------------------------------------------------------------------
+
+Any VCLXAccessibleRadioButton::getCurrentValue(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Any aValue;
+
+    VCLXRadioButton* pVCLXRadioButton = static_cast< VCLXRadioButton* >( GetVCLXWindow() );
+    if ( pVCLXRadioButton )
+        aValue <<= (sal_Int32) pVCLXRadioButton->getState();
+
+    return aValue;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Bool bReturn = sal_False;
+
+    VCLXRadioButton* pVCLXRadioButton = static_cast< VCLXRadioButton* >( GetVCLXWindow() );
+    if ( pVCLXRadioButton )
+    {
+        sal_Int32 nValue = 0;
+        OSL_VERIFY( aNumber >>= nValue );
+
+        if ( nValue < 0 )
+            nValue = 0;
+        else if ( nValue > 1 )
+            nValue = 1;
+
+        pVCLXRadioButton->setState( (sal_Bool) nValue );
+        bReturn = sal_True;
+    }
+
+    return bReturn;
+}
+
+// -----------------------------------------------------------------------------
+
+Any VCLXAccessibleRadioButton::getMaximumValue(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Any aValue;
+    aValue <<= (sal_Int32) 1;
+
+    return aValue;
+}
+
+// -----------------------------------------------------------------------------
+
+Any VCLXAccessibleRadioButton::getMinimumValue(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Any aValue;
+    aValue <<= (sal_Int32) 0;
+
+    return aValue;
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
new file mode 100644
index 000000000000..9bd9cf45f94b
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+
+// includes --------------------------------------------------------------
+#include <accessibility/standard/vclxaccessiblescrollbar.hxx>
+
+#include <toolkit/awt/vclxwindows.hxx>
+#include <accessibility/helper/accresmgr.hxx>
+#include <accessibility/helper/accessiblestrings.hrc>
+
+#include <unotools/accessiblestatesethelper.hxx>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/awt/ScrollBarOrientation.hpp>
+#include <cppuhelper/typeprovider.hxx>
+#include <comphelper/sequence.hxx>
+#include <vcl/scrbar.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::accessibility;
+using namespace ::comphelper;
+
+
+// -----------------------------------------------------------------------------
+// VCLXAccessibleScrollBar
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleScrollBar::VCLXAccessibleScrollBar( VCLXWindow* pVCLWindow )
+    :VCLXAccessibleComponent( pVCLWindow )
+{
+}
+
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleScrollBar::~VCLXAccessibleScrollBar()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+{
+    switch ( rVclWindowEvent.GetId() )
+    {
+        case VCLEVENT_SCROLLBAR_SCROLL:
+        {
+            NotifyAccessibleEvent( AccessibleEventId::VALUE_CHANGED, Any(), Any() );
+        }
+        break;
+        default:
+            VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
+   }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleScrollBar::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+{
+    VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet );
+
+    VCLXScrollBar* pVCLXScrollBar = static_cast< VCLXScrollBar* >( GetVCLXWindow() );
+    if ( pVCLXScrollBar )
+    {
+        rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+        if ( pVCLXScrollBar->getOrientation() == ScrollBarOrientation::HORIZONTAL )
+            rStateSet.AddState( AccessibleStateType::HORIZONTAL );
+        else if ( pVCLXScrollBar->getOrientation() == ScrollBarOrientation::VERTICAL )
+            rStateSet.AddState( AccessibleStateType::VERTICAL );
+    }
+}
+
+// -----------------------------------------------------------------------------
+// XInterface
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleScrollBar, VCLXAccessibleComponent, VCLXAccessibleScrollBar_BASE )
+
+// -----------------------------------------------------------------------------
+// XTypeProvider
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleScrollBar, VCLXAccessibleComponent, VCLXAccessibleScrollBar_BASE )
+
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleScrollBar::getImplementationName() throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleScrollBar" );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< ::rtl::OUString > VCLXAccessibleScrollBar::getSupportedServiceNames() throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames(1);
+    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleScrollBar" );
+    return aNames;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleAction
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleScrollBar::getAccessibleActionCount( ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return 4;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    sal_Bool bReturn = sal_False;
+    ScrollBar* pScrollBar = static_cast< ScrollBar* >( GetWindow() );
+    if ( pScrollBar )
+    {
+        ScrollType eScrollType;
+        switch ( nIndex )
+        {
+            case 0:     eScrollType = SCROLL_LINEUP;    break;
+            case 1:     eScrollType = SCROLL_LINEDOWN;  break;
+            case 2:     eScrollType = SCROLL_PAGEUP;    break;
+            case 3:     eScrollType = SCROLL_PAGEDOWN;  break;
+            default:    eScrollType = SCROLL_DONTKNOW;  break;
+        }
+        if ( pScrollBar->DoScrollAction( eScrollType ) )
+            bReturn = sal_True;
+    }
+
+    return bReturn;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    ::rtl::OUString sDescription;
+
+    switch ( nIndex )
+    {
+        case 0:     sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_DECLINE ) );      break;
+        case 1:     sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_INCLINE ) );      break;
+        case 2:     sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_DECBLOCK ) );     break;
+        case 3:     sDescription = ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_INCBLOCK ) );     break;
+        default:                                                                                        break;
+    }
+
+    return sDescription;
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessibleKeyBinding > VCLXAccessibleScrollBar::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    return Reference< XAccessibleKeyBinding >();
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleValue
+// -----------------------------------------------------------------------------
+
+Any VCLXAccessibleScrollBar::getCurrentValue(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Any aValue;
+
+    VCLXScrollBar* pVCLXScrollBar = static_cast< VCLXScrollBar* >( GetVCLXWindow() );
+    if ( pVCLXScrollBar )
+        aValue <<= (sal_Int32) pVCLXScrollBar->getValue();
+
+    return aValue;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Bool bReturn = sal_False;
+
+    VCLXScrollBar* pVCLXScrollBar = static_cast< VCLXScrollBar* >( GetVCLXWindow() );
+    if ( pVCLXScrollBar )
+    {
+        sal_Int32 nValue = 0, nValueMin = 0, nValueMax = 0;
+        OSL_VERIFY( aNumber >>= nValue );
+        OSL_VERIFY( getMinimumValue() >>= nValueMin );
+        OSL_VERIFY( getMaximumValue() >>= nValueMax );
+
+        if ( nValue < nValueMin )
+            nValue = nValueMin;
+        else if ( nValue > nValueMax )
+            nValue = nValueMax;
+
+        pVCLXScrollBar->setValue( nValue );
+        bReturn = sal_True;
+    }
+
+    return bReturn;
+}
+
+// -----------------------------------------------------------------------------
+
+Any VCLXAccessibleScrollBar::getMaximumValue(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Any aValue;
+
+    VCLXScrollBar* pVCLXScrollBar = static_cast< VCLXScrollBar* >( GetVCLXWindow() );
+    if ( pVCLXScrollBar )
+        aValue <<= (sal_Int32) pVCLXScrollBar->getMaximum();
+
+    return aValue;
+}
+
+// -----------------------------------------------------------------------------
+
+Any VCLXAccessibleScrollBar::getMinimumValue(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Any aValue;
+    aValue <<= (sal_Int32) 0;
+
+    return aValue;
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
new file mode 100644
index 000000000000..1e1d7b0ef640
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+#include <accessibility/standard/vclxaccessiblestatusbar.hxx>
+#include <accessibility/standard/vclxaccessiblestatusbaritem.hxx>
+#include <toolkit/helper/convert.hxx>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <vcl/status.hxx>
+
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::accessibility;
+using namespace ::comphelper;
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleStatusBar
+//  ----------------------------------------------------
+
+VCLXAccessibleStatusBar::VCLXAccessibleStatusBar( VCLXWindow* pVCLXWindow )
+    :VCLXAccessibleComponent( pVCLXWindow )
+{
+    m_pStatusBar = static_cast< StatusBar* >( GetWindow() );
+
+    if ( m_pStatusBar )
+        m_aAccessibleChildren.assign( m_pStatusBar->GetItemCount(), Reference< XAccessible >() );
+}
+
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleStatusBar::~VCLXAccessibleStatusBar()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleStatusBar::UpdateShowing( sal_Int32 i, sal_Bool bShowing )
+{
+    if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+    {
+        Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+        if ( xChild.is() )
+        {
+            VCLXAccessibleStatusBarItem* pVCLXAccessibleStatusBarItem = static_cast< VCLXAccessibleStatusBarItem* >( xChild.get() );
+            if ( pVCLXAccessibleStatusBarItem )
+                pVCLXAccessibleStatusBarItem->SetShowing( bShowing );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleStatusBar::UpdateItemName( sal_Int32 i )
+{
+    if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+    {
+        Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+        if ( xChild.is() )
+        {
+            VCLXAccessibleStatusBarItem* pVCLXAccessibleStatusBarItem = static_cast< VCLXAccessibleStatusBarItem* >( xChild.get() );
+            if ( pVCLXAccessibleStatusBarItem )
+            {
+                ::rtl::OUString sItemName = pVCLXAccessibleStatusBarItem->GetItemName();
+                pVCLXAccessibleStatusBarItem->SetItemName( sItemName );
+            }
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleStatusBar::UpdateItemText( sal_Int32 i )
+{
+    if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+    {
+        Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+        if ( xChild.is() )
+        {
+            VCLXAccessibleStatusBarItem* pVCLXAccessibleStatusBarItem = static_cast< VCLXAccessibleStatusBarItem* >( xChild.get() );
+            if ( pVCLXAccessibleStatusBarItem )
+            {
+                ::rtl::OUString sItemText = pVCLXAccessibleStatusBarItem->GetItemText();
+                pVCLXAccessibleStatusBarItem->SetItemText( sItemText );
+            }
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleStatusBar::InsertChild( sal_Int32 i )
+{
+    if ( i >= 0 && i <= (sal_Int32)m_aAccessibleChildren.size() )
+    {
+        // insert entry in child list
+        m_aAccessibleChildren.insert( m_aAccessibleChildren.begin() + i, Reference< XAccessible >() );
+
+        // send accessible child event
+        Reference< XAccessible > xChild( getAccessibleChild( i ) );
+        if ( xChild.is() )
+        {
+            Any aOldValue, aNewValue;
+            aNewValue <<= xChild;
+            NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldValue, aNewValue );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleStatusBar::RemoveChild( sal_Int32 i )
+{
+    if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+    {
+        // get the accessible of the removed page
+        Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+
+        // remove entry in child list
+        m_aAccessibleChildren.erase( m_aAccessibleChildren.begin() + i );
+
+        // send accessible child event
+        if ( xChild.is() )
+        {
+            Any aOldValue, aNewValue;
+            aOldValue <<= xChild;
+            NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldValue, aNewValue );
+
+            Reference< XComponent > xComponent( xChild, UNO_QUERY );
+            if ( xComponent.is() )
+                xComponent->dispose();
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+{
+    switch ( rVclWindowEvent.GetId() )
+    {
+        case VCLEVENT_STATUSBAR_ITEMADDED:
+        {
+            if ( m_pStatusBar )
+            {
+                sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
+                sal_uInt16 nItemPos = m_pStatusBar->GetItemPos( nItemId );
+                InsertChild( nItemPos );
+            }
+        }
+        break;
+        case VCLEVENT_STATUSBAR_ITEMREMOVED:
+        {
+            if ( m_pStatusBar )
+            {
+                sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
+                for ( sal_Int32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i )
+                {
+                    Reference< XAccessible > xChild( getAccessibleChild( i ) );
+                    if ( xChild.is() )
+                    {
+                        VCLXAccessibleStatusBarItem* pVCLXAccessibleStatusBarItem = static_cast< VCLXAccessibleStatusBarItem* >( xChild.get() );
+                        if ( pVCLXAccessibleStatusBarItem && pVCLXAccessibleStatusBarItem->GetItemId() == nItemId )
+                        {
+                            RemoveChild( i );
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        break;
+        case VCLEVENT_STATUSBAR_ALLITEMSREMOVED:
+        {
+            for ( sal_Int32 i = m_aAccessibleChildren.size() - 1; i >= 0; --i )
+                RemoveChild( i );
+        }
+        break;
+        case VCLEVENT_STATUSBAR_SHOWITEM:
+        case VCLEVENT_STATUSBAR_HIDEITEM:
+        {
+            if ( m_pStatusBar )
+            {
+                sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
+                sal_uInt16 nItemPos = m_pStatusBar->GetItemPos( nItemId );
+                UpdateShowing( nItemPos, rVclWindowEvent.GetId() == VCLEVENT_STATUSBAR_SHOWITEM );
+            }
+        }
+        break;
+        case VCLEVENT_STATUSBAR_SHOWALLITEMS:
+        case VCLEVENT_STATUSBAR_HIDEALLITEMS:
+        {
+            for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+                UpdateShowing( i, rVclWindowEvent.GetId() == VCLEVENT_STATUSBAR_SHOWALLITEMS );
+        }
+        break;
+        case VCLEVENT_STATUSBAR_NAMECHANGED:
+        {
+            if ( m_pStatusBar )
+            {
+                sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
+                sal_uInt16 nItemPos = m_pStatusBar->GetItemPos( nItemId );
+                UpdateItemName( nItemPos );
+            }
+        }
+        break;
+        case VCLEVENT_STATUSBAR_DRAWITEM:
+        {
+            if ( m_pStatusBar )
+            {
+                sal_uInt16 nItemId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
+                sal_uInt16 nItemPos = m_pStatusBar->GetItemPos( nItemId );
+                UpdateItemText( nItemPos );
+            }
+        }
+        break;
+        case VCLEVENT_OBJECT_DYING:
+        {
+            if ( m_pStatusBar )
+            {
+                m_pStatusBar = NULL;
+
+                // dispose all children
+                for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+                {
+                    Reference< XComponent > xComponent( m_aAccessibleChildren[i], UNO_QUERY );
+                    if ( xComponent.is() )
+                        xComponent->dispose();
+                }
+                m_aAccessibleChildren.clear();
+            }
+
+            VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
+        }
+        break;
+        default:
+            VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
+   }
+}
+
+// -----------------------------------------------------------------------------
+// XComponent
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleStatusBar::disposing()
+{
+    VCLXAccessibleComponent::disposing();
+
+    if ( m_pStatusBar )
+    {
+        m_pStatusBar = NULL;
+
+        // dispose all children
+        for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+        {
+            Reference< XComponent > xComponent( m_aAccessibleChildren[i], UNO_QUERY );
+            if ( xComponent.is() )
+                xComponent->dispose();
+        }
+        m_aAccessibleChildren.clear();
+    }
+}
+
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleStatusBar::getImplementationName() throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleStatusBar" );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< ::rtl::OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames(1);
+    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleStatusBar" );
+    return aNames;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleContext
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return m_aAccessibleChildren.size();
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( i < 0 || i >= getAccessibleChildCount() )
+        throw IndexOutOfBoundsException();
+
+    Reference< XAccessible > xChild = m_aAccessibleChildren[i];
+    if ( !xChild.is() )
+    {
+        if ( m_pStatusBar )
+        {
+            sal_uInt16 nItemId = m_pStatusBar->GetItemId( (sal_uInt16)i );
+
+            xChild = new VCLXAccessibleStatusBarItem( m_pStatusBar, nItemId );
+
+            // insert into status bar item list
+            m_aAccessibleChildren[i] = xChild;
+        }
+    }
+
+    return xChild;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleComponent
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Reference< XAccessible > xChild;
+    if ( m_pStatusBar )
+    {
+        sal_uInt16 nItemId = m_pStatusBar->GetItemId( VCLPoint( rPoint ) );
+        sal_Int32 nItemPos = m_pStatusBar->GetItemPos( nItemId );
+        if ( nItemPos >= 0 && nItemPos < (sal_Int32)m_aAccessibleChildren.size() )
+            xChild = getAccessibleChild( nItemPos );
+    }
+
+    return xChild;
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
new file mode 100644
index 000000000000..c3badc50bdbf
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -0,0 +1,629 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+#include <accessibility/standard/vclxaccessiblestatusbaritem.hxx>
+#include <toolkit/helper/externallock.hxx>
+#include <toolkit/helper/convert.hxx>
+#include <accessibility/helper/characterattributeshelper.hxx>
+
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
+#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
+
+#include <unotools/accessiblestatesethelper.hxx>
+#include <unotools/accessiblerelationsethelper.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/unohelp2.hxx>
+#include <vcl/status.hxx>
+#include <vcl/controllayout.hxx>
+
+#include <memory>
+
+
+using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star;
+using namespace ::comphelper;
+
+
+// -----------------------------------------------------------------------------
+// class VCLXAccessibleStatusBarItem
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleStatusBarItem::VCLXAccessibleStatusBarItem( StatusBar* pStatusBar, sal_uInt16 nItemId )
+    :AccessibleTextHelper_BASE( new VCLExternalSolarLock() )
+    ,m_pStatusBar( pStatusBar )
+    ,m_nItemId( nItemId )
+{
+    m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() );
+
+    m_sItemName = GetItemName();
+    m_sItemText = GetItemText();
+    m_bShowing  = IsShowing();
+}
+
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleStatusBarItem::~VCLXAccessibleStatusBarItem()
+{
+    delete m_pExternalLock;
+    m_pExternalLock = NULL;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleStatusBarItem::IsShowing()
+{
+    sal_Bool bShowing = sal_False;
+
+    if ( m_pStatusBar )
+        bShowing = m_pStatusBar->IsItemVisible( m_nItemId );
+
+    return bShowing;
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleStatusBarItem::SetShowing( sal_Bool bShowing )
+{
+    if ( m_bShowing != bShowing )
+    {
+        Any aOldValue, aNewValue;
+        if ( m_bShowing )
+            aOldValue <<= AccessibleStateType::SHOWING;
+        else
+            aNewValue <<= AccessibleStateType::SHOWING;
+        m_bShowing = bShowing;
+        NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleStatusBarItem::SetItemName( const ::rtl::OUString& sItemName )
+{
+    if ( !m_sItemName.equals( sItemName ) )
+    {
+        Any aOldValue, aNewValue;
+        aOldValue <<= m_sItemName;
+        aNewValue <<= sItemName;
+        m_sItemName = sItemName;
+        NotifyAccessibleEvent( AccessibleEventId::NAME_CHANGED, aOldValue, aNewValue );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleStatusBarItem::GetItemName()
+{
+    ::rtl::OUString sName;
+    if ( m_pStatusBar )
+        sName = m_pStatusBar->GetAccessibleName( m_nItemId );
+
+    return sName;
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleStatusBarItem::SetItemText( const ::rtl::OUString& sItemText )
+{
+    Any aOldValue, aNewValue;
+    if ( implInitTextChangedEvent( m_sItemText, sItemText, aOldValue, aNewValue ) )
+    {
+        m_sItemText = sItemText;
+        NotifyAccessibleEvent( AccessibleEventId::TEXT_CHANGED, aOldValue, aNewValue );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleStatusBarItem::GetItemText()
+{
+    ::rtl::OUString sText;
+    ::vcl::ControlLayoutData aLayoutData;
+    if ( m_pStatusBar )
+    {
+        Rectangle aItemRect = m_pStatusBar->GetItemRect( m_nItemId );
+        m_pStatusBar->RecordLayoutData( &aLayoutData, aItemRect );
+        sText = aLayoutData.m_aDisplayText;
+    }
+
+    return sText;
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleStatusBarItem::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+{
+    rStateSet.AddState( AccessibleStateType::ENABLED );
+    rStateSet.AddState( AccessibleStateType::SENSITIVE );
+
+    rStateSet.AddState( AccessibleStateType::VISIBLE );
+
+    if ( IsShowing() )
+        rStateSet.AddState( AccessibleStateType::SHOWING );
+}
+
+// -----------------------------------------------------------------------------
+// OCommonAccessibleComponent
+// -----------------------------------------------------------------------------
+
+awt::Rectangle VCLXAccessibleStatusBarItem::implGetBounds() throw (RuntimeException)
+{
+    awt::Rectangle aBounds( 0, 0, 0, 0 );
+
+    if ( m_pStatusBar )
+        aBounds = AWTRectangle( m_pStatusBar->GetItemRect( m_nItemId ) );
+
+    return aBounds;
+}
+
+// -----------------------------------------------------------------------------
+// OCommonAccessibleText
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleStatusBarItem::implGetText()
+{
+    return GetItemText();
+}
+
+// -----------------------------------------------------------------------------
+
+lang::Locale VCLXAccessibleStatusBarItem::implGetLocale()
+{
+    return Application::GetSettings().GetLocale();
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleStatusBarItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
+{
+    nStartIndex = 0;
+    nEndIndex = 0;
+}
+
+// -----------------------------------------------------------------------------
+// XInterface
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleStatusBarItem, AccessibleTextHelper_BASE, VCLXAccessibleStatusBarItem_BASE )
+
+// -----------------------------------------------------------------------------
+// XTypeProvider
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleStatusBarItem, AccessibleTextHelper_BASE, VCLXAccessibleStatusBarItem_BASE )
+
+// -----------------------------------------------------------------------------
+// XComponent
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleStatusBarItem::disposing()
+{
+    AccessibleTextHelper_BASE::disposing();
+
+    m_pStatusBar = NULL;
+    m_sItemName = ::rtl::OUString();
+    m_sItemText = ::rtl::OUString();
+}
+
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleStatusBarItem::getImplementationName() throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleStatusBarItem" );
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleStatusBarItem::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() );
+    const ::rtl::OUString* pNames = aNames.getConstArray();
+    const ::rtl::OUString* pEnd = pNames + aNames.getLength();
+    for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames )
+        ;
+
+    return pNames != pEnd;
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< ::rtl::OUString > VCLXAccessibleStatusBarItem::getSupportedServiceNames() throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames(1);
+    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleStatusBarItem" );
+    return aNames;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessible
+// -----------------------------------------------------------------------------
+
+Reference< XAccessibleContext > VCLXAccessibleStatusBarItem::getAccessibleContext(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return this;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleContext
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return 0;
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( i < 0 || i >= getAccessibleChildCount() )
+        throw IndexOutOfBoundsException();
+
+    return Reference< XAccessible >();
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleParent(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Reference< XAccessible > xParent;
+    if ( m_pStatusBar )
+        xParent = m_pStatusBar->GetAccessible();
+
+    return xParent;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nIndexInParent = -1;
+    if ( m_pStatusBar )
+        nIndexInParent = m_pStatusBar->GetItemPos( m_nItemId );
+
+    return nIndexInParent;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return AccessibleRole::LABEL;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleStatusBarItem::getAccessibleDescription(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    ::rtl::OUString sDescription;
+    if ( m_pStatusBar )
+        sDescription = m_pStatusBar->GetHelpText( m_nItemId );
+
+    return sDescription;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleStatusBarItem::getAccessibleName(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return GetItemName();
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessibleRelationSet > VCLXAccessibleStatusBarItem::getAccessibleRelationSet(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
+    Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
+    return xSet;
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessibleStateSet > VCLXAccessibleStatusBarItem::getAccessibleStateSet(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper;
+    Reference< XAccessibleStateSet > xSet = pStateSetHelper;
+
+    if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
+    {
+        FillAccessibleStateSet( *pStateSetHelper );
+    }
+    else
+    {
+        pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+    }
+
+    return xSet;
+}
+
+// -----------------------------------------------------------------------------
+
+Locale VCLXAccessibleStatusBarItem::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return Application::GetSettings().GetLocale();
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleComponent
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return Reference< XAccessible >();
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleStatusBarItem::grabFocus(  ) throw (RuntimeException)
+{
+    // no focus for status bar items
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleStatusBarItem::getForeground(   ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nColor = 0;
+    Reference< XAccessible > xParent = getAccessibleParent();
+    if ( xParent.is() )
+    {
+        Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+        if ( xParentComp.is() )
+            nColor = xParentComp->getForeground();
+    }
+
+    return nColor;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleStatusBarItem::getBackground(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nColor = 0;
+    Reference< XAccessible > xParent = getAccessibleParent();
+    if ( xParent.is() )
+    {
+        Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+        if ( xParentComp.is() )
+            nColor = xParentComp->getBackground();
+    }
+
+    return nColor;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleExtendedComponent
+// -----------------------------------------------------------------------------
+
+Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Reference< awt::XFont > xFont;
+    Reference< XAccessible > xParent = getAccessibleParent();
+    if ( xParent.is() )
+    {
+        Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+        if ( xParentComp.is() )
+            xFont = xParentComp->getFont();
+    }
+
+    return xFont;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleStatusBarItem::getTitledBorderText(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return GetItemText();
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleStatusBarItem::getToolTipText(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return ::rtl::OUString();
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleText
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleStatusBarItem::getCaretPosition() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return -1;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleStatusBarItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    return sal_False;
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< PropertyValue > VCLXAccessibleStatusBarItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Sequence< PropertyValue > aValues;
+    ::rtl::OUString sText( implGetText() );
+
+    if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    if ( m_pStatusBar )
+    {
+        Font aFont = m_pStatusBar->GetFont();
+        sal_Int32 nBackColor = getBackground();
+        sal_Int32 nColor = getForeground();
+        ::std::auto_ptr< CharacterAttributesHelper > pHelper( new CharacterAttributesHelper( aFont, nBackColor, nColor ) );
+        aValues = pHelper->GetCharacterAttributes( aRequestedAttributes );
+    }
+
+    return aValues;
+}
+
+// -----------------------------------------------------------------------------
+
+awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    awt::Rectangle aBounds( 0, 0, 0, 0 );
+    if ( m_pStatusBar )
+    {
+        ::vcl::ControlLayoutData aLayoutData;
+        Rectangle aItemRect = m_pStatusBar->GetItemRect( m_nItemId );
+        m_pStatusBar->RecordLayoutData( &aLayoutData, aItemRect );
+        Rectangle aCharRect = aLayoutData.GetCharacterBounds( nIndex );
+        aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
+        aBounds = AWTRectangle( aCharRect );
+    }
+
+    return aBounds;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nIndex = -1;
+    if ( m_pStatusBar )
+    {
+        ::vcl::ControlLayoutData aLayoutData;
+        Rectangle aItemRect = m_pStatusBar->GetItemRect( m_nItemId );
+        m_pStatusBar->RecordLayoutData( &aLayoutData, aItemRect );
+        Point aPnt( VCLPoint( aPoint ) );
+        aPnt += aItemRect.TopLeft();
+        nIndex = aLayoutData.GetIndexForPoint( aPnt );
+    }
+
+    return nIndex;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleStatusBarItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    return sal_False;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Bool bReturn = sal_False;
+
+    if ( m_pStatusBar )
+    {
+        Reference< datatransfer::clipboard::XClipboard > xClipboard = m_pStatusBar->GetClipboard();
+        if ( xClipboard.is() )
+        {
+            ::rtl::OUString sText( getTextRange( nStartIndex, nEndIndex ) );
+
+            ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText );
+            const sal_uInt32 nRef = Application::ReleaseSolarMutex();
+            xClipboard->setContents( pDataObj, NULL );
+
+            Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY );
+            if( xFlushableClipboard.is() )
+                xFlushableClipboard->flushClipboard();
+
+            Application::AcquireSolarMutex( nRef );
+
+            bReturn = sal_True;
+        }
+    }
+
+    return bReturn;
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
new file mode 100644
index 000000000000..e23580b05280
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -0,0 +1,515 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+#include <accessibility/standard/vclxaccessibletabcontrol.hxx>
+#include <accessibility/standard/vclxaccessibletabpage.hxx>
+
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <vcl/tabctrl.hxx>
+#include <vcl/tabpage.hxx>
+
+#include <vector>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::accessibility;
+using namespace ::comphelper;
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleTabControl
+//  ----------------------------------------------------
+
+VCLXAccessibleTabControl::VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow )
+    :VCLXAccessibleComponent( pVCLXWindow )
+{
+    m_pTabControl = static_cast< TabControl* >( GetWindow() );
+
+    if ( m_pTabControl )
+        m_aAccessibleChildren.assign( m_pTabControl->GetPageCount(), Reference< XAccessible >() );
+}
+
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleTabControl::~VCLXAccessibleTabControl()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabControl::UpdateFocused()
+{
+    for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+    {
+        Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+        if ( xChild.is() )
+        {
+            VCLXAccessibleTabPage* pVCLXAccessibleTabPage = static_cast< VCLXAccessibleTabPage* >( xChild.get() );
+            if ( pVCLXAccessibleTabPage )
+                pVCLXAccessibleTabPage->SetFocused( pVCLXAccessibleTabPage->IsFocused() );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabControl::UpdateSelected( sal_Int32 i, bool bSelected )
+{
+    NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
+
+    if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+    {
+        Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+        if ( xChild.is() )
+        {
+            VCLXAccessibleTabPage* pVCLXAccessibleTabPage = static_cast< VCLXAccessibleTabPage* >( xChild.get() );
+            if ( pVCLXAccessibleTabPage )
+                pVCLXAccessibleTabPage->SetSelected( bSelected );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabControl::UpdatePageText( sal_Int32 i )
+{
+    if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+    {
+        Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+        if ( xChild.is() )
+        {
+            VCLXAccessibleTabPage* pVCLXAccessibleTabPage = static_cast< VCLXAccessibleTabPage* >( xChild.get() );
+            if ( pVCLXAccessibleTabPage )
+                pVCLXAccessibleTabPage->SetPageText( pVCLXAccessibleTabPage->GetPageText() );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabControl::UpdateTabPage( sal_Int32 i, bool bNew )
+{
+    if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+    {
+        Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+        if ( xChild.is() )
+        {
+            VCLXAccessibleTabPage* pVCLXAccessibleTabPage = static_cast< VCLXAccessibleTabPage* >( xChild.get() );
+            if ( pVCLXAccessibleTabPage )
+                pVCLXAccessibleTabPage->Update( bNew );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabControl::InsertChild( sal_Int32 i )
+{
+    if ( i >= 0 && i <= (sal_Int32)m_aAccessibleChildren.size() )
+    {
+        // insert entry in child list
+        m_aAccessibleChildren.insert( m_aAccessibleChildren.begin() + i, Reference< XAccessible >() );
+
+        // send accessible child event
+        Reference< XAccessible > xChild( getAccessibleChild( i ) );
+        if ( xChild.is() )
+        {
+            Any aOldValue, aNewValue;
+            aNewValue <<= xChild;
+            NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldValue, aNewValue );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabControl::RemoveChild( sal_Int32 i )
+{
+    if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
+    {
+        // get the accessible of the removed page
+        Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+
+        // remove entry in child list
+        m_aAccessibleChildren.erase( m_aAccessibleChildren.begin() + i );
+
+        // send accessible child event
+        if ( xChild.is() )
+        {
+            Any aOldValue, aNewValue;
+            aOldValue <<= xChild;
+            NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldValue, aNewValue );
+
+            Reference< XComponent > xComponent( xChild, UNO_QUERY );
+            if ( xComponent.is() )
+                xComponent->dispose();
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+{
+    switch ( rVclWindowEvent.GetId() )
+    {
+        case VCLEVENT_TABPAGE_ACTIVATE:
+        case VCLEVENT_TABPAGE_DEACTIVATE:
+        {
+            if ( m_pTabControl )
+            {
+                sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
+                sal_uInt16 nPagePos = m_pTabControl->GetPagePos( nPageId );
+                UpdateFocused();
+                UpdateSelected( nPagePos, rVclWindowEvent.GetId() == VCLEVENT_TABPAGE_ACTIVATE );
+            }
+        }
+        break;
+        case VCLEVENT_TABPAGE_PAGETEXTCHANGED:
+        {
+            if ( m_pTabControl )
+            {
+                sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
+                sal_uInt16 nPagePos = m_pTabControl->GetPagePos( nPageId );
+                UpdatePageText( nPagePos );
+            }
+        }
+        break;
+        case VCLEVENT_TABPAGE_INSERTED:
+        {
+            if ( m_pTabControl )
+            {
+                sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
+                sal_uInt16 nPagePos = m_pTabControl->GetPagePos( nPageId );
+                InsertChild( nPagePos );
+            }
+        }
+        break;
+        case VCLEVENT_TABPAGE_REMOVED:
+        {
+            if ( m_pTabControl )
+            {
+                sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
+                for ( sal_Int32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i )
+                {
+                    Reference< XAccessible > xChild( getAccessibleChild( i ) );
+                    if ( xChild.is() )
+                    {
+                        VCLXAccessibleTabPage* pVCLXAccessibleTabPage = static_cast< VCLXAccessibleTabPage* >( xChild.get() );
+                        if ( pVCLXAccessibleTabPage && pVCLXAccessibleTabPage->GetPageId() == nPageId )
+                        {
+                            RemoveChild( i );
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        break;
+        case VCLEVENT_TABPAGE_REMOVEDALL:
+        {
+            for ( sal_Int32 i = m_aAccessibleChildren.size() - 1; i >= 0; --i )
+                RemoveChild( i );
+        }
+        break;
+        case VCLEVENT_WINDOW_GETFOCUS:
+        case VCLEVENT_WINDOW_LOSEFOCUS:
+        {
+            UpdateFocused();
+        }
+        break;
+        case VCLEVENT_OBJECT_DYING:
+        {
+            if ( m_pTabControl )
+            {
+                m_pTabControl = NULL;
+
+                // dispose all tab pages
+                for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+                {
+                    Reference< XComponent > xComponent( m_aAccessibleChildren[i], UNO_QUERY );
+                    if ( xComponent.is() )
+                        xComponent->dispose();
+                }
+                m_aAccessibleChildren.clear();
+            }
+
+            VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
+        }
+        break;
+        default:
+            VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
+   }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabControl::ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent )
+{
+    switch ( rVclWindowEvent.GetId() )
+    {
+        case VCLEVENT_WINDOW_SHOW:
+        case VCLEVENT_WINDOW_HIDE:
+        {
+            if ( m_pTabControl )
+            {
+                Window* pChild = static_cast< Window* >( rVclWindowEvent.GetData() );
+                if ( pChild && pChild->GetType() == WINDOW_TABPAGE )
+                {
+                    for ( sal_Int32 i = 0, nCount = m_pTabControl->GetPageCount(); i < nCount; ++i )
+                    {
+                        sal_uInt16 nPageId = m_pTabControl->GetPageId( (sal_uInt16)i );
+                        TabPage* pTabPage = m_pTabControl->GetTabPage( nPageId );
+                        if ( pTabPage == (TabPage*) pChild )
+                            UpdateTabPage( i, rVclWindowEvent.GetId() == VCLEVENT_WINDOW_SHOW );
+                    }
+                }
+            }
+        }
+        break;
+        default:
+            VCLXAccessibleComponent::ProcessWindowChildEvent( rVclWindowEvent );
+    }
+}
+
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabControl::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+{
+    VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet );
+
+    if ( m_pTabControl )
+        rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+}
+
+// -----------------------------------------------------------------------------
+// XInterface
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleTabControl, VCLXAccessibleComponent, VCLXAccessibleTabControl_BASE )
+
+// -----------------------------------------------------------------------------
+// XTypeProvider
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTabControl, VCLXAccessibleComponent, VCLXAccessibleTabControl_BASE )
+
+// -----------------------------------------------------------------------------
+// XComponent
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabControl::disposing()
+{
+    VCLXAccessibleComponent::disposing();
+
+    if ( m_pTabControl )
+    {
+        m_pTabControl = NULL;
+
+        // dispose all tab pages
+        for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i )
+        {
+            Reference< XComponent > xComponent( m_aAccessibleChildren[i], UNO_QUERY );
+            if ( xComponent.is() )
+                xComponent->dispose();
+        }
+        m_aAccessibleChildren.clear();
+    }
+}
+
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleTabControl::getImplementationName() throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleTabControl" );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< ::rtl::OUString > VCLXAccessibleTabControl::getSupportedServiceNames() throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames(1);
+    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleTabControl" );
+    return aNames;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleContext
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return m_aAccessibleChildren.size();
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( i < 0 || i >= getAccessibleChildCount() )
+        throw IndexOutOfBoundsException();
+
+    Reference< XAccessible > xChild = m_aAccessibleChildren[i];
+    if ( !xChild.is() )
+    {
+        if ( m_pTabControl )
+        {
+            sal_uInt16 nPageId = m_pTabControl->GetPageId( (sal_uInt16)i );
+
+            xChild = new VCLXAccessibleTabPage( m_pTabControl, nPageId );
+
+            // insert into tab page list
+            m_aAccessibleChildren[i] = xChild;
+        }
+    }
+
+    return xChild;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int16 VCLXAccessibleTabControl::getAccessibleRole(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return AccessibleRole::PAGE_TAB_LIST;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleTabControl::getAccessibleName(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return ::rtl::OUString();
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleSelection
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
+        throw IndexOutOfBoundsException();
+
+    if ( m_pTabControl )
+        m_pTabControl->SelectTabPage( m_pTabControl->GetPageId( (sal_uInt16)nChildIndex ) );
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
+        throw IndexOutOfBoundsException();
+
+    sal_Bool bSelected = sal_False;
+    if ( m_pTabControl && m_pTabControl->GetCurPageId() == m_pTabControl->GetPageId( (sal_uInt16)nChildIndex ) )
+        bSelected = sal_True;
+
+    return bSelected;
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabControl::clearAccessibleSelection(  ) throw (RuntimeException)
+{
+    // This method makes no sense in a tab control, and so does nothing.
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabControl::selectAllAccessibleChildren(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    selectAccessibleChild( 0 );
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleTabControl::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return 1;
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nSelectedChildIndex < 0 || nSelectedChildIndex >= getSelectedAccessibleChildCount() )
+        throw IndexOutOfBoundsException();
+
+    Reference< XAccessible > xChild;
+
+    for ( sal_Int32 i = 0, j = 0, nCount = getAccessibleChildCount(); i < nCount; i++ )
+    {
+        if ( isAccessibleChildSelected( i ) && ( j++ == nSelectedChildIndex ) )
+        {
+            xChild = getAccessibleChild( i );
+            break;
+        }
+    }
+
+    return xChild;
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabControl::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
+        throw IndexOutOfBoundsException();
+
+    // This method makes no sense in a tab control, and so does nothing.
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx
new file mode 100644
index 000000000000..6b871fced829
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessibletabpage.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_accessibility.hxx"
+#include <accessibility/standard/vclxaccessibletabpage.hxx>
+#include <toolkit/helper/externallock.hxx>
+#include <toolkit/helper/convert.hxx>
+#include <accessibility/helper/characterattributeshelper.hxx>
+
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
+#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
+
+#include <unotools/accessiblestatesethelper.hxx>
+#include <unotools/accessiblerelationsethelper.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/unohelp2.hxx>
+#include <vcl/tabctrl.hxx>
+#include <vcl/tabpage.hxx>
+
+#include <memory>
+
+
+using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star;
+using namespace ::comphelper;
+
+
+// -----------------------------------------------------------------------------
+// class VCLXAccessibleTabPage
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleTabPage::VCLXAccessibleTabPage( TabControl* pTabControl, sal_uInt16 nPageId )
+    :AccessibleTextHelper_BASE( new VCLExternalSolarLock() )
+    ,m_pTabControl( pTabControl )
+    ,m_nPageId( nPageId )
+{
+    m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() );
+    m_bFocused  = IsFocused();
+    m_bSelected = IsSelected();
+    m_sPageText = GetPageText();
+}
+
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleTabPage::~VCLXAccessibleTabPage()
+{
+    delete m_pExternalLock;
+    m_pExternalLock = NULL;
+}
+
+// -----------------------------------------------------------------------------
+
+bool VCLXAccessibleTabPage::IsFocused()
+{
+    bool bFocused = false;
+
+    if ( m_pTabControl && m_pTabControl->HasFocus() && m_pTabControl->GetCurPageId() == m_nPageId )
+        bFocused = true;
+
+    return bFocused;
+}
+
+// -----------------------------------------------------------------------------
+
+bool VCLXAccessibleTabPage::IsSelected()
+{
+    bool bSelected = false;
+
+    if ( m_pTabControl && m_pTabControl->GetCurPageId() == m_nPageId )
+        bSelected = true;
+
+    return bSelected;
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabPage::SetFocused( bool bFocused )
+{
+    if ( m_bFocused != bFocused )
+    {
+        Any aOldValue, aNewValue;
+        if ( m_bFocused )
+            aOldValue <<= AccessibleStateType::FOCUSED;
+        else
+            aNewValue <<= AccessibleStateType::FOCUSED;
+        m_bFocused = bFocused;
+        NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabPage::SetSelected( bool bSelected )
+{
+    if ( m_bSelected != bSelected )
+    {
+        Any aOldValue, aNewValue;
+        if ( m_bSelected )
+            aOldValue <<= AccessibleStateType::SELECTED;
+        else
+            aNewValue <<= AccessibleStateType::SELECTED;
+        m_bSelected = bSelected;
+        NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabPage::SetPageText( const ::rtl::OUString& sPageText )
+{
+    Any aOldValue, aNewValue;
+    if ( OCommonAccessibleText::implInitTextChangedEvent( m_sPageText, sPageText, aOldValue, aNewValue ) )
+    {
+        Any aOldName, aNewName;
+        aOldName <<= m_sPageText;
+        aNewName <<= sPageText;
+        m_sPageText = sPageText;
+        NotifyAccessibleEvent( AccessibleEventId::NAME_CHANGED, aOldName, aNewName );
+        NotifyAccessibleEvent( AccessibleEventId::TEXT_CHANGED, aOldValue, aNewValue );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleTabPage::GetPageText()
+{
+    ::rtl::OUString sText;
+    if ( m_pTabControl )
+        sText = OutputDevice::GetNonMnemonicString( m_pTabControl->GetPageText( m_nPageId ) );
+
+    return sText;
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabPage::Update( bool bNew )
+{
+    if ( m_pTabControl )
+    {
+        TabPage* pTabPage = m_pTabControl->GetTabPage( m_nPageId );
+        if ( pTabPage )
+        {
+            Reference< XAccessible > xChild( pTabPage->GetAccessible( bNew ) );
+            if ( xChild.is() )
+            {
+                Any aOldValue, aNewValue;
+                if ( bNew )
+                    aNewValue <<= xChild;
+                else
+                    aOldValue <<= xChild;
+                NotifyAccessibleEvent( AccessibleEventId::CHILD, aOldValue, aNewValue );
+            }
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabPage::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+{
+    rStateSet.AddState( AccessibleStateType::ENABLED );
+    rStateSet.AddState( AccessibleStateType::SENSITIVE );
+
+    rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+
+    if ( IsFocused() )
+        rStateSet.AddState( AccessibleStateType::FOCUSED );
+
+    rStateSet.AddState( AccessibleStateType::VISIBLE );
+
+    rStateSet.AddState( AccessibleStateType::SHOWING );
+
+    rStateSet.AddState( AccessibleStateType::SELECTABLE );
+
+    if ( IsSelected() )
+        rStateSet.AddState( AccessibleStateType::SELECTED );
+}
+
+// -----------------------------------------------------------------------------
+// OCommonAccessibleComponent
+// -----------------------------------------------------------------------------
+
+awt::Rectangle VCLXAccessibleTabPage::implGetBounds() throw (RuntimeException)
+{
+    awt::Rectangle aBounds( 0, 0, 0, 0 );
+
+    if ( m_pTabControl )
+        aBounds = AWTRectangle( m_pTabControl->GetTabBounds( m_nPageId ) );
+
+    return aBounds;
+}
+
+// -----------------------------------------------------------------------------
+// OCommonAccessibleText
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleTabPage::implGetText()
+{
+    return GetPageText();
+}
+
+// -----------------------------------------------------------------------------
+
+lang::Locale VCLXAccessibleTabPage::implGetLocale()
+{
+    return Application::GetSettings().GetLocale();
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabPage::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
+{
+    nStartIndex = 0;
+    nEndIndex = 0;
+}
+
+// -----------------------------------------------------------------------------
+// XInterface
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleTabPage, AccessibleTextHelper_BASE, VCLXAccessibleTabPage_BASE )
+
+// -----------------------------------------------------------------------------
+// XTypeProvider
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTabPage, AccessibleTextHelper_BASE, VCLXAccessibleTabPage_BASE )
+
+// -----------------------------------------------------------------------------
+// XComponent
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabPage::disposing()
+{
+    AccessibleTextHelper_BASE::disposing();
+
+    m_pTabControl = NULL;
+    m_sPageText = ::rtl::OUString();
+}
+
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleTabPage::getImplementationName() throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleTabPage" );
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleTabPage::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() );
+    const ::rtl::OUString* pNames = aNames.getConstArray();
+    const ::rtl::OUString* pEnd = pNames + aNames.getLength();
+    for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames )
+        ;
+
+    return pNames != pEnd;
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< ::rtl::OUString > VCLXAccessibleTabPage::getSupportedServiceNames() throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames(1);
+    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleTabPage" );
+    return aNames;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessible
+// -----------------------------------------------------------------------------
+
+Reference< XAccessibleContext > VCLXAccessibleTabPage::getAccessibleContext(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return this;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleContext
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleTabPage::getAccessibleChildCount() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nCount = 0;
+    if ( m_pTabControl )
+    {
+        TabPage* pTabPage = m_pTabControl->GetTabPage( m_nPageId );
+        if ( pTabPage && pTabPage->IsVisible() )
+            nCount = 1;
+    }
+
+    return nCount;
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( i < 0 || i >= getAccessibleChildCount() )
+        throw IndexOutOfBoundsException();
+
+    Reference< XAccessible > xChild;
+    if ( m_pTabControl )
+    {
+        TabPage* pTabPage = m_pTabControl->GetTabPage( m_nPageId );
+        if ( pTabPage && pTabPage->IsVisible() )
+            xChild = pTabPage->GetAccessible();
+    }
+
+    return xChild;
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleParent(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Reference< XAccessible > xParent;
+    if ( m_pTabControl )
+        xParent = m_pTabControl->GetAccessible();
+
+    return xParent;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleTabPage::getAccessibleIndexInParent(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nIndexInParent = -1;
+    if ( m_pTabControl )
+        nIndexInParent = m_pTabControl->GetPagePos( m_nPageId );
+
+    return nIndexInParent;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int16 VCLXAccessibleTabPage::getAccessibleRole(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return AccessibleRole::PAGE_TAB;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleTabPage::getAccessibleDescription(    ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    ::rtl::OUString sDescription;
+    if ( m_pTabControl )
+        sDescription = m_pTabControl->GetHelpText( m_nPageId );
+
+    return sDescription;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleTabPage::getAccessibleName(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return GetPageText();
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessibleRelationSet > VCLXAccessibleTabPage::getAccessibleRelationSet(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
+    Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
+    return xSet;
+}
+
+// -----------------------------------------------------------------------------
+
+Reference< XAccessibleStateSet > VCLXAccessibleTabPage::getAccessibleStateSet(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper;
+    Reference< XAccessibleStateSet > xSet = pStateSetHelper;
+
+    if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
+    {
+        FillAccessibleStateSet( *pStateSetHelper );
+    }
+    else
+    {
+        pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+    }
+
+    return xSet;
+}
+
+// -----------------------------------------------------------------------------
+
+Locale VCLXAccessibleTabPage::getLocale(  ) throw (IllegalAccessibleComponentStateException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return Application::GetSettings().GetLocale();
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleComponent
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Reference< XAccessible > xChild;
+    for ( sal_uInt32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i )
+    {
+        Reference< XAccessible > xAcc = getAccessibleChild( i );
+        if ( xAcc.is() )
+        {
+            Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
+            if ( xComp.is() )
+            {
+                Rectangle aRect = VCLRectangle( xComp->getBounds() );
+                Point aPos = VCLPoint( rPoint );
+                if ( aRect.IsInside( aPos ) )
+                {
+                    xChild = xAcc;
+                    break;
+                }
+            }
+        }
+    }
+
+    return xChild;
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabPage::grabFocus(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( m_pTabControl )
+    {
+        m_pTabControl->SelectTabPage( m_nPageId );
+        m_pTabControl->GrabFocus();
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nColor = 0;
+    Reference< XAccessible > xParent = getAccessibleParent();
+    if ( xParent.is() )
+    {
+        Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+        if ( xParentComp.is() )
+            nColor = xParentComp->getForeground();
+    }
+
+    return nColor;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleTabPage::getBackground(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nColor = 0;
+    Reference< XAccessible > xParent = getAccessibleParent();
+    if ( xParent.is() )
+    {
+        Reference< XAccessibleComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+        if ( xParentComp.is() )
+            nColor = xParentComp->getBackground();
+    }
+
+    return nColor;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleExtendedComponent
+// -----------------------------------------------------------------------------
+
+Reference< awt::XFont > VCLXAccessibleTabPage::getFont(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Reference< awt::XFont > xFont;
+    Reference< XAccessible > xParent = getAccessibleParent();
+    if ( xParent.is() )
+    {
+        Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
+        if ( xParentComp.is() )
+            xFont = xParentComp->getFont();
+    }
+
+    return xFont;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleTabPage::getTitledBorderText(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return ::rtl::OUString();
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleTabPage::getToolTipText(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return ::rtl::OUString();
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleText
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleTabPage::getCaretPosition() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return -1;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleTabPage::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    return sal_False;
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< PropertyValue > VCLXAccessibleTabPage::getCharacterAttributes( sal_Int32 nIndex, const Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Sequence< PropertyValue > aValues;
+    ::rtl::OUString sText( implGetText() );
+
+    if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    if ( m_pTabControl )
+    {
+        Font aFont = m_pTabControl->GetFont();
+        sal_Int32 nBackColor = getBackground();
+        sal_Int32 nColor = getForeground();
+        ::std::auto_ptr< CharacterAttributesHelper > pHelper( new CharacterAttributesHelper( aFont, nBackColor, nColor ) );
+        aValues = pHelper->GetCharacterAttributes( aRequestedAttributes );
+    }
+
+    return aValues;
+}
+
+// -----------------------------------------------------------------------------
+
+awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    awt::Rectangle aBounds( 0, 0, 0, 0 );
+    if ( m_pTabControl )
+    {
+        Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId );
+        Rectangle aCharRect = m_pTabControl->GetCharacterBounds( m_nPageId, nIndex );
+        aCharRect.Move( -aPageRect.Left(), -aPageRect.Top() );
+        aBounds = AWTRectangle( aCharRect );
+    }
+
+    return aBounds;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nIndex = -1;
+    if ( m_pTabControl )
+    {
+        sal_uInt16 nPageId = 0;
+        Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId );
+        Point aPnt( VCLPoint( aPoint ) );
+        aPnt += aPageRect.TopLeft();
+        sal_Int32 nI = m_pTabControl->GetIndexForPoint( aPnt, nPageId );
+        if ( nI != -1 && m_nPageId == nPageId )
+            nIndex = nI;
+    }
+
+    return nIndex;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleTabPage::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    return sal_False;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Bool bReturn = sal_False;
+
+    if ( m_pTabControl )
+    {
+        Reference< datatransfer::clipboard::XClipboard > xClipboard = m_pTabControl->GetClipboard();
+        if ( xClipboard.is() )
+        {
+            ::rtl::OUString sText( getTextRange( nStartIndex, nEndIndex ) );
+
+            ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText );
+            const sal_uInt32 nRef = Application::ReleaseSolarMutex();
+            xClipboard->setContents( pDataObj, NULL );
+
+            Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY );
+            if( xFlushableClipboard.is() )
+                xFlushableClipboard->flushClipboard();
+
+            Application::AcquireSolarMutex( nRef );
+
+            bReturn = sal_True;
+        }
+    }
+
+    return bReturn;
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
new file mode 100644
index 000000000000..93fc1b3da2ff
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+#include <accessibility/standard/vclxaccessibletabpagewindow.hxx>
+#include <toolkit/helper/convert.hxx>
+#include <vcl/tabctrl.hxx>
+#include <vcl/tabpage.hxx>
+
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::accessibility;
+using namespace ::comphelper;
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleTabPageWindow
+//  ----------------------------------------------------
+
+VCLXAccessibleTabPageWindow::VCLXAccessibleTabPageWindow( VCLXWindow* pVCLXWindow )
+    :VCLXAccessibleComponent( pVCLXWindow )
+{
+    m_pTabPage = static_cast< TabPage* >( GetWindow() );
+    if ( m_pTabPage )
+    {
+        Window* pParent = m_pTabPage->GetAccessibleParentWindow();
+        if ( pParent && pParent->GetType() == WINDOW_TABCONTROL )
+        {
+            m_pTabControl = static_cast< TabControl* >( pParent );
+            if ( m_pTabControl )
+            {
+                for ( sal_uInt16 i = 0, nCount = m_pTabControl->GetPageCount(); i < nCount; ++i )
+                {
+                    sal_uInt16 nPageId = m_pTabControl->GetPageId( i );
+                    if ( m_pTabControl->GetTabPage( nPageId ) == m_pTabPage )
+                        m_nPageId = nPageId;
+                }
+            }
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleTabPageWindow::~VCLXAccessibleTabPageWindow()
+{
+}
+
+// -----------------------------------------------------------------------------
+// OCommonAccessibleComponent
+// -----------------------------------------------------------------------------
+
+awt::Rectangle VCLXAccessibleTabPageWindow::implGetBounds() throw (RuntimeException)
+{
+    awt::Rectangle aBounds( 0, 0, 0, 0 );
+
+    if ( m_pTabControl )
+    {
+        Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId );
+        if ( m_pTabPage )
+        {
+            Rectangle aRect = Rectangle( m_pTabPage->GetPosPixel(), m_pTabPage->GetSizePixel() );
+            aRect.Move( -aPageRect.Left(), -aPageRect.Top() );
+            aBounds = AWTRectangle( aRect );
+        }
+    }
+
+    return aBounds;
+}
+
+// -----------------------------------------------------------------------------
+// XComponent
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTabPageWindow::disposing()
+{
+    VCLXAccessibleComponent::disposing();
+
+    m_pTabControl = NULL;
+    m_pTabPage = NULL;
+}
+
+// -----------------------------------------------------------------------------
+// XAccessibleContext
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > VCLXAccessibleTabPageWindow::getAccessibleParent(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Reference< XAccessible > xParent;
+    if ( m_pTabControl )
+    {
+        Reference< XAccessible > xAcc( m_pTabControl->GetAccessible() );
+        if ( xAcc.is() )
+        {
+            Reference< XAccessibleContext > xCont( xAcc->getAccessibleContext() );
+            if ( xCont.is() )
+                xParent = xCont->getAccessibleChild( m_pTabControl->GetPagePos( m_nPageId ) );
+        }
+    }
+
+    return xParent;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleTabPageWindow::getAccessibleIndexInParent(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return 0;
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
new file mode 100644
index 000000000000..c6bbaddf6426
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -0,0 +1,362 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+#include <accessibility/standard/vclxaccessibletextcomponent.hxx>
+#include <toolkit/helper/macros.hxx>
+#include <toolkit/helper/convert.hxx>
+#include <accessibility/helper/characterattributeshelper.hxx>
+
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
+#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
+#include <cppuhelper/typeprovider.hxx>
+#include <comphelper/sequence.hxx>
+#include <vcl/window.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/unohelp2.hxx>
+#include <vcl/ctrl.hxx>
+
+#include <memory>
+#include <vector>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::accessibility;
+using namespace ::comphelper;
+
+
+//  ----------------------------------------------------
+//  class VCLXAccessibleTextComponent
+//  ----------------------------------------------------
+
+VCLXAccessibleTextComponent::VCLXAccessibleTextComponent( VCLXWindow* pVCLXWindow )
+    :VCLXAccessibleComponent( pVCLXWindow )
+{
+    if ( GetWindow() )
+        m_sText = OutputDevice::GetNonMnemonicString( GetWindow()->GetText() );
+}
+
+// -----------------------------------------------------------------------------
+
+VCLXAccessibleTextComponent::~VCLXAccessibleTextComponent()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTextComponent::SetText( const ::rtl::OUString& sText )
+{
+    Any aOldValue, aNewValue;
+    if ( implInitTextChangedEvent( m_sText, sText, aOldValue, aNewValue ) )
+    {
+        m_sText = sText;
+        NotifyAccessibleEvent( AccessibleEventId::TEXT_CHANGED, aOldValue, aNewValue );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTextComponent::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+{
+    switch ( rVclWindowEvent.GetId() )
+    {
+        case VCLEVENT_WINDOW_FRAMETITLECHANGED:
+        {
+            VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
+            SetText( implGetText() );
+        }
+        break;
+        default:
+            VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
+   }
+}
+
+// -----------------------------------------------------------------------------
+// OCommonAccessibleText
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleTextComponent::implGetText()
+{
+    ::rtl::OUString aText;
+    if ( GetWindow() )
+        aText = OutputDevice::GetNonMnemonicString( GetWindow()->GetText() );
+
+    return aText;
+}
+
+// -----------------------------------------------------------------------------
+
+lang::Locale VCLXAccessibleTextComponent::implGetLocale()
+{
+    return Application::GetSettings().GetLocale();
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTextComponent::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
+{
+    nStartIndex = 0;
+    nEndIndex = 0;
+}
+
+// -----------------------------------------------------------------------------
+// XComponent
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleTextComponent::disposing()
+{
+    VCLXAccessibleComponent::disposing();
+
+    m_sText = ::rtl::OUString();
+}
+
+// -----------------------------------------------------------------------------
+// XInterface
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleTextComponent, VCLXAccessibleComponent, VCLXAccessibleTextComponent_BASE )
+
+// -----------------------------------------------------------------------------
+// XTypeProvider
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTextComponent, VCLXAccessibleComponent, VCLXAccessibleTextComponent_BASE )
+
+// -----------------------------------------------------------------------------
+// XAccessibleText
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleTextComponent::getCaretPosition() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return -1;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleTextComponent::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return setSelection( nIndex, nIndex );
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Unicode VCLXAccessibleTextComponent::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getCharacter( nIndex );
+}
+
+// -----------------------------------------------------------------------------
+
+Sequence< PropertyValue > VCLXAccessibleTextComponent::getCharacterAttributes( sal_Int32 nIndex, const Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Sequence< PropertyValue > aValues;
+    ::rtl::OUString sText( implGetText() );
+
+    if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    if ( GetWindow() )
+    {
+        Font aFont = GetWindow()->GetControlFont();
+        sal_Int32 nBackColor = GetWindow()->GetControlBackground().GetColor();
+        sal_Int32 nColor = GetWindow()->GetControlForeground().GetColor();
+        ::std::auto_ptr< CharacterAttributesHelper > pHelper( new CharacterAttributesHelper( aFont, nBackColor, nColor ) );
+        aValues = pHelper->GetCharacterAttributes( aRequestedAttributes );
+    }
+
+    return aValues;
+}
+
+// -----------------------------------------------------------------------------
+
+awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    awt::Rectangle aRect;
+    Control* pControl = static_cast< Control* >( GetWindow() );
+    if ( pControl )
+        aRect = AWTRectangle( pControl->GetCharacterBounds( nIndex ) );
+
+    return aRect;
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleTextComponent::getCharacterCount() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getCharacterCount();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nIndex = -1;
+    Control* pControl = static_cast< Control* >( GetWindow() );
+    if ( pControl )
+        nIndex = pControl->GetIndexForPoint( VCLPoint( aPoint ) );
+
+    return nIndex;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleTextComponent::getSelectedText() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getSelectedText();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getSelectionStart();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getSelectionEnd();
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    return sal_False;
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleTextComponent::getText() throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getText();
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex );
+}
+
+// -----------------------------------------------------------------------------
+
+::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType );
+}
+
+// -----------------------------------------------------------------------------
+
+::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType );
+}
+
+// -----------------------------------------------------------------------------
+
+::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType );
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Bool bReturn = sal_False;
+
+    if ( GetWindow() )
+    {
+        Reference< datatransfer::clipboard::XClipboard > xClipboard = GetWindow()->GetClipboard();
+        if ( xClipboard.is() )
+        {
+            ::rtl::OUString sText( getTextRange( nStartIndex, nEndIndex ) );
+
+            ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText );
+            const sal_uInt32 nRef = Application::ReleaseSolarMutex();
+            xClipboard->setContents( pDataObj, NULL );
+
+            Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY );
+            if( xFlushableClipboard.is() )
+                xFlushableClipboard->flushClipboard();
+
+            Application::AcquireSolarMutex( nRef );
+
+            bReturn = sal_True;
+        }
+    }
+
+    return bReturn;
+}
+
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx
new file mode 100644
index 000000000000..e77d203d443a
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessibletextfield.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_accessibility.hxx"
+#include <accessibility/standard/vclxaccessibletextfield.hxx>
+#include <vcl/lstbox.hxx>
+#include <accessibility/helper/listboxhelper.hxx>
+
+#include <unotools/accessiblestatesethelper.hxx>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <vcl/svapp.hxx>
+#include <vcl/combobox.hxx>
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::accessibility;
+
+
+
+
+VCLXAccessibleTextField::VCLXAccessibleTextField (VCLXWindow* pVCLWindow, const Reference< XAccessible >& _xParent) :
+
+    VCLXAccessibleTextComponent (pVCLWindow),
+
+    m_xParent( _xParent )
+
+{
+}
+
+
+
+
+VCLXAccessibleTextField::~VCLXAccessibleTextField (void)
+{
+}
+
+
+
+
+::rtl::OUString VCLXAccessibleTextField::implGetText (void)
+{
+    ::rtl::OUString aText;
+    ListBox* pListBox = static_cast<ListBox*>(GetWindow());
+    if (pListBox!=NULL && !pListBox->IsInDropDown())
+        aText = pListBox->GetSelectEntry();
+
+    return aText;
+}
+
+
+
+
+IMPLEMENT_FORWARD_XINTERFACE2(VCLXAccessibleTextField, VCLXAccessibleTextComponent, VCLXAccessible_BASE)
+IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleTextField, VCLXAccessibleTextComponent, VCLXAccessible_BASE)
+
+
+//=====  XAccessible  =========================================================
+
+Reference<XAccessibleContext> SAL_CALL
+    VCLXAccessibleTextField::getAccessibleContext (void)
+    throw (RuntimeException)
+{
+    return this;
+}
+
+
+//=====  XAccessibleContext  ==================================================
+
+sal_Int32 SAL_CALL VCLXAccessibleTextField::getAccessibleChildCount (void)
+    throw (RuntimeException)
+{
+    return 0;
+}
+
+
+
+
+Reference<XAccessible> SAL_CALL VCLXAccessibleTextField::getAccessibleChild (sal_Int32)
+    throw (IndexOutOfBoundsException, RuntimeException)
+{
+    throw IndexOutOfBoundsException();
+}
+
+
+
+
+sal_Int16 SAL_CALL VCLXAccessibleTextField::getAccessibleRole (void)
+    throw (RuntimeException)
+{
+    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+    return AccessibleRole::TEXT;
+}
+
+Reference< XAccessible > SAL_CALL VCLXAccessibleTextField::getAccessibleParent(  )
+    throw (RuntimeException)
+{
+    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+
+    return m_xParent;
+}
+
+
+
+//===== XServiceInfo ==========================================================
+
+::rtl::OUString VCLXAccessibleTextField::getImplementationName (void)
+    throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii ("com.sun.star.comp.toolkit.AccessibleTextField");
+}
+
+
+
+
+Sequence< ::rtl::OUString > VCLXAccessibleTextField::getSupportedServiceNames (void)
+    throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames = VCLXAccessibleTextComponent::getSupportedServiceNames();
+    sal_Int32 nLength = aNames.getLength();
+    aNames.realloc( nLength + 1 );
+    aNames[nLength] = ::rtl::OUString::createFromAscii(
+        "com.sun.star.accessibility.AccessibleTextField");
+    return aNames;
+}
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
new file mode 100644
index 000000000000..a11e1d52c7e3
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -0,0 +1,882 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+
+// includes --------------------------------------------------------------
+#include <accessibility/standard/vclxaccessibletoolbox.hxx>
+#include <accessibility/standard/vclxaccessibletoolboxitem.hxx>
+#include <toolkit/helper/convert.hxx>
+
+#include <unotools/accessiblestatesethelper.hxx>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <tools/debug.hxx>
+#include <vcl/toolbox.hxx>
+#include <comphelper/accessiblewrapper.hxx>
+#include <comphelper/processfactory.hxx>
+
+using namespace ::comphelper;
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::accessibility;
+
+namespace
+{
+    // =========================================================================
+    // = OToolBoxWindowItemContext
+    // =========================================================================
+    /** XAccessibleContext implementation for a toolbox item which is represented by a VCL Window
+    */
+    class OToolBoxWindowItemContext : public OAccessibleContextWrapper
+    {
+        sal_Int32 m_nIndexInParent;
+    public:
+        OToolBoxWindowItemContext(sal_Int32 _nIndexInParent,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& _rxInnerAccessibleContext,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxOwningAccessible,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParentAccessible
+            ) : OAccessibleContextWrapper(
+            _rxORB,
+            _rxInnerAccessibleContext,
+            _rxOwningAccessible,
+            _rxParentAccessible     )
+            ,m_nIndexInParent(_nIndexInParent)
+        {
+        }
+        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException);
+    };
+
+    // -------------------------------------------------------------------------
+    sal_Int32 SAL_CALL OToolBoxWindowItemContext::getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        return m_nIndexInParent;
+    }
+
+    // =========================================================================
+    // = OToolBoxWindowItem
+    // =========================================================================
+    typedef ::cppu::ImplHelper1 <   XUnoTunnel
+                                >   OToolBoxWindowItem_Base;
+
+    /** XAccessible implementation for a toolbox item which is represented by a VCL Window
+    */
+    class OToolBoxWindowItem
+            :public OAccessibleWrapper
+            ,public OToolBoxWindowItem_Base
+    {
+    private:
+        sal_Int32 m_nIndexInParent;
+
+    public:
+        inline sal_Int32    getIndexInParent() const                    { return m_nIndexInParent; }
+        inline void         setIndexInParent( sal_Int32 _nNewIndex )    { m_nIndexInParent = _nNewIndex; }
+
+        static  sal_Bool    isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation = NULL );
+
+    public:
+        OToolBoxWindowItem(sal_Int32 _nIndexInParent,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxInnerAccessible,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParentAccessible
+            ) : OAccessibleWrapper(
+            _rxORB,
+            _rxInnerAccessible,
+            _rxParentAccessible)
+            ,m_nIndexInParent(_nIndexInParent)
+        {
+        }
+
+    protected:
+        // XInterface
+        DECLARE_XINTERFACE( )
+        DECLARE_XTYPEPROVIDER( )
+
+        // OAccessibleWrapper
+        virtual OAccessibleContextWrapper* createAccessibleContext(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& _rxInnerContext
+            );
+
+        // XUnoTunnel
+        virtual sal_Int64 SAL_CALL getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw (RuntimeException);
+        static Sequence< sal_Int8 > getUnoTunnelImplementationId();
+    };
+
+    // -------------------------------------------------------------------------
+    IMPLEMENT_FORWARD_XINTERFACE2( OToolBoxWindowItem, OAccessibleWrapper, OToolBoxWindowItem_Base )
+    IMPLEMENT_FORWARD_XTYPEPROVIDER2( OToolBoxWindowItem, OAccessibleWrapper, OToolBoxWindowItem_Base )
+
+    // -------------------------------------------------------------------------
+    OAccessibleContextWrapper* OToolBoxWindowItem::createAccessibleContext(
+            const Reference< XAccessibleContext >& _rxInnerContext )
+    {
+        return new OToolBoxWindowItemContext( m_nIndexInParent,getORB(), _rxInnerContext, this, getParent() );
+    }
+
+    //--------------------------------------------------------------------
+    sal_Bool OToolBoxWindowItem::isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation )
+    {
+        OToolBoxWindowItem* pImplementation = NULL;
+
+        Reference< XUnoTunnel > xTunnel( _rxAcc, UNO_QUERY );
+        if ( xTunnel.is() )
+            pImplementation = reinterpret_cast< OToolBoxWindowItem* >( xTunnel->getSomething( getUnoTunnelImplementationId() ) );
+
+        if ( _ppImplementation )
+            *_ppImplementation = pImplementation;
+
+        return NULL != pImplementation;
+    }
+
+    //--------------------------------------------------------------------
+    Sequence< sal_Int8 > OToolBoxWindowItem::getUnoTunnelImplementationId()
+    {
+        static ::cppu::OImplementationId * pId = 0;
+        if (! pId)
+        {
+            ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+            if (! pId)
+            {
+                static ::cppu::OImplementationId aId;
+                pId = &aId;
+            }
+        }
+        return pId->getImplementationId();
+    }
+
+    //--------------------------------------------------------------------
+    sal_Int64 SAL_CALL OToolBoxWindowItem::getSomething( const Sequence< sal_Int8 >& _rId ) throw (RuntimeException)
+    {
+        if  (   ( 16 == _rId.getLength() )
+            &&  ( 0 == rtl_compareMemory( getUnoTunnelImplementationId().getConstArray(),  _rId.getConstArray(), 16 ) )
+            )
+            return reinterpret_cast< sal_Int64>( this );
+
+        return 0;
+    }
+}
+
+DBG_NAME(VCLXAccessibleToolBox)
+
+// -----------------------------------------------------------------------------
+// VCLXAccessibleToolBox
+// -----------------------------------------------------------------------------
+VCLXAccessibleToolBox::VCLXAccessibleToolBox( VCLXWindow* pVCLXWindow ) :
+
+    VCLXAccessibleComponent( pVCLXWindow )
+
+{
+    DBG_CTOR(VCLXAccessibleToolBox,NULL);
+}
+// -----------------------------------------------------------------------------
+VCLXAccessibleToolBox::~VCLXAccessibleToolBox()
+{
+    DBG_DTOR(VCLXAccessibleToolBox,NULL);
+}
+// -----------------------------------------------------------------------------
+VCLXAccessibleToolBoxItem* VCLXAccessibleToolBox::GetItem_Impl( sal_Int32 _nPos, bool _bMustHaveFocus )
+{
+    VCLXAccessibleToolBoxItem* pItem = NULL;
+    ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
+    if ( pToolBox && ( !_bMustHaveFocus || pToolBox->HasFocus() ) )
+    {
+        ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.find( _nPos );
+        // returns only toolbox buttons, not windows
+        if ( aIter != m_aAccessibleChildren.end()  && !aIter->second.is())
+            pItem = static_cast< VCLXAccessibleToolBoxItem* >( aIter->second.get() );
+    }
+
+    return pItem;
+}
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleToolBox::UpdateFocus_Impl()
+{
+    ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
+    if( !pToolBox )
+        return;
+
+    // submit events only if toolbox has the focus to avoid sending events due to mouse move
+    sal_Bool bHasFocus = sal_False;
+    if ( pToolBox->HasFocus() )
+        bHasFocus = sal_True;
+    else
+    {
+        // check for subtoolbar, i.e. check if our parent is a toolbar
+        ToolBox* pToolBoxParent = dynamic_cast< ToolBox* >( pToolBox->GetParent() );
+        // subtoolbars never get the focus as key input is just forwarded, so check if the parent toolbar has it
+        if ( pToolBoxParent && pToolBoxParent->HasFocus() )
+            bHasFocus = sal_True;
+    }
+
+    if ( bHasFocus )
+    {
+        sal_uInt16 nHighlightItemId = pToolBox->GetHighlightItemId();
+        sal_uInt16 nFocusCount = 0;
+        for ( ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.begin();
+              aIter != m_aAccessibleChildren.end(); ++aIter )
+        {
+            sal_uInt16 nItemId = pToolBox->GetItemId( (sal_uInt16)aIter->first );
+
+            if ( aIter->second.is() )
+            {
+                VCLXAccessibleToolBoxItem* pItem =
+                    static_cast< VCLXAccessibleToolBoxItem* >( aIter->second.get() );
+                if ( pItem->HasFocus() && nItemId != nHighlightItemId )
+                {
+                    // reset the old focused item
+                    pItem->SetFocus( sal_False );
+                    nFocusCount++;
+                }
+                if ( nItemId == nHighlightItemId )
+                {
+                    // set the new focused item
+                    pItem->SetFocus( sal_True );
+                    nFocusCount++;
+                }
+            }
+        // both items changed?
+        if ( nFocusCount > 1 )
+            break;
+        }
+    }
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBox::ReleaseFocus_Impl( sal_Int32 _nPos )
+{
+    ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
+    if ( pToolBox ) // #107124#, do not check for focus because this message is also handled in losefocus
+    {
+        ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.find( _nPos );
+        if ( aIter != m_aAccessibleChildren.end() && aIter->second.is() )
+        {
+            VCLXAccessibleToolBoxItem* pItem =
+                static_cast< VCLXAccessibleToolBoxItem* >( aIter->second.get() );
+            if ( pItem->HasFocus() )
+                pItem->SetFocus( sal_False );
+        }
+    }
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32  )
+{
+    ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
+    if ( pToolBox )
+    {
+        for ( ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.begin();
+              aIter != m_aAccessibleChildren.end(); ++aIter )
+        {
+                sal_uInt16 nItemId = pToolBox->GetItemId( (sal_uInt16)aIter->first );
+
+                VCLXAccessibleToolBoxItem* pItem =
+                    static_cast< VCLXAccessibleToolBoxItem* >( aIter->second.get() );
+                pItem->SetChecked( pToolBox->IsItemChecked( nItemId ) );
+        }
+    }
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBox::UpdateIndeterminate_Impl( sal_Int32 _nPos )
+{
+    ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
+    if ( pToolBox )
+    {
+        sal_uInt16 nItemId = pToolBox->GetItemId( (sal_uInt16)_nPos );
+
+        ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.find( _nPos );
+        if ( aIter != m_aAccessibleChildren.end() && aIter->second.is() )
+        {
+            VCLXAccessibleToolBoxItem* pItem =
+                static_cast< VCLXAccessibleToolBoxItem* >( aIter->second.get() );
+            if ( pItem )
+                pItem->SetIndeterminate( pToolBox->GetItemState( nItemId ) == STATE_DONTKNOW );
+        }
+    }
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBox::implReleaseToolboxItem( ToolBoxItemsMap::iterator& _rMapPos,
+        bool _bNotifyRemoval, bool _bDispose )
+{
+    Reference< XAccessible > xItemAcc( _rMapPos->second );
+    if ( !xItemAcc.is() )
+        return;
+
+    if ( _bNotifyRemoval )
+    {
+        NotifyAccessibleEvent( AccessibleEventId::CHILD, makeAny( xItemAcc ), Any() );
+    }
+
+    OToolBoxWindowItem* pWindowItem = NULL;
+    if ( !OToolBoxWindowItem::isWindowItem( xItemAcc, &pWindowItem ) )
+    {
+        static_cast< VCLXAccessibleToolBoxItem* >( xItemAcc.get() )->ReleaseToolBox();
+        if ( _bDispose )
+            ::comphelper::disposeComponent( xItemAcc );
+    }
+    else
+    {
+        if ( _bDispose )
+        {
+            if ( pWindowItem )
+            {
+                Reference< XAccessibleContext > xContext( pWindowItem->getContextNoCreate() );
+                ::comphelper::disposeComponent( xContext );
+            }
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBox::UpdateItem_Impl( sal_Int32 _nPos, sal_Bool _bItemAdded )
+{
+    if ( _nPos < sal_Int32( m_aAccessibleChildren.size() ) )
+    {
+        UpdateAllItems_Impl();
+        return;
+    }
+
+    ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
+    if ( pToolBox )
+    {
+        if ( !_bItemAdded )
+        {   // the item was removed
+            // -> destroy the old item
+            ToolBoxItemsMap::iterator aItemPos = m_aAccessibleChildren.find( _nPos );
+            if ( m_aAccessibleChildren.end() != aItemPos )
+            {
+                implReleaseToolboxItem( aItemPos, true, true );
+                m_aAccessibleChildren.erase( aItemPos );
+            }
+        }
+
+        // adjust the "index-in-parent"s
+        ToolBoxItemsMap::iterator aIndexAdjust = m_aAccessibleChildren.upper_bound( _nPos );
+        while ( m_aAccessibleChildren.end() != aIndexAdjust )
+        {
+            Reference< XAccessible > xItemAcc( aIndexAdjust->second );
+
+            OToolBoxWindowItem* pWindowItem = NULL;
+            if ( !OToolBoxWindowItem::isWindowItem( xItemAcc, &pWindowItem ) )
+            {
+                VCLXAccessibleToolBoxItem* pItem = static_cast< VCLXAccessibleToolBoxItem* >( xItemAcc.get() );
+                if ( pItem )
+                {
+                    sal_Int32 nIndex = pItem->getIndexInParent( );
+                    nIndex += _bItemAdded ? +1 : -1;
+                    pItem->setIndexInParent( nIndex );
+                }
+            }
+            else
+            {
+                if ( pWindowItem )
+                {
+                    sal_Int32 nIndex = pWindowItem->getIndexInParent( );
+                    nIndex += _bItemAdded ? +1 : -1;
+                    pWindowItem->setIndexInParent( nIndex );
+                }
+            }
+
+            ++aIndexAdjust;
+        }
+
+        if ( _bItemAdded )
+        {
+            // TODO: we should make this dependent on the existence of event listeners
+            // with the current implementation, we always create accessible object
+            Any aNewChild = makeAny( getAccessibleChild( (sal_Int32)_nPos ) );
+            NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), aNewChild );
+        }
+    }
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBox::UpdateAllItems_Impl()
+{
+    ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
+    if ( pToolBox )
+    {
+        // deregister the old items
+        for ( ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.begin();
+                aIter != m_aAccessibleChildren.end(); ++aIter )
+        {
+            implReleaseToolboxItem( aIter, true, true );
+        }
+        m_aAccessibleChildren.clear();
+
+        // register the new items
+        sal_uInt16 i, nCount = pToolBox->GetItemCount();
+        for ( i = 0; i < nCount; ++i )
+        {
+            Any aNewValue;
+            aNewValue <<= getAccessibleChild( (sal_Int32)i );;
+            NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), aNewValue );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void VCLXAccessibleToolBox::UpdateCustomPopupItemp_Impl( Window* pWindow, bool bOpen )
+{
+    ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
+    if( pWindow && pToolBox )
+    {
+        Reference< XAccessible > xChild( pWindow->GetAccessible() );
+        if( xChild.is() )
+        {
+            Reference< XAccessible > xChildItem( getAccessibleChild( static_cast< sal_Int32 >( pToolBox->GetItemPos( pToolBox->GetDownItemId() ) ) ) );
+            VCLXAccessibleToolBoxItem* pItem = static_cast< VCLXAccessibleToolBoxItem* >( xChildItem.get() );
+
+            pItem->SetChild( xChild );
+            pItem->NotifyChildEvent( xChild, bOpen );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBox::UpdateItemName_Impl( sal_Int32 _nPos )
+{
+    VCLXAccessibleToolBoxItem* pItem = GetItem_Impl( _nPos, false );
+    if ( pItem )
+        pItem->NameChanged();
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBox::UpdateItemEnabled_Impl( sal_Int32 _nPos )
+{
+    VCLXAccessibleToolBoxItem* pItem = GetItem_Impl( _nPos, false );
+    if ( pItem )
+        pItem->ToggleEnableState();
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBox::HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent, bool _bShow )
+{
+    Window* pChildWindow = (Window *) rVclWindowEvent.GetData();
+    ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
+    if ( pChildWindow
+        && pToolBox
+        && pToolBox == pChildWindow->GetParent()
+        && pChildWindow->GetType() == WINDOW_TOOLBOX )
+    {
+        sal_Int32 nIndex = pToolBox->GetItemPos( pToolBox->GetCurItemId() );
+        Reference< XAccessible > xItem = getAccessibleChild( nIndex );
+        if ( xItem.is() )
+        {
+            Reference< XAccessible > xChild = pChildWindow->GetAccessible();
+            VCLXAccessibleToolBoxItem* pItem =
+                static_cast< VCLXAccessibleToolBoxItem* >( xItem.get() );
+            pItem->SetChild( xChild );
+            pItem->NotifyChildEvent( xChild, _bShow );
+        }
+    }
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBox::ReleaseSubToolBox( ToolBox* _pSubToolBox )
+{
+    ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
+    if ( pToolBox )
+    {
+        sal_Int32 nIndex = pToolBox->GetItemPos( pToolBox->GetCurItemId() );
+        Reference< XAccessible > xItem = getAccessibleChild( nIndex );
+        if ( xItem.is() )
+        {
+            Reference< XAccessible > xChild = _pSubToolBox->GetAccessible();
+            VCLXAccessibleToolBoxItem* pItem =
+                static_cast< VCLXAccessibleToolBoxItem* >( xItem.get() );
+            if ( pItem->GetChild() == xChild )
+            {
+                pItem->SetChild( Reference< XAccessible >() );
+                pItem->NotifyChildEvent( xChild, false );
+            }
+        }
+    }
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+{
+    VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet );
+
+    ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
+    if ( pToolBox )
+    {
+        rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+        if ( pToolBox->IsHorizontal() )
+            rStateSet.AddState( AccessibleStateType::HORIZONTAL );
+        else
+            rStateSet.AddState( AccessibleStateType::VERTICAL );
+    }
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
+{
+    // to prevent an early release of the toolbox (VCLEVENT_OBJECT_DYING)
+    Reference< XAccessibleContext > xTemp = this;
+
+    switch ( rVclWindowEvent.GetId() )
+    {
+        case VCLEVENT_TOOLBOX_CLICK:
+        {
+            if ( rVclWindowEvent.GetData() )
+            {
+                UpdateChecked_Impl( (sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData() );
+                UpdateIndeterminate_Impl( (sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData() );
+            }
+            break;
+        }
+        case VCLEVENT_TOOLBOX_DOUBLECLICK:
+        case VCLEVENT_TOOLBOX_ACTIVATE:
+        case VCLEVENT_TOOLBOX_DEACTIVATE:
+        case VCLEVENT_TOOLBOX_SELECT:
+            break;
+
+        case VCLEVENT_TOOLBOX_HIGHLIGHT:
+            UpdateFocus_Impl();
+            break;
+
+        case VCLEVENT_TOOLBOX_HIGHLIGHTOFF:
+            ReleaseFocus_Impl( (sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData() );
+            break;
+
+        case VCLEVENT_TOOLBOX_ITEMADDED :
+//            UpdateItem_Impl( (sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData(), VCLEVENT_TOOLBOX_ITEMADDED == rVclWindowEvent.GetId() );
+            UpdateItem_Impl( (sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData(), sal_True );
+            break;
+
+        case VCLEVENT_TOOLBOX_ITEMREMOVED :
+        case VCLEVENT_TOOLBOX_ALLITEMSCHANGED :
+        {
+            UpdateAllItems_Impl();
+            break;
+        }
+
+        case VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED:
+        {
+            sal_Int32 nPos = (sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData();
+            ToolBoxItemsMap::iterator aAccessiblePos( m_aAccessibleChildren.find( nPos ) );
+            if ( m_aAccessibleChildren.end() != aAccessiblePos )
+            {
+                implReleaseToolboxItem( aAccessiblePos, false, true );
+                m_aAccessibleChildren.erase (aAccessiblePos);
+            }
+
+            Any aNewValue;
+            aNewValue <<= getAccessibleChild(nPos);
+            NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), aNewValue );
+            break;
+        }
+        case VCLEVENT_TOOLBOX_ITEMTEXTCHANGED :
+            UpdateItemName_Impl( (sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData() );
+            break;
+
+        case VCLEVENT_TOOLBOX_ITEMENABLED :
+        case VCLEVENT_TOOLBOX_ITEMDISABLED :
+        {
+            UpdateItemEnabled_Impl( (sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData() );
+            break;
+        }
+
+        case VCLEVENT_DROPDOWN_OPEN:
+        case VCLEVENT_DROPDOWN_CLOSE:
+        {
+            UpdateCustomPopupItemp_Impl( static_cast< Window* >( rVclWindowEvent.GetData() ), rVclWindowEvent.GetId() == VCLEVENT_DROPDOWN_OPEN );
+            break;
+        }
+
+        case VCLEVENT_OBJECT_DYING :
+        {
+            // if this toolbox is a subtoolbox, we have to relese it from its parent
+            ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
+            if ( pToolBox && pToolBox->GetParent() &&
+                 pToolBox->GetParent()->GetType() == WINDOW_TOOLBOX )
+            {
+                VCLXAccessibleToolBox* pParent = static_cast< VCLXAccessibleToolBox* >(
+                    pToolBox->GetParent()->GetAccessible()->getAccessibleContext().get() );
+                if ( pParent )
+                    pParent->ReleaseSubToolBox( pToolBox );
+            }
+
+            // dispose all items
+            for ( ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.begin();
+                  aIter != m_aAccessibleChildren.end(); ++aIter )
+            {
+                implReleaseToolboxItem( aIter, false, true );
+            }
+            m_aAccessibleChildren.clear();
+
+            //!!! no break to call base class
+        }
+
+        default:
+            VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
+    }
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent )
+{
+    switch ( rVclWindowEvent.GetId() )
+    {
+        case VCLEVENT_WINDOW_SHOW:  // send create on show for direct accessible children
+        {
+            Reference< XAccessible > xReturn = GetItemWindowAccessible(rVclWindowEvent);
+            if ( xReturn.is() )
+                NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), makeAny(xReturn) );
+            else
+                HandleSubToolBarEvent( rVclWindowEvent, true );
+        }
+        break;
+
+        default:
+           VCLXAccessibleComponent::ProcessWindowChildEvent( rVclWindowEvent );
+
+    }
+}
+// -----------------------------------------------------------------------------
+// XInterface
+// -----------------------------------------------------------------------------
+IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleToolBox, VCLXAccessibleComponent, VCLXAccessibleToolBox_BASE )
+// -----------------------------------------------------------------------------
+// XTypeProvider
+// -----------------------------------------------------------------------------
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleToolBox, VCLXAccessibleComponent, VCLXAccessibleToolBox_BASE )
+// -----------------------------------------------------------------------------
+// XComponent
+// -----------------------------------------------------------------------------
+void SAL_CALL VCLXAccessibleToolBox::disposing()
+{
+    VCLXAccessibleComponent::disposing();
+
+    // release the items
+    for ( ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.begin();
+          aIter != m_aAccessibleChildren.end(); ++aIter )
+    {
+        implReleaseToolboxItem( aIter, false, true );
+    }
+    m_aAccessibleChildren.clear();
+}
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+::rtl::OUString VCLXAccessibleToolBox::getImplementationName() throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleToolBox" );
+}
+// -----------------------------------------------------------------------------
+Sequence< ::rtl::OUString > VCLXAccessibleToolBox::getSupportedServiceNames() throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames = VCLXAccessibleComponent::getSupportedServiceNames();
+    sal_Int32 nLength = aNames.getLength();
+    aNames.realloc( nLength + 1 );
+    aNames[nLength] = ::rtl::OUString::createFromAscii( "com.sun.star.accessibility.AccessibleToolBox" );
+    return aNames;
+}
+// -----------------------------------------------------------------------------
+// XAccessibleContext
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL VCLXAccessibleToolBox::getAccessibleChildCount(  ) throw (RuntimeException)
+{
+    comphelper::OExternalLockGuard aGuard( this );
+
+    sal_Int32 nCount = 0;
+    ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
+    if ( pToolBox )
+        nCount = pToolBox->GetItemCount();
+
+    return nCount;
+}
+// -----------------------------------------------------------------------------
+Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    if ( i < 0 || i >= getAccessibleChildCount() )
+        throw IndexOutOfBoundsException();
+
+    comphelper::OExternalLockGuard aGuard( this );
+
+    ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
+    if ( pToolBox )
+    {
+        Reference< XAccessible > xChild;
+        // search for the child
+        ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.find(i);
+        if ( m_aAccessibleChildren.end() == aIter )
+        {
+            sal_uInt16 nItemId = pToolBox->GetItemId( (sal_uInt16)i );
+            sal_uInt16 nHighlightItemId = pToolBox->GetHighlightItemId();
+            Window* pItemWindow = pToolBox->GetItemWindow( nItemId );
+            // not found -> create a new child
+            VCLXAccessibleToolBoxItem* pChild = new VCLXAccessibleToolBoxItem( pToolBox, i );
+            Reference< XAccessible> xParent = pChild;
+            if ( pItemWindow )
+            {
+                xChild = new OToolBoxWindowItem(0,::comphelper::getProcessServiceFactory(),pItemWindow->GetAccessible(),xParent);
+                pItemWindow->SetAccessible(xChild);
+                pChild->SetChild( xChild );
+            }
+            xChild = pChild;
+            if ( nHighlightItemId > 0 && nItemId == nHighlightItemId )
+                pChild->SetFocus( sal_True );
+            if ( pToolBox->IsItemChecked( nItemId ) )
+                pChild->SetChecked( sal_True );
+            if ( pToolBox->GetItemState( nItemId ) == STATE_DONTKNOW )
+                pChild->SetIndeterminate( true );
+            m_aAccessibleChildren.insert( ToolBoxItemsMap::value_type( i, xChild ) );
+        }
+        else
+        {
+            // found it
+            xChild = aIter->second;
+        }
+        return xChild;
+    }
+
+    return NULL;
+}
+// -----------------------------------------------------------------------------
+Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( const awt::Point& _rPoint ) throw (RuntimeException)
+{
+    comphelper::OExternalLockGuard aGuard( this );
+
+    Reference< XAccessible > xAccessible;
+    ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
+    if ( pToolBox )
+    {
+        sal_uInt16 nItemPos = pToolBox->GetItemPos( VCLPoint( _rPoint ) );
+        if ( nItemPos != TOOLBOX_ITEM_NOTFOUND )
+            xAccessible = getAccessibleChild( nItemPos );
+    }
+
+    return xAccessible;
+}
+// -----------------------------------------------------------------------------
+Reference< XAccessible > VCLXAccessibleToolBox::GetItemWindowAccessible( const VclWindowEvent& rVclWindowEvent )
+{
+    Reference< XAccessible > xReturn;
+    Window* pChildWindow = (Window *) rVclWindowEvent.GetData();
+    ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
+    if ( pChildWindow && pToolBox )
+    {
+        sal_uInt16 nCount = pToolBox->GetItemCount();
+        for (sal_uInt16 i = 0 ; i < nCount && !xReturn.is() ; ++i)
+        {
+            sal_uInt16 nItemId = pToolBox->GetItemId( i );
+            Window* pItemWindow = pToolBox->GetItemWindow( nItemId );
+            if ( pItemWindow == pChildWindow )
+                xReturn = getAccessibleChild(i);
+        }
+    }
+    return xReturn;
+}
+// -----------------------------------------------------------------------------
+Reference< XAccessible > VCLXAccessibleToolBox::GetChildAccessible( const VclWindowEvent& rVclWindowEvent )
+{
+    Reference< XAccessible > xReturn = GetItemWindowAccessible(rVclWindowEvent);
+
+    if ( !xReturn.is() )
+        xReturn = VCLXAccessibleComponent::GetChildAccessible(rVclWindowEvent);
+    return xReturn;
+}
+// -----------------------------------------------------------------------------
+// XAccessibleSelection
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+    if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
+        throw IndexOutOfBoundsException();
+    ToolBox * pToolBox = static_cast < ToolBox * > ( GetWindow() );
+    sal_uInt16 nPos = static_cast < sal_uInt16 > (nChildIndex);
+    pToolBox->ChangeHighlight( nPos );
+}
+// -----------------------------------------------------------------------------
+sal_Bool VCLXAccessibleToolBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+    if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
+        throw IndexOutOfBoundsException();
+    ToolBox * pToolBox = static_cast < ToolBox * > ( GetWindow() );
+    sal_uInt16 nPos = static_cast < sal_uInt16 > (nChildIndex);
+    if ( pToolBox != NULL && pToolBox->GetHighlightItemId() == pToolBox->GetItemId( nPos ) )
+        return sal_True;
+    else
+        return sal_False;
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBox::clearAccessibleSelection(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+    ToolBox * pToolBox = static_cast < ToolBox * > ( GetWindow() );
+    pToolBox -> LoseFocus();
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBox::selectAllAccessibleChildren(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+    // intentionally empty. makes no sense for a toolbox
+}
+// -----------------------------------------------------------------------------
+sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+    sal_Int32 nRet = 0;
+    for ( sal_Int32 i = 0, nCount = getAccessibleChildCount(); i < nCount; i++ )
+    {
+        if ( isAccessibleChildSelected( i ) )
+        {
+            nRet = 1;
+            break; // a toolbox can only have (n)one selected child
+        }
+    }
+    return nRet;
+}
+// -----------------------------------------------------------------------------
+Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+    if ( nSelectedChildIndex < 0 || nSelectedChildIndex >= getSelectedAccessibleChildCount() )
+        throw IndexOutOfBoundsException();
+    Reference< XAccessible > xChild;
+    for ( sal_Int32 i = 0, j = 0, nCount = getAccessibleChildCount(); i < nCount; i++ )
+    {
+        if ( isAccessibleChildSelected( i ) && ( j++ == nSelectedChildIndex ) )
+        {
+            xChild = getAccessibleChild( i );
+            break;
+        }
+    }
+    return xChild;
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBox::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+    if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
+        throw IndexOutOfBoundsException();
+    clearAccessibleSelection(); // a toolbox can only have (n)one selected child
+}
+// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
new file mode 100644
index 000000000000..d4ad29a27bef
--- /dev/null
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -0,0 +1,718 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_accessibility.hxx"
+#include <accessibility/standard/vclxaccessibletoolboxitem.hxx>
+#include <toolkit/helper/convert.hxx>
+#include <accessibility/helper/accresmgr.hxx>
+#include <accessibility/helper/accessiblestrings.hrc>
+#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/Size.hpp>
+
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
+#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
+#include <tools/debug.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/toolbox.hxx>
+#include <vcl/unohelp2.hxx>
+#include <vcl/help.hxx>
+#include <toolkit/awt/vclxwindow.hxx>
+#include <toolkit/helper/externallock.hxx>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <unotools/accessiblerelationsethelper.hxx>
+#include <cppuhelper/typeprovider.hxx>
+#include <comphelper/sequence.hxx>
+
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+
+// class VCLXAccessibleToolBoxItem ------------------------------------------
+
+using namespace ::com::sun::star::accessibility;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star;
+using namespace ::comphelper;
+
+DBG_NAME(VCLXAccessibleToolBoxItem)
+
+// -----------------------------------------------------------------------------
+// Ctor() and Dtor()
+// -----------------------------------------------------------------------------
+VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_Int32 _nPos ) :
+
+    AccessibleTextHelper_BASE( new VCLExternalSolarLock() ),
+
+    m_pToolBox      ( _pToolBox ),
+    m_nIndexInParent( _nPos ),
+    m_nRole         ( AccessibleRole::PUSH_BUTTON ),
+    m_nItemId       ( 0 ),
+    m_bHasFocus     ( sal_False ),
+    m_bIsChecked    ( sal_False ),
+    m_bIndeterminate( false )
+
+{
+    DBG_CTOR( VCLXAccessibleToolBoxItem, NULL );
+
+    m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock( ) );
+
+    DBG_ASSERT( m_pToolBox, "invalid toolbox" );
+    m_nItemId = m_pToolBox->GetItemId( (sal_uInt16)m_nIndexInParent );
+    m_sOldName = GetText( true );
+    m_bIsChecked = m_pToolBox->IsItemChecked( m_nItemId );
+    m_bIndeterminate = ( m_pToolBox->GetItemState( m_nItemId ) == STATE_DONTKNOW );
+    ToolBoxItemType eType = m_pToolBox->GetItemType( (sal_uInt16)m_nIndexInParent );
+    switch ( eType )
+    {
+        case TOOLBOXITEM_BUTTON :
+        {
+            ToolBoxItemBits nBits = m_pToolBox->GetItemBits( m_nItemId );
+            if (( nBits & TIB_DROPDOWN ) == TIB_DROPDOWN)
+                m_nRole = AccessibleRole::BUTTON_DROPDOWN;
+            else if (( ( nBits & TIB_CHECKABLE ) == TIB_CHECKABLE ) ||
+                ( ( nBits & TIB_AUTOCHECK ) == TIB_AUTOCHECK ) )
+                m_nRole = AccessibleRole::TOGGLE_BUTTON;
+            else if ( m_pToolBox->GetItemWindow( m_nItemId ) )
+                m_nRole = AccessibleRole::PANEL;
+            break;
+        }
+
+        case TOOLBOXITEM_SPACE :
+            m_nRole = AccessibleRole::FILLER;
+            break;
+
+        case TOOLBOXITEM_SEPARATOR :
+        case TOOLBOXITEM_BREAK :
+            m_nRole = AccessibleRole::SEPARATOR;
+            break;
+
+        default:
+        {
+            DBG_ERRORFILE( "unsupported toolbox itemtype" );
+        }
+    }
+}
+// -----------------------------------------------------------------------------
+VCLXAccessibleToolBoxItem::~VCLXAccessibleToolBoxItem()
+{
+    DBG_DTOR( VCLXAccessibleToolBoxItem, NULL );
+
+    delete m_pExternalLock;
+    m_pExternalLock = NULL;
+}
+// -----------------------------------------------------------------------------
+::rtl::OUString VCLXAccessibleToolBoxItem::GetText( bool _bAsName )
+{
+    ::rtl::OUString sRet;
+    // no text for separators and spaces
+    if ( m_pToolBox && m_nItemId > 0 && ( _bAsName || m_pToolBox->GetButtonType() != BUTTON_SYMBOL ) )
+    {
+        sRet = m_pToolBox->GetItemText( m_nItemId );
+//OJ #108243# we only read the name of the toolboxitem
+//
+//      Window* pItemWindow = m_pToolBox->GetItemWindow( m_nItemId );
+//      if ( pItemWindow && pItemWindow->GetAccessible().is() &&
+//           pItemWindow->GetAccessible()->getAccessibleContext().is() )
+//      {
+//          ::rtl::OUString sWinText = pItemWindow->GetAccessible()->getAccessibleContext()->getAccessibleName();
+//          if ( ( sRet.getLength() > 0 ) && ( sWinText.getLength() > 0 ) )
+//              sRet += String( RTL_CONSTASCII_USTRINGPARAM( " " ) );
+//          sRet += sWinText;
+//      }
+    }
+    return sRet;
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBoxItem::SetFocus( sal_Bool _bFocus )
+{
+    if ( m_bHasFocus != _bFocus )
+    {
+        Any aOldValue;
+        Any aNewValue;
+        if ( m_bHasFocus )
+            aOldValue <<= AccessibleStateType::FOCUSED;
+        else
+            aNewValue <<= AccessibleStateType::FOCUSED;
+        m_bHasFocus = _bFocus;
+         NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+    }
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBoxItem::SetChecked( sal_Bool _bCheck )
+{
+    if ( m_bIsChecked != _bCheck )
+    {
+        Any aOldValue;
+        Any aNewValue;
+        if ( m_bIsChecked )
+            aOldValue <<= AccessibleStateType::CHECKED;
+        else
+            aNewValue <<= AccessibleStateType::CHECKED;
+        m_bIsChecked = _bCheck;
+        NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+    }
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBoxItem::SetIndeterminate( bool _bIndeterminate )
+{
+    if ( m_bIndeterminate != _bIndeterminate )
+    {
+        Any aOldValue, aNewValue;
+        if ( m_bIndeterminate )
+            aOldValue <<= AccessibleStateType::INDETERMINATE;
+        else
+            aNewValue <<= AccessibleStateType::INDETERMINATE;
+        m_bIndeterminate = _bIndeterminate;
+        NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+    }
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBoxItem::NameChanged()
+{
+    ::rtl::OUString sNewName = implGetText();
+    if ( sNewName != m_sOldName )
+    {
+        Any aOldValue, aNewValue;
+        aOldValue <<= m_sOldName;
+        // save new name as old name for next change
+        m_sOldName = sNewName;
+        aNewValue <<= m_sOldName;
+        NotifyAccessibleEvent( AccessibleEventId::NAME_CHANGED, aOldValue, aNewValue );
+    }
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBoxItem::SetChild( const Reference< XAccessible >& _xChild )
+{
+    m_xChild = _xChild;
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBoxItem::NotifyChildEvent( const Reference< XAccessible >& _xChild, bool _bShow )
+{
+    Any aOld = _bShow ? Any() : makeAny( _xChild );
+    Any aNew = _bShow ? makeAny( _xChild ) : Any();
+    NotifyAccessibleEvent( AccessibleEventId::CHILD, aOld, aNew );
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBoxItem::ToggleEnableState()
+{
+    Any aOldValue[2], aNewValue[2];
+    if ( m_pToolBox->IsItemEnabled( m_nItemId ) )
+    {
+        aNewValue[0] <<= AccessibleStateType::SENSITIVE;
+        aNewValue[1] <<= AccessibleStateType::ENABLED;
+    }
+    else
+    {
+        aOldValue[0] <<= AccessibleStateType::ENABLED;
+        aOldValue[1] <<= AccessibleStateType::SENSITIVE;
+    }
+
+    NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[0], aNewValue[0] );
+    NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[1], aNewValue[1] );
+}
+// -----------------------------------------------------------------------------
+awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::implGetBounds(  ) throw (RuntimeException)
+{
+    awt::Rectangle aRect;
+    if ( m_pToolBox )
+        aRect = AWTRectangle( m_pToolBox->GetItemPosRect( (sal_uInt16)m_nIndexInParent ) );
+
+    return aRect;
+}
+// -----------------------------------------------------------------------------
+::rtl::OUString VCLXAccessibleToolBoxItem::implGetText()
+{
+    return GetText (true);
+}
+// -----------------------------------------------------------------------------
+Locale VCLXAccessibleToolBoxItem::implGetLocale()
+{
+    return Application::GetSettings().GetUILocale();
+}
+// -----------------------------------------------------------------------------
+void VCLXAccessibleToolBoxItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex )
+{
+    nStartIndex = 0;
+    nEndIndex = 0;
+}
+// -----------------------------------------------------------------------------
+// XInterface
+// -----------------------------------------------------------------------------
+IMPLEMENT_FORWARD_REFCOUNT( VCLXAccessibleToolBoxItem, AccessibleTextHelper_BASE )
+Any SAL_CALL VCLXAccessibleToolBoxItem::queryInterface( const Type& _rType ) throw (RuntimeException)
+{
+    // --> PB 2004-09-03 #i33611# - toolbox buttons without text don't support XAccessibleText
+    if ( _rType == ::getCppuType( ( const Reference< XAccessibleText >* ) 0 )
+        && ( !m_pToolBox || m_pToolBox->GetButtonType() == BUTTON_SYMBOL ) )
+        return Any();
+    // <--
+
+    ::com::sun::star::uno::Any aReturn = AccessibleTextHelper_BASE::queryInterface( _rType );
+    if ( !aReturn.hasValue() )
+        aReturn = VCLXAccessibleToolBoxItem_BASE::queryInterface( _rType );
+    return aReturn;
+}
+// -----------------------------------------------------------------------------
+// XTypeProvider
+// -----------------------------------------------------------------------------
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleToolBoxItem, AccessibleTextHelper_BASE, VCLXAccessibleToolBoxItem_BASE )
+// -----------------------------------------------------------------------------
+// XComponent
+// -----------------------------------------------------------------------------
+void SAL_CALL VCLXAccessibleToolBoxItem::disposing()
+{
+    AccessibleTextHelper_BASE::disposing();
+    m_pToolBox = NULL;
+}
+// -----------------------------------------------------------------------------
+// XServiceInfo
+// -----------------------------------------------------------------------------
+::rtl::OUString VCLXAccessibleToolBoxItem::getImplementationName() throw (RuntimeException)
+{
+    return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleToolBoxItem" );
+}
+// -----------------------------------------------------------------------------
+sal_Bool VCLXAccessibleToolBoxItem::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames( getSupportedServiceNames() );
+    const ::rtl::OUString* pNames = aNames.getConstArray();
+    const ::rtl::OUString* pEnd = pNames + aNames.getLength();
+    for ( ; pNames != pEnd && !pNames->equals( rServiceName ); ++pNames )
+        ;
+
+    return pNames != pEnd;
+}
+// -----------------------------------------------------------------------------
+Sequence< ::rtl::OUString > VCLXAccessibleToolBoxItem::getSupportedServiceNames() throw (RuntimeException)
+{
+    Sequence< ::rtl::OUString > aNames(4);
+    aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.accessibility.AccessibleContext" );
+    aNames[1] = ::rtl::OUString::createFromAscii( "com.sun.star.accessibility.AccessibleComponent" );
+    aNames[2] = ::rtl::OUString::createFromAscii( "com.sun.star.accessibility.AccessibleExtendedComponent" );
+    aNames[3] = ::rtl::OUString::createFromAscii( "com.sun.star.accessibility.AccessibleToolBoxItem" );
+    return aNames;
+}
+// -----------------------------------------------------------------------------
+// XAccessible
+// -----------------------------------------------------------------------------
+Reference< XAccessibleContext > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleContext(  ) throw (RuntimeException)
+{
+    return this;
+}
+// -----------------------------------------------------------------------------
+// XAccessibleContext
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChildCount(  ) throw (RuntimeException)
+{
+    OContextEntryGuard aGuard( this );
+
+    return m_xChild.is() ? 1 : 0;
+}
+// -----------------------------------------------------------------------------
+Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChild( sal_Int32 i ) throw (RuntimeException,  com::sun::star::lang::IndexOutOfBoundsException)
+{
+    OContextEntryGuard aGuard( this );
+
+    // no child -> so index is out of bounds
+    if ( !m_xChild.is() || i != 0 )
+        throw IndexOutOfBoundsException();
+
+    return m_xChild;
+}
+// -----------------------------------------------------------------------------
+Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleParent(  ) throw (RuntimeException)
+{
+    OContextEntryGuard aGuard( this );
+
+    return m_pToolBox->GetAccessible();
+}
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleIndexInParent(  ) throw (RuntimeException)
+{
+    OContextEntryGuard aGuard( this );
+
+    return m_nIndexInParent;
+}
+// -----------------------------------------------------------------------------
+sal_Int16 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRole(  ) throw (RuntimeException)
+{
+    OContextEntryGuard aGuard( this );
+
+    return m_nRole;
+}
+// -----------------------------------------------------------------------------
+::rtl::OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleDescription(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    ::rtl::OUString sDescription;
+    if ( m_pToolBox )
+        sDescription = m_pToolBox->GetHelpText( m_nItemId );
+
+    return sDescription;
+}
+// -----------------------------------------------------------------------------
+::rtl::OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    // entry text == accessible name
+    return GetText( true );
+}
+// -----------------------------------------------------------------------------
+Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRelationSet(  ) throw (RuntimeException)
+{
+    OContextEntryGuard aGuard( this );
+
+    utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper;
+    Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
+    return xSet;
+}
+// -----------------------------------------------------------------------------
+Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleStateSet(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper;
+    Reference< XAccessibleStateSet > xStateSet = pStateSetHelper;
+
+    if ( m_pToolBox && !rBHelper.bDisposed && !rBHelper.bInDispose )
+    {
+        pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE );
+        if ( m_bIsChecked )
+            pStateSetHelper->AddState( AccessibleStateType::CHECKED );
+        if ( m_bIndeterminate )
+            pStateSetHelper->AddState( AccessibleStateType::INDETERMINATE );
+        if ( m_pToolBox->IsItemEnabled( m_nItemId ) )
+        {
+            pStateSetHelper->AddState( AccessibleStateType::ENABLED );
+            pStateSetHelper->AddState( AccessibleStateType::SENSITIVE );
+        }
+        if ( m_pToolBox->IsItemVisible( m_nItemId ) )
+            pStateSetHelper->AddState( AccessibleStateType::VISIBLE );
+        if ( m_pToolBox->IsItemReallyVisible( m_nItemId ) )
+            pStateSetHelper->AddState( AccessibleStateType::SHOWING );
+        if ( m_bHasFocus )
+            pStateSetHelper->AddState( AccessibleStateType::FOCUSED );
+    }
+    else
+        pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+
+    return xStateSet;
+}
+// -----------------------------------------------------------------------------
+// XAccessibleText
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getCaretPosition() throw (RuntimeException)
+{
+    return -1;
+}
+// -----------------------------------------------------------------------------
+sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    return sal_False;
+}
+// -----------------------------------------------------------------------------
+Sequence< PropertyValue > SAL_CALL VCLXAccessibleToolBoxItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< ::rtl::OUString >& ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    ::rtl::OUString sText( implGetText() );
+
+    if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    return Sequence< PropertyValue >();
+}
+// -----------------------------------------------------------------------------
+awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    ::rtl::OUString sText( implGetText() );
+
+    if ( !implIsValidIndex( nIndex, sText.getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    awt::Rectangle aBounds( 0, 0, 0, 0 );
+    if ( m_pToolBox && m_pToolBox->GetButtonType() != BUTTON_SYMBOL ) // symbol buttons have no character bounds
+    {
+        Rectangle aCharRect = m_pToolBox->GetCharacterBounds( m_nItemId, nIndex );
+        Rectangle aItemRect = m_pToolBox->GetItemRect( m_nItemId );
+        aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
+        aBounds = AWTRectangle( aCharRect );
+    }
+
+    return aBounds;
+}
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nIndex = -1;
+    if ( m_pToolBox && m_pToolBox->GetButtonType() != BUTTON_SYMBOL ) // symbol buttons have no character bounds
+    {
+        sal_uInt16 nItemId = 0;
+        Rectangle aItemRect = m_pToolBox->GetItemRect( m_nItemId );
+        Point aPnt( VCLPoint( aPoint ) );
+        aPnt += aItemRect.TopLeft();
+        sal_Int32 nIdx = m_pToolBox->GetIndexForPoint( aPnt, nItemId );
+        if ( nIdx != -1 && nItemId == m_nItemId )
+            nIndex = nIdx;
+    }
+
+    return nIndex;
+}
+// -----------------------------------------------------------------------------
+sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    return sal_False;
+}
+// -----------------------------------------------------------------------------
+sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) )
+        throw IndexOutOfBoundsException();
+
+    sal_Bool bReturn = sal_False;
+
+    if ( m_pToolBox )
+    {
+        Reference< datatransfer::clipboard::XClipboard > xClipboard = m_pToolBox->GetClipboard();
+        if ( xClipboard.is() )
+        {
+            ::rtl::OUString sText( getTextRange( nStartIndex, nEndIndex ) );
+
+            ::vcl::unohelper::TextDataObject* pDataObj = new ::vcl::unohelper::TextDataObject( sText );
+            const sal_uInt32 nRef = Application::ReleaseSolarMutex();
+            xClipboard->setContents( pDataObj, NULL );
+
+            Reference< datatransfer::clipboard::XFlushableClipboard > xFlushableClipboard( xClipboard, uno::UNO_QUERY );
+            if( xFlushableClipboard.is() )
+                xFlushableClipboard->flushClipboard();
+
+            Application::AcquireSolarMutex( nRef );
+
+            bReturn = sal_True;
+        }
+    }
+
+    return bReturn;
+}
+// -----------------------------------------------------------------------------
+// XAccessibleComponent
+// -----------------------------------------------------------------------------
+Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException)
+{
+    return Reference< XAccessible >();
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL VCLXAccessibleToolBoxItem::grabFocus(  ) throw (RuntimeException)
+{
+    Reference< XAccessible > xParent(getAccessibleParent());
+
+    if( xParent.is() )
+    {
+        Reference< XAccessibleSelection > rxAccessibleSelection(xParent->getAccessibleContext(), UNO_QUERY);
+
+        if ( rxAccessibleSelection.is() )
+        {
+            rxAccessibleSelection -> selectAccessibleChild ( getAccessibleIndexInParent() );
+        }
+    }
+}
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getForeground(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nColor = 0;
+    if ( m_pToolBox )
+       nColor = m_pToolBox->GetControlForeground().GetColor();
+
+    return nColor;
+}
+// -----------------------------------------------------------------------------
+sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Int32 nColor = 0;
+    if ( m_pToolBox )
+       nColor = m_pToolBox->GetControlBackground().GetColor();
+
+    return nColor;
+}
+// -----------------------------------------------------------------------------
+// XAccessibleExtendedComponent
+// -----------------------------------------------------------------------------
+Reference< awt::XFont > SAL_CALL VCLXAccessibleToolBoxItem::getFont(    ) throw (RuntimeException)
+{
+    return uno::Reference< awt::XFont >();
+}
+// -----------------------------------------------------------------------------
+awt::FontDescriptor SAL_CALL VCLXAccessibleToolBoxItem::getFontMetrics( const Reference< awt::XFont >& xFont ) throw (RuntimeException)
+{
+    return xFont->getFontDescriptor();
+}
+// -----------------------------------------------------------------------------
+::rtl::OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    ::rtl::OUString sRet;
+    if ( m_pToolBox )
+        sRet = m_pToolBox->GetItemText( m_nItemId );
+
+    return sRet;
+}
+// -----------------------------------------------------------------------------
+::rtl::OUString SAL_CALL VCLXAccessibleToolBoxItem::getToolTipText(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    ::rtl::OUString sRet;
+    if ( m_pToolBox )
+    {
+        if ( Help::IsExtHelpEnabled() )
+            sRet = m_pToolBox->GetHelpText( m_nItemId );
+        else
+            sRet = m_pToolBox->GetQuickHelpText( m_nItemId );
+        if ( !sRet.getLength() )
+            // no help text set, so use item text
+            sRet = m_pToolBox->GetItemText( m_nItemId );
+    }
+    return sRet;
+}
+// -----------------------------------------------------------------------------
+// XAccessibleAction
+// -----------------------------------------------------------------------------
+sal_Int32 VCLXAccessibleToolBoxItem::getAccessibleActionCount( ) throw (RuntimeException)
+{
+    // only one action -> "Click"
+    return 1;
+}
+// -----------------------------------------------------------------------------
+sal_Bool VCLXAccessibleToolBoxItem::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    if ( m_pToolBox )
+        m_pToolBox->TriggerItem( m_nItemId );
+
+    return sal_True;
+}
+// -----------------------------------------------------------------------------
+::rtl::OUString VCLXAccessibleToolBoxItem::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) );
+}
+// -----------------------------------------------------------------------------
+Reference< XAccessibleKeyBinding > VCLXAccessibleToolBoxItem::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+{
+    OContextEntryGuard aGuard( this );
+
+    if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
+        throw IndexOutOfBoundsException();
+
+    return Reference< XAccessibleKeyBinding >();
+}
+// -----------------------------------------------------------------------------
+// XAccessibleValue
+// -----------------------------------------------------------------------------
+Any VCLXAccessibleToolBoxItem::getCurrentValue(  ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    Any aValue;
+    if ( m_pToolBox )
+        aValue <<= (sal_Int32)m_pToolBox->IsItemChecked( m_nItemId );
+
+    return aValue;
+}
+// -----------------------------------------------------------------------------
+sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) throw (RuntimeException)
+{
+    OExternalLockGuard aGuard( this );
+
+    sal_Bool bReturn = sal_False;
+
+    if ( m_pToolBox )
+    {
+        sal_Int32 nValue = 0;
+        OSL_VERIFY( aNumber >>= nValue );
+
+        if ( nValue < 0 )
+            nValue = 0;
+        else if ( nValue > 1 )
+            nValue = 1;
+
+        m_pToolBox->CheckItem( m_nItemId, (sal_Bool) nValue );
+        bReturn = sal_True;
+    }
+
+    return bReturn;
+}
+// -----------------------------------------------------------------------------
+Any VCLXAccessibleToolBoxItem::getMaximumValue(  ) throw (RuntimeException)
+{
+    return makeAny((sal_Int32)1);
+}
+// -----------------------------------------------------------------------------
+Any VCLXAccessibleToolBoxItem::getMinimumValue(  ) throw (RuntimeException)
+{
+    return makeAny((sal_Int32)0);
+}
+// -----------------------------------------------------------------------------
+
+
diff --git a/accessibility/util/acc.map b/accessibility/util/acc.map
new file mode 100644
index 000000000000..b9e53f414df5
--- /dev/null
+++ b/accessibility/util/acc.map
@@ -0,0 +1,7 @@
+UDK_3_0_0 {
+    global:
+        getStandardAccessibleFactory;
+        getSvtAccessibilityComponentFactory;
+    local:
+        *;
+};
diff --git a/accessibility/util/makefile.mk b/accessibility/util/makefile.mk
new file mode 100644
index 000000000000..42a6061fa2c9
--- /dev/null
+++ b/accessibility/util/makefile.mk
@@ -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.
+#
+#*************************************************************************
+
+PRJ=..
+PRJNAME=accessibility
+TARGET=acc
+USE_DEFFILE=TRUE
+
+# --- Settings ----------------------------------
+
+.INCLUDE :	settings.mk
+
+#.INCLUDE :	svpre.mk
+#.INCLUDE :	settings.mk
+#.INCLUDE :	sv.mk
+
+LDUMP=ldump2.exe
+
+# --- Library -----------------------------------
+# --- acc ---------------------------------------
+LIB1TARGET=$(SLB)$/$(PRJNAME).lib
+LIB1FILES=\
+        $(SLB)$/standard.lib \
+        $(SLB)$/extended.lib \
+        $(SLB)$/helper.lib
+
+SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
+
+SHL1STDLIBS= \
+        $(VCLLIB)           \
+        $(COMPHELPERLIB)    \
+        $(SOTLIB)           \
+        $(CPPULIB)          \
+        $(CPPUHELPERLIB)    \
+        $(UNOTOOLSLIB)      \
+        $(TKLIB)            \
+        $(TOOLSLIB)         \
+        $(SVTOOLLIB)        \
+        $(SVLLIB)           \
+        $(SALLIB)
+
+SHL1LIBS=$(LIB1TARGET)
+SHL1DEPN=$(LIB1TARGET)	\
+        makefile.mk
+
+
+SHL1VERSIONMAP= $(TARGET).map 
+SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
+DEF1NAME=       $(SHL1TARGET)
+
+# === .res file ==========================================================
+
+RES1FILELIST=\
+            $(SRS)$/helper.srs
+
+RESLIB1NAME=$(TARGET)
+RESLIB1SRSFILES=$(RES1FILELIST)
+
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
+
diff --git a/accessibility/workben/TODO b/accessibility/workben/TODO
new file mode 100644
index 000000000000..6fdfd5cb81aa
--- /dev/null
+++ b/accessibility/workben/TODO
@@ -0,0 +1,13 @@
+This is a unsorted list of TODO's and idea regarding the Accessibility Workbench
+
+* increase repaint performance
+* fix paint problems in ObjectViewContainer for e.g. File menu
+* change package structure to be flat (apps don't need deep package names)
+* add ant build script(s)
+* evaluate TreeTable as enhanced overview
+* add error panel and a bunch of consistency checks
+* add focus tracking mode
+* evaluate drawing transparent frames at screen coordinates of an object
+* enhance text view (colors)
+* add table view
+* more generic view loading (Class.forName())
diff --git a/accessibility/workben/makefile b/accessibility/workben/makefile
new file mode 100644
index 000000000000..4bd7c05e44dd
--- /dev/null
+++ b/accessibility/workben/makefile
@@ -0,0 +1,9 @@
+all:
+	cd source/org/openoffice/accessibility ; $(MAKE) all
+
+ROOT=source
+SUBDIRS=source/org/openoffice/accessibility
+include source/makefile.in
+
+run: all
+	$(JAVA) -classpath $(CLASSPATH) org.openoffice.accessibility.awb.AccessibilityWorkBench
diff --git a/accessibility/workben/makefile.in b/accessibility/workben/makefile.in
new file mode 100644
index 000000000000..d81df5fb7363
--- /dev/null
+++ b/accessibility/workben/makefile.in
@@ -0,0 +1,31 @@
+PRJ=$(ROOT)/..
+SETTINGS=$(OO_SDK_HOME)/settings
+include $(SETTINGS)/settings.mk
+include $(SETTINGS)/std.mk
+include $(SETTINGS)/dk.mk
+
+OUT_COMP_JAVA = $(OUT_CLASS)/$(patsubst .,/,$(PACKAGE))
+JAVAC=$(JAVA_HOME)/bin/javac
+JAVA=$(JAVA_HOME)/bin/java
+CLASS_FILES = $(patsubst %.java, %.class, $(JAVAFILES))
+CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(OFFICE_CLASSES_DIR)/jurt.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/unoil.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/ridl.jar\
+		$(PATH_SEPARATOR)$(OFFICE_CLASSES_DIR)/juh.jar\
+		$(PATH_SEPARATOR)$(OUT_COMP_JAVA)\
+		$(PATH_SEPARATOR).\
+		$(PATH_SEPARATOR)$(ROOT)\
+		)
+
+subdirs:
+	$(foreach dir,$(SUBDIRS), cd $(dir);$(MAKE);cd ..;)
+
+clean:
+	-rm *.class *.jar
+	$(foreach dir,$(SUBDIRS), cd $(dir);$(MAKE) clean ; cd ..;)
+
+
+%.class : %.java
+	$(JAVAC) -classpath $(CLASSPATH) $<
+
+.PHONY: all package clean subdirs
diff --git a/accessibility/workben/makefile.mk b/accessibility/workben/makefile.mk
new file mode 100644
index 000000000000..7f19d8936757
--- /dev/null
+++ b/accessibility/workben/makefile.mk
@@ -0,0 +1,39 @@
+# copied from settings.mk
+SOLARBINDIR=$(SOLARVERSION)$/$(INPATH)$/bin$(UPDMINOREXT)
+
+# Please modify the following lines to match your environment:
+#   If you use the run: target at the end of the file, then adapt pipe name
+PIPE_NAME = $(USER)
+
+# The following variables probably don't need to be changed.
+JAVA = java
+#   The JAR_PATH points to the jar files of your local office installation.
+JAR_PATH = $(SOLARBINDIR)$/
+
+
+# The rest of this makefile should not need to be touched.
+
+JAR_FILES =		\
+    unoil.jar	\
+    ridl.jar	\
+    jurt.jar	\
+    juh.jar		\
+    java_uno.jar
+
+
+JAVA_CLASSPATHS := 			\
+    ..$/$(INPATH)$/class						\
+    $(foreach,i,$(JAR_FILES) $(JAR_PATH)$i) \
+    $(CLASSPATH)
+
+CLASSPATH !:=$(JAVA_CLASSPATHS:t$(PATH_SEPERATOR))
+
+all:
+    build
+
+# Example of how to run the work bench.
+run:
+    +$(JAVA) -classpath "$(CLASSPATH)" org/openoffice/accessibility/awb/AccessibilityWorkBench -p $(PIPE_NAME)
+
+runjar:
+    +$(JAVA) -classpath "$(CLASSPATH)" -jar AccessibilityWorkBench.jar -p $(PIPE_NAME)
diff --git a/accessibility/workben/org/openoffice/accessibility/Makefile b/accessibility/workben/org/openoffice/accessibility/Makefile
new file mode 100644
index 000000000000..a6db6a05ab4b
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/Makefile
@@ -0,0 +1,6 @@
+all : subdirs
+
+ROOT=../../../
+SUBDIRS=misc awb
+include $(ROOT)/makefile.in
+
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/AccessibilityWorkBench.java b/accessibility/workben/org/openoffice/accessibility/awb/AccessibilityWorkBench.java
new file mode 100644
index 000000000000..6e8e45bc4e82
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/AccessibilityWorkBench.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb;
+
+import java.awt.Cursor;
+import java.awt.GridBagConstraints;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JComponent;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JRadioButtonMenuItem;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeExpansionListener;
+import javax.swing.event.TreeWillExpandListener;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
+
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.frame.XFrame;
+import com.sun.star.frame.XTerminateListener;
+import com.sun.star.lang.EventObject;
+import com.sun.star.uno.UnoRuntime;
+
+import org.openoffice.accessibility.misc.MessageArea;
+import org.openoffice.accessibility.misc.Options;
+import org.openoffice.accessibility.misc.OfficeConnection;
+import org.openoffice.accessibility.misc.SimpleOffice;
+import org.openoffice.accessibility.awb.canvas.Canvas;
+import org.openoffice.accessibility.awb.tree.AccessibilityTree;
+import org.openoffice.accessibility.awb.tree.AccessibilityModel;
+import org.openoffice.accessibility.awb.tree.DynamicAccessibilityModel;
+import org.openoffice.accessibility.awb.view.ObjectViewContainer;
+import org.openoffice.accessibility.awb.view.ObjectViewContainerWindow;
+
+
+
+/** This class manages the GUI of the work bench.
+    @see AccessibilityTreeModel
+        for the implementation of the tree view on the left side which also
+        manages the registration of accessibility listeners.
+    @see Canvas
+        for the graphical view of the accessible objects.
+*/
+public class AccessibilityWorkBench
+            extends JFrame
+            implements XTerminateListener,
+                       ActionListener,
+                       TreeSelectionListener
+{
+    public static final String msVersion = "v1.9";
+    public String msOptionsFileName = ".AWBrc";
+
+    public static void main (String args[])
+    {
+        String sPipeName = System.getenv( "USER" );
+
+        for (int i=0; i<args.length; i++)
+        {
+            if (args[i].equals ("-h") || args[i].equals ("--help") || args[i].equals ("-?"))
+            {
+                System.out.println ("usage: AccessibilityWorkBench <option>*");
+                System.out.println ("options:");
+                System.out.println (" -p <pipe-name>    name of the pipe to use to connect to OpenOffice.org.");
+                System.out.println ("                   Defaults to $USER.");
+                System.exit (0);
+            }
+            else if (args[i].equals ("-p"))
+            {
+                sPipeName = args[++i];
+            }
+        }
+
+        saWorkBench = new AccessibilityWorkBench (sPipeName);
+    }
+
+
+
+
+    /** Return the one instance of the AccessibilityWorkBench
+        @return
+            Returns null when the AccessibilityWorkBench could not be
+            created successfully.
+    */
+    public static AccessibilityWorkBench Instance ()
+    {
+        return saWorkBench;
+    }
+
+
+
+    /** Create an accessibility work bench that listens at the specified
+        port to Office applications.
+    */
+    private AccessibilityWorkBench (String sPipeName)
+    {
+        mbInitialized = false;
+
+        OfficeConnection.SetPipeName (sPipeName);
+        Options.Instance().Load (msOptionsFileName);
+        Layout ();
+
+        MessageArea.println (System.getProperty ("os.name") + " / "
+            + System.getProperty ("os.arch") + " / "
+            + System.getProperty ("os.version"));
+        MessageArea.println ("Using pipe name " + sPipeName);
+
+        maTree.addTreeSelectionListener (this);
+
+        addWindowListener (new WindowAdapter ()
+            { public void windowClosing (WindowEvent e) {Quit();} }
+            );
+
+        OfficeConnection.Instance().AddConnectionListener (this);
+        Initialize ();
+    }
+
+
+
+
+    /** Create and arrange the widgets of the GUI.
+    */
+    public void Layout ()
+    {
+        setSize (new java.awt.Dimension (800,600));
+
+        JScrollPane aScrollPane;
+        GridBagConstraints constraints;
+
+        // Create new layout.
+        java.awt.GridBagLayout aLayout = new java.awt.GridBagLayout ();
+        getContentPane().setLayout (aLayout);
+
+        //  Accessible Tree.
+        javax.swing.tree.TreeModel treeModel = new DynamicAccessibilityModel();
+        maTree = new AccessibilityTree(treeModel);
+        // Add the model as tree listeners to be able to populate/clear the
+        // child lists on demand.
+        maTree.addTreeExpansionListener((TreeExpansionListener) treeModel);
+        maTree.addTreeWillExpandListener((TreeWillExpandListener) treeModel);
+
+        JScrollPane aTreeScrollPane = new JScrollPane(
+            maTree,
+            JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
+            JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+        aTreeScrollPane.setPreferredSize (new java.awt.Dimension (400,300));
+
+        // Object view shows details about the currently selected accessible
+        // object.
+        maObjectViewContainer = new ObjectViewContainer ();
+        JScrollPane aObjectViewContainerScrollPane = new JScrollPane(
+            maObjectViewContainer,
+            JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+            JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        aObjectViewContainerScrollPane.setPreferredSize (
+            new java.awt.Dimension (400,300));
+        JButton aCornerButton = new JButton ("CreateNewViewWindow");
+        aCornerButton.addActionListener (this);
+        aObjectViewContainerScrollPane.setCorner (
+            JScrollPane.LOWER_RIGHT_CORNER,
+            aCornerButton);
+
+        // Split pane for tree view and object view.
+        JSplitPane aLeftViewSplitPane = new JSplitPane (
+            JSplitPane.VERTICAL_SPLIT,
+            aTreeScrollPane,
+            aObjectViewContainerScrollPane
+            );
+        aLeftViewSplitPane.setDividerLocation (300);
+        aLeftViewSplitPane.setContinuousLayout (true);
+
+        //  Canvas.
+        maCanvas = new Canvas ();
+        maCanvas.SetTree (maTree);
+        JScrollPane aScrolledCanvas = new JScrollPane(maCanvas,
+            JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+            JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        aScrolledCanvas.getViewport().setBackground (java.awt.Color.RED);
+        aScrolledCanvas.setPreferredSize (new java.awt.Dimension(600,400));
+
+        // Split pane for tree view and canvas.
+        JSplitPane aViewSplitPane = new JSplitPane (
+            JSplitPane.HORIZONTAL_SPLIT,
+            aLeftViewSplitPane,
+            aScrolledCanvas
+            );
+        aViewSplitPane.setOneTouchExpandable(true);
+        aViewSplitPane.setDividerLocation (400);
+        aViewSplitPane.setContinuousLayout (true);
+
+        // Split pane for the three views at the top and the message area.
+        MessageArea.Instance().setPreferredSize (new java.awt.Dimension(600,50));
+        JSplitPane aSplitPane = new JSplitPane (
+            JSplitPane.VERTICAL_SPLIT,
+            aViewSplitPane,
+            MessageArea.Instance());
+        aSplitPane.setOneTouchExpandable(true);
+        aSplitPane.setContinuousLayout (true);
+        addGridElement (aSplitPane, 0,0, 2,1, 3,3,
+            GridBagConstraints.CENTER, GridBagConstraints.BOTH);
+
+        // Button bar.
+        maButtonBar = new javax.swing.JPanel();
+        java.awt.GridBagLayout aButtonLayout = new java.awt.GridBagLayout ();
+        maButtonBar.setLayout (new java.awt.FlowLayout());
+        addGridElement (maButtonBar, 0,3, 2,1, 1,0,
+            GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL);
+
+        //  Buttons.
+        //        maConnectButton = createButton ("Connect", "connect");
+        //        maUpdateButton = createButton ("Update", "update");
+        //        maShapesButton = createButton ("Expand Shapes", "shapes");
+        maExpandButton = createButton ("Expand All", "expand");
+        maQuitButton = createButton ("Quit", "quit");
+        UpdateButtonStates ();
+
+        setJMenuBar (CreateMenuBar ());
+
+        setTitle("Accessibility Workbench " + msVersion);
+
+        setVisible (true);
+        pack ();
+        aSplitPane.setDividerLocation (1.0);
+        validate ();
+        repaint();
+    }
+
+
+
+
+    /** Shortcut method for adding an object to a GridBagLayout.
+    */
+    void addGridElement (JComponent object,
+        int x, int y,
+        int width, int height,
+        int weightx, int weighty,
+        int anchor, int fill)
+    {
+        GridBagConstraints constraints = new GridBagConstraints ();
+        constraints.gridx = x;
+        constraints.gridy = y;
+        constraints.gridwidth = width;
+        constraints.gridheight = height;
+        constraints.weightx = weightx;
+        constraints.weighty = weighty;
+        constraints.anchor = anchor;
+        constraints.fill = fill;
+        getContentPane().add (object, constraints);
+    }
+
+
+
+
+    /** Create a new button and place at the right most position into the
+        button bar.
+    */
+    public JButton createButton (String title, String command)
+    {
+        JButton aButton = new JButton (title);
+        aButton.setEnabled (false);
+        aButton.setActionCommand (command);
+        aButton.addActionListener (this);
+
+        maButtonBar.add (aButton);
+        return aButton;
+    }
+
+
+
+
+    /** Create a menu bar for the application.
+        @return
+            Returns the new menu bar.  The returned reference is also
+            remembered in the data member <member>maMenuBar</member>.
+    */
+    javax.swing.JMenuBar CreateMenuBar()
+    {
+        // Menu bar.
+        maMenuBar = new JMenuBar ();
+
+        // File menu.
+        JMenu aFileMenu = new JMenu ("File");
+        maMenuBar.add (aFileMenu);
+        JMenuItem aItem;
+        aItem = new JMenuItem ("Quit");
+        aFileMenu.add (aItem);
+        aItem.addActionListener (this);
+
+        // View menu.
+        JMenu aViewMenu = new JMenu ("View");
+        maMenuBar.add (aViewMenu);
+        ButtonGroup aGroup = new ButtonGroup ();
+        int nZoomMode = Options.GetInteger ("ZoomMode", Canvas.WHOLE_SCREEN);
+        JRadioButtonMenuItem aRadioButton = new JRadioButtonMenuItem (
+            "Whole Screen", nZoomMode==Canvas.WHOLE_SCREEN);
+        aGroup.add (aRadioButton);
+        aViewMenu.add (aRadioButton);
+        aRadioButton.addActionListener (this);
+        aRadioButton = new JRadioButtonMenuItem ("200%", nZoomMode==200);
+        aGroup.add (aRadioButton);
+        aViewMenu.add (aRadioButton);
+        aRadioButton.addActionListener (this);
+        aRadioButton = new JRadioButtonMenuItem ("100%", nZoomMode==100);
+        aGroup.add (aRadioButton);
+        aViewMenu.add (aRadioButton);
+        aRadioButton.addActionListener (this);
+        aRadioButton = new JRadioButtonMenuItem ("50%", nZoomMode==50);
+        aGroup.add (aRadioButton);
+        aViewMenu.add (aRadioButton);
+        aRadioButton.addActionListener (this);
+        aRadioButton = new JRadioButtonMenuItem ("25%", nZoomMode==25);
+        aGroup.add (aRadioButton);
+        aViewMenu.add (aRadioButton);
+        aRadioButton.addActionListener (this);
+        aRadioButton = new JRadioButtonMenuItem ("10%", nZoomMode==10);
+        aGroup.add (aRadioButton);
+        aViewMenu.add (aRadioButton);
+        aRadioButton.addActionListener (this);
+
+        // Options menu.
+        JMenu aOptionsMenu = new JMenu ("Options");
+        maMenuBar.add (aOptionsMenu);
+        JCheckBoxMenuItem aCBItem;
+        aCBItem = new JCheckBoxMenuItem ("Show Descriptions",
+                                         Options.GetBoolean("ShowDescriptions"));
+        aOptionsMenu.add (aCBItem);
+        aCBItem.addActionListener (this);
+
+        aCBItem = new JCheckBoxMenuItem ("Show Names",
+                                         Options.GetBoolean ("ShowNames"));
+        aOptionsMenu.add (aCBItem);
+        aCBItem.addActionListener (this);
+
+        aCBItem = new JCheckBoxMenuItem ("Show Text",
+                                         Options.GetBoolean ("ShowText"));
+        aOptionsMenu.add (aCBItem);
+        aCBItem.addActionListener (this);
+
+        aCBItem = new JCheckBoxMenuItem ("Antialiased Rendering",
+                                         Options.GetBoolean ("Antialiasing"));
+        aOptionsMenu.add (aCBItem);
+        aCBItem.addActionListener (this);
+
+        // Help menu.
+        JMenu aHelpMenu = new JMenu ("Help");
+        maMenuBar.add (aHelpMenu);
+
+        aItem = new JMenuItem ("Help");
+        aHelpMenu.add (aItem);
+        aItem.addActionListener (this);
+
+        aItem = new JMenuItem ("News");
+        aHelpMenu.add (aItem);
+        aItem.addActionListener (this);
+
+        aItem = new JMenuItem ("About");
+        aHelpMenu.add (aItem);
+        aItem.addActionListener (this);
+
+        return maMenuBar;
+    }
+
+
+
+
+    /** Initialize the AWB.  This includes clearing the canvas, add
+        listeners, creation of a new tree model for the tree list box and
+        the update of the button states.
+
+        This method may be called any number of times.  Note that all
+        actions will be carried out every time.  The main purpose of a
+        second call is that of a re-initialization after a reconnect.
+    */
+    protected void Initialize ()
+    {
+        maCanvas.SetTree (maTree);
+
+        SimpleOffice aOffice = SimpleOffice.Instance ();
+        if (aOffice != null)
+        {
+            // Add terminate listener.
+            if (aOffice.GetDesktop() != null)
+                aOffice.GetDesktop().addTerminateListener (this);
+
+        }
+
+        mbInitialized = true;
+        UpdateButtonStates ();
+    }
+
+
+
+
+    /** Update the states of the buttons according to the internal state of
+        the AWB.
+    */
+    protected void UpdateButtonStates ()
+    {
+        //        maConnectButton.setEnabled (mbInitialized);
+        maQuitButton.setEnabled (true);
+        //        maUpdateButton.setEnabled (mbInitialized);
+        maExpandButton.setEnabled (mbInitialized);
+        //        maShapesButton.setEnabled (mbInitialized);
+    }
+
+
+
+    /** Callback for GUI actions from the buttons.
+    */
+    public void actionPerformed (ActionEvent aEvent)
+    {
+        String sCommand = aEvent.getActionCommand();
+        if (sCommand.equals("connect"))
+        {
+            SimpleOffice.Clear();
+            Initialize ();
+        }
+        else if (sCommand.equals("quit"))
+        {
+            Quit ();
+        }
+        else if (sCommand.equals("update"))
+        {
+//          maTree.Dispose();
+            Initialize ();
+        }
+        else if (sCommand.equals("shapes"))
+        {
+            Cursor aCursor = getCursor();
+            setCursor (new Cursor (Cursor.WAIT_CURSOR));
+            //            maTree.expandShapes();
+            setCursor (aCursor);
+        }
+        else if (sCommand.equals("expand"))
+        {
+            Cursor aCursor = getCursor();
+            setCursor (new Cursor (Cursor.WAIT_CURSOR));
+
+            for (int i=0; i<maTree.getRowCount(); i++)
+                maTree.expandRow (i);
+            //            maAccessibilityTree.expandAll();
+            setCursor (aCursor);
+        }
+        else if (sCommand.equals ("Quit"))
+        {
+            System.out.println ("exiting");
+            System.exit (0);
+        }
+        else if (sCommand.equals ("Show Descriptions"))
+        {
+            Options.SetBoolean ("ShowDescriptions",
+                ((JCheckBoxMenuItem)aEvent.getSource()).getState());
+            maCanvas.repaint();
+        }
+        else if (sCommand.equals ("Show Names"))
+        {
+            Options.SetBoolean ("ShowNames",
+                ((JCheckBoxMenuItem)aEvent.getSource()).getState());
+            maCanvas.repaint();
+        }
+        else if (sCommand.equals ("Show Text"))
+        {
+            Options.SetBoolean ("ShowText",
+                ((JCheckBoxMenuItem)aEvent.getSource()).getState());
+            maCanvas.repaint();
+        }
+        else if (sCommand.equals ("Antialiased Rendering"))
+        {
+            Options.SetBoolean ("Antialiasing",
+                ((JCheckBoxMenuItem)aEvent.getSource()).getState());
+            maCanvas.repaint();
+        }
+        else if (sCommand.equals ("Help"))
+        {
+            HelpWindow.Instance().loadFile ("help.html");
+        }
+        else if (sCommand.equals ("News"))
+        {
+            try{
+                HelpWindow.Instance().loadFile ("news.html");
+            } catch (Exception ex) {}
+        }
+        else if (sCommand.equals ("About"))
+        {
+            HelpWindow.Instance().loadFile ("about.html");
+        }
+        else if (sCommand.equals ("Whole Screen"))
+        {
+            Options.SetInteger ("ZoomMode", Canvas.WHOLE_SCREEN);
+            maCanvas.repaint();
+        }
+        else if (sCommand.equals ("200%"))
+        {
+            Options.SetInteger ("ZoomMode", 200);
+            maCanvas.repaint();
+        }
+        else if (sCommand.equals ("100%"))
+        {
+            Options.SetInteger ("ZoomMode", 100);
+            maCanvas.repaint();
+        }
+        else if (sCommand.equals ("50%"))
+        {
+            Options.SetInteger ("ZoomMode", 50);
+            maCanvas.repaint();
+        }
+        else if (sCommand.equals ("25%"))
+        {
+            Options.SetInteger ("ZoomMode", 25);
+            maCanvas.repaint();
+        }
+        else if (sCommand.equals ("10%"))
+        {
+            Options.SetInteger ("ZoomMode", 10);
+            maCanvas.repaint();
+        }
+        else if (sCommand.equals ("<connected>"))
+        {
+            Connected ();
+        }
+        else if (sCommand.equals ("CreateNewViewWindow"))
+        {
+            TreePath aSelectionPath = maTree.getSelectionPath();
+            if (aSelectionPath != null)
+            {
+                javax.swing.tree.TreeNode aSelectedNode =
+                    (javax.swing.tree.TreeNode)aSelectionPath.getLastPathComponent();
+                if (aSelectedNode instanceof XAccessible) {
+                   new ObjectViewContainerWindow (((XAccessible) aSelectedNode).getAccessibleContext());
+                }
+            }
+        }
+        else
+        {
+            System.err.println("unknown command " + sCommand);
+        }
+    }
+
+
+
+
+    /** TreeSelectionListener
+        Tell the object view and the canvas about the selected object.
+    */
+    public void valueChanged (TreeSelectionEvent aEvent) {
+
+        if (aEvent.isAddedPath()) {
+            Cursor aCursor = getCursor();
+            setCursor (new Cursor (Cursor.WAIT_CURSOR));
+
+            javax.swing.tree.TreePath aPath = aEvent.getPath();
+            maTree.scrollPathToVisible (aPath);
+            Object aObject = aPath.getLastPathComponent();
+            implSetCurrentObject( aObject );
+            if (aObject instanceof XAccessible)
+            {
+                if (maObjectViewContainer != null)
+                    maObjectViewContainer.SetObject( ((XAccessible)aObject).getAccessibleContext() );
+            }
+            if (maCanvas != null)
+                maCanvas.SelectObject ((TreeNode) aObject);
+            setCursor (aCursor);
+        } else {
+            implSetCurrentObject( aEvent.getPath().getLastPathComponent() );
+            if (maObjectViewContainer != null)
+                maObjectViewContainer.SetObject (null);
+            if (maCanvas != null)
+                maCanvas.SelectObject (null);
+        }
+    }
+
+
+    private void implSetCurrentObject( Object i_object )
+    {
+        if ( maObjectViewContainer == null )
+            return;
+        if ( maCurrentObject != null )
+        {
+            AccessibilityModel.removeEventListener( (TreeNode)maCurrentObject, maObjectViewContainer );
+        }
+        maCurrentObject = i_object;
+        if ( maCurrentObject != null )
+        {
+            AccessibilityModel.addEventListener( (TreeNode)maCurrentObject, maObjectViewContainer );
+        }
+    }
+
+    // XEventListener
+    public void disposing (EventObject aSourceObj)
+    {
+        XFrame xFrame = (XFrame)UnoRuntime.queryInterface(
+            XFrame.class, aSourceObj.Source);
+
+        if( xFrame != null )
+            System.out.println("frame disposed");
+        else
+            System.out.println("controller disposed");
+    }
+
+
+
+
+    // XTerminateListener
+    public void queryTermination(final EventObject aEvent) throws com.sun.star.frame.TerminationVetoException
+    {
+        System.out.println ("Terminate Event : " + aEvent);
+    }
+
+
+
+
+    // XTerminateListener
+    public void notifyTermination(final EventObject aEvent)
+    {
+        System.out.println ("Notifiy Termination Event : " + aEvent);
+    }
+
+
+    /** Called after the AWB is connected to an Office application.
+    */
+    private void Connected ()
+    {
+        // Clear the tree and by expanding the root node initiate the
+        // scanning and insertion of nodes for the top-level windows.
+//        maTree.Clear();
+//        maTree.collapseRow (0);
+//        maTree.expandRow (0);
+
+        // Register the top window listener.
+        XExtendedToolkit xToolkit =
+            SimpleOffice.Instance().GetExtendedToolkit();
+        if (xToolkit != null)
+        {
+            maTree.setToolkit(xToolkit);
+        }
+    }
+
+
+    /** Called when shutting down the AWB tool.
+    */
+    private void Quit ()
+    {
+//        maTree.Dispose();
+        System.exit (0);
+    }
+
+    /// The Singleton Workbench object.
+    private static AccessibilityWorkBench
+        saWorkBench = null;
+
+    private JPanel maMainPanel;
+    private JPanel maButtonBar;
+    private Canvas maCanvas;
+    private AccessibilityTree maTree;
+    private ObjectViewContainer maObjectViewContainer;
+    private JButton
+        maConnectButton,
+        maQuitButton,
+        maUpdateButton,
+        maExpandButton,
+        maShapesButton;
+    private JMenuBar maMenuBar;
+    private boolean mbInitialized;
+    private Object maCurrentObject = null;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/HelpWindow.java b/accessibility/workben/org/openoffice/accessibility/awb/HelpWindow.java
new file mode 100644
index 000000000000..2f9671d191e5
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/HelpWindow.java
@@ -0,0 +1,187 @@
+package org.openoffice.accessibility.awb;
+
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JEditorPane;
+import javax.swing.JButton;
+import java.net.URL;
+import javax.swing.event.HyperlinkListener;
+import javax.swing.event.HyperlinkEvent;
+import java.net.MalformedURLException;
+import java.io.IOException;
+import java.io.File;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.GridBagLayout;
+import java.awt.GridBagConstraints;
+import java.awt.event.ActionListener;
+import java.util.LinkedList;
+
+public class HelpWindow
+    implements ActionListener
+{
+    public static synchronized HelpWindow Instance ()
+    {
+        if (maInstance == null)
+            maInstance = new HelpWindow();
+        return maInstance;
+    }
+
+    public void loadFile (String sFilename)
+    {
+        File aFile = new File (sFilename);
+        try
+        {
+            loadURL (aFile.toURL());
+        }
+        catch (MalformedURLException e)
+        {
+            e.printStackTrace (System.err);
+        }
+    }
+    public void loadURL (String sURL)
+    {
+        try
+        {
+            loadURL (new URL (sURL));
+        }
+        catch (MalformedURLException e)
+        {
+            e.printStackTrace (System.err);
+        }
+    }
+
+
+
+
+    public void loadURL (URL aURL)
+    {
+        maHistory.addLast (aURL);
+        selectHistoryPage (maHistory.size()-1);
+        maFrame.toFront ();
+    }
+
+
+
+
+    private HelpWindow ()
+    {
+        try
+        {
+            maCurrentHistoryEntry = -1;
+            maHistory = new LinkedList();
+
+            maFrame = new JFrame ();
+            maFrame.addWindowListener (new WindowAdapter ()
+                {
+                    public void windowClosing (WindowEvent e)
+                    {
+                        maInstance = null;
+                    }
+                });
+            maContent = createContentWidget();
+
+            maFrame.getContentPane().setLayout (new GridBagLayout());
+            GridBagConstraints aConstraints = new GridBagConstraints ();
+            aConstraints.gridx = 0;
+            aConstraints.gridy = 0;
+            aConstraints.gridwidth = 3;
+            aConstraints.weightx = 1;
+            aConstraints.weighty = 1;
+            aConstraints.fill = GridBagConstraints.BOTH;
+            maFrame.getContentPane().add (new JScrollPane (maContent), aConstraints);
+
+            aConstraints = new GridBagConstraints();
+            aConstraints.gridx = 0;
+            aConstraints.gridy = 1;
+            maPrevButton = new JButton ("Prev");
+            maFrame.getContentPane().add (maPrevButton, aConstraints);
+            maPrevButton.addActionListener (this);
+
+            aConstraints = new GridBagConstraints();
+            aConstraints.gridx = 1;
+            aConstraints.gridy = 1;
+            maNextButton = new JButton ("Next");
+            maFrame.getContentPane().add (maNextButton, aConstraints);
+            maNextButton.addActionListener (this);
+
+            aConstraints = new GridBagConstraints();
+            aConstraints.gridx = 2;
+            aConstraints.gridy = 1;
+            aConstraints.anchor = GridBagConstraints.EAST;
+            JButton aButton = new JButton ("Close");
+            maFrame.getContentPane().add (aButton, aConstraints);
+            aButton.addActionListener (this);
+
+            maFrame.setSize (600,400);
+            maFrame.setVisible (true);
+        }
+        catch (Exception e)
+        {}
+    }
+
+    public void actionPerformed (java.awt.event.ActionEvent e)
+    {
+        if (e.getActionCommand().equals("Prev"))
+        {
+            selectHistoryPage (maCurrentHistoryEntry - 1);
+        }
+        else if (e.getActionCommand().equals("Next"))
+        {
+            selectHistoryPage (maCurrentHistoryEntry + 1);
+        }
+        else if (e.getActionCommand().equals("Close"))
+        {
+            maFrame.dispose ();
+            maInstance = null;
+        }
+    }
+
+    private JEditorPane createContentWidget ()
+    {
+        JEditorPane aContent = new JEditorPane ();
+        aContent.setEditable (false);
+        aContent.addHyperlinkListener (new HyperlinkListener()
+            {
+                public void hyperlinkUpdate (HyperlinkEvent e)
+                {
+                    if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED)
+                        HelpWindow.Instance().loadURL (e.getURL());
+                }
+            });
+        return aContent;
+    }
+
+    private void selectHistoryPage (int i)
+    {
+        if (i < 0)
+            i = 0;
+        else if (i >= maHistory.size()-1)
+            i = maHistory.size()-1;
+        if (i != maCurrentHistoryEntry)
+        {
+            URL aURL = (URL)maHistory.get (i);
+            try
+            {
+                maContent.setPage (aURL);
+            }
+            catch (java.io.IOException ex)
+            {
+                ex.printStackTrace(System.err);
+            }
+
+            maCurrentHistoryEntry = i;
+        }
+
+        maPrevButton.setEnabled (maCurrentHistoryEntry > 0);
+        maNextButton.setEnabled (maCurrentHistoryEntry < maHistory.size()-1);
+    }
+
+    private static HelpWindow maInstance = null;
+    private JFrame maFrame;
+    private JEditorPane maContent;
+    private LinkedList maHistory;
+    private int maCurrentHistoryEntry;
+    private JButton maPrevButton;
+    private JButton maNextButton;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/Makefile b/accessibility/workben/org/openoffice/accessibility/awb/Makefile
new file mode 100644
index 000000000000..d38799bed109
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/Makefile
@@ -0,0 +1,13 @@
+#	$Id: Makefile,v 1.1 2003/06/13 16:30:18 af Exp $
+
+all : package
+
+ROOT=../../../..
+PACKAGE = org.openoffice.accessibility.awb
+SUBDIRS = canvas event tree view
+
+include makefile.common
+
+include $(ROOT)/makefile.in
+
+package: subdirs $(CLASS_FILES)
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/Canvas.java b/accessibility/workben/org/openoffice/accessibility/awb/canvas/Canvas.java
new file mode 100644
index 000000000000..86b642e8091c
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/canvas/Canvas.java
@@ -0,0 +1,322 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.canvas;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
+import java.awt.Toolkit;
+import java.awt.geom.Rectangle2D;
+import java.util.Iterator;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JViewport;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.tree.TreePath;
+
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleComponent;
+
+import org.openoffice.accessibility.misc.Options;
+
+/** This canvas displays accessible objects graphically.  Each accessible
+    object with graphical representation is represented by an
+    CanvasShape object and has to be added by the
+    <member>addAccessible</member> member function.
+
+    <p>The canvas listens to selection events of the associated JTree and
+    highlights the first selected node of that tree.</p>
+*/
+public class Canvas
+    extends JPanel
+{
+    // This constant can be passed to SetZoomMode to always show the whole screen.
+    public static final int WHOLE_SCREEN = -1;
+
+    public Canvas ()
+    {
+        super (true);
+        maShapeList = new ShapeContainer (this);
+        maMouseObserver = new MouseObserver (this);
+        maTree = null;
+        mnHOffset = 0;
+        mnVOffset = 0;
+        mnScale = 1;
+        maLastWidgetSize = new Dimension (0,0);
+    }
+
+
+
+    /** Tell the canvas which tree to use to highlight accessible
+        objects and to observe for changes in the tree structure.
+    */
+    public void SetTree (javax.swing.JTree aTree)
+    {
+        if (aTree != maTree)
+        {
+            maTree = aTree;
+            maShapeList.SetTree (maTree);
+            maMouseObserver.SetTree (maTree);
+        }
+    }
+
+
+
+
+    private void Clear ()
+    {
+        maShapeList.Clear();
+    }
+
+
+
+
+    public Iterator GetShapeIterator ()
+    {
+        return maShapeList.GetIterator();
+    }
+
+
+
+
+    public void paintComponent (Graphics g)
+    {
+        synchronized (g)
+        {
+            super.paintComponent (g);
+
+            Graphics2D g2 = (Graphics2D)g;
+            if (Options.GetBoolean("Antialiasing"))
+                g2.setRenderingHint (RenderingHints.KEY_ANTIALIASING,
+                    RenderingHints.VALUE_ANTIALIAS_ON);
+            else
+                g2.setRenderingHint (RenderingHints.KEY_ANTIALIASING,
+                    RenderingHints.VALUE_ANTIALIAS_OFF);
+
+            setupTransformation ();
+            g2.translate (mnHOffset, mnVOffset);
+            g2.scale (mnScale, mnScale);
+
+            // Draw the screen representation to give a hint of the location of the
+            // accessible object on the screen.
+            Dimension aScreenSize = Toolkit.getDefaultToolkit().getScreenSize();
+            Rectangle2D.Double aScreen = new Rectangle2D.Double (
+                0,
+                0,
+                aScreenSize.getWidth(),
+                aScreenSize.getHeight());
+            // Fill the screen rectangle and draw a frame arround it to increase its visibility.
+            g2.setColor (new Color (250,240,230));
+            g2.fill (aScreen);
+            g2.setColor (Color.BLACK);
+            g2.draw (aScreen);
+
+            synchronized (maShapeList)
+            {
+                Iterator aShapeIterator = maShapeList.GetIterator();
+                boolean bShowDescriptions = Options.GetBoolean ("ShowDescriptions");
+                boolean bShowNames = Options.GetBoolean ("ShowNames");
+                boolean bShowText = Options.GetBoolean ("ShowText");
+                while (aShapeIterator.hasNext())
+                {
+                    CanvasShape aCanvasShape =
+                        (CanvasShape)aShapeIterator.next();
+                    try
+                    {
+                        aCanvasShape.paint (
+                            g2,
+                            bShowDescriptions, bShowNames, bShowText);
+                    }
+                    catch (Exception aException)
+                    {
+                        System.err.println ("caught exception while painting a shape:"
+                            + aException);
+                        aException.printStackTrace (System.err);
+                    }
+                }
+            }
+
+            // Paint highlighted frame around active object as the last thing.
+            if (maActiveObject != null)
+                maActiveObject.paint_highlight (g2);
+        }
+    }
+
+
+
+
+    /** Set up the transformation so that the graphical display can show a
+        centered representation of the whole screen.
+    */
+    private void setupTransformation ()
+    {
+        // Turn off scrollbars when showing the whole screen.  Otherwise show them when needed.
+        JViewport aViewport = (JViewport)getParent();
+        JScrollPane aScrollPane = (JScrollPane)aViewport.getParent();
+        int nZoomMode = Options.GetInteger ("ZoomMode", WHOLE_SCREEN);
+        if (nZoomMode == WHOLE_SCREEN)
+        {
+            if (aScrollPane.getHorizontalScrollBarPolicy()
+                != JScrollPane.HORIZONTAL_SCROLLBAR_NEVER)
+                aScrollPane.setHorizontalScrollBarPolicy (
+                    JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            if (aScrollPane.getVerticalScrollBarPolicy()
+                != JScrollPane.VERTICAL_SCROLLBAR_NEVER)
+                aScrollPane.setVerticalScrollBarPolicy (
+                    JScrollPane.VERTICAL_SCROLLBAR_NEVER);
+        }
+        else
+        {
+            if (aScrollPane.getHorizontalScrollBarPolicy()
+                != JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED)
+                aScrollPane.setHorizontalScrollBarPolicy (
+                    JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+            if (aScrollPane.getVerticalScrollBarPolicy()
+                != JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED)
+                aScrollPane.setVerticalScrollBarPolicy (
+                    JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
+        }
+
+        Dimension aScreenSize = Toolkit.getDefaultToolkit().getScreenSize();
+        Dimension aWidgetSize = aViewport.getSize();
+        {
+            if ((aScreenSize.getWidth() > 0) && (aScreenSize.getHeight() > 0))
+            {
+                if (nZoomMode == WHOLE_SCREEN)
+                {
+                    // Calculate the scales that would map the screen onto the
+                    // widget in both of the coordinate axes and select the
+                    // smaller
+                    // of the two: it maps the screen onto the widget in both
+                    // axes at the same time.
+                    double nHScale = (aWidgetSize.getWidth() - 10)
+                           / aScreenSize.getWidth();
+                    double nVScale = (aWidgetSize.getHeight() - 10)
+                        / aScreenSize.getHeight();
+                    if (nHScale < nVScale)
+                        mnScale = nHScale;
+                    else
+                        mnScale = nVScale;
+                }
+                else
+                {
+                    mnScale = nZoomMode / 100.0;
+                }
+
+                // Calculate offsets that center the scaled screen inside
+                // the widget.
+                mnHOffset = (aWidgetSize.getWidth()
+                             - mnScale*aScreenSize.getWidth()) / 2.0;
+                mnVOffset = (aWidgetSize.getHeight()
+                             - mnScale*aScreenSize.getHeight()) / 2.0;
+                if (mnHOffset < 0)
+                    mnHOffset = 0;
+                if (mnVOffset < 0)
+                    mnVOffset = 0;
+
+                setPreferredSize (new Dimension (
+                    (int)(2*mnHOffset + mnScale * aScreenSize.getWidth()),
+                    (int)(2*mnVOffset + mnScale * aScreenSize.getHeight())));
+                revalidate ();
+            }
+            else
+            {
+                // In case of a degenerate (not yet initialized?) screen size
+                // use some meaningless default values.
+                mnScale = 1;
+                mnHOffset = 0;
+                mnVOffset = 0;
+            }
+        }
+        maLastWidgetSize = aWidgetSize;
+    }
+
+
+
+    protected boolean HighlightObject (CanvasShape aNewActiveObject)
+    {
+        if (aNewActiveObject != maActiveObject)
+        {
+            if (maActiveObject != null)
+                maActiveObject.Highlight (false);
+
+            maActiveObject = aNewActiveObject;
+            if (maActiveObject != null)
+            {
+                /*           if (maTree != null)
+                {
+                    TreePath aPath = new TreePath (
+                        maActiveObject.GetNode().GetPath());
+                    maTree.scrollPathToVisible (aPath);
+                    maTree.setSelectionPath (aPath);
+                    maTree.repaint ();
+                }
+                */
+                maActiveObject.Highlight (true);
+            }
+            repaint ();
+            return true;
+        }
+        else
+            return false;
+    }
+
+
+
+
+    /** Called when the selection of the tree changes.  Highlight the
+        corresponding graphical representation of the object.
+    */
+    public void SelectObject (javax.swing.tree.TreeNode aNode)
+    {
+        CanvasShape aCanvasShape = maShapeList.Get (aNode);
+        HighlightObject (aCanvasShape);
+    }
+
+
+
+
+    private int
+        mnXAnchor,
+        mnYAnchor,
+        maResizeFlag;
+    private double
+        mnHOffset,
+        mnVOffset,
+        mnScale;
+    private CanvasShape maActiveObject;
+    private javax.swing.JTree maTree;
+    // The size of the widget at the last call of setupTransformation()
+    private Dimension maLastWidgetSize;
+    private ShapeContainer maShapeList;
+    private MouseObserver maMouseObserver;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/CanvasShape.java b/accessibility/workben/org/openoffice/accessibility/awb/canvas/CanvasShape.java
new file mode 100644
index 000000000000..f2595351a4f5
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/canvas/CanvasShape.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.canvas;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.NoninvertibleTransformException;
+
+
+import com.sun.star.accessibility.*;
+import com.sun.star.lang.EventObject;
+import com.sun.star.uno.UnoRuntime;
+
+
+class CanvasShape implements XAccessibleEventListener
+{
+    public final Color maHighlightColor = Color.red;
+    public final Color maSelectionColor = Color.green;
+    public final Color maFocusColor = Color.blue;
+
+    public CanvasShape (javax.swing.tree.TreeNode aNode, Canvas aCanvas)
+    {
+        maNode = aNode;
+        msName = "<no name>";
+        msDescription = "<no description>";
+        maShape = new Rectangle2D.Double (-10,-10,10,10);
+        maPosition = new Point (-10,-10);
+        maSize = new Dimension (10,10);
+        maFgColor = java.awt.Color.black;
+        maBgColor = Color.blue;
+        mnRole = -1;
+        mbHighlighted = false;
+        mbSelected = false;
+        mbFocused = false;
+        maCanvas = aCanvas;
+
+        Update ();
+    }
+
+
+
+
+    public javax.swing.tree.TreePath getNodePath (javax.swing.tree.TreeNode node)
+    {
+        javax.swing.tree.TreeNode parent = node.getParent();
+        return (parent != null) ?
+            getNodePath(parent).pathByAddingChild(node) :
+            new javax.swing.tree.TreePath(node);
+    }
+
+    public javax.swing.tree.TreePath getNodePath ()
+    {
+        return getNodePath(maNode);
+    }
+
+
+
+    /** Update the data obtained from the <type>AccessibilityNode</type>
+        object.
+    */
+    public void Update ()
+    {
+        if (maNode instanceof XAccessible) {
+            mxContext = ((XAccessible) maNode).getAccessibleContext();
+            mxComponent = (XAccessibleComponent)UnoRuntime.queryInterface(
+                XAccessibleComponent.class, mxContext);
+        }
+
+        if (mxContext != null)
+        {
+            msName = mxContext.getAccessibleName();
+            msDescription = mxContext.getAccessibleDescription();
+            mnRole = mxContext.getAccessibleRole();
+
+            // Extract the selected and focused flag.
+            XAccessibleStateSet xStateSet = mxContext.getAccessibleStateSet ();
+            if (xStateSet != null)
+            {
+                mbSelected = xStateSet.contains (AccessibleStateType.SELECTED);
+                mbFocused = xStateSet.contains (AccessibleStateType.FOCUSED);
+            }
+        }
+
+        UpdateGeometry ();
+
+        if (mxComponent != null)
+        {
+            // Note: alpha values in office 0..255 have to be mapped to
+            //       255..0 in Java
+            Color aCol = new Color (mxComponent.getForeground(), true);
+            maFgColor = new Color (aCol.getRed (),
+                                   aCol.getGreen (),
+                                   aCol.getBlue (),
+                                   0xff - aCol.getAlpha ());
+            aCol = new Color (mxComponent.getBackground(), true);
+            maBgColor = new Color (aCol.getRed (),
+                                   aCol.getGreen (),
+                                   aCol.getBlue (),
+                                   0xff - aCol.getAlpha ());
+        }
+    }
+
+
+
+    public void UpdateGeometry ()
+    {
+        if (mxComponent != null)
+        {
+            com.sun.star.awt.Point aLocationOnScreen =
+                mxComponent.getLocationOnScreen();
+            com.sun.star.awt.Size aSizeOnScreen = mxComponent.getSize();
+            maPosition = new Point (
+                aLocationOnScreen.X,
+                aLocationOnScreen.Y);
+            maSize = new Dimension (
+                aSizeOnScreen.Width,
+                aSizeOnScreen.Height);
+        }
+    }
+
+
+
+    /** Paint the object into the specified canvas.  It is transformed
+        according to the specified offset and scale.
+    */
+    public void paint (
+        Graphics2D g,
+        boolean bShowDescription,
+        boolean bShowName,
+        boolean bShowText)
+    {
+        try{
+            // Transform the object's position and size according to the
+            // specified offset and scale.
+            Point aLocation = new Point();
+            maShape = new Rectangle2D.Double (
+                maPosition.x,
+                maPosition.y,
+                maSize.width,
+                maSize.height);
+            maTransformation = g.getTransform();
+
+            // Fill the object's bounding box with its background color if it
+            // has no children.
+            if (mxContext.getAccessibleChildCount() == 0)
+            {
+                g.setColor (maBgColor);
+                g.fill (maShape);
+            }
+
+            // Remove alpha channel from color before drawing the frame.
+            Color color = maFgColor;
+            if (maFgColor.getAlpha()<128)
+                color = new Color (maFgColor.getRed(), maFgColor.getGreen(), maFgColor.getBlue());
+            g.setColor (color);
+            g.draw (maShape);
+
+            if (mbFocused)
+            {
+                g.setColor (maFocusColor);
+                for (int x=0; x<=2; x++)
+                    for (int y=0; y<=2; y++)
+                        g.fill (
+                            new Rectangle2D.Double (
+                                maShape.x + x/2.0 * maShape.width-3,
+                                maShape.y + y/2.0 * maShape.height-3,
+                                6,
+                                6));
+            }
+            if (mbSelected)
+            {
+                g.setColor (maSelectionColor);
+                for (int x=0; x<=2; x++)
+                    for (int y=0; y<=2; y++)
+                        g.draw (
+                            new Rectangle2D.Double (
+                                maShape.x + x/2.0 * maShape.width-2,
+                                maShape.y + y/2.0 * maShape.height-2,
+                                4,
+                                4));
+            }
+
+            // Write the object's text OR name and description.
+            g.setColor (maFgColor);
+            if (bShowName)
+                paintName (g);
+            if (bShowDescription)
+                paintDescription (g);
+            if (bShowText)
+                paintText (g);
+        }
+        catch (Exception e)
+        { // don't care
+        }
+    }
+
+
+    public void paint_highlight (Graphics2D g)
+    {
+        if (mbHighlighted)
+            g.setColor (maHighlightColor);
+        else
+            g.setColor (maFgColor);
+        g.draw (maShape);
+    }
+
+
+
+
+    private void paintName (Graphics2D g)
+    {
+        g.drawString ("Name: " + msName,
+            (float)maShape.x+5,
+            (float)maShape.y+15);
+    }
+
+
+
+    private void paintDescription (Graphics2D g)
+    {
+        g.drawString ("Description: " + msDescription,
+            (float)maShape.x+5,
+            (float)maShape.y+35);
+    }
+
+
+
+
+    private void paintText (Graphics2D g)
+    {
+        XAccessibleText xText = null;
+        // get XAccessibleText
+        xText = (XAccessibleText)UnoRuntime.queryInterface(
+            XAccessibleText.class, mxContext);
+
+        // Draw every character in the text string.
+        if (xText != null)
+        {
+            String sText = xText.getText();
+            try
+            {
+                for(int i = 0; i < sText.length(); i++)
+                {
+                    com.sun.star.awt.Rectangle aRect =
+                        xText.getCharacterBounds(i);
+
+                    double x = maShape.x + aRect.X;
+                    double y = maShape.y + aRect.Y + aRect.Height;
+
+                    g.drawString (sText.substring(i, i+1), (float)x, (float)y);
+                }
+            }
+            catch (com.sun.star.lang.IndexOutOfBoundsException e)
+            {}
+        }
+    }
+
+
+    /** Compute whether the specified point lies inside the object's
+        bounding box.
+    */
+    public boolean Contains (int x, int y)
+    {
+        Point2D aPosition = new Point2D.Double (x,y);
+        try
+        {
+            maTransformation.inverseTransform (aPosition, aPosition);
+            //            System.out.println ("transformed "+x+","+y+" to "+aPosition);
+        }
+        catch (NoninvertibleTransformException aException)
+        {
+            return false;
+        }
+        return (maShape.contains (aPosition));
+    }
+
+    public void Highlight (boolean bFlag)
+    {
+        mbHighlighted = bFlag;
+    }
+
+    public boolean IsHighlighted ()
+    {
+        return mbHighlighted;
+    }
+
+    public Rectangle GetBBox ()
+    {
+        return new Rectangle (maPosition, maSize);
+    }
+
+    public Point getOrigin ()
+    {
+        return maPosition;
+    }
+
+    public Dimension GetSize ()
+    {
+        return maSize;
+    }
+
+    public int getRole ()
+    {
+        return mnRole;
+    }
+
+    public XAccessibleContext getContext ()
+    {
+        return mxContext;
+    }
+
+    public XAccessibleComponent getComponent ()
+    {
+        return mxComponent;
+    }
+
+    public String toString ()
+    {
+        return ">"+msName+", "+msDescription+" +"+maPosition.x+"+"+maPosition.y
+            +"x"+maSize.width+"x"+maSize.height+"<";
+    }
+
+    /** */
+    public void notifyEvent(com.sun.star.accessibility.AccessibleEventObject aEvent) {
+        try {
+            switch (aEvent.EventId) {
+                case AccessibleEventId.BOUNDRECT_CHANGED:
+                case AccessibleEventId.VISIBLE_DATA_CHANGED:
+                    UpdateGeometry ();
+                    maCanvas.repaint();
+                    break;
+                default:
+                    break;
+            }
+        } catch (Exception aException) {
+            System.err.println ("caught exception while updating a shape:"
+                + aException);
+            aException.printStackTrace (System.err);
+        }
+    }
+
+    /** Callback for disposing events.
+    */
+    public void disposing (com.sun.star.lang.EventObject e)
+    {
+        System.out.println ("Disposing");
+    }
+
+
+
+
+    private Canvas
+        maCanvas;
+    private javax.swing.tree.TreeNode
+        maNode;
+    private XAccessibleContext
+        mxContext;
+    private XAccessibleComponent
+        mxComponent;
+    private String
+        msDescription,
+        msName;
+    private Rectangle2D.Double maShape;
+    private AffineTransform maTransformation;
+    private Point maPosition;
+    private Dimension
+        maTransformedSize,
+        maSize;
+    private Color
+        maFgColor,
+        maBgColor;
+    private boolean
+        // Highlighting objects is an internal concept.  Corresponds to selection in the tree view.
+        mbHighlighted,
+        // Set when the accessible object is selected.
+        mbSelected,
+        // Set when the accessible object is focused.
+        mbFocused;
+    private int
+        mnRole;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile b/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile
new file mode 100644
index 000000000000..8d9688433ff9
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile
@@ -0,0 +1,15 @@
+#	$Id: Makefile,v 1.1 2003/06/13 16:30:21 af Exp $
+
+all : package
+
+ROOT=../../../../..
+PACKAGE = org.openoffice.accessibility.awb.canvas
+SUBDIRS =
+include makefile.common
+
+include $(ROOT)/makefile.in
+
+
+package : $(CLASS_FILES)
+
+
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/MouseObserver.java b/accessibility/workben/org/openoffice/accessibility/awb/canvas/MouseObserver.java
new file mode 100644
index 000000000000..3e7e2807906d
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/canvas/MouseObserver.java
@@ -0,0 +1,104 @@
+package org.openoffice.accessibility.awb.canvas;
+
+import java.awt.Dimension;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.util.Iterator;
+import javax.swing.tree.TreePath;
+
+
+/** Observe the mouse and highlight shapes of the canvas when clicked.
+*/
+public class MouseObserver
+    implements MouseListener,
+               MouseMotionListener
+{
+    public MouseObserver (Canvas aCanvas)
+    {
+        maCanvas = aCanvas;
+        maCanvas.addMouseListener (this);
+        maCanvas.addMouseMotionListener (this);
+    }
+
+
+    public void SetTree (javax.swing.JTree aTree)
+    {
+        maTree = aTree;
+    }
+
+    public void mouseClicked (MouseEvent e)
+    {}
+
+    public void mousePressed (MouseEvent e)
+    {
+        CanvasShape aObjectUnderMouse = FindCanvasShapeUnderMouse (e);
+        maTree.clearSelection();
+        if (aObjectUnderMouse != null)
+        {
+            TreePath aPath = aObjectUnderMouse.getNodePath();
+            if ((e.getModifiers() & InputEvent.CTRL_MASK) != 0)
+                maTree.expandPath (aPath);
+            // Selecting the entry will eventually highlight the shape.
+            maTree.setSelectionPath (aPath);
+            maTree.makeVisible (aPath);
+        }
+    }
+
+    public void mouseReleased (MouseEvent e)
+    {}
+
+    public void mouseEntered (MouseEvent e)
+    {}
+
+    public void mouseExited (MouseEvent e)
+    {}
+
+    public void mouseDragged (MouseEvent e)
+    {
+    }
+
+    public void mouseMoved (MouseEvent e)
+    {
+        if ((e.getModifiers() & InputEvent.SHIFT_MASK) != 0)
+            maCanvas.HighlightObject (FindCanvasShapeUnderMouse (e));
+    }
+
+
+    /** Search for the smallest shape that contains the mouse position.
+    */
+    protected CanvasShape FindCanvasShapeUnderMouse (MouseEvent e)
+    {
+        Dimension aSmallestSize = null;
+        Iterator maShapeIterator = maCanvas.GetShapeIterator();
+        CanvasShape aShapeUnderMouse = null;
+        while (maShapeIterator.hasNext())
+        {
+            CanvasShape aShape = (CanvasShape)maShapeIterator.next();
+            if (aShape != null)
+                if (aShape.Contains (e.getX(),e.getY()))
+                {
+                    if (aShapeUnderMouse == null)
+                    {
+                        aSmallestSize = aShape.GetSize();
+                        aShapeUnderMouse = aShape;
+                    }
+                    else
+                    {
+                        Dimension aSize = aShape.GetSize();
+                        if (aSize.getWidth()<aSmallestSize.getWidth()
+                            || aSize.getHeight()<aSmallestSize.getHeight())
+                        {
+                            aSmallestSize = aSize;
+                            aShapeUnderMouse = aShape;
+                        }
+                    }
+                }
+        }
+        return aShapeUnderMouse;
+    }
+
+    private Canvas maCanvas;
+    private javax.swing.JTree maTree;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/ShapeContainer.java b/accessibility/workben/org/openoffice/accessibility/awb/canvas/ShapeContainer.java
new file mode 100644
index 000000000000..03ad4bf38c46
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/canvas/ShapeContainer.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.canvas;
+
+import java.awt.Rectangle;
+import java.util.Iterator;
+import javax.swing.event.TreeModelListener;
+import javax.swing.event.TreeExpansionListener;
+import javax.swing.event.TreeWillExpandListener;
+import javax.swing.event.TreeExpansionEvent;
+import javax.swing.event.TreeModelEvent;
+import javax.swing.tree.TreeNode;
+
+import com.sun.star.accessibility.XAccessibleEventBroadcaster;
+
+/** Each canvas has a shape container that is responsible for maintaining
+    a collection of shapes that are displayed by the canvas.
+*/
+public class ShapeContainer
+    implements TreeModelListener,
+               TreeExpansionListener,
+               TreeWillExpandListener
+{
+    public ShapeContainer (Canvas aCanvas)
+    {
+        maShapeList = new java.util.Hashtable();
+        maBoundingBox = new Rectangle (0,0,100,100);
+        maCanvas = aCanvas;
+        maTree = null;
+    }
+
+
+
+
+    public synchronized void SetTree (javax.swing.JTree aTree)
+    {
+        if (aTree != maTree)
+        {
+            if (maTree != null)
+            {
+                maTree.getModel().removeTreeModelListener (this);
+                maTree.removeTreeExpansionListener (this);
+                maTree.removeTreeWillExpandListener (this);
+            }
+
+            Clear();
+
+            maTree = aTree;
+
+            maTree.getModel().addTreeModelListener (this);
+            maTree.addTreeExpansionListener (this);
+            maTree.addTreeWillExpandListener (this);
+        }
+    }
+
+
+
+
+    public synchronized boolean AddNode (TreeNode aNode)
+    {
+        CanvasShape aShape = (CanvasShape)maShapeList.get (aNode);
+        if (aShape == null)
+        {
+            aShape = new CanvasShape (aNode, maCanvas);
+
+                        if (aNode instanceof XAccessibleEventBroadcaster)
+                           ((XAccessibleEventBroadcaster) aNode).addEventListener(aShape);
+
+            // Update bounding box that includes all objects.
+           if (maShapeList.size() == 0)
+               maBoundingBox = aShape.GetBBox();
+           else
+               maBoundingBox = maBoundingBox.union (aShape.GetBBox());
+
+            maShapeList.put (aNode, aShape);
+
+            maCanvas.repaint();
+
+            return true;
+        }
+        else
+            return false;
+    }
+
+
+    /**
+    */
+    public synchronized boolean RemoveNode (TreeNode aNode)
+    {
+        CanvasShape aShape = (CanvasShape)maShapeList.get (aNode);
+        if (aShape != null)
+        {
+                        if (aNode instanceof XAccessibleEventBroadcaster)
+                           ((XAccessibleEventBroadcaster) aNode).removeEventListener(aShape);
+
+            maShapeList.remove (aNode);
+            maCanvas.SelectObject (null);
+            maCanvas.repaint ();
+            return true;
+        }
+        else
+            return false;
+    }
+
+
+
+
+    public synchronized void Clear ()
+    {
+        maShapeList.clear ();
+    }
+
+
+
+
+    public Iterator GetIterator ()
+    {
+        return maShapeList.values().iterator ();
+    }
+
+
+
+
+    public CanvasShape Get (TreeNode aNode)
+    {
+            if (aNode != null) {
+        return (CanvasShape)maShapeList.get (aNode);
+            }
+            return null;
+    }
+
+
+    private void PrintMessage (String aMessage, java.util.EventObject aEvent)
+    {
+        //        System.out.println ("ShapeContainer: " + aMessage + ": " + aEvent);
+    }
+
+    public void treeNodesChanged (TreeModelEvent aEvent)
+    {
+        PrintMessage ("treeNodesChanged", aEvent);
+    }
+    public void treeNodesInserted (TreeModelEvent aEvent)
+    {
+        PrintMessage ("treeNodesInserted", aEvent);
+        Object[] aNewNodes = aEvent.getChildren();
+        for (int i=0; i<aNewNodes.length; i++)
+            AddNode ((TreeNode)aNewNodes[i]);
+    }
+    public void treeNodesRemoved (TreeModelEvent aEvent)
+    {
+        PrintMessage ("treeNodesRemoved", aEvent);
+        Object[] aOldNodes = aEvent.getChildren();
+        for (int i=0; i<aOldNodes.length; i++)
+            RemoveNode ((TreeNode)aOldNodes[i]);
+    }
+    public void treeStructureChanged (TreeModelEvent aEvent)
+    {
+        PrintMessage ("treeStructureChanged", aEvent);
+        TreeNode aNode = (TreeNode)aEvent.getTreePath().getLastPathComponent();
+        RemoveAllChildren(aNode);
+        AddAllChildren(aNode);
+    }
+
+    public void treeWillExpand (TreeExpansionEvent aEvent)
+    {
+        PrintMessage ("treeWillExpand", aEvent);
+    }
+    public void treeWillCollapse (TreeExpansionEvent aEvent)
+    {
+        PrintMessage ("treeWillCollapse", aEvent);
+        TreeNode aNode = (TreeNode)aEvent.getPath().getLastPathComponent();
+        RemoveAllChildren (aNode);
+    }
+    public void treeExpanded (TreeExpansionEvent aEvent)
+    {
+        PrintMessage ("treeExpanded", aEvent);
+        TreeNode aNode = (TreeNode)aEvent.getPath().getLastPathComponent();
+        AddAllChildren (aNode);
+    }
+    public void treeCollapsed (TreeExpansionEvent aEvent)
+    {
+        PrintMessage ("treeCollapsed", aEvent);
+    }
+
+    private void AddAllChildren (TreeNode aNode) {
+        java.util.Enumeration aChildList = aNode.children();
+        while (aChildList.hasMoreElements()) {
+            TreeNode aChild = (TreeNode) aChildList.nextElement();
+            if (aChild != null) {
+                AddAllChildren (aChild);
+                AddNode (aChild);
+            }
+        }
+    }
+
+    private void RemoveAllChildren (TreeNode aNode) {
+        java.util.Enumeration aChildList = aNode.children();
+        while (aChildList.hasMoreElements()) {
+            TreeNode aChild = (TreeNode) aChildList.nextElement();
+            if (aChild != null) {
+                RemoveAllChildren (aChild);
+                RemoveNode (aChild);
+            }
+        }
+    }
+
+
+    private java.util.Hashtable maShapeList;
+    private Rectangle maBoundingBox;
+    private Canvas maCanvas;
+    private javax.swing.JTree maTree;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common
new file mode 100644
index 000000000000..df47f1bc8028
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.common
@@ -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.
+#
+#*************************************************************************
+
+JARFILES = jurt.jar unoil.jar ridl.jar 
+JAVAFILES = 		\
+	CanvasShape.java  	\
+	Canvas.java        	\
+	MouseObserver.java	\
+	ShapeContainer.java
+
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.mk b/accessibility/workben/org/openoffice/accessibility/awb/canvas/makefile.mk
new file mode 100644
index 000000000000..1e56c10c98b4
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/canvas/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.
+#
+#*************************************************************************
+
+PRJNAME	= awb
+PRJ		= ..$/..$/..$/..$/..$/..
+TARGET	= awb_canvas
+PACKAGE	= org$/openoffice$/accessibility$/awb$/canvas
+
+USE_JAVAVER:=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+.IF "$(JAVAVER:s/.//)" >= "140" 
+
+.INCLUDE : makefile.common
+
+JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+
+#JARTARGET               = $(TARGET).jar
+#JARCOMPRESS             = TRUE
+JARCLASSDIRS            = $(PACKAGE) org/openoffice/java/accessibility/awb 
+#CUSTOMMANIFESTFILE      = manifest
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+
+.INCLUDE :  target.mk
+
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/makefile.common
new file mode 100644
index 000000000000..0bf38a0fada2
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/makefile.common
@@ -0,0 +1,30 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+JAVAFILES = 						\
+	AccessibilityWorkBench.java		\
+	HelpWindow.java						
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk b/accessibility/workben/org/openoffice/accessibility/awb/makefile.mk
new file mode 100644
index 000000000000..a07d631d6f11
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/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.
+#
+#*************************************************************************
+
+PRJNAME	= awb
+PRJ		= ..$/..$/..$/..$/..
+TARGET	= java_awb
+PACKAGE	= org$/openoffice$/accessibility$/awb
+
+USE_JAVAVER:=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+.IF "$(JAVAVER:s/.//)" >= "140" 
+JARFILES = jurt.jar unoil.jar ridl.jar 
+
+.INCLUDE : makefile.common
+
+JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+
+JARTARGET               = $(TARGET).jar
+JARCOMPRESS             = TRUE
+JARCLASSDIRS            = $(PACKAGE) \
+    org$/openoffice$/accessibility$/misc
+CUSTOMMANIFESTFILE      = manifest
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+
+.INCLUDE :  target.mk
+
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/manifest b/accessibility/workben/org/openoffice/accessibility/awb/manifest
new file mode 100644
index 000000000000..36111c54081d
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/manifest
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: org.openoffice.accessibility.awb.AccessibilityWorkBench
+Class-Path: classes.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar jaxp.jar
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityModel.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityModel.java
new file mode 100644
index 000000000000..159467778554
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityModel.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.tree;
+
+import javax.swing.SwingUtilities;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.MutableTreeNode;
+import javax.swing.tree.DefaultMutableTreeNode;
+
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.awt.XTopWindow;
+import com.sun.star.awt.XTopWindowListener;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleEventBroadcaster;
+import com.sun.star.accessibility.XAccessibleEventListener;
+
+/**
+ *
+ */
+public abstract class AccessibilityModel extends javax.swing.tree.DefaultTreeModel {
+
+    protected java.util.Hashtable nodeList;
+    protected static DefaultMutableTreeNode disconnectedRootNode =
+        new DefaultMutableTreeNode("<not connected>");
+
+    /** Creates a new instance of AccessibilityModel */
+    public AccessibilityModel() {
+        super(disconnectedRootNode, false);
+        nodeList = new java.util.Hashtable();
+    }
+
+    /* Convenience method that creates a new Toolkit node from xToolkit
+     * and sets as the new root object of the tree.
+     */
+    public synchronized void setRoot(XExtendedToolkit xToolkit) {
+        if (xToolkit != null) {
+            try {
+                // remove old root node as topwindow listener
+                if (getRoot() instanceof ToolkitNode) {
+                    ToolkitNode tn = (ToolkitNode) getRoot();
+                    if (tn.xToolkit != null) {
+                        tn.xToolkit.removeTopWindowListener(tn);
+                    }
+                }
+                nodeList.clear();
+                setRoot(new ToolkitNode(xToolkit, this));
+                xToolkit.addTopWindowListener((ToolkitNode) getRoot());
+            } catch (com.sun.star.uno.RuntimeException e) {
+                // FIXME: error message !
+            }
+        }
+    }
+
+    /* Appends the new child to parent's child list */
+    public void addNodeInto(MutableTreeNode newChild, MutableTreeNode parent) {
+        int index = parent.getChildCount();
+        if (newChild != null && newChild.getParent() == parent) {
+            index -= 1;
+        }
+        insertNodeInto(newChild, parent, index);
+    }
+
+    /** Adds listener to the listener chain of node */
+    public static void addEventListener(TreeNode node, XAccessibleEventListener listener) {
+        if (node instanceof AccessibilityNode) {
+            ((AccessibilityNode) node).addEventListener(listener);
+        }
+    }
+
+    /** Removes listener from the listener chain of node */
+    public static void removeEventListener(TreeNode node, XAccessibleEventListener listener) {
+        if (node instanceof AccessibilityNode) {
+            ((AccessibilityNode) node).removeEventListener(listener);
+        }
+    }
+
+    protected abstract AccessibilityNode createWindowNode(XAccessible xAccessible,
+            XAccessibleContext xAccessibleContext);
+    protected abstract AccessibilityNode createNode(XAccessible xAccessible);
+
+    /** Adds xAccessible,node to the internal hashtable */
+    public AccessibilityNode putNode(XAccessible xAccessible, AccessibilityNode node) {
+        if (xAccessible != null) {
+            String oid = UnoRuntime.generateOid(xAccessible);
+            java.lang.ref.WeakReference ref = (java.lang.ref.WeakReference)
+                nodeList.put(oid, new java.lang.ref.WeakReference(node));
+            if (ref != null) {
+                return (AccessibilityNode) ref.get();
+            }
+        }
+        return null;
+    }
+
+    /** Returns the AccessibilityNode for xAccessible */
+    public AccessibilityNode findNode(XAccessible xAccessible) {
+        if (xAccessible != null) {
+            String oid = UnoRuntime.generateOid(xAccessible);
+            java.lang.ref.WeakReference ref =
+                (java.lang.ref.WeakReference) nodeList.get(oid);
+            if (ref != null) {
+                return (AccessibilityNode) ref.get();
+            }
+        }
+        return null;
+    }
+
+    /** Removes the AccessibilityNode for xAccessible from the internal hashtable */
+    public AccessibilityNode removeNode(XAccessible xAccessible) {
+        if (xAccessible != null) {
+            String oid = UnoRuntime.generateOid(xAccessible);
+            java.lang.ref.WeakReference ref =
+                (java.lang.ref.WeakReference) nodeList.remove(oid);
+            if (ref != null) {
+                return (AccessibilityNode) ref.get();
+            }
+        }
+        return null;
+    }
+
+    public AccessibilityNode removeNode(Object o) {
+        if (o instanceof XAccessible) {
+            return removeNode((XAccessible) o);
+        }
+        return null;
+    }
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityNode.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityNode.java
new file mode 100644
index 000000000000..81a499aabf0d
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityNode.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.tree;
+
+import org.openoffice.accessibility.misc.AccessibleEventMulticaster;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.SwingUtilities;
+
+import com.sun.star.accessibility.AccessibleEventId;
+import com.sun.star.accessibility.AccessibleEventObject;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleEventBroadcaster;
+import com.sun.star.accessibility.XAccessibleEventListener;
+
+import com.sun.star.uno.UnoRuntime;
+
+class AccessibilityNode extends DefaultMutableTreeNode implements XAccessible,
+        XAccessibleEventListener, XAccessibleEventBroadcaster {
+
+    protected AccessibilityModel treeModel;
+    protected XAccessibleContext unoAccessibleContext;
+
+    private XAccessibleEventListener listener;
+
+    public AccessibilityNode(AccessibilityModel treeModel) {
+        this.treeModel = treeModel;
+    }
+
+    protected void finalize() throws java.lang.Throwable {
+        if (userObject != null) {
+            treeModel.removeNode(userObject);
+        }
+    }
+
+    /** Sets the XAccessibleContext object of this node */
+    public void setAccessibleContext(XAccessibleContext xAccessibleContext) {
+        unoAccessibleContext = xAccessibleContext;
+    }
+
+    /** Returns the XAccessibleContext object of this node */
+    public XAccessibleContext getAccessibleContext() {
+        return unoAccessibleContext;
+    }
+
+    /** Attaches or Detaches the itself as listener to unoAccessibleContext */
+    protected void setAttached(boolean attach) {
+        XAccessibleContext xAccessibleContext = unoAccessibleContext;
+        if (xAccessibleContext != null) {
+            try {
+                XAccessibleEventBroadcaster xAccessibleEventBroadcaster =
+                    UnoRuntime.queryInterface( XAccessibleEventBroadcaster.class, xAccessibleContext );
+                if (xAccessibleEventBroadcaster != null) {
+                    if (attach) {
+                        xAccessibleEventBroadcaster.addEventListener(this);
+                    } else {
+                        xAccessibleEventBroadcaster.removeEventListener(this);
+                    }
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+                // FIXME: error message !
+            }
+        }
+    }
+
+    public void disposing(com.sun.star.lang.EventObject eventObject) {
+        XAccessibleEventListener localListener = this.listener;
+        if (localListener != null) {
+            localListener.disposing(eventObject);
+        }
+
+        treeModel.removeNode(userObject);
+        userObject = null;
+        unoAccessibleContext = null;
+        // FIXME: mark the object as being disposed in the tree view !
+    }
+
+    protected void handleChildRemoved(XAccessible xAccessible) {
+        final AccessibilityNode node = treeModel.findNode(xAccessible);
+        if (node != null) {
+            SwingUtilities.invokeLater(new java.lang.Runnable() {
+                public void run() {
+                    treeModel.removeNodeFromParent(node);
+                }
+            });
+        }
+    }
+
+    protected void handleChildAdded(XAccessible xAccessible) {
+        final AccessibilityNode parent = this;
+        final AccessibilityNode node = treeModel.createNode(xAccessible);
+        if (node != null) {
+            SwingUtilities.invokeLater(new java.lang.Runnable() {
+                public void run() {
+                    try {
+                        XAccessibleContext xAC = node.getAccessibleContext();
+                        if (xAC != null) {
+                            treeModel.insertNodeInto(node, parent,
+                                xAC.getAccessibleIndexInParent());
+                        }
+                    } catch (com.sun.star.uno.RuntimeException e) {
+                        // FIXME: output
+                    }
+                }
+            });
+        }
+    }
+
+    public void notifyEvent(AccessibleEventObject accessibleEventObject) {
+        if (accessibleEventObject.EventId == AccessibleEventId.CHILD) {
+            XAccessible xAccessible = UnoRuntime.queryInterface( XAccessible.class, accessibleEventObject.OldValue );
+            if (xAccessible != null) {
+                handleChildRemoved(xAccessible);
+            }
+
+            xAccessible = UnoRuntime.queryInterface( XAccessible.class, accessibleEventObject.NewValue );
+            if (xAccessible != null) {
+                handleChildAdded(xAccessible);
+            }
+        }
+
+        XAccessibleEventListener localListener = this.listener;
+        if (localListener != null) {
+            localListener.notifyEvent(accessibleEventObject);
+        }
+    }
+
+    public synchronized void addEventListener(com.sun.star.accessibility.XAccessibleEventListener xAccessibleEventListener) {
+         listener = AccessibleEventMulticaster.add(listener, xAccessibleEventListener);
+    }
+
+    public synchronized void removeEventListener(com.sun.star.accessibility.XAccessibleEventListener xAccessibleEventListener) {
+        listener = AccessibleEventMulticaster.remove(listener, xAccessibleEventListener);
+    }
+}
+
+
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTree.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTree.java
new file mode 100644
index 000000000000..e485c993706a
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTree.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.tree;
+
+import org.openoffice.accessibility.misc.NameProvider;
+
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.DefaultMutableTreeNode;
+
+import com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+
+/**
+ *
+ */
+public class AccessibilityTree extends javax.swing.JTree {
+
+    /** Creates a new instance of AccessibilityTree */
+    public AccessibilityTree(javax.swing.tree.TreeModel model) {
+        super(model);
+        // always show handles to indicate expandable / collapsable
+        showsRootHandles = true;
+    }
+
+    public void setToolkit(XExtendedToolkit xToolkit) {
+        AccessibilityModel model = (AccessibilityModel) getModel();
+        if (model != null) {
+            // hide the root node when connected
+            setRootVisible(xToolkit == null);
+            // update the root node
+            model.setRoot(xToolkit);
+            model.reload();
+        }
+    }
+
+     public String convertValueToText(Object value, boolean selected,
+            boolean expanded, boolean leaf, int row, boolean hasFocus) {
+
+        if (value instanceof DefaultMutableTreeNode) {
+            DefaultMutableTreeNode node = (DefaultMutableTreeNode) value;
+
+            Object userObject = node.getUserObject();
+            if (userObject != null && userObject instanceof XAccessible) {
+                XAccessible xAccessible = (XAccessible) userObject;
+                try {
+                    XAccessibleContext xAC = xAccessible.getAccessibleContext();
+                    if (xAC != null) {
+                        String name = xAC.getAccessibleName();
+                        if (name.length() == 0) {
+                            name = new String ("<no name>");
+                        }
+                        value = name + " / " + NameProvider.getRoleName(xAC.getAccessibleRole());
+                    }
+                } catch (com.sun.star.uno.RuntimeException e) {
+                    value = "???";
+                }
+            }
+        }
+
+        return super.convertValueToText(value, selected, expanded, leaf, row, hasFocus);
+     }
+
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTreeModel.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTreeModel.java
new file mode 100644
index 000000000000..6069c8f5f5ee
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/AccessibilityTreeModel.java
@@ -0,0 +1,217 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.tree;
+
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.lang.DisposedException;
+import com.sun.star.lang.IndexOutOfBoundsException;
+
+import org.openoffice.accessibility.misc.OfficeConnection;
+import org.openoffice.accessibility.awb.event.EventQueue;
+
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeNode;
+
+
+public class AccessibilityTreeModel
+    extends DefaultTreeModel
+{
+    public AccessibilityTreeModel ()
+    {
+        super (null);
+        setAsksAllowsChildren (false);
+
+        SetRootNode();
+    }
+
+
+
+    /** Release all resources.
+    */
+    synchronized public void Dispose ()
+    {
+        Clear ();
+    }
+
+
+
+    /** Calls to this method are dispatched to the given node but are
+        observed for exceptions.
+    */
+    synchronized public boolean isLeaf (Object aObject)
+    {
+        boolean bIsLeaf = true;
+
+        if (aObject != null)
+        {
+            AccessibilityNode aNode = (AccessibilityNode)aObject;
+            try
+            {
+                bIsLeaf = aNode.isLeaf();
+            }
+            catch (DisposedException aException)
+            {
+                System.out.println ("node is disposed. removing it");
+                /*                TreeNode aParent = aNode.GetParent();
+                int nIndexInParent = aParent.getIndex (aNode);
+                aNode.removeFromParent ();
+                System.out.println ("" + aParent + " # " + aNode + " # "+ nIndexInParent);
+                nodesWereRemoved (
+                    aParent, new int[]{nIndexInParent}, new
+                    Object[]{aNode});
+                */
+            }
+            catch (Exception aException)
+            {
+                System.err.println ("caught exception in AccessibilityTreeModel.isLeaf():"
+                    + aException);
+                aException.printStackTrace (System.err);
+            }
+        }
+
+        return bIsLeaf;
+    }
+
+
+
+
+    synchronized public int getChildCount (Object aObject)
+    {
+        AccessibilityNode aNode = (AccessibilityNode)aObject;
+        return aNode.getChildCount();
+    }
+
+
+
+
+    /** Return the requested child of aParent.  If that child is not yet
+        known to the parent then try to create it.
+    */
+    synchronized public Object getChild (Object aParent, final int nIndex)
+    {
+        AccessibilityNode aChild = null;
+
+        final AccessibilityNode aParentNode = (AccessibilityNode)aParent;
+
+        // Try to get an existing child from the super class object.
+        aChild = aParentNode.GetChildNoCreate (nIndex);
+
+        // When the requested child does not yet exist and this node is not a
+        // special node then create a new node.
+        if (aChild == null)
+        {
+            aChild = aParentNode.CreateChild (nIndex);
+            aParentNode.SetChild ((AccessibilityNode)aChild, nIndex);
+            /*            EventQueue.Instance().AddEvent (new Runnable() { public void run() {
+                AccessibilityTreeModel.this.nodeWasInserted (
+                    aParentNode, nIndex);
+            }});
+            */        }
+
+        return aChild;
+    }
+
+
+    synchronized public void nodeWasInserted (AccessibilityNode aParent, int nIndex)
+    {
+        nodesWereInserted (aParent, new int[]{nIndex});
+        nodeStructureChanged (aParent);
+
+    }
+
+
+
+
+    /** Clear the tree so that afterwards it has only the root node.
+    */
+    public void Clear ()
+    {
+        AccessibilityNode aRoot = (AccessibilityNode)getRoot();
+        aRoot.RemoveAllChildren();
+        SetRootNode();
+        nodeStructureChanged (aRoot);
+    }
+
+
+
+
+    private void SetRootNode ()
+    {
+        OfficeConnection aConnection = OfficeConnection.Instance();
+        AccessibilityNode aRoot;
+        if (aConnection!=null && aConnection.IsValid())
+            aRoot = new AccessibilityNode ("<connected>");
+        else
+            aRoot = new AccessibilityNode ("<not connected>");
+        setRoot (aRoot);
+    }
+
+
+
+
+    /** Add a new child to the root node.
+    */
+    public synchronized void AddTopLevelNode (AccessibilityNode aNode)
+    {
+        if (aNode != null)
+        {
+            if ( ! OfficeConnection.Instance().IsValid())
+            {
+                setRoot (null);
+            }
+
+            AccessibilityNode aRoot = (AccessibilityNode)getRoot();
+            if (aRoot == null)
+            {
+                aRoot = new AccessibilityNode ("<connected>");
+                setRoot (aRoot);
+            }
+
+            aNode.SetParent (aRoot);
+            aRoot.Append (aNode);
+            nodesWereInserted (aRoot, new int[]{aRoot.getIndex (aNode)});
+        }
+    }
+
+
+
+
+    /** Remove a node that is a direct child of the root.
+    */
+    public synchronized void RemoveTopLevelNode (AccessibilityNode aNode)
+    {
+        AccessibilityNode aRoot = (AccessibilityNode)getRoot();
+        if (aRoot != null)
+        {
+            int nIndex = aRoot.getIndex (aNode);
+            aRoot.Remove (aNode);
+            nodesWereRemoved (aRoot, new int[]{nIndex}, new Object[]{aNode});
+        }
+    }
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityModel.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityModel.java
new file mode 100644
index 000000000000..f2b4c6f0e97f
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityModel.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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.tree;
+
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.MutableTreeNode;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.event.TreeExpansionListener;
+import javax.swing.event.TreeWillExpandListener;
+
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+
+/**
+ *
+ */
+public class DynamicAccessibilityModel extends AccessibilityModel implements TreeExpansionListener, TreeWillExpandListener {
+
+    /* Creates a AccessibilityNode object for a window */
+    protected AccessibilityNode createWindowNode(XAccessible xAccessible,
+            XAccessibleContext xAccessibleContext) {
+        if (xAccessible != null) {
+            // Some objects inherit XAccessible, but should not appear in
+            // the hierarchy as toplevels (like sub-menus), so they don't
+            // return an accessible context.
+            if (xAccessibleContext != null) {
+                AccessibilityNode node = new AccessibilityNode(this);
+                node.setUserObject(xAccessible);
+                node.setAccessibleContext(xAccessibleContext);
+                putNode(xAccessible, node);
+                return node;
+            }
+        }
+        return null;
+    }
+
+    /* Creates a DynamicAccessibilityNode object */
+    protected AccessibilityNode createNode(XAccessible xAccessible) {
+        if (xAccessible != null) {
+            try {
+                // Some objects inherit XAccessible, but should not appear in
+                // the hierarchy as toplevels (like sub-menus), so they don't
+                // return an accessible context.
+                XAccessibleContext xAccessibleContext = xAccessible.getAccessibleContext();
+                if (xAccessibleContext != null) {
+                    AccessibilityNode node = new DynamicAccessibilityNode(this);
+                    node.setUserObject(xAccessible);
+                    node.setAccessibleContext(xAccessibleContext);
+                    putNode(xAccessible, node);
+                    return node;
+                }
+            } catch (com.sun.star.uno.RuntimeException e) {
+            }
+        }
+        return null;
+    }
+
+    public void treeCollapsed(javax.swing.event.TreeExpansionEvent treeExpansionEvent) {
+        TreeNode node = (TreeNode) treeExpansionEvent.getPath().getLastPathComponent();
+        if (node instanceof DynamicAccessibilityNode) {
+            DynamicAccessibilityNode dynode = (DynamicAccessibilityNode) node;
+            dynode.clear();
+        }
+    }
+
+    public void treeExpanded(javax.swing.event.TreeExpansionEvent treeExpansionEvent) {
+        TreeNode node = (TreeNode) treeExpansionEvent.getPath().getLastPathComponent();
+        if (node instanceof AccessibilityNode) {
+            // Calling oneway methods from an UNO thread may cause
+            // deadlocks, so adding the listeners here.
+            for (java.util.Enumeration e = node.children(); e.hasMoreElements(); ) {
+                ((AccessibilityNode) e.nextElement()).setAttached(true);
+            }
+        }
+    }
+
+    public void treeWillCollapse(javax.swing.event.TreeExpansionEvent treeExpansionEvent)
+            throws javax.swing.tree.ExpandVetoException {
+        TreeNode node = (TreeNode) treeExpansionEvent.getPath().getLastPathComponent();
+        if (node instanceof AccessibilityNode) {
+            // Calling oneway methods from an UNO thread may cause
+            // deadlocks, so adding the listeners here.
+            for (java.util.Enumeration e = node.children(); e.hasMoreElements(); ) {
+                ((AccessibilityNode) e.nextElement()).setAttached(false);
+            }
+        }
+    }
+
+    public void treeWillExpand(javax.swing.event.TreeExpansionEvent treeExpansionEvent)
+            throws javax.swing.tree.ExpandVetoException {
+        TreeNode node = (TreeNode) treeExpansionEvent.getPath().getLastPathComponent();
+        if (node instanceof DynamicAccessibilityNode) {
+            DynamicAccessibilityNode dynode = (DynamicAccessibilityNode) node;
+            dynode.populate();
+        }
+    }
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityNode.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityNode.java
new file mode 100644
index 000000000000..a982ad71c4d5
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/DynamicAccessibilityNode.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.tree;
+
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+
+/*
+ * This class is dynamic in the way that it does not contain any children
+ * until the node is going to be expanded. It also releases all children
+ * as soon as the node is collapsed again.
+ */
+class DynamicAccessibilityNode extends AccessibilityNode {
+
+    public DynamicAccessibilityNode(AccessibilityModel treeModel) {
+        super(treeModel);
+    }
+
+    // Populates the child list. Called by AccessibilityMode.treeWillExpand().
+    protected void populate() {
+        try {
+            XAccessibleContext xAC = getAccessibleContext();
+            if (xAC != null) {
+                int n = xAC.getAccessibleChildCount();
+                for (int i=0; i<n; i++) {
+                    XAccessible xAccessible = xAC.getAccessibleChild(i);
+                    AccessibilityNode node = treeModel.findNode(xAccessible);
+                    if (node == null) {
+                        node = treeModel.createNode(xAccessible);
+                    }
+                    if (node != null) {
+                        // NOTE: do not send any tree notifications here !
+                        add(node);
+                    }
+                }
+            }
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            // This should never happen since we previously checked the child
+            // count.
+            // FIXME: error message
+        } catch (com.sun.star.uno.RuntimeException e) {
+            // FIXME: error message
+        }
+    }
+
+    // Clears the child list. Called by AccessibilityModel.treeCollapsed().
+    protected void clear() {
+        removeAllChildren();
+    }
+
+    /* This is called whenever the node is painted, no matter if collapsed
+     * or expanded. Making this a "life" value seems to be appropriate.
+     */
+    public boolean isLeaf() {
+        try {
+            XAccessibleContext xAC = getAccessibleContext();
+            if (xAC != null) {
+                return xAC.getAccessibleChildCount() == 0;
+            }
+            return true;
+        } catch (com.sun.star.uno.RuntimeException e) {
+            return true;
+        }
+    }
+
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/Makefile b/accessibility/workben/org/openoffice/accessibility/awb/tree/Makefile
new file mode 100644
index 000000000000..579b8822ce76
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/Makefile
@@ -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.
+#
+#*************************************************************************
+
+all : package
+
+ROOT=../../../../..
+PACKAGE = org.openoffice.accessibility.awb.tree
+SUBDIRS =
+include makefile.common
+
+include $(ROOT)/makefile.in
+
+
+package : $(CLASS_FILES)
+
+
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/ToolkitNode.java b/accessibility/workben/org/openoffice/accessibility/awb/tree/ToolkitNode.java
new file mode 100644
index 000000000000..8eaa9dab6c02
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/ToolkitNode.java
@@ -0,0 +1,215 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.tree;
+
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+
+import com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.awt.XTopWindow;
+
+import com.sun.star.uno.UnoRuntime;
+
+import javax.swing.SwingUtilities;
+import javax.swing.tree.DefaultMutableTreeNode;
+
+/**
+ *
+ */
+public class ToolkitNode extends DefaultMutableTreeNode
+        implements com.sun.star.awt.XTopWindowListener {
+
+    protected XExtendedToolkit xToolkit;
+
+    private AccessibilityModel treeModel;
+
+    /** Creates a new instance of TopWindowListener */
+    public ToolkitNode(XExtendedToolkit xToolkit, AccessibilityModel treeModel) {
+        super("<connected>");
+        this.xToolkit = xToolkit;
+        this.treeModel = treeModel;
+
+        // Initially fill the child list
+        try {
+            for (int i=0,j=xToolkit.getTopWindowCount(); i<j; i++) {
+                XTopWindow xTopWindow = xToolkit.getTopWindow(i);
+                if (xTopWindow != null) {
+                    AccessibilityNode an = getTopWindowNode(xTopWindow);
+                    if (an != null) {
+                        add(an);
+                        // Calling oneway methods from an UNO thread may cause
+                        // deadlocks, so adding the listeners here.
+                        an.setAttached(true);
+                    }
+                }
+            }
+        } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+            // This should never happen since we properly check the count
+            // before - anyway returning what we got so far.
+        }
+    }
+
+    /** Returns an AccessibilityNode if xAccessible has a valid toplevel */
+    private AccessibilityNode getTopWindowNode(XAccessible xAccessible) {
+        XAccessibleContext xAC = xAccessible.getAccessibleContext();
+        if (xAC != null) {
+            short role = xAC.getAccessibleRole();
+            if ((role == AccessibleRole.FRAME) || (role == AccessibleRole.DIALOG) || (role == AccessibleRole.WINDOW)) {
+                return treeModel.createWindowNode(xAccessible, xAC);
+            }
+        }
+        return null;
+    }
+
+    /** Returns an AccessibilityNode if xAccessible has a valid toplevel */
+    private AccessibilityNode getTopWindowNode(XAccessible xAccessible, XAccessibleContext xAC) {
+        if (xAC != null) {
+            short role = xAC.getAccessibleRole();
+            if ((role == AccessibleRole.FRAME) || (role == AccessibleRole.DIALOG) || (role == AccessibleRole.WINDOW)) {
+                AccessibilityNode parent = treeModel.createWindowNode(xAccessible, xAC);
+                if (parent != null) {
+                    try {
+                        int n = xAC.getAccessibleChildCount();
+                        for (int i=0; i<n; i++) {
+                            AccessibilityNode child = treeModel.createNode(xAC.getAccessibleChild(i));
+                            if (child != null) {
+                                parent.add(child);
+                            }
+                        }
+                    } catch (com.sun.star.lang.IndexOutOfBoundsException e) {
+
+                    }
+                }
+                return parent;
+            }
+        }
+        return null;
+    }
+
+    /** Returns the XAccessible interface corresponding to the toplevel window */
+    private AccessibilityNode getTopWindowNode(XTopWindow w) {
+        XAccessible xAccessible = (XAccessible)
+            UnoRuntime.queryInterface(XAccessible.class, w);
+        if (xAccessible != null) {
+            // XTopWindows usually have an accessible parent, which is the
+            // native container window ..
+            XAccessibleContext xAC = xAccessible.getAccessibleContext();
+            if (xAC != null) {
+                XAccessible xParent = xAC.getAccessibleParent();
+                if (xParent != null) {
+                    AccessibilityNode parent = getTopWindowNode(xParent);
+                    AccessibilityNode child = treeModel.createNode(xAccessible);
+                    if (parent != null && child != null) {
+                        parent.add(child);
+                    }
+                    return parent;
+                } else {
+                    return getTopWindowNode(xAccessible, xAC);
+                }
+            }
+        }
+        return null;
+    }
+
+    public void disposing(com.sun.star.lang.EventObject eventObject) {
+        // FIXME : message
+        // prevent setRoot from removing this as event listener
+        xToolkit = null;
+        treeModel.setRoot(treeModel.disconnectedRootNode);
+    }
+
+    public void windowActivated(com.sun.star.lang.EventObject eventObject) {
+    }
+
+    public void windowClosed(com.sun.star.lang.EventObject eventObject) {
+        XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface(
+            XAccessible.class, eventObject.Source);
+        if (xAccessible != null) {
+            AccessibilityNode node = treeModel.findNode(xAccessible);
+
+            // The object implementing XTopWindow is often not the toplevel
+            // accessible object.
+            if (node != null && node.getParent() != this) {
+                node = (AccessibilityNode) node.getParent();
+            }
+
+            if (node != null) {
+                final AccessibilityNode an = node;
+                Runnable removeRun = new Runnable() {
+                    public void run() {
+                        try {
+                            treeModel.removeNodeFromParent(an);
+                            // Calling oneway methods from an UNO thread may cause
+                            // deadlocks, so removing the listeners here.
+                            an.setAttached(false);
+                        } catch (IllegalArgumentException e) {
+                            // for some toplevel we get more than one event -
+                            // ignoring
+                        }
+                    }
+                };
+                SwingUtilities.invokeLater(removeRun);
+            }
+        }
+    }
+
+    public void windowClosing(com.sun.star.lang.EventObject eventObject) {
+    }
+
+    public void windowDeactivated(com.sun.star.lang.EventObject eventObject) {
+    }
+
+    public void windowMinimized(com.sun.star.lang.EventObject eventObject) {
+    }
+
+    public void windowNormalized(com.sun.star.lang.EventObject eventObject) {
+    }
+
+    public void windowOpened(com.sun.star.lang.EventObject eventObject) {
+        final XTopWindow xTopWindow = (XTopWindow) UnoRuntime.queryInterface(
+            XTopWindow.class, eventObject.Source);
+        if (xTopWindow != null) {
+            final ToolkitNode tn = this;
+            Runnable addNodeRun = new Runnable() {
+                public void run() {
+                    // Note: UNO does not allow to make synchronous callbacks
+                    // to oneway calls, so we have to fetch the node here.
+                    AccessibilityNode an = getTopWindowNode(xTopWindow);
+                    if (an != null) {
+                        treeModel.addNodeInto(an, tn);
+                        // Calling oneway methods from an UNO thread may cause
+                        // deadlocks, so adding the listeners here.
+                        an.setAttached(true);
+                    }
+                }
+            };
+            SwingUtilities.invokeLater(addNodeRun);
+        }
+    }
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common
new file mode 100644
index 000000000000..e44be51360e7
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.common
@@ -0,0 +1,35 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+JARFILES = jurt.jar unoil.jar ridl.jar 
+JAVAFILES = 						\
+	AccessibilityModel.java \
+	AccessibilityNode.java \
+	AccessibilityTree.java \
+	DynamicAccessibilityModel.java \
+	DynamicAccessibilityNode.java \
+	ToolkitNode.java
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.mk b/accessibility/workben/org/openoffice/accessibility/awb/tree/makefile.mk
new file mode 100644
index 000000000000..0135ca9d6422
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/tree/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.
+#
+#*************************************************************************
+
+PRJNAME	= awb
+PRJ		= ..$/..$/..$/..$/..$/..
+TARGET	= java_tree
+PACKAGE	= org$/openoffice$/accessibility$/awb$/tree
+
+USE_JAVAVER:=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+.IF "$(JAVAVER:s/.//)" >= "140" 
+
+.INCLUDE : makefile.common
+
+JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+
+.INCLUDE :  target.mk
+
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/ComponentView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/ComponentView.java
new file mode 100644
index 000000000000..d4c0e102b7a9
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/ComponentView.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.view;
+
+import java.awt.Color;
+import java.awt.Dimension;
+
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+
+import javax.swing.JLabel;
+
+import com.sun.star.accessibility.AccessibleEventId;
+import com.sun.star.accessibility.AccessibleEventObject;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.uno.UnoRuntime;
+
+import org.openoffice.accessibility.misc.NameProvider;
+
+/** The <type>ContextView</type> class displays information accessible over
+    the <type>XAccessibleContext</type> interface.  This includes name,
+    description, and role.
+*/
+public class ComponentView
+    extends ObjectView
+{
+    static public ObjectView Create (
+        ObjectViewContainer aContainer,
+        XAccessibleContext xContext)
+    {
+        if (UnoRuntime.queryInterface(
+            XAccessibleComponent.class, xContext) != null)
+            return new ComponentView (aContainer);
+        else
+            return null;
+    }
+
+    public ComponentView (ObjectViewContainer aContainer)
+    {
+        super (aContainer);
+
+        ViewGridLayout aLayout = new ViewGridLayout (this);
+
+        maRelativeLocationLabel = aLayout.AddLabeledEntry ("Relative Location: ");
+        maAbsoluteLocationLabel = aLayout.AddLabeledEntry ("Location on Screen: ");
+        maSizeLabel = aLayout.AddLabeledEntry ("Size");
+        maBoundingBoxLabel = aLayout.AddLabeledEntry ("Bounding Box: ");
+        maConsistencyLabel = aLayout.AddLabeledEntry ("Consistent: ");
+        maForegroundColorLabel = aLayout.AddLabeledEntry ("Foreground Color: ");
+        maBackgroundColorLabel = aLayout.AddLabeledEntry ("Background Color: ");
+    }
+
+
+    public void SetObject (XAccessibleContext xContext)
+    {
+        mxComponent = (XAccessibleComponent)UnoRuntime.queryInterface(
+            XAccessibleComponent.class, xContext);
+        super.SetObject (xContext);
+    }
+
+    public void Update ()
+    {
+        if (mxContext == null)
+        {
+            maRelativeLocationLabel.setText ("<null object>");
+            maAbsoluteLocationLabel.setText ("<null object>");
+            maSizeLabel.setText ("<null object>");
+            maBoundingBoxLabel.setText ("<null object>");
+            maConsistencyLabel.setText ("<null object>");
+            maForegroundColorLabel.setText ("<null object>");
+            maBackgroundColorLabel.setText ("<null object>");
+        }
+        else
+        {
+            com.sun.star.awt.Point aLocation = mxComponent.getLocation();
+            maRelativeLocationLabel.setText (
+                aLocation.X + ", " + aLocation.Y);
+            com.sun.star.awt.Point aLocationOnScreen =
+                mxComponent.getLocationOnScreen();
+            maAbsoluteLocationLabel.setText (
+                aLocationOnScreen.X + ", " + aLocationOnScreen.Y);
+            com.sun.star.awt.Size aSize = mxComponent.getSize();
+            maSizeLabel.setText (
+                aSize.Width + ", " + aSize.Height);
+            com.sun.star.awt.Rectangle aBBox = mxComponent.getBounds();
+            maBoundingBoxLabel.setText (
+                aBBox.X + ", " + aBBox.Y + ","
+                + aBBox.Width + ", " + aBBox.Height);
+            int nColor = mxComponent.getForeground();
+            maForegroundColorLabel.setText (
+                "R"+ (nColor>>16&0xff)
+                + "G" + (nColor>>8&0xff)
+                + "B" + (nColor>>0&0xff)
+                + "A" + (nColor>>24&0xff));
+            nColor = mxComponent.getBackground();
+            maBackgroundColorLabel.setText (
+                "R"+ (nColor>>16&0xff)
+                + "G" + (nColor>>8&0xff)
+                + "B" + (nColor>>0&0xff)
+                + "A" + (nColor>>24&0xff));
+
+            // Check consistency of coordinates.
+            String sConsistency = new String ();
+            if (aBBox.X!=aLocation.X || aBBox.Y!=aLocation.Y)
+                sConsistency += (sConsistency.length()!=0?", ":"") +
+                    "Bounding box conflicts with relative location";
+            if (aBBox.Width!=aSize.Width || aBBox.Height!=aSize.Height)
+                sConsistency += (sConsistency.length()!=0?", ":"") +
+                    "Bounding box conflicts with size";
+            XAccessible xParent = mxContext.getAccessibleParent();
+            XAccessibleComponent xParentComponent =
+                (XAccessibleComponent)UnoRuntime.queryInterface(
+                    XAccessibleComponent.class, xParent);
+            if (xParentComponent == null)
+            {
+                if (aLocation.X != aLocationOnScreen.X
+                    || aLocation.Y != aLocationOnScreen.Y)
+                    sConsistency += (sConsistency.length()!=0?", ":"") +
+                        "location on screen does not equal "
+                        + "relative location without parent";
+            }
+            else
+            {
+                com.sun.star.awt.Point aParentLocationOnScreen =
+                    xParentComponent.getLocationOnScreen();
+                if (aLocation.X+aParentLocationOnScreen.X
+                    != aLocationOnScreen.X
+                    || aLocation.Y+aParentLocationOnScreen.Y
+                    != aLocationOnScreen.Y)
+                    sConsistency += (sConsistency.length()!=0?", ":"") +
+                        "location on screen does not match "
+                        + "relative location";
+            }
+            if (sConsistency.length() == 0)
+                sConsistency += "yes";
+            else
+                maConsistencyLabel.setBackground (GetContainer().GetErrorColor());
+            maConsistencyLabel.setText (sConsistency);
+        }
+    }
+
+    public String GetTitle ()
+    {
+        return ("Component");
+    }
+
+    /** Listen for changes regarding displayed values.
+    */
+    public void notifyEvent (AccessibleEventObject aEvent)
+    {
+        switch (aEvent.EventId)
+        {
+            case AccessibleEventId.BOUNDRECT_CHANGED :
+            case AccessibleEventId.VISIBLE_DATA_CHANGED :
+                Update ();
+        }
+    }
+
+    private XAccessibleComponent mxComponent;
+    private JLabel
+        maRelativeLocationLabel,
+        maAbsoluteLocationLabel,
+        maSizeLabel,
+        maBoundingBoxLabel,
+        maConsistencyLabel,
+        maForegroundColorLabel,
+        maBackgroundColorLabel;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/ContextView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/ContextView.java
new file mode 100644
index 000000000000..a8588cd18ca6
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/ContextView.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.view;
+
+import java.awt.Color;
+import java.awt.Dimension;
+
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+
+import com.sun.star.accessibility.AccessibleEventId;
+import com.sun.star.accessibility.AccessibleEventObject;
+import com.sun.star.accessibility.XAccessibleContext;
+
+import org.openoffice.accessibility.misc.NameProvider;
+
+/** The <type>ContextView</type> class displays information accessible over
+    the <type>XAccessibleContext</type> interface.  This includes name,
+    description, and role.
+*/
+public class ContextView
+    extends ObjectView
+    implements ActionListener
+{
+    static public ObjectView Create (
+        ObjectViewContainer aContainer,
+        XAccessibleContext xContext)
+    {
+        if (xContext != null)
+            return new ContextView (aContainer);
+        else
+            return null;
+    }
+
+    public ContextView (ObjectViewContainer aContainer)
+    {
+        super (aContainer);
+
+        ViewGridLayout aLayout = new ViewGridLayout (this);
+        maNameLabel = aLayout.AddLabeledString ("Name:");
+        maDescriptionLabel = aLayout.AddLabeledString ("Description:");
+        maRoleLabel = aLayout.AddLabeledEntry ("Role:");
+    }
+
+    public void Update ()
+    {
+        if (mxContext == null)
+        {
+            maNameLabel.setText ("<null object>");
+            maDescriptionLabel.setText ("<null object>");
+            maRoleLabel.setText ("<null object>");
+        }
+        else
+        {
+            maNameLabel.setText (mxContext.getAccessibleName());
+            maDescriptionLabel.setText (mxContext.getAccessibleDescription());
+            maRoleLabel.setText (NameProvider.getRoleName (mxContext.getAccessibleRole()));
+        }
+    }
+
+    public String GetTitle ()
+    {
+        return ("Context");
+    }
+
+    /** Listen for changes regarding displayed values.
+    */
+    public void notifyEvent (AccessibleEventObject aEvent)
+    {
+        switch (aEvent.EventId)
+        {
+            case AccessibleEventId.NAME_CHANGED :
+            case AccessibleEventId.DESCRIPTION_CHANGED :
+                Update ();
+        }
+    }
+
+    public void actionPerformed (ActionEvent aEvent)
+    {
+    }
+
+
+    private JLabel
+        maNameLabel,
+        maDescriptionLabel,
+        maRoleLabel;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/EditableTextView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/EditableTextView.java
new file mode 100644
index 000000000000..2e39f117f62e
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/EditableTextView.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.view;
+
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import javax.swing.JButton;
+
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleEditableText;
+import com.sun.star.uno.UnoRuntime;
+
+import org.openoffice.accessibility.awb.view.text.TextDialogFactory;
+
+
+public class EditableTextView
+    extends ObjectView
+    implements ActionListener
+{
+    /** Create a EditableTextView when the given object supports the
+        XAccessibleEditableText interface.
+    */
+    static public ObjectView Create (
+        ObjectViewContainer aContainer,
+        XAccessibleContext xContext)
+    {
+        XAccessibleEditableText xEditableText =
+            (XAccessibleEditableText)UnoRuntime.queryInterface(
+                XAccessibleEditableText.class, xContext);
+        if (xEditableText != null)
+            return new EditableTextView (aContainer);
+        else
+            return null;
+    }
+
+    public EditableTextView (ObjectViewContainer aContainer)
+    {
+        super (aContainer);
+
+        JButton aButton = new JButton ("cut...");
+        aButton.setFont (ViewGridLayout.GetFont());
+        aButton.addActionListener (this);
+        add (aButton);
+        aButton = new JButton ("paste...");
+        aButton.setFont (ViewGridLayout.GetFont());
+        aButton.addActionListener (this);
+        add (aButton);
+        aButton = new JButton ("edit...");
+        aButton.setFont (ViewGridLayout.GetFont());
+        aButton.addActionListener (this);
+        add (aButton);
+        aButton = new JButton ("format...");
+        aButton.setFont (ViewGridLayout.GetFont());
+        aButton.addActionListener (this);
+        add (aButton);
+    }
+
+
+    /** Additionally to the context store a reference to the
+        XAccessibleEditableText interface.
+    */
+    public void SetObject (XAccessibleContext xObject)
+    {
+        mxEditableText = (XAccessibleEditableText)UnoRuntime.queryInterface(
+            XAccessibleEditableText.class, xObject);
+        super.SetObject (xObject);
+    }
+
+    public String GetTitle ()
+    {
+        return ("Editable Text");
+    }
+
+    synchronized public void Destroy ()
+    {
+        mxEditableText = null;
+        super.Destroy();
+    }
+
+    public void actionPerformed (ActionEvent aEvent)
+    {
+        String sCommand = aEvent.getActionCommand();
+        if (sCommand.equals ("cut..."))
+            TextDialogFactory.CreateCutDialog (mxContext);
+        else if (sCommand.equals ("past..."))
+            TextDialogFactory.CreatePasteDialog (mxContext);
+        else if (sCommand.equals ("edit..."))
+            TextDialogFactory.CreateEditDialog (mxContext);
+        else if (sCommand.equals ("format..."))
+            TextDialogFactory.CreateFormatDialog (mxContext);
+    }
+
+    private XAccessibleEditableText mxEditableText;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/EventMonitorView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/EventMonitorView.java
new file mode 100644
index 000000000000..67e8091e027f
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/EventMonitorView.java
@@ -0,0 +1,126 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.view;
+
+import java.awt.BorderLayout;
+import java.awt.GridBagLayout;
+import java.awt.GridBagConstraints;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics;
+import javax.swing.JScrollBar;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+import com.sun.star.accessibility.AccessibleEventId;
+import com.sun.star.accessibility.AccessibleEventObject;
+import com.sun.star.accessibility.XAccessibleContext;
+
+import org.openoffice.accessibility.misc.NameProvider;
+
+
+/** A simple event monitor that shows all events sent to one accessible
+    object.
+*/
+class EventMonitorView
+    extends ObjectView
+{
+    static public ObjectView Create (
+        ObjectViewContainer aContainer,
+        XAccessibleContext xContext)
+    {
+        if (xContext != null)
+            return new EventMonitorView (aContainer);
+        else
+            return null;
+    }
+
+    public EventMonitorView (ObjectViewContainer aContainer)
+    {
+        super (aContainer);
+        mnLineNo = 0;
+        Layout();
+    }
+
+    public String GetTitle ()
+    {
+        return "Event Monitor";
+    }
+
+    /** Create and arrange the widgets for this view.
+    */
+    private void Layout ()
+    {
+        setLayout (new GridBagLayout ());
+
+        maText = new JTextArea();
+        maText.setBackground (new Color (255,250,240));
+        maText.setFont (new Font ("Helvetica", Font.PLAIN, 9));
+
+        maScrollPane = new JScrollPane (maText,
+            JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
+            JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+        maScrollPane.setPreferredSize (new Dimension (300,200));
+
+        GridBagConstraints aConstraints = new GridBagConstraints ();
+        aConstraints.weightx = 1;
+        aConstraints.fill = GridBagConstraints.HORIZONTAL;
+        add (maScrollPane, aConstraints);
+    }
+
+
+    public void Update ()
+    {
+    }
+
+
+    private void UpdateVerticalScrollBar ()
+    {
+        JScrollBar sb = maScrollPane.getVerticalScrollBar();
+        if (sb != null)
+        {
+            int nScrollBarValue = sb.getMaximum() - sb.getVisibleAmount() - 1;
+            sb.setValue (nScrollBarValue);
+        }
+    }
+
+
+    public void notifyEvent (AccessibleEventObject aEvent)
+    {
+        maText.append ((mnLineNo++) + ". " + NameProvider.getEventName (aEvent.EventId) + " : "
+            + aEvent.OldValue.toString()
+            + " -> "
+            + aEvent.NewValue.toString() + "\n");
+        UpdateVerticalScrollBar();
+    }
+
+    private JTextArea maText;
+    private int mnLineNo;
+    private JScrollPane maScrollPane;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/FocusView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/FocusView.java
new file mode 100644
index 000000000000..4dec27958d71
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/FocusView.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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.view;
+
+import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JLabel;
+
+import com.sun.star.accessibility.AccessibleEventId;
+import com.sun.star.accessibility.AccessibleEventObject;
+import com.sun.star.accessibility.AccessibleStateType;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleStateSet;
+import com.sun.star.uno.UnoRuntime;
+
+public class FocusView
+    extends ObjectView
+    implements ActionListener
+{
+    /** Create a FocusView when the given object supports the
+        XAccessibleComponent interface.
+    */
+    static public ObjectView Create (
+        ObjectViewContainer aContainer,
+        XAccessibleContext xContext)
+    {
+        XAccessibleComponent xComponent = (XAccessibleComponent)UnoRuntime.queryInterface(
+                XAccessibleComponent.class, xContext);
+        if (xComponent != null)
+            return new FocusView (aContainer);
+        else
+            return null;
+    }
+
+    public FocusView (ObjectViewContainer aContainer)
+    {
+        super (aContainer);
+
+        setLayout (new GridBagLayout());
+        GridBagConstraints aConstraints = new GridBagConstraints ();
+
+        maFocused = new JLabel ();
+        maFocused.setFont (GetContainer().GetViewFont());
+        aConstraints.gridy = 0;
+        aConstraints.weightx = 1;
+        aConstraints.fill = GridBagConstraints.HORIZONTAL;
+        add (maFocused, aConstraints);
+
+        maGrabFocus = new JButton ("grabFocus");
+        maGrabFocus.setFont (GetContainer().GetViewFont());
+        aConstraints.gridy = 1;
+        aConstraints.fill = GridBagConstraints.NONE;
+        aConstraints.anchor = GridBagConstraints.WEST;
+        add (maGrabFocus, aConstraints);
+
+        maGrabFocus.addActionListener (this);
+    }
+
+    /** Additionally to the context store a reference to the
+        XAccessibleComponent interface.
+    */
+    public void SetObject (XAccessibleContext xObject)
+    {
+        mxComponent = (XAccessibleComponent)UnoRuntime.queryInterface(
+                XAccessibleComponent.class, xObject);
+        super.SetObject (xObject);
+    }
+
+    synchronized public void Destroy ()
+    {
+        super.Destroy();
+        maGrabFocus.removeActionListener (this);
+    }
+
+    synchronized public void Update ()
+    {
+        if (mxContext == null)
+        {
+            maFocused.setText ("<null object>");
+            maGrabFocus.setEnabled (false);
+        }
+        else
+        {
+            XAccessibleStateSet aStateSet = mxContext.getAccessibleStateSet();
+            if (aStateSet.contains(AccessibleStateType.FOCUSED))
+                maFocused.setText ("focused");
+            else
+                maFocused.setText ("not focused");
+            if (maGrabFocus != null)
+                maGrabFocus.setEnabled (true);
+        }
+    }
+
+    public String GetTitle ()
+    {
+        return ("Focus");
+    }
+
+    synchronized public void actionPerformed (ActionEvent aEvent)
+    {
+        if (aEvent.getActionCommand().equals("grabFocus"))
+        {
+            mxComponent.grabFocus();
+        }
+    }
+
+    public void notifyEvent (AccessibleEventObject aEvent)
+    {
+        System.out.println (aEvent);
+        if (aEvent.EventId == AccessibleEventId.STATE_CHANGED)
+            Update ();
+    }
+
+    private JLabel maFocused;
+    private JButton maGrabFocus;
+    private XAccessibleComponent mxComponent;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/LayoutManager.java b/accessibility/workben/org/openoffice/accessibility/awb/view/LayoutManager.java
new file mode 100644
index 000000000000..728b3dc426d7
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/LayoutManager.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.view;
+
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.GridBagLayout;
+import java.awt.GridBagConstraints;
+import java.awt.Point;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.event.MouseEvent;
+import javax.swing.JComponent;
+
+class LayoutManager
+    implements MouseListener,
+               MouseMotionListener
+{
+    public LayoutManager (JComponent aLayoutedComponent)
+    {
+        maLayoutedComponent = aLayoutedComponent;
+        maDraggedView = null;
+        mbInsertionPending = false;
+    }
+
+    public void mouseClicked (MouseEvent aEvent)
+    {
+        System.out.println (aEvent);
+    }
+    public void mousePressed (MouseEvent aEvent)
+    {
+        mnOldY = aEvent.getPoint().y;
+    }
+    public void mouseReleased (MouseEvent aEvent)
+    {
+        if (mbInsertionPending)
+        {
+            InsertView (maDraggedView, aEvent.getPoint().y);
+            mbInsertionPending = false;
+            maDraggedView = null;
+        }
+    }
+    public void mouseEntered (MouseEvent aEvent)
+    {
+    }
+    public void mouseExited (MouseEvent aEvent)
+    {
+        if (mbInsertionPending)
+        {
+            InsertView (maDraggedView, mnOldY);
+            mbInsertionPending = false;
+            maDraggedView = null;
+        }
+    }
+    public void mouseDragged (MouseEvent aEvent)
+    {
+        int dy = mnOldY - aEvent.getPoint().y;
+        GridBagLayout aLayout = (GridBagLayout)maLayoutedComponent.getLayout();
+        if ( ! mbInsertionPending && dy != 0)
+        {
+            maDraggedView = RemoveView (mnOldY);
+            if (maDraggedView != null)
+                mbInsertionPending = true;
+        }
+    }
+    public void mouseMoved (MouseEvent aEvent)
+    {
+    }
+
+
+
+
+    private ObjectView RemoveView (int y)
+    {
+        ObjectView aView = null;
+        GridBagLayout aLayout = (GridBagLayout)maLayoutedComponent.getLayout();
+
+        Point aGridLocation = aLayout.location (10,y);
+        Component[] aComponentList = maLayoutedComponent.getComponents();
+        System.out.println ("removing view at " + aGridLocation);
+        for (int i=0; i<aComponentList.length && aView==null; i++)
+        {
+            GridBagConstraints aConstraints = aLayout.getConstraints (
+                aComponentList[i]);
+            if (aConstraints.gridy == aGridLocation.y)
+                aView = (ObjectView)aComponentList[i];
+        }
+        maNormalCursor = maLayoutedComponent.getCursor();
+        if (aView != null)
+        {
+            System.out.println ("removing view at " + aGridLocation.y);
+            maLayoutedComponent.setCursor (new Cursor (Cursor.MOVE_CURSOR));
+            maLayoutedComponent.remove (aView);
+            maLayoutedComponent.validate();
+            maLayoutedComponent.repaint();
+        }
+
+        return aView;
+    }
+
+    private void InsertView (ObjectView aView, int y)
+    {
+        if (aView != null)
+        {
+            GridBagLayout aLayout = (GridBagLayout)maLayoutedComponent.getLayout();
+            Point aGridLocation = aLayout.location (0,y);
+            Component[] aComponentList = maLayoutedComponent.getComponents();
+            System.out.println ("new position is " + aGridLocation.y);
+            for (int i=0; i<aComponentList.length; i++)
+            {
+                GridBagConstraints aConstraints = aLayout.getConstraints (
+                    aComponentList[i]);
+                if (aConstraints.gridy >= aGridLocation.y)
+                {
+                    if (aConstraints.gridy == aGridLocation.y)
+                        maLayoutedComponent.add (maDraggedView, aConstraints);
+                    aConstraints.gridy += 1;
+                    aLayout.setConstraints (aComponentList[i], aConstraints);
+                }
+            }
+            maLayoutedComponent.validate();
+            maLayoutedComponent.repaint();
+        }
+        maLayoutedComponent.setCursor (maNormalCursor);
+    }
+
+
+
+
+    private JComponent maLayoutedComponent;
+    private ObjectView maDraggedView;
+    private int mnOldY;
+    private boolean mbInsertionPending;
+    private Cursor maNormalCursor;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/Makefile b/accessibility/workben/org/openoffice/accessibility/awb/view/Makefile
new file mode 100644
index 000000000000..2e4eb1566afd
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/Makefile
@@ -0,0 +1,13 @@
+#	$Id: Makefile,v 1.1 2003/06/13 16:30:34 af Exp $
+
+all : package
+
+ROOT=../../../../..
+PACKAGE = org.openoffice.accessibility.awb.view
+SUBDIRS = text
+include makefile.common
+
+include $(ROOT)/makefile.in
+
+
+package : $(CLASS_FILES)
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/ObjectView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/ObjectView.java
new file mode 100644
index 000000000000..3c1b8e90ff26
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/ObjectView.java
@@ -0,0 +1,90 @@
+package org.openoffice.accessibility.awb.view;
+
+import javax.swing.JPanel;
+
+import com.sun.star.accessibility.AccessibleEventObject;
+import com.sun.star.accessibility.XAccessibleContext;
+
+/** This is the base class for all object views that can be placed inside an
+    object view container.
+
+    <p>When provided with a new accessible object the container will call
+    the Create method to create a new instance when certain conditions are
+    met.  It then calls SetObject to pass the object to the instance.
+    Finally it calls Update.</p>
+
+    <p>The SetObject and Update methods may be called for a new object
+    without calling Create first.  In this way an existing instance is
+    recycled.</p>
+*/
+abstract public class ObjectView
+    extends JPanel
+{
+    /** This factory method creates a new instance of the (derived) class
+        when the given accessible object supports all necessary features.
+        In the ususal case this will be the support of a specific
+        accessibility interface.
+    */
+    static public ObjectView Create (
+        ObjectViewContainer aContainer,
+        XAccessibleContext xContext)
+    {
+        return null;
+    }
+
+    public ObjectView (ObjectViewContainer aContainer)
+    {
+        maContainer = aContainer;
+        mxContext = null;
+    }
+
+    /** Call this when you want the object to be destroyed.  Release all
+        resources when called.
+    */
+    public void Destroy ()
+    {
+    }
+
+    /** Tell the view to display information for a new accessible object.
+        @param xObject
+            The given object may be null.  A typical behaviour in this case
+            would be to display a blank area.  But is also possible to show
+            information about the last object.
+    */
+    public void SetObject (XAccessibleContext xContext)
+    {
+        mxContext = xContext;
+        Update ();
+    }
+
+
+    /** This is a request of a repaint with the current state of the current
+        object.  The current object may or may not be the same as the one
+        when Update() was called the last time.
+    */
+    public void Update ()
+    {
+    }
+
+
+    /** Return a string that is used as a title of an enclosing frame.
+    */
+    abstract public String GetTitle ();
+
+
+    public ObjectViewContainer GetContainer ()
+    {
+        return maContainer;
+    }
+
+
+    /** Implement this method if you are interested in accessible events.
+    */
+    public void notifyEvent (AccessibleEventObject aEvent)
+    {}
+
+    /// Reference to the current object to display information about.
+    protected XAccessibleContext mxContext;
+
+    protected ObjectViewContainer maContainer;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/ObjectViewContainer.java b/accessibility/workben/org/openoffice/accessibility/awb/view/ObjectViewContainer.java
new file mode 100644
index 000000000000..54855cbaf885
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/ObjectViewContainer.java
@@ -0,0 +1,310 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.view;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.GridBagLayout;
+import java.awt.GridBagConstraints;
+import java.awt.Insets;
+
+import java.util.Vector;
+
+import java.lang.reflect.Method;
+import java.lang.NoSuchMethodException;
+import java.lang.IllegalAccessException;
+import java.lang.reflect.InvocationTargetException;
+
+import javax.swing.JPanel;
+import javax.swing.JTree;
+import javax.swing.BorderFactory;
+import javax.swing.border.Border;
+import javax.swing.border.BevelBorder;
+import javax.swing.SwingUtilities;
+
+import com.sun.star.accessibility.AccessibleEventObject;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessibleEventBroadcaster;
+import com.sun.star.accessibility.XAccessibleEventListener;
+import com.sun.star.accessibility.XAccessibleSelection;
+import com.sun.star.lang.EventObject;
+import com.sun.star.uno.UnoRuntime;
+
+import org.openoffice.accessibility.awb.view.ObjectView;
+
+
+
+/** This container of specialized object views displays information about
+    one accessible object.
+    In this it plays several roles:
+    1. Object container.
+    2. Accessibility event dispatcher.
+    3. Object view class registration manager.
+    4. Swing widget.
+*/
+public class ObjectViewContainer
+    extends JPanel
+    implements XAccessibleEventListener
+{
+    public ObjectViewContainer ()
+    {
+        maFont = new Font ("Dialog", Font.PLAIN, 11);
+        maViewTemplates = new Vector ();
+        maViewBorder = BorderFactory.createBevelBorder (BevelBorder.RAISED);
+        GridBagLayout aLayout = new GridBagLayout ();
+        setLayout (aLayout);
+        //        maLayoutManager = new LayoutManager (this);
+        maLayoutManager = null;
+
+        RegisterView (ContextView.class);
+        RegisterView (ComponentView.class);
+        RegisterView (ParentView.class);
+        RegisterView (StateSetView.class);
+        RegisterView (FocusView.class);
+        RegisterView (TextView.class);
+        RegisterView (EditableTextView.class);
+        RegisterView (TableView.class);
+        RegisterView (SelectionView.class);
+        RegisterView (ServiceInterfaceView.class);
+        RegisterView (EventMonitorView.class);
+
+        mxContext = null;
+
+        //        addMouseListener (maLayoutManager);
+        //        addMouseMotionListener (maLayoutManager);
+    }
+
+
+
+    /** Remove all existing views and create new ones according to the
+        interfaces supported by the given object.
+    */
+    public synchronized void SetObject (XAccessibleContext xContext)
+    {
+        // Call Destroy at all views to give them a chance to release their
+        // resources.
+        int n = getComponentCount();
+        for (int i=0; i<n; i++)
+            ((ObjectView)getComponent(i)).Destroy();
+        // Remove existing views.
+        removeAll ();
+
+        mxContext = xContext;
+
+        // Add new views.
+        for (int i=0; i<maViewTemplates.size(); i++)
+        {
+            try
+            {
+                Class aViewClass = (Class)maViewTemplates.elementAt (i);
+                Method aCreateMethod = aViewClass.getDeclaredMethod (
+                    "Create", new Class[] {
+                        ObjectViewContainer.class,
+                        XAccessibleContext.class});
+                if (aCreateMethod != null)
+                {
+                    ObjectView aView = (ObjectView)
+                        aCreateMethod.invoke (
+                            null, new Object[] {this, xContext});
+                    Add (aView);
+                }
+            }
+            catch (NoSuchMethodException e)
+            {System.err.println ("Caught exception while creating view "
+                + i + " : " + e);}
+            catch (IllegalAccessException e)
+            {System.err.println ("Caught exception while creating view "
+                + i + " : " + e);}
+            catch (InvocationTargetException e)
+            {System.err.println ("Caught exception while creating view "
+                + i + " : " + e);}
+        }
+
+        UpdateLayoutManager ();
+
+        // Now set the object at all views.
+        n = getComponentCount();
+        for (int i=0; i<n; i++)
+            ((ObjectView)getComponent(i)).SetObject (xContext);
+
+        setPreferredSize (getLayout().preferredLayoutSize (this));
+        ((GridBagLayout) getLayout()).invalidateLayout(this);
+        validate();
+    }
+
+
+
+
+    /** Add the given class to the list of classes which will be
+        instantiated the next time an accessible object is set.
+    */
+    public void RegisterView (Class aObjectViewClass)
+    {
+        maViewTemplates.addElement (aObjectViewClass);
+    }
+
+
+
+
+    /** Replace one view class with another.
+    */
+    public void ReplaceView (Class aObjectViewClass, Class aSubstitution)
+    {
+        int nIndex = maViewTemplates.indexOf (aObjectViewClass);
+        if (nIndex >= 0)
+            maViewTemplates.setElementAt (aSubstitution, nIndex);
+    }
+
+
+    /** Return a font that should be used for widgets in the views.
+    */
+    public Font GetViewFont ()
+    {
+        return maFont;
+    }
+
+    public Color GetErrorColor ()
+    {
+        return new Color (255,80,50);
+    }
+
+    /** Add an object view and place it below all previously added views.
+        @param aView
+            This argument may be null.  In this case nothing happens.
+    */
+    private void Add (ObjectView aView)
+    {
+        if (aView != null)
+        {
+            GridBagConstraints constraints = new GridBagConstraints ();
+            constraints.gridx = 0;
+            constraints.gridy = getComponentCount();
+            constraints.gridwidth = 1;
+            constraints.gridheight = 1;
+            constraints.weightx = 1;
+            constraints.weighty = 0;
+            constraints.ipadx = 2;
+            constraints.ipady = 5;
+            constraints.insets = new Insets (5,5,5,5);
+            constraints.anchor = GridBagConstraints.NORTH;
+            constraints.fill = GridBagConstraints.HORIZONTAL;
+
+            aView.setBorder (
+                BorderFactory.createTitledBorder (
+                    maViewBorder, aView.GetTitle()));
+
+            add (aView, constraints);
+        }
+    }
+
+    /** Update the layout manager by setting the vertical weight of the
+        bottom entry to 1 and so make it strech to over the available
+        space.
+
+    */
+    private void UpdateLayoutManager ()
+    {
+        // Adapt the layout manager.
+        if (getComponentCount() > 1000)
+        {
+            Component aComponent = getComponent (getComponentCount()-1);
+            GridBagLayout aLayout = (GridBagLayout)getLayout();
+            GridBagConstraints aConstraints = aLayout.getConstraints (aComponent);
+            aConstraints.weighty = 1;
+            aLayout.setConstraints (aComponent, aConstraints);
+        }
+    }
+
+
+
+
+    /** Put the event just received into the event queue which will deliver
+        it soon asynchronuously to the DispatchEvent method.
+    */
+    public void notifyEvent (final AccessibleEventObject aEvent)
+    {
+        SwingUtilities.invokeLater(
+            new Runnable()
+            {
+                public void run()
+                {
+                    DispatchEvent (aEvent);
+                }
+            }
+        );
+    }
+
+
+
+
+    /** Forward accessibility events to all views without them being
+        registered as event listeners each on their own.
+    */
+    private void DispatchEvent (AccessibleEventObject aEvent)
+    {
+        int n = getComponentCount();
+        for (int i=0; i<n; i++)
+            ((ObjectView)getComponent(i)).notifyEvent (aEvent);
+    }
+
+
+
+    /** When the object is disposed that is displayed by the views of this
+        container then tell all views about this.
+    */
+    public void disposing (EventObject aEvent)
+    {
+        mxContext = null;
+       SwingUtilities.invokeLater(
+            new Runnable()
+            {
+                public void run()
+                {
+                    SetObject (null);
+                }
+            }
+            );
+    }
+
+
+
+
+    /// The current accessible context display by the views.
+    private XAccessibleContext mxContext;
+
+    /// Observe this tree for selection changes and notify them to all
+    /// children.
+    private JTree maTree;
+    private Border maViewBorder;
+    /// List of view templates which are instantiated when new object is set.
+    private Vector maViewTemplates;
+    private Font maFont;
+    private LayoutManager maLayoutManager;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/ObjectViewContainerWindow.java b/accessibility/workben/org/openoffice/accessibility/awb/view/ObjectViewContainerWindow.java
new file mode 100644
index 000000000000..8db9af4f46ca
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/ObjectViewContainerWindow.java
@@ -0,0 +1,35 @@
+package org.openoffice.accessibility.awb.view;
+
+import java.awt.BorderLayout;
+import javax.swing.JFrame;
+import com.sun.star.accessibility.XAccessibleContext;
+
+
+/** Top level window that creates a single object view container.  This
+    container shows information about a specific accessible object and is
+    not affected by the selection of the accessbility tree widget.
+*/
+public class ObjectViewContainerWindow
+    extends JFrame
+{
+    public ObjectViewContainerWindow (XAccessibleContext xContext)
+    {
+        setSize (new java.awt.Dimension (300,600));
+
+        maContainer = new ObjectViewContainer ();
+        maContainer.SetObject (xContext);
+        getContentPane().add (maContainer, BorderLayout.CENTER);
+
+        pack ();
+        setVisible (true);
+    }
+
+    /** Set the object that is displayed in this window.
+    */
+    public void SetObject (XAccessibleContext xContext)
+    {
+        maContainer.SetObject (xContext);
+    }
+
+    private ObjectViewContainer maContainer;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/ParentView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/ParentView.java
new file mode 100644
index 000000000000..216bc3a82bfc
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/ParentView.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.view;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.GridBagLayout;
+import java.awt.GridBagConstraints;
+import java.lang.Integer;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+
+import com.sun.star.accessibility.AccessibleEventId;
+import com.sun.star.accessibility.AccessibleEventObject;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.lang.IndexOutOfBoundsException;
+
+import org.openoffice.accessibility.misc.NameProvider;
+
+
+/** Show informations related to the parent/child relationship.
+*/
+public class ParentView
+    extends ObjectView
+{
+    static public ObjectView Create (
+        ObjectViewContainer aContainer,
+        XAccessibleContext xContext)
+    {
+        if (xContext != null)
+            return new ParentView (aContainer);
+        else
+            return null;
+    }
+
+    public ParentView (ObjectViewContainer aContainer)
+    {
+        super (aContainer);
+
+        ViewGridLayout aLayout = new ViewGridLayout (this);
+        maParentLabel = aLayout.AddLabeledEntry ("Has parent: ");
+        maIndexLabel = aLayout.AddLabeledEntry ("Index in parent: ");
+        maValidLabel = aLayout.AddLabeledEntry ("Parent/Child relationship valid: ");
+        maChildrenLabel = aLayout.AddLabeledEntry ("Child count: ");
+    }
+
+    public void Update ()
+    {
+        if (mxContext == null)
+        {
+            maParentLabel.setText ("<null object>");
+            maIndexLabel.setText ("<null object>");
+            maValidLabel.setText ("<null object>");
+            maChildrenLabel.setText ("<null object>");
+        }
+        else
+        {
+            XAccessible xParent = mxContext.getAccessibleParent();
+            int nIndex = mxContext.getAccessibleIndexInParent();
+            maIndexLabel.setText (Integer.toString(nIndex));
+            if (xParent != null)
+            {
+                maParentLabel.setText ("yes");
+                XAccessibleContext xParentContext =
+                    xParent.getAccessibleContext();
+                if (xParentContext != null)
+                {
+                    try
+                    {
+                        XAccessible xChild =
+                            xParentContext.getAccessibleChild(nIndex);
+                        if (xChild != mxContext)
+                            maValidLabel.setText ("yes");
+                        else
+                        {
+                            maValidLabel.setText ("no");
+                            maValidLabel.setBackground (GetContainer().GetErrorColor());
+                        }
+                    }
+                    catch (IndexOutOfBoundsException e)
+                    {
+                        maValidLabel.setText ("no: invalid index in parent");
+                        maValidLabel.setBackground (GetContainer().GetErrorColor());
+                    }
+                }
+                else
+                {
+                    maValidLabel.setText ("no: parent has no context");
+                    maValidLabel.setBackground (GetContainer().GetErrorColor());
+                }
+            }
+            else
+                maParentLabel.setText ("no");
+            maChildrenLabel.setText (Integer.toString(mxContext.getAccessibleChildCount()));
+        }
+    }
+
+    public String GetTitle ()
+    {
+        return ("Parent");
+    }
+
+
+    /** Listen for changes regarding displayed values.
+    */
+    public void notifyEvent (AccessibleEventObject aEvent)
+    {
+        switch (aEvent.EventId)
+        {
+            default:
+                Update ();
+        }
+    }
+
+
+    private JLabel
+        maParentLabel,
+        maIndexLabel,
+        maValidLabel,
+        maChildrenLabel;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/SelectionView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/SelectionView.java
new file mode 100644
index 000000000000..ad5a83467372
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/SelectionView.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.view;
+
+import java.util.Vector;
+
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.GridBagLayout;
+import java.awt.GridBagConstraints;
+
+import javax.swing.BoxLayout;
+import javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JOptionPane;
+import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JToggleButton;
+import javax.swing.ListSelectionModel;
+
+
+import com.sun.star.accessibility.AccessibleEventId;
+import com.sun.star.accessibility.AccessibleEventObject;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.AccessibleStateType;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleSelection;
+import com.sun.star.accessibility.XAccessibleStateSet;
+
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.lang.IndexOutOfBoundsException;
+
+
+/** Display a list of children and select/deselect buttons
+*/
+class SelectionView
+    extends ObjectView
+    implements ActionListener
+{
+    static public ObjectView Create (
+        ObjectViewContainer aContainer,
+        XAccessibleContext xContext)
+    {
+        XAccessibleSelection xSelection = (XAccessibleSelection)UnoRuntime.queryInterface(
+                XAccessibleSelection.class, xContext);
+        if (xSelection != null)
+            return new SelectionView(aContainer);
+        else
+            return null;
+    }
+
+    public SelectionView (ObjectViewContainer aContainer)
+    {
+        super (aContainer);
+        Layout();
+    }
+
+    public String GetTitle ()
+    {
+        return "Selection";
+    }
+
+    /** Create and arrange the widgets for this view.
+    */
+    private void Layout ()
+    {
+        setLayout (new GridBagLayout());
+
+        GridBagConstraints aConstraints = new GridBagConstraints();
+
+        // Label that shows whether the selection is multi selectable.
+        aConstraints.gridx = 0;
+        aConstraints.gridy = 0;
+        aConstraints.anchor = GridBagConstraints.WEST;
+        maTypeLabel = new JLabel ();
+        maTypeLabel.setFont (maContainer.GetViewFont());
+        add (maTypeLabel, aConstraints);
+
+        // the JListBox
+        maChildrenSelector = new JPanel ();
+        maChildrenSelector.setPreferredSize (new Dimension (100,100));
+        maChildrenSelector.setLayout (
+            new BoxLayout (maChildrenSelector, BoxLayout.Y_AXIS));
+
+        aConstraints.gridx = 0;
+        aConstraints.gridwidth = 4;
+        aConstraints.gridy = 1;
+        aConstraints.fill = GridBagConstraints.HORIZONTAL;
+        add (new JScrollPane (maChildrenSelector,
+                 JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+                 JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED),
+            aConstraints);
+
+        JButton aButton;
+        aButton = new JButton( "Select all" );
+        aButton.setFont (maContainer.GetViewFont());
+        aButton.setActionCommand( "Select all" );
+        aButton.addActionListener( this );
+        aConstraints.gridx = 0;
+        aConstraints.gridwidth = 1;
+        aConstraints.gridy = 2;
+        aConstraints.fill = GridBagConstraints.NONE;
+        aConstraints.anchor = GridBagConstraints.WEST;
+        add (aButton, aConstraints);
+
+        aButton = new JButton( "Clear Selection" );
+        aButton.setFont (maContainer.GetViewFont());
+        aButton.setActionCommand( "Clear Selection" );
+        aButton.addActionListener( this );
+        aConstraints.gridx = 1;
+        aConstraints.gridy = 2;
+        aConstraints.weightx = 1;
+        add (aButton, aConstraints);
+
+        setSize (getPreferredSize());
+    }
+
+
+    public void SetObject (XAccessibleContext xContext)
+    {
+        mxSelection = (XAccessibleSelection)UnoRuntime.queryInterface(
+            XAccessibleSelection.class, xContext);
+        super.SetObject (xContext);
+    }
+
+
+    public void Update ()
+    {
+        maChildrenSelector.removeAll ();
+
+        // Determine whether multi selection is possible.
+        XAccessibleStateSet aStateSet = mxContext.getAccessibleStateSet();
+        boolean bMultiSelectable = false;
+        if (aStateSet!=null && aStateSet.contains(
+            AccessibleStateType.MULTI_SELECTABLE))
+        {
+            bMultiSelectable = true;
+            maTypeLabel.setText ("multi selectable");
+        }
+        else
+        {
+            maTypeLabel.setText ("single selectable");
+        }
+
+        if (mxContext.getAccessibleRole() != AccessibleRole.TABLE)
+        {
+            int nCount = mxContext.getAccessibleChildCount();
+            for (int i=0; i<nCount; i++)
+            {
+                try
+                {
+                    XAccessible xChild = mxContext.getAccessibleChild(i);
+                    XAccessibleContext xChildContext = xChild.getAccessibleContext();
+
+                    String sName = i + " " + xChildContext.getAccessibleName();
+                    JToggleButton aChild;
+                    aChild = new JCheckBox (sName);
+                    aChild.setFont (maContainer.GetViewFont());
+
+                    XAccessibleStateSet aChildStateSet =
+                        mxContext.getAccessibleStateSet();
+                    aChild.setSelected (aChildStateSet!=null
+                        && aChildStateSet.contains(AccessibleStateType.SELECTED));
+
+                    aChild.addActionListener (this);
+                    maChildrenSelector.add (aChild);
+
+                }
+                catch (IndexOutOfBoundsException e)
+                {
+                }
+            }
+        }
+    }
+
+
+    void SelectAll()
+    {
+        mxSelection.selectAllAccessibleChildren();
+    }
+
+    void ClearSelection()
+    {
+        mxSelection.clearAccessibleSelection();
+    }
+
+
+
+    /** Call the function associated with the pressed button.
+    */
+    public void actionPerformed (ActionEvent aEvent)
+    {
+        String sCommand = aEvent.getActionCommand();
+
+        if (sCommand.equals ("Clear Selection"))
+            ClearSelection();
+        else if (sCommand.equals ("Select all"))
+            SelectAll();
+        else
+        {
+            // Extract the child index from the widget text.
+            String[] aWords = sCommand.split (" ");
+            int nIndex = Integer.parseInt(aWords[0]);
+            try
+            {
+                if (((JToggleButton)aEvent.getSource()).isSelected())
+                    mxSelection.selectAccessibleChild (nIndex);
+                else
+                    mxSelection.deselectAccessibleChild (nIndex);
+            }
+            catch (IndexOutOfBoundsException e)
+            {
+                System.err.println (
+                    "caught exception while changing selection: " + e);
+            }
+        }
+    }
+
+
+    public void notifyEvent (AccessibleEventObject aEvent)
+    {
+        switch (aEvent.EventId)
+        {
+            case AccessibleEventId.SELECTION_CHANGED:
+            case AccessibleEventId.STATE_CHANGED:
+            case AccessibleEventId.CHILD:
+                Update ();
+        }
+    }
+
+    private JPanel maChildrenSelector;
+    private XAccessibleSelection mxSelection;
+    private JLabel maTypeLabel;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/ServiceInterfaceView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/ServiceInterfaceView.java
new file mode 100644
index 000000000000..7c41ff01c97e
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/ServiceInterfaceView.java
@@ -0,0 +1,150 @@
+package org.openoffice.accessibility.awb.view;
+
+import java.awt.GridLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.GridBagLayout;
+import java.awt.GridBagConstraints;
+import java.lang.Integer;
+import javax.swing.JScrollPane;
+import javax.swing.JTree;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+
+import com.sun.star.accessibility.AccessibleEventId;
+import com.sun.star.accessibility.AccessibleEventObject;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.lang.IndexOutOfBoundsException;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lang.XTypeProvider;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.UnoRuntime;
+
+import org.openoffice.accessibility.misc.NameProvider;
+
+
+/** Show all supported services and interfaces.
+*/
+public class ServiceInterfaceView
+    extends ObjectView
+{
+    static public ObjectView Create (
+        ObjectViewContainer aContainer,
+        XAccessibleContext xContext)
+    {
+        if (xContext != null)
+            return new ServiceInterfaceView (aContainer);
+        else
+            return null;
+    }
+
+
+
+
+    public ServiceInterfaceView (ObjectViewContainer aContainer)
+    {
+        super (aContainer);
+
+        maImplementationNameRoot = new DefaultMutableTreeNode ("Implementation Name");
+        maServiceRoot = new DefaultMutableTreeNode ("Supported Services");
+        maInterfaceRoot = new DefaultMutableTreeNode ("Supported Interfaces");
+        maTree = new JTree (new DefaultMutableTreeNode[]
+            {maServiceRoot,maInterfaceRoot});
+        JScrollPane aScrollPane = new JScrollPane (
+            maTree,
+            JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+            JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+
+        setMinimumSize (new Dimension(300,200));
+        setLayout (new GridLayout (1,1));
+        add (aScrollPane);
+    }
+
+
+
+
+    public void Update ()
+    {
+        DefaultTreeModel aModel = (DefaultTreeModel)maTree.getModel();
+
+        // Clear old tree.
+        DefaultMutableTreeNode aRoot =(DefaultMutableTreeNode)aModel.getRoot();
+        aRoot.removeAllChildren();
+
+        // Create the new tree.
+        CreateImplementationNameTree ();
+        CreateServiceTree ();
+        CreateInterfaceTree ();
+        aRoot.add (maImplementationNameRoot);
+        aRoot.add (maServiceRoot);
+        aRoot.add (maInterfaceRoot);
+        aModel.setRoot (aRoot);
+
+        // Expand whole tree.
+        for (int i=0; i<maTree.getRowCount(); i++)
+            maTree.expandRow (i);
+    }
+
+    private void CreateImplementationNameTree ()
+    {
+        XServiceInfo xServiceInfo = (XServiceInfo)UnoRuntime.queryInterface(
+            XServiceInfo.class, mxContext);
+        maImplementationNameRoot.removeAllChildren();
+        if (xServiceInfo != null)
+        {
+            maImplementationNameRoot.add (
+                new DefaultMutableTreeNode (
+                    (xServiceInfo!=null
+                        ? xServiceInfo.getImplementationName()
+                        : "<XServiceInfo not supported>")));
+        }
+    }
+
+    private void CreateServiceTree ()
+    {
+        XServiceInfo xServiceInfo = (XServiceInfo)UnoRuntime.queryInterface(
+            XServiceInfo.class, mxContext);
+        maServiceRoot.removeAllChildren();
+        if (xServiceInfo != null)
+        {
+            String[] aServiceNames = xServiceInfo.getSupportedServiceNames();
+            int nCount = aServiceNames.length;
+            for (int i=0; i<nCount; i++)
+                maServiceRoot.add (
+                    new DefaultMutableTreeNode (aServiceNames[i]));
+        }
+        else
+            maServiceRoot.add (
+                new DefaultMutableTreeNode("XServiceInfo not supported"));
+    }
+
+    private void CreateInterfaceTree ()
+    {
+        XTypeProvider xTypeProvider = (XTypeProvider)UnoRuntime.queryInterface(
+            XTypeProvider.class, mxContext);
+        maInterfaceRoot.removeAllChildren();
+        if (xTypeProvider != null)
+        {
+            Type[] aTypes = xTypeProvider.getTypes();
+            int nCount = aTypes.length;
+            for (int i=0; i<nCount; i++)
+                maInterfaceRoot.add (
+                    new DefaultMutableTreeNode (aTypes[i].getTypeName()));
+        }
+        else
+            maInterfaceRoot.add (
+                new DefaultMutableTreeNode("XTypeProvider not supported"));
+    }
+
+    public String GetTitle ()
+    {
+        return ("Supported Services and Interfaces");
+    }
+
+
+    private JTree maTree;
+    private DefaultMutableTreeNode maImplementationNameRoot;
+    private DefaultMutableTreeNode maServiceRoot;
+    private DefaultMutableTreeNode maInterfaceRoot;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/StateSetView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/StateSetView.java
new file mode 100644
index 000000000000..44638b099edc
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/StateSetView.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.view;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Insets;
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
+import java.awt.geom.AffineTransform;
+
+
+
+import com.sun.star.accessibility.AccessibleEventObject;
+import com.sun.star.accessibility.AccessibleEventId;
+import com.sun.star.accessibility.AccessibleStateType;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleStateSet;
+
+import org.openoffice.accessibility.misc.NameProvider;
+
+public class StateSetView
+    extends ObjectView
+{
+    /** Create a FocusView when the given object supports the
+        XAccessibleComponent interface.
+    */
+    static public ObjectView Create (
+        ObjectViewContainer aContainer,
+        XAccessibleContext xContext)
+    {
+        ObjectView aView = null;
+        if (xContext != null)
+            aView = new StateSetView (aContainer);
+
+        return aView;
+    }
+
+    public StateSetView (ObjectViewContainer aContainer)
+    {
+        super (aContainer);
+        setPreferredSize (new Dimension(300,110));
+        setMinimumSize (new Dimension(200,80));
+    }
+
+    public String GetTitle ()
+    {
+        return ("StateSet");
+    }
+
+    public void notifyEvent (AccessibleEventObject aEvent)
+    {
+        if (aEvent.EventId == AccessibleEventId.STATE_CHANGED)
+            Update();
+    }
+
+
+    public void Update ()
+    {
+        repaint ();
+    }
+
+    public void paintChildren (Graphics g)
+    {
+        if (g != null)
+            synchronized (g)
+            {
+                super.paintChildren (g);
+
+                // Calculcate the are inside the border.
+                Insets aInsets = getInsets ();
+                Dimension aSize = getSize();
+                Rectangle aWidgetArea = new Rectangle (
+                    aInsets.left,
+                    aInsets.top,
+                    aSize.width-aInsets.left-aInsets.right,
+                    aSize.height-aInsets.top-aInsets.bottom);
+
+                PaintAllStates ((Graphics2D)g, aWidgetArea);
+            }
+    }
+
+    private void PaintAllStates (Graphics2D g, Rectangle aWidgetArea)
+    {
+        Color aTextColor = g.getColor();
+
+        g.setRenderingHint (
+            RenderingHints.KEY_ANTIALIASING,
+            RenderingHints.VALUE_ANTIALIAS_ON);
+
+        XAccessibleStateSet xStateSet = ( mxContext != null ) ? mxContext.getAccessibleStateSet() : null;
+        if (xStateSet != null)
+        {
+            short aStates[] = xStateSet.getStates ();
+            final int nMaxStateIndex = AccessibleStateType.VISIBLE;//MANAGES_DESCENDANTS;
+            int nStateWidth = (aWidgetArea.width-12) / (nMaxStateIndex+1);
+            AffineTransform aTransform = g.getTransform ();
+            g.setColor (aTextColor);
+            int y = aWidgetArea.y+aWidgetArea.height - 25;
+            double nTextRotation = -0.9;//-java.lang.Math.PI/2;
+            double nScale = 0.6;
+
+            // Create a shape for the boxes.
+            int nBoxWidth = 8;
+            Rectangle aCheckBox = new Rectangle (-nBoxWidth/2,0,nBoxWidth,nBoxWidth);
+
+            // For each state draw a box, fill it appropriately, and draw
+            // thre states name.
+            for (short i=0; i<=nMaxStateIndex; i++)
+            {
+                int x = nStateWidth + i * nStateWidth;
+                String sStateName = NameProvider.getStateName (i);
+                if (sStateName == null)
+                    sStateName = new String ("<unknown state " + i + ">");
+                boolean bStateSet = xStateSet.contains (i);
+                g.setTransform (aTransform);
+                g.translate (x,y);
+                if (bStateSet)
+                {
+                    switch (i)
+                    {
+                        case AccessibleStateType.INVALID:
+                        case AccessibleStateType.DEFUNC:
+                            g.setColor (saInvalidColor);
+                            break;
+                        case AccessibleStateType.FOCUSED:
+                            g.setColor (saFocusColor);
+                            break;
+                        case AccessibleStateType.SELECTED:
+                            g.setColor (saSelectionColor);
+                            break;
+                        case AccessibleStateType.EDITABLE:
+                            g.setColor (saEditColor);
+                            break;
+                        default:
+                            g.setColor (saDefaultColor);
+                            break;
+                    }
+                    g.fill (aCheckBox);
+                    g.setColor (aTextColor);
+                }
+                g.draw (aCheckBox);
+                g.rotate (nTextRotation);
+                g.scale (nScale, nScale);
+                g.translate (2,-2);
+                g.drawString (sStateName, 0,0);
+            }
+
+            // Draw string of set states.
+            String sStates = new String ();
+            for (int i=0; i<aStates.length; i++)
+            {
+                if (i > 0)
+                    sStates = sStates + ", ";
+                sStates = sStates + NameProvider.getStateName(aStates[i]);
+            }
+            g.setTransform (aTransform);
+            g.translate (10,aWidgetArea.y+aWidgetArea.height-3);
+            g.scale (0.9,0.9);
+            g.drawString (sStates,0,0);
+        }
+    }
+
+    static private Color
+        saInvalidColor = new Color (255,0,255),
+        saFocusColor = new Color (100,100,255),
+        saSelectionColor = Color.GREEN,
+        saDefaultColor = new Color (90,90,90),
+        saEditColor = new Color (240,240,0);
+}
+
+
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/TableView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/TableView.java
new file mode 100644
index 000000000000..07b5d2bb9b78
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/TableView.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.view;
+
+import java.lang.Integer;
+import java.lang.StringBuffer;
+
+import javax.swing.JLabel;
+
+import com.sun.star.accessibility.AccessibleEventId;
+import com.sun.star.accessibility.AccessibleEventObject;
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleTable;
+import com.sun.star.uno.UnoRuntime;
+
+
+
+/** The <type>ContextView</type> class displays information accessible over
+    the <type>XAccessibleContext</type> interface.  This includes name,
+    description, and role.
+*/
+public class TableView
+    extends ObjectView
+{
+    static public ObjectView Create (
+        ObjectViewContainer aContainer,
+        XAccessibleContext xContext)
+    {
+        if (UnoRuntime.queryInterface(
+            XAccessibleTable.class, xContext) != null)
+            return new TableView (aContainer);
+        else
+            return null;
+    }
+
+    public TableView (ObjectViewContainer aContainer)
+    {
+        super (aContainer);
+
+        ViewGridLayout aLayout = new ViewGridLayout (this);
+
+        maRowCountLabel = aLayout.AddLabeledEntry ("Row Count: ");
+        maColumnCountLabel = aLayout.AddLabeledEntry ("Column Count: ");
+        maCellCountLabel = aLayout.AddLabeledEntry ("Cell Count: ");
+        maSelectedRowsLabel = aLayout.AddLabeledEntry ("Selected Rows: ");
+        maSelectedColumnsLabel = aLayout.AddLabeledEntry ("Selected Columns: ");
+    }
+
+
+    public void SetObject (XAccessibleContext xContext)
+    {
+        mxTable = (XAccessibleTable)UnoRuntime.queryInterface(
+            XAccessibleTable.class, xContext);
+        super.SetObject (xContext);
+    }
+
+
+    public void Update ()
+    {
+        if (mxTable == null)
+        {
+            maRowCountLabel.setText ("<null object>");
+            maColumnCountLabel.setText ("<null object>");
+            maCellCountLabel.setText ("<null object>");
+            maSelectedRowsLabel.setText ("<null object>");
+            maSelectedColumnsLabel.setText ("<null object>");
+        }
+        else
+        {
+            int nRowCount = mxTable.getAccessibleRowCount();
+            int nColumnCount = mxTable.getAccessibleColumnCount();
+            maRowCountLabel.setText (Integer.toString (nRowCount));
+            maColumnCountLabel.setText (Integer.toString (nColumnCount));
+            maCellCountLabel.setText (Integer.toString (nRowCount*nColumnCount));
+
+            StringBuffer sList = new StringBuffer();
+            int[] aSelected = mxTable.getSelectedAccessibleRows();
+            boolean bFirst = true;
+            for (int i=0; i<aSelected.length; i++)
+            {
+                if ( ! bFirst)
+                {
+                    sList.append (", ");
+                    bFirst = false;
+                }
+                sList.append (Integer.toString(aSelected[i]));
+            }
+            maSelectedRowsLabel.setText (sList.toString());
+            sList = new StringBuffer();
+            aSelected = mxTable.getSelectedAccessibleColumns();
+            bFirst = true;
+            for (int i=0; i<aSelected.length; i++)
+            {
+                if ( ! bFirst)
+                {
+                    sList.append (", ");
+                    bFirst = false;
+                }
+                sList.append (Integer.toString(aSelected[i]));
+            }
+            maSelectedColumnsLabel.setText (sList.toString());
+        }
+    }
+
+
+
+
+    public String GetTitle ()
+    {
+        return ("Table");
+    }
+
+
+
+
+    /** Listen for changes regarding displayed values.
+    */
+    public void notifyEvent (AccessibleEventObject aEvent)
+    {
+        switch (aEvent.EventId)
+        {
+            case AccessibleEventId.TABLE_MODEL_CHANGED :
+            case AccessibleEventId.SELECTION_CHANGED:
+                Update ();
+        }
+    }
+
+    private XAccessibleTable mxTable;
+    private JLabel
+        maRowCountLabel,
+        maColumnCountLabel,
+        maCellCountLabel,
+        maSelectedRowsLabel,
+        maSelectedColumnsLabel;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/TextView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/TextView.java
new file mode 100644
index 000000000000..4a838aa85884
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/TextView.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.view;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSpinner;
+import javax.swing.JTree;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.MutableTreeNode;
+
+import com.sun.star.accessibility.AccessibleEventId;
+import com.sun.star.accessibility.AccessibleEventObject;
+import com.sun.star.accessibility.AccessibleTextType;
+import com.sun.star.accessibility.AccessibleStateType;
+import com.sun.star.accessibility.TextSegment;
+import com.sun.star.accessibility.XAccessibleText;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleMultiLineText;
+import com.sun.star.accessibility.XAccessibleStateSet;
+import com.sun.star.awt.Point;
+import com.sun.star.awt.Rectangle;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.lang.IndexOutOfBoundsException;
+import com.sun.star.lang.IllegalArgumentException;
+import com.sun.star.uno.UnoRuntime;
+
+import org.openoffice.accessibility.awb.view.text.CaretSpinnerModel;
+import org.openoffice.accessibility.awb.view.text.TextDialogFactory;
+
+
+public class TextView
+    extends ObjectView
+    implements ActionListener
+{
+
+    /** Create a TextView when the given object supports the
+        XAccessibleText interface.
+    */
+    static public ObjectView Create (
+        ObjectViewContainer aContainer,
+        XAccessibleContext xContext)
+    {
+        XAccessibleText xText = (XAccessibleText)UnoRuntime.queryInterface(
+                XAccessibleText.class, xContext);
+        if (xText != null)
+            return new TextView (aContainer);
+        else
+            return null;
+    }
+
+
+    public TextView (ObjectViewContainer aContainer)
+    {
+        super (aContainer);
+
+        ViewGridLayout aLayout = new ViewGridLayout (this);
+
+        maTextLabel = aLayout.AddLabeledString ("Text: ");
+        maCharacterArrayLabel = aLayout.AddLabeledEntry ("Characters: ");
+        maCharacterCountLabel = aLayout.AddLabeledEntry ("Character Count: ");
+        maSelectionLabel = aLayout.AddLabeledEntry ("Selection: ");
+        maBoundsLabel = aLayout.AddLabeledEntry ("Bounds Test: ");
+        maCaretPositionSpinner = (JSpinner)aLayout.AddLabeledComponent (
+            "Caret position:", new JSpinner());
+        Dimension aSize = maCaretPositionSpinner.getSize();
+        maCaretPositionSpinner.setPreferredSize (new Dimension (100,20));
+        maCaretLineNoLabel = aLayout.AddLabeledEntry ("Line number at caret: ");
+        maCaretLineTextLabel = aLayout.AddLabeledEntry ("Text of line at caret: ");
+        maLineNoFromCaretPosLabel = aLayout.AddLabeledEntry ("Line number at index of caret: ");
+        maLineTextFromCaretPosLabel = aLayout.AddLabeledEntry ("Text of line at index of caret: ");
+
+        JPanel aButtonPanel = new JPanel ();
+        aLayout.AddComponent (aButtonPanel);
+
+        JButton aButton = new JButton ("select...");
+        aButton.setFont (aLayout.GetFont());
+        aButton.addActionListener (this);
+        aButtonPanel.add (aButton);
+
+        aButton = new JButton ("copy...");
+        aButton.setFont (aLayout.GetFont());
+        aButton.addActionListener (this);
+        aButtonPanel.add (aButton);
+
+        // A tree that holds the text broken down into various segments.
+        maTree = new JTree ();
+        aLayout.AddComponent (new JScrollPane (
+            maTree,
+            JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+            JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED));
+    }
+
+
+    /** Additionally to the context store a reference to the
+        XAccessibleText interface.
+    */
+    public void SetObject (XAccessibleContext xObject)
+    {
+        mxText = (XAccessibleText)UnoRuntime.queryInterface(
+            XAccessibleText.class, xObject);
+        maCaretSpinnerModel = new CaretSpinnerModel(mxText);
+        maCaretPositionSpinner.setModel (maCaretSpinnerModel);
+        super.SetObject (xObject);
+    }
+
+    synchronized public void Destroy ()
+    {
+        mxText = null;
+        super.Destroy();
+    }
+
+    synchronized public void Update ()
+    {
+        maCaretPositionSpinner.setEnabled (mxText != null);
+        DefaultMutableTreeNode aRoot = new DefaultMutableTreeNode ("Text Segments");
+        if (mxText == null)
+        {
+            maTextLabel.setText ("<null object>");
+            maCharacterArrayLabel.setText ("<null object>");
+            maCharacterCountLabel.setText ("<null object>");
+            maSelectionLabel.setText ("<null object>");
+            maBoundsLabel.setText ("<null object>");
+            maCaretLineNoLabel.setText ("<null object>");
+            maCaretLineTextLabel.setText ("<null object>");
+            maLineNoFromCaretPosLabel.setText ("<null object>");
+            maLineTextFromCaretPosLabel.setText ("<null object>");
+        }
+        else
+        {
+            maTextLabel.setText (mxText.getText());
+            maCharacterArrayLabel.setText (GetCharacterArray());
+            maCharacterCountLabel.setText (
+                Integer.toString(mxText.getCharacterCount()));
+            // Selection.
+            maSelectionLabel.setText (
+                "[" + mxText.getSelectionStart()
+                + "," + mxText.getSelectionEnd()
+                + "] \"" + mxText.getSelectedText() + "\"");
+
+            // Character bounds.
+            maBoundsLabel.setText (GetTextBoundsString());
+
+            // Caret position.
+            maCaretPositionSpinner.setValue (new Integer (mxText.getCaretPosition()));
+
+            // Multi line methods.
+            XAccessibleMultiLineText xMultiText = (XAccessibleMultiLineText)
+                UnoRuntime.queryInterface( XAccessibleMultiLineText.class, mxText );
+
+            if( null != xMultiText ) {
+                try {
+                  maCaretLineNoLabel.setText ( Integer.toString( xMultiText.getNumberOfLineWithCaret() ) );
+                  TextSegment ts = xMultiText.getTextAtLineWithCaret();
+                  maCaretLineTextLabel.setText ( "[" + ts.SegmentStart
+                     + "," + ts.SegmentEnd
+                     + "] \"" + ts.SegmentText + "\"");
+                  maLineNoFromCaretPosLabel.setText ( Integer.toString( xMultiText.getLineNumberAtIndex( mxText.getCaretPosition() ) ) );
+                  ts = xMultiText.getTextAtLineNumber(xMultiText.getLineNumberAtIndex( mxText.getCaretPosition() ) );
+                  maLineTextFromCaretPosLabel.setText  ( "[" + ts.SegmentStart
+                    + "," + ts.SegmentEnd
+                    + "] \"" + ts.SegmentText + "\"");
+                } catch( IndexOutOfBoundsException e) {
+                }
+            }
+
+            // Text segments.
+            aRoot.add (CreateNode ("Character", AccessibleTextType.CHARACTER));
+            aRoot.add (CreateNode ("Word", AccessibleTextType.WORD));
+            aRoot.add (CreateNode ("Sentence", AccessibleTextType.SENTENCE));
+            aRoot.add (CreateNode ("Paragraph", AccessibleTextType.PARAGRAPH));
+            aRoot.add (CreateNode ("Line", AccessibleTextType.LINE));
+            aRoot.add (CreateNode ("Attribute", AccessibleTextType.ATTRIBUTE_RUN));
+            aRoot.add (CreateNode ("Glyph", AccessibleTextType.GLYPH));
+        }
+        ((DefaultTreeModel)maTree.getModel()).setRoot (aRoot);
+    }
+
+    public String GetTitle ()
+    {
+        return ("Text");
+    }
+
+    public void notifyEvent (AccessibleEventObject aEvent)
+    {
+        System.out.println (aEvent);
+        switch (aEvent.EventId)
+        {
+            case AccessibleEventId.CARET_CHANGED :
+                maCaretSpinnerModel.Update();
+                Update ();
+                break;
+
+            case AccessibleEventId.TEXT_CHANGED :
+            case AccessibleEventId.TEXT_SELECTION_CHANGED:
+                Update ();
+                break;
+        }
+    }
+
+    public void actionPerformed (ActionEvent aEvent)
+    {
+        String sCommand = aEvent.getActionCommand();
+        if (sCommand.equals ("select..."))
+            TextDialogFactory.CreateSelectionDialog (mxContext);
+        else if (sCommand.equals ("copy..."))
+            TextDialogFactory.CreateCopyDialog (mxContext);
+    }
+
+
+
+    /** Create a string that is a list of all characters returned by the
+        getCharacter() method.
+    */
+    private String GetCharacterArray ()
+    {
+        // Do not show more than 30 characters.
+        int nCharacterCount = mxText.getCharacterCount();
+        int nMaxDisplayCount = 30;
+
+        // build up string
+        StringBuffer aCharacterArray = new StringBuffer();
+        int nIndex = 0;
+        try
+        {
+            while (nIndex<nCharacterCount && nIndex<nMaxDisplayCount)
+            {
+                aCharacterArray.append (mxText.getCharacter (nIndex));
+                if (nIndex < nCharacterCount-1)
+                    aCharacterArray.append (",");
+                nIndex ++;
+            }
+            if (nMaxDisplayCount < nCharacterCount)
+                aCharacterArray.append (", ...");
+        }
+        catch (IndexOutOfBoundsException e)
+        {
+            aCharacterArray.append ("; Index Out Of Bounds at index " + nIndex);
+        }
+
+        return aCharacterArray.toString();
+    }
+
+
+
+    /** Iterate over all characters and translate their positions
+        back and forth.
+        */
+    private String GetTextBoundsString ()
+    {
+        StringBuffer aBuffer = new StringBuffer ();
+        try
+        {
+            // Iterate over all characters in the text.
+            int nCount = mxText.getCharacterCount();
+            for (int i=0; i<nCount; i++)
+            {
+                // Get bounds for this character.
+                Rectangle aBBox = mxText.getCharacterBounds (i);
+
+                // get the character by 'clicking' into the middle of
+                // the bounds
+                Point aMiddle = new Point();
+                aMiddle.X = aBBox.X + (aBBox.Width / 2) - 1;
+                aMiddle.Y = aBBox.Y + (aBBox.Height / 2) - 1;
+                int nIndex = mxText.getIndexAtPoint (aMiddle);
+
+                // get the character, or a '#' for an illegal index
+                if ((nIndex >= 0) && (nIndex < mxText.getCharacter(i)))
+                    aBuffer.append (mxText.getCharacter(nIndex));
+                else
+                    aBuffer.append ('#');
+            }
+        }
+        catch (IndexOutOfBoundsException aEvent)
+        {
+            // Ignore errors.
+        }
+
+        return aBuffer.toString();
+    }
+
+
+
+
+    private final static int BEFORE = -1;
+    private final static int AT = 0;
+    private final static int BEHIND = +1;
+
+    private MutableTreeNode CreateNode (String sTitle, short nTextType)
+    {
+        DefaultMutableTreeNode aNode = new DefaultMutableTreeNode (sTitle);
+
+        aNode.add (CreateSegmentNode ("Before", nTextType, BEFORE));
+        aNode.add (CreateSegmentNode ("At", nTextType, AT));
+        aNode.add (CreateSegmentNode ("Behind", nTextType, BEHIND));
+
+        return aNode;
+    }
+
+    private MutableTreeNode CreateSegmentNode (String sTitle, short nTextType, int nWhere)
+    {
+        TextSegment aSegment;
+        int nTextLength = mxText.getCharacterCount();
+        DefaultMutableTreeNode aNode = new DefaultMutableTreeNode (sTitle);
+        for (int nIndex=0; nIndex<=nTextLength; /* empty */)
+        {
+            aSegment = GetTextSegment (nIndex, nTextType, nWhere);
+            DefaultMutableTreeNode aSegmentNode = new DefaultMutableTreeNode (
+                new StringBuffer (
+                    Integer.toString (nIndex) + " -> "
+                    + Integer.toString (aSegment.SegmentStart) + " - "
+                    + Integer.toString (aSegment.SegmentEnd) + " : "
+                    + aSegment.SegmentText.toString()));
+            aNode.add (aSegmentNode);
+            if (nTextType ==  AccessibleTextType.ATTRIBUTE_RUN)
+                AddAttributeNodes (aSegmentNode, aSegment);
+            if (aSegment.SegmentEnd > nIndex)
+                nIndex = aSegment.SegmentEnd;
+            else
+                nIndex ++;
+        }
+
+        return aNode;
+    }
+
+
+    private TextSegment GetTextSegment (int nIndex, short nTextType, int nWhere)
+    {
+        TextSegment aSegment;
+
+        try
+        {
+            switch (nWhere)
+            {
+                case BEFORE:
+                    aSegment = mxText.getTextBeforeIndex (nIndex, nTextType);
+                    break;
+
+                case AT:
+                    aSegment = mxText.getTextAtIndex (nIndex, nTextType);
+                    break;
+
+                case BEHIND:
+                    aSegment = mxText.getTextBehindIndex (nIndex, nTextType);
+                    break;
+
+                default:
+                    aSegment = new TextSegment();
+                    aSegment.SegmentText = new String ("unknown position "   + nWhere);
+                    aSegment.SegmentStart = nIndex;
+                    aSegment.SegmentStart = nIndex+1;
+                    break;
+            }
+        }
+        catch (IndexOutOfBoundsException aException)
+        {
+            aSegment = new TextSegment ();
+            aSegment.SegmentText = new String ("Invalid index at ") + nIndex + " : "
+                + aException.toString();
+            aSegment.SegmentStart = nIndex;
+            aSegment.SegmentEnd = nIndex+1;
+        }
+        catch (IllegalArgumentException aException)
+        {
+            aSegment = new TextSegment ();
+            aSegment.SegmentText = new String ("Illegal argument at ") + nIndex + " : "
+                + aException.toString();
+            aSegment.SegmentStart = nIndex;
+            aSegment.SegmentEnd = nIndex+1;
+        }
+
+        return aSegment;
+    }
+
+
+    /** Add to the given node one node for every attribute of the given segment.
+    */
+    private void AddAttributeNodes (
+        DefaultMutableTreeNode aNode,
+        TextSegment aSegment)
+    {
+        try
+        {
+            PropertyValue[] aValues = mxText.getCharacterAttributes (
+                aSegment.SegmentStart, aAttributeList);
+            for (int i=0; i<aValues.length; i++)
+                aNode.add (new DefaultMutableTreeNode (
+                    aValues[i].Name + ": " + aValues[i].Value));
+        }
+        catch (IndexOutOfBoundsException aException)
+        {
+            aNode.add (new DefaultMutableTreeNode (
+                "caught IndexOutOfBoundsException while retrieveing attributes"));
+        }
+    }
+
+    private XAccessibleText mxText;
+    private JLabel
+        maTextLabel,
+        maCharacterArrayLabel,
+        maCharacterCountLabel,
+        maSelectionLabel,
+        maBoundsLabel,
+        maCaretLineNoLabel,
+        maCaretLineTextLabel,
+        maLineNoFromCaretPosLabel,
+        maLineTextFromCaretPosLabel;
+
+    private JSpinner maCaretPositionSpinner;
+    private JTree maTree;
+    private CaretSpinnerModel maCaretSpinnerModel;
+
+    private static String[] aAttributeList = new String[] {
+        "CharBackColor",
+        "CharColor",
+        "CharEscapement",
+        "CharHeight",
+        "CharPosture",
+        "CharStrikeout",
+        "CharUnderline",
+        "CharWeight",
+        "ParaAdjust",
+        "ParaBottomMargin",
+        "ParaFirstLineIndent",
+        "ParaLeftMargin",
+        "ParaLineSpacing",
+        "ParaRightMargin",
+        "ParaTabStops"};
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/ViewGridLayout.java b/accessibility/workben/org/openoffice/accessibility/awb/view/ViewGridLayout.java
new file mode 100644
index 000000000000..bc598dcaf2fa
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/ViewGridLayout.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.view;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.GridBagLayout;
+import java.awt.GridBagConstraints;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+
+
+/** This class is a convenience class for views to use the GridBagLayout.
+*/
+class ViewGridLayout
+{
+    public ViewGridLayout (JComponent aComponent)
+    {
+        maComponent = aComponent;
+        maComponent.setLayout (new GridBagLayout());
+        maComponent.setMinimumSize (new Dimension (300,30));
+        maComponent.setMaximumSize (new Dimension (300,1000));
+        mnCurrentLine = 0;
+    }
+
+    public JLabel AddLabeledEntry (String sTitle)
+    {
+        return (JLabel)AddLabeledComponent (sTitle, new JLabel (""));
+    }
+
+    public JLabel AddLabeledString (String sTitle)
+    {
+        JLabel aLabel = AddLabeledEntry (sTitle);
+        aLabel.setBackground (new Color(220,220,220));
+        aLabel.setOpaque (true);
+        return aLabel;
+    }
+
+    public JComponent AddLabeledComponent (String sTitle, JComponent aComponent)
+    {
+        GridBagConstraints constraints = new GridBagConstraints ();
+        constraints.gridx = 0;
+        constraints.anchor = GridBagConstraints.WEST;
+        constraints.fill = GridBagConstraints.NONE;
+        constraints.gridy = mnCurrentLine;
+
+        JLabel aLabel = new JLabel(sTitle);
+        aLabel.setFont (saFont);
+        maComponent.add (aLabel, constraints);
+        constraints.gridx = 1;
+        constraints.weightx = 1;
+        constraints.fill = GridBagConstraints.NONE;
+        aComponent.setFont (saFont);
+        maComponent.add (aComponent, constraints);
+
+        mnCurrentLine += 1;
+
+        return aComponent;
+    }
+
+    public JComponent AddComponent (JComponent aComponent)
+    {
+        GridBagConstraints constraints = new GridBagConstraints ();
+        constraints.gridx = 0;
+        constraints.gridwidth = 2;
+        constraints.weightx = 1;
+        constraints.anchor = GridBagConstraints.WEST;
+        constraints.fill = GridBagConstraints.HORIZONTAL;
+        constraints.gridy = mnCurrentLine;
+
+        maComponent.add (aComponent, constraints);
+
+        mnCurrentLine += 1;
+
+        return aComponent;
+    }
+
+    static public Font GetFont ()
+    {
+        return saFont;
+    }
+
+    static private Font saFont;
+    private int mnCurrentLine;
+    private JComponent maComponent;
+
+    static
+    {
+        saFont = new Font ("Dialog", Font.PLAIN, 11);
+    }
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common
new file mode 100644
index 000000000000..38033b3ab658
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.common
@@ -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.
+#
+#*************************************************************************
+
+JARFILES = jurt.jar unoil.jar ridl.jar 
+JAVAFILES = 						\
+	ComponentView.java				\
+	ContextView.java				\
+	EditableTextView.java			\
+	EventMonitorView.java			\
+	FocusView.java					\
+	LayoutManager.java				\
+	ObjectView.java					\
+	ObjectViewContainer.java		\
+	ObjectViewContainerWindow.java	\
+	ParentView.java					\
+	SelectionView.java				\
+	ServiceInterfaceView.java		\
+	StateSetView.java				\
+	TableView.java					\
+	TextView.java					\
+	ViewGridLayout.java
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.mk b/accessibility/workben/org/openoffice/accessibility/awb/view/makefile.mk
new file mode 100644
index 000000000000..0bfa48537ea2
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/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.
+#
+#*************************************************************************
+
+PRJNAME	= awb
+PRJ		= ..$/..$/..$/..$/..$/..
+TARGET	= awb_view
+PACKAGE	= org$/openoffice$/accessibility$/awb$/view
+
+USE_JAVAVER:=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+.IF "$(JAVAVER:s/.//)" >= "140" 
+
+.INCLUDE : makefile.common
+
+JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+
+.INCLUDE :  target.mk
+
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/text/CaretSpinnerModel.java b/accessibility/workben/org/openoffice/accessibility/awb/view/text/CaretSpinnerModel.java
new file mode 100644
index 000000000000..c210b0eff086
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/text/CaretSpinnerModel.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.view.text;
+
+import java.lang.Integer;
+import java.util.Vector;
+import javax.swing.SpinnerModel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+import com.sun.star.accessibility.XAccessibleText;
+import com.sun.star.lang.IndexOutOfBoundsException;
+
+
+/** A simple model for JSpinner objects that clips the spinner values to valid
+    text indices.
+*/
+public class CaretSpinnerModel
+    implements SpinnerModel
+{
+    public CaretSpinnerModel (XAccessibleText xText)
+    {
+        mxText = xText;
+        maListeners = new Vector ();
+    }
+
+    public void addChangeListener (ChangeListener aListener)
+    {
+        if (aListener != null)
+            maListeners.add (aListener);
+    }
+
+    public void removeChangeListener (ChangeListener aListener)
+    {
+        maListeners.removeElement (aListener);
+    }
+
+    public Object getNextValue ()
+    {
+        if (mxText != null)
+        {
+            int nPosition = mxText.getCaretPosition();
+            if (nPosition+1 <= mxText.getCharacterCount())
+                return new Integer (nPosition+1);
+        }
+        return null;
+    }
+
+    public Object getPreviousValue ()
+    {
+        if (mxText != null)
+        {
+            int nPosition = mxText.getCaretPosition();
+            if (nPosition > 0)
+                return new Integer (nPosition-1);
+        }
+        return null;
+    }
+
+    public Object getValue ()
+    {
+        if (mxText != null)
+            return new Integer (mxText.getCaretPosition());
+        else
+            return null;
+    }
+
+    public void setValue (Object aValue)
+    {
+        if (mxText != null)
+            if (aValue instanceof Integer)
+            {
+                try
+                {
+                    if( ((Integer)aValue).intValue() != mxText.getCaretPosition() )
+                      mxText.setCaretPosition (((Integer)aValue).intValue());
+                }
+                catch (IndexOutOfBoundsException aException)
+                {
+                }
+            }
+    }
+
+    /** Call this method when the caret position has changes so that the model
+        can inform its listeners about it.
+    */
+    public void Update ()
+    {
+        ChangeEvent aEvent = new ChangeEvent (this);
+        for (int i=0; i<maListeners.size(); i++)
+            ((ChangeListener)maListeners.elementAt(i)).stateChanged (aEvent);
+    }
+
+    private XAccessibleText mxText;
+    private Integer maValue;
+    private Vector maListeners;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/text/Makefile b/accessibility/workben/org/openoffice/accessibility/awb/view/text/Makefile
new file mode 100644
index 000000000000..c58899a09f6e
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/text/Makefile
@@ -0,0 +1,13 @@
+#	$Id: Makefile,v 1.1 2003/06/13 16:30:41 af Exp $
+
+all : package
+
+ROOT=../../../../..
+PACKAGE = org.openoffice.accessibility.awb.view.text
+SUBDIRS =
+include makefile.common
+
+include $(ROOT)/makefile.in
+
+
+package : $(CLASS_FILES)
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextActionDialog.java b/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextActionDialog.java
new file mode 100644
index 000000000000..f37969d5ee59
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextActionDialog.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.view.text;
+
+import java.awt.BorderLayout;
+import java.awt.Container;
+import java.awt.FlowLayout;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.text.JTextComponent;
+
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleText;
+import com.sun.star.accessibility.XAccessibleEditableText;
+import com.sun.star.lang.IndexOutOfBoundsException;
+import com.sun.star.uno.UnoRuntime;
+
+
+/**
+ * Display a dialog with a text field and a pair of cancel/do-it buttons
+ */
+class TextActionDialog
+    extends JDialog
+    implements ActionListener
+{
+    public TextActionDialog (
+        XAccessibleContext xContext,
+        String sExplanation,
+        String sTitle)
+    {
+        super();// AccessibilityWorkBench.Instance() );
+
+        mxContext = xContext;
+        msTitle = sTitle;
+        msExplanation = sExplanation;
+        Layout  ();
+        setSize (350, 225);
+
+    }
+
+
+    /** build dialog */
+    protected void Layout()
+    {
+        setTitle (msTitle);
+
+        // vertical stacking of the elements
+        Container aContent = getContentPane();
+        //        aContent.setLayout( new BorderLayout() );
+
+        // Label with explanation.
+        if (msExplanation.length() > 0)
+            aContent.add (new JLabel (msExplanation), BorderLayout.NORTH);
+
+        // the text field
+        maText = new JTextArea();
+        maText.setLineWrap (true);
+        maText.setEditable (false);
+        aContent.add (maText, BorderLayout.CENTER);
+
+        XAccessibleText xText = (XAccessibleText)UnoRuntime.queryInterface(
+            XAccessibleText.class, mxContext);
+        String sText = xText.getText();
+        maText.setText (sText);
+        maText.setRows (sText.length() / 40 + 1);
+        maText.setColumns (Math.min (Math.max (40, sText.length()), 20));
+
+        JPanel aButtons = new JPanel();
+        aButtons.setLayout (new FlowLayout());
+        maIndexToggle = new JCheckBox ("reverse selection");
+        aButtons.add (maIndexToggle);
+
+        JButton aActionButton = new JButton (msTitle);
+        aActionButton.setActionCommand ("Action");
+        aActionButton.addActionListener (this);
+        aButtons.add (aActionButton);
+
+        JButton aCancelButton = new JButton ("cancel");
+        aCancelButton.setActionCommand ("Cancel");
+        aCancelButton.addActionListener (this);
+        aButtons.add (aCancelButton);
+
+        // add Panel with buttons
+        aContent.add (aButtons, BorderLayout.SOUTH);
+    }
+
+    protected void Cancel()
+    {
+        hide();
+        dispose();
+    }
+
+    public void actionPerformed(ActionEvent e)
+    {
+        String sCommand = e.getActionCommand();
+
+        if( "Cancel".equals( sCommand ) )
+            Cancel();
+        else if( "Action".equals( sCommand ) )
+            Action();
+    }
+
+
+    protected int GetSelectionStart()
+    {
+        return GetSelection(true);
+    }
+    protected int GetSelectionEnd()
+    {
+        return GetSelection(false);
+    }
+    private int GetSelection (boolean bStart)
+    {
+        if (bStart ^ maIndexToggle.isSelected())
+            return maText.getSelectionStart();
+        else
+            return maText.getSelectionEnd();
+    }
+
+
+
+    protected void Action ()
+    {
+        String sError = null;
+        boolean bSuccess = true;
+        try
+        {
+            XAccessibleText xText =
+                (XAccessibleText)UnoRuntime.queryInterface(
+                    XAccessibleText.class, mxContext);
+            if (xText != null)
+                bSuccess = bSuccess && TextAction (xText);
+
+            XAccessibleEditableText xEditableText =
+                (XAccessibleEditableText)UnoRuntime.queryInterface(
+                    XAccessibleEditableText.class, mxContext);
+            if (xEditableText != null)
+                bSuccess = bSuccess && EditableTextAction (xEditableText);
+
+            if ( ! bSuccess)
+                sError = "Can't execute";
+        }
+        catch (IndexOutOfBoundsException e)
+        {
+            sError = "Index out of bounds";
+        }
+
+        if (sError != null)
+            JOptionPane.showMessageDialog (
+                this,// AccessibilityWorkBench.Instance(),
+                sError,
+                msTitle,
+                JOptionPane.ERROR_MESSAGE);
+
+        Cancel();
+    }
+
+    /** override this for dialog-specific action */
+    boolean TextAction (XAccessibleText xText)
+        throws IndexOutOfBoundsException
+    {
+        return true;
+    }
+
+    boolean EditableTextAction (XAccessibleEditableText xText)
+        throws IndexOutOfBoundsException
+    {
+        return true;
+    }
+
+    private XAccessibleContext mxContext;
+    protected JTextArea maText;
+    private String msTitle;
+    private String msExplanation;
+    private JCheckBox maIndexToggle;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextAttributeDialog.java b/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextAttributeDialog.java
new file mode 100644
index 000000000000..dad548ca730e
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextAttributeDialog.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.view.text;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import javax.swing.BoxLayout;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JColorChooser;
+import javax.swing.JPanel;
+import javax.swing.text.JTextComponent;
+
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleEditableText;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.lang.IndexOutOfBoundsException;
+import com.sun.star.uno.UnoRuntime;
+
+
+class TextAttributeDialog
+    extends TextActionDialog
+{
+    public TextAttributeDialog (XAccessibleContext xContext)
+    {
+        super (xContext,
+            "Choose attributes, select text, and press 'Set':",
+            "set");
+    }
+
+    protected void Layout ()
+    {
+        super.Layout ();
+
+        maForeground = Color.black;
+        maBackground = Color.white;
+
+        JPanel aPanel = new JPanel();
+        aPanel.setLayout (new BoxLayout (aPanel, BoxLayout.Y_AXIS));
+
+        maBoldCheckBox = new JCheckBox ("bold");
+        maUnderlineCheckBox = new JCheckBox ("underline");
+        maItalicsCheckBox = new JCheckBox ("italics");
+
+        JButton aForegroundButton = new JButton ("Foreground",
+            new TextAttributeDialog.ColorIcon(true));
+        aForegroundButton.addActionListener (new ActionListener()
+            {
+                public void actionPerformed (ActionEvent aEvent)
+                {
+                    maForeground = JColorChooser.showDialog (
+                        TextAttributeDialog.this,
+                        "Select Foreground Color",
+                        maForeground);
+                }
+            } );
+
+        JButton aBackgroundButton = new JButton("Background",
+            new TextAttributeDialog.ColorIcon(false));
+        aBackgroundButton.addActionListener (new ActionListener()
+            {
+                public void actionPerformed (ActionEvent eEvent)
+                {
+                    maBackground = JColorChooser.showDialog(
+                        TextAttributeDialog.this,
+                        "Select Background Color",
+                        maBackground);
+                }
+            } );
+
+        aPanel.add (maBoldCheckBox);
+        aPanel.add (maUnderlineCheckBox);
+        aPanel.add (maItalicsCheckBox);
+        aPanel.add (aForegroundButton);
+        aPanel.add (aBackgroundButton);
+
+        getContentPane().add (aPanel, BorderLayout.WEST);
+    }
+
+
+    /** edit the text */
+    boolean EditableTextAction (XAccessibleEditableText xText)
+        throws IndexOutOfBoundsException
+    {
+        PropertyValue[] aSequence = new PropertyValue[6];
+        aSequence[0] = new PropertyValue();
+        aSequence[0].Name = "CharWeight";
+        aSequence[0].Value = new Integer (maBoldCheckBox.isSelected() ? 150 : 100);
+        aSequence[1] = new PropertyValue();
+        aSequence[1].Name = "CharUnderline";
+        aSequence[1].Value = new Integer (maUnderlineCheckBox.isSelected() ? 1 : 0);
+        aSequence[2] = new PropertyValue();
+        aSequence[2].Name = "CharBackColor";
+        aSequence[2].Value = new Integer (maBackground.getRGB());
+        aSequence[3] = new PropertyValue();
+        aSequence[3].Name = "CharColor";
+        aSequence[3].Value = new Integer (maForeground.getRGB());
+        aSequence[4] = new PropertyValue();
+        aSequence[4].Name = "CharPosture";
+        aSequence[4].Value = new Integer (maItalicsCheckBox.isSelected() ? 1 : 0);
+        aSequence[5] = new PropertyValue();
+        aSequence[5].Name = "CharBackTransparent";
+        aSequence[5].Value = new Boolean (false);
+
+        return xText.setAttributes (
+            GetSelectionStart(),
+            GetSelectionEnd(),
+            aSequence);
+    }
+
+    class ColorIcon
+        implements Icon
+    {
+        public ColorIcon(boolean bWhich) { bForeground = bWhich; }
+        public int getIconHeight()  { return nHeight; }
+        public int getIconWidth() { return nWidth; }
+        public void paintIcon (Component c, Graphics g, int x, int y)
+        {
+            g.setColor( getColor() );
+            g.fillRect( x, y, nHeight, nWidth );
+            g.setColor( c.getForeground() );
+            g.drawRect( x, y, nHeight, nWidth );
+        }
+        Color getColor()
+        {
+            if (bForeground)
+                return maForeground;
+            else
+                return maBackground;
+        }
+
+        private static final int nHeight = 16;
+        private static final int nWidth = 16;
+        private boolean bForeground;
+    }
+
+
+
+
+    private JCheckBox
+        maBoldCheckBox,
+        maUnderlineCheckBox,
+        maItalicsCheckBox;
+    private Color
+        maForeground,
+        maBackground;
+
+}
+
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextDialogFactory.java b/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextDialogFactory.java
new file mode 100644
index 000000000000..cdb3f26b5e55
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextDialogFactory.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.view.text;
+
+import javax.swing.JDialog;
+import javax.swing.text.JTextComponent;
+
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleEditableText;
+import com.sun.star.accessibility.XAccessibleText;
+import com.sun.star.lang.IndexOutOfBoundsException;
+import com.sun.star.uno.UnoRuntime;
+
+
+/** Factory for dialogs of the text views.
+*/
+public class TextDialogFactory
+{
+    static public JDialog CreateSelectionDialog (XAccessibleContext xContext)
+    {
+        JDialog aDialog = new TextActionDialog(
+            xContext,
+            "Select range:",
+            "select")
+            {
+                boolean TextAction (XAccessibleText xText)
+                    throws IndexOutOfBoundsException
+                {
+                    return xText.setSelection(
+                        GetSelectionStart(),
+                        GetSelectionEnd() );
+                }
+            };
+        if (aDialog != null)
+            aDialog.show();
+        return aDialog;
+    }
+
+    static public JDialog CreateCopyDialog (XAccessibleContext xContext)
+    {
+        JDialog aDialog = new TextActionDialog(
+            xContext,
+            "Select range and copy:",
+            "copy")
+            {
+                boolean TextAction (XAccessibleText xText)
+                    throws IndexOutOfBoundsException
+                {
+                    return xText.copyText(
+                        GetSelectionStart(),
+                        GetSelectionEnd());
+                }
+            };
+        if (aDialog != null)
+            aDialog.show();
+        return aDialog;
+    }
+    static public JDialog CreateCutDialog (XAccessibleContext xContext)
+    {
+        JDialog aDialog = new TextActionDialog(
+            xContext,
+            "Select range and cut:",
+            "cut")
+            {
+                boolean EditableTextAction (XAccessibleEditableText xText)
+                    throws IndexOutOfBoundsException
+                {
+                    return xText.cutText(
+                        GetSelectionStart(),
+                        GetSelectionEnd() );
+                }
+            };
+        if (aDialog != null)
+            aDialog.show();
+        return aDialog;
+    }
+    static public JDialog CreatePasteDialog (XAccessibleContext xContext)
+    {
+        JDialog aDialog = new TextActionDialog (
+            xContext,
+            "Place Caret and paste:",
+            "paste")
+            {
+                boolean EditableTextAction (XAccessibleEditableText xText)
+                    throws IndexOutOfBoundsException
+                {
+                    return xText.pasteText(maText.getCaretPosition());
+                }
+            };
+        if (aDialog != null)
+            aDialog.show();
+        return aDialog;
+    }
+    static public JDialog CreateEditDialog (XAccessibleContext xContext)
+    {
+        JDialog aDialog = new TextEditDialog (
+            xContext,
+            "Edit text:",
+            "edit");
+        if (aDialog != null)
+            aDialog.show();
+        return aDialog;
+    }
+    static public JDialog CreateFormatDialog (XAccessibleContext xContext)
+    {
+        JDialog aDialog = new TextAttributeDialog (xContext);
+        if (aDialog != null)
+            aDialog.show();
+        return aDialog;
+    }
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextEditDialog.java b/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextEditDialog.java
new file mode 100644
index 000000000000..a8710cbad7cc
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/text/TextEditDialog.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.awb.view.text;
+
+import javax.swing.text.JTextComponent;
+
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleEditableText;
+import com.sun.star.lang.IndexOutOfBoundsException;
+import com.sun.star.uno.UnoRuntime;
+
+
+class TextEditDialog
+    extends TextActionDialog
+{
+    public TextEditDialog (
+        XAccessibleContext xContext,
+        String sExplanation,
+        String sTitle )
+    {
+        super (xContext, sExplanation, sTitle);
+    }
+
+    protected void Layout()
+    {
+        super.Layout();
+        maText.setEditable (true);
+    }
+
+
+    /** edit the text */
+    boolean EditableTextAction (XAccessibleEditableText xText)
+    {
+        return UpdateText (xText, maText.getText());
+    }
+
+
+    /** update the text */
+    boolean UpdateText (XAccessibleEditableText xText, String sNew)
+    {
+        boolean bResult = false;
+
+        String sOld = xText.getText();
+
+        // false alarm? Early out if no change was done!
+        if ( ! sOld.equals (sNew))
+        {
+
+            // Get the minimum length of both strings.
+            int nMinLength = sOld.length();
+            if (sNew.length() < nMinLength)
+                nMinLength = sNew.length();
+
+            // Count equal characters from front and end.
+            int nFront = 0;
+            while ((nFront < nMinLength) &&
+                (sNew.charAt(nFront) == sOld.charAt(nFront)))
+                nFront++;
+            int nBack = 0;
+            while ((nBack < nMinLength) &&
+                (sNew.charAt(sNew.length()-nBack-1) ==
+                 sOld.charAt(sOld.length()-nBack-1)    ))
+                nBack++;
+            if (nFront + nBack > nMinLength)
+                nBack = nMinLength - nFront;
+
+            // so... the first nFront and the last nBack characters are the
+            // same. Change the others!
+            String sDel = sOld.substring (nFront, sOld.length() - nBack);
+            String sIns = sNew.substring (nFront, sNew.length() - nBack);
+
+            System.out.println ("edit text: " +
+                sOld.substring(0, nFront) +
+                " [ " + sDel + " -> " + sIns + " ] " +
+                sOld.substring(sOld.length() - nBack));
+
+            try
+            {
+                // edit the text, and use
+                // (set|insert|delete|replace)Text as needed
+                if( nFront+nBack == 0 )
+                    bResult = xText.setText( sIns );
+                else if( sDel.length() == 0 )
+                    bResult = xText.insertText( sIns, nFront );
+                else if( sIns.length() == 0 )
+                    bResult = xText.deleteText( nFront, sOld.length()-nBack );
+                else
+                    bResult = xText.replaceText(nFront, sOld.length()-nBack,sIns);
+            }
+            catch( IndexOutOfBoundsException aException)
+            {
+            }
+        }
+
+        return bResult;
+    }
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common b/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common
new file mode 100644
index 000000000000..7d9a5e8febfa
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.common
@@ -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.
+#
+#*************************************************************************
+
+JARFILES = jurt.jar unoil.jar ridl.jar 
+JAVAFILES = 					\
+	CaretSpinnerModel.java		\
+	TextActionDialog.java		\
+	TextEditDialog.java			\
+	TextAttributeDialog.java	\
+	TextDialogFactory.java
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.mk b/accessibility/workben/org/openoffice/accessibility/awb/view/text/makefile.mk
new file mode 100644
index 000000000000..1ec7da26619b
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/text/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.
+#
+#*************************************************************************
+
+PRJNAME	= awb
+PRJ		= ..$/..$/..$/..$/..$/..$/..
+TARGET	= awb_view_text
+PACKAGE	= org$/openoffice$/accessibility$/awb$/view$/text
+
+USE_JAVAVER:=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+.IF "$(JAVAVER:s/.//)" >= "140" 
+
+.INCLUDE : makefile.common
+
+JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+
+.INCLUDE :  target.mk
+
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/AccessibleEventMulticaster.java b/accessibility/workben/org/openoffice/accessibility/misc/AccessibleEventMulticaster.java
new file mode 100644
index 000000000000..0f56117e1fdf
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/misc/AccessibleEventMulticaster.java
@@ -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.
+ *
+ ************************************************************************/
+
+package org.openoffice.accessibility.misc;
+
+import com.sun.star.lang.EventObject;
+
+import com.sun.star.accessibility.AccessibleEventObject;
+import com.sun.star.accessibility.XAccessibleEventBroadcaster;
+import com.sun.star.accessibility.XAccessibleEventListener;
+
+/**
+ *
+ */
+public class AccessibleEventMulticaster implements XAccessibleEventListener {
+
+    private final XAccessibleEventListener a;
+    private final XAccessibleEventListener b;
+
+    /** Creates a new instance of AccessibleEventMulticaster */
+    protected AccessibleEventMulticaster(XAccessibleEventListener a,
+                                         XAccessibleEventListener b) {
+        this.a = a;
+        this.b = b;
+    }
+
+    protected XAccessibleEventListener remove(XAccessibleEventListener l) {
+        if (l == a)
+            return b;
+        if (l == b)
+            return a;
+        XAccessibleEventListener a2 = remove(a, l);
+        XAccessibleEventListener b2 = remove(b, l);
+        if (a2 == a && b2 == b) {
+            return this; // not found
+        }
+        return add(a2, b2);
+    }
+
+    public void notifyEvent(AccessibleEventObject accessibleEventObject) {
+        a.notifyEvent(accessibleEventObject);
+        b.notifyEvent(accessibleEventObject);
+    }
+
+    public void disposing(EventObject eventObject) {
+        a.disposing(eventObject);
+        b.disposing(eventObject);
+    }
+
+    public static XAccessibleEventListener add(XAccessibleEventListener a, XAccessibleEventListener b) {
+        if (a == null)
+            return b;
+        if (b == null)
+            return a;
+        return new AccessibleEventMulticaster(a,b);
+    }
+
+    public static XAccessibleEventListener remove(XAccessibleEventListener l, XAccessibleEventListener oldl) {
+        if (l == oldl || l == null) {
+            return null;
+        } else if (l instanceof AccessibleEventMulticaster) {
+            return ((AccessibleEventMulticaster) l).remove(oldl);
+        } else {
+            return l;
+        }
+    }
+
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/Connector.java b/accessibility/workben/org/openoffice/accessibility/misc/Connector.java
new file mode 100644
index 000000000000..de188676e224
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/misc/Connector.java
@@ -0,0 +1,50 @@
+package org.openoffice.accessibility.misc;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.Vector;
+
+
+/** Wait for an Office application and connect to it.
+*/
+public class Connector
+    extends TimerTask
+{
+    final public static long snDelay = 3000;
+
+    public Connector ()
+    {
+        maTimer = new Timer (true);
+        maListeners = new Vector();
+        run ();
+    }
+
+    public void AddConnectionListener (ActionListener aListener)
+    {
+        SimpleOffice aOffice = SimpleOffice.Instance();
+        if (aOffice!=null && aOffice.IsConnected())
+            aListener.actionPerformed (
+                new ActionEvent (aOffice,0,"<connected>"));
+        maListeners.add (aListener);
+    }
+
+    public void run ()
+    {
+        SimpleOffice aOffice = SimpleOffice.Instance();
+        if (aOffice!=null && !aOffice.IsConnected())
+            if ( ! aOffice.Connect())
+                 maTimer.schedule (this, snDelay);
+            else
+            {
+                ActionEvent aEvent = new ActionEvent (aOffice,0,"<connected>");
+                for (int i=0; i<maListeners.size(); i++)
+                    ((ActionListener)maListeners.elementAt(i)).actionPerformed(
+                        aEvent);
+            }
+    }
+
+    Timer maTimer;
+    Vector maListeners;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/InformationWriter.java b/accessibility/workben/org/openoffice/accessibility/misc/InformationWriter.java
new file mode 100644
index 000000000000..fbd1455cd295
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/misc/InformationWriter.java
@@ -0,0 +1,421 @@
+package org.openoffice.accessibility.misc;
+
+import java.lang.Thread;
+import java.io.PrintStream;
+
+import com.sun.star.awt.Rectangle;
+import com.sun.star.awt.XWindow;
+
+import com.sun.star.beans.Property;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.beans.XPropertySetInfo;
+
+import com.sun.star.container.XIndexAccess;
+import com.sun.star.container.XChild;
+import com.sun.star.container.XEnumerationAccess;
+import com.sun.star.container.XEnumeration;
+
+import com.sun.star.frame.XComponentLoader;
+import com.sun.star.frame.XController;
+import com.sun.star.frame.XDesktop;
+import com.sun.star.frame.XFrame;
+import com.sun.star.frame.XTasksSupplier;
+import com.sun.star.frame.XTask;
+
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lang.XServiceName;
+import com.sun.star.lang.XTypeProvider;
+
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XInterface;
+import com.sun.star.uno.Type;
+
+import com.sun.star.drawing.XDrawView;
+import com.sun.star.drawing.XDrawPage;
+import com.sun.star.drawing.XShapes;
+import com.sun.star.drawing.XShape;
+import com.sun.star.drawing.XShapeDescriptor;
+
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessibleRelationSet;
+import com.sun.star.accessibility.XAccessibleStateSet;
+
+public class InformationWriter
+{
+    public InformationWriter (PrintStream aOut)
+    {
+        maOut = aOut;
+    }
+
+    public void drawPageTest (XInterface xPage)
+    {
+        try
+        {
+            printProperty (xPage, "BorderBottom  ", "BorderBottom");
+            printProperty (xPage, "BorderLeft    ", "BorderLeft");
+            printProperty (xPage, "BorderRight   ", "BorderRight");
+            printProperty (xPage, "BorderTop     ", "BorderTop");
+            printProperty (xPage, "Height        ", "Height");
+            printProperty (xPage, "Width         ", "Width");
+            printProperty (xPage, "Number        ", "Number");
+        }
+        catch  (Exception e)
+        {
+            System.out.println ("caught exception while testing draw page:" + e);
+        }
+    }
+
+    public void printProperty (XInterface xObject, String prefix, String name)
+    {
+        try
+        {
+            XPropertySet xPropertySet =  (XPropertySet) UnoRuntime.queryInterface(
+                XPropertySet.class, xObject);
+            maOut.println (prefix +
+                xPropertySet.getPropertyValue (name));
+        }
+        catch (Exception e)
+        {
+            maOut.println ("caught exception while getting property "
+                + name + " : " + e);
+        }
+    }
+
+
+
+    public void showShapes (XDrawPage xPage)
+    {
+        try
+        {
+            XIndexAccess xShapeList = (XIndexAccess) UnoRuntime.queryInterface(
+                XIndexAccess.class, xPage);
+
+            maOut.println ("There are " + xShapeList.getCount()
+                + " shapes");
+            for (int i=0; i<xShapeList.getCount(); i++)
+            {
+                XShape xShape = (XShape) UnoRuntime.queryInterface(
+                    XShape.class, xShapeList.getByIndex (i));
+
+                XShapeDescriptor xShapeDescriptor =
+                    (XShapeDescriptor) UnoRuntime.queryInterface(
+                        XShapeDescriptor.class, xShape);
+                String sName = xShapeDescriptor.getShapeType ();
+                maOut.println ("   shape " + i + " : " + sName);
+
+                XPropertySet xPropertySet =
+                    (XPropertySet) UnoRuntime.queryInterface(
+                        XPropertySet.class, xShape);
+                Integer nZOrder =
+                    (Integer) xPropertySet.getPropertyValue ("ZOrder");
+                maOut.println ("   zorder = " + nZOrder);
+            }
+        }
+        catch (Exception e)
+        {
+            maOut.println ("caught exception in showShapes: " + e);
+        }
+    }
+
+
+
+
+    /** @descr Print all available services of the given object to the
+                standard output.
+    */
+    public void showServices (XInterface xObject)
+    {
+        try
+        {
+            maOut.println ("Services:");
+            XMultiServiceFactory xMSF = (XMultiServiceFactory) UnoRuntime.queryInterface (
+                XMultiServiceFactory.class,
+                xObject
+                );
+            if (xMSF == null)
+                maOut.println ("    object does not support interface XMultiServiceFactory");
+            else
+            {
+                String[] sServiceNames = xMSF.getAvailableServiceNames ();
+                maOut.println ("    object can create "
+                    + sServiceNames.length + " services");
+                for (int i=0; i<sServiceNames.length; i++)
+                    maOut.println ("        service " + i + " : " + sServiceNames[i]);
+            }
+        }
+        catch (Exception e)
+        {
+            maOut.println ("caught exception in showServices : " + e);
+        }
+    }
+
+    /** @descr Print the service and implementation name of the given
+                object.
+    */
+    public void showInfo (XInterface xObject)
+    {
+        try
+        {
+            System.out.println ("Info:");
+            // Use interface XServiceName to retrieve name of (main) service.
+            XServiceName xSN = (XServiceName) UnoRuntime.queryInterface (
+                XServiceName.class, xObject);
+            if (xSN == null)
+                maOut.println ("    interface XServiceName not supported");
+            else
+            {
+                maOut.println ("    Service name        : " + xSN.getServiceName ());
+            }
+
+            // Use interface XServiceInfo to retrieve information about
+            // supported services.
+            XServiceInfo xSI = (XServiceInfo) UnoRuntime.queryInterface (
+                XServiceInfo.class, xObject);
+            if (xSI == null)
+                maOut.println ("    interface XServiceInfo not supported");
+            else
+            {
+                maOut.println ("    Implementation name : "
+                    + xSI.getImplementationName ());
+            }
+        }
+        catch (Exception e)
+        {
+            maOut.println ("caught exception in showInfo : " + e);
+        }
+    }
+
+
+
+
+    /** @descr Print information about supported interfaces.
+    */
+    public void showInterfaces (XInterface xObject)
+    {
+        try
+        {
+            maOut.println ("Interfaces:");
+            // Use interface XTypeProvider to retrieve a list of supported
+            // interfaces.
+            XTypeProvider xTP = (XTypeProvider) UnoRuntime.queryInterface (
+                XTypeProvider.class, xObject);
+            if (xTP == null)
+                maOut.println ("    interface XTypeProvider not supported");
+            else
+            {
+                Type[] aTypeList = xTP.getTypes ();
+                maOut.println ("    object supports " + aTypeList.length
+                    + " interfaces");
+                for (int i=0; i<aTypeList.length; i++)
+                    maOut.println ("        " + i + " : "
+                        + aTypeList[i].getTypeName());
+            }
+        }
+        catch (Exception e)
+        {
+            maOut.println ("caught exception in showInterfaces : " + e);
+        }
+    }
+
+
+    /** @descr Print information concerning the accessibility of the given
+        object.
+    */
+    public boolean showAccessibility (XInterface xObject, int depth)
+    {
+        try
+        {
+            // Create indentation string.
+            String sIndent = "";
+            while (depth-- > 0)
+                sIndent += "    ";
+
+            //  Get XAccessibleContext object if given object does not
+            //  already support this interface.
+            XAccessibleContext xContext
+                = (XAccessibleContext) UnoRuntime.queryInterface (
+                    XAccessibleContext.class, xObject);
+            if (xContext == null)
+            {
+                XAccessible xAccessible
+                    = (XAccessible) UnoRuntime.queryInterface (
+                        XAccessible.class, xObject);
+                if (xAccessible == null)
+                {
+                    maOut.println (sIndent + "given object " + xObject
+                        + " is not accessible");
+                    return false;
+                }
+                else
+                    xContext = xAccessible.getAccessibleContext();
+            }
+
+            //  Print information about the accessible context.
+            if (xContext != null)
+            {
+                maOut.println (sIndent + "Name         : "
+                    + xContext.getAccessibleName());
+                maOut.println (sIndent + "Description  : "
+                    + xContext.getAccessibleDescription());
+                maOut.println (sIndent + "Role         : "
+                    + xContext.getAccessibleRole());
+                String sHasParent;
+                if (xContext.getAccessibleParent() != null)
+                {
+                    maOut.println (sIndent + "Has parent   : yes");
+                    maOut.println (sIndent + "Parent index : "
+                        + xContext.getAccessibleIndexInParent());
+                }
+                else
+                    maOut.println (sIndent + "Has parent   : no");
+                maOut.println (sIndent + "Child count  : "
+                    + xContext.getAccessibleChildCount());
+                maOut.print (sIndent + "Relation set : ");
+                XAccessibleRelationSet xRelationSet
+                    = xContext.getAccessibleRelationSet();
+                if (xRelationSet != null)
+                {
+                    maOut.print (xRelationSet.getRelationCount() + " (");
+                    for (int i=0; i<xRelationSet.getRelationCount(); i++)
+                    {
+                        if (i > 0)
+                            maOut.print (", ");
+                        maOut.print (xRelationSet.getRelation(i).toString());
+                    }
+                    maOut.println (")");
+                }
+                else
+                    maOut.println ("no relation set");
+
+                maOut.print (sIndent + "State set    : ");
+                XAccessibleStateSet xStateSet =
+                    xContext.getAccessibleStateSet();
+                if (xStateSet != null)
+                {
+                    XIndexAccess xStates =
+                        (XIndexAccess) UnoRuntime.queryInterface (
+                            XIndexAccess.class, xStateSet);
+                    maOut.print (xStates.getCount() + " (");
+                    for (int i=0; i<xStates.getCount(); i++)
+                    {
+                        if (i > 0)
+                            maOut.print (", ");
+                        maOut.print (xStates.getByIndex(i).toString());
+                    }
+                    maOut.println (")");
+                }
+                else
+                    maOut.println ("no state set");
+
+                showAccessibleComponent (xContext, sIndent);
+            }
+            else
+                maOut.println ("object has no accessible context.");
+
+            //            showInfo (xContext);
+            //            showServices (xContext);
+            //            showInterfaces (xContext);
+        }
+        catch (Exception e)
+        {
+            System.out.println ("caught exception in showAccessibility :" + e);
+        }
+        return true;
+    }
+
+
+
+
+    /** @descr Print information about the given accessible component.
+    */
+    public void showAccessibleComponent (XInterface xObject, String sIndent)
+    {
+        try
+        {
+            XAccessibleComponent xComponent =
+                (XAccessibleComponent) UnoRuntime.queryInterface (
+                    XAccessibleComponent.class, xObject);
+
+            //  Print information about the accessible context.
+            if (xComponent != null)
+            {
+                maOut.println (sIndent + "Position        : "
+                    + xComponent.getLocation().X+", "
+                    + xComponent.getLocation().Y);
+                maOut.println (sIndent + "Screen position : "
+                    + xComponent.getLocationOnScreen().X+", "
+                    + xComponent.getLocationOnScreen().Y);
+                maOut.println (sIndent + "Size            : "
+                    + xComponent.getSize().Width+", "
+                    + xComponent.getSize().Height);
+            }
+        }
+        catch (Exception e)
+        {
+            System.out.println (
+                "caught exception in showAccessibleComponent : " + e);
+        }
+    }
+
+
+    /** Show a textual representation of the accessibility subtree rooted in
+        xRoot.
+    */
+    public boolean showAccessibilityTree (XAccessible xRoot, int depth)
+    {
+        try
+        {
+            if ( ! showAccessibility (xRoot, depth))
+                return false;
+
+            String sIndent = "";
+            for (int i=0; i<depth; i++)
+                sIndent += "    ";
+
+            //  Iterate over children and show them.
+            XAccessibleContext xContext = xRoot.getAccessibleContext();
+            if (xContext != null)
+            {
+                int n = xContext.getAccessibleChildCount();
+                for (int i=0; i<n; i++)
+                {
+                    maOut.println (sIndent + "child " + i + " :");
+                    showAccessibilityTree (xContext.getAccessibleChild(i),depth+1);
+                }
+            }
+            else
+                maOut.println ("Accessible object has no context");
+        }
+        catch (Exception e)
+        {
+            System.out.println (
+                "caught exception in showAccessibleTree : " + e);
+            return false;
+        }
+
+        return true;
+    }
+
+    public void showProperties (XInterface xObject)
+    {
+        XPropertySet xSet = (XPropertySet) UnoRuntime.queryInterface (
+            XPropertySet.class, xObject);
+        if (xSet == null)
+            maOut.println ("object does not support XPropertySet");
+        else
+        {
+            XPropertySetInfo xInfo = xSet.getPropertySetInfo ();
+            Property[] aProperties = xInfo.getProperties ();
+            int n = aProperties.length;
+            for (int i=0; i<n; i++)
+                maOut.println (i + " : " + aProperties[i].Name +", " + aProperties[i].Type);
+        }
+    }
+
+    private PrintStream maOut;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/Makefile b/accessibility/workben/org/openoffice/accessibility/misc/Makefile
new file mode 100644
index 000000000000..ce9091d5d735
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/misc/Makefile
@@ -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.
+#
+#*************************************************************************
+
+all : package
+
+ROOT=../../../..
+PACKAGE = org.openoffice.accessibility.misc
+SUBDIRS = 
+
+include makefile.common
+
+include $(ROOT)/makefile.in
+
+package: subdirs $(CLASS_FILES)
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/MessageArea.java b/accessibility/workben/org/openoffice/accessibility/misc/MessageArea.java
new file mode 100644
index 000000000000..d990a517dfc1
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/misc/MessageArea.java
@@ -0,0 +1,125 @@
+package org.openoffice.accessibility.misc;
+
+import java.awt.Font;
+import java.awt.Rectangle;
+import java.awt.Color;
+import java.awt.Graphics;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JScrollBar;
+
+
+
+/** A message area displays text in a scrollable text widget.  It is a
+    singleton.  Other objects can access it directly to display messages.
+*/
+public class MessageArea
+    extends JScrollPane
+{
+    public static synchronized MessageArea Instance ()
+    {
+        if (saInstance == null)
+            saInstance = new MessageArea ();
+        return saInstance;
+    }
+
+
+
+
+    /** Create a new message area.  This method is private because the class is
+        a singleton and may therefore not be instanciated from the outside.
+    */
+    private MessageArea ()
+    {
+        maText = new JTextArea();
+        maText.setBackground (new Color (255,250,240));
+        maText.setFont (new Font ("Helvetica", Font.PLAIN, 9));
+        setViewportView (maText);
+        setVerticalScrollBarPolicy (JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
+        setHorizontalScrollBarPolicy (JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
+
+        printMessage (
+            "class path is " + System.getProperty ("java.class.path") + "\n");
+    }
+
+
+
+
+    /** Show the given string at the end of the message area and scroll to make
+        it visible.
+    */
+    public static synchronized void print (String aMessage)
+    {
+        print (0, aMessage);
+    }
+
+
+
+
+    /** Show the given string at the end of the message area and scroll to make
+        it visible.  Indent the string as requested.
+    */
+    public static synchronized void print (int nIndentation, String aMessage)
+    {
+        while (nIndentation-- > 0)
+            aMessage = " " + aMessage;
+        Instance().printMessage(aMessage);
+    }
+
+
+
+
+    /** Show the given string at the end of the message area and scroll to make
+        it visible.
+    */
+    public static void println (String aMessage)
+    {
+        println (0, aMessage);
+    }
+
+
+
+
+    /** Show the given string at the end of the message area and scroll to make
+        it visible.
+    */
+    public static void println (int nIndentation, String aMessage)
+    {
+        print (nIndentation, aMessage+"\n");
+    }
+
+
+
+
+    public void paintComponent (Graphics g)
+    {
+        synchronized (g)
+        {
+            JScrollBar sb = getVerticalScrollBar();
+            if (sb != null)
+            {
+                int nScrollBarValue = sb.getMaximum() - sb.getVisibleAmount() - 1;
+                sb.setValue (nScrollBarValue);
+            }
+            super.paintComponent (g);
+        }
+    }
+
+
+
+
+    /** Append the given string to the end of the text and scroll so that it
+        becomes visible.  This is an internal method.  Use one of the static
+        and public ones.
+    */
+    private synchronized void printMessage (String aMessage)
+    {
+        maText.append (aMessage);
+    }
+
+
+
+
+    private static MessageArea saInstance = null;
+    private JTextArea maText;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/NameProvider.java b/accessibility/workben/org/openoffice/accessibility/misc/NameProvider.java
new file mode 100644
index 000000000000..736bc2c7f17b
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/misc/NameProvider.java
@@ -0,0 +1,263 @@
+package org.openoffice.accessibility.misc;
+
+import java.util.HashMap;
+import com.sun.star.accessibility.AccessibleStateType;
+import com.sun.star.accessibility.AccessibleEventId;
+import com.sun.star.accessibility.AccessibleRole;
+import com.sun.star.accessibility.AccessibleRelationType;
+
+
+/** Provide names for several accessibility constants groups.
+*/
+public class NameProvider
+{
+    /** Return the name of the specified state.
+        @param nStateId
+            Id of the state for which to return its name.  This is one of
+            the ids listed in the <type>AccessibleStateType</const>
+            constants group.
+        @return
+            Returns the name of the specified state.  When an invalid or
+            unknown state id is given then a special string is returned that
+            says that the state does not exist.
+     */
+    public static String getStateName (int nStateId)
+    {
+        String sStateName = (String)maStateMap.get (new Integer(nStateId));
+        if (sStateName == null)
+            sStateName = new String ("<unknown state " + nStateId + ">");
+        return sStateName;
+    }
+
+
+    /** Return the name of the specified event.
+        @param nEventId
+            Id of the event type for which to return its name.  This is one
+            of the ids listed in the <type>AccessibleEventId</const>
+            constants group.
+        @return
+            Returns the name of the specified event type or an empty string
+            if an invalid / unknown event id was given.
+     */
+    public static String getEventName (int nEventId)
+    {
+        return (String)maEventMap.get (new Integer(nEventId));
+    }
+
+
+    /** Return the name of the specified role.
+        @param nRole
+            Id of the role for which to return its name.  This is one of
+            the ids listed in the <type>AccessibleRole</const>
+            constants group.
+        @return
+            Returns the name of the specified role or an empty string if an
+            invalid / unknown role id was given.
+     */
+    public static String getRoleName (int nRole)
+    {
+        return (String)maRoleMap.get (new Integer(nRole));
+    }
+
+
+    /** Return the name of the specified relation.
+        @param nRelation
+            Id of the relation for which to return its name.  This is one of
+            the ids listed in the <type>AccessibleRelationType</const>
+            constants group.
+        @return
+            Returns the name of the specified relation type or an empty
+            string if an invalid / unknown role id was given.
+     */
+    public static String getRelationName (int nRelation)
+    {
+        return (String)maRelationMap.get (new Integer(nRelation));
+    }
+
+
+    private static HashMap maStateMap = new HashMap();
+    private static HashMap maEventMap = new HashMap();
+    private static HashMap maRoleMap = new HashMap();
+    private static HashMap maRelationMap = new HashMap();
+
+    static {
+        maStateMap.put (new Integer (AccessibleStateType.INVALID), "INVALID");
+        maStateMap.put (new Integer (AccessibleStateType.ACTIVE), "ACTIVE");
+        maStateMap.put (new Integer (AccessibleStateType.ARMED), "ARMED");
+        maStateMap.put (new Integer (AccessibleStateType.BUSY), "BUSY");
+        maStateMap.put (new Integer (AccessibleStateType.CHECKED), "CHECKED");
+        //        maStateMap.put (new Integer (AccessibleStateType.COLLAPSED), "COLLAPSED");
+        maStateMap.put (new Integer (AccessibleStateType.DEFUNC), "DEFUNC");
+        maStateMap.put (new Integer (AccessibleStateType.EDITABLE), "EDITABLE");
+        maStateMap.put (new Integer (AccessibleStateType.ENABLED), "ENABLED");
+        maStateMap.put (new Integer (AccessibleStateType.EXPANDABLE), "EXPANDABLE");
+        maStateMap.put (new Integer (AccessibleStateType.EXPANDED), "EXPANDED");
+        maStateMap.put (new Integer (AccessibleStateType.FOCUSABLE), "FOCUSABLE");
+        maStateMap.put (new Integer (AccessibleStateType.FOCUSED), "FOCUSED");
+        maStateMap.put (new Integer (AccessibleStateType.HORIZONTAL), "HORIZONTAL");
+        maStateMap.put (new Integer (AccessibleStateType.ICONIFIED), "ICONIFIED");
+        maStateMap.put (new Integer (AccessibleStateType.MODAL), "MODAL");
+        maStateMap.put (new Integer (AccessibleStateType.MULTI_LINE), "MULTI_LINE");
+        maStateMap.put (new Integer (AccessibleStateType.MULTI_SELECTABLE), "MULTI_SELECTABLE");
+        maStateMap.put (new Integer (AccessibleStateType.OPAQUE), "OPAQUE");
+        maStateMap.put (new Integer (AccessibleStateType.PRESSED), "PRESSED");
+        maStateMap.put (new Integer (AccessibleStateType.RESIZABLE), "RESIZABLE");
+        maStateMap.put (new Integer (AccessibleStateType.SELECTABLE), "SELECTABLE");
+        maStateMap.put (new Integer (AccessibleStateType.SELECTED), "SELECTED");
+        maStateMap.put (new Integer (AccessibleStateType.SENSITIVE), "SENSITIVE");
+        maStateMap.put (new Integer (AccessibleStateType.SHOWING), "SHOWING");
+        maStateMap.put (new Integer (AccessibleStateType.SINGLE_LINE), "SINGLE_LINE");
+        maStateMap.put (new Integer (AccessibleStateType.STALE), "STALE");
+        maStateMap.put (new Integer (AccessibleStateType.TRANSIENT), "TRANSIENT");
+        maStateMap.put (new Integer (AccessibleStateType.VERTICAL), "VERTICAL");
+        maStateMap.put (new Integer (AccessibleStateType.VISIBLE), "VISIBLE");
+        maStateMap.put (new Integer (AccessibleStateType.MANAGES_DESCENDANTS),
+            "MANAGES_DESCENDANTS");
+        //maStateMap.put (new Integer (AccessibleStateType.INCONSISTENT),"INCONSISTENT");
+
+
+        maEventMap.put (new Integer (0),
+            "[UNKNOWN]");
+        maEventMap.put (new Integer (AccessibleEventId.NAME_CHANGED),
+            "NAME_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.DESCRIPTION_CHANGED),
+            "DESCRIPTION_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.ACTION_CHANGED),
+            "ACTION_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.STATE_CHANGED),
+            "STATE_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.ACTIVE_DESCENDANT_CHANGED),
+            "ACTIVE_DESCENDANT_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.BOUNDRECT_CHANGED),
+            "BOUNDRECT_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.CHILD),
+            "CHILD");
+        maEventMap.put (new Integer (AccessibleEventId.INVALIDATE_ALL_CHILDREN),
+            "INVALIDATE_ALL_CHILDREN");
+        maEventMap.put (new Integer (AccessibleEventId.SELECTION_CHANGED),
+            "SELECTION_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.VISIBLE_DATA_CHANGED),
+            "VISIBLE_DATA_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.VALUE_CHANGED),
+            "VALUE_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.CONTENT_FLOWS_FROM_RELATION_CHANGED),
+            "CONTENT_FLOWS_FROM_RELATION_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.CONTENT_FLOWS_TO_RELATION_CHANGED),
+            "CONTENT_FLOWS_TO_RELATION_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.CONTROLLED_BY_RELATION_CHANGED),
+            "CONTROLLED_BY_RELATION_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.CONTROLLER_FOR_RELATION_CHANGED),
+            "CONTROLLER_FOR_RELATION_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.LABEL_FOR_RELATION_CHANGED),
+            "LABEL_FOR_RELATION_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.LABELED_BY_RELATION_CHANGED),
+            "LABELED_BY_RELATION_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.MEMBER_OF_RELATION_CHANGED),
+            "MEMBER_OF_RELATION_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.SUB_WINDOW_OF_RELATION_CHANGED),
+            "SUB_WINDOW_OF_RELATION_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.CARET_CHANGED),
+            "CARET_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.TEXT_SELECTION_CHANGED),
+            "TEXT_SELECTION_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.TEXT_CHANGED),
+            "TEXT_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.TEXT_ATTRIBUTE_CHANGED),
+            "TEXT_ATTRIBUTE_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.HYPERTEXT_CHANGED),
+            "HYPERTEXT_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.TABLE_CAPTION_CHANGED),
+            "TABLE_CAPTION_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.TABLE_COLUMN_DESCRIPTION_CHANGED),
+            "TABLE_COLUMN_DESCRIPTION_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.TABLE_COLUMN_HEADER_CHANGED),
+            "TABLE_COLUMN_HEADER_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.TABLE_MODEL_CHANGED),
+            "TABLE_MODEL_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.TABLE_ROW_DESCRIPTION_CHANGED),
+            "TABLE_ROW_DESCRIPTION_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.TABLE_ROW_HEADER_CHANGED),
+            "TABLE_ROW_HEADER_CHANGED");
+        maEventMap.put (new Integer (AccessibleEventId.TABLE_SUMMARY_CHANGED),
+            "TABLE_SUMMARY_CHANGED");
+
+        maRoleMap.put (new Integer(AccessibleRole.UNKNOWN), "UNKNOWN");
+        maRoleMap.put (new Integer (AccessibleRole.UNKNOWN), "UNKNOWN");
+        maRoleMap.put (new Integer (AccessibleRole.ALERT), "ALERT");
+        maRoleMap.put (new Integer (AccessibleRole.COLUMN_HEADER), "COLUMN_HEADER");
+        maRoleMap.put (new Integer (AccessibleRole.CANVAS), "CANVAS");
+        maRoleMap.put (new Integer (AccessibleRole.CHECK_BOX), "CHECK_BOX");
+        maRoleMap.put (new Integer (AccessibleRole.CHECK_MENU_ITEM), "CHECK_MENU_ITEM");
+        maRoleMap.put (new Integer (AccessibleRole.COLOR_CHOOSER), "COLOR_CHOOSER");
+        maRoleMap.put (new Integer (AccessibleRole.COMBO_BOX), "COMBO_BOX");
+        maRoleMap.put (new Integer (AccessibleRole.DESKTOP_ICON), "DESKTOP_ICON");
+        maRoleMap.put (new Integer (AccessibleRole.DESKTOP_PANE), "DESKTOP_PANE");
+        maRoleMap.put (new Integer (AccessibleRole.DIRECTORY_PANE), "DIRECTORY_PANE");
+        maRoleMap.put (new Integer (AccessibleRole.DIALOG), "DIALOG");
+        maRoleMap.put (new Integer (AccessibleRole.DOCUMENT), "DOCUMENT");
+        maRoleMap.put (new Integer (AccessibleRole.EMBEDDED_OBJECT), "EMBEDDED_OBJECT");
+        maRoleMap.put (new Integer (AccessibleRole.END_NOTE), "END_NOTE");
+        maRoleMap.put (new Integer (AccessibleRole.FILE_CHOOSER), "FILE_CHOOSER");
+        maRoleMap.put (new Integer (AccessibleRole.FILLER), "FILLER");
+        maRoleMap.put (new Integer (AccessibleRole.FONT_CHOOSER), "FONT_CHOOSER");
+        maRoleMap.put (new Integer (AccessibleRole.FOOTER), "FOOTER");
+        maRoleMap.put (new Integer (AccessibleRole.FOOTNOTE), "FOOTNOTE");
+        maRoleMap.put (new Integer (AccessibleRole.FRAME), "FRAME");
+        maRoleMap.put (new Integer (AccessibleRole.GLASS_PANE), "GLASS_PANE");
+        maRoleMap.put (new Integer (AccessibleRole.GRAPHIC), "GRAPHIC");
+        maRoleMap.put (new Integer (AccessibleRole.GROUP_BOX), "GROUP_BOX");
+        maRoleMap.put (new Integer (AccessibleRole.HEADER), "HEADER");
+        maRoleMap.put (new Integer (AccessibleRole.HEADING), "HEADING");
+        maRoleMap.put (new Integer (AccessibleRole.HYPER_LINK), "HYPER_LINK");
+        maRoleMap.put (new Integer (AccessibleRole.ICON), "ICON");
+        maRoleMap.put (new Integer (AccessibleRole.INTERNAL_FRAME), "INTERNAL_FRAME");
+        maRoleMap.put (new Integer (AccessibleRole.LABEL), "LABEL");
+        maRoleMap.put (new Integer (AccessibleRole.LAYERED_PANE), "LAYERED_PANE");
+        maRoleMap.put (new Integer (AccessibleRole.LIST), "LIST");
+        maRoleMap.put (new Integer (AccessibleRole.LIST_ITEM), "LIST_ITEM");
+        maRoleMap.put (new Integer (AccessibleRole.MENU), "MENU");
+        maRoleMap.put (new Integer (AccessibleRole.MENU_BAR), "MENU_BAR");
+        maRoleMap.put (new Integer (AccessibleRole.MENU_ITEM), "MENU_ITEM");
+        maRoleMap.put (new Integer (AccessibleRole.OPTION_PANE), "OPTION_PANE");
+        maRoleMap.put (new Integer (AccessibleRole.PAGE_TAB), "PAGE_TAB");
+        maRoleMap.put (new Integer (AccessibleRole.PAGE_TAB_LIST), "PAGE_TAB_LIST");
+        maRoleMap.put (new Integer (AccessibleRole.PANEL), "PANEL");
+        maRoleMap.put (new Integer (AccessibleRole.PARAGRAPH), "PARAGRAPH");
+        maRoleMap.put (new Integer (AccessibleRole.PASSWORD_TEXT), "PASSWORD_TEXT");
+        maRoleMap.put (new Integer (AccessibleRole.POPUP_MENU), "POPUP_MENU");
+        maRoleMap.put (new Integer (AccessibleRole.PUSH_BUTTON), "PUSH_BUTTON");
+        maRoleMap.put (new Integer (AccessibleRole.PROGRESS_BAR), "PROGRESS_BAR");
+        maRoleMap.put (new Integer (AccessibleRole.RADIO_BUTTON), "RADIO_BUTTON");
+        maRoleMap.put (new Integer (AccessibleRole.RADIO_MENU_ITEM), "RADIO_MENU_ITEM");
+        maRoleMap.put (new Integer (AccessibleRole.ROW_HEADER), "ROW_HEADER");
+        maRoleMap.put (new Integer (AccessibleRole.ROOT_PANE), "ROOT_PANE");
+        maRoleMap.put (new Integer (AccessibleRole.SCROLL_BAR), "SCROLL_BAR");
+        maRoleMap.put (new Integer (AccessibleRole.SCROLL_PANE), "SCROLL_PANE");
+        maRoleMap.put (new Integer (AccessibleRole.SHAPE), "SHAPE");
+        maRoleMap.put (new Integer (AccessibleRole.SEPARATOR), "SEPARATOR");
+        maRoleMap.put (new Integer (AccessibleRole.SLIDER), "SLIDER");
+        maRoleMap.put (new Integer (AccessibleRole.SPIN_BOX), "SPIN_BOX");
+        maRoleMap.put (new Integer (AccessibleRole.SPLIT_PANE), "SPLIT_PANE");
+        maRoleMap.put (new Integer (AccessibleRole.STATUS_BAR), "STATUS_BAR");
+        maRoleMap.put (new Integer (AccessibleRole.TABLE), "TABLE");
+        maRoleMap.put (new Integer (AccessibleRole.TABLE_CELL), "TABLE_CELL");
+        maRoleMap.put (new Integer (AccessibleRole.TEXT), "TEXT");
+        maRoleMap.put (new Integer (AccessibleRole.TEXT_FRAME), "TEXT_FRAME");
+        maRoleMap.put (new Integer (AccessibleRole.TOGGLE_BUTTON), "TOGGLE_BUTTON");
+        maRoleMap.put (new Integer (AccessibleRole.TOOL_BAR), "TOOL_BAR");
+        maRoleMap.put (new Integer (AccessibleRole.TOOL_TIP), "TOOL_TIP");
+        maRoleMap.put (new Integer (AccessibleRole.TREE), "TREE");
+        maRoleMap.put (new Integer (AccessibleRole.VIEW_PORT), "VIEW_PORT");
+        maRoleMap.put (new Integer (AccessibleRole.WINDOW), "WINDOW");
+
+        maRelationMap.put (new Integer (AccessibleRelationType.INVALID), "INVALID");
+        maRelationMap.put (new Integer (AccessibleRelationType.CONTENT_FLOWS_FROM), "CONTENT_FLOWS_FROM");
+        maRelationMap.put (new Integer (AccessibleRelationType.CONTENT_FLOWS_TO), "CONTENT_FLOWS_TO");
+        maRelationMap.put (new Integer (AccessibleRelationType.CONTROLLED_BY), "CONTROLLED_BY");
+        maRelationMap.put (new Integer (AccessibleRelationType.CONTROLLER_FOR), "CONTROLLER_FOR");
+        maRelationMap.put (new Integer (AccessibleRelationType.LABEL_FOR), "LABEL_FOR");
+        maRelationMap.put (new Integer (AccessibleRelationType.LABELED_BY), "LABELED_BY");
+        maRelationMap.put (new Integer (AccessibleRelationType.MEMBER_OF), "MEMBER_OF");
+        maRelationMap.put (new Integer (AccessibleRelationType.SUB_WINDOW_OF), "SUB_WINDOW_OF");
+    }
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/OfficeConnection.java b/accessibility/workben/org/openoffice/accessibility/misc/OfficeConnection.java
new file mode 100644
index 000000000000..d9f77d9e4e07
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/misc/OfficeConnection.java
@@ -0,0 +1,169 @@
+package org.openoffice.accessibility.misc;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.PrintStream;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.Vector;
+
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.bridge.XUnoUrlResolver;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.comp.helper.Bootstrap;
+
+/** This class establishes a connection to a StarOffice application.
+ */
+public class OfficeConnection
+    extends TimerTask
+{
+    final public static long snDelay = 3000;
+
+    public static synchronized OfficeConnection Instance ()
+    {
+        if (saInstance == null)
+            saInstance = new OfficeConnection ();
+        return saInstance;
+    }
+
+
+
+
+    static public void SetPipeName (String sPipeName)
+    {
+        ssDefaultPipeName = sPipeName;
+    }
+
+
+
+
+    public void AddConnectionListener (ActionListener aListener)
+    {
+        SimpleOffice aOffice = SimpleOffice.Instance();
+        if (IsValid())
+            aListener.actionPerformed (
+                new ActionEvent (aOffice,0,"<connected>"));
+        maListeners.add (aListener);
+    }
+
+
+
+    /** @descr Return the service manager that represents the connected
+                StarOffice application
+    */
+    public XMultiServiceFactory GetServiceManager ()
+    {
+        return maServiceManager;
+    }
+
+
+
+
+    /** Return a flag that indicates if the constructor has been able to
+        establish a valid connection.
+    */
+    public boolean IsValid ()
+    {
+        return (maServiceManager != null);
+    }
+
+
+
+
+    /** Connect to a already running StarOffice application that has
+        been started with a command line argument like
+        "-accept=pipe,name=<username>;urp;"
+    */
+    private boolean Connect ()
+    {
+        mbInitialized = true;
+        //  Set up connection string.
+        String sConnectString = "uno:pipe,name=" + msPipeName
+                + ";urp;StarOffice.ServiceManager";
+
+        // connect to a running office and get the ServiceManager
+        try
+        {
+            //  Create a URL Resolver.
+            XMultiServiceFactory aLocalServiceManager =
+                Bootstrap.createSimpleServiceManager();
+            XUnoUrlResolver aURLResolver =
+                (XUnoUrlResolver) UnoRuntime.queryInterface (
+                    XUnoUrlResolver.class,
+                    aLocalServiceManager.createInstance (
+                        "com.sun.star.bridge.UnoUrlResolver")
+                    );
+
+            maServiceManager =
+                (XMultiServiceFactory) UnoRuntime.queryInterface (
+                    XMultiServiceFactory.class,
+                    aURLResolver.resolve (sConnectString)
+                    );
+        }
+
+        catch (Exception e)
+        {
+            if (maOut != null)
+            {
+                maOut.println ("Could not connect with "
+                    + sConnectString + " : " + e);
+                maOut.println ("Please start OpenOffice/StarOffice with "
+                    + "\"-accept=pipe,name=" + msPipeName + ";urp;\"");
+            }
+        }
+
+        return maServiceManager != null;
+    }
+
+
+    public void run ()
+    {
+        if ( ! IsValid())
+        {
+            MessageArea.println ("trying to connect");
+            if (Connect())
+            {
+                // Stop the timer.
+                cancel ();
+
+                ActionEvent aEvent = new ActionEvent (this,0,"<connected>");
+                for (int i=0; i<maListeners.size(); i++)
+                    ((ActionListener)maListeners.elementAt(i)).actionPerformed(aEvent);
+            }
+        }
+    }
+
+    private OfficeConnection ()
+    {
+        this (null);
+    }
+
+
+    private OfficeConnection (PrintStream aOut)
+    {
+        msPipeName = ssDefaultPipeName;
+        maOut = aOut;
+        maListeners = new Vector();
+        maServiceManager = null;
+
+        maTimer = new Timer (true);
+        maTimer.schedule (this, 0, snDelay);
+    }
+
+
+    private static OfficeConnection saInstance = null;
+    private static String ssDefaultPipeName = System.getenv( "USER" );
+
+    private XMultiServiceFactory maServiceManager;
+    String msPipeName;
+
+    /** A value of true just indicates that it has been tried to establish a connection,
+        not that that has been successfull.
+    */
+    private boolean mbInitialized = false;
+
+    /// Stream used to print messages.
+    private PrintStream maOut;
+    private Timer maTimer;
+    private Vector maListeners;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/Options.java b/accessibility/workben/org/openoffice/accessibility/misc/Options.java
new file mode 100644
index 000000000000..e3c358264a1d
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/misc/Options.java
@@ -0,0 +1,106 @@
+package org.openoffice.accessibility.misc;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.Properties;
+
+
+/** Load from and save options into a file.
+*/
+public class Options
+    extends Properties
+{
+    static public Options Instance ()
+    {
+        if (saOptions == null)
+            saOptions = new Options ();
+        return saOptions;
+    }
+
+    static public void SetString (String sName, String sValue)
+    {
+        Instance().setProperty (sName, sValue);
+        Instance().Save ();
+    }
+
+    static public String GetString (String sName)
+    {
+        return Instance().getProperty (sName);
+    }
+
+    static public void SetBoolean (String sName, boolean bValue)
+    {
+        Instance().setProperty (sName, Boolean.toString(bValue));
+        Instance().Save ();
+    }
+
+    static public boolean GetBoolean (String sName)
+    {
+        return Boolean.valueOf(Instance().getProperty (sName)).booleanValue();
+    }
+
+    static public void SetInteger (String sName, int nValue)
+    {
+        Instance().setProperty (sName, Integer.toString(nValue));
+        Instance().Save ();
+    }
+
+    static public int GetInteger (String sName, int nDefault)
+    {
+        String sValue = Instance().getProperty (sName);
+        if (sValue == null)
+            return nDefault;
+        else
+            return Integer.parseInt (sValue);
+    }
+
+    public void Load (String sBaseName)
+    {
+        try
+        {
+            load (new FileInputStream (ProvideFile(sBaseName)));
+        }
+        catch (java.io.IOException e)
+        {
+            // Ignore a non-existing options file.
+        }
+    }
+
+    public void Save (String sBaseName)
+    {
+        ProvideFile(sBaseName);
+        Save ();
+    }
+
+    public void Save ()
+    {
+        if (maFile != null)
+        {
+            try
+            {
+                store (new FileOutputStream (maFile), null);
+            }
+            catch (java.io.IOException e)
+            {
+            }
+        }
+    }
+
+    private Options ()
+    {
+        maFile = null;
+    }
+
+    private File ProvideFile (String sBaseName)
+    {
+        maFile = new File (
+            System.getProperty ("user.home"),
+            sBaseName);
+        return maFile;
+    }
+
+    static private Options saOptions = null;
+    private File maFile;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/SimpleOffice.java b/accessibility/workben/org/openoffice/accessibility/misc/SimpleOffice.java
new file mode 100644
index 000000000000..3a2dcdf21926
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/misc/SimpleOffice.java
@@ -0,0 +1,413 @@
+package org.openoffice.accessibility.misc;
+
+import java.lang.Thread;
+
+import com.sun.star.awt.Rectangle;
+import com.sun.star.awt.XExtendedToolkit;
+import com.sun.star.awt.XWindow;
+
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.beans.XPropertySet;
+
+import com.sun.star.container.XIndexAccess;
+import com.sun.star.container.XChild;
+import com.sun.star.container.XEnumerationAccess;
+import com.sun.star.container.XEnumeration;
+
+import com.sun.star.frame.XComponentLoader;
+import com.sun.star.frame.XController;
+import com.sun.star.frame.XDesktop;
+import com.sun.star.frame.XFrame;
+import com.sun.star.frame.XModel;
+import com.sun.star.frame.XTasksSupplier;
+import com.sun.star.frame.XTask;
+
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lang.XServiceName;
+import com.sun.star.lang.XTypeProvider;
+
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XInterface;
+import com.sun.star.uno.Type;
+
+import com.sun.star.drawing.XDrawView;
+import com.sun.star.drawing.XDrawPage;
+import com.sun.star.drawing.XShapes;
+import com.sun.star.drawing.XShape;
+import com.sun.star.drawing.XShapeDescriptor;
+
+import com.sun.star.accessibility.XAccessible;
+import com.sun.star.accessibility.XAccessibleContext;
+import com.sun.star.accessibility.XAccessibleComponent;
+import com.sun.star.accessibility.XAccessibleRelationSet;
+import com.sun.star.accessibility.XAccessibleStateSet;
+
+
+/** This singleton class tries to simplify some tasks like loading a document
+    or getting various objects.
+*/
+public class SimpleOffice
+{
+    synchronized static public SimpleOffice Instance ()
+    {
+        if (saInstance == null)
+            saInstance = new SimpleOffice ();
+
+        return saInstance;
+    }
+
+    synchronized static public void Clear ()
+    {
+        saInstance = null;
+    }
+
+
+    public XModel LoadDocument (String URL)
+    {
+        XModel xModel = null;
+        try
+        {
+            //  Load the document from the specified URL.
+            XComponentLoader xLoader =
+                (XComponentLoader)UnoRuntime.queryInterface(
+                    XComponentLoader.class, mxDesktop);
+
+            XComponent xComponent = xLoader.loadComponentFromURL (
+                URL,
+                "_blank",
+                0,
+                new PropertyValue[0]
+                );
+
+            xModel = (XModel) UnoRuntime.queryInterface(
+                XModel.class, xComponent);
+        }
+        catch (java.lang.NullPointerException e)
+        {
+            MessageArea.println ("caught exception while loading "
+                + URL + " : " + e);
+        }
+        catch (Exception e)
+        {
+            MessageArea.println ("caught exception while loading "
+                + URL + " : " + e);
+        }
+        return xModel;
+    }
+
+
+
+
+    public XModel GetModel (String name)
+    {
+        XModel xModel = null;
+        try
+        {
+            XTasksSupplier xTasksSupplier =
+                (XTasksSupplier) UnoRuntime.queryInterface(
+                    XTasksSupplier.class, mxDesktop);
+            XEnumerationAccess xEA = xTasksSupplier.getTasks();
+            XEnumeration xE = xEA.createEnumeration();
+            while (xE.hasMoreElements())
+            {
+                XTask xTask = (XTask) UnoRuntime.queryInterface(
+                    XTask.class, xE.nextElement());
+                MessageArea.print (xTask.getName());
+            }
+        }
+        catch (Exception e)
+        {
+            MessageArea.println ("caught exception while getting Model " + name
+                + ": " + e);
+        }
+        return xModel;
+    }
+
+
+    public XModel GetModel (XDrawView xView)
+    {
+        XController xController = (XController) UnoRuntime.queryInterface(
+            XController.class, xView);
+        if (xController != null)
+            return xController.getModel();
+        else
+        {
+            MessageArea.println ("can't cast view to controller");
+            return null;
+        }
+    }
+
+
+
+
+    public  XDesktop GetDesktop ()
+    {
+        if (mxDesktop != null)
+            return mxDesktop;
+        try
+        {
+            //  Get the factory of the connected office.
+            XMultiServiceFactory xMSF =
+                    OfficeConnection.Instance().GetServiceManager ();
+            if (xMSF == null)
+            {
+                MessageArea.println ("can't connect to office");
+                return null;
+            }
+            else
+                MessageArea.println ("Connected successfully.");
+
+            //  Create a new desktop.
+            mxDesktop = (XDesktop) UnoRuntime.queryInterface(
+                XDesktop.class,
+                xMSF.createInstance ("com.sun.star.frame.Desktop")
+                );
+        }
+        catch (Exception e)
+        {
+            MessageArea.println ("caught exception while creating desktop: "
+                + e);
+        }
+
+        return mxDesktop;
+    }
+
+
+    /** Return a reference to the extended toolkit which is a broadcaster of
+        top window, key, and focus events.
+    */
+    public XExtendedToolkit GetExtendedToolkit ()
+    {
+        XExtendedToolkit xToolkit = null;
+        if (this != null)
+            try
+            {
+                //  Get the factory of the connected office.
+                XMultiServiceFactory xMSF =
+                        OfficeConnection.Instance().GetServiceManager ();
+                if (xMSF != null)
+                {
+                    xToolkit = (XExtendedToolkit) UnoRuntime.queryInterface(
+                        XExtendedToolkit.class,
+                        xMSF.createInstance ("stardiv.Toolkit.VCLXToolkit")
+                        );
+                }
+            }
+            catch (Exception e)
+            {
+                MessageArea.println (
+                    "caught exception while creating extended toolkit: " + e);
+            }
+
+        return xToolkit;
+    }
+
+
+
+    static public XAccessible GetAccessibleObject (XInterface xObject)
+    {
+        XAccessible xAccessible = null;
+        try
+        {
+            xAccessible = (XAccessible) UnoRuntime.queryInterface(
+                XAccessible.class, xObject);
+        }
+        catch (Exception e)
+        {
+            System.err.println (
+                "caught exception while getting accessible object" + e);
+            e.printStackTrace (System.err);
+        }
+        return xAccessible;
+    }
+
+    static public XAccessibleContext GetAccessibleContext (XInterface xObject)
+    {
+        XAccessible xAccessible = GetAccessibleObject (xObject);
+        if (xAccessible != null)
+            return xAccessible.getAccessibleContext();
+        else
+            return null;
+    }
+
+    /** Return the root object of the accessibility hierarchy.
+    */
+    public XAccessible GetAccessibleRoot (XAccessible xAccessible)
+    {
+        try
+        {
+            XAccessible xParent = null;
+            do
+            {
+                XAccessibleContext xContext = xAccessible.getAccessibleContext();
+                if (xContext != null)
+                    xParent = xContext.getAccessibleParent();
+                if (xParent != null)
+                    xAccessible = xParent;
+            }
+            while (xParent != null);
+        }
+        catch (Exception e)
+        {
+            MessageArea.println (
+                "caught exception while getting accessible root" + e);
+            e.printStackTrace();
+        }
+        return xAccessible;
+    }
+
+
+
+
+    /** @descr Return the current window associated with the given
+                model.
+    */
+    public XWindow GetCurrentWindow ()
+    {
+        return GetCurrentWindow ((XModel) UnoRuntime.queryInterface(
+                XModel.class, GetDesktop()));
+    }
+
+
+
+
+
+    public XWindow GetCurrentWindow (XModel xModel)
+    {
+        XWindow xWindow = null;
+        try
+        {
+            if (xModel == null)
+                MessageArea.println ("invalid model (==null)");
+            XController xController = xModel.getCurrentController();
+            if (xController == null)
+                MessageArea.println ("can't get controller from model");
+            XFrame xFrame = xController.getFrame();
+            if (xFrame == null)
+                MessageArea.println ("can't get frame from controller");
+            xWindow = xFrame.getComponentWindow ();
+            if (xWindow == null)
+                MessageArea.println ("can't get window from frame");
+        }
+        catch (Exception e)
+        {
+            MessageArea.println ("caught exception while getting current window" + e);
+        }
+
+        return xWindow;
+    }
+
+
+    /** @descr Return the current draw page of the given desktop.
+    */
+    public XDrawPage GetCurrentDrawPage ()
+    {
+        return GetCurrentDrawPage (
+            (XDrawView) UnoRuntime.queryInterface(
+                XDrawView.class,
+                GetCurrentView()));
+    }
+
+
+
+
+    public XDrawPage GetCurrentDrawPage (XDrawView xView)
+    {
+        XDrawPage xPage = null;
+        try
+        {
+            if (xView == null)
+                MessageArea.println ("can't get current draw page from null view");
+            else
+                xPage = xView.getCurrentPage();
+        }
+        catch (Exception e)
+        {
+            MessageArea.println ("caught exception while getting current draw page : " + e);
+        }
+
+        return xPage;
+    }
+
+
+
+
+    /** @descr Return the current view of the given desktop.
+    */
+    public XDrawView GetCurrentView ()
+    {
+        return GetCurrentView (GetDesktop());
+    }
+
+    public XDrawView GetCurrentView (XDesktop xDesktop)
+    {
+        if (xDesktop == null)
+            MessageArea.println ("can't get desktop to retrieve current view");
+
+        XDrawView xView = null;
+        try
+        {
+            XComponent xComponent = xDesktop.getCurrentComponent();
+            if (xComponent == null)
+                MessageArea.println ("can't get component to retrieve current view");
+
+            XFrame xFrame = xDesktop.getCurrentFrame();
+            if (xFrame == null)
+                MessageArea.println ("can't get frame to retrieve current view");
+
+            XController xController = xFrame.getController();
+            if (xController == null)
+                MessageArea.println ("can't get controller to retrieve current view");
+
+            xView = (XDrawView) UnoRuntime.queryInterface(
+                XDrawView.class, xController);
+            if (xView == null)
+                MessageArea.println ("could not cast controller into view");
+        }
+        catch (Exception e)
+        {
+            MessageArea.println ("caught exception while getting current view : " + e);
+        }
+
+        return xView;
+    }
+
+
+
+
+    //  Return the accessible object of the document window.
+    public static XAccessible GetAccessibleDocumentWindow (XDrawPage xPage)
+    {
+        XIndexAccess xShapeList = (XIndexAccess) UnoRuntime.queryInterface(
+            XIndexAccess.class, xPage);
+        if (xShapeList.getCount() > 0)
+        {
+            // All shapes return as accessible object the document window's
+            // accessible object.  This is, of course, a hack and will be
+            // removed as soon as the missing infrastructure for obtaining
+            // the object directly is implemented.
+            XShape xShape = null;
+            try{
+                xShape = (XShape) UnoRuntime.queryInterface(
+                    XShape.class, xShapeList.getByIndex (0));
+            } catch (Exception e)
+            {}
+            XAccessible xAccessible = (XAccessible) UnoRuntime.queryInterface (
+                XAccessible.class, xShape);
+            return xAccessible;
+        }
+        else
+            return null;
+    }
+
+    private SimpleOffice ()
+    {
+    }
+
+
+
+    private XDesktop mxDesktop;
+    private static SimpleOffice saInstance = null;
+}
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/makefile.common b/accessibility/workben/org/openoffice/accessibility/misc/makefile.common
new file mode 100644
index 000000000000..0d7b0a3f51df
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/misc/makefile.common
@@ -0,0 +1,36 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+JARFILES = jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar
+JAVAFILES = 					\
+	AccessibleEventMulticaster.java \
+	InformationWriter.java  \
+	MessageArea.java        \
+	NameProvider.java      	\
+	OfficeConnection.java	\
+	Options.java			\
+	SimpleOffice.java
diff --git a/accessibility/workben/org/openoffice/accessibility/misc/makefile.mk b/accessibility/workben/org/openoffice/accessibility/misc/makefile.mk
new file mode 100644
index 000000000000..312410c1de48
--- /dev/null
+++ b/accessibility/workben/org/openoffice/accessibility/misc/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.
+#
+#*************************************************************************
+
+PRJNAME	= awb
+PRJ		= ..$/..$/..$/..$/..
+TARGET	= java_misc
+PACKAGE	= org$/openoffice$/accessibility$/misc
+
+USE_JAVAVER:=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+.IF "$(JAVAVER:s/.//)" >= "140" 
+
+.INCLUDE : makefile.common
+
+JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+
+#JARTARGET               = $(TARGET).jar
+#JARCOMPRESS             = TRUE
+#JARCLASSDIRS            = $(PACKAGE) org/openoffice/java/accessibility/awb 
+#CUSTOMMANIFESTFILE      = manifest
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+
+.INCLUDE :  target.mk
+
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..5952adaac9ac
--- /dev/null
+++ b/afms/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=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)"==""
+.IF "$(ZIP1TARGETN)"!=""
+$(ZIP1TARGETN):	$(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE)
+
+.ENDIF          # "$(ZIP1TARGETN)"!=""
+
+.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);
+        }
author	Jan Holesovsky <kendy@collabora.com>	2017-12-04 17:55:21 +0100
committer	Jan Holesovsky <kendy@collabora.com>	2017-12-04 18:00:09 +0100
commit	f53d4e656a6a72936309b641c778b6d47c25ffae (patch)
tree	39b46c7cda431bc6faa071ee69f0830d5bcd7642 /oox
parent	c9d1df376a949a2edf7d0cea7c695b9ff213d8f0 (diff)