update translations for 5.4

and force-fix errors using pocheck, add hsb (Upper Sorbian) ui files Change-Id: I3b5ca6727d9cc276f0d85ef0a6cb70c4d938c9ea
author: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> 2017-05-28 17:51:40 +0200
committer: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> 2017-05-28 18:20:52 +0200
commit: f12656527a34992d7b1a20618c359859f5c8e4a1 (patch)
tree: a0803ca6ba16a19a1727e1d7985d7abec2a45994 /source/hsb/svl
parent: ffe364726be8d78394cc5080d928b354e65febfb (diff)
1 files changed, 568 insertions, 0 deletions
diff --git a/source/hsb/svl/source/misc.po b/source/hsb/svl/source/misc.po
new file mode 100644
index 00000000000..8c173144581
--- /dev/null
+++ b/source/hsb/svl/source/misc.po
@@ -0,0 +1,568 @@
+#. extracted from svl/source/misc
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2017-04-12 14:14+0200\n"
+"PO-Revision-Date: 2016-12-09 19:09+0000\n"
+"Last-Translator: milupo <milupo@sorbzilla.de>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: hsb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
+"X-POOTLE-MTIME: 1481310540.000000\n"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_OCTSTREAM\n"
+"string.text"
+msgid "Binary file"
+msgstr "Binarna dataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_PDF\n"
+"string.text"
+msgid "PDF file"
+msgstr "PDF-dataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_RTF\n"
+"string.text"
+msgid "RTF File"
+msgstr "RTF-dataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_MSWORD\n"
+"string.text"
+msgid "MS-Word document"
+msgstr "Dokument MS Word"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_STARCALC\n"
+"string.text"
+msgid "%PRODUCTNAME Spreadsheet"
+msgstr "Tabelowy dokument %PRODUCTNAME"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_STARCHART\n"
+"string.text"
+msgid "%PRODUCTNAME Chart"
+msgstr "Diagram %PRODUCTNAME"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_STARDRAW\n"
+"string.text"
+msgid "%PRODUCTNAME Drawing"
+msgstr "Rysowanka %PRODUCTNAME"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_STARIMAGE\n"
+"string.text"
+msgid "%PRODUCTNAME Image"
+msgstr "Wobraz %PRODUCTNAME"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_STARMATH\n"
+"string.text"
+msgid "%PRODUCTNAME Formula"
+msgstr "Formla %PRODUCTNAME"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_STARWRITER\n"
+"string.text"
+msgid "%PRODUCTNAME Text"
+msgstr "Tekst %PRODUCTNAME"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_ZIP\n"
+"string.text"
+msgid "ZIP file"
+msgstr "ZIP-dataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_JAR\n"
+"string.text"
+msgid "JAR file"
+msgstr "JAR-dataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_AUDIO_AIFF\n"
+"string.text"
+msgid "Audio file"
+msgstr "Awdiodataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_AUDIO_BASIC\n"
+"string.text"
+msgid "Audio file"
+msgstr "Awdiodataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_AUDIO_MIDI\n"
+"string.text"
+msgid "Audio file"
+msgstr "Awdiodataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_AUDIO_VORBIS\n"
+"string.text"
+msgid "Audio file"
+msgstr "Awdiodataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_AUDIO_WAV\n"
+"string.text"
+msgid "Audio file"
+msgstr "Awdiodataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_AUDIO_WEBM\n"
+"string.text"
+msgid "Audio file"
+msgstr "Awdiodataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_IMAGE_GIF\n"
+"string.text"
+msgid "Image"
+msgstr "Wobraz"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_IMAGE_JPEG\n"
+"string.text"
+msgid "Image"
+msgstr "Wobraz"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_IMAGE_PCX\n"
+"string.text"
+msgid "Image"
+msgstr "Wobraz"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_IMAGE_BMP\n"
+"string.text"
+msgid "Bitmap"
+msgstr "Bitmap"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_TEXT_HTML\n"
+"string.text"
+msgid "HTML document"
+msgstr "HTML-dokument"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_TEXT_PLAIN\n"
+"string.text"
+msgid "Text file"
+msgstr "Tekstowa dataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_TEXT_URL\n"
+"string.text"
+msgid "Bookmark"
+msgstr "Zapołožka"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_TEXT_VCARD\n"
+"string.text"
+msgid "vCard file"
+msgstr "vCard-dataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_VIDEO_MSVIDEO\n"
+"string.text"
+msgid "Video file"
+msgstr "Widejodataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_VIDEO_THEORA\n"
+"string.text"
+msgid "Video file"
+msgstr "Widejodataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_VIDEO_VDO\n"
+"string.text"
+msgid "Video file"
+msgstr "Widejodataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_VIDEO_WEBM\n"
+"string.text"
+msgid "Video file"
+msgstr "Widejodataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_X_STARMAIL\n"
+"string.text"
+msgid "Message"
+msgstr "Powěsć"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_X_VRML\n"
+"string.text"
+msgid "VRML file"
+msgstr "VRML-dataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_STARIMPRESS\n"
+"string.text"
+msgid "%PRODUCTNAME Presentation"
+msgstr "Prezentacija %PRODUCTNAME"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_IMPRESSPACKED\n"
+"string.text"
+msgid "%PRODUCTNAME Presentation (packed)"
+msgstr "Prezentacija %PRODUCTNAME (zapakowana)"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_STARHELP\n"
+"string.text"
+msgid "%PRODUCTNAME Help"
+msgstr "Pomoc %PRODUCTNAME"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_CNT_FSYSBOX\n"
+"string.text"
+msgid "Workplace"
+msgstr "Dźěłowe městno"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_CNT_FSYSFLD\n"
+"string.text"
+msgid "Folder"
+msgstr "Rjadowak"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_GAL\n"
+"string.text"
+msgid "Gallery"
+msgstr "Galerija"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_GAL_THEME\n"
+"string.text"
+msgid "Gallery theme"
+msgstr "Tema galerije"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_STARW_GLOB\n"
+"string.text"
+msgid "%PRODUCTNAME Master Document"
+msgstr "Globalny dokument %PRODUCTNAME"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_SDM\n"
+"string.text"
+msgid "Message"
+msgstr "Powěsć"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_SMD\n"
+"string.text"
+msgid "Message"
+msgstr "Powěsć"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_STARW_WEB\n"
+"string.text"
+msgid "%PRODUCTNAME Writer/Web"
+msgstr "Writer/Web %PRODUCTNAME"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_FRAMESET\n"
+"string.text"
+msgid "Frameset Document"
+msgstr "Dokument Frameset"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_MACRO\n"
+"string.text"
+msgid "Macro file"
+msgstr "Makrodataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_CNT_SFSYSFOLDER\n"
+"string.text"
+msgid "System folder"
+msgstr "Systemowy rjadowak"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_TEMPLATE\n"
+"string.text"
+msgid "%PRODUCTNAME Template"
+msgstr "Předłoha %PRODUCTNAME"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_IMAGE_GENERIC\n"
+"string.text"
+msgid "Image"
+msgstr "Wobraz"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_MSEXCEL\n"
+"string.text"
+msgid "MS Excel document"
+msgstr "Dokument MS Excel"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL\n"
+"string.text"
+msgid "MS Excel Template"
+msgstr "Předłoha MS Excel"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_MSPPOINT\n"
+"string.text"
+msgid "MS PowerPoint document"
+msgstr "Dokument MS Powerpoint"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_TEXT_VCALENDAR\n"
+"string.text"
+msgid "vCalendar-file"
+msgstr "vCalendar-dataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_TEXT_ICALENDAR\n"
+"string.text"
+msgid "iCalendar-File"
+msgstr "iCalendar-dataja"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_TEXT_XMLICALENDAR\n"
+"string.text"
+msgid "XML-iCalendar-File"
+msgstr "Dataja XML-iCalendar"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP\n"
+"string.text"
+msgid "CDE-Calendar-File"
+msgstr "Dataja CDE-Calendar"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_INET_MSG_RFC822\n"
+"string.text"
+msgid "message/rfc822"
+msgstr "message/rfc822"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE\n"
+"string.text"
+msgid "multipart/alternative"
+msgstr "multipart/alternative"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_INET_MULTI_DIGEST\n"
+"string.text"
+msgid "multipart/digest"
+msgstr "multipart/digest"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_INET_MULTI_PARALLEL\n"
+"string.text"
+msgid "multipart/parallel"
+msgstr "multipart/parallel"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_INET_MULTI_RELATED\n"
+"string.text"
+msgid "multipart/related"
+msgstr "multipart/related"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_INET_MULTI_MIXED\n"
+"string.text"
+msgid "multipart/mixed"
+msgstr "multipart/mixed"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_SXCALC\n"
+"string.text"
+msgid "OpenOffice.org 1.0 Spreadsheet"
+msgstr "Tabelowy dokument OpenOffice.org 1.0"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_SXCHART\n"
+"string.text"
+msgid "OpenOffice.org 1.0 Chart"
+msgstr "Diagram OpenOffice.org 1.0"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_SXDRAW\n"
+"string.text"
+msgid "OpenOffice.org 1.0 Drawing"
+msgstr "Rysowanka OpenOffice.org 1.0"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_SXMATH\n"
+"string.text"
+msgid "OpenOffice.org 1.0 Formula"
+msgstr "Formla OpenOffice.org 1.0"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_SXWRITER\n"
+"string.text"
+msgid "OpenOffice.org 1.0 Text Document"
+msgstr "Tekstowy dokument OpenOffice.org 1.0"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_SXIMPRESS\n"
+"string.text"
+msgid "OpenOffice.org 1.0 Presentation"
+msgstr "Prezentacija OpenOffice.org 1.0"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_SXGLOBAL\n"
+"string.text"
+msgid "OpenOffice.org 1.0 Master Document"
+msgstr "Globalny dokument OpenOffice.org 1.0"
+
+#: mediatyp.src
+msgctxt ""
+"mediatyp.src\n"
+"STR_SVT_MIMETYPE_APP_SXIPACKED\n"
+"string.text"
+msgid "OpenOffice.org 1.0 Presentation (packed)"
+msgstr "Prezentacija OpenOffice.org 1.0 (zapakowana)"
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
index 25df1065c1ec..ddc5d8042ab4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,86 @@
 *~
 .*.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/COPYING b/COPYING
new file mode 100644
index 000000000000..94a9ed024d38
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/COPYING.LGPL b/COPYING.LGPL
new file mode 100644
index 000000000000..fc8a5de7edf4
--- /dev/null
+++ b/COPYING.LGPL
@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/COPYING.MPL b/COPYING.MPL
new file mode 100644
index 000000000000..7714141d1542
--- /dev/null
+++ b/COPYING.MPL
@@ -0,0 +1,470 @@
+                          MOZILLA PUBLIC LICENSE
+                                Version 1.1
+
+                              ---------------
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the NPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+     ``The contents of this file are subject to the Mozilla Public License
+     Version 1.1 (the "License"); you may not use this file except in
+     compliance with the License. You may obtain a copy of the License at
+     http://www.mozilla.org/MPL/
+
+     Software distributed under the License is distributed on an "AS IS"
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+     License for the specific language governing rights and limitations
+     under the License.
+
+     The Original Code is ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the _____ license (the  "[___] License"), in which case the
+     provisions of [______] License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the [____] License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the [___] License.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL or the [___] License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
+
diff --git a/GNUmakefile.mk b/GNUmakefile.mk
new file mode 100644
index 000000000000..018b21e3f1ac
--- /dev/null
+++ b/GNUmakefile.mk
@@ -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..54e93cfae54b
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,70 @@
+# @configure_input@
+
+SHELL=/usr/bin/env bash
+
+ifeq ($(USE_GMAKE),)
+GBUILD_OPT:=
+else
+GBUILD_OPT:=--gmake
+endif
+
+all: Makefile dmake/dmake@EXEEXT@ src.downloaded
+
+	@. ./*[Ee]nv.[Ss]et.sh && \
+        cd instsetoo_native && \
+        build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
+
+install:
+	@. ./*[Ee]nv.[Ss]et.sh && \
+	echo "Installing in $${prefix:-@prefix@}..." && \
+	ooinstall "$${prefix:-@prefix@}" && \
+	echo "" && \
+	echo "Installation finished, you can now execute:" && \
+	echo "$${prefix:-@prefix@}/program/soffice"
+
+dev-install:
+	@. ./*[Ee]nv.[Ss]et.sh && \
+        ooinstall -l @abs_builddir@/install && \
+        echo "" && \
+        echo "Developer installation finished, you can now execute:" && \
+        echo "@abs_builddir@/install/program/soffice"
+
+distclean: dmake/dmake@EXEEXT@
+	@. ./*[Ee]nv.[Ss]et.sh && \
+        dmake distclean
+
+clean: dmake/dmake@EXEEXT@
+	@. ./*[Ee]nv.[Ss]et.sh && \
+        dmake clean && \
+        if [ -n "$$USE_GMAKE" ] ; then make -f GNUmakefile.mk -sr clean ; fi
+
+dmake/dmake@EXEEXT@:
+	@. ./*[Ee]nv.[Ss]et.sh && \
+        ./bootstrap
+
+src.downloaded: ooo.lst download
+	@. ./*[Ee]nv.[Ss]et.sh && \
+	$$SRC_ROOT/download $$SRC_ROOT/ooo.lst && touch $@
+
+fetch: src.downloaded
+
+Makefile: configure.in set_soenv.in Makefile.in
+	./autogen.sh
+
+check: Makefile dmake/dmake@EXEEXT@ fetch
+	@. ./*[Ee]nv.[Ss]et.sh && \
+	cd smoketestoo_native && \
+	export SAL_USE_VCLPLUGIN="svp" && \
+        build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
+
+id:
+	@. ./*[Ee]nv.[Ss]et.sh && \
+		create-ids
+
+tags:
+	@. ./*[Ee]nv.[Ss]et.sh && \
+		create-tags
+
+docs:
+	@. ./*[Ee]nv.[Ss]et.sh && \
+		mkdocs.sh $$SRC_ROOT/docs $$SOLARENV/inc/doxygen.cfg
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/Mesa/inc/gl.h b/Mesa/inc/gl.h
new file mode 100644
index 000000000000..b427637e6ece
--- /dev/null
+++ b/Mesa/inc/gl.h
@@ -0,0 +1,2252 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.0
+ *
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef __gl_h_
+#define __gl_h_
+
+#if defined(USE_MGL_NAMESPACE)
+#include "gl_mangle.h"
+#endif
+
+
+/**********************************************************************
+ * Begin system-specific stuff. Do not do any of this when building
+ * for SciTech SNAP, as this is all done before this header file is
+ * included.
+ */
+#if !defined(__SCITECH_SNAP__)
+
+#if defined(__BEOS__)
+#include <stdlib.h>     /* to get some BeOS-isms */
+#endif
+
+#if !defined(OPENSTEP) && (defined(NeXT) || defined(NeXT_PDO))
+#define OPENSTEP
+#endif
+
+#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)
+#define __WIN32__
+#endif
+
+#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__))
+#  if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
+#    define GLAPI __declspec(dllexport)
+#  elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
+#    define GLAPI __declspec(dllimport)
+#  else /* for use with static link lib build of Win32 edition only */
+#    define GLAPI extern
+#  endif /* _STATIC_MESA support */
+#  define GLAPIENTRY __stdcall
+#elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */
+#  define GLAPI extern
+#  define GLAPIENTRY __stdcall
+#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
+#  define GLAPI __attribute__((visibility("default")))
+#  define GLAPIENTRY
+#endif /* WIN32 && !CYGWIN */
+
+#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
+#  define PRAGMA_EXPORT_SUPPORTED       1
+#endif
+
+/*
+ * WINDOWS: Include windows.h here to define APIENTRY.
+ * It is also useful when applications include this file by
+ * including only glut.h, since glut.h depends on windows.h.
+ * Applications needing to include windows.h with parms other
+ * than "WIN32_LEAN_AND_MEAN" may include windows.h before
+ * glut.h or gl.h.
+ */
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) \
+     && !defined(OPENSTEP) && !defined(__CYGWIN__) || defined(__MINGW32__)
+#include <GL/mesa_wgl.h>
+#endif
+
+#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
+#pragma import on
+#endif
+
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+#ifndef GLAPIENTRY
+#define GLAPIENTRY
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY GLAPIENTRY
+#endif
+
+/* "P" suffix to be used for a pointer to a function */
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+
+#ifndef GLAPIENTRYP
+#define GLAPIENTRYP GLAPIENTRY *
+#endif
+
+#ifdef CENTERLINE_CLPP
+#define signed
+#endif
+
+#if defined(PRAGMA_EXPORT_SUPPORTED)
+#pragma export on
+#endif
+
+#endif /* !__SCITECH_SNAP__ */
+/*
+ * End system-specific stuff.
+ **********************************************************************/
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+#define GL_VERSION_1_1   1
+#define GL_VERSION_1_2   1
+#define GL_VERSION_1_3   1
+#define GL_ARB_imaging   1
+
+
+/*
+ * Datatypes
+ */
+typedef unsigned int    GLenum;
+typedef unsigned char   GLboolean;
+typedef unsigned int    GLbitfield;
+typedef void        GLvoid;
+typedef signed char GLbyte;     /* 1-byte signed */
+typedef short       GLshort;    /* 2-byte signed */
+typedef int     GLint;      /* 4-byte signed */
+typedef unsigned char   GLubyte;    /* 1-byte unsigned */
+typedef unsigned short  GLushort;   /* 2-byte unsigned */
+typedef unsigned int    GLuint;     /* 4-byte unsigned */
+typedef int     GLsizei;    /* 4-byte signed */
+typedef float       GLfloat;    /* single precision float */
+typedef float       GLclampf;   /* single precision float in [0,1] */
+typedef double      GLdouble;   /* double precision float */
+typedef double      GLclampd;   /* double precision float in [0,1] */
+
+
+
+/*
+ * Constants
+ */
+
+/* Boolean values */
+#define GL_FALSE                0x0
+#define GL_TRUE                 0x1
+
+/* Data types */
+#define GL_BYTE                 0x1400
+#define GL_UNSIGNED_BYTE            0x1401
+#define GL_SHORT                0x1402
+#define GL_UNSIGNED_SHORT           0x1403
+#define GL_INT                  0x1404
+#define GL_UNSIGNED_INT             0x1405
+#define GL_FLOAT                0x1406
+#define GL_2_BYTES              0x1407
+#define GL_3_BYTES              0x1408
+#define GL_4_BYTES              0x1409
+#define GL_DOUBLE               0x140A
+
+/* Primitives */
+#define GL_POINTS               0x0000
+#define GL_LINES                0x0001
+#define GL_LINE_LOOP                0x0002
+#define GL_LINE_STRIP               0x0003
+#define GL_TRIANGLES                0x0004
+#define GL_TRIANGLE_STRIP           0x0005
+#define GL_TRIANGLE_FAN             0x0006
+#define GL_QUADS                0x0007
+#define GL_QUAD_STRIP               0x0008
+#define GL_POLYGON              0x0009
+
+/* Vertex Arrays */
+#define GL_VERTEX_ARRAY             0x8074
+#define GL_NORMAL_ARRAY             0x8075
+#define GL_COLOR_ARRAY              0x8076
+#define GL_INDEX_ARRAY              0x8077
+#define GL_TEXTURE_COORD_ARRAY          0x8078
+#define GL_EDGE_FLAG_ARRAY          0x8079
+#define GL_VERTEX_ARRAY_SIZE            0x807A
+#define GL_VERTEX_ARRAY_TYPE            0x807B
+#define GL_VERTEX_ARRAY_STRIDE          0x807C
+#define GL_NORMAL_ARRAY_TYPE            0x807E
+#define GL_NORMAL_ARRAY_STRIDE          0x807F
+#define GL_COLOR_ARRAY_SIZE         0x8081
+#define GL_COLOR_ARRAY_TYPE         0x8082
+#define GL_COLOR_ARRAY_STRIDE           0x8083
+#define GL_INDEX_ARRAY_TYPE         0x8085
+#define GL_INDEX_ARRAY_STRIDE           0x8086
+#define GL_TEXTURE_COORD_ARRAY_SIZE     0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE     0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE       0x808A
+#define GL_EDGE_FLAG_ARRAY_STRIDE       0x808C
+#define GL_VERTEX_ARRAY_POINTER         0x808E
+#define GL_NORMAL_ARRAY_POINTER         0x808F
+#define GL_COLOR_ARRAY_POINTER          0x8090
+#define GL_INDEX_ARRAY_POINTER          0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER      0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER      0x8093
+#define GL_V2F                  0x2A20
+#define GL_V3F                  0x2A21
+#define GL_C4UB_V2F             0x2A22
+#define GL_C4UB_V3F             0x2A23
+#define GL_C3F_V3F              0x2A24
+#define GL_N3F_V3F              0x2A25
+#define GL_C4F_N3F_V3F              0x2A26
+#define GL_T2F_V3F              0x2A27
+#define GL_T4F_V4F              0x2A28
+#define GL_T2F_C4UB_V3F             0x2A29
+#define GL_T2F_C3F_V3F              0x2A2A
+#define GL_T2F_N3F_V3F              0x2A2B
+#define GL_T2F_C4F_N3F_V3F          0x2A2C
+#define GL_T4F_C4F_N3F_V4F          0x2A2D
+
+/* Matrix Mode */
+#define GL_MATRIX_MODE              0x0BA0
+#define GL_MODELVIEW                0x1700
+#define GL_PROJECTION               0x1701
+#define GL_TEXTURE              0x1702
+
+/* Points */
+#define GL_POINT_SMOOTH             0x0B10
+#define GL_POINT_SIZE               0x0B11
+#define GL_POINT_SIZE_GRANULARITY       0x0B13
+#define GL_POINT_SIZE_RANGE         0x0B12
+
+/* Lines */
+#define GL_LINE_SMOOTH              0x0B20
+#define GL_LINE_STIPPLE             0x0B24
+#define GL_LINE_STIPPLE_PATTERN         0x0B25
+#define GL_LINE_STIPPLE_REPEAT          0x0B26
+#define GL_LINE_WIDTH               0x0B21
+#define GL_LINE_WIDTH_GRANULARITY       0x0B23
+#define GL_LINE_WIDTH_RANGE         0x0B22
+
+/* Polygons */
+#define GL_POINT                0x1B00
+#define GL_LINE                 0x1B01
+#define GL_FILL                 0x1B02
+#define GL_CW                   0x0900
+#define GL_CCW                  0x0901
+#define GL_FRONT                0x0404
+#define GL_BACK                 0x0405
+#define GL_POLYGON_MODE             0x0B40
+#define GL_POLYGON_SMOOTH           0x0B41
+#define GL_POLYGON_STIPPLE          0x0B42
+#define GL_EDGE_FLAG                0x0B43
+#define GL_CULL_FACE                0x0B44
+#define GL_CULL_FACE_MODE           0x0B45
+#define GL_FRONT_FACE               0x0B46
+#define GL_POLYGON_OFFSET_FACTOR        0x8038
+#define GL_POLYGON_OFFSET_UNITS         0x2A00
+#define GL_POLYGON_OFFSET_POINT         0x2A01
+#define GL_POLYGON_OFFSET_LINE          0x2A02
+#define GL_POLYGON_OFFSET_FILL          0x8037
+
+/* Display Lists */
+#define GL_COMPILE              0x1300
+#define GL_COMPILE_AND_EXECUTE          0x1301
+#define GL_LIST_BASE                0x0B32
+#define GL_LIST_INDEX               0x0B33
+#define GL_LIST_MODE                0x0B30
+
+/* Depth buffer */
+#define GL_NEVER                0x0200
+#define GL_LESS                 0x0201
+#define GL_EQUAL                0x0202
+#define GL_LEQUAL               0x0203
+#define GL_GREATER              0x0204
+#define GL_NOTEQUAL             0x0205
+#define GL_GEQUAL               0x0206
+#define GL_ALWAYS               0x0207
+#define GL_DEPTH_TEST               0x0B71
+#define GL_DEPTH_BITS               0x0D56
+#define GL_DEPTH_CLEAR_VALUE            0x0B73
+#define GL_DEPTH_FUNC               0x0B74
+#define GL_DEPTH_RANGE              0x0B70
+#define GL_DEPTH_WRITEMASK          0x0B72
+#define GL_DEPTH_COMPONENT          0x1902
+
+/* Lighting */
+#define GL_LIGHTING             0x0B50
+#define GL_LIGHT0               0x4000
+#define GL_LIGHT1               0x4001
+#define GL_LIGHT2               0x4002
+#define GL_LIGHT3               0x4003
+#define GL_LIGHT4               0x4004
+#define GL_LIGHT5               0x4005
+#define GL_LIGHT6               0x4006
+#define GL_LIGHT7               0x4007
+#define GL_SPOT_EXPONENT            0x1205
+#define GL_SPOT_CUTOFF              0x1206
+#define GL_CONSTANT_ATTENUATION         0x1207
+#define GL_LINEAR_ATTENUATION           0x1208
+#define GL_QUADRATIC_ATTENUATION        0x1209
+#define GL_AMBIENT              0x1200
+#define GL_DIFFUSE              0x1201
+#define GL_SPECULAR             0x1202
+#define GL_SHININESS                0x1601
+#define GL_EMISSION             0x1600
+#define GL_POSITION             0x1203
+#define GL_SPOT_DIRECTION           0x1204
+#define GL_AMBIENT_AND_DIFFUSE          0x1602
+#define GL_COLOR_INDEXES            0x1603
+#define GL_LIGHT_MODEL_TWO_SIDE         0x0B52
+#define GL_LIGHT_MODEL_LOCAL_VIEWER     0x0B51
+#define GL_LIGHT_MODEL_AMBIENT          0x0B53
+#define GL_FRONT_AND_BACK           0x0408
+#define GL_SHADE_MODEL              0x0B54
+#define GL_FLAT                 0x1D00
+#define GL_SMOOTH               0x1D01
+#define GL_COLOR_MATERIAL           0x0B57
+#define GL_COLOR_MATERIAL_FACE          0x0B55
+#define GL_COLOR_MATERIAL_PARAMETER     0x0B56
+#define GL_NORMALIZE                0x0BA1
+
+/* User clipping planes */
+#define GL_CLIP_PLANE0              0x3000
+#define GL_CLIP_PLANE1              0x3001
+#define GL_CLIP_PLANE2              0x3002
+#define GL_CLIP_PLANE3              0x3003
+#define GL_CLIP_PLANE4              0x3004
+#define GL_CLIP_PLANE5              0x3005
+
+/* Accumulation buffer */
+#define GL_ACCUM_RED_BITS           0x0D58
+#define GL_ACCUM_GREEN_BITS         0x0D59
+#define GL_ACCUM_BLUE_BITS          0x0D5A
+#define GL_ACCUM_ALPHA_BITS         0x0D5B
+#define GL_ACCUM_CLEAR_VALUE            0x0B80
+#define GL_ACCUM                0x0100
+#define GL_ADD                  0x0104
+#define GL_LOAD                 0x0101
+#define GL_MULT                 0x0103
+#define GL_RETURN               0x0102
+
+/* Alpha testing */
+#define GL_ALPHA_TEST               0x0BC0
+#define GL_ALPHA_TEST_REF           0x0BC2
+#define GL_ALPHA_TEST_FUNC          0x0BC1
+
+/* Blending */
+#define GL_BLEND                0x0BE2
+#define GL_BLEND_SRC                0x0BE1
+#define GL_BLEND_DST                0x0BE0
+#define GL_ZERO                 0x0
+#define GL_ONE                  0x1
+#define GL_SRC_COLOR                0x0300
+#define GL_ONE_MINUS_SRC_COLOR          0x0301
+#define GL_SRC_ALPHA                0x0302
+#define GL_ONE_MINUS_SRC_ALPHA          0x0303
+#define GL_DST_ALPHA                0x0304
+#define GL_ONE_MINUS_DST_ALPHA          0x0305
+#define GL_DST_COLOR                0x0306
+#define GL_ONE_MINUS_DST_COLOR          0x0307
+#define GL_SRC_ALPHA_SATURATE           0x0308
+
+/* Render Mode */
+#define GL_FEEDBACK             0x1C01
+#define GL_RENDER               0x1C00
+#define GL_SELECT               0x1C02
+
+/* Feedback */
+#define GL_2D                   0x0600
+#define GL_3D                   0x0601
+#define GL_3D_COLOR             0x0602
+#define GL_3D_COLOR_TEXTURE         0x0603
+#define GL_4D_COLOR_TEXTURE         0x0604
+#define GL_POINT_TOKEN              0x0701
+#define GL_LINE_TOKEN               0x0702
+#define GL_LINE_RESET_TOKEN         0x0707
+#define GL_POLYGON_TOKEN            0x0703
+#define GL_BITMAP_TOKEN             0x0704
+#define GL_DRAW_PIXEL_TOKEN         0x0705
+#define GL_COPY_PIXEL_TOKEN         0x0706
+#define GL_PASS_THROUGH_TOKEN           0x0700
+#define GL_FEEDBACK_BUFFER_POINTER      0x0DF0
+#define GL_FEEDBACK_BUFFER_SIZE         0x0DF1
+#define GL_FEEDBACK_BUFFER_TYPE         0x0DF2
+
+/* Selection */
+#define GL_SELECTION_BUFFER_POINTER     0x0DF3
+#define GL_SELECTION_BUFFER_SIZE        0x0DF4
+
+/* Fog */
+#define GL_FOG                  0x0B60
+#define GL_FOG_MODE             0x0B65
+#define GL_FOG_DENSITY              0x0B62
+#define GL_FOG_COLOR                0x0B66
+#define GL_FOG_INDEX                0x0B61
+#define GL_FOG_START                0x0B63
+#define GL_FOG_END              0x0B64
+#define GL_LINEAR               0x2601
+#define GL_EXP                  0x0800
+#define GL_EXP2                 0x0801
+
+/* Logic Ops */
+#define GL_LOGIC_OP             0x0BF1
+#define GL_INDEX_LOGIC_OP           0x0BF1
+#define GL_COLOR_LOGIC_OP           0x0BF2
+#define GL_LOGIC_OP_MODE            0x0BF0
+#define GL_CLEAR                0x1500
+#define GL_SET                  0x150F
+#define GL_COPY                 0x1503
+#define GL_COPY_INVERTED            0x150C
+#define GL_NOOP                 0x1505
+#define GL_INVERT               0x150A
+#define GL_AND                  0x1501
+#define GL_NAND                 0x150E
+#define GL_OR                   0x1507
+#define GL_NOR                  0x1508
+#define GL_XOR                  0x1506
+#define GL_EQUIV                0x1509
+#define GL_AND_REVERSE              0x1502
+#define GL_AND_INVERTED             0x1504
+#define GL_OR_REVERSE               0x150B
+#define GL_OR_INVERTED              0x150D
+
+/* Stencil */
+#define GL_STENCIL_BITS             0x0D57
+#define GL_STENCIL_TEST             0x0B90
+#define GL_STENCIL_CLEAR_VALUE          0x0B91
+#define GL_STENCIL_FUNC             0x0B92
+#define GL_STENCIL_VALUE_MASK           0x0B93
+#define GL_STENCIL_FAIL             0x0B94
+#define GL_STENCIL_PASS_DEPTH_FAIL      0x0B95
+#define GL_STENCIL_PASS_DEPTH_PASS      0x0B96
+#define GL_STENCIL_REF              0x0B97
+#define GL_STENCIL_WRITEMASK            0x0B98
+#define GL_STENCIL_INDEX            0x1901
+#define GL_KEEP                 0x1E00
+#define GL_REPLACE              0x1E01
+#define GL_INCR                 0x1E02
+#define GL_DECR                 0x1E03
+
+/* Buffers, Pixel Drawing/Reading */
+#define GL_NONE                 0x0
+#define GL_LEFT                 0x0406
+#define GL_RIGHT                0x0407
+/*GL_FRONT                  0x0404 */
+/*GL_BACK                   0x0405 */
+/*GL_FRONT_AND_BACK             0x0408 */
+#define GL_FRONT_LEFT               0x0400
+#define GL_FRONT_RIGHT              0x0401
+#define GL_BACK_LEFT                0x0402
+#define GL_BACK_RIGHT               0x0403
+#define GL_AUX0                 0x0409
+#define GL_AUX1                 0x040A
+#define GL_AUX2                 0x040B
+#define GL_AUX3                 0x040C
+#define GL_COLOR_INDEX              0x1900
+#define GL_RED                  0x1903
+#define GL_GREEN                0x1904
+#define GL_BLUE                 0x1905
+#define GL_ALPHA                0x1906
+#define GL_LUMINANCE                0x1909
+#define GL_LUMINANCE_ALPHA          0x190A
+#define GL_ALPHA_BITS               0x0D55
+#define GL_RED_BITS             0x0D52
+#define GL_GREEN_BITS               0x0D53
+#define GL_BLUE_BITS                0x0D54
+#define GL_INDEX_BITS               0x0D51
+#define GL_SUBPIXEL_BITS            0x0D50
+#define GL_AUX_BUFFERS              0x0C00
+#define GL_READ_BUFFER              0x0C02
+#define GL_DRAW_BUFFER              0x0C01
+#define GL_DOUBLEBUFFER             0x0C32
+#define GL_STEREO               0x0C33
+#define GL_BITMAP               0x1A00
+#define GL_COLOR                0x1800
+#define GL_DEPTH                0x1801
+#define GL_STENCIL              0x1802
+#define GL_DITHER               0x0BD0
+#define GL_RGB                  0x1907
+#define GL_RGBA                 0x1908
+
+/* Implementation limits */
+#define GL_MAX_LIST_NESTING         0x0B31
+#define GL_MAX_EVAL_ORDER           0x0D30
+#define GL_MAX_LIGHTS               0x0D31
+#define GL_MAX_CLIP_PLANES          0x0D32
+#define GL_MAX_TEXTURE_SIZE         0x0D33
+#define GL_MAX_PIXEL_MAP_TABLE          0x0D34
+#define GL_MAX_ATTRIB_STACK_DEPTH       0x0D35
+#define GL_MAX_MODELVIEW_STACK_DEPTH        0x0D36
+#define GL_MAX_NAME_STACK_DEPTH         0x0D37
+#define GL_MAX_PROJECTION_STACK_DEPTH       0x0D38
+#define GL_MAX_TEXTURE_STACK_DEPTH      0x0D39
+#define GL_MAX_VIEWPORT_DIMS            0x0D3A
+#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH    0x0D3B
+
+/* Gets */
+#define GL_ATTRIB_STACK_DEPTH           0x0BB0
+#define GL_CLIENT_ATTRIB_STACK_DEPTH        0x0BB1
+#define GL_COLOR_CLEAR_VALUE            0x0C22
+#define GL_COLOR_WRITEMASK          0x0C23
+#define GL_CURRENT_INDEX            0x0B01
+#define GL_CURRENT_COLOR            0x0B00
+#define GL_CURRENT_NORMAL           0x0B02
+#define GL_CURRENT_RASTER_COLOR         0x0B04
+#define GL_CURRENT_RASTER_DISTANCE      0x0B09
+#define GL_CURRENT_RASTER_INDEX         0x0B05
+#define GL_CURRENT_RASTER_POSITION      0x0B07
+#define GL_CURRENT_RASTER_TEXTURE_COORDS    0x0B06
+#define GL_CURRENT_RASTER_POSITION_VALID    0x0B08
+#define GL_CURRENT_TEXTURE_COORDS       0x0B03
+#define GL_INDEX_CLEAR_VALUE            0x0C20
+#define GL_INDEX_MODE               0x0C30
+#define GL_INDEX_WRITEMASK          0x0C21
+#define GL_MODELVIEW_MATRIX         0x0BA6
+#define GL_MODELVIEW_STACK_DEPTH        0x0BA3
+#define GL_NAME_STACK_DEPTH         0x0D70
+#define GL_PROJECTION_MATRIX            0x0BA7
+#define GL_PROJECTION_STACK_DEPTH       0x0BA4
+#define GL_RENDER_MODE              0x0C40
+#define GL_RGBA_MODE                0x0C31
+#define GL_TEXTURE_MATRIX           0x0BA8
+#define GL_TEXTURE_STACK_DEPTH          0x0BA5
+#define GL_VIEWPORT             0x0BA2
+
+/* Evaluators */
+#define GL_AUTO_NORMAL              0x0D80
+#define GL_MAP1_COLOR_4             0x0D90
+#define GL_MAP1_INDEX               0x0D91
+#define GL_MAP1_NORMAL              0x0D92
+#define GL_MAP1_TEXTURE_COORD_1         0x0D93
+#define GL_MAP1_TEXTURE_COORD_2         0x0D94
+#define GL_MAP1_TEXTURE_COORD_3         0x0D95
+#define GL_MAP1_TEXTURE_COORD_4         0x0D96
+#define GL_MAP1_VERTEX_3            0x0D97
+#define GL_MAP1_VERTEX_4            0x0D98
+#define GL_MAP2_COLOR_4             0x0DB0
+#define GL_MAP2_INDEX               0x0DB1
+#define GL_MAP2_NORMAL              0x0DB2
+#define GL_MAP2_TEXTURE_COORD_1         0x0DB3
+#define GL_MAP2_TEXTURE_COORD_2         0x0DB4
+#define GL_MAP2_TEXTURE_COORD_3         0x0DB5
+#define GL_MAP2_TEXTURE_COORD_4         0x0DB6
+#define GL_MAP2_VERTEX_3            0x0DB7
+#define GL_MAP2_VERTEX_4            0x0DB8
+#define GL_MAP1_GRID_DOMAIN         0x0DD0
+#define GL_MAP1_GRID_SEGMENTS           0x0DD1
+#define GL_MAP2_GRID_DOMAIN         0x0DD2
+#define GL_MAP2_GRID_SEGMENTS           0x0DD3
+#define GL_COEFF                0x0A00
+#define GL_ORDER                0x0A01
+#define GL_DOMAIN               0x0A02
+
+/* Hints */
+#define GL_PERSPECTIVE_CORRECTION_HINT      0x0C50
+#define GL_POINT_SMOOTH_HINT            0x0C51
+#define GL_LINE_SMOOTH_HINT         0x0C52
+#define GL_POLYGON_SMOOTH_HINT          0x0C53
+#define GL_FOG_HINT             0x0C54
+#define GL_DONT_CARE                0x1100
+#define GL_FASTEST              0x1101
+#define GL_NICEST               0x1102
+
+/* Scissor box */
+#define GL_SCISSOR_BOX              0x0C10
+#define GL_SCISSOR_TEST             0x0C11
+
+/* Pixel Mode / Transfer */
+#define GL_MAP_COLOR                0x0D10
+#define GL_MAP_STENCIL              0x0D11
+#define GL_INDEX_SHIFT              0x0D12
+#define GL_INDEX_OFFSET             0x0D13
+#define GL_RED_SCALE                0x0D14
+#define GL_RED_BIAS             0x0D15
+#define GL_GREEN_SCALE              0x0D18
+#define GL_GREEN_BIAS               0x0D19
+#define GL_BLUE_SCALE               0x0D1A
+#define GL_BLUE_BIAS                0x0D1B
+#define GL_ALPHA_SCALE              0x0D1C
+#define GL_ALPHA_BIAS               0x0D1D
+#define GL_DEPTH_SCALE              0x0D1E
+#define GL_DEPTH_BIAS               0x0D1F
+#define GL_PIXEL_MAP_S_TO_S_SIZE        0x0CB1
+#define GL_PIXEL_MAP_I_TO_I_SIZE        0x0CB0
+#define GL_PIXEL_MAP_I_TO_R_SIZE        0x0CB2
+#define GL_PIXEL_MAP_I_TO_G_SIZE        0x0CB3
+#define GL_PIXEL_MAP_I_TO_B_SIZE        0x0CB4
+#define GL_PIXEL_MAP_I_TO_A_SIZE        0x0CB5
+#define GL_PIXEL_MAP_R_TO_R_SIZE        0x0CB6
+#define GL_PIXEL_MAP_G_TO_G_SIZE        0x0CB7
+#define GL_PIXEL_MAP_B_TO_B_SIZE        0x0CB8
+#define GL_PIXEL_MAP_A_TO_A_SIZE        0x0CB9
+#define GL_PIXEL_MAP_S_TO_S         0x0C71
+#define GL_PIXEL_MAP_I_TO_I         0x0C70
+#define GL_PIXEL_MAP_I_TO_R         0x0C72
+#define GL_PIXEL_MAP_I_TO_G         0x0C73
+#define GL_PIXEL_MAP_I_TO_B         0x0C74
+#define GL_PIXEL_MAP_I_TO_A         0x0C75
+#define GL_PIXEL_MAP_R_TO_R         0x0C76
+#define GL_PIXEL_MAP_G_TO_G         0x0C77
+#define GL_PIXEL_MAP_B_TO_B         0x0C78
+#define GL_PIXEL_MAP_A_TO_A         0x0C79
+#define GL_PACK_ALIGNMENT           0x0D05
+#define GL_PACK_LSB_FIRST           0x0D01
+#define GL_PACK_ROW_LENGTH          0x0D02
+#define GL_PACK_SKIP_PIXELS         0x0D04
+#define GL_PACK_SKIP_ROWS           0x0D03
+#define GL_PACK_SWAP_BYTES          0x0D00
+#define GL_UNPACK_ALIGNMENT         0x0CF5
+#define GL_UNPACK_LSB_FIRST         0x0CF1
+#define GL_UNPACK_ROW_LENGTH            0x0CF2
+#define GL_UNPACK_SKIP_PIXELS           0x0CF4
+#define GL_UNPACK_SKIP_ROWS         0x0CF3
+#define GL_UNPACK_SWAP_BYTES            0x0CF0
+#define GL_ZOOM_X               0x0D16
+#define GL_ZOOM_Y               0x0D17
+
+/* Texture mapping */
+#define GL_TEXTURE_ENV              0x2300
+#define GL_TEXTURE_ENV_MODE         0x2200
+#define GL_TEXTURE_1D               0x0DE0
+#define GL_TEXTURE_2D               0x0DE1
+#define GL_TEXTURE_WRAP_S           0x2802
+#define GL_TEXTURE_WRAP_T           0x2803
+#define GL_TEXTURE_MAG_FILTER           0x2800
+#define GL_TEXTURE_MIN_FILTER           0x2801
+#define GL_TEXTURE_ENV_COLOR            0x2201
+#define GL_TEXTURE_GEN_S            0x0C60
+#define GL_TEXTURE_GEN_T            0x0C61
+#define GL_TEXTURE_GEN_MODE         0x2500
+#define GL_TEXTURE_BORDER_COLOR         0x1004
+#define GL_TEXTURE_WIDTH            0x1000
+#define GL_TEXTURE_HEIGHT           0x1001
+#define GL_TEXTURE_BORDER           0x1005
+#define GL_TEXTURE_COMPONENTS           0x1003
+#define GL_TEXTURE_RED_SIZE         0x805C
+#define GL_TEXTURE_GREEN_SIZE           0x805D
+#define GL_TEXTURE_BLUE_SIZE            0x805E
+#define GL_TEXTURE_ALPHA_SIZE           0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE       0x8060
+#define GL_TEXTURE_INTENSITY_SIZE       0x8061
+#define GL_NEAREST_MIPMAP_NEAREST       0x2700
+#define GL_NEAREST_MIPMAP_LINEAR        0x2702
+#define GL_LINEAR_MIPMAP_NEAREST        0x2701
+#define GL_LINEAR_MIPMAP_LINEAR         0x2703
+#define GL_OBJECT_LINEAR            0x2401
+#define GL_OBJECT_PLANE             0x2501
+#define GL_EYE_LINEAR               0x2400
+#define GL_EYE_PLANE                0x2502
+#define GL_SPHERE_MAP               0x2402
+#define GL_DECAL                0x2101
+#define GL_MODULATE             0x2100
+#define GL_NEAREST              0x2600
+#define GL_REPEAT               0x2901
+#define GL_CLAMP                0x2900
+#define GL_S                    0x2000
+#define GL_T                    0x2001
+#define GL_R                    0x2002
+#define GL_Q                    0x2003
+#define GL_TEXTURE_GEN_R            0x0C62
+#define GL_TEXTURE_GEN_Q            0x0C63
+
+/* Utility */
+#define GL_VENDOR               0x1F00
+#define GL_RENDERER             0x1F01
+#define GL_VERSION              0x1F02
+#define GL_EXTENSIONS               0x1F03
+
+/* Errors */
+#define GL_NO_ERROR                 0x0
+#define GL_INVALID_ENUM             0x0500
+#define GL_INVALID_VALUE            0x0501
+#define GL_INVALID_OPERATION            0x0502
+#define GL_STACK_OVERFLOW           0x0503
+#define GL_STACK_UNDERFLOW          0x0504
+#define GL_OUT_OF_MEMORY            0x0505
+
+/* glPush/PopAttrib bits */
+#define GL_CURRENT_BIT              0x00000001
+#define GL_POINT_BIT                0x00000002
+#define GL_LINE_BIT             0x00000004
+#define GL_POLYGON_BIT              0x00000008
+#define GL_POLYGON_STIPPLE_BIT          0x00000010
+#define GL_PIXEL_MODE_BIT           0x00000020
+#define GL_LIGHTING_BIT             0x00000040
+#define GL_FOG_BIT              0x00000080
+#define GL_DEPTH_BUFFER_BIT         0x00000100
+#define GL_ACCUM_BUFFER_BIT         0x00000200
+#define GL_STENCIL_BUFFER_BIT           0x00000400
+#define GL_VIEWPORT_BIT             0x00000800
+#define GL_TRANSFORM_BIT            0x00001000
+#define GL_ENABLE_BIT               0x00002000
+#define GL_COLOR_BUFFER_BIT         0x00004000
+#define GL_HINT_BIT             0x00008000
+#define GL_EVAL_BIT             0x00010000
+#define GL_LIST_BIT             0x00020000
+#define GL_TEXTURE_BIT              0x00040000
+#define GL_SCISSOR_BIT              0x00080000
+#define GL_ALL_ATTRIB_BITS          0x000FFFFF
+
+
+/* OpenGL 1.1 */
+#define GL_PROXY_TEXTURE_1D         0x8063
+#define GL_PROXY_TEXTURE_2D         0x8064
+#define GL_TEXTURE_PRIORITY         0x8066
+#define GL_TEXTURE_RESIDENT         0x8067
+#define GL_TEXTURE_BINDING_1D           0x8068
+#define GL_TEXTURE_BINDING_2D           0x8069
+#define GL_TEXTURE_INTERNAL_FORMAT      0x1003
+#define GL_ALPHA4               0x803B
+#define GL_ALPHA8               0x803C
+#define GL_ALPHA12              0x803D
+#define GL_ALPHA16              0x803E
+#define GL_LUMINANCE4               0x803F
+#define GL_LUMINANCE8               0x8040
+#define GL_LUMINANCE12              0x8041
+#define GL_LUMINANCE16              0x8042
+#define GL_LUMINANCE4_ALPHA4            0x8043
+#define GL_LUMINANCE6_ALPHA2            0x8044
+#define GL_LUMINANCE8_ALPHA8            0x8045
+#define GL_LUMINANCE12_ALPHA4           0x8046
+#define GL_LUMINANCE12_ALPHA12          0x8047
+#define GL_LUMINANCE16_ALPHA16          0x8048
+#define GL_INTENSITY                0x8049
+#define GL_INTENSITY4               0x804A
+#define GL_INTENSITY8               0x804B
+#define GL_INTENSITY12              0x804C
+#define GL_INTENSITY16              0x804D
+#define GL_R3_G3_B2             0x2A10
+#define GL_RGB4                 0x804F
+#define GL_RGB5                 0x8050
+#define GL_RGB8                 0x8051
+#define GL_RGB10                0x8052
+#define GL_RGB12                0x8053
+#define GL_RGB16                0x8054
+#define GL_RGBA2                0x8055
+#define GL_RGBA4                0x8056
+#define GL_RGB5_A1              0x8057
+#define GL_RGBA8                0x8058
+#define GL_RGB10_A2             0x8059
+#define GL_RGBA12               0x805A
+#define GL_RGBA16               0x805B
+#define GL_CLIENT_PIXEL_STORE_BIT       0x00000001
+#define GL_CLIENT_VERTEX_ARRAY_BIT      0x00000002
+#define GL_ALL_CLIENT_ATTRIB_BITS       0xFFFFFFFF
+#define GL_CLIENT_ALL_ATTRIB_BITS       0xFFFFFFFF
+
+
+
+/*
+ * Miscellaneous
+ */
+
+GLAPI void GLAPIENTRY glClearIndex( GLfloat c );
+
+GLAPI void GLAPIENTRY glClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );
+
+GLAPI void GLAPIENTRY glClear( GLbitfield mask );
+
+GLAPI void GLAPIENTRY glIndexMask( GLuint mask );
+
+GLAPI void GLAPIENTRY glColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha );
+
+GLAPI void GLAPIENTRY glAlphaFunc( GLenum func, GLclampf ref );
+
+GLAPI void GLAPIENTRY glBlendFunc( GLenum sfactor, GLenum dfactor );
+
+GLAPI void GLAPIENTRY glLogicOp( GLenum opcode );
+
+GLAPI void GLAPIENTRY glCullFace( GLenum mode );
+
+GLAPI void GLAPIENTRY glFrontFace( GLenum mode );
+
+GLAPI void GLAPIENTRY glPointSize( GLfloat size );
+
+GLAPI void GLAPIENTRY glLineWidth( GLfloat width );
+
+GLAPI void GLAPIENTRY glLineStipple( GLint factor, GLushort pattern );
+
+GLAPI void GLAPIENTRY glPolygonMode( GLenum face, GLenum mode );
+
+GLAPI void GLAPIENTRY glPolygonOffset( GLfloat factor, GLfloat units );
+
+GLAPI void GLAPIENTRY glPolygonStipple( const GLubyte *mask );
+
+GLAPI void GLAPIENTRY glGetPolygonStipple( GLubyte *mask );
+
+GLAPI void GLAPIENTRY glEdgeFlag( GLboolean flag );
+
+GLAPI void GLAPIENTRY glEdgeFlagv( const GLboolean *flag );
+
+GLAPI void GLAPIENTRY glScissor( GLint x, GLint y, GLsizei width, GLsizei height);
+
+GLAPI void GLAPIENTRY glClipPlane( GLenum plane, const GLdouble *equation );
+
+GLAPI void GLAPIENTRY glGetClipPlane( GLenum plane, GLdouble *equation );
+
+GLAPI void GLAPIENTRY glDrawBuffer( GLenum mode );
+
+GLAPI void GLAPIENTRY glReadBuffer( GLenum mode );
+
+GLAPI void GLAPIENTRY glEnable( GLenum cap );
+
+GLAPI void GLAPIENTRY glDisable( GLenum cap );
+
+GLAPI GLboolean GLAPIENTRY glIsEnabled( GLenum cap );
+
+
+GLAPI void GLAPIENTRY glEnableClientState( GLenum cap );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glDisableClientState( GLenum cap );  /* 1.1 */
+
+
+GLAPI void GLAPIENTRY glGetBooleanv( GLenum pname, GLboolean *params );
+
+GLAPI void GLAPIENTRY glGetDoublev( GLenum pname, GLdouble *params );
+
+GLAPI void GLAPIENTRY glGetFloatv( GLenum pname, GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetIntegerv( GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glPushAttrib( GLbitfield mask );
+
+GLAPI void GLAPIENTRY glPopAttrib( void );
+
+
+GLAPI void GLAPIENTRY glPushClientAttrib( GLbitfield mask );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glPopClientAttrib( void );  /* 1.1 */
+
+
+GLAPI GLint GLAPIENTRY glRenderMode( GLenum mode );
+
+GLAPI GLenum GLAPIENTRY glGetError( void );
+
+GLAPI const GLubyte * GLAPIENTRY glGetString( GLenum name );
+
+GLAPI void GLAPIENTRY glFinish( void );
+
+GLAPI void GLAPIENTRY glFlush( void );
+
+GLAPI void GLAPIENTRY glHint( GLenum target, GLenum mode );
+
+
+/*
+ * Depth Buffer
+ */
+
+GLAPI void GLAPIENTRY glClearDepth( GLclampd depth );
+
+GLAPI void GLAPIENTRY glDepthFunc( GLenum func );
+
+GLAPI void GLAPIENTRY glDepthMask( GLboolean flag );
+
+GLAPI void GLAPIENTRY glDepthRange( GLclampd near_val, GLclampd far_val );
+
+
+/*
+ * Accumulation Buffer
+ */
+
+GLAPI void GLAPIENTRY glClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
+
+GLAPI void GLAPIENTRY glAccum( GLenum op, GLfloat value );
+
+
+/*
+ * Transformation
+ */
+
+GLAPI void GLAPIENTRY glMatrixMode( GLenum mode );
+
+GLAPI void GLAPIENTRY glOrtho( GLdouble left, GLdouble right,
+                                 GLdouble bottom, GLdouble top,
+                                 GLdouble near_val, GLdouble far_val );
+
+GLAPI void GLAPIENTRY glFrustum( GLdouble left, GLdouble right,
+                                   GLdouble bottom, GLdouble top,
+                                   GLdouble near_val, GLdouble far_val );
+
+GLAPI void GLAPIENTRY glViewport( GLint x, GLint y,
+                                    GLsizei width, GLsizei height );
+
+GLAPI void GLAPIENTRY glPushMatrix( void );
+
+GLAPI void GLAPIENTRY glPopMatrix( void );
+
+GLAPI void GLAPIENTRY glLoadIdentity( void );
+
+GLAPI void GLAPIENTRY glLoadMatrixd( const GLdouble *m );
+GLAPI void GLAPIENTRY glLoadMatrixf( const GLfloat *m );
+
+GLAPI void GLAPIENTRY glMultMatrixd( const GLdouble *m );
+GLAPI void GLAPIENTRY glMultMatrixf( const GLfloat *m );
+
+GLAPI void GLAPIENTRY glRotated( GLdouble angle,
+                                   GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glRotatef( GLfloat angle,
+                                   GLfloat x, GLfloat y, GLfloat z );
+
+GLAPI void GLAPIENTRY glScaled( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glScalef( GLfloat x, GLfloat y, GLfloat z );
+
+GLAPI void GLAPIENTRY glTranslated( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glTranslatef( GLfloat x, GLfloat y, GLfloat z );
+
+
+/*
+ * Display Lists
+ */
+
+GLAPI GLboolean GLAPIENTRY glIsList( GLuint list );
+
+GLAPI void GLAPIENTRY glDeleteLists( GLuint list, GLsizei range );
+
+GLAPI GLuint GLAPIENTRY glGenLists( GLsizei range );
+
+GLAPI void GLAPIENTRY glNewList( GLuint list, GLenum mode );
+
+GLAPI void GLAPIENTRY glEndList( void );
+
+GLAPI void GLAPIENTRY glCallList( GLuint list );
+
+GLAPI void GLAPIENTRY glCallLists( GLsizei n, GLenum type,
+                                     const GLvoid *lists );
+
+GLAPI void GLAPIENTRY glListBase( GLuint base );
+
+
+/*
+ * Drawing Functions
+ */
+
+GLAPI void GLAPIENTRY glBegin( GLenum mode );
+
+GLAPI void GLAPIENTRY glEnd( void );
+
+
+GLAPI void GLAPIENTRY glVertex2d( GLdouble x, GLdouble y );
+GLAPI void GLAPIENTRY glVertex2f( GLfloat x, GLfloat y );
+GLAPI void GLAPIENTRY glVertex2i( GLint x, GLint y );
+GLAPI void GLAPIENTRY glVertex2s( GLshort x, GLshort y );
+
+GLAPI void GLAPIENTRY glVertex3d( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glVertex3f( GLfloat x, GLfloat y, GLfloat z );
+GLAPI void GLAPIENTRY glVertex3i( GLint x, GLint y, GLint z );
+GLAPI void GLAPIENTRY glVertex3s( GLshort x, GLshort y, GLshort z );
+
+GLAPI void GLAPIENTRY glVertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
+GLAPI void GLAPIENTRY glVertex4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
+GLAPI void GLAPIENTRY glVertex4i( GLint x, GLint y, GLint z, GLint w );
+GLAPI void GLAPIENTRY glVertex4s( GLshort x, GLshort y, GLshort z, GLshort w );
+
+GLAPI void GLAPIENTRY glVertex2dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glVertex2fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glVertex2iv( const GLint *v );
+GLAPI void GLAPIENTRY glVertex2sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glVertex3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glVertex3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glVertex3iv( const GLint *v );
+GLAPI void GLAPIENTRY glVertex3sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glVertex4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glVertex4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glVertex4iv( const GLint *v );
+GLAPI void GLAPIENTRY glVertex4sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glNormal3b( GLbyte nx, GLbyte ny, GLbyte nz );
+GLAPI void GLAPIENTRY glNormal3d( GLdouble nx, GLdouble ny, GLdouble nz );
+GLAPI void GLAPIENTRY glNormal3f( GLfloat nx, GLfloat ny, GLfloat nz );
+GLAPI void GLAPIENTRY glNormal3i( GLint nx, GLint ny, GLint nz );
+GLAPI void GLAPIENTRY glNormal3s( GLshort nx, GLshort ny, GLshort nz );
+
+GLAPI void GLAPIENTRY glNormal3bv( const GLbyte *v );
+GLAPI void GLAPIENTRY glNormal3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glNormal3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glNormal3iv( const GLint *v );
+GLAPI void GLAPIENTRY glNormal3sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glIndexd( GLdouble c );
+GLAPI void GLAPIENTRY glIndexf( GLfloat c );
+GLAPI void GLAPIENTRY glIndexi( GLint c );
+GLAPI void GLAPIENTRY glIndexs( GLshort c );
+GLAPI void GLAPIENTRY glIndexub( GLubyte c );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glIndexdv( const GLdouble *c );
+GLAPI void GLAPIENTRY glIndexfv( const GLfloat *c );
+GLAPI void GLAPIENTRY glIndexiv( const GLint *c );
+GLAPI void GLAPIENTRY glIndexsv( const GLshort *c );
+GLAPI void GLAPIENTRY glIndexubv( const GLubyte *c );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glColor3b( GLbyte red, GLbyte green, GLbyte blue );
+GLAPI void GLAPIENTRY glColor3d( GLdouble red, GLdouble green, GLdouble blue );
+GLAPI void GLAPIENTRY glColor3f( GLfloat red, GLfloat green, GLfloat blue );
+GLAPI void GLAPIENTRY glColor3i( GLint red, GLint green, GLint blue );
+GLAPI void GLAPIENTRY glColor3s( GLshort red, GLshort green, GLshort blue );
+GLAPI void GLAPIENTRY glColor3ub( GLubyte red, GLubyte green, GLubyte blue );
+GLAPI void GLAPIENTRY glColor3ui( GLuint red, GLuint green, GLuint blue );
+GLAPI void GLAPIENTRY glColor3us( GLushort red, GLushort green, GLushort blue );
+
+GLAPI void GLAPIENTRY glColor4b( GLbyte red, GLbyte green,
+                                   GLbyte blue, GLbyte alpha );
+GLAPI void GLAPIENTRY glColor4d( GLdouble red, GLdouble green,
+                                   GLdouble blue, GLdouble alpha );
+GLAPI void GLAPIENTRY glColor4f( GLfloat red, GLfloat green,
+                                   GLfloat blue, GLfloat alpha );
+GLAPI void GLAPIENTRY glColor4i( GLint red, GLint green,
+                                   GLint blue, GLint alpha );
+GLAPI void GLAPIENTRY glColor4s( GLshort red, GLshort green,
+                                   GLshort blue, GLshort alpha );
+GLAPI void GLAPIENTRY glColor4ub( GLubyte red, GLubyte green,
+                                    GLubyte blue, GLubyte alpha );
+GLAPI void GLAPIENTRY glColor4ui( GLuint red, GLuint green,
+                                    GLuint blue, GLuint alpha );
+GLAPI void GLAPIENTRY glColor4us( GLushort red, GLushort green,
+                                    GLushort blue, GLushort alpha );
+
+
+GLAPI void GLAPIENTRY glColor3bv( const GLbyte *v );
+GLAPI void GLAPIENTRY glColor3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glColor3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glColor3iv( const GLint *v );
+GLAPI void GLAPIENTRY glColor3sv( const GLshort *v );
+GLAPI void GLAPIENTRY glColor3ubv( const GLubyte *v );
+GLAPI void GLAPIENTRY glColor3uiv( const GLuint *v );
+GLAPI void GLAPIENTRY glColor3usv( const GLushort *v );
+
+GLAPI void GLAPIENTRY glColor4bv( const GLbyte *v );
+GLAPI void GLAPIENTRY glColor4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glColor4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glColor4iv( const GLint *v );
+GLAPI void GLAPIENTRY glColor4sv( const GLshort *v );
+GLAPI void GLAPIENTRY glColor4ubv( const GLubyte *v );
+GLAPI void GLAPIENTRY glColor4uiv( const GLuint *v );
+GLAPI void GLAPIENTRY glColor4usv( const GLushort *v );
+
+
+GLAPI void GLAPIENTRY glTexCoord1d( GLdouble s );
+GLAPI void GLAPIENTRY glTexCoord1f( GLfloat s );
+GLAPI void GLAPIENTRY glTexCoord1i( GLint s );
+GLAPI void GLAPIENTRY glTexCoord1s( GLshort s );
+
+GLAPI void GLAPIENTRY glTexCoord2d( GLdouble s, GLdouble t );
+GLAPI void GLAPIENTRY glTexCoord2f( GLfloat s, GLfloat t );
+GLAPI void GLAPIENTRY glTexCoord2i( GLint s, GLint t );
+GLAPI void GLAPIENTRY glTexCoord2s( GLshort s, GLshort t );
+
+GLAPI void GLAPIENTRY glTexCoord3d( GLdouble s, GLdouble t, GLdouble r );
+GLAPI void GLAPIENTRY glTexCoord3f( GLfloat s, GLfloat t, GLfloat r );
+GLAPI void GLAPIENTRY glTexCoord3i( GLint s, GLint t, GLint r );
+GLAPI void GLAPIENTRY glTexCoord3s( GLshort s, GLshort t, GLshort r );
+
+GLAPI void GLAPIENTRY glTexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+GLAPI void GLAPIENTRY glTexCoord4f( GLfloat s, GLfloat t, GLfloat r, GLfloat q );
+GLAPI void GLAPIENTRY glTexCoord4i( GLint s, GLint t, GLint r, GLint q );
+GLAPI void GLAPIENTRY glTexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q );
+
+GLAPI void GLAPIENTRY glTexCoord1dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord1fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord1iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord1sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glTexCoord2dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord2fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord2iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord2sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glTexCoord3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord3iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord3sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glTexCoord4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord4iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord4sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glRasterPos2d( GLdouble x, GLdouble y );
+GLAPI void GLAPIENTRY glRasterPos2f( GLfloat x, GLfloat y );
+GLAPI void GLAPIENTRY glRasterPos2i( GLint x, GLint y );
+GLAPI void GLAPIENTRY glRasterPos2s( GLshort x, GLshort y );
+
+GLAPI void GLAPIENTRY glRasterPos3d( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glRasterPos3f( GLfloat x, GLfloat y, GLfloat z );
+GLAPI void GLAPIENTRY glRasterPos3i( GLint x, GLint y, GLint z );
+GLAPI void GLAPIENTRY glRasterPos3s( GLshort x, GLshort y, GLshort z );
+
+GLAPI void GLAPIENTRY glRasterPos4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
+GLAPI void GLAPIENTRY glRasterPos4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
+GLAPI void GLAPIENTRY glRasterPos4i( GLint x, GLint y, GLint z, GLint w );
+GLAPI void GLAPIENTRY glRasterPos4s( GLshort x, GLshort y, GLshort z, GLshort w );
+
+GLAPI void GLAPIENTRY glRasterPos2dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glRasterPos2fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glRasterPos2iv( const GLint *v );
+GLAPI void GLAPIENTRY glRasterPos2sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glRasterPos3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glRasterPos3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glRasterPos3iv( const GLint *v );
+GLAPI void GLAPIENTRY glRasterPos3sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glRasterPos4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glRasterPos4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glRasterPos4iv( const GLint *v );
+GLAPI void GLAPIENTRY glRasterPos4sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glRectd( GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2 );
+GLAPI void GLAPIENTRY glRectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 );
+GLAPI void GLAPIENTRY glRecti( GLint x1, GLint y1, GLint x2, GLint y2 );
+GLAPI void GLAPIENTRY glRects( GLshort x1, GLshort y1, GLshort x2, GLshort y2 );
+
+
+GLAPI void GLAPIENTRY glRectdv( const GLdouble *v1, const GLdouble *v2 );
+GLAPI void GLAPIENTRY glRectfv( const GLfloat *v1, const GLfloat *v2 );
+GLAPI void GLAPIENTRY glRectiv( const GLint *v1, const GLint *v2 );
+GLAPI void GLAPIENTRY glRectsv( const GLshort *v1, const GLshort *v2 );
+
+
+/*
+ * Vertex Arrays  (1.1)
+ */
+
+GLAPI void GLAPIENTRY glVertexPointer( GLint size, GLenum type,
+                                       GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glNormalPointer( GLenum type, GLsizei stride,
+                                       const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glColorPointer( GLint size, GLenum type,
+                                      GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glIndexPointer( GLenum type, GLsizei stride,
+                                      const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glTexCoordPointer( GLint size, GLenum type,
+                                         GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glEdgeFlagPointer( GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glGetPointerv( GLenum pname, GLvoid **params );
+
+GLAPI void GLAPIENTRY glArrayElement( GLint i );
+
+GLAPI void GLAPIENTRY glDrawArrays( GLenum mode, GLint first, GLsizei count );
+
+GLAPI void GLAPIENTRY glDrawElements( GLenum mode, GLsizei count,
+                                      GLenum type, const GLvoid *indices );
+
+GLAPI void GLAPIENTRY glInterleavedArrays( GLenum format, GLsizei stride,
+                                           const GLvoid *pointer );
+
+/*
+ * Lighting
+ */
+
+GLAPI void GLAPIENTRY glShadeModel( GLenum mode );
+
+GLAPI void GLAPIENTRY glLightf( GLenum light, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glLighti( GLenum light, GLenum pname, GLint param );
+GLAPI void GLAPIENTRY glLightfv( GLenum light, GLenum pname,
+                                 const GLfloat *params );
+GLAPI void GLAPIENTRY glLightiv( GLenum light, GLenum pname,
+                                 const GLint *params );
+
+GLAPI void GLAPIENTRY glGetLightfv( GLenum light, GLenum pname,
+                                    GLfloat *params );
+GLAPI void GLAPIENTRY glGetLightiv( GLenum light, GLenum pname,
+                                    GLint *params );
+
+GLAPI void GLAPIENTRY glLightModelf( GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glLightModeli( GLenum pname, GLint param );
+GLAPI void GLAPIENTRY glLightModelfv( GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glLightModeliv( GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glMaterialf( GLenum face, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glMateriali( GLenum face, GLenum pname, GLint param );
+GLAPI void GLAPIENTRY glMaterialfv( GLenum face, GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glMaterialiv( GLenum face, GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glGetMaterialfv( GLenum face, GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetMaterialiv( GLenum face, GLenum pname, GLint *params );
+
+GLAPI void GLAPIENTRY glColorMaterial( GLenum face, GLenum mode );
+
+
+/*
+ * Raster functions
+ */
+
+GLAPI void GLAPIENTRY glPixelZoom( GLfloat xfactor, GLfloat yfactor );
+
+GLAPI void GLAPIENTRY glPixelStoref( GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glPixelStorei( GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glPixelTransferf( GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glPixelTransferi( GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glPixelMapfv( GLenum map, GLsizei mapsize,
+                                    const GLfloat *values );
+GLAPI void GLAPIENTRY glPixelMapuiv( GLenum map, GLsizei mapsize,
+                                     const GLuint *values );
+GLAPI void GLAPIENTRY glPixelMapusv( GLenum map, GLsizei mapsize,
+                                     const GLushort *values );
+
+GLAPI void GLAPIENTRY glGetPixelMapfv( GLenum map, GLfloat *values );
+GLAPI void GLAPIENTRY glGetPixelMapuiv( GLenum map, GLuint *values );
+GLAPI void GLAPIENTRY glGetPixelMapusv( GLenum map, GLushort *values );
+
+GLAPI void GLAPIENTRY glBitmap( GLsizei width, GLsizei height,
+                                GLfloat xorig, GLfloat yorig,
+                                GLfloat xmove, GLfloat ymove,
+                                const GLubyte *bitmap );
+
+GLAPI void GLAPIENTRY glReadPixels( GLint x, GLint y,
+                                    GLsizei width, GLsizei height,
+                                    GLenum format, GLenum type,
+                                    GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glDrawPixels( GLsizei width, GLsizei height,
+                                    GLenum format, GLenum type,
+                                    const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glCopyPixels( GLint x, GLint y,
+                                    GLsizei width, GLsizei height,
+                                    GLenum type );
+
+/*
+ * Stenciling
+ */
+
+GLAPI void GLAPIENTRY glStencilFunc( GLenum func, GLint ref, GLuint mask );
+
+GLAPI void GLAPIENTRY glStencilMask( GLuint mask );
+
+GLAPI void GLAPIENTRY glStencilOp( GLenum fail, GLenum zfail, GLenum zpass );
+
+GLAPI void GLAPIENTRY glClearStencil( GLint s );
+
+
+
+/*
+ * Texture mapping
+ */
+
+GLAPI void GLAPIENTRY glTexGend( GLenum coord, GLenum pname, GLdouble param );
+GLAPI void GLAPIENTRY glTexGenf( GLenum coord, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glTexGeni( GLenum coord, GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glTexGendv( GLenum coord, GLenum pname, const GLdouble *params );
+GLAPI void GLAPIENTRY glTexGenfv( GLenum coord, GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glTexGeniv( GLenum coord, GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexGendv( GLenum coord, GLenum pname, GLdouble *params );
+GLAPI void GLAPIENTRY glGetTexGenfv( GLenum coord, GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetTexGeniv( GLenum coord, GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glTexEnvf( GLenum target, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glTexEnvi( GLenum target, GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glTexEnvfv( GLenum target, GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glTexEnviv( GLenum target, GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexEnvfv( GLenum target, GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetTexEnviv( GLenum target, GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glTexParameterf( GLenum target, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glTexParameteri( GLenum target, GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glTexParameterfv( GLenum target, GLenum pname,
+                                          const GLfloat *params );
+GLAPI void GLAPIENTRY glTexParameteriv( GLenum target, GLenum pname,
+                                          const GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexParameterfv( GLenum target,
+                                           GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetTexParameteriv( GLenum target,
+                                           GLenum pname, GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexLevelParameterfv( GLenum target, GLint level,
+                                                GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetTexLevelParameteriv( GLenum target, GLint level,
+                                                GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glTexImage1D( GLenum target, GLint level,
+                                    GLint internalFormat,
+                                    GLsizei width, GLint border,
+                                    GLenum format, GLenum type,
+                                    const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glTexImage2D( GLenum target, GLint level,
+                                    GLint internalFormat,
+                                    GLsizei width, GLsizei height,
+                                    GLint border, GLenum format, GLenum type,
+                                    const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glGetTexImage( GLenum target, GLint level,
+                                     GLenum format, GLenum type,
+                                     GLvoid *pixels );
+
+
+/* 1.1 functions */
+
+GLAPI void GLAPIENTRY glGenTextures( GLsizei n, GLuint *textures );
+
+GLAPI void GLAPIENTRY glDeleteTextures( GLsizei n, const GLuint *textures);
+
+GLAPI void GLAPIENTRY glBindTexture( GLenum target, GLuint texture );
+
+GLAPI void GLAPIENTRY glPrioritizeTextures( GLsizei n,
+                                            const GLuint *textures,
+                                            const GLclampf *priorities );
+
+GLAPI GLboolean GLAPIENTRY glAreTexturesResident( GLsizei n,
+                                                  const GLuint *textures,
+                                                  GLboolean *residences );
+
+GLAPI GLboolean GLAPIENTRY glIsTexture( GLuint texture );
+
+
+GLAPI void GLAPIENTRY glTexSubImage1D( GLenum target, GLint level,
+                                       GLint xoffset,
+                                       GLsizei width, GLenum format,
+                                       GLenum type, const GLvoid *pixels );
+
+
+GLAPI void GLAPIENTRY glTexSubImage2D( GLenum target, GLint level,
+                                       GLint xoffset, GLint yoffset,
+                                       GLsizei width, GLsizei height,
+                                       GLenum format, GLenum type,
+                                       const GLvoid *pixels );
+
+
+GLAPI void GLAPIENTRY glCopyTexImage1D( GLenum target, GLint level,
+                                        GLenum internalformat,
+                                        GLint x, GLint y,
+                                        GLsizei width, GLint border );
+
+
+GLAPI void GLAPIENTRY glCopyTexImage2D( GLenum target, GLint level,
+                                        GLenum internalformat,
+                                        GLint x, GLint y,
+                                        GLsizei width, GLsizei height,
+                                        GLint border );
+
+
+GLAPI void GLAPIENTRY glCopyTexSubImage1D( GLenum target, GLint level,
+                                           GLint xoffset, GLint x, GLint y,
+                                           GLsizei width );
+
+
+GLAPI void GLAPIENTRY glCopyTexSubImage2D( GLenum target, GLint level,
+                                           GLint xoffset, GLint yoffset,
+                                           GLint x, GLint y,
+                                           GLsizei width, GLsizei height );
+
+
+/*
+ * Evaluators
+ */
+
+GLAPI void GLAPIENTRY glMap1d( GLenum target, GLdouble u1, GLdouble u2,
+                               GLint stride,
+                               GLint order, const GLdouble *points );
+GLAPI void GLAPIENTRY glMap1f( GLenum target, GLfloat u1, GLfloat u2,
+                               GLint stride,
+                               GLint order, const GLfloat *points );
+
+GLAPI void GLAPIENTRY glMap2d( GLenum target,
+             GLdouble u1, GLdouble u2, GLint ustride, GLint uorder,
+             GLdouble v1, GLdouble v2, GLint vstride, GLint vorder,
+             const GLdouble *points );
+GLAPI void GLAPIENTRY glMap2f( GLenum target,
+             GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
+             GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,
+             const GLfloat *points );
+
+GLAPI void GLAPIENTRY glGetMapdv( GLenum target, GLenum query, GLdouble *v );
+GLAPI void GLAPIENTRY glGetMapfv( GLenum target, GLenum query, GLfloat *v );
+GLAPI void GLAPIENTRY glGetMapiv( GLenum target, GLenum query, GLint *v );
+
+GLAPI void GLAPIENTRY glEvalCoord1d( GLdouble u );
+GLAPI void GLAPIENTRY glEvalCoord1f( GLfloat u );
+
+GLAPI void GLAPIENTRY glEvalCoord1dv( const GLdouble *u );
+GLAPI void GLAPIENTRY glEvalCoord1fv( const GLfloat *u );
+
+GLAPI void GLAPIENTRY glEvalCoord2d( GLdouble u, GLdouble v );
+GLAPI void GLAPIENTRY glEvalCoord2f( GLfloat u, GLfloat v );
+
+GLAPI void GLAPIENTRY glEvalCoord2dv( const GLdouble *u );
+GLAPI void GLAPIENTRY glEvalCoord2fv( const GLfloat *u );
+
+GLAPI void GLAPIENTRY glMapGrid1d( GLint un, GLdouble u1, GLdouble u2 );
+GLAPI void GLAPIENTRY glMapGrid1f( GLint un, GLfloat u1, GLfloat u2 );
+
+GLAPI void GLAPIENTRY glMapGrid2d( GLint un, GLdouble u1, GLdouble u2,
+                                   GLint vn, GLdouble v1, GLdouble v2 );
+GLAPI void GLAPIENTRY glMapGrid2f( GLint un, GLfloat u1, GLfloat u2,
+                                   GLint vn, GLfloat v1, GLfloat v2 );
+
+GLAPI void GLAPIENTRY glEvalPoint1( GLint i );
+
+GLAPI void GLAPIENTRY glEvalPoint2( GLint i, GLint j );
+
+GLAPI void GLAPIENTRY glEvalMesh1( GLenum mode, GLint i1, GLint i2 );
+
+GLAPI void GLAPIENTRY glEvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 );
+
+
+/*
+ * Fog
+ */
+
+GLAPI void GLAPIENTRY glFogf( GLenum pname, GLfloat param );
+
+GLAPI void GLAPIENTRY glFogi( GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glFogfv( GLenum pname, const GLfloat *params );
+
+GLAPI void GLAPIENTRY glFogiv( GLenum pname, const GLint *params );
+
+
+/*
+ * Selection and Feedback
+ */
+
+GLAPI void GLAPIENTRY glFeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer );
+
+GLAPI void GLAPIENTRY glPassThrough( GLfloat token );
+
+GLAPI void GLAPIENTRY glSelectBuffer( GLsizei size, GLuint *buffer );
+
+GLAPI void GLAPIENTRY glInitNames( void );
+
+GLAPI void GLAPIENTRY glLoadName( GLuint name );
+
+GLAPI void GLAPIENTRY glPushName( GLuint name );
+
+GLAPI void GLAPIENTRY glPopName( void );
+
+
+
+/*
+ * OpenGL 1.2
+ */
+
+#define GL_RESCALE_NORMAL           0x803A
+#define GL_CLAMP_TO_EDGE            0x812F
+#define GL_MAX_ELEMENTS_VERTICES        0x80E8
+#define GL_MAX_ELEMENTS_INDICES         0x80E9
+#define GL_BGR                  0x80E0
+#define GL_BGRA                 0x80E1
+#define GL_UNSIGNED_BYTE_3_3_2          0x8032
+#define GL_UNSIGNED_BYTE_2_3_3_REV      0x8362
+#define GL_UNSIGNED_SHORT_5_6_5         0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV     0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4       0x8033
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV       0x8365
+#define GL_UNSIGNED_SHORT_5_5_5_1       0x8034
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV       0x8366
+#define GL_UNSIGNED_INT_8_8_8_8         0x8035
+#define GL_UNSIGNED_INT_8_8_8_8_REV     0x8367
+#define GL_UNSIGNED_INT_10_10_10_2      0x8036
+#define GL_UNSIGNED_INT_2_10_10_10_REV      0x8368
+#define GL_LIGHT_MODEL_COLOR_CONTROL        0x81F8
+#define GL_SINGLE_COLOR             0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR      0x81FA
+#define GL_TEXTURE_MIN_LOD          0x813A
+#define GL_TEXTURE_MAX_LOD          0x813B
+#define GL_TEXTURE_BASE_LEVEL           0x813C
+#define GL_TEXTURE_MAX_LEVEL            0x813D
+#define GL_SMOOTH_POINT_SIZE_RANGE      0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY    0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE      0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY    0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE     0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE     0x846E
+#define GL_PACK_SKIP_IMAGES         0x806B
+#define GL_PACK_IMAGE_HEIGHT            0x806C
+#define GL_UNPACK_SKIP_IMAGES           0x806D
+#define GL_UNPACK_IMAGE_HEIGHT          0x806E
+#define GL_TEXTURE_3D               0x806F
+#define GL_PROXY_TEXTURE_3D         0x8070
+#define GL_TEXTURE_DEPTH            0x8071
+#define GL_TEXTURE_WRAP_R           0x8072
+#define GL_MAX_3D_TEXTURE_SIZE          0x8073
+#define GL_TEXTURE_BINDING_3D           0x806A
+
+GLAPI void GLAPIENTRY glDrawRangeElements( GLenum mode, GLuint start,
+    GLuint end, GLsizei count, GLenum type, const GLvoid *indices );
+
+GLAPI void GLAPIENTRY glTexImage3D( GLenum target, GLint level,
+                                      GLint internalFormat,
+                                      GLsizei width, GLsizei height,
+                                      GLsizei depth, GLint border,
+                                      GLenum format, GLenum type,
+                                      const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glTexSubImage3D( GLenum target, GLint level,
+                                         GLint xoffset, GLint yoffset,
+                                         GLint zoffset, GLsizei width,
+                                         GLsizei height, GLsizei depth,
+                                         GLenum format,
+                                         GLenum type, const GLvoid *pixels);
+
+GLAPI void GLAPIENTRY glCopyTexSubImage3D( GLenum target, GLint level,
+                                             GLint xoffset, GLint yoffset,
+                                             GLint zoffset, GLint x,
+                                             GLint y, GLsizei width,
+                                             GLsizei height );
+
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+
+
+/*
+ * GL_ARB_imaging
+ */
+
+#define GL_CONSTANT_COLOR           0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR     0x8002
+#define GL_CONSTANT_ALPHA           0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA     0x8004
+#define GL_COLOR_TABLE              0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE     0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE    0x80D2
+#define GL_PROXY_COLOR_TABLE            0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE   0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE  0x80D5
+#define GL_COLOR_TABLE_SCALE            0x80D6
+#define GL_COLOR_TABLE_BIAS         0x80D7
+#define GL_COLOR_TABLE_FORMAT           0x80D8
+#define GL_COLOR_TABLE_WIDTH            0x80D9
+#define GL_COLOR_TABLE_RED_SIZE         0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE       0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE        0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE       0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE       0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE       0x80DF
+#define GL_CONVOLUTION_1D           0x8010
+#define GL_CONVOLUTION_2D           0x8011
+#define GL_SEPARABLE_2D             0x8012
+#define GL_CONVOLUTION_BORDER_MODE      0x8013
+#define GL_CONVOLUTION_FILTER_SCALE     0x8014
+#define GL_CONVOLUTION_FILTER_BIAS      0x8015
+#define GL_REDUCE               0x8016
+#define GL_CONVOLUTION_FORMAT           0x8017
+#define GL_CONVOLUTION_WIDTH            0x8018
+#define GL_CONVOLUTION_HEIGHT           0x8019
+#define GL_MAX_CONVOLUTION_WIDTH        0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT       0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE       0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE     0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE      0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE     0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS        0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS      0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS       0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS      0x8023
+#define GL_CONSTANT_BORDER          0x8151
+#define GL_REPLICATE_BORDER         0x8153
+#define GL_CONVOLUTION_BORDER_COLOR     0x8154
+#define GL_COLOR_MATRIX             0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH     0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH     0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE      0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE    0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE     0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE    0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS       0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS     0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS      0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS     0x80BB
+#define GL_HISTOGRAM                0x8024
+#define GL_PROXY_HISTOGRAM          0x8025
+#define GL_HISTOGRAM_WIDTH          0x8026
+#define GL_HISTOGRAM_FORMAT         0x8027
+#define GL_HISTOGRAM_RED_SIZE           0x8028
+#define GL_HISTOGRAM_GREEN_SIZE         0x8029
+#define GL_HISTOGRAM_BLUE_SIZE          0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE         0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE     0x802C
+#define GL_HISTOGRAM_SINK           0x802D
+#define GL_MINMAX               0x802E
+#define GL_MINMAX_FORMAT            0x802F
+#define GL_MINMAX_SINK              0x8030
+#define GL_TABLE_TOO_LARGE          0x8031
+#define GL_BLEND_EQUATION           0x8009
+#define GL_MIN                  0x8007
+#define GL_MAX                  0x8008
+#define GL_FUNC_ADD             0x8006
+#define GL_FUNC_SUBTRACT            0x800A
+#define GL_FUNC_REVERSE_SUBTRACT        0x800B
+#define GL_BLEND_COLOR              0x8005
+
+
+GLAPI void GLAPIENTRY glColorTable( GLenum target, GLenum internalformat,
+                                    GLsizei width, GLenum format,
+                                    GLenum type, const GLvoid *table );
+
+GLAPI void GLAPIENTRY glColorSubTable( GLenum target,
+                                       GLsizei start, GLsizei count,
+                                       GLenum format, GLenum type,
+                                       const GLvoid *data );
+
+GLAPI void GLAPIENTRY glColorTableParameteriv(GLenum target, GLenum pname,
+                                              const GLint *params);
+
+GLAPI void GLAPIENTRY glColorTableParameterfv(GLenum target, GLenum pname,
+                                              const GLfloat *params);
+
+GLAPI void GLAPIENTRY glCopyColorSubTable( GLenum target, GLsizei start,
+                                           GLint x, GLint y, GLsizei width );
+
+GLAPI void GLAPIENTRY glCopyColorTable( GLenum target, GLenum internalformat,
+                                        GLint x, GLint y, GLsizei width );
+
+GLAPI void GLAPIENTRY glGetColorTable( GLenum target, GLenum format,
+                                       GLenum type, GLvoid *table );
+
+GLAPI void GLAPIENTRY glGetColorTableParameterfv( GLenum target, GLenum pname,
+                                                  GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetColorTableParameteriv( GLenum target, GLenum pname,
+                                                  GLint *params );
+
+GLAPI void GLAPIENTRY glBlendEquation( GLenum mode );
+
+GLAPI void GLAPIENTRY glBlendColor( GLclampf red, GLclampf green,
+                                    GLclampf blue, GLclampf alpha );
+
+GLAPI void GLAPIENTRY glHistogram( GLenum target, GLsizei width,
+                   GLenum internalformat, GLboolean sink );
+
+GLAPI void GLAPIENTRY glResetHistogram( GLenum target );
+
+GLAPI void GLAPIENTRY glGetHistogram( GLenum target, GLboolean reset,
+                      GLenum format, GLenum type,
+                      GLvoid *values );
+
+GLAPI void GLAPIENTRY glGetHistogramParameterfv( GLenum target, GLenum pname,
+                         GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetHistogramParameteriv( GLenum target, GLenum pname,
+                         GLint *params );
+
+GLAPI void GLAPIENTRY glMinmax( GLenum target, GLenum internalformat,
+                GLboolean sink );
+
+GLAPI void GLAPIENTRY glResetMinmax( GLenum target );
+
+GLAPI void GLAPIENTRY glGetMinmax( GLenum target, GLboolean reset,
+                                   GLenum format, GLenum types,
+                                   GLvoid *values );
+
+GLAPI void GLAPIENTRY glGetMinmaxParameterfv( GLenum target, GLenum pname,
+                          GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetMinmaxParameteriv( GLenum target, GLenum pname,
+                          GLint *params );
+
+GLAPI void GLAPIENTRY glConvolutionFilter1D( GLenum target,
+    GLenum internalformat, GLsizei width, GLenum format, GLenum type,
+    const GLvoid *image );
+
+GLAPI void GLAPIENTRY glConvolutionFilter2D( GLenum target,
+    GLenum internalformat, GLsizei width, GLsizei height, GLenum format,
+    GLenum type, const GLvoid *image );
+
+GLAPI void GLAPIENTRY glConvolutionParameterf( GLenum target, GLenum pname,
+    GLfloat params );
+
+GLAPI void GLAPIENTRY glConvolutionParameterfv( GLenum target, GLenum pname,
+    const GLfloat *params );
+
+GLAPI void GLAPIENTRY glConvolutionParameteri( GLenum target, GLenum pname,
+    GLint params );
+
+GLAPI void GLAPIENTRY glConvolutionParameteriv( GLenum target, GLenum pname,
+    const GLint *params );
+
+GLAPI void GLAPIENTRY glCopyConvolutionFilter1D( GLenum target,
+    GLenum internalformat, GLint x, GLint y, GLsizei width );
+
+GLAPI void GLAPIENTRY glCopyConvolutionFilter2D( GLenum target,
+    GLenum internalformat, GLint x, GLint y, GLsizei width,
+    GLsizei height);
+
+GLAPI void GLAPIENTRY glGetConvolutionFilter( GLenum target, GLenum format,
+    GLenum type, GLvoid *image );
+
+GLAPI void GLAPIENTRY glGetConvolutionParameterfv( GLenum target, GLenum pname,
+    GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetConvolutionParameteriv( GLenum target, GLenum pname,
+    GLint *params );
+
+GLAPI void GLAPIENTRY glSeparableFilter2D( GLenum target,
+    GLenum internalformat, GLsizei width, GLsizei height, GLenum format,
+    GLenum type, const GLvoid *row, const GLvoid *column );
+
+GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format,
+    GLenum type, GLvoid *row, GLvoid *column, GLvoid *span );
+
+typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
+
+
+
+/*
+ * OpenGL 1.3
+ */
+
+/* multitexture */
+#define GL_TEXTURE0             0x84C0
+#define GL_TEXTURE1             0x84C1
+#define GL_TEXTURE2             0x84C2
+#define GL_TEXTURE3             0x84C3
+#define GL_TEXTURE4             0x84C4
+#define GL_TEXTURE5             0x84C5
+#define GL_TEXTURE6             0x84C6
+#define GL_TEXTURE7             0x84C7
+#define GL_TEXTURE8             0x84C8
+#define GL_TEXTURE9             0x84C9
+#define GL_TEXTURE10                0x84CA
+#define GL_TEXTURE11                0x84CB
+#define GL_TEXTURE12                0x84CC
+#define GL_TEXTURE13                0x84CD
+#define GL_TEXTURE14                0x84CE
+#define GL_TEXTURE15                0x84CF
+#define GL_TEXTURE16                0x84D0
+#define GL_TEXTURE17                0x84D1
+#define GL_TEXTURE18                0x84D2
+#define GL_TEXTURE19                0x84D3
+#define GL_TEXTURE20                0x84D4
+#define GL_TEXTURE21                0x84D5
+#define GL_TEXTURE22                0x84D6
+#define GL_TEXTURE23                0x84D7
+#define GL_TEXTURE24                0x84D8
+#define GL_TEXTURE25                0x84D9
+#define GL_TEXTURE26                0x84DA
+#define GL_TEXTURE27                0x84DB
+#define GL_TEXTURE28                0x84DC
+#define GL_TEXTURE29                0x84DD
+#define GL_TEXTURE30                0x84DE
+#define GL_TEXTURE31                0x84DF
+#define GL_ACTIVE_TEXTURE           0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE        0x84E1
+#define GL_MAX_TEXTURE_UNITS            0x84E2
+/* texture_cube_map */
+#define GL_NORMAL_MAP               0x8511
+#define GL_REFLECTION_MAP           0x8512
+#define GL_TEXTURE_CUBE_MAP         0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP     0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X      0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X      0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y      0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y      0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z      0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z      0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP       0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE        0x851C
+/* texture_compression */
+#define GL_COMPRESSED_ALPHA         0x84E9
+#define GL_COMPRESSED_LUMINANCE         0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA       0x84EB
+#define GL_COMPRESSED_INTENSITY         0x84EC
+#define GL_COMPRESSED_RGB           0x84ED
+#define GL_COMPRESSED_RGBA          0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT     0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE    0x86A0
+#define GL_TEXTURE_COMPRESSED           0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS   0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS       0x86A3
+/* multisample */
+#define GL_MULTISAMPLE              0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE     0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE          0x809F
+#define GL_SAMPLE_COVERAGE          0x80A0
+#define GL_SAMPLE_BUFFERS           0x80A8
+#define GL_SAMPLES              0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE        0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT       0x80AB
+#define GL_MULTISAMPLE_BIT          0x20000000
+/* transpose_matrix */
+#define GL_TRANSPOSE_MODELVIEW_MATRIX       0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX      0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX     0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX       0x84E6
+/* texture_env_combine */
+#define GL_COMBINE              0x8570
+#define GL_COMBINE_RGB              0x8571
+#define GL_COMBINE_ALPHA            0x8572
+#define GL_SOURCE0_RGB              0x8580
+#define GL_SOURCE1_RGB              0x8581
+#define GL_SOURCE2_RGB              0x8582
+#define GL_SOURCE0_ALPHA            0x8588
+#define GL_SOURCE1_ALPHA            0x8589
+#define GL_SOURCE2_ALPHA            0x858A
+#define GL_OPERAND0_RGB             0x8590
+#define GL_OPERAND1_RGB             0x8591
+#define GL_OPERAND2_RGB             0x8592
+#define GL_OPERAND0_ALPHA           0x8598
+#define GL_OPERAND1_ALPHA           0x8599
+#define GL_OPERAND2_ALPHA           0x859A
+#define GL_RGB_SCALE                0x8573
+#define GL_ADD_SIGNED               0x8574
+#define GL_INTERPOLATE              0x8575
+#define GL_SUBTRACT             0x84E7
+#define GL_CONSTANT             0x8576
+#define GL_PRIMARY_COLOR            0x8577
+#define GL_PREVIOUS             0x8578
+/* texture_env_dot3 */
+#define GL_DOT3_RGB             0x86AE
+#define GL_DOT3_RGBA                0x86AF
+/* texture_border_clamp */
+#define GL_CLAMP_TO_BORDER          0x812D
+
+GLAPI void GLAPIENTRY glActiveTexture( GLenum texture );
+
+GLAPI void GLAPIENTRY glClientActiveTexture( GLenum texture );
+
+GLAPI void GLAPIENTRY glCompressedTexImage1D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexImage2D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexImage3D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexSubImage1D( GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glGetCompressedTexImage( GLenum target, GLint lod, GLvoid *img );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1d( GLenum target, GLdouble s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1f( GLenum target, GLfloat s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1i( GLenum target, GLint s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1s( GLenum target, GLshort s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1sv( GLenum target, const GLshort *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2d( GLenum target, GLdouble s, GLdouble t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2f( GLenum target, GLfloat s, GLfloat t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2i( GLenum target, GLint s, GLint t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2s( GLenum target, GLshort s, GLshort t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2sv( GLenum target, const GLshort *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3d( GLenum target, GLdouble s, GLdouble t, GLdouble r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3f( GLenum target, GLfloat s, GLfloat t, GLfloat r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3i( GLenum target, GLint s, GLint t, GLint r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3s( GLenum target, GLshort s, GLshort t, GLshort r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3sv( GLenum target, const GLshort *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4d( GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4f( GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4i( GLenum target, GLint s, GLint t, GLint r, GLint q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4s( GLenum target, GLshort s, GLshort t, GLshort r, GLshort q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4sv( GLenum target, const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glLoadTransposeMatrixd( const GLdouble m[16] );
+
+GLAPI void GLAPIENTRY glLoadTransposeMatrixf( const GLfloat m[16] );
+
+GLAPI void GLAPIENTRY glMultTransposeMatrixd( const GLdouble m[16] );
+
+GLAPI void GLAPIENTRY glMultTransposeMatrixf( const GLfloat m[16] );
+
+GLAPI void GLAPIENTRY glSampleCoverage( GLclampf value, GLboolean invert );
+
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, void *img);
+
+
+/*
+ * GL_ARB_multitexture (ARB extension 1 and OpenGL 1.2.1)
+ */
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+
+#define GL_TEXTURE0_ARB             0x84C0
+#define GL_TEXTURE1_ARB             0x84C1
+#define GL_TEXTURE2_ARB             0x84C2
+#define GL_TEXTURE3_ARB             0x84C3
+#define GL_TEXTURE4_ARB             0x84C4
+#define GL_TEXTURE5_ARB             0x84C5
+#define GL_TEXTURE6_ARB             0x84C6
+#define GL_TEXTURE7_ARB             0x84C7
+#define GL_TEXTURE8_ARB             0x84C8
+#define GL_TEXTURE9_ARB             0x84C9
+#define GL_TEXTURE10_ARB            0x84CA
+#define GL_TEXTURE11_ARB            0x84CB
+#define GL_TEXTURE12_ARB            0x84CC
+#define GL_TEXTURE13_ARB            0x84CD
+#define GL_TEXTURE14_ARB            0x84CE
+#define GL_TEXTURE15_ARB            0x84CF
+#define GL_TEXTURE16_ARB            0x84D0
+#define GL_TEXTURE17_ARB            0x84D1
+#define GL_TEXTURE18_ARB            0x84D2
+#define GL_TEXTURE19_ARB            0x84D3
+#define GL_TEXTURE20_ARB            0x84D4
+#define GL_TEXTURE21_ARB            0x84D5
+#define GL_TEXTURE22_ARB            0x84D6
+#define GL_TEXTURE23_ARB            0x84D7
+#define GL_TEXTURE24_ARB            0x84D8
+#define GL_TEXTURE25_ARB            0x84D9
+#define GL_TEXTURE26_ARB            0x84DA
+#define GL_TEXTURE27_ARB            0x84DB
+#define GL_TEXTURE28_ARB            0x84DC
+#define GL_TEXTURE29_ARB            0x84DD
+#define GL_TEXTURE30_ARB            0x84DE
+#define GL_TEXTURE31_ARB            0x84DF
+#define GL_ACTIVE_TEXTURE_ARB           0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB        0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB        0x84E2
+
+GLAPI void GLAPIENTRY glActiveTextureARB(GLenum texture);
+GLAPI void GLAPIENTRY glClientActiveTextureARB(GLenum texture);
+GLAPI void GLAPIENTRY glMultiTexCoord1dARB(GLenum target, GLdouble s);
+GLAPI void GLAPIENTRY glMultiTexCoord1dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1fARB(GLenum target, GLfloat s);
+GLAPI void GLAPIENTRY glMultiTexCoord1fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1iARB(GLenum target, GLint s);
+GLAPI void GLAPIENTRY glMultiTexCoord1ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1sARB(GLenum target, GLshort s);
+GLAPI void GLAPIENTRY glMultiTexCoord1svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t);
+GLAPI void GLAPIENTRY glMultiTexCoord2dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t);
+GLAPI void GLAPIENTRY glMultiTexCoord2fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2iARB(GLenum target, GLint s, GLint t);
+GLAPI void GLAPIENTRY glMultiTexCoord2ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2sARB(GLenum target, GLshort s, GLshort t);
+GLAPI void GLAPIENTRY glMultiTexCoord2svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void GLAPIENTRY glMultiTexCoord3dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void GLAPIENTRY glMultiTexCoord3fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r);
+GLAPI void GLAPIENTRY glMultiTexCoord3ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void GLAPIENTRY glMultiTexCoord3svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void GLAPIENTRY glMultiTexCoord4dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void GLAPIENTRY glMultiTexCoord4fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void GLAPIENTRY glMultiTexCoord4ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void GLAPIENTRY glMultiTexCoord4svARB(GLenum target, const GLshort *v);
+
+typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+
+#endif /* GL_ARB_multitexture */
+
+
+
+/*
+ * Define this token if you want "old-style" header file behaviour (extensions
+ * defined in gl.h).  Otherwise, extensions will be included from glext.h.
+ */
+#if defined(GL_GLEXT_LEGACY)
+
+/* All extensions that used to be here are now found in glext.h */
+
+#else  /* GL_GLEXT_LEGACY */
+
+#include <GL/glext.h>
+
+#endif  /* GL_GLEXT_LEGACY */
+
+
+
+#if GL_ARB_shader_objects
+
+#ifndef GL_MESA_shader_debug
+#define GL_MESA_shader_debug 1
+
+#define GL_DEBUG_OBJECT_MESA              0x8759
+#define GL_DEBUG_PRINT_MESA               0x875A
+#define GL_DEBUG_ASSERT_MESA              0x875B
+
+GLAPI GLhandleARB GLAPIENTRY glCreateDebugObjectMESA (void);
+GLAPI void GLAPIENTRY glClearDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
+GLAPI void GLAPIENTRY glGetDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType, GLsizei maxLength,
+                                         GLsizei *length, GLcharARB *debugLog);
+GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
+
+#endif /* GL_MESA_shader_debug */
+
+#endif /* GL_ARB_shader_objects */
+
+
+/*
+ * ???. GL_MESA_packed_depth_stencil
+ * XXX obsolete
+ */
+#ifndef GL_MESA_packed_depth_stencil
+#define GL_MESA_packed_depth_stencil 1
+
+#define GL_DEPTH_STENCIL_MESA           0x8750
+#define GL_UNSIGNED_INT_24_8_MESA       0x8751
+#define GL_UNSIGNED_INT_8_24_REV_MESA       0x8752
+#define GL_UNSIGNED_SHORT_15_1_MESA     0x8753
+#define GL_UNSIGNED_SHORT_1_15_REV_MESA     0x8754
+
+#endif /* GL_MESA_packed_depth_stencil */
+
+
+#ifndef GL_MESA_program_debug
+#define GL_MESA_program_debug 1
+
+#define GL_FRAGMENT_PROGRAM_POSITION_MESA       0x8bb0
+#define GL_FRAGMENT_PROGRAM_CALLBACK_MESA       0x8bb1
+#define GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA  0x8bb2
+#define GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA  0x8bb3
+#define GL_VERTEX_PROGRAM_POSITION_MESA         0x8bb4
+#define GL_VERTEX_PROGRAM_CALLBACK_MESA         0x8bb5
+#define GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA    0x8bb6
+#define GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA    0x8bb7
+
+typedef void (*GLprogramcallbackMESA)(GLenum target, GLvoid *data);
+
+GLAPI void GLAPIENTRY glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback, GLvoid *data);
+
+GLAPI void GLAPIENTRY glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name, GLfloat *v);
+
+#endif /* GL_MESA_program_debug */
+
+
+#ifndef GL_ATI_blend_equation_separate
+#define GL_ATI_blend_equation_separate 1
+
+#define GL_ALPHA_BLEND_EQUATION_ATI         0x883D
+
+GLAPI void GLAPIENTRY glBlendEquationSeparateATI( GLenum modeRGB, GLenum modeA );
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLenum modeA);
+
+#endif /* GL_ATI_blend_equation_separate */
+
+
+
+/**
+ ** NOTE!!!!!  If you add new functions to this file, or update
+ ** glext.h be sure to regenerate the gl_mangle.h file.  See comments
+ ** in that file for details.
+ **/
+
+
+
+/**********************************************************************
+ * Begin system-specific stuff
+ */
+#if defined(PRAGMA_EXPORT_SUPPORTED)
+#pragma export off
+#endif
+
+#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
+#pragma import off
+#endif
+/*
+ * End system-specific stuff
+ **********************************************************************/
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gl_h_ */
diff --git a/Mesa/inc/gl_mangle.h b/Mesa/inc/gl_mangle.h
new file mode 100644
index 000000000000..369b8a0fc6d5
--- /dev/null
+++ b/Mesa/inc/gl_mangle.h
@@ -0,0 +1,1568 @@
+#if 0
+#define GL_MANGLE_C1 "DO NOT EDIT!!! - TO REGENERATE from gl.h, EXECUTE THIS FILE IN SHELL (/bin/sh) and save the output"
+#define GL_MANGLE_C2 "This file is used to create GL function protypes and aliases for the function names"
+    files="gl.h glext.h"
+#define GL_MANGLE_C3 "get regeneration header - copy everything in this file above the 'REGENERATE_TO_END' line"
+    awk     '!done; /^\/\*REGENERATE_TO_END/ {done=1}' $0
+    echo ""
+#define GL_MANGLE_C4 get aliases
+    grep '^GLAPI' $files | sed -e 's/.*ENTRY gl\([^( ]*\).*$/#define gl\1       MANGLE(\1)/' | sort | uniq
+    echo ""
+    echo "#endif /* GL_MANGLE_H */"
+    exit
+#endif /* REGENERATION */
+
+/*
+ * If you compile Mesa with USE_MGL_NAMESPACE defined then you can link
+ * your application both with OpenGL and Mesa.  The Mesa functions will
+ * be redefined so they are prefixed with "mgl" instead of "gl".
+ * Mgl contributed by Randy Frank (rfrank@rsinc.com)
+ * Regneration code contributed by Ray Tice (rayt@ma.ultra.net)
+ */
+
+#ifndef GL_MANGLE_H
+#define GL_MANGLE_H
+
+#ifndef   MANGLE
+#define   MANGLE(x) mgl##x
+#endif  /*MANGLE*/
+
+/*REGENERATE_TO_END-----------ALL LINES BELOW HERE GET REPLACED ON REGENERATION */
+
+#define glAccum     MANGLE(Accum)
+#define glActiveStencilFaceEXT      MANGLE(ActiveStencilFaceEXT)
+#define glActiveTextureARB      MANGLE(ActiveTextureARB)
+#define glActiveTexture     MANGLE(ActiveTexture)
+#define glActiveVaryingNV       MANGLE(ActiveVaryingNV)
+#define glAlphaFragmentOp1ATI       MANGLE(AlphaFragmentOp1ATI)
+#define glAlphaFragmentOp2ATI       MANGLE(AlphaFragmentOp2ATI)
+#define glAlphaFragmentOp3ATI       MANGLE(AlphaFragmentOp3ATI)
+#define glAlphaFunc     MANGLE(AlphaFunc)
+#define glApplyTextureEXT       MANGLE(ApplyTextureEXT)
+#define glAreProgramsResidentNV     MANGLE(AreProgramsResidentNV)
+#define glAreTexturesResidentEXT        MANGLE(AreTexturesResidentEXT)
+#define glAreTexturesResident       MANGLE(AreTexturesResident)
+#define glArrayElementEXT       MANGLE(ArrayElementEXT)
+#define glArrayElement      MANGLE(ArrayElement)
+#define glArrayObjectATI        MANGLE(ArrayObjectATI)
+#define glAsyncMarkerSGIX       MANGLE(AsyncMarkerSGIX)
+#define glAttachObjectARB       MANGLE(AttachObjectARB)
+#define glAttachShader      MANGLE(AttachShader)
+#define glBeginFragmentShaderATI        MANGLE(BeginFragmentShaderATI)
+#define glBegin     MANGLE(Begin)
+#define glBeginOcclusionQueryNV     MANGLE(BeginOcclusionQueryNV)
+#define glBeginQueryARB     MANGLE(BeginQueryARB)
+#define glBeginQuery        MANGLE(BeginQuery)
+#define glBeginTransformFeedbackNV      MANGLE(BeginTransformFeedbackNV)
+#define glBeginVertexShaderEXT      MANGLE(BeginVertexShaderEXT)
+#define glBindAttribLocationARB     MANGLE(BindAttribLocationARB)
+#define glBindAttribLocation        MANGLE(BindAttribLocation)
+#define glBindBufferARB     MANGLE(BindBufferARB)
+#define glBindBufferBaseNV      MANGLE(BindBufferBaseNV)
+#define glBindBuffer        MANGLE(BindBuffer)
+#define glBindBufferOffsetNV        MANGLE(BindBufferOffsetNV)
+#define glBindBufferRangeNV     MANGLE(BindBufferRangeNV)
+#define glBindFragDataLocationEXT       MANGLE(BindFragDataLocationEXT)
+#define glBindFragmentShaderATI     MANGLE(BindFragmentShaderATI)
+#define glBindFramebufferEXT        MANGLE(BindFramebufferEXT)
+#define glBindLightParameterEXT     MANGLE(BindLightParameterEXT)
+#define glBindMaterialParameterEXT      MANGLE(BindMaterialParameterEXT)
+#define glBindParameterEXT      MANGLE(BindParameterEXT)
+#define glBindProgramARB        MANGLE(BindProgramARB)
+#define glBindProgramNV     MANGLE(BindProgramNV)
+#define glBindRenderbufferEXT       MANGLE(BindRenderbufferEXT)
+#define glBindTexGenParameterEXT        MANGLE(BindTexGenParameterEXT)
+#define glBindTextureEXT        MANGLE(BindTextureEXT)
+#define glBindTexture       MANGLE(BindTexture)
+#define glBindTextureUnitParameterEXT       MANGLE(BindTextureUnitParameterEXT)
+#define glBindVertexArrayAPPLE      MANGLE(BindVertexArrayAPPLE)
+#define glBindVertexShaderEXT       MANGLE(BindVertexShaderEXT)
+#define glBinormal3bEXT     MANGLE(Binormal3bEXT)
+#define glBinormal3bvEXT        MANGLE(Binormal3bvEXT)
+#define glBinormal3dEXT     MANGLE(Binormal3dEXT)
+#define glBinormal3dvEXT        MANGLE(Binormal3dvEXT)
+#define glBinormal3fEXT     MANGLE(Binormal3fEXT)
+#define glBinormal3fvEXT        MANGLE(Binormal3fvEXT)
+#define glBinormal3iEXT     MANGLE(Binormal3iEXT)
+#define glBinormal3ivEXT        MANGLE(Binormal3ivEXT)
+#define glBinormal3sEXT     MANGLE(Binormal3sEXT)
+#define glBinormal3svEXT        MANGLE(Binormal3svEXT)
+#define glBinormalPointerEXT        MANGLE(BinormalPointerEXT)
+#define glBitmap        MANGLE(Bitmap)
+#define glBlendColorEXT     MANGLE(BlendColorEXT)
+#define glBlendColor        MANGLE(BlendColor)
+#define glBlendEquationEXT      MANGLE(BlendEquationEXT)
+#define glBlendEquation     MANGLE(BlendEquation)
+#define glBlendEquationSeparateATI      MANGLE(BlendEquationSeparateATI)
+#define glBlendEquationSeparateEXT      MANGLE(BlendEquationSeparateEXT)
+#define glBlendEquationSeparate     MANGLE(BlendEquationSeparate)
+#define glBlendFunc     MANGLE(BlendFunc)
+#define glBlendFuncSeparateEXT      MANGLE(BlendFuncSeparateEXT)
+#define glBlendFuncSeparateINGR     MANGLE(BlendFuncSeparateINGR)
+#define glBlendFuncSeparate     MANGLE(BlendFuncSeparate)
+#define glBlitFramebufferEXT        MANGLE(BlitFramebufferEXT)
+#define glBufferDataARB     MANGLE(BufferDataARB)
+#define glBufferData        MANGLE(BufferData)
+#define glBufferParameteriAPPLE     MANGLE(BufferParameteriAPPLE)
+#define glBufferSubDataARB      MANGLE(BufferSubDataARB)
+#define glBufferSubData     MANGLE(BufferSubData)
+#define glCallList      MANGLE(CallList)
+#define glCallLists     MANGLE(CallLists)
+#define glCheckFramebufferStatusEXT     MANGLE(CheckFramebufferStatusEXT)
+#define glClampColorARB     MANGLE(ClampColorARB)
+#define glClearAccum        MANGLE(ClearAccum)
+#define glClearColorIiEXT       MANGLE(ClearColorIiEXT)
+#define glClearColorIuiEXT      MANGLE(ClearColorIuiEXT)
+#define glClearColor        MANGLE(ClearColor)
+#define glClearDebugLogMESA     MANGLE(ClearDebugLogMESA)
+#define glClearDepthdNV     MANGLE(ClearDepthdNV)
+#define glClearDepth        MANGLE(ClearDepth)
+#define glClearIndex        MANGLE(ClearIndex)
+#define glClear     MANGLE(Clear)
+#define glClearStencil      MANGLE(ClearStencil)
+#define glClientActiveTextureARB        MANGLE(ClientActiveTextureARB)
+#define glClientActiveTexture       MANGLE(ClientActiveTexture)
+#define glClientActiveVertexStreamATI       MANGLE(ClientActiveVertexStreamATI)
+#define glClipPlane     MANGLE(ClipPlane)
+#define glColor3b       MANGLE(Color3b)
+#define glColor3bv      MANGLE(Color3bv)
+#define glColor3d       MANGLE(Color3d)
+#define glColor3dv      MANGLE(Color3dv)
+#define glColor3f       MANGLE(Color3f)
+#define glColor3fVertex3fSUN        MANGLE(Color3fVertex3fSUN)
+#define glColor3fVertex3fvSUN       MANGLE(Color3fVertex3fvSUN)
+#define glColor3fv      MANGLE(Color3fv)
+#define glColor3hNV     MANGLE(Color3hNV)
+#define glColor3hvNV        MANGLE(Color3hvNV)
+#define glColor3i       MANGLE(Color3i)
+#define glColor3iv      MANGLE(Color3iv)
+#define glColor3s       MANGLE(Color3s)
+#define glColor3sv      MANGLE(Color3sv)
+#define glColor3ub      MANGLE(Color3ub)
+#define glColor3ubv     MANGLE(Color3ubv)
+#define glColor3ui      MANGLE(Color3ui)
+#define glColor3uiv     MANGLE(Color3uiv)
+#define glColor3us      MANGLE(Color3us)
+#define glColor3usv     MANGLE(Color3usv)
+#define glColor4b       MANGLE(Color4b)
+#define glColor4bv      MANGLE(Color4bv)
+#define glColor4d       MANGLE(Color4d)
+#define glColor4dv      MANGLE(Color4dv)
+#define glColor4f       MANGLE(Color4f)
+#define glColor4fNormal3fVertex3fSUN        MANGLE(Color4fNormal3fVertex3fSUN)
+#define glColor4fNormal3fVertex3fvSUN       MANGLE(Color4fNormal3fVertex3fvSUN)
+#define glColor4fv      MANGLE(Color4fv)
+#define glColor4hNV     MANGLE(Color4hNV)
+#define glColor4hvNV        MANGLE(Color4hvNV)
+#define glColor4i       MANGLE(Color4i)
+#define glColor4iv      MANGLE(Color4iv)
+#define glColor4s       MANGLE(Color4s)
+#define glColor4sv      MANGLE(Color4sv)
+#define glColor4ub      MANGLE(Color4ub)
+#define glColor4ubVertex2fSUN       MANGLE(Color4ubVertex2fSUN)
+#define glColor4ubVertex2fvSUN      MANGLE(Color4ubVertex2fvSUN)
+#define glColor4ubVertex3fSUN       MANGLE(Color4ubVertex3fSUN)
+#define glColor4ubVertex3fvSUN      MANGLE(Color4ubVertex3fvSUN)
+#define glColor4ubv     MANGLE(Color4ubv)
+#define glColor4ui      MANGLE(Color4ui)
+#define glColor4uiv     MANGLE(Color4uiv)
+#define glColor4us      MANGLE(Color4us)
+#define glColor4usv     MANGLE(Color4usv)
+#define glColorFragmentOp1ATI       MANGLE(ColorFragmentOp1ATI)
+#define glColorFragmentOp2ATI       MANGLE(ColorFragmentOp2ATI)
+#define glColorFragmentOp3ATI       MANGLE(ColorFragmentOp3ATI)
+#define glColorMaskIndexedEXT       MANGLE(ColorMaskIndexedEXT)
+#define glColorMask     MANGLE(ColorMask)
+#define glColorMaterial     MANGLE(ColorMaterial)
+#define glColorPointerEXT       MANGLE(ColorPointerEXT)
+#define glColorPointerListIBM       MANGLE(ColorPointerListIBM)
+#define glColorPointer      MANGLE(ColorPointer)
+#define glColorPointervINTEL        MANGLE(ColorPointervINTEL)
+#define glColorSubTableEXT      MANGLE(ColorSubTableEXT)
+#define glColorSubTable     MANGLE(ColorSubTable)
+#define glColorTableEXT     MANGLE(ColorTableEXT)
+#define glColorTable        MANGLE(ColorTable)
+#define glColorTableParameterfv     MANGLE(ColorTableParameterfv)
+#define glColorTableParameterfvSGI      MANGLE(ColorTableParameterfvSGI)
+#define glColorTableParameteriv     MANGLE(ColorTableParameteriv)
+#define glColorTableParameterivSGI      MANGLE(ColorTableParameterivSGI)
+#define glColorTableSGI     MANGLE(ColorTableSGI)
+#define glCombinerInputNV       MANGLE(CombinerInputNV)
+#define glCombinerOutputNV      MANGLE(CombinerOutputNV)
+#define glCombinerParameterfNV      MANGLE(CombinerParameterfNV)
+#define glCombinerParameterfvNV     MANGLE(CombinerParameterfvNV)
+#define glCombinerParameteriNV      MANGLE(CombinerParameteriNV)
+#define glCombinerParameterivNV     MANGLE(CombinerParameterivNV)
+#define glCombinerStageParameterfvNV        MANGLE(CombinerStageParameterfvNV)
+#define glCompileShaderARB      MANGLE(CompileShaderARB)
+#define glCompileShader     MANGLE(CompileShader)
+#define glCompressedTexImage1DARB       MANGLE(CompressedTexImage1DARB)
+#define glCompressedTexImage1D      MANGLE(CompressedTexImage1D)
+#define glCompressedTexImage2DARB       MANGLE(CompressedTexImage2DARB)
+#define glCompressedTexImage2D      MANGLE(CompressedTexImage2D)
+#define glCompressedTexImage3DARB       MANGLE(CompressedTexImage3DARB)
+#define glCompressedTexImage3D      MANGLE(CompressedTexImage3D)
+#define glCompressedTexSubImage1DARB        MANGLE(CompressedTexSubImage1DARB)
+#define glCompressedTexSubImage1D       MANGLE(CompressedTexSubImage1D)
+#define glCompressedTexSubImage2DARB        MANGLE(CompressedTexSubImage2DARB)
+#define glCompressedTexSubImage2D       MANGLE(CompressedTexSubImage2D)
+#define glCompressedTexSubImage3DARB        MANGLE(CompressedTexSubImage3DARB)
+#define glCompressedTexSubImage3D       MANGLE(CompressedTexSubImage3D)
+#define glConvolutionFilter1DEXT        MANGLE(ConvolutionFilter1DEXT)
+#define glConvolutionFilter1D       MANGLE(ConvolutionFilter1D)
+#define glConvolutionFilter2DEXT        MANGLE(ConvolutionFilter2DEXT)
+#define glConvolutionFilter2D       MANGLE(ConvolutionFilter2D)
+#define glConvolutionParameterfEXT      MANGLE(ConvolutionParameterfEXT)
+#define glConvolutionParameterf     MANGLE(ConvolutionParameterf)
+#define glConvolutionParameterfvEXT     MANGLE(ConvolutionParameterfvEXT)
+#define glConvolutionParameterfv        MANGLE(ConvolutionParameterfv)
+#define glConvolutionParameteriEXT      MANGLE(ConvolutionParameteriEXT)
+#define glConvolutionParameteri     MANGLE(ConvolutionParameteri)
+#define glConvolutionParameterivEXT     MANGLE(ConvolutionParameterivEXT)
+#define glConvolutionParameteriv        MANGLE(ConvolutionParameteriv)
+#define glCopyColorSubTableEXT      MANGLE(CopyColorSubTableEXT)
+#define glCopyColorSubTable     MANGLE(CopyColorSubTable)
+#define glCopyColorTable        MANGLE(CopyColorTable)
+#define glCopyColorTableSGI     MANGLE(CopyColorTableSGI)
+#define glCopyConvolutionFilter1DEXT        MANGLE(CopyConvolutionFilter1DEXT)
+#define glCopyConvolutionFilter1D       MANGLE(CopyConvolutionFilter1D)
+#define glCopyConvolutionFilter2DEXT        MANGLE(CopyConvolutionFilter2DEXT)
+#define glCopyConvolutionFilter2D       MANGLE(CopyConvolutionFilter2D)
+#define glCopyPixels        MANGLE(CopyPixels)
+#define glCopyTexImage1DEXT     MANGLE(CopyTexImage1DEXT)
+#define glCopyTexImage1D        MANGLE(CopyTexImage1D)
+#define glCopyTexImage2DEXT     MANGLE(CopyTexImage2DEXT)
+#define glCopyTexImage2D        MANGLE(CopyTexImage2D)
+#define glCopyTexSubImage1DEXT      MANGLE(CopyTexSubImage1DEXT)
+#define glCopyTexSubImage1D     MANGLE(CopyTexSubImage1D)
+#define glCopyTexSubImage2DEXT      MANGLE(CopyTexSubImage2DEXT)
+#define glCopyTexSubImage2D     MANGLE(CopyTexSubImage2D)
+#define glCopyTexSubImage3DEXT      MANGLE(CopyTexSubImage3DEXT)
+#define glCopyTexSubImage3D     MANGLE(CopyTexSubImage3D)
+#define glCreateDebugObjectMESA     MANGLE(CreateDebugObjectMESA)
+#define glCreateProgram     MANGLE(CreateProgram)
+#define glCreateProgramObjectARB        MANGLE(CreateProgramObjectARB)
+#define glCreateShader      MANGLE(CreateShader)
+#define glCreateShaderObjectARB     MANGLE(CreateShaderObjectARB)
+#define glCullFace      MANGLE(CullFace)
+#define glCullParameterdvEXT        MANGLE(CullParameterdvEXT)
+#define glCullParameterfvEXT        MANGLE(CullParameterfvEXT)
+#define glCurrentPaletteMatrixARB       MANGLE(CurrentPaletteMatrixARB)
+#define glDeformationMap3dSGIX      MANGLE(DeformationMap3dSGIX)
+#define glDeformationMap3fSGIX      MANGLE(DeformationMap3fSGIX)
+#define glDeformSGIX        MANGLE(DeformSGIX)
+#define glDeleteAsyncMarkersSGIX        MANGLE(DeleteAsyncMarkersSGIX)
+#define glDeleteBuffersARB      MANGLE(DeleteBuffersARB)
+#define glDeleteBuffers     MANGLE(DeleteBuffers)
+#define glDeleteFencesAPPLE     MANGLE(DeleteFencesAPPLE)
+#define glDeleteFencesNV        MANGLE(DeleteFencesNV)
+#define glDeleteFragmentShaderATI       MANGLE(DeleteFragmentShaderATI)
+#define glDeleteFramebuffersEXT     MANGLE(DeleteFramebuffersEXT)
+#define glDeleteLists       MANGLE(DeleteLists)
+#define glDeleteObjectARB       MANGLE(DeleteObjectARB)
+#define glDeleteOcclusionQueriesNV      MANGLE(DeleteOcclusionQueriesNV)
+#define glDeleteProgram     MANGLE(DeleteProgram)
+#define glDeleteProgramsARB     MANGLE(DeleteProgramsARB)
+#define glDeleteProgramsNV      MANGLE(DeleteProgramsNV)
+#define glDeleteQueriesARB      MANGLE(DeleteQueriesARB)
+#define glDeleteQueries     MANGLE(DeleteQueries)
+#define glDeleteRenderbuffersEXT        MANGLE(DeleteRenderbuffersEXT)
+#define glDeleteShader      MANGLE(DeleteShader)
+#define glDeleteTexturesEXT     MANGLE(DeleteTexturesEXT)
+#define glDeleteTextures        MANGLE(DeleteTextures)
+#define glDeleteVertexArraysAPPLE       MANGLE(DeleteVertexArraysAPPLE)
+#define glDeleteVertexShaderEXT     MANGLE(DeleteVertexShaderEXT)
+#define glDepthBoundsdNV        MANGLE(DepthBoundsdNV)
+#define glDepthBoundsEXT        MANGLE(DepthBoundsEXT)
+#define glDepthFunc     MANGLE(DepthFunc)
+#define glDepthMask     MANGLE(DepthMask)
+#define glDepthRangedNV     MANGLE(DepthRangedNV)
+#define glDepthRange        MANGLE(DepthRange)
+#define glDetachObjectARB       MANGLE(DetachObjectARB)
+#define glDetachShader      MANGLE(DetachShader)
+#define glDetailTexFuncSGIS     MANGLE(DetailTexFuncSGIS)
+#define glDisableClientState        MANGLE(DisableClientState)
+#define glDisableIndexedEXT     MANGLE(DisableIndexedEXT)
+#define glDisable       MANGLE(Disable)
+#define glDisableVariantClientStateEXT      MANGLE(DisableVariantClientStateEXT)
+#define glDisableVertexAttribArrayARB       MANGLE(DisableVertexAttribArrayARB)
+#define glDisableVertexAttribArray      MANGLE(DisableVertexAttribArray)
+#define glDrawArraysEXT     MANGLE(DrawArraysEXT)
+#define glDrawArraysInstancedEXT        MANGLE(DrawArraysInstancedEXT)
+#define glDrawArrays        MANGLE(DrawArrays)
+#define glDrawBuffer        MANGLE(DrawBuffer)
+#define glDrawBuffersARB        MANGLE(DrawBuffersARB)
+#define glDrawBuffersATI        MANGLE(DrawBuffersATI)
+#define glDrawBuffers       MANGLE(DrawBuffers)
+#define glDrawElementArrayAPPLE     MANGLE(DrawElementArrayAPPLE)
+#define glDrawElementArrayATI       MANGLE(DrawElementArrayATI)
+#define glDrawElementsInstancedEXT      MANGLE(DrawElementsInstancedEXT)
+#define glDrawElements      MANGLE(DrawElements)
+#define glDrawMeshArraysSUN     MANGLE(DrawMeshArraysSUN)
+#define glDrawPixels        MANGLE(DrawPixels)
+#define glDrawRangeElementArrayAPPLE        MANGLE(DrawRangeElementArrayAPPLE)
+#define glDrawRangeElementArrayATI      MANGLE(DrawRangeElementArrayATI)
+#define glDrawRangeElementsEXT      MANGLE(DrawRangeElementsEXT)
+#define glDrawRangeElements     MANGLE(DrawRangeElements)
+#define glEdgeFlag      MANGLE(EdgeFlag)
+#define glEdgeFlagPointerEXT        MANGLE(EdgeFlagPointerEXT)
+#define glEdgeFlagPointerListIBM        MANGLE(EdgeFlagPointerListIBM)
+#define glEdgeFlagPointer       MANGLE(EdgeFlagPointer)
+#define glEdgeFlagv     MANGLE(EdgeFlagv)
+#define glElementPointerAPPLE       MANGLE(ElementPointerAPPLE)
+#define glElementPointerATI     MANGLE(ElementPointerATI)
+#define glEnableClientState     MANGLE(EnableClientState)
+#define glEnableIndexedEXT      MANGLE(EnableIndexedEXT)
+#define glEnable        MANGLE(Enable)
+#define glEnableVariantClientStateEXT       MANGLE(EnableVariantClientStateEXT)
+#define glEnableVertexAttribArrayARB        MANGLE(EnableVertexAttribArrayARB)
+#define glEnableVertexAttribArray       MANGLE(EnableVertexAttribArray)
+#define glEndFragmentShaderATI      MANGLE(EndFragmentShaderATI)
+#define glEndList       MANGLE(EndList)
+#define glEnd       MANGLE(End)
+#define glEndOcclusionQueryNV       MANGLE(EndOcclusionQueryNV)
+#define glEndQueryARB       MANGLE(EndQueryARB)
+#define glEndQuery      MANGLE(EndQuery)
+#define glEndTransformFeedbackNV        MANGLE(EndTransformFeedbackNV)
+#define glEndVertexShaderEXT        MANGLE(EndVertexShaderEXT)
+#define glEvalCoord1d       MANGLE(EvalCoord1d)
+#define glEvalCoord1dv      MANGLE(EvalCoord1dv)
+#define glEvalCoord1f       MANGLE(EvalCoord1f)
+#define glEvalCoord1fv      MANGLE(EvalCoord1fv)
+#define glEvalCoord2d       MANGLE(EvalCoord2d)
+#define glEvalCoord2dv      MANGLE(EvalCoord2dv)
+#define glEvalCoord2f       MANGLE(EvalCoord2f)
+#define glEvalCoord2fv      MANGLE(EvalCoord2fv)
+#define glEvalMapsNV        MANGLE(EvalMapsNV)
+#define glEvalMesh1     MANGLE(EvalMesh1)
+#define glEvalMesh2     MANGLE(EvalMesh2)
+#define glEvalPoint1        MANGLE(EvalPoint1)
+#define glEvalPoint2        MANGLE(EvalPoint2)
+#define glExecuteProgramNV      MANGLE(ExecuteProgramNV)
+#define glExtractComponentEXT       MANGLE(ExtractComponentEXT)
+#define glFeedbackBuffer        MANGLE(FeedbackBuffer)
+#define glFinalCombinerInputNV      MANGLE(FinalCombinerInputNV)
+#define glFinishAsyncSGIX       MANGLE(FinishAsyncSGIX)
+#define glFinishFenceAPPLE      MANGLE(FinishFenceAPPLE)
+#define glFinishFenceNV     MANGLE(FinishFenceNV)
+#define glFinish        MANGLE(Finish)
+#define glFinishObjectAPPLE     MANGLE(FinishObjectAPPLE)
+#define glFinishTextureSUNX     MANGLE(FinishTextureSUNX)
+#define glFlush     MANGLE(Flush)
+#define glFlushMappedBufferRangeAPPLE       MANGLE(FlushMappedBufferRangeAPPLE)
+#define glFlushPixelDataRangeNV     MANGLE(FlushPixelDataRangeNV)
+#define glFlushRasterSGIX       MANGLE(FlushRasterSGIX)
+#define glFlushVertexArrayRangeAPPLE        MANGLE(FlushVertexArrayRangeAPPLE)
+#define glFlushVertexArrayRangeNV       MANGLE(FlushVertexArrayRangeNV)
+#define glFogCoorddEXT      MANGLE(FogCoorddEXT)
+#define glFogCoordd     MANGLE(FogCoordd)
+#define glFogCoorddvEXT     MANGLE(FogCoorddvEXT)
+#define glFogCoorddv        MANGLE(FogCoorddv)
+#define glFogCoordfEXT      MANGLE(FogCoordfEXT)
+#define glFogCoordf     MANGLE(FogCoordf)
+#define glFogCoordfvEXT     MANGLE(FogCoordfvEXT)
+#define glFogCoordfv        MANGLE(FogCoordfv)
+#define glFogCoordhNV       MANGLE(FogCoordhNV)
+#define glFogCoordhvNV      MANGLE(FogCoordhvNV)
+#define glFogCoordPointerEXT        MANGLE(FogCoordPointerEXT)
+#define glFogCoordPointerListIBM        MANGLE(FogCoordPointerListIBM)
+#define glFogCoordPointer       MANGLE(FogCoordPointer)
+#define glFogf      MANGLE(Fogf)
+#define glFogFuncSGIS       MANGLE(FogFuncSGIS)
+#define glFogfv     MANGLE(Fogfv)
+#define glFogi      MANGLE(Fogi)
+#define glFogiv     MANGLE(Fogiv)
+#define glFragmentColorMaterialSGIX     MANGLE(FragmentColorMaterialSGIX)
+#define glFragmentLightfSGIX        MANGLE(FragmentLightfSGIX)
+#define glFragmentLightfvSGIX       MANGLE(FragmentLightfvSGIX)
+#define glFragmentLightiSGIX        MANGLE(FragmentLightiSGIX)
+#define glFragmentLightivSGIX       MANGLE(FragmentLightivSGIX)
+#define glFragmentLightModelfSGIX       MANGLE(FragmentLightModelfSGIX)
+#define glFragmentLightModelfvSGIX      MANGLE(FragmentLightModelfvSGIX)
+#define glFragmentLightModeliSGIX       MANGLE(FragmentLightModeliSGIX)
+#define glFragmentLightModelivSGIX      MANGLE(FragmentLightModelivSGIX)
+#define glFragmentMaterialfSGIX     MANGLE(FragmentMaterialfSGIX)
+#define glFragmentMaterialfvSGIX        MANGLE(FragmentMaterialfvSGIX)
+#define glFragmentMaterialiSGIX     MANGLE(FragmentMaterialiSGIX)
+#define glFragmentMaterialivSGIX        MANGLE(FragmentMaterialivSGIX)
+#define glFramebufferRenderbufferEXT        MANGLE(FramebufferRenderbufferEXT)
+#define glFramebufferTexture1DEXT       MANGLE(FramebufferTexture1DEXT)
+#define glFramebufferTexture2DEXT       MANGLE(FramebufferTexture2DEXT)
+#define glFramebufferTexture3DEXT       MANGLE(FramebufferTexture3DEXT)
+#define glFramebufferTextureEXT     MANGLE(FramebufferTextureEXT)
+#define glFramebufferTextureFaceEXT     MANGLE(FramebufferTextureFaceEXT)
+#define glFramebufferTextureLayerEXT        MANGLE(FramebufferTextureLayerEXT)
+#define glFrameZoomSGIX     MANGLE(FrameZoomSGIX)
+#define glFreeObjectBufferATI       MANGLE(FreeObjectBufferATI)
+#define glFrontFace     MANGLE(FrontFace)
+#define glFrustum       MANGLE(Frustum)
+#define glGenAsyncMarkersSGIX       MANGLE(GenAsyncMarkersSGIX)
+#define glGenBuffersARB     MANGLE(GenBuffersARB)
+#define glGenBuffers        MANGLE(GenBuffers)
+#define glGenerateMipmapEXT     MANGLE(GenerateMipmapEXT)
+#define glGenFencesAPPLE        MANGLE(GenFencesAPPLE)
+#define glGenFencesNV       MANGLE(GenFencesNV)
+#define glGenFragmentShadersATI     MANGLE(GenFragmentShadersATI)
+#define glGenFramebuffersEXT        MANGLE(GenFramebuffersEXT)
+#define glGenLists      MANGLE(GenLists)
+#define glGenOcclusionQueriesNV     MANGLE(GenOcclusionQueriesNV)
+#define glGenProgramsARB        MANGLE(GenProgramsARB)
+#define glGenProgramsNV     MANGLE(GenProgramsNV)
+#define glGenQueriesARB     MANGLE(GenQueriesARB)
+#define glGenQueries        MANGLE(GenQueries)
+#define glGenRenderbuffersEXT       MANGLE(GenRenderbuffersEXT)
+#define glGenSymbolsEXT     MANGLE(GenSymbolsEXT)
+#define glGenTexturesEXT        MANGLE(GenTexturesEXT)
+#define glGenTextures       MANGLE(GenTextures)
+#define glGenVertexArraysAPPLE      MANGLE(GenVertexArraysAPPLE)
+#define glGenVertexShadersEXT       MANGLE(GenVertexShadersEXT)
+#define glGetActiveAttribARB        MANGLE(GetActiveAttribARB)
+#define glGetActiveAttrib       MANGLE(GetActiveAttrib)
+#define glGetActiveUniformARB       MANGLE(GetActiveUniformARB)
+#define glGetActiveUniform      MANGLE(GetActiveUniform)
+#define glGetActiveVaryingNV        MANGLE(GetActiveVaryingNV)
+#define glGetArrayObjectfvATI       MANGLE(GetArrayObjectfvATI)
+#define glGetArrayObjectivATI       MANGLE(GetArrayObjectivATI)
+#define glGetAttachedObjectsARB     MANGLE(GetAttachedObjectsARB)
+#define glGetAttachedShaders        MANGLE(GetAttachedShaders)
+#define glGetAttribLocationARB      MANGLE(GetAttribLocationARB)
+#define glGetAttribLocation     MANGLE(GetAttribLocation)
+#define glGetBooleanIndexedvEXT     MANGLE(GetBooleanIndexedvEXT)
+#define glGetBooleanv       MANGLE(GetBooleanv)
+#define glGetBufferParameterivARB       MANGLE(GetBufferParameterivARB)
+#define glGetBufferParameteriv      MANGLE(GetBufferParameteriv)
+#define glGetBufferPointervARB      MANGLE(GetBufferPointervARB)
+#define glGetBufferPointerv     MANGLE(GetBufferPointerv)
+#define glGetBufferSubDataARB       MANGLE(GetBufferSubDataARB)
+#define glGetBufferSubData      MANGLE(GetBufferSubData)
+#define glGetClipPlane      MANGLE(GetClipPlane)
+#define glGetColorTableEXT      MANGLE(GetColorTableEXT)
+#define glGetColorTable     MANGLE(GetColorTable)
+#define glGetColorTableParameterfvEXT       MANGLE(GetColorTableParameterfvEXT)
+#define glGetColorTableParameterfv      MANGLE(GetColorTableParameterfv)
+#define glGetColorTableParameterfvSGI       MANGLE(GetColorTableParameterfvSGI)
+#define glGetColorTableParameterivEXT       MANGLE(GetColorTableParameterivEXT)
+#define glGetColorTableParameteriv      MANGLE(GetColorTableParameteriv)
+#define glGetColorTableParameterivSGI       MANGLE(GetColorTableParameterivSGI)
+#define glGetColorTableSGI      MANGLE(GetColorTableSGI)
+#define glGetCombinerInputParameterfvNV     MANGLE(GetCombinerInputParameterfvNV)
+#define glGetCombinerInputParameterivNV     MANGLE(GetCombinerInputParameterivNV)
+#define glGetCombinerOutputParameterfvNV        MANGLE(GetCombinerOutputParameterfvNV)
+#define glGetCombinerOutputParameterivNV        MANGLE(GetCombinerOutputParameterivNV)
+#define glGetCombinerStageParameterfvNV     MANGLE(GetCombinerStageParameterfvNV)
+#define glGetCompressedTexImageARB      MANGLE(GetCompressedTexImageARB)
+#define glGetCompressedTexImage     MANGLE(GetCompressedTexImage)
+#define glGetConvolutionFilterEXT       MANGLE(GetConvolutionFilterEXT)
+#define glGetConvolutionFilter      MANGLE(GetConvolutionFilter)
+#define glGetConvolutionParameterfvEXT      MANGLE(GetConvolutionParameterfvEXT)
+#define glGetConvolutionParameterfv     MANGLE(GetConvolutionParameterfv)
+#define glGetConvolutionParameterivEXT      MANGLE(GetConvolutionParameterivEXT)
+#define glGetConvolutionParameteriv     MANGLE(GetConvolutionParameteriv)
+#define glGetDebugLogLengthMESA     MANGLE(GetDebugLogLengthMESA)
+#define glGetDebugLogMESA       MANGLE(GetDebugLogMESA)
+#define glGetDetailTexFuncSGIS      MANGLE(GetDetailTexFuncSGIS)
+#define glGetDoublev        MANGLE(GetDoublev)
+#define glGetError      MANGLE(GetError)
+#define glGetFenceivNV      MANGLE(GetFenceivNV)
+#define glGetFinalCombinerInputParameterfvNV        MANGLE(GetFinalCombinerInputParameterfvNV)
+#define glGetFinalCombinerInputParameterivNV        MANGLE(GetFinalCombinerInputParameterivNV)
+#define glGetFloatv     MANGLE(GetFloatv)
+#define glGetFogFuncSGIS        MANGLE(GetFogFuncSGIS)
+#define glGetFragDataLocationEXT        MANGLE(GetFragDataLocationEXT)
+#define glGetFragmentLightfvSGIX        MANGLE(GetFragmentLightfvSGIX)
+#define glGetFragmentLightivSGIX        MANGLE(GetFragmentLightivSGIX)
+#define glGetFragmentMaterialfvSGIX     MANGLE(GetFragmentMaterialfvSGIX)
+#define glGetFragmentMaterialivSGIX     MANGLE(GetFragmentMaterialivSGIX)
+#define glGetFramebufferAttachmentParameterivEXT        MANGLE(GetFramebufferAttachmentParameterivEXT)
+#define glGetHandleARB      MANGLE(GetHandleARB)
+#define glGetHistogramEXT       MANGLE(GetHistogramEXT)
+#define glGetHistogram      MANGLE(GetHistogram)
+#define glGetHistogramParameterfvEXT        MANGLE(GetHistogramParameterfvEXT)
+#define glGetHistogramParameterfv       MANGLE(GetHistogramParameterfv)
+#define glGetHistogramParameterivEXT        MANGLE(GetHistogramParameterivEXT)
+#define glGetHistogramParameteriv       MANGLE(GetHistogramParameteriv)
+#define glGetImageTransformParameterfvHP        MANGLE(GetImageTransformParameterfvHP)
+#define glGetImageTransformParameterivHP        MANGLE(GetImageTransformParameterivHP)
+#define glGetInfoLogARB     MANGLE(GetInfoLogARB)
+#define glGetInstrumentsSGIX        MANGLE(GetInstrumentsSGIX)
+#define glGetIntegerIndexedvEXT     MANGLE(GetIntegerIndexedvEXT)
+#define glGetIntegerv       MANGLE(GetIntegerv)
+#define glGetInvariantBooleanvEXT       MANGLE(GetInvariantBooleanvEXT)
+#define glGetInvariantFloatvEXT     MANGLE(GetInvariantFloatvEXT)
+#define glGetInvariantIntegervEXT       MANGLE(GetInvariantIntegervEXT)
+#define glGetLightfv        MANGLE(GetLightfv)
+#define glGetLightiv        MANGLE(GetLightiv)
+#define glGetListParameterfvSGIX        MANGLE(GetListParameterfvSGIX)
+#define glGetListParameterivSGIX        MANGLE(GetListParameterivSGIX)
+#define glGetLocalConstantBooleanvEXT       MANGLE(GetLocalConstantBooleanvEXT)
+#define glGetLocalConstantFloatvEXT     MANGLE(GetLocalConstantFloatvEXT)
+#define glGetLocalConstantIntegervEXT       MANGLE(GetLocalConstantIntegervEXT)
+#define glGetMapAttribParameterfvNV     MANGLE(GetMapAttribParameterfvNV)
+#define glGetMapAttribParameterivNV     MANGLE(GetMapAttribParameterivNV)
+#define glGetMapControlPointsNV     MANGLE(GetMapControlPointsNV)
+#define glGetMapdv      MANGLE(GetMapdv)
+#define glGetMapfv      MANGLE(GetMapfv)
+#define glGetMapiv      MANGLE(GetMapiv)
+#define glGetMapParameterfvNV       MANGLE(GetMapParameterfvNV)
+#define glGetMapParameterivNV       MANGLE(GetMapParameterivNV)
+#define glGetMaterialfv     MANGLE(GetMaterialfv)
+#define glGetMaterialiv     MANGLE(GetMaterialiv)
+#define glGetMinmaxEXT      MANGLE(GetMinmaxEXT)
+#define glGetMinmax     MANGLE(GetMinmax)
+#define glGetMinmaxParameterfvEXT       MANGLE(GetMinmaxParameterfvEXT)
+#define glGetMinmaxParameterfv      MANGLE(GetMinmaxParameterfv)
+#define glGetMinmaxParameterivEXT       MANGLE(GetMinmaxParameterivEXT)
+#define glGetMinmaxParameteriv      MANGLE(GetMinmaxParameteriv)
+#define glGetObjectBufferfvATI      MANGLE(GetObjectBufferfvATI)
+#define glGetObjectBufferivATI      MANGLE(GetObjectBufferivATI)
+#define glGetObjectParameterfvARB       MANGLE(GetObjectParameterfvARB)
+#define glGetObjectParameterivARB       MANGLE(GetObjectParameterivARB)
+#define glGetOcclusionQueryivNV     MANGLE(GetOcclusionQueryivNV)
+#define glGetOcclusionQueryuivNV        MANGLE(GetOcclusionQueryuivNV)
+#define glGetPixelMapfv     MANGLE(GetPixelMapfv)
+#define glGetPixelMapuiv        MANGLE(GetPixelMapuiv)
+#define glGetPixelMapusv        MANGLE(GetPixelMapusv)
+#define glGetPixelTexGenParameterfvSGIS     MANGLE(GetPixelTexGenParameterfvSGIS)
+#define glGetPixelTexGenParameterivSGIS     MANGLE(GetPixelTexGenParameterivSGIS)
+#define glGetPointervEXT        MANGLE(GetPointervEXT)
+#define glGetPointerv       MANGLE(GetPointerv)
+#define glGetPolygonStipple     MANGLE(GetPolygonStipple)
+#define glGetProgramEnvParameterdvARB       MANGLE(GetProgramEnvParameterdvARB)
+#define glGetProgramEnvParameterfvARB       MANGLE(GetProgramEnvParameterfvARB)
+#define glGetProgramEnvParameterIivNV       MANGLE(GetProgramEnvParameterIivNV)
+#define glGetProgramEnvParameterIuivNV      MANGLE(GetProgramEnvParameterIuivNV)
+#define glGetProgramInfoLog     MANGLE(GetProgramInfoLog)
+#define glGetProgramivARB       MANGLE(GetProgramivARB)
+#define glGetProgramiv      MANGLE(GetProgramiv)
+#define glGetProgramivNV        MANGLE(GetProgramivNV)
+#define glGetProgramLocalParameterdvARB     MANGLE(GetProgramLocalParameterdvARB)
+#define glGetProgramLocalParameterfvARB     MANGLE(GetProgramLocalParameterfvARB)
+#define glGetProgramLocalParameterIivNV     MANGLE(GetProgramLocalParameterIivNV)
+#define glGetProgramLocalParameterIuivNV        MANGLE(GetProgramLocalParameterIuivNV)
+#define glGetProgramNamedParameterdvNV      MANGLE(GetProgramNamedParameterdvNV)
+#define glGetProgramNamedParameterfvNV      MANGLE(GetProgramNamedParameterfvNV)
+#define glGetProgramParameterdvNV       MANGLE(GetProgramParameterdvNV)
+#define glGetProgramParameterfvNV       MANGLE(GetProgramParameterfvNV)
+#define glGetProgramRegisterfvMESA      MANGLE(GetProgramRegisterfvMESA)
+#define glGetProgramStringARB       MANGLE(GetProgramStringARB)
+#define glGetProgramStringNV        MANGLE(GetProgramStringNV)
+#define glGetQueryivARB     MANGLE(GetQueryivARB)
+#define glGetQueryiv        MANGLE(GetQueryiv)
+#define glGetQueryObjecti64vEXT     MANGLE(GetQueryObjecti64vEXT)
+#define glGetQueryObjectivARB       MANGLE(GetQueryObjectivARB)
+#define glGetQueryObjectiv      MANGLE(GetQueryObjectiv)
+#define glGetQueryObjectui64vEXT        MANGLE(GetQueryObjectui64vEXT)
+#define glGetQueryObjectuivARB      MANGLE(GetQueryObjectuivARB)
+#define glGetQueryObjectuiv     MANGLE(GetQueryObjectuiv)
+#define glGetRenderbufferParameterivEXT     MANGLE(GetRenderbufferParameterivEXT)
+#define glGetSeparableFilterEXT     MANGLE(GetSeparableFilterEXT)
+#define glGetSeparableFilter        MANGLE(GetSeparableFilter)
+#define glGetShaderInfoLog      MANGLE(GetShaderInfoLog)
+#define glGetShaderiv       MANGLE(GetShaderiv)
+#define glGetShaderSourceARB        MANGLE(GetShaderSourceARB)
+#define glGetShaderSource       MANGLE(GetShaderSource)
+#define glGetSharpenTexFuncSGIS     MANGLE(GetSharpenTexFuncSGIS)
+#define glGetString     MANGLE(GetString)
+#define glGetTexBumpParameterfvATI      MANGLE(GetTexBumpParameterfvATI)
+#define glGetTexBumpParameterivATI      MANGLE(GetTexBumpParameterivATI)
+#define glGetTexEnvfv       MANGLE(GetTexEnvfv)
+#define glGetTexEnviv       MANGLE(GetTexEnviv)
+#define glGetTexFilterFuncSGIS      MANGLE(GetTexFilterFuncSGIS)
+#define glGetTexGendv       MANGLE(GetTexGendv)
+#define glGetTexGenfv       MANGLE(GetTexGenfv)
+#define glGetTexGeniv       MANGLE(GetTexGeniv)
+#define glGetTexImage       MANGLE(GetTexImage)
+#define glGetTexLevelParameterfv        MANGLE(GetTexLevelParameterfv)
+#define glGetTexLevelParameteriv        MANGLE(GetTexLevelParameteriv)
+#define glGetTexParameterfv     MANGLE(GetTexParameterfv)
+#define glGetTexParameterIivEXT     MANGLE(GetTexParameterIivEXT)
+#define glGetTexParameterIuivEXT        MANGLE(GetTexParameterIuivEXT)
+#define glGetTexParameteriv     MANGLE(GetTexParameteriv)
+#define glGetTrackMatrixivNV        MANGLE(GetTrackMatrixivNV)
+#define glGetTransformFeedbackVaryingNV     MANGLE(GetTransformFeedbackVaryingNV)
+#define glGetUniformBufferSizeEXT       MANGLE(GetUniformBufferSizeEXT)
+#define glGetUniformfvARB       MANGLE(GetUniformfvARB)
+#define glGetUniformfv      MANGLE(GetUniformfv)
+#define glGetUniformivARB       MANGLE(GetUniformivARB)
+#define glGetUniformiv      MANGLE(GetUniformiv)
+#define glGetUniformLocationARB     MANGLE(GetUniformLocationARB)
+#define glGetUniformLocation        MANGLE(GetUniformLocation)
+#define glGetUniformOffsetEXT       MANGLE(GetUniformOffsetEXT)
+#define glGetUniformuivEXT      MANGLE(GetUniformuivEXT)
+#define glGetVariantArrayObjectfvATI        MANGLE(GetVariantArrayObjectfvATI)
+#define glGetVariantArrayObjectivATI        MANGLE(GetVariantArrayObjectivATI)
+#define glGetVariantBooleanvEXT     MANGLE(GetVariantBooleanvEXT)
+#define glGetVariantFloatvEXT       MANGLE(GetVariantFloatvEXT)
+#define glGetVariantIntegervEXT     MANGLE(GetVariantIntegervEXT)
+#define glGetVariantPointervEXT     MANGLE(GetVariantPointervEXT)
+#define glGetVaryingLocationNV      MANGLE(GetVaryingLocationNV)
+#define glGetVertexAttribArrayObjectfvATI       MANGLE(GetVertexAttribArrayObjectfvATI)
+#define glGetVertexAttribArrayObjectivATI       MANGLE(GetVertexAttribArrayObjectivATI)
+#define glGetVertexAttribdvARB      MANGLE(GetVertexAttribdvARB)
+#define glGetVertexAttribdv     MANGLE(GetVertexAttribdv)
+#define glGetVertexAttribdvNV       MANGLE(GetVertexAttribdvNV)
+#define glGetVertexAttribfvARB      MANGLE(GetVertexAttribfvARB)
+#define glGetVertexAttribfv     MANGLE(GetVertexAttribfv)
+#define glGetVertexAttribfvNV       MANGLE(GetVertexAttribfvNV)
+#define glGetVertexAttribIivEXT     MANGLE(GetVertexAttribIivEXT)
+#define glGetVertexAttribIuivEXT        MANGLE(GetVertexAttribIuivEXT)
+#define glGetVertexAttribivARB      MANGLE(GetVertexAttribivARB)
+#define glGetVertexAttribiv     MANGLE(GetVertexAttribiv)
+#define glGetVertexAttribivNV       MANGLE(GetVertexAttribivNV)
+#define glGetVertexAttribPointervARB        MANGLE(GetVertexAttribPointervARB)
+#define glGetVertexAttribPointerv       MANGLE(GetVertexAttribPointerv)
+#define glGetVertexAttribPointervNV     MANGLE(GetVertexAttribPointervNV)
+#define glGlobalAlphaFactorbSUN     MANGLE(GlobalAlphaFactorbSUN)
+#define glGlobalAlphaFactordSUN     MANGLE(GlobalAlphaFactordSUN)
+#define glGlobalAlphaFactorfSUN     MANGLE(GlobalAlphaFactorfSUN)
+#define glGlobalAlphaFactoriSUN     MANGLE(GlobalAlphaFactoriSUN)
+#define glGlobalAlphaFactorsSUN     MANGLE(GlobalAlphaFactorsSUN)
+#define glGlobalAlphaFactorubSUN        MANGLE(GlobalAlphaFactorubSUN)
+#define glGlobalAlphaFactoruiSUN        MANGLE(GlobalAlphaFactoruiSUN)
+#define glGlobalAlphaFactorusSUN        MANGLE(GlobalAlphaFactorusSUN)
+#define glHint      MANGLE(Hint)
+#define glHintPGI       MANGLE(HintPGI)
+#define glHistogramEXT      MANGLE(HistogramEXT)
+#define glHistogram     MANGLE(Histogram)
+#define glIglooInterfaceSGIX        MANGLE(IglooInterfaceSGIX)
+#define glImageTransformParameterfHP        MANGLE(ImageTransformParameterfHP)
+#define glImageTransformParameterfvHP       MANGLE(ImageTransformParameterfvHP)
+#define glImageTransformParameteriHP        MANGLE(ImageTransformParameteriHP)
+#define glImageTransformParameterivHP       MANGLE(ImageTransformParameterivHP)
+#define glIndexd        MANGLE(Indexd)
+#define glIndexdv       MANGLE(Indexdv)
+#define glIndexf        MANGLE(Indexf)
+#define glIndexFuncEXT      MANGLE(IndexFuncEXT)
+#define glIndexfv       MANGLE(Indexfv)
+#define glIndexi        MANGLE(Indexi)
+#define glIndexiv       MANGLE(Indexiv)
+#define glIndexMask     MANGLE(IndexMask)
+#define glIndexMaterialEXT      MANGLE(IndexMaterialEXT)
+#define glIndexPointerEXT       MANGLE(IndexPointerEXT)
+#define glIndexPointerListIBM       MANGLE(IndexPointerListIBM)
+#define glIndexPointer      MANGLE(IndexPointer)
+#define glIndexs        MANGLE(Indexs)
+#define glIndexsv       MANGLE(Indexsv)
+#define glIndexub       MANGLE(Indexub)
+#define glIndexubv      MANGLE(Indexubv)
+#define glInitNames     MANGLE(InitNames)
+#define glInsertComponentEXT        MANGLE(InsertComponentEXT)
+#define glInstrumentsBufferSGIX     MANGLE(InstrumentsBufferSGIX)
+#define glInterleavedArrays     MANGLE(InterleavedArrays)
+#define glIsAsyncMarkerSGIX     MANGLE(IsAsyncMarkerSGIX)
+#define glIsBufferARB       MANGLE(IsBufferARB)
+#define glIsBuffer      MANGLE(IsBuffer)
+#define glIsEnabledIndexedEXT       MANGLE(IsEnabledIndexedEXT)
+#define glIsEnabled     MANGLE(IsEnabled)
+#define glIsFenceAPPLE      MANGLE(IsFenceAPPLE)
+#define glIsFenceNV     MANGLE(IsFenceNV)
+#define glIsFramebufferEXT      MANGLE(IsFramebufferEXT)
+#define glIsList        MANGLE(IsList)
+#define glIsObjectBufferATI     MANGLE(IsObjectBufferATI)
+#define glIsOcclusionQueryNV        MANGLE(IsOcclusionQueryNV)
+#define glIsProgramARB      MANGLE(IsProgramARB)
+#define glIsProgram     MANGLE(IsProgram)
+#define glIsProgramNV       MANGLE(IsProgramNV)
+#define glIsQueryARB        MANGLE(IsQueryARB)
+#define glIsQuery       MANGLE(IsQuery)
+#define glIsRenderbufferEXT     MANGLE(IsRenderbufferEXT)
+#define glIsShader      MANGLE(IsShader)
+#define glIsTextureEXT      MANGLE(IsTextureEXT)
+#define glIsTexture     MANGLE(IsTexture)
+#define glIsVariantEnabledEXT       MANGLE(IsVariantEnabledEXT)
+#define glIsVertexArrayAPPLE        MANGLE(IsVertexArrayAPPLE)
+#define glLightEnviSGIX     MANGLE(LightEnviSGIX)
+#define glLightf        MANGLE(Lightf)
+#define glLightfv       MANGLE(Lightfv)
+#define glLighti        MANGLE(Lighti)
+#define glLightiv       MANGLE(Lightiv)
+#define glLightModelf       MANGLE(LightModelf)
+#define glLightModelfv      MANGLE(LightModelfv)
+#define glLightModeli       MANGLE(LightModeli)
+#define glLightModeliv      MANGLE(LightModeliv)
+#define glLineStipple       MANGLE(LineStipple)
+#define glLineWidth     MANGLE(LineWidth)
+#define glLinkProgramARB        MANGLE(LinkProgramARB)
+#define glLinkProgram       MANGLE(LinkProgram)
+#define glListBase      MANGLE(ListBase)
+#define glListParameterfSGIX        MANGLE(ListParameterfSGIX)
+#define glListParameterfvSGIX       MANGLE(ListParameterfvSGIX)
+#define glListParameteriSGIX        MANGLE(ListParameteriSGIX)
+#define glListParameterivSGIX       MANGLE(ListParameterivSGIX)
+#define glLoadIdentityDeformationMapSGIX        MANGLE(LoadIdentityDeformationMapSGIX)
+#define glLoadIdentity      MANGLE(LoadIdentity)
+#define glLoadMatrixd       MANGLE(LoadMatrixd)
+#define glLoadMatrixf       MANGLE(LoadMatrixf)
+#define glLoadName      MANGLE(LoadName)
+#define glLoadProgramNV     MANGLE(LoadProgramNV)
+#define glLoadTransposeMatrixdARB       MANGLE(LoadTransposeMatrixdARB)
+#define glLoadTransposeMatrixd      MANGLE(LoadTransposeMatrixd)
+#define glLoadTransposeMatrixfARB       MANGLE(LoadTransposeMatrixfARB)
+#define glLoadTransposeMatrixf      MANGLE(LoadTransposeMatrixf)
+#define glLockArraysEXT     MANGLE(LockArraysEXT)
+#define glLogicOp       MANGLE(LogicOp)
+#define glMap1d     MANGLE(Map1d)
+#define glMap1f     MANGLE(Map1f)
+#define glMap2d     MANGLE(Map2d)
+#define glMap2f     MANGLE(Map2f)
+#define glMapBufferARB      MANGLE(MapBufferARB)
+#define glMapBuffer     MANGLE(MapBuffer)
+#define glMapControlPointsNV        MANGLE(MapControlPointsNV)
+#define glMapGrid1d     MANGLE(MapGrid1d)
+#define glMapGrid1f     MANGLE(MapGrid1f)
+#define glMapGrid2d     MANGLE(MapGrid2d)
+#define glMapGrid2f     MANGLE(MapGrid2f)
+#define glMapObjectBufferATI        MANGLE(MapObjectBufferATI)
+#define glMapParameterfvNV      MANGLE(MapParameterfvNV)
+#define glMapParameterivNV      MANGLE(MapParameterivNV)
+#define glMaterialf     MANGLE(Materialf)
+#define glMaterialfv        MANGLE(Materialfv)
+#define glMateriali     MANGLE(Materiali)
+#define glMaterialiv        MANGLE(Materialiv)
+#define glMatrixIndexPointerARB     MANGLE(MatrixIndexPointerARB)
+#define glMatrixIndexubvARB     MANGLE(MatrixIndexubvARB)
+#define glMatrixIndexuivARB     MANGLE(MatrixIndexuivARB)
+#define glMatrixIndexusvARB     MANGLE(MatrixIndexusvARB)
+#define glMatrixMode        MANGLE(MatrixMode)
+#define glMinmaxEXT     MANGLE(MinmaxEXT)
+#define glMinmax        MANGLE(Minmax)
+#define glMultiDrawArraysEXT        MANGLE(MultiDrawArraysEXT)
+#define glMultiDrawArrays       MANGLE(MultiDrawArrays)
+#define glMultiDrawElementArrayAPPLE        MANGLE(MultiDrawElementArrayAPPLE)
+#define glMultiDrawElementsEXT      MANGLE(MultiDrawElementsEXT)
+#define glMultiDrawElements     MANGLE(MultiDrawElements)
+#define glMultiDrawRangeElementArrayAPPLE       MANGLE(MultiDrawRangeElementArrayAPPLE)
+#define glMultiModeDrawArraysIBM        MANGLE(MultiModeDrawArraysIBM)
+#define glMultiModeDrawElementsIBM      MANGLE(MultiModeDrawElementsIBM)
+#define glMultiTexCoord1dARB        MANGLE(MultiTexCoord1dARB)
+#define glMultiTexCoord1d       MANGLE(MultiTexCoord1d)
+#define glMultiTexCoord1dvARB       MANGLE(MultiTexCoord1dvARB)
+#define glMultiTexCoord1dv      MANGLE(MultiTexCoord1dv)
+#define glMultiTexCoord1fARB        MANGLE(MultiTexCoord1fARB)
+#define glMultiTexCoord1f       MANGLE(MultiTexCoord1f)
+#define glMultiTexCoord1fvARB       MANGLE(MultiTexCoord1fvARB)
+#define glMultiTexCoord1fv      MANGLE(MultiTexCoord1fv)
+#define glMultiTexCoord1hNV     MANGLE(MultiTexCoord1hNV)
+#define glMultiTexCoord1hvNV        MANGLE(MultiTexCoord1hvNV)
+#define glMultiTexCoord1iARB        MANGLE(MultiTexCoord1iARB)
+#define glMultiTexCoord1i       MANGLE(MultiTexCoord1i)
+#define glMultiTexCoord1ivARB       MANGLE(MultiTexCoord1ivARB)
+#define glMultiTexCoord1iv      MANGLE(MultiTexCoord1iv)
+#define glMultiTexCoord1sARB        MANGLE(MultiTexCoord1sARB)
+#define glMultiTexCoord1s       MANGLE(MultiTexCoord1s)
+#define glMultiTexCoord1svARB       MANGLE(MultiTexCoord1svARB)
+#define glMultiTexCoord1sv      MANGLE(MultiTexCoord1sv)
+#define glMultiTexCoord2dARB        MANGLE(MultiTexCoord2dARB)
+#define glMultiTexCoord2d       MANGLE(MultiTexCoord2d)
+#define glMultiTexCoord2dvARB       MANGLE(MultiTexCoord2dvARB)
+#define glMultiTexCoord2dv      MANGLE(MultiTexCoord2dv)
+#define glMultiTexCoord2fARB        MANGLE(MultiTexCoord2fARB)
+#define glMultiTexCoord2f       MANGLE(MultiTexCoord2f)
+#define glMultiTexCoord2fvARB       MANGLE(MultiTexCoord2fvARB)
+#define glMultiTexCoord2fv      MANGLE(MultiTexCoord2fv)
+#define glMultiTexCoord2hNV     MANGLE(MultiTexCoord2hNV)
+#define glMultiTexCoord2hvNV        MANGLE(MultiTexCoord2hvNV)
+#define glMultiTexCoord2iARB        MANGLE(MultiTexCoord2iARB)
+#define glMultiTexCoord2i       MANGLE(MultiTexCoord2i)
+#define glMultiTexCoord2ivARB       MANGLE(MultiTexCoord2ivARB)
+#define glMultiTexCoord2iv      MANGLE(MultiTexCoord2iv)
+#define glMultiTexCoord2sARB        MANGLE(MultiTexCoord2sARB)
+#define glMultiTexCoord2s       MANGLE(MultiTexCoord2s)
+#define glMultiTexCoord2svARB       MANGLE(MultiTexCoord2svARB)
+#define glMultiTexCoord2sv      MANGLE(MultiTexCoord2sv)
+#define glMultiTexCoord3dARB        MANGLE(MultiTexCoord3dARB)
+#define glMultiTexCoord3d       MANGLE(MultiTexCoord3d)
+#define glMultiTexCoord3dvARB       MANGLE(MultiTexCoord3dvARB)
+#define glMultiTexCoord3dv      MANGLE(MultiTexCoord3dv)
+#define glMultiTexCoord3fARB        MANGLE(MultiTexCoord3fARB)
+#define glMultiTexCoord3f       MANGLE(MultiTexCoord3f)
+#define glMultiTexCoord3fvARB       MANGLE(MultiTexCoord3fvARB)
+#define glMultiTexCoord3fv      MANGLE(MultiTexCoord3fv)
+#define glMultiTexCoord3hNV     MANGLE(MultiTexCoord3hNV)
+#define glMultiTexCoord3hvNV        MANGLE(MultiTexCoord3hvNV)
+#define glMultiTexCoord3iARB        MANGLE(MultiTexCoord3iARB)
+#define glMultiTexCoord3i       MANGLE(MultiTexCoord3i)
+#define glMultiTexCoord3ivARB       MANGLE(MultiTexCoord3ivARB)
+#define glMultiTexCoord3iv      MANGLE(MultiTexCoord3iv)
+#define glMultiTexCoord3sARB        MANGLE(MultiTexCoord3sARB)
+#define glMultiTexCoord3s       MANGLE(MultiTexCoord3s)
+#define glMultiTexCoord3svARB       MANGLE(MultiTexCoord3svARB)
+#define glMultiTexCoord3sv      MANGLE(MultiTexCoord3sv)
+#define glMultiTexCoord4dARB        MANGLE(MultiTexCoord4dARB)
+#define glMultiTexCoord4d       MANGLE(MultiTexCoord4d)
+#define glMultiTexCoord4dvARB       MANGLE(MultiTexCoord4dvARB)
+#define glMultiTexCoord4dv      MANGLE(MultiTexCoord4dv)
+#define glMultiTexCoord4fARB        MANGLE(MultiTexCoord4fARB)
+#define glMultiTexCoord4f       MANGLE(MultiTexCoord4f)
+#define glMultiTexCoord4fvARB       MANGLE(MultiTexCoord4fvARB)
+#define glMultiTexCoord4fv      MANGLE(MultiTexCoord4fv)
+#define glMultiTexCoord4hNV     MANGLE(MultiTexCoord4hNV)
+#define glMultiTexCoord4hvNV        MANGLE(MultiTexCoord4hvNV)
+#define glMultiTexCoord4iARB        MANGLE(MultiTexCoord4iARB)
+#define glMultiTexCoord4i       MANGLE(MultiTexCoord4i)
+#define glMultiTexCoord4ivARB       MANGLE(MultiTexCoord4ivARB)
+#define glMultiTexCoord4iv      MANGLE(MultiTexCoord4iv)
+#define glMultiTexCoord4sARB        MANGLE(MultiTexCoord4sARB)
+#define glMultiTexCoord4s       MANGLE(MultiTexCoord4s)
+#define glMultiTexCoord4svARB       MANGLE(MultiTexCoord4svARB)
+#define glMultiTexCoord4sv      MANGLE(MultiTexCoord4sv)
+#define glMultMatrixd       MANGLE(MultMatrixd)
+#define glMultMatrixf       MANGLE(MultMatrixf)
+#define glMultTransposeMatrixdARB       MANGLE(MultTransposeMatrixdARB)
+#define glMultTransposeMatrixd      MANGLE(MultTransposeMatrixd)
+#define glMultTransposeMatrixfARB       MANGLE(MultTransposeMatrixfARB)
+#define glMultTransposeMatrixf      MANGLE(MultTransposeMatrixf)
+#define glNewList       MANGLE(NewList)
+#define glNewObjectBufferATI        MANGLE(NewObjectBufferATI)
+#define glNormal3b      MANGLE(Normal3b)
+#define glNormal3bv     MANGLE(Normal3bv)
+#define glNormal3d      MANGLE(Normal3d)
+#define glNormal3dv     MANGLE(Normal3dv)
+#define glNormal3f      MANGLE(Normal3f)
+#define glNormal3fVertex3fSUN       MANGLE(Normal3fVertex3fSUN)
+#define glNormal3fVertex3fvSUN      MANGLE(Normal3fVertex3fvSUN)
+#define glNormal3fv     MANGLE(Normal3fv)
+#define glNormal3hNV        MANGLE(Normal3hNV)
+#define glNormal3hvNV       MANGLE(Normal3hvNV)
+#define glNormal3i      MANGLE(Normal3i)
+#define glNormal3iv     MANGLE(Normal3iv)
+#define glNormal3s      MANGLE(Normal3s)
+#define glNormal3sv     MANGLE(Normal3sv)
+#define glNormalPointerEXT      MANGLE(NormalPointerEXT)
+#define glNormalPointerListIBM      MANGLE(NormalPointerListIBM)
+#define glNormalPointer     MANGLE(NormalPointer)
+#define glNormalPointervINTEL       MANGLE(NormalPointervINTEL)
+#define glNormalStream3bATI     MANGLE(NormalStream3bATI)
+#define glNormalStream3bvATI        MANGLE(NormalStream3bvATI)
+#define glNormalStream3dATI     MANGLE(NormalStream3dATI)
+#define glNormalStream3dvATI        MANGLE(NormalStream3dvATI)
+#define glNormalStream3fATI     MANGLE(NormalStream3fATI)
+#define glNormalStream3fvATI        MANGLE(NormalStream3fvATI)
+#define glNormalStream3iATI     MANGLE(NormalStream3iATI)
+#define glNormalStream3ivATI        MANGLE(NormalStream3ivATI)
+#define glNormalStream3sATI     MANGLE(NormalStream3sATI)
+#define glNormalStream3svATI        MANGLE(NormalStream3svATI)
+#define glOrtho     MANGLE(Ortho)
+#define glPassTexCoordATI       MANGLE(PassTexCoordATI)
+#define glPassThrough       MANGLE(PassThrough)
+#define glPixelDataRangeNV      MANGLE(PixelDataRangeNV)
+#define glPixelMapfv        MANGLE(PixelMapfv)
+#define glPixelMapuiv       MANGLE(PixelMapuiv)
+#define glPixelMapusv       MANGLE(PixelMapusv)
+#define glPixelStoref       MANGLE(PixelStoref)
+#define glPixelStorei       MANGLE(PixelStorei)
+#define glPixelTexGenParameterfSGIS     MANGLE(PixelTexGenParameterfSGIS)
+#define glPixelTexGenParameterfvSGIS        MANGLE(PixelTexGenParameterfvSGIS)
+#define glPixelTexGenParameteriSGIS     MANGLE(PixelTexGenParameteriSGIS)
+#define glPixelTexGenParameterivSGIS        MANGLE(PixelTexGenParameterivSGIS)
+#define glPixelTexGenSGIX       MANGLE(PixelTexGenSGIX)
+#define glPixelTransferf        MANGLE(PixelTransferf)
+#define glPixelTransferi        MANGLE(PixelTransferi)
+#define glPixelTransformParameterfEXT       MANGLE(PixelTransformParameterfEXT)
+#define glPixelTransformParameterfvEXT      MANGLE(PixelTransformParameterfvEXT)
+#define glPixelTransformParameteriEXT       MANGLE(PixelTransformParameteriEXT)
+#define glPixelTransformParameterivEXT      MANGLE(PixelTransformParameterivEXT)
+#define glPixelZoom     MANGLE(PixelZoom)
+#define glPNTrianglesfATI       MANGLE(PNTrianglesfATI)
+#define glPNTrianglesiATI       MANGLE(PNTrianglesiATI)
+#define glPointParameterfARB        MANGLE(PointParameterfARB)
+#define glPointParameterfEXT        MANGLE(PointParameterfEXT)
+#define glPointParameterf       MANGLE(PointParameterf)
+#define glPointParameterfSGIS       MANGLE(PointParameterfSGIS)
+#define glPointParameterfvARB       MANGLE(PointParameterfvARB)
+#define glPointParameterfvEXT       MANGLE(PointParameterfvEXT)
+#define glPointParameterfv      MANGLE(PointParameterfv)
+#define glPointParameterfvSGIS      MANGLE(PointParameterfvSGIS)
+#define glPointParameteri       MANGLE(PointParameteri)
+#define glPointParameteriNV     MANGLE(PointParameteriNV)
+#define glPointParameteriv      MANGLE(PointParameteriv)
+#define glPointParameterivNV        MANGLE(PointParameterivNV)
+#define glPointSize     MANGLE(PointSize)
+#define glPollAsyncSGIX     MANGLE(PollAsyncSGIX)
+#define glPollInstrumentsSGIX       MANGLE(PollInstrumentsSGIX)
+#define glPolygonMode       MANGLE(PolygonMode)
+#define glPolygonOffsetEXT      MANGLE(PolygonOffsetEXT)
+#define glPolygonOffset     MANGLE(PolygonOffset)
+#define glPolygonStipple        MANGLE(PolygonStipple)
+#define glPopAttrib     MANGLE(PopAttrib)
+#define glPopClientAttrib       MANGLE(PopClientAttrib)
+#define glPopMatrix     MANGLE(PopMatrix)
+#define glPopName       MANGLE(PopName)
+#define glPrimitiveRestartIndexNV       MANGLE(PrimitiveRestartIndexNV)
+#define glPrimitiveRestartNV        MANGLE(PrimitiveRestartNV)
+#define glPrioritizeTexturesEXT     MANGLE(PrioritizeTexturesEXT)
+#define glPrioritizeTextures        MANGLE(PrioritizeTextures)
+#define glProgramBufferParametersfvNV       MANGLE(ProgramBufferParametersfvNV)
+#define glProgramBufferParametersIivNV      MANGLE(ProgramBufferParametersIivNV)
+#define glProgramBufferParametersIuivNV     MANGLE(ProgramBufferParametersIuivNV)
+#define glProgramCallbackMESA       MANGLE(ProgramCallbackMESA)
+#define glProgramEnvParameter4dARB      MANGLE(ProgramEnvParameter4dARB)
+#define glProgramEnvParameter4dvARB     MANGLE(ProgramEnvParameter4dvARB)
+#define glProgramEnvParameter4fARB      MANGLE(ProgramEnvParameter4fARB)
+#define glProgramEnvParameter4fvARB     MANGLE(ProgramEnvParameter4fvARB)
+#define glProgramEnvParameterI4iNV      MANGLE(ProgramEnvParameterI4iNV)
+#define glProgramEnvParameterI4ivNV     MANGLE(ProgramEnvParameterI4ivNV)
+#define glProgramEnvParameterI4uiNV     MANGLE(ProgramEnvParameterI4uiNV)
+#define glProgramEnvParameterI4uivNV        MANGLE(ProgramEnvParameterI4uivNV)
+#define glProgramEnvParameters4fvEXT        MANGLE(ProgramEnvParameters4fvEXT)
+#define glProgramEnvParametersI4ivNV        MANGLE(ProgramEnvParametersI4ivNV)
+#define glProgramEnvParametersI4uivNV       MANGLE(ProgramEnvParametersI4uivNV)
+#define glProgramLocalParameter4dARB        MANGLE(ProgramLocalParameter4dARB)
+#define glProgramLocalParameter4dvARB       MANGLE(ProgramLocalParameter4dvARB)
+#define glProgramLocalParameter4fARB        MANGLE(ProgramLocalParameter4fARB)
+#define glProgramLocalParameter4fvARB       MANGLE(ProgramLocalParameter4fvARB)
+#define glProgramLocalParameterI4iNV        MANGLE(ProgramLocalParameterI4iNV)
+#define glProgramLocalParameterI4ivNV       MANGLE(ProgramLocalParameterI4ivNV)
+#define glProgramLocalParameterI4uiNV       MANGLE(ProgramLocalParameterI4uiNV)
+#define glProgramLocalParameterI4uivNV      MANGLE(ProgramLocalParameterI4uivNV)
+#define glProgramLocalParameters4fvEXT      MANGLE(ProgramLocalParameters4fvEXT)
+#define glProgramLocalParametersI4ivNV      MANGLE(ProgramLocalParametersI4ivNV)
+#define glProgramLocalParametersI4uivNV     MANGLE(ProgramLocalParametersI4uivNV)
+#define glProgramNamedParameter4dNV     MANGLE(ProgramNamedParameter4dNV)
+#define glProgramNamedParameter4dvNV        MANGLE(ProgramNamedParameter4dvNV)
+#define glProgramNamedParameter4fNV     MANGLE(ProgramNamedParameter4fNV)
+#define glProgramNamedParameter4fvNV        MANGLE(ProgramNamedParameter4fvNV)
+#define glProgramParameter4dNV      MANGLE(ProgramParameter4dNV)
+#define glProgramParameter4dvNV     MANGLE(ProgramParameter4dvNV)
+#define glProgramParameter4fNV      MANGLE(ProgramParameter4fNV)
+#define glProgramParameter4fvNV     MANGLE(ProgramParameter4fvNV)
+#define glProgramParameteriEXT      MANGLE(ProgramParameteriEXT)
+#define glProgramParameters4dvNV        MANGLE(ProgramParameters4dvNV)
+#define glProgramParameters4fvNV        MANGLE(ProgramParameters4fvNV)
+#define glProgramStringARB      MANGLE(ProgramStringARB)
+#define glProgramVertexLimitNV      MANGLE(ProgramVertexLimitNV)
+#define glPushAttrib        MANGLE(PushAttrib)
+#define glPushClientAttrib      MANGLE(PushClientAttrib)
+#define glPushMatrix        MANGLE(PushMatrix)
+#define glPushName      MANGLE(PushName)
+#define glRasterPos2d       MANGLE(RasterPos2d)
+#define glRasterPos2dv      MANGLE(RasterPos2dv)
+#define glRasterPos2f       MANGLE(RasterPos2f)
+#define glRasterPos2fv      MANGLE(RasterPos2fv)
+#define glRasterPos2i       MANGLE(RasterPos2i)
+#define glRasterPos2iv      MANGLE(RasterPos2iv)
+#define glRasterPos2s       MANGLE(RasterPos2s)
+#define glRasterPos2sv      MANGLE(RasterPos2sv)
+#define glRasterPos3d       MANGLE(RasterPos3d)
+#define glRasterPos3dv      MANGLE(RasterPos3dv)
+#define glRasterPos3f       MANGLE(RasterPos3f)
+#define glRasterPos3fv      MANGLE(RasterPos3fv)
+#define glRasterPos3i       MANGLE(RasterPos3i)
+#define glRasterPos3iv      MANGLE(RasterPos3iv)
+#define glRasterPos3s       MANGLE(RasterPos3s)
+#define glRasterPos3sv      MANGLE(RasterPos3sv)
+#define glRasterPos4d       MANGLE(RasterPos4d)
+#define glRasterPos4dv      MANGLE(RasterPos4dv)
+#define glRasterPos4f       MANGLE(RasterPos4f)
+#define glRasterPos4fv      MANGLE(RasterPos4fv)
+#define glRasterPos4i       MANGLE(RasterPos4i)
+#define glRasterPos4iv      MANGLE(RasterPos4iv)
+#define glRasterPos4s       MANGLE(RasterPos4s)
+#define glRasterPos4sv      MANGLE(RasterPos4sv)
+#define glReadBuffer        MANGLE(ReadBuffer)
+#define glReadInstrumentsSGIX       MANGLE(ReadInstrumentsSGIX)
+#define glReadPixels        MANGLE(ReadPixels)
+#define glRectd     MANGLE(Rectd)
+#define glRectdv        MANGLE(Rectdv)
+#define glRectf     MANGLE(Rectf)
+#define glRectfv        MANGLE(Rectfv)
+#define glRecti     MANGLE(Recti)
+#define glRectiv        MANGLE(Rectiv)
+#define glRects     MANGLE(Rects)
+#define glRectsv        MANGLE(Rectsv)
+#define glReferencePlaneSGIX        MANGLE(ReferencePlaneSGIX)
+#define glRenderbufferStorageEXT        MANGLE(RenderbufferStorageEXT)
+#define glRenderbufferStorageMultisampleCoverageNV      MANGLE(RenderbufferStorageMultisampleCoverageNV)
+#define glRenderbufferStorageMultisampleEXT     MANGLE(RenderbufferStorageMultisampleEXT)
+#define glRenderMode        MANGLE(RenderMode)
+#define glReplacementCodePointerSUN     MANGLE(ReplacementCodePointerSUN)
+#define glReplacementCodeubSUN      MANGLE(ReplacementCodeubSUN)
+#define glReplacementCodeubvSUN     MANGLE(ReplacementCodeubvSUN)
+#define glReplacementCodeuiColor3fVertex3fSUN       MANGLE(ReplacementCodeuiColor3fVertex3fSUN)
+#define glReplacementCodeuiColor3fVertex3fvSUN      MANGLE(ReplacementCodeuiColor3fVertex3fvSUN)
+#define glReplacementCodeuiColor4fNormal3fVertex3fSUN       MANGLE(ReplacementCodeuiColor4fNormal3fVertex3fSUN)
+#define glReplacementCodeuiColor4fNormal3fVertex3fvSUN      MANGLE(ReplacementCodeuiColor4fNormal3fVertex3fvSUN)
+#define glReplacementCodeuiColor4ubVertex3fSUN      MANGLE(ReplacementCodeuiColor4ubVertex3fSUN)
+#define glReplacementCodeuiColor4ubVertex3fvSUN     MANGLE(ReplacementCodeuiColor4ubVertex3fvSUN)
+#define glReplacementCodeuiNormal3fVertex3fSUN      MANGLE(ReplacementCodeuiNormal3fVertex3fSUN)
+#define glReplacementCodeuiNormal3fVertex3fvSUN     MANGLE(ReplacementCodeuiNormal3fVertex3fvSUN)
+#define glReplacementCodeuiSUN      MANGLE(ReplacementCodeuiSUN)
+#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN     MANGLE(ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN)
+#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN        MANGLE(ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN)
+#define glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN        MANGLE(ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN)
+#define glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN       MANGLE(ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN)
+#define glReplacementCodeuiTexCoord2fVertex3fSUN        MANGLE(ReplacementCodeuiTexCoord2fVertex3fSUN)
+#define glReplacementCodeuiTexCoord2fVertex3fvSUN       MANGLE(ReplacementCodeuiTexCoord2fVertex3fvSUN)
+#define glReplacementCodeuiVertex3fSUN      MANGLE(ReplacementCodeuiVertex3fSUN)
+#define glReplacementCodeuiVertex3fvSUN     MANGLE(ReplacementCodeuiVertex3fvSUN)
+#define glReplacementCodeuivSUN     MANGLE(ReplacementCodeuivSUN)
+#define glReplacementCodeusSUN      MANGLE(ReplacementCodeusSUN)
+#define glReplacementCodeusvSUN     MANGLE(ReplacementCodeusvSUN)
+#define glRequestResidentProgramsNV     MANGLE(RequestResidentProgramsNV)
+#define glResetHistogramEXT     MANGLE(ResetHistogramEXT)
+#define glResetHistogram        MANGLE(ResetHistogram)
+#define glResetMinmaxEXT        MANGLE(ResetMinmaxEXT)
+#define glResetMinmax       MANGLE(ResetMinmax)
+#define glResizeBuffersMESA     MANGLE(ResizeBuffersMESA)
+#define glRotated       MANGLE(Rotated)
+#define glRotatef       MANGLE(Rotatef)
+#define glSampleCoverageARB     MANGLE(SampleCoverageARB)
+#define glSampleCoverage        MANGLE(SampleCoverage)
+#define glSampleMapATI      MANGLE(SampleMapATI)
+#define glSampleMaskEXT     MANGLE(SampleMaskEXT)
+#define glSampleMaskSGIS        MANGLE(SampleMaskSGIS)
+#define glSamplePatternEXT      MANGLE(SamplePatternEXT)
+#define glSamplePatternSGIS     MANGLE(SamplePatternSGIS)
+#define glScaled        MANGLE(Scaled)
+#define glScalef        MANGLE(Scalef)
+#define glScissor       MANGLE(Scissor)
+#define glSecondaryColor3bEXT       MANGLE(SecondaryColor3bEXT)
+#define glSecondaryColor3b      MANGLE(SecondaryColor3b)
+#define glSecondaryColor3bvEXT      MANGLE(SecondaryColor3bvEXT)
+#define glSecondaryColor3bv     MANGLE(SecondaryColor3bv)
+#define glSecondaryColor3dEXT       MANGLE(SecondaryColor3dEXT)
+#define glSecondaryColor3d      MANGLE(SecondaryColor3d)
+#define glSecondaryColor3dvEXT      MANGLE(SecondaryColor3dvEXT)
+#define glSecondaryColor3dv     MANGLE(SecondaryColor3dv)
+#define glSecondaryColor3fEXT       MANGLE(SecondaryColor3fEXT)
+#define glSecondaryColor3f      MANGLE(SecondaryColor3f)
+#define glSecondaryColor3fvEXT      MANGLE(SecondaryColor3fvEXT)
+#define glSecondaryColor3fv     MANGLE(SecondaryColor3fv)
+#define glSecondaryColor3hNV        MANGLE(SecondaryColor3hNV)
+#define glSecondaryColor3hvNV       MANGLE(SecondaryColor3hvNV)
+#define glSecondaryColor3iEXT       MANGLE(SecondaryColor3iEXT)
+#define glSecondaryColor3i      MANGLE(SecondaryColor3i)
+#define glSecondaryColor3ivEXT      MANGLE(SecondaryColor3ivEXT)
+#define glSecondaryColor3iv     MANGLE(SecondaryColor3iv)
+#define glSecondaryColor3sEXT       MANGLE(SecondaryColor3sEXT)
+#define glSecondaryColor3s      MANGLE(SecondaryColor3s)
+#define glSecondaryColor3svEXT      MANGLE(SecondaryColor3svEXT)
+#define glSecondaryColor3sv     MANGLE(SecondaryColor3sv)
+#define glSecondaryColor3ubEXT      MANGLE(SecondaryColor3ubEXT)
+#define glSecondaryColor3ub     MANGLE(SecondaryColor3ub)
+#define glSecondaryColor3ubvEXT     MANGLE(SecondaryColor3ubvEXT)
+#define glSecondaryColor3ubv        MANGLE(SecondaryColor3ubv)
+#define glSecondaryColor3uiEXT      MANGLE(SecondaryColor3uiEXT)
+#define glSecondaryColor3ui     MANGLE(SecondaryColor3ui)
+#define glSecondaryColor3uivEXT     MANGLE(SecondaryColor3uivEXT)
+#define glSecondaryColor3uiv        MANGLE(SecondaryColor3uiv)
+#define glSecondaryColor3usEXT      MANGLE(SecondaryColor3usEXT)
+#define glSecondaryColor3us     MANGLE(SecondaryColor3us)
+#define glSecondaryColor3usvEXT     MANGLE(SecondaryColor3usvEXT)
+#define glSecondaryColor3usv        MANGLE(SecondaryColor3usv)
+#define glSecondaryColorPointerEXT      MANGLE(SecondaryColorPointerEXT)
+#define glSecondaryColorPointerListIBM      MANGLE(SecondaryColorPointerListIBM)
+#define glSecondaryColorPointer     MANGLE(SecondaryColorPointer)
+#define glSelectBuffer      MANGLE(SelectBuffer)
+#define glSeparableFilter2DEXT      MANGLE(SeparableFilter2DEXT)
+#define glSeparableFilter2D     MANGLE(SeparableFilter2D)
+#define glSetFenceAPPLE     MANGLE(SetFenceAPPLE)
+#define glSetFenceNV        MANGLE(SetFenceNV)
+#define glSetFragmentShaderConstantATI      MANGLE(SetFragmentShaderConstantATI)
+#define glSetInvariantEXT       MANGLE(SetInvariantEXT)
+#define glSetLocalConstantEXT       MANGLE(SetLocalConstantEXT)
+#define glShadeModel        MANGLE(ShadeModel)
+#define glShaderOp1EXT      MANGLE(ShaderOp1EXT)
+#define glShaderOp2EXT      MANGLE(ShaderOp2EXT)
+#define glShaderOp3EXT      MANGLE(ShaderOp3EXT)
+#define glShaderSourceARB       MANGLE(ShaderSourceARB)
+#define glShaderSource      MANGLE(ShaderSource)
+#define glSharpenTexFuncSGIS        MANGLE(SharpenTexFuncSGIS)
+#define glSpriteParameterfSGIX      MANGLE(SpriteParameterfSGIX)
+#define glSpriteParameterfvSGIX     MANGLE(SpriteParameterfvSGIX)
+#define glSpriteParameteriSGIX      MANGLE(SpriteParameteriSGIX)
+#define glSpriteParameterivSGIX     MANGLE(SpriteParameterivSGIX)
+#define glStartInstrumentsSGIX      MANGLE(StartInstrumentsSGIX)
+#define glStencilClearTagEXT        MANGLE(StencilClearTagEXT)
+#define glStencilFunc       MANGLE(StencilFunc)
+#define glStencilFuncSeparateATI        MANGLE(StencilFuncSeparateATI)
+#define glStencilFuncSeparate       MANGLE(StencilFuncSeparate)
+#define glStencilMask       MANGLE(StencilMask)
+#define glStencilMaskSeparate       MANGLE(StencilMaskSeparate)
+#define glStencilOp     MANGLE(StencilOp)
+#define glStencilOpSeparateATI      MANGLE(StencilOpSeparateATI)
+#define glStencilOpSeparate     MANGLE(StencilOpSeparate)
+#define glStopInstrumentsSGIX       MANGLE(StopInstrumentsSGIX)
+#define glStringMarkerGREMEDY       MANGLE(StringMarkerGREMEDY)
+#define glSwizzleEXT        MANGLE(SwizzleEXT)
+#define glTagSampleBufferSGIX       MANGLE(TagSampleBufferSGIX)
+#define glTangent3bEXT      MANGLE(Tangent3bEXT)
+#define glTangent3bvEXT     MANGLE(Tangent3bvEXT)
+#define glTangent3dEXT      MANGLE(Tangent3dEXT)
+#define glTangent3dvEXT     MANGLE(Tangent3dvEXT)
+#define glTangent3fEXT      MANGLE(Tangent3fEXT)
+#define glTangent3fvEXT     MANGLE(Tangent3fvEXT)
+#define glTangent3iEXT      MANGLE(Tangent3iEXT)
+#define glTangent3ivEXT     MANGLE(Tangent3ivEXT)
+#define glTangent3sEXT      MANGLE(Tangent3sEXT)
+#define glTangent3svEXT     MANGLE(Tangent3svEXT)
+#define glTangentPointerEXT     MANGLE(TangentPointerEXT)
+#define glTbufferMask3DFX       MANGLE(TbufferMask3DFX)
+#define glTestFenceAPPLE        MANGLE(TestFenceAPPLE)
+#define glTestFenceNV       MANGLE(TestFenceNV)
+#define glTestObjectAPPLE       MANGLE(TestObjectAPPLE)
+#define glTexBufferEXT      MANGLE(TexBufferEXT)
+#define glTexBumpParameterfvATI     MANGLE(TexBumpParameterfvATI)
+#define glTexBumpParameterivATI     MANGLE(TexBumpParameterivATI)
+#define glTexCoord1d        MANGLE(TexCoord1d)
+#define glTexCoord1dv       MANGLE(TexCoord1dv)
+#define glTexCoord1f        MANGLE(TexCoord1f)
+#define glTexCoord1fv       MANGLE(TexCoord1fv)
+#define glTexCoord1hNV      MANGLE(TexCoord1hNV)
+#define glTexCoord1hvNV     MANGLE(TexCoord1hvNV)
+#define glTexCoord1i        MANGLE(TexCoord1i)
+#define glTexCoord1iv       MANGLE(TexCoord1iv)
+#define glTexCoord1s        MANGLE(TexCoord1s)
+#define glTexCoord1sv       MANGLE(TexCoord1sv)
+#define glTexCoord2d        MANGLE(TexCoord2d)
+#define glTexCoord2dv       MANGLE(TexCoord2dv)
+#define glTexCoord2fColor3fVertex3fSUN      MANGLE(TexCoord2fColor3fVertex3fSUN)
+#define glTexCoord2fColor3fVertex3fvSUN     MANGLE(TexCoord2fColor3fVertex3fvSUN)
+#define glTexCoord2fColor4fNormal3fVertex3fSUN      MANGLE(TexCoord2fColor4fNormal3fVertex3fSUN)
+#define glTexCoord2fColor4fNormal3fVertex3fvSUN     MANGLE(TexCoord2fColor4fNormal3fVertex3fvSUN)
+#define glTexCoord2fColor4ubVertex3fSUN     MANGLE(TexCoord2fColor4ubVertex3fSUN)
+#define glTexCoord2fColor4ubVertex3fvSUN        MANGLE(TexCoord2fColor4ubVertex3fvSUN)
+#define glTexCoord2f        MANGLE(TexCoord2f)
+#define glTexCoord2fNormal3fVertex3fSUN     MANGLE(TexCoord2fNormal3fVertex3fSUN)
+#define glTexCoord2fNormal3fVertex3fvSUN        MANGLE(TexCoord2fNormal3fVertex3fvSUN)
+#define glTexCoord2fVertex3fSUN     MANGLE(TexCoord2fVertex3fSUN)
+#define glTexCoord2fVertex3fvSUN        MANGLE(TexCoord2fVertex3fvSUN)
+#define glTexCoord2fv       MANGLE(TexCoord2fv)
+#define glTexCoord2hNV      MANGLE(TexCoord2hNV)
+#define glTexCoord2hvNV     MANGLE(TexCoord2hvNV)
+#define glTexCoord2i        MANGLE(TexCoord2i)
+#define glTexCoord2iv       MANGLE(TexCoord2iv)
+#define glTexCoord2s        MANGLE(TexCoord2s)
+#define glTexCoord2sv       MANGLE(TexCoord2sv)
+#define glTexCoord3d        MANGLE(TexCoord3d)
+#define glTexCoord3dv       MANGLE(TexCoord3dv)
+#define glTexCoord3f        MANGLE(TexCoord3f)
+#define glTexCoord3fv       MANGLE(TexCoord3fv)
+#define glTexCoord3hNV      MANGLE(TexCoord3hNV)
+#define glTexCoord3hvNV     MANGLE(TexCoord3hvNV)
+#define glTexCoord3i        MANGLE(TexCoord3i)
+#define glTexCoord3iv       MANGLE(TexCoord3iv)
+#define glTexCoord3s        MANGLE(TexCoord3s)
+#define glTexCoord3sv       MANGLE(TexCoord3sv)
+#define glTexCoord4d        MANGLE(TexCoord4d)
+#define glTexCoord4dv       MANGLE(TexCoord4dv)
+#define glTexCoord4fColor4fNormal3fVertex4fSUN      MANGLE(TexCoord4fColor4fNormal3fVertex4fSUN)
+#define glTexCoord4fColor4fNormal3fVertex4fvSUN     MANGLE(TexCoord4fColor4fNormal3fVertex4fvSUN)
+#define glTexCoord4f        MANGLE(TexCoord4f)
+#define glTexCoord4fVertex4fSUN     MANGLE(TexCoord4fVertex4fSUN)
+#define glTexCoord4fVertex4fvSUN        MANGLE(TexCoord4fVertex4fvSUN)
+#define glTexCoord4fv       MANGLE(TexCoord4fv)
+#define glTexCoord4hNV      MANGLE(TexCoord4hNV)
+#define glTexCoord4hvNV     MANGLE(TexCoord4hvNV)
+#define glTexCoord4i        MANGLE(TexCoord4i)
+#define glTexCoord4iv       MANGLE(TexCoord4iv)
+#define glTexCoord4s        MANGLE(TexCoord4s)
+#define glTexCoord4sv       MANGLE(TexCoord4sv)
+#define glTexCoordPointerEXT        MANGLE(TexCoordPointerEXT)
+#define glTexCoordPointerListIBM        MANGLE(TexCoordPointerListIBM)
+#define glTexCoordPointer       MANGLE(TexCoordPointer)
+#define glTexCoordPointervINTEL     MANGLE(TexCoordPointervINTEL)
+#define glTexEnvf       MANGLE(TexEnvf)
+#define glTexEnvfv      MANGLE(TexEnvfv)
+#define glTexEnvi       MANGLE(TexEnvi)
+#define glTexEnviv      MANGLE(TexEnviv)
+#define glTexFilterFuncSGIS     MANGLE(TexFilterFuncSGIS)
+#define glTexGend       MANGLE(TexGend)
+#define glTexGendv      MANGLE(TexGendv)
+#define glTexGenf       MANGLE(TexGenf)
+#define glTexGenfv      MANGLE(TexGenfv)
+#define glTexGeni       MANGLE(TexGeni)
+#define glTexGeniv      MANGLE(TexGeniv)
+#define glTexImage1D        MANGLE(TexImage1D)
+#define glTexImage2D        MANGLE(TexImage2D)
+#define glTexImage3DEXT     MANGLE(TexImage3DEXT)
+#define glTexImage3D        MANGLE(TexImage3D)
+#define glTexImage4DSGIS        MANGLE(TexImage4DSGIS)
+#define glTexParameterf     MANGLE(TexParameterf)
+#define glTexParameterfv        MANGLE(TexParameterfv)
+#define glTexParameterIivEXT        MANGLE(TexParameterIivEXT)
+#define glTexParameteri     MANGLE(TexParameteri)
+#define glTexParameterIuivEXT       MANGLE(TexParameterIuivEXT)
+#define glTexParameteriv        MANGLE(TexParameteriv)
+#define glTexSubImage1DEXT      MANGLE(TexSubImage1DEXT)
+#define glTexSubImage1D     MANGLE(TexSubImage1D)
+#define glTexSubImage2DEXT      MANGLE(TexSubImage2DEXT)
+#define glTexSubImage2D     MANGLE(TexSubImage2D)
+#define glTexSubImage3DEXT      MANGLE(TexSubImage3DEXT)
+#define glTexSubImage3D     MANGLE(TexSubImage3D)
+#define glTexSubImage4DSGIS     MANGLE(TexSubImage4DSGIS)
+#define glTextureColorMaskSGIS      MANGLE(TextureColorMaskSGIS)
+#define glTextureLightEXT       MANGLE(TextureLightEXT)
+#define glTextureMaterialEXT        MANGLE(TextureMaterialEXT)
+#define glTextureNormalEXT      MANGLE(TextureNormalEXT)
+#define glTrackMatrixNV     MANGLE(TrackMatrixNV)
+#define glTransformFeedbackAttribsNV        MANGLE(TransformFeedbackAttribsNV)
+#define glTransformFeedbackVaryingsNV       MANGLE(TransformFeedbackVaryingsNV)
+#define glTranslated        MANGLE(Translated)
+#define glTranslatef        MANGLE(Translatef)
+#define glUniform1fARB      MANGLE(Uniform1fARB)
+#define glUniform1f     MANGLE(Uniform1f)
+#define glUniform1fvARB     MANGLE(Uniform1fvARB)
+#define glUniform1fv        MANGLE(Uniform1fv)
+#define glUniform1iARB      MANGLE(Uniform1iARB)
+#define glUniform1i     MANGLE(Uniform1i)
+#define glUniform1ivARB     MANGLE(Uniform1ivARB)
+#define glUniform1iv        MANGLE(Uniform1iv)
+#define glUniform1uiEXT     MANGLE(Uniform1uiEXT)
+#define glUniform1uivEXT        MANGLE(Uniform1uivEXT)
+#define glUniform2fARB      MANGLE(Uniform2fARB)
+#define glUniform2f     MANGLE(Uniform2f)
+#define glUniform2fvARB     MANGLE(Uniform2fvARB)
+#define glUniform2fv        MANGLE(Uniform2fv)
+#define glUniform2iARB      MANGLE(Uniform2iARB)
+#define glUniform2i     MANGLE(Uniform2i)
+#define glUniform2ivARB     MANGLE(Uniform2ivARB)
+#define glUniform2iv        MANGLE(Uniform2iv)
+#define glUniform2uiEXT     MANGLE(Uniform2uiEXT)
+#define glUniform2uivEXT        MANGLE(Uniform2uivEXT)
+#define glUniform3fARB      MANGLE(Uniform3fARB)
+#define glUniform3f     MANGLE(Uniform3f)
+#define glUniform3fvARB     MANGLE(Uniform3fvARB)
+#define glUniform3fv        MANGLE(Uniform3fv)
+#define glUniform3iARB      MANGLE(Uniform3iARB)
+#define glUniform3i     MANGLE(Uniform3i)
+#define glUniform3ivARB     MANGLE(Uniform3ivARB)
+#define glUniform3iv        MANGLE(Uniform3iv)
+#define glUniform3uiEXT     MANGLE(Uniform3uiEXT)
+#define glUniform3uivEXT        MANGLE(Uniform3uivEXT)
+#define glUniform4fARB      MANGLE(Uniform4fARB)
+#define glUniform4f     MANGLE(Uniform4f)
+#define glUniform4fvARB     MANGLE(Uniform4fvARB)
+#define glUniform4fv        MANGLE(Uniform4fv)
+#define glUniform4iARB      MANGLE(Uniform4iARB)
+#define glUniform4i     MANGLE(Uniform4i)
+#define glUniform4ivARB     MANGLE(Uniform4ivARB)
+#define glUniform4iv        MANGLE(Uniform4iv)
+#define glUniform4uiEXT     MANGLE(Uniform4uiEXT)
+#define glUniform4uivEXT        MANGLE(Uniform4uivEXT)
+#define glUniformBufferEXT      MANGLE(UniformBufferEXT)
+#define glUniformMatrix2fvARB       MANGLE(UniformMatrix2fvARB)
+#define glUniformMatrix2fv      MANGLE(UniformMatrix2fv)
+#define glUniformMatrix2x3fv        MANGLE(UniformMatrix2x3fv)
+#define glUniformMatrix2x4fv        MANGLE(UniformMatrix2x4fv)
+#define glUniformMatrix3fvARB       MANGLE(UniformMatrix3fvARB)
+#define glUniformMatrix3fv      MANGLE(UniformMatrix3fv)
+#define glUniformMatrix3x2fv        MANGLE(UniformMatrix3x2fv)
+#define glUniformMatrix3x4fv        MANGLE(UniformMatrix3x4fv)
+#define glUniformMatrix4fvARB       MANGLE(UniformMatrix4fvARB)
+#define glUniformMatrix4fv      MANGLE(UniformMatrix4fv)
+#define glUniformMatrix4x2fv        MANGLE(UniformMatrix4x2fv)
+#define glUniformMatrix4x3fv        MANGLE(UniformMatrix4x3fv)
+#define glUnlockArraysEXT       MANGLE(UnlockArraysEXT)
+#define glUnmapBufferARB        MANGLE(UnmapBufferARB)
+#define glUnmapBuffer       MANGLE(UnmapBuffer)
+#define glUnmapObjectBufferATI      MANGLE(UnmapObjectBufferATI)
+#define glUpdateObjectBufferATI     MANGLE(UpdateObjectBufferATI)
+#define glUseProgram        MANGLE(UseProgram)
+#define glUseProgramObjectARB       MANGLE(UseProgramObjectARB)
+#define glValidateProgramARB        MANGLE(ValidateProgramARB)
+#define glValidateProgram       MANGLE(ValidateProgram)
+#define glVariantArrayObjectATI     MANGLE(VariantArrayObjectATI)
+#define glVariantbvEXT      MANGLE(VariantbvEXT)
+#define glVariantdvEXT      MANGLE(VariantdvEXT)
+#define glVariantfvEXT      MANGLE(VariantfvEXT)
+#define glVariantivEXT      MANGLE(VariantivEXT)
+#define glVariantPointerEXT     MANGLE(VariantPointerEXT)
+#define glVariantsvEXT      MANGLE(VariantsvEXT)
+#define glVariantubvEXT     MANGLE(VariantubvEXT)
+#define glVariantuivEXT     MANGLE(VariantuivEXT)
+#define glVariantusvEXT     MANGLE(VariantusvEXT)
+#define glVertex2d      MANGLE(Vertex2d)
+#define glVertex2dv     MANGLE(Vertex2dv)
+#define glVertex2f      MANGLE(Vertex2f)
+#define glVertex2fv     MANGLE(Vertex2fv)
+#define glVertex2hNV        MANGLE(Vertex2hNV)
+#define glVertex2hvNV       MANGLE(Vertex2hvNV)
+#define glVertex2i      MANGLE(Vertex2i)
+#define glVertex2iv     MANGLE(Vertex2iv)
+#define glVertex2s      MANGLE(Vertex2s)
+#define glVertex2sv     MANGLE(Vertex2sv)
+#define glVertex3d      MANGLE(Vertex3d)
+#define glVertex3dv     MANGLE(Vertex3dv)
+#define glVertex3f      MANGLE(Vertex3f)
+#define glVertex3fv     MANGLE(Vertex3fv)
+#define glVertex3hNV        MANGLE(Vertex3hNV)
+#define glVertex3hvNV       MANGLE(Vertex3hvNV)
+#define glVertex3i      MANGLE(Vertex3i)
+#define glVertex3iv     MANGLE(Vertex3iv)
+#define glVertex3s      MANGLE(Vertex3s)
+#define glVertex3sv     MANGLE(Vertex3sv)
+#define glVertex4d      MANGLE(Vertex4d)
+#define glVertex4dv     MANGLE(Vertex4dv)
+#define glVertex4f      MANGLE(Vertex4f)
+#define glVertex4fv     MANGLE(Vertex4fv)
+#define glVertex4hNV        MANGLE(Vertex4hNV)
+#define glVertex4hvNV       MANGLE(Vertex4hvNV)
+#define glVertex4i      MANGLE(Vertex4i)
+#define glVertex4iv     MANGLE(Vertex4iv)
+#define glVertex4s      MANGLE(Vertex4s)
+#define glVertex4sv     MANGLE(Vertex4sv)
+#define glVertexArrayParameteriAPPLE        MANGLE(VertexArrayParameteriAPPLE)
+#define glVertexArrayRangeAPPLE     MANGLE(VertexArrayRangeAPPLE)
+#define glVertexArrayRangeNV        MANGLE(VertexArrayRangeNV)
+#define glVertexAttrib1dARB     MANGLE(VertexAttrib1dARB)
+#define glVertexAttrib1d        MANGLE(VertexAttrib1d)
+#define glVertexAttrib1dNV      MANGLE(VertexAttrib1dNV)
+#define glVertexAttrib1dvARB        MANGLE(VertexAttrib1dvARB)
+#define glVertexAttrib1dv       MANGLE(VertexAttrib1dv)
+#define glVertexAttrib1dvNV     MANGLE(VertexAttrib1dvNV)
+#define glVertexAttrib1fARB     MANGLE(VertexAttrib1fARB)
+#define glVertexAttrib1f        MANGLE(VertexAttrib1f)
+#define glVertexAttrib1fNV      MANGLE(VertexAttrib1fNV)
+#define glVertexAttrib1fvARB        MANGLE(VertexAttrib1fvARB)
+#define glVertexAttrib1fv       MANGLE(VertexAttrib1fv)
+#define glVertexAttrib1fvNV     MANGLE(VertexAttrib1fvNV)
+#define glVertexAttrib1hNV      MANGLE(VertexAttrib1hNV)
+#define glVertexAttrib1hvNV     MANGLE(VertexAttrib1hvNV)
+#define glVertexAttrib1sARB     MANGLE(VertexAttrib1sARB)
+#define glVertexAttrib1s        MANGLE(VertexAttrib1s)
+#define glVertexAttrib1sNV      MANGLE(VertexAttrib1sNV)
+#define glVertexAttrib1svARB        MANGLE(VertexAttrib1svARB)
+#define glVertexAttrib1sv       MANGLE(VertexAttrib1sv)
+#define glVertexAttrib1svNV     MANGLE(VertexAttrib1svNV)
+#define glVertexAttrib2dARB     MANGLE(VertexAttrib2dARB)
+#define glVertexAttrib2d        MANGLE(VertexAttrib2d)
+#define glVertexAttrib2dNV      MANGLE(VertexAttrib2dNV)
+#define glVertexAttrib2dvARB        MANGLE(VertexAttrib2dvARB)
+#define glVertexAttrib2dv       MANGLE(VertexAttrib2dv)
+#define glVertexAttrib2dvNV     MANGLE(VertexAttrib2dvNV)
+#define glVertexAttrib2fARB     MANGLE(VertexAttrib2fARB)
+#define glVertexAttrib2f        MANGLE(VertexAttrib2f)
+#define glVertexAttrib2fNV      MANGLE(VertexAttrib2fNV)
+#define glVertexAttrib2fvARB        MANGLE(VertexAttrib2fvARB)
+#define glVertexAttrib2fv       MANGLE(VertexAttrib2fv)
+#define glVertexAttrib2fvNV     MANGLE(VertexAttrib2fvNV)
+#define glVertexAttrib2hNV      MANGLE(VertexAttrib2hNV)
+#define glVertexAttrib2hvNV     MANGLE(VertexAttrib2hvNV)
+#define glVertexAttrib2sARB     MANGLE(VertexAttrib2sARB)
+#define glVertexAttrib2s        MANGLE(VertexAttrib2s)
+#define glVertexAttrib2sNV      MANGLE(VertexAttrib2sNV)
+#define glVertexAttrib2svARB        MANGLE(VertexAttrib2svARB)
+#define glVertexAttrib2sv       MANGLE(VertexAttrib2sv)
+#define glVertexAttrib2svNV     MANGLE(VertexAttrib2svNV)
+#define glVertexAttrib3dARB     MANGLE(VertexAttrib3dARB)
+#define glVertexAttrib3d        MANGLE(VertexAttrib3d)
+#define glVertexAttrib3dNV      MANGLE(VertexAttrib3dNV)
+#define glVertexAttrib3dvARB        MANGLE(VertexAttrib3dvARB)
+#define glVertexAttrib3dv       MANGLE(VertexAttrib3dv)
+#define glVertexAttrib3dvNV     MANGLE(VertexAttrib3dvNV)
+#define glVertexAttrib3fARB     MANGLE(VertexAttrib3fARB)
+#define glVertexAttrib3f        MANGLE(VertexAttrib3f)
+#define glVertexAttrib3fNV      MANGLE(VertexAttrib3fNV)
+#define glVertexAttrib3fvARB        MANGLE(VertexAttrib3fvARB)
+#define glVertexAttrib3fv       MANGLE(VertexAttrib3fv)
+#define glVertexAttrib3fvNV     MANGLE(VertexAttrib3fvNV)
+#define glVertexAttrib3hNV      MANGLE(VertexAttrib3hNV)
+#define glVertexAttrib3hvNV     MANGLE(VertexAttrib3hvNV)
+#define glVertexAttrib3sARB     MANGLE(VertexAttrib3sARB)
+#define glVertexAttrib3s        MANGLE(VertexAttrib3s)
+#define glVertexAttrib3sNV      MANGLE(VertexAttrib3sNV)
+#define glVertexAttrib3svARB        MANGLE(VertexAttrib3svARB)
+#define glVertexAttrib3sv       MANGLE(VertexAttrib3sv)
+#define glVertexAttrib3svNV     MANGLE(VertexAttrib3svNV)
+#define glVertexAttrib4bvARB        MANGLE(VertexAttrib4bvARB)
+#define glVertexAttrib4bv       MANGLE(VertexAttrib4bv)
+#define glVertexAttrib4dARB     MANGLE(VertexAttrib4dARB)
+#define glVertexAttrib4d        MANGLE(VertexAttrib4d)
+#define glVertexAttrib4dNV      MANGLE(VertexAttrib4dNV)
+#define glVertexAttrib4dvARB        MANGLE(VertexAttrib4dvARB)
+#define glVertexAttrib4dv       MANGLE(VertexAttrib4dv)
+#define glVertexAttrib4dvNV     MANGLE(VertexAttrib4dvNV)
+#define glVertexAttrib4fARB     MANGLE(VertexAttrib4fARB)
+#define glVertexAttrib4f        MANGLE(VertexAttrib4f)
+#define glVertexAttrib4fNV      MANGLE(VertexAttrib4fNV)
+#define glVertexAttrib4fvARB        MANGLE(VertexAttrib4fvARB)
+#define glVertexAttrib4fv       MANGLE(VertexAttrib4fv)
+#define glVertexAttrib4fvNV     MANGLE(VertexAttrib4fvNV)
+#define glVertexAttrib4hNV      MANGLE(VertexAttrib4hNV)
+#define glVertexAttrib4hvNV     MANGLE(VertexAttrib4hvNV)
+#define glVertexAttrib4ivARB        MANGLE(VertexAttrib4ivARB)
+#define glVertexAttrib4iv       MANGLE(VertexAttrib4iv)
+#define glVertexAttrib4NbvARB       MANGLE(VertexAttrib4NbvARB)
+#define glVertexAttrib4Nbv      MANGLE(VertexAttrib4Nbv)
+#define glVertexAttrib4NivARB       MANGLE(VertexAttrib4NivARB)
+#define glVertexAttrib4Niv      MANGLE(VertexAttrib4Niv)
+#define glVertexAttrib4NsvARB       MANGLE(VertexAttrib4NsvARB)
+#define glVertexAttrib4Nsv      MANGLE(VertexAttrib4Nsv)
+#define glVertexAttrib4NubARB       MANGLE(VertexAttrib4NubARB)
+#define glVertexAttrib4Nub      MANGLE(VertexAttrib4Nub)
+#define glVertexAttrib4NubvARB      MANGLE(VertexAttrib4NubvARB)
+#define glVertexAttrib4Nubv     MANGLE(VertexAttrib4Nubv)
+#define glVertexAttrib4NuivARB      MANGLE(VertexAttrib4NuivARB)
+#define glVertexAttrib4Nuiv     MANGLE(VertexAttrib4Nuiv)
+#define glVertexAttrib4NusvARB      MANGLE(VertexAttrib4NusvARB)
+#define glVertexAttrib4Nusv     MANGLE(VertexAttrib4Nusv)
+#define glVertexAttrib4sARB     MANGLE(VertexAttrib4sARB)
+#define glVertexAttrib4s        MANGLE(VertexAttrib4s)
+#define glVertexAttrib4sNV      MANGLE(VertexAttrib4sNV)
+#define glVertexAttrib4svARB        MANGLE(VertexAttrib4svARB)
+#define glVertexAttrib4sv       MANGLE(VertexAttrib4sv)
+#define glVertexAttrib4svNV     MANGLE(VertexAttrib4svNV)
+#define glVertexAttrib4ubNV     MANGLE(VertexAttrib4ubNV)
+#define glVertexAttrib4ubvARB       MANGLE(VertexAttrib4ubvARB)
+#define glVertexAttrib4ubv      MANGLE(VertexAttrib4ubv)
+#define glVertexAttrib4ubvNV        MANGLE(VertexAttrib4ubvNV)
+#define glVertexAttrib4uivARB       MANGLE(VertexAttrib4uivARB)
+#define glVertexAttrib4uiv      MANGLE(VertexAttrib4uiv)
+#define glVertexAttrib4usvARB       MANGLE(VertexAttrib4usvARB)
+#define glVertexAttrib4usv      MANGLE(VertexAttrib4usv)
+#define glVertexAttribArrayObjectATI        MANGLE(VertexAttribArrayObjectATI)
+#define glVertexAttribI1iEXT        MANGLE(VertexAttribI1iEXT)
+#define glVertexAttribI1ivEXT       MANGLE(VertexAttribI1ivEXT)
+#define glVertexAttribI1uiEXT       MANGLE(VertexAttribI1uiEXT)
+#define glVertexAttribI1uivEXT      MANGLE(VertexAttribI1uivEXT)
+#define glVertexAttribI2iEXT        MANGLE(VertexAttribI2iEXT)
+#define glVertexAttribI2ivEXT       MANGLE(VertexAttribI2ivEXT)
+#define glVertexAttribI2uiEXT       MANGLE(VertexAttribI2uiEXT)
+#define glVertexAttribI2uivEXT      MANGLE(VertexAttribI2uivEXT)
+#define glVertexAttribI3iEXT        MANGLE(VertexAttribI3iEXT)
+#define glVertexAttribI3ivEXT       MANGLE(VertexAttribI3ivEXT)
+#define glVertexAttribI3uiEXT       MANGLE(VertexAttribI3uiEXT)
+#define glVertexAttribI3uivEXT      MANGLE(VertexAttribI3uivEXT)
+#define glVertexAttribI4bvEXT       MANGLE(VertexAttribI4bvEXT)
+#define glVertexAttribI4iEXT        MANGLE(VertexAttribI4iEXT)
+#define glVertexAttribI4ivEXT       MANGLE(VertexAttribI4ivEXT)
+#define glVertexAttribI4svEXT       MANGLE(VertexAttribI4svEXT)
+#define glVertexAttribI4ubvEXT      MANGLE(VertexAttribI4ubvEXT)
+#define glVertexAttribI4uiEXT       MANGLE(VertexAttribI4uiEXT)
+#define glVertexAttribI4uivEXT      MANGLE(VertexAttribI4uivEXT)
+#define glVertexAttribI4usvEXT      MANGLE(VertexAttribI4usvEXT)
+#define glVertexAttribIPointerEXT       MANGLE(VertexAttribIPointerEXT)
+#define glVertexAttribPointerARB        MANGLE(VertexAttribPointerARB)
+#define glVertexAttribPointer       MANGLE(VertexAttribPointer)
+#define glVertexAttribPointerNV     MANGLE(VertexAttribPointerNV)
+#define glVertexAttribs1dvNV        MANGLE(VertexAttribs1dvNV)
+#define glVertexAttribs1fvNV        MANGLE(VertexAttribs1fvNV)
+#define glVertexAttribs1hvNV        MANGLE(VertexAttribs1hvNV)
+#define glVertexAttribs1svNV        MANGLE(VertexAttribs1svNV)
+#define glVertexAttribs2dvNV        MANGLE(VertexAttribs2dvNV)
+#define glVertexAttribs2fvNV        MANGLE(VertexAttribs2fvNV)
+#define glVertexAttribs2hvNV        MANGLE(VertexAttribs2hvNV)
+#define glVertexAttribs2svNV        MANGLE(VertexAttribs2svNV)
+#define glVertexAttribs3dvNV        MANGLE(VertexAttribs3dvNV)
+#define glVertexAttribs3fvNV        MANGLE(VertexAttribs3fvNV)
+#define glVertexAttribs3hvNV        MANGLE(VertexAttribs3hvNV)
+#define glVertexAttribs3svNV        MANGLE(VertexAttribs3svNV)
+#define glVertexAttribs4dvNV        MANGLE(VertexAttribs4dvNV)
+#define glVertexAttribs4fvNV        MANGLE(VertexAttribs4fvNV)
+#define glVertexAttribs4hvNV        MANGLE(VertexAttribs4hvNV)
+#define glVertexAttribs4svNV        MANGLE(VertexAttribs4svNV)
+#define glVertexAttribs4ubvNV       MANGLE(VertexAttribs4ubvNV)
+#define glVertexBlendARB        MANGLE(VertexBlendARB)
+#define glVertexBlendEnvfATI        MANGLE(VertexBlendEnvfATI)
+#define glVertexBlendEnviATI        MANGLE(VertexBlendEnviATI)
+#define glVertexPointerEXT      MANGLE(VertexPointerEXT)
+#define glVertexPointerListIBM      MANGLE(VertexPointerListIBM)
+#define glVertexPointer     MANGLE(VertexPointer)
+#define glVertexPointervINTEL       MANGLE(VertexPointervINTEL)
+#define glVertexStream1dATI     MANGLE(VertexStream1dATI)
+#define glVertexStream1dvATI        MANGLE(VertexStream1dvATI)
+#define glVertexStream1fATI     MANGLE(VertexStream1fATI)
+#define glVertexStream1fvATI        MANGLE(VertexStream1fvATI)
+#define glVertexStream1iATI     MANGLE(VertexStream1iATI)
+#define glVertexStream1ivATI        MANGLE(VertexStream1ivATI)
+#define glVertexStream1sATI     MANGLE(VertexStream1sATI)
+#define glVertexStream1svATI        MANGLE(VertexStream1svATI)
+#define glVertexStream2dATI     MANGLE(VertexStream2dATI)
+#define glVertexStream2dvATI        MANGLE(VertexStream2dvATI)
+#define glVertexStream2fATI     MANGLE(VertexStream2fATI)
+#define glVertexStream2fvATI        MANGLE(VertexStream2fvATI)
+#define glVertexStream2iATI     MANGLE(VertexStream2iATI)
+#define glVertexStream2ivATI        MANGLE(VertexStream2ivATI)
+#define glVertexStream2sATI     MANGLE(VertexStream2sATI)
+#define glVertexStream2svATI        MANGLE(VertexStream2svATI)
+#define glVertexStream3dATI     MANGLE(VertexStream3dATI)
+#define glVertexStream3dvATI        MANGLE(VertexStream3dvATI)
+#define glVertexStream3fATI     MANGLE(VertexStream3fATI)
+#define glVertexStream3fvATI        MANGLE(VertexStream3fvATI)
+#define glVertexStream3iATI     MANGLE(VertexStream3iATI)
+#define glVertexStream3ivATI        MANGLE(VertexStream3ivATI)
+#define glVertexStream3sATI     MANGLE(VertexStream3sATI)
+#define glVertexStream3svATI        MANGLE(VertexStream3svATI)
+#define glVertexStream4dATI     MANGLE(VertexStream4dATI)
+#define glVertexStream4dvATI        MANGLE(VertexStream4dvATI)
+#define glVertexStream4fATI     MANGLE(VertexStream4fATI)
+#define glVertexStream4fvATI        MANGLE(VertexStream4fvATI)
+#define glVertexStream4iATI     MANGLE(VertexStream4iATI)
+#define glVertexStream4ivATI        MANGLE(VertexStream4ivATI)
+#define glVertexStream4sATI     MANGLE(VertexStream4sATI)
+#define glVertexStream4svATI        MANGLE(VertexStream4svATI)
+#define glVertexWeightfEXT      MANGLE(VertexWeightfEXT)
+#define glVertexWeightfvEXT     MANGLE(VertexWeightfvEXT)
+#define glVertexWeighthNV       MANGLE(VertexWeighthNV)
+#define glVertexWeighthvNV      MANGLE(VertexWeighthvNV)
+#define glVertexWeightPointerEXT        MANGLE(VertexWeightPointerEXT)
+#define glViewport      MANGLE(Viewport)
+#define glWeightbvARB       MANGLE(WeightbvARB)
+#define glWeightdvARB       MANGLE(WeightdvARB)
+#define glWeightfvARB       MANGLE(WeightfvARB)
+#define glWeightivARB       MANGLE(WeightivARB)
+#define glWeightPointerARB      MANGLE(WeightPointerARB)
+#define glWeightsvARB       MANGLE(WeightsvARB)
+#define glWeightubvARB      MANGLE(WeightubvARB)
+#define glWeightuivARB      MANGLE(WeightuivARB)
+#define glWeightusvARB      MANGLE(WeightusvARB)
+#define glWindowPos2dARB        MANGLE(WindowPos2dARB)
+#define glWindowPos2d       MANGLE(WindowPos2d)
+#define glWindowPos2dMESA       MANGLE(WindowPos2dMESA)
+#define glWindowPos2dvARB       MANGLE(WindowPos2dvARB)
+#define glWindowPos2dv      MANGLE(WindowPos2dv)
+#define glWindowPos2dvMESA      MANGLE(WindowPos2dvMESA)
+#define glWindowPos2fARB        MANGLE(WindowPos2fARB)
+#define glWindowPos2f       MANGLE(WindowPos2f)
+#define glWindowPos2fMESA       MANGLE(WindowPos2fMESA)
+#define glWindowPos2fvARB       MANGLE(WindowPos2fvARB)
+#define glWindowPos2fv      MANGLE(WindowPos2fv)
+#define glWindowPos2fvMESA      MANGLE(WindowPos2fvMESA)
+#define glWindowPos2iARB        MANGLE(WindowPos2iARB)
+#define glWindowPos2i       MANGLE(WindowPos2i)
+#define glWindowPos2iMESA       MANGLE(WindowPos2iMESA)
+#define glWindowPos2ivARB       MANGLE(WindowPos2ivARB)
+#define glWindowPos2iv      MANGLE(WindowPos2iv)
+#define glWindowPos2ivMESA      MANGLE(WindowPos2ivMESA)
+#define glWindowPos2sARB        MANGLE(WindowPos2sARB)
+#define glWindowPos2s       MANGLE(WindowPos2s)
+#define glWindowPos2sMESA       MANGLE(WindowPos2sMESA)
+#define glWindowPos2svARB       MANGLE(WindowPos2svARB)
+#define glWindowPos2sv      MANGLE(WindowPos2sv)
+#define glWindowPos2svMESA      MANGLE(WindowPos2svMESA)
+#define glWindowPos3dARB        MANGLE(WindowPos3dARB)
+#define glWindowPos3d       MANGLE(WindowPos3d)
+#define glWindowPos3dMESA       MANGLE(WindowPos3dMESA)
+#define glWindowPos3dvARB       MANGLE(WindowPos3dvARB)
+#define glWindowPos3dv      MANGLE(WindowPos3dv)
+#define glWindowPos3dvMESA      MANGLE(WindowPos3dvMESA)
+#define glWindowPos3fARB        MANGLE(WindowPos3fARB)
+#define glWindowPos3f       MANGLE(WindowPos3f)
+#define glWindowPos3fMESA       MANGLE(WindowPos3fMESA)
+#define glWindowPos3fvARB       MANGLE(WindowPos3fvARB)
+#define glWindowPos3fv      MANGLE(WindowPos3fv)
+#define glWindowPos3fvMESA      MANGLE(WindowPos3fvMESA)
+#define glWindowPos3iARB        MANGLE(WindowPos3iARB)
+#define glWindowPos3i       MANGLE(WindowPos3i)
+#define glWindowPos3iMESA       MANGLE(WindowPos3iMESA)
+#define glWindowPos3ivARB       MANGLE(WindowPos3ivARB)
+#define glWindowPos3iv      MANGLE(WindowPos3iv)
+#define glWindowPos3ivMESA      MANGLE(WindowPos3ivMESA)
+#define glWindowPos3sARB        MANGLE(WindowPos3sARB)
+#define glWindowPos3s       MANGLE(WindowPos3s)
+#define glWindowPos3sMESA       MANGLE(WindowPos3sMESA)
+#define glWindowPos3svARB       MANGLE(WindowPos3svARB)
+#define glWindowPos3sv      MANGLE(WindowPos3sv)
+#define glWindowPos3svMESA      MANGLE(WindowPos3svMESA)
+#define glWindowPos4dMESA       MANGLE(WindowPos4dMESA)
+#define glWindowPos4dvMESA      MANGLE(WindowPos4dvMESA)
+#define glWindowPos4fMESA       MANGLE(WindowPos4fMESA)
+#define glWindowPos4fvMESA      MANGLE(WindowPos4fvMESA)
+#define glWindowPos4iMESA       MANGLE(WindowPos4iMESA)
+#define glWindowPos4ivMESA      MANGLE(WindowPos4ivMESA)
+#define glWindowPos4sMESA       MANGLE(WindowPos4sMESA)
+#define glWindowPos4svMESA      MANGLE(WindowPos4svMESA)
+#define glWriteMaskEXT      MANGLE(WriteMaskEXT)
+
+#endif /* GL_MANGLE_H */
diff --git a/Mesa/inc/glext.h b/Mesa/inc/glext.h
new file mode 100644
index 000000000000..449b70d0b459
--- /dev/null
+++ b/Mesa/inc/glext.h
@@ -0,0 +1,7271 @@
+#ifndef __glext_h_
+#define __glext_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2007 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+/*************************************************************/
+
+/* Header file version number, required by OpenGL ABI for Linux */
+/* glext.h last updated 2008/03/24 */
+/* Current version at http://www.opengl.org/registry/ */
+#define GL_GLEXT_VERSION 40
+
+#ifndef GL_VERSION_1_2
+#define GL_UNSIGNED_BYTE_3_3_2            0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
+#define GL_UNSIGNED_INT_8_8_8_8           0x8035
+#define GL_UNSIGNED_INT_10_10_10_2        0x8036
+#define GL_RESCALE_NORMAL                 0x803A
+#define GL_TEXTURE_BINDING_3D             0x806A
+#define GL_PACK_SKIP_IMAGES               0x806B
+#define GL_PACK_IMAGE_HEIGHT              0x806C
+#define GL_UNPACK_SKIP_IMAGES             0x806D
+#define GL_UNPACK_IMAGE_HEIGHT            0x806E
+#define GL_TEXTURE_3D                     0x806F
+#define GL_PROXY_TEXTURE_3D               0x8070
+#define GL_TEXTURE_DEPTH                  0x8071
+#define GL_TEXTURE_WRAP_R                 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE            0x8073
+#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
+#define GL_UNSIGNED_SHORT_5_6_5           0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
+#define GL_BGR                            0x80E0
+#define GL_BGRA                           0x80E1
+#define GL_MAX_ELEMENTS_VERTICES          0x80E8
+#define GL_MAX_ELEMENTS_INDICES           0x80E9
+#define GL_CLAMP_TO_EDGE                  0x812F
+#define GL_TEXTURE_MIN_LOD                0x813A
+#define GL_TEXTURE_MAX_LOD                0x813B
+#define GL_TEXTURE_BASE_LEVEL             0x813C
+#define GL_TEXTURE_MAX_LEVEL              0x813D
+#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
+#define GL_SINGLE_COLOR                   0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
+#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
+#endif
+
+#ifndef GL_ARB_imaging
+#define GL_CONSTANT_COLOR                 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
+#define GL_CONSTANT_ALPHA                 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
+#define GL_BLEND_COLOR                    0x8005
+#define GL_FUNC_ADD                       0x8006
+#define GL_MIN                            0x8007
+#define GL_MAX                            0x8008
+#define GL_BLEND_EQUATION                 0x8009
+#define GL_FUNC_SUBTRACT                  0x800A
+#define GL_FUNC_REVERSE_SUBTRACT          0x800B
+#define GL_CONVOLUTION_1D                 0x8010
+#define GL_CONVOLUTION_2D                 0x8011
+#define GL_SEPARABLE_2D                   0x8012
+#define GL_CONVOLUTION_BORDER_MODE        0x8013
+#define GL_CONVOLUTION_FILTER_SCALE       0x8014
+#define GL_CONVOLUTION_FILTER_BIAS        0x8015
+#define GL_REDUCE                         0x8016
+#define GL_CONVOLUTION_FORMAT             0x8017
+#define GL_CONVOLUTION_WIDTH              0x8018
+#define GL_CONVOLUTION_HEIGHT             0x8019
+#define GL_MAX_CONVOLUTION_WIDTH          0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
+#define GL_HISTOGRAM                      0x8024
+#define GL_PROXY_HISTOGRAM                0x8025
+#define GL_HISTOGRAM_WIDTH                0x8026
+#define GL_HISTOGRAM_FORMAT               0x8027
+#define GL_HISTOGRAM_RED_SIZE             0x8028
+#define GL_HISTOGRAM_GREEN_SIZE           0x8029
+#define GL_HISTOGRAM_BLUE_SIZE            0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
+#define GL_HISTOGRAM_SINK                 0x802D
+#define GL_MINMAX                         0x802E
+#define GL_MINMAX_FORMAT                  0x802F
+#define GL_MINMAX_SINK                    0x8030
+#define GL_TABLE_TOO_LARGE                0x8031
+#define GL_COLOR_MATRIX                   0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
+#define GL_COLOR_TABLE                    0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
+#define GL_PROXY_COLOR_TABLE              0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE              0x80D6
+#define GL_COLOR_TABLE_BIAS               0x80D7
+#define GL_COLOR_TABLE_FORMAT             0x80D8
+#define GL_COLOR_TABLE_WIDTH              0x80D9
+#define GL_COLOR_TABLE_RED_SIZE           0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
+#define GL_CONSTANT_BORDER                0x8151
+#define GL_REPLICATE_BORDER               0x8153
+#define GL_CONVOLUTION_BORDER_COLOR       0x8154
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_TEXTURE0                       0x84C0
+#define GL_TEXTURE1                       0x84C1
+#define GL_TEXTURE2                       0x84C2
+#define GL_TEXTURE3                       0x84C3
+#define GL_TEXTURE4                       0x84C4
+#define GL_TEXTURE5                       0x84C5
+#define GL_TEXTURE6                       0x84C6
+#define GL_TEXTURE7                       0x84C7
+#define GL_TEXTURE8                       0x84C8
+#define GL_TEXTURE9                       0x84C9
+#define GL_TEXTURE10                      0x84CA
+#define GL_TEXTURE11                      0x84CB
+#define GL_TEXTURE12                      0x84CC
+#define GL_TEXTURE13                      0x84CD
+#define GL_TEXTURE14                      0x84CE
+#define GL_TEXTURE15                      0x84CF
+#define GL_TEXTURE16                      0x84D0
+#define GL_TEXTURE17                      0x84D1
+#define GL_TEXTURE18                      0x84D2
+#define GL_TEXTURE19                      0x84D3
+#define GL_TEXTURE20                      0x84D4
+#define GL_TEXTURE21                      0x84D5
+#define GL_TEXTURE22                      0x84D6
+#define GL_TEXTURE23                      0x84D7
+#define GL_TEXTURE24                      0x84D8
+#define GL_TEXTURE25                      0x84D9
+#define GL_TEXTURE26                      0x84DA
+#define GL_TEXTURE27                      0x84DB
+#define GL_TEXTURE28                      0x84DC
+#define GL_TEXTURE29                      0x84DD
+#define GL_TEXTURE30                      0x84DE
+#define GL_TEXTURE31                      0x84DF
+#define GL_ACTIVE_TEXTURE                 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
+#define GL_MAX_TEXTURE_UNITS              0x84E2
+#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
+#define GL_MULTISAMPLE                    0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
+#define GL_SAMPLE_COVERAGE                0x80A0
+#define GL_SAMPLE_BUFFERS                 0x80A8
+#define GL_SAMPLES                        0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
+#define GL_MULTISAMPLE_BIT                0x20000000
+#define GL_NORMAL_MAP                     0x8511
+#define GL_REFLECTION_MAP                 0x8512
+#define GL_TEXTURE_CUBE_MAP               0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
+#define GL_COMPRESSED_ALPHA               0x84E9
+#define GL_COMPRESSED_LUMINANCE           0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
+#define GL_COMPRESSED_INTENSITY           0x84EC
+#define GL_COMPRESSED_RGB                 0x84ED
+#define GL_COMPRESSED_RGBA                0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
+#define GL_TEXTURE_COMPRESSED             0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
+#define GL_CLAMP_TO_BORDER                0x812D
+#define GL_COMBINE                        0x8570
+#define GL_COMBINE_RGB                    0x8571
+#define GL_COMBINE_ALPHA                  0x8572
+#define GL_SOURCE0_RGB                    0x8580
+#define GL_SOURCE1_RGB                    0x8581
+#define GL_SOURCE2_RGB                    0x8582
+#define GL_SOURCE0_ALPHA                  0x8588
+#define GL_SOURCE1_ALPHA                  0x8589
+#define GL_SOURCE2_ALPHA                  0x858A
+#define GL_OPERAND0_RGB                   0x8590
+#define GL_OPERAND1_RGB                   0x8591
+#define GL_OPERAND2_RGB                   0x8592
+#define GL_OPERAND0_ALPHA                 0x8598
+#define GL_OPERAND1_ALPHA                 0x8599
+#define GL_OPERAND2_ALPHA                 0x859A
+#define GL_RGB_SCALE                      0x8573
+#define GL_ADD_SIGNED                     0x8574
+#define GL_INTERPOLATE                    0x8575
+#define GL_SUBTRACT                       0x84E7
+#define GL_CONSTANT                       0x8576
+#define GL_PRIMARY_COLOR                  0x8577
+#define GL_PREVIOUS                       0x8578
+#define GL_DOT3_RGB                       0x86AE
+#define GL_DOT3_RGBA                      0x86AF
+#endif
+
+#ifndef GL_VERSION_1_4
+#define GL_BLEND_DST_RGB                  0x80C8
+#define GL_BLEND_SRC_RGB                  0x80C9
+#define GL_BLEND_DST_ALPHA                0x80CA
+#define GL_BLEND_SRC_ALPHA                0x80CB
+#define GL_POINT_SIZE_MIN                 0x8126
+#define GL_POINT_SIZE_MAX                 0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
+#define GL_POINT_DISTANCE_ATTENUATION     0x8129
+#define GL_GENERATE_MIPMAP                0x8191
+#define GL_GENERATE_MIPMAP_HINT           0x8192
+#define GL_DEPTH_COMPONENT16              0x81A5
+#define GL_DEPTH_COMPONENT24              0x81A6
+#define GL_DEPTH_COMPONENT32              0x81A7
+#define GL_MIRRORED_REPEAT                0x8370
+#define GL_FOG_COORDINATE_SOURCE          0x8450
+#define GL_FOG_COORDINATE                 0x8451
+#define GL_FRAGMENT_DEPTH                 0x8452
+#define GL_CURRENT_FOG_COORDINATE         0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
+#define GL_FOG_COORDINATE_ARRAY           0x8457
+#define GL_COLOR_SUM                      0x8458
+#define GL_CURRENT_SECONDARY_COLOR        0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
+#define GL_SECONDARY_COLOR_ARRAY          0x845E
+#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
+#define GL_TEXTURE_FILTER_CONTROL         0x8500
+#define GL_TEXTURE_LOD_BIAS               0x8501
+#define GL_INCR_WRAP                      0x8507
+#define GL_DECR_WRAP                      0x8508
+#define GL_TEXTURE_DEPTH_SIZE             0x884A
+#define GL_DEPTH_TEXTURE_MODE             0x884B
+#define GL_TEXTURE_COMPARE_MODE           0x884C
+#define GL_TEXTURE_COMPARE_FUNC           0x884D
+#define GL_COMPARE_R_TO_TEXTURE           0x884E
+#endif
+
+#ifndef GL_VERSION_1_5
+#define GL_BUFFER_SIZE                    0x8764
+#define GL_BUFFER_USAGE                   0x8765
+#define GL_QUERY_COUNTER_BITS             0x8864
+#define GL_CURRENT_QUERY                  0x8865
+#define GL_QUERY_RESULT                   0x8866
+#define GL_QUERY_RESULT_AVAILABLE         0x8867
+#define GL_ARRAY_BUFFER                   0x8892
+#define GL_ELEMENT_ARRAY_BUFFER           0x8893
+#define GL_ARRAY_BUFFER_BINDING           0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+#define GL_READ_ONLY                      0x88B8
+#define GL_WRITE_ONLY                     0x88B9
+#define GL_READ_WRITE                     0x88BA
+#define GL_BUFFER_ACCESS                  0x88BB
+#define GL_BUFFER_MAPPED                  0x88BC
+#define GL_BUFFER_MAP_POINTER             0x88BD
+#define GL_STREAM_DRAW                    0x88E0
+#define GL_STREAM_READ                    0x88E1
+#define GL_STREAM_COPY                    0x88E2
+#define GL_STATIC_DRAW                    0x88E4
+#define GL_STATIC_READ                    0x88E5
+#define GL_STATIC_COPY                    0x88E6
+#define GL_DYNAMIC_DRAW                   0x88E8
+#define GL_DYNAMIC_READ                   0x88E9
+#define GL_DYNAMIC_COPY                   0x88EA
+#define GL_SAMPLES_PASSED                 0x8914
+#define GL_FOG_COORD_SRC                  GL_FOG_COORDINATE_SOURCE
+#define GL_FOG_COORD                      GL_FOG_COORDINATE
+#define GL_CURRENT_FOG_COORD              GL_CURRENT_FOG_COORDINATE
+#define GL_FOG_COORD_ARRAY_TYPE           GL_FOG_COORDINATE_ARRAY_TYPE
+#define GL_FOG_COORD_ARRAY_STRIDE         GL_FOG_COORDINATE_ARRAY_STRIDE
+#define GL_FOG_COORD_ARRAY_POINTER        GL_FOG_COORDINATE_ARRAY_POINTER
+#define GL_FOG_COORD_ARRAY                GL_FOG_COORDINATE_ARRAY
+#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
+#define GL_SRC0_RGB                       GL_SOURCE0_RGB
+#define GL_SRC1_RGB                       GL_SOURCE1_RGB
+#define GL_SRC2_RGB                       GL_SOURCE2_RGB
+#define GL_SRC0_ALPHA                     GL_SOURCE0_ALPHA
+#define GL_SRC1_ALPHA                     GL_SOURCE1_ALPHA
+#define GL_SRC2_ALPHA                     GL_SOURCE2_ALPHA
+#endif
+
+#ifndef GL_VERSION_2_0
+#define GL_BLEND_EQUATION_RGB             GL_BLEND_EQUATION
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
+#define GL_CURRENT_VERTEX_ATTRIB          0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
+#define GL_STENCIL_BACK_FUNC              0x8800
+#define GL_STENCIL_BACK_FAIL              0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
+#define GL_MAX_DRAW_BUFFERS               0x8824
+#define GL_DRAW_BUFFER0                   0x8825
+#define GL_DRAW_BUFFER1                   0x8826
+#define GL_DRAW_BUFFER2                   0x8827
+#define GL_DRAW_BUFFER3                   0x8828
+#define GL_DRAW_BUFFER4                   0x8829
+#define GL_DRAW_BUFFER5                   0x882A
+#define GL_DRAW_BUFFER6                   0x882B
+#define GL_DRAW_BUFFER7                   0x882C
+#define GL_DRAW_BUFFER8                   0x882D
+#define GL_DRAW_BUFFER9                   0x882E
+#define GL_DRAW_BUFFER10                  0x882F
+#define GL_DRAW_BUFFER11                  0x8830
+#define GL_DRAW_BUFFER12                  0x8831
+#define GL_DRAW_BUFFER13                  0x8832
+#define GL_DRAW_BUFFER14                  0x8833
+#define GL_DRAW_BUFFER15                  0x8834
+#define GL_BLEND_EQUATION_ALPHA           0x883D
+#define GL_POINT_SPRITE                   0x8861
+#define GL_COORD_REPLACE                  0x8862
+#define GL_MAX_VERTEX_ATTRIBS             0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#define GL_MAX_TEXTURE_COORDS             0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
+#define GL_FRAGMENT_SHADER                0x8B30
+#define GL_VERTEX_SHADER                  0x8B31
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
+#define GL_MAX_VARYING_FLOATS             0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_SHADER_TYPE                    0x8B4F
+#define GL_FLOAT_VEC2                     0x8B50
+#define GL_FLOAT_VEC3                     0x8B51
+#define GL_FLOAT_VEC4                     0x8B52
+#define GL_INT_VEC2                       0x8B53
+#define GL_INT_VEC3                       0x8B54
+#define GL_INT_VEC4                       0x8B55
+#define GL_BOOL                           0x8B56
+#define GL_BOOL_VEC2                      0x8B57
+#define GL_BOOL_VEC3                      0x8B58
+#define GL_BOOL_VEC4                      0x8B59
+#define GL_FLOAT_MAT2                     0x8B5A
+#define GL_FLOAT_MAT3                     0x8B5B
+#define GL_FLOAT_MAT4                     0x8B5C
+#define GL_SAMPLER_1D                     0x8B5D
+#define GL_SAMPLER_2D                     0x8B5E
+#define GL_SAMPLER_3D                     0x8B5F
+#define GL_SAMPLER_CUBE                   0x8B60
+#define GL_SAMPLER_1D_SHADOW              0x8B61
+#define GL_SAMPLER_2D_SHADOW              0x8B62
+#define GL_DELETE_STATUS                  0x8B80
+#define GL_COMPILE_STATUS                 0x8B81
+#define GL_LINK_STATUS                    0x8B82
+#define GL_VALIDATE_STATUS                0x8B83
+#define GL_INFO_LOG_LENGTH                0x8B84
+#define GL_ATTACHED_SHADERS               0x8B85
+#define GL_ACTIVE_UNIFORMS                0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
+#define GL_SHADER_SOURCE_LENGTH           0x8B88
+#define GL_ACTIVE_ATTRIBUTES              0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
+#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
+#define GL_CURRENT_PROGRAM                0x8B8D
+#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
+#define GL_LOWER_LEFT                     0x8CA1
+#define GL_UPPER_LEFT                     0x8CA2
+#define GL_STENCIL_BACK_REF               0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
+#endif
+
+#ifndef GL_VERSION_2_1
+#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
+#define GL_PIXEL_PACK_BUFFER              0x88EB
+#define GL_PIXEL_UNPACK_BUFFER            0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
+#define GL_FLOAT_MAT2x3                   0x8B65
+#define GL_FLOAT_MAT2x4                   0x8B66
+#define GL_FLOAT_MAT3x2                   0x8B67
+#define GL_FLOAT_MAT3x4                   0x8B68
+#define GL_FLOAT_MAT4x2                   0x8B69
+#define GL_FLOAT_MAT4x3                   0x8B6A
+#define GL_SRGB                           0x8C40
+#define GL_SRGB8                          0x8C41
+#define GL_SRGB_ALPHA                     0x8C42
+#define GL_SRGB8_ALPHA8                   0x8C43
+#define GL_SLUMINANCE_ALPHA               0x8C44
+#define GL_SLUMINANCE8_ALPHA8             0x8C45
+#define GL_SLUMINANCE                     0x8C46
+#define GL_SLUMINANCE8                    0x8C47
+#define GL_COMPRESSED_SRGB                0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
+#define GL_COMPRESSED_SLUMINANCE          0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA    0x8C4B
+#endif
+
+#ifndef GL_ARB_multitexture
+#define GL_TEXTURE0_ARB                   0x84C0
+#define GL_TEXTURE1_ARB                   0x84C1
+#define GL_TEXTURE2_ARB                   0x84C2
+#define GL_TEXTURE3_ARB                   0x84C3
+#define GL_TEXTURE4_ARB                   0x84C4
+#define GL_TEXTURE5_ARB                   0x84C5
+#define GL_TEXTURE6_ARB                   0x84C6
+#define GL_TEXTURE7_ARB                   0x84C7
+#define GL_TEXTURE8_ARB                   0x84C8
+#define GL_TEXTURE9_ARB                   0x84C9
+#define GL_TEXTURE10_ARB                  0x84CA
+#define GL_TEXTURE11_ARB                  0x84CB
+#define GL_TEXTURE12_ARB                  0x84CC
+#define GL_TEXTURE13_ARB                  0x84CD
+#define GL_TEXTURE14_ARB                  0x84CE
+#define GL_TEXTURE15_ARB                  0x84CF
+#define GL_TEXTURE16_ARB                  0x84D0
+#define GL_TEXTURE17_ARB                  0x84D1
+#define GL_TEXTURE18_ARB                  0x84D2
+#define GL_TEXTURE19_ARB                  0x84D3
+#define GL_TEXTURE20_ARB                  0x84D4
+#define GL_TEXTURE21_ARB                  0x84D5
+#define GL_TEXTURE22_ARB                  0x84D6
+#define GL_TEXTURE23_ARB                  0x84D7
+#define GL_TEXTURE24_ARB                  0x84D8
+#define GL_TEXTURE25_ARB                  0x84D9
+#define GL_TEXTURE26_ARB                  0x84DA
+#define GL_TEXTURE27_ARB                  0x84DB
+#define GL_TEXTURE28_ARB                  0x84DC
+#define GL_TEXTURE29_ARB                  0x84DD
+#define GL_TEXTURE30_ARB                  0x84DE
+#define GL_TEXTURE31_ARB                  0x84DF
+#define GL_ACTIVE_TEXTURE_ARB             0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
+#endif
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
+#endif
+
+#ifndef GL_ARB_multisample
+#define GL_MULTISAMPLE_ARB                0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
+#define GL_SAMPLE_COVERAGE_ARB            0x80A0
+#define GL_SAMPLE_BUFFERS_ARB             0x80A8
+#define GL_SAMPLES_ARB                    0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
+#define GL_MULTISAMPLE_BIT_ARB            0x20000000
+#endif
+
+#ifndef GL_ARB_texture_env_add
+#endif
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_NORMAL_MAP_ARB                 0x8511
+#define GL_REFLECTION_MAP_ARB             0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
+#endif
+
+#ifndef GL_ARB_texture_compression
+#define GL_COMPRESSED_ALPHA_ARB           0x84E9
+#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
+#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
+#define GL_COMPRESSED_RGB_ARB             0x84ED
+#define GL_COMPRESSED_RGBA_ARB            0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
+#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
+#endif
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_CLAMP_TO_BORDER_ARB            0x812D
+#endif
+
+#ifndef GL_ARB_point_parameters
+#define GL_POINT_SIZE_MIN_ARB             0x8126
+#define GL_POINT_SIZE_MAX_ARB             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
+#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
+#endif
+
+#ifndef GL_ARB_vertex_blend
+#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
+#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
+#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
+#define GL_VERTEX_BLEND_ARB               0x86A7
+#define GL_CURRENT_WEIGHT_ARB             0x86A8
+#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
+#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
+#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
+#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
+#define GL_WEIGHT_ARRAY_ARB               0x86AD
+#define GL_MODELVIEW0_ARB                 0x1700
+#define GL_MODELVIEW1_ARB                 0x850A
+#define GL_MODELVIEW2_ARB                 0x8722
+#define GL_MODELVIEW3_ARB                 0x8723
+#define GL_MODELVIEW4_ARB                 0x8724
+#define GL_MODELVIEW5_ARB                 0x8725
+#define GL_MODELVIEW6_ARB                 0x8726
+#define GL_MODELVIEW7_ARB                 0x8727
+#define GL_MODELVIEW8_ARB                 0x8728
+#define GL_MODELVIEW9_ARB                 0x8729
+#define GL_MODELVIEW10_ARB                0x872A
+#define GL_MODELVIEW11_ARB                0x872B
+#define GL_MODELVIEW12_ARB                0x872C
+#define GL_MODELVIEW13_ARB                0x872D
+#define GL_MODELVIEW14_ARB                0x872E
+#define GL_MODELVIEW15_ARB                0x872F
+#define GL_MODELVIEW16_ARB                0x8730
+#define GL_MODELVIEW17_ARB                0x8731
+#define GL_MODELVIEW18_ARB                0x8732
+#define GL_MODELVIEW19_ARB                0x8733
+#define GL_MODELVIEW20_ARB                0x8734
+#define GL_MODELVIEW21_ARB                0x8735
+#define GL_MODELVIEW22_ARB                0x8736
+#define GL_MODELVIEW23_ARB                0x8737
+#define GL_MODELVIEW24_ARB                0x8738
+#define GL_MODELVIEW25_ARB                0x8739
+#define GL_MODELVIEW26_ARB                0x873A
+#define GL_MODELVIEW27_ARB                0x873B
+#define GL_MODELVIEW28_ARB                0x873C
+#define GL_MODELVIEW29_ARB                0x873D
+#define GL_MODELVIEW30_ARB                0x873E
+#define GL_MODELVIEW31_ARB                0x873F
+#endif
+
+#ifndef GL_ARB_matrix_palette
+#define GL_MATRIX_PALETTE_ARB             0x8840
+#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
+#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
+#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
+#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
+#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
+#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
+#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
+#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
+#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
+#endif
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_COMBINE_ARB                    0x8570
+#define GL_COMBINE_RGB_ARB                0x8571
+#define GL_COMBINE_ALPHA_ARB              0x8572
+#define GL_SOURCE0_RGB_ARB                0x8580
+#define GL_SOURCE1_RGB_ARB                0x8581
+#define GL_SOURCE2_RGB_ARB                0x8582
+#define GL_SOURCE0_ALPHA_ARB              0x8588
+#define GL_SOURCE1_ALPHA_ARB              0x8589
+#define GL_SOURCE2_ALPHA_ARB              0x858A
+#define GL_OPERAND0_RGB_ARB               0x8590
+#define GL_OPERAND1_RGB_ARB               0x8591
+#define GL_OPERAND2_RGB_ARB               0x8592
+#define GL_OPERAND0_ALPHA_ARB             0x8598
+#define GL_OPERAND1_ALPHA_ARB             0x8599
+#define GL_OPERAND2_ALPHA_ARB             0x859A
+#define GL_RGB_SCALE_ARB                  0x8573
+#define GL_ADD_SIGNED_ARB                 0x8574
+#define GL_INTERPOLATE_ARB                0x8575
+#define GL_SUBTRACT_ARB                   0x84E7
+#define GL_CONSTANT_ARB                   0x8576
+#define GL_PRIMARY_COLOR_ARB              0x8577
+#define GL_PREVIOUS_ARB                   0x8578
+#endif
+
+#ifndef GL_ARB_texture_env_crossbar
+#endif
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_DOT3_RGB_ARB                   0x86AE
+#define GL_DOT3_RGBA_ARB                  0x86AF
+#endif
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_MIRRORED_REPEAT_ARB            0x8370
+#endif
+
+#ifndef GL_ARB_depth_texture
+#define GL_DEPTH_COMPONENT16_ARB          0x81A5
+#define GL_DEPTH_COMPONENT24_ARB          0x81A6
+#define GL_DEPTH_COMPONENT32_ARB          0x81A7
+#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
+#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
+#endif
+
+#ifndef GL_ARB_shadow
+#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
+#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
+#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
+#endif
+
+#ifndef GL_ARB_shadow_ambient
+#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
+#endif
+
+#ifndef GL_ARB_window_pos
+#endif
+
+#ifndef GL_ARB_vertex_program
+#define GL_COLOR_SUM_ARB                  0x8458
+#define GL_VERTEX_PROGRAM_ARB             0x8620
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
+#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
+#define GL_PROGRAM_LENGTH_ARB             0x8627
+#define GL_PROGRAM_STRING_ARB             0x8628
+#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
+#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
+#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
+#define GL_CURRENT_MATRIX_ARB             0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
+#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
+#define GL_PROGRAM_BINDING_ARB            0x8677
+#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
+#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
+#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
+#define GL_PROGRAM_FORMAT_ARB             0x8876
+#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
+#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
+#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
+#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
+#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
+#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
+#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
+#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
+#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
+#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
+#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
+#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
+#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
+#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
+#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
+#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
+#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
+#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
+#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
+#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
+#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
+#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
+#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
+#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
+#define GL_MATRIX0_ARB                    0x88C0
+#define GL_MATRIX1_ARB                    0x88C1
+#define GL_MATRIX2_ARB                    0x88C2
+#define GL_MATRIX3_ARB                    0x88C3
+#define GL_MATRIX4_ARB                    0x88C4
+#define GL_MATRIX5_ARB                    0x88C5
+#define GL_MATRIX6_ARB                    0x88C6
+#define GL_MATRIX7_ARB                    0x88C7
+#define GL_MATRIX8_ARB                    0x88C8
+#define GL_MATRIX9_ARB                    0x88C9
+#define GL_MATRIX10_ARB                   0x88CA
+#define GL_MATRIX11_ARB                   0x88CB
+#define GL_MATRIX12_ARB                   0x88CC
+#define GL_MATRIX13_ARB                   0x88CD
+#define GL_MATRIX14_ARB                   0x88CE
+#define GL_MATRIX15_ARB                   0x88CF
+#define GL_MATRIX16_ARB                   0x88D0
+#define GL_MATRIX17_ARB                   0x88D1
+#define GL_MATRIX18_ARB                   0x88D2
+#define GL_MATRIX19_ARB                   0x88D3
+#define GL_MATRIX20_ARB                   0x88D4
+#define GL_MATRIX21_ARB                   0x88D5
+#define GL_MATRIX22_ARB                   0x88D6
+#define GL_MATRIX23_ARB                   0x88D7
+#define GL_MATRIX24_ARB                   0x88D8
+#define GL_MATRIX25_ARB                   0x88D9
+#define GL_MATRIX26_ARB                   0x88DA
+#define GL_MATRIX27_ARB                   0x88DB
+#define GL_MATRIX28_ARB                   0x88DC
+#define GL_MATRIX29_ARB                   0x88DD
+#define GL_MATRIX30_ARB                   0x88DE
+#define GL_MATRIX31_ARB                   0x88DF
+#endif
+
+#ifndef GL_ARB_fragment_program
+#define GL_FRAGMENT_PROGRAM_ARB           0x8804
+#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
+#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
+#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
+#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
+#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
+#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
+#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
+#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
+#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
+#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
+#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
+#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
+#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_BUFFER_SIZE_ARB                0x8764
+#define GL_BUFFER_USAGE_ARB               0x8765
+#define GL_ARRAY_BUFFER_ARB               0x8892
+#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
+#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
+#define GL_READ_ONLY_ARB                  0x88B8
+#define GL_WRITE_ONLY_ARB                 0x88B9
+#define GL_READ_WRITE_ARB                 0x88BA
+#define GL_BUFFER_ACCESS_ARB              0x88BB
+#define GL_BUFFER_MAPPED_ARB              0x88BC
+#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
+#define GL_STREAM_DRAW_ARB                0x88E0
+#define GL_STREAM_READ_ARB                0x88E1
+#define GL_STREAM_COPY_ARB                0x88E2
+#define GL_STATIC_DRAW_ARB                0x88E4
+#define GL_STATIC_READ_ARB                0x88E5
+#define GL_STATIC_COPY_ARB                0x88E6
+#define GL_DYNAMIC_DRAW_ARB               0x88E8
+#define GL_DYNAMIC_READ_ARB               0x88E9
+#define GL_DYNAMIC_COPY_ARB               0x88EA
+#endif
+
+#ifndef GL_ARB_occlusion_query
+#define GL_QUERY_COUNTER_BITS_ARB         0x8864
+#define GL_CURRENT_QUERY_ARB              0x8865
+#define GL_QUERY_RESULT_ARB               0x8866
+#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
+#define GL_SAMPLES_PASSED_ARB             0x8914
+#endif
+
+#ifndef GL_ARB_shader_objects
+#define GL_PROGRAM_OBJECT_ARB             0x8B40
+#define GL_SHADER_OBJECT_ARB              0x8B48
+#define GL_OBJECT_TYPE_ARB                0x8B4E
+#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
+#define GL_FLOAT_VEC2_ARB                 0x8B50
+#define GL_FLOAT_VEC3_ARB                 0x8B51
+#define GL_FLOAT_VEC4_ARB                 0x8B52
+#define GL_INT_VEC2_ARB                   0x8B53
+#define GL_INT_VEC3_ARB                   0x8B54
+#define GL_INT_VEC4_ARB                   0x8B55
+#define GL_BOOL_ARB                       0x8B56
+#define GL_BOOL_VEC2_ARB                  0x8B57
+#define GL_BOOL_VEC3_ARB                  0x8B58
+#define GL_BOOL_VEC4_ARB                  0x8B59
+#define GL_FLOAT_MAT2_ARB                 0x8B5A
+#define GL_FLOAT_MAT3_ARB                 0x8B5B
+#define GL_FLOAT_MAT4_ARB                 0x8B5C
+#define GL_SAMPLER_1D_ARB                 0x8B5D
+#define GL_SAMPLER_2D_ARB                 0x8B5E
+#define GL_SAMPLER_3D_ARB                 0x8B5F
+#define GL_SAMPLER_CUBE_ARB               0x8B60
+#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
+#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
+#define GL_SAMPLER_2D_RECT_ARB            0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
+#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
+#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
+#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
+#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
+#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
+#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
+#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
+#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
+#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
+#endif
+
+#ifndef GL_ARB_vertex_shader
+#define GL_VERTEX_SHADER_ARB              0x8B31
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
+#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
+#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
+#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
+#endif
+
+#ifndef GL_ARB_fragment_shader
+#define GL_FRAGMENT_SHADER_ARB            0x8B30
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
+#endif
+
+#ifndef GL_ARB_shading_language_100
+#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
+#endif
+
+#ifndef GL_ARB_texture_non_power_of_two
+#endif
+
+#ifndef GL_ARB_point_sprite
+#define GL_POINT_SPRITE_ARB               0x8861
+#define GL_COORD_REPLACE_ARB              0x8862
+#endif
+
+#ifndef GL_ARB_fragment_program_shadow
+#endif
+
+#ifndef GL_ARB_draw_buffers
+#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
+#define GL_DRAW_BUFFER0_ARB               0x8825
+#define GL_DRAW_BUFFER1_ARB               0x8826
+#define GL_DRAW_BUFFER2_ARB               0x8827
+#define GL_DRAW_BUFFER3_ARB               0x8828
+#define GL_DRAW_BUFFER4_ARB               0x8829
+#define GL_DRAW_BUFFER5_ARB               0x882A
+#define GL_DRAW_BUFFER6_ARB               0x882B
+#define GL_DRAW_BUFFER7_ARB               0x882C
+#define GL_DRAW_BUFFER8_ARB               0x882D
+#define GL_DRAW_BUFFER9_ARB               0x882E
+#define GL_DRAW_BUFFER10_ARB              0x882F
+#define GL_DRAW_BUFFER11_ARB              0x8830
+#define GL_DRAW_BUFFER12_ARB              0x8831
+#define GL_DRAW_BUFFER13_ARB              0x8832
+#define GL_DRAW_BUFFER14_ARB              0x8833
+#define GL_DRAW_BUFFER15_ARB              0x8834
+#endif
+
+#ifndef GL_ARB_texture_rectangle
+#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
+#endif
+
+#ifndef GL_ARB_color_buffer_float
+#define GL_RGBA_FLOAT_MODE_ARB            0x8820
+#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
+#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
+#define GL_CLAMP_READ_COLOR_ARB           0x891C
+#define GL_FIXED_ONLY_ARB                 0x891D
+#endif
+
+#ifndef GL_ARB_half_float_pixel
+#define GL_HALF_FLOAT_ARB                 0x140B
+#endif
+
+#ifndef GL_ARB_texture_float
+#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
+#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
+#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
+#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
+#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
+#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
+#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
+#define GL_RGBA32F_ARB                    0x8814
+#define GL_RGB32F_ARB                     0x8815
+#define GL_ALPHA32F_ARB                   0x8816
+#define GL_INTENSITY32F_ARB               0x8817
+#define GL_LUMINANCE32F_ARB               0x8818
+#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
+#define GL_RGBA16F_ARB                    0x881A
+#define GL_RGB16F_ARB                     0x881B
+#define GL_ALPHA16F_ARB                   0x881C
+#define GL_INTENSITY16F_ARB               0x881D
+#define GL_LUMINANCE16F_ARB               0x881E
+#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
+#endif
+
+#ifndef GL_ARB_pixel_buffer_object
+#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
+#endif
+
+#ifndef GL_EXT_abgr
+#define GL_ABGR_EXT                       0x8000
+#endif
+
+#ifndef GL_EXT_blend_color
+#define GL_CONSTANT_COLOR_EXT             0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
+#define GL_CONSTANT_ALPHA_EXT             0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
+#define GL_BLEND_COLOR_EXT                0x8005
+#endif
+
+#ifndef GL_EXT_polygon_offset
+#define GL_POLYGON_OFFSET_EXT             0x8037
+#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
+#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
+#endif
+
+#ifndef GL_EXT_texture
+#define GL_ALPHA4_EXT                     0x803B
+#define GL_ALPHA8_EXT                     0x803C
+#define GL_ALPHA12_EXT                    0x803D
+#define GL_ALPHA16_EXT                    0x803E
+#define GL_LUMINANCE4_EXT                 0x803F
+#define GL_LUMINANCE8_EXT                 0x8040
+#define GL_LUMINANCE12_EXT                0x8041
+#define GL_LUMINANCE16_EXT                0x8042
+#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
+#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
+#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
+#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
+#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
+#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
+#define GL_INTENSITY_EXT                  0x8049
+#define GL_INTENSITY4_EXT                 0x804A
+#define GL_INTENSITY8_EXT                 0x804B
+#define GL_INTENSITY12_EXT                0x804C
+#define GL_INTENSITY16_EXT                0x804D
+#define GL_RGB2_EXT                       0x804E
+#define GL_RGB4_EXT                       0x804F
+#define GL_RGB5_EXT                       0x8050
+#define GL_RGB8_EXT                       0x8051
+#define GL_RGB10_EXT                      0x8052
+#define GL_RGB12_EXT                      0x8053
+#define GL_RGB16_EXT                      0x8054
+#define GL_RGBA2_EXT                      0x8055
+#define GL_RGBA4_EXT                      0x8056
+#define GL_RGB5_A1_EXT                    0x8057
+#define GL_RGBA8_EXT                      0x8058
+#define GL_RGB10_A2_EXT                   0x8059
+#define GL_RGBA12_EXT                     0x805A
+#define GL_RGBA16_EXT                     0x805B
+#define GL_TEXTURE_RED_SIZE_EXT           0x805C
+#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
+#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
+#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
+#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
+#define GL_REPLACE_EXT                    0x8062
+#define GL_PROXY_TEXTURE_1D_EXT           0x8063
+#define GL_PROXY_TEXTURE_2D_EXT           0x8064
+#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
+#endif
+
+#ifndef GL_EXT_texture3D
+#define GL_PACK_SKIP_IMAGES_EXT           0x806B
+#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
+#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
+#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
+#define GL_TEXTURE_3D_EXT                 0x806F
+#define GL_PROXY_TEXTURE_3D_EXT           0x8070
+#define GL_TEXTURE_DEPTH_EXT              0x8071
+#define GL_TEXTURE_WRAP_R_EXT             0x8072
+#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
+#endif
+
+#ifndef GL_SGIS_texture_filter4
+#define GL_FILTER4_SGIS                   0x8146
+#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
+#endif
+
+#ifndef GL_EXT_subtexture
+#endif
+
+#ifndef GL_EXT_copy_texture
+#endif
+
+#ifndef GL_EXT_histogram
+#define GL_HISTOGRAM_EXT                  0x8024
+#define GL_PROXY_HISTOGRAM_EXT            0x8025
+#define GL_HISTOGRAM_WIDTH_EXT            0x8026
+#define GL_HISTOGRAM_FORMAT_EXT           0x8027
+#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
+#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
+#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
+#define GL_HISTOGRAM_SINK_EXT             0x802D
+#define GL_MINMAX_EXT                     0x802E
+#define GL_MINMAX_FORMAT_EXT              0x802F
+#define GL_MINMAX_SINK_EXT                0x8030
+#define GL_TABLE_TOO_LARGE_EXT            0x8031
+#endif
+
+#ifndef GL_EXT_convolution
+#define GL_CONVOLUTION_1D_EXT             0x8010
+#define GL_CONVOLUTION_2D_EXT             0x8011
+#define GL_SEPARABLE_2D_EXT               0x8012
+#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
+#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
+#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
+#define GL_REDUCE_EXT                     0x8016
+#define GL_CONVOLUTION_FORMAT_EXT         0x8017
+#define GL_CONVOLUTION_WIDTH_EXT          0x8018
+#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
+#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
+#endif
+
+#ifndef GL_SGI_color_matrix
+#define GL_COLOR_MATRIX_SGI               0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
+#endif
+
+#ifndef GL_SGI_color_table
+#define GL_COLOR_TABLE_SGI                0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
+#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
+#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
+#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
+#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
+#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
+#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
+#endif
+
+#ifndef GL_SGIS_pixel_texture
+#define GL_PIXEL_TEXTURE_SGIS             0x8353
+#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
+#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
+#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
+#endif
+
+#ifndef GL_SGIX_pixel_texture
+#define GL_PIXEL_TEX_GEN_SGIX             0x8139
+#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
+#endif
+
+#ifndef GL_SGIS_texture4D
+#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
+#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
+#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
+#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
+#define GL_TEXTURE_4D_SGIS                0x8134
+#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
+#define GL_TEXTURE_4DSIZE_SGIS            0x8136
+#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
+#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
+#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
+#endif
+
+#ifndef GL_SGI_texture_color_table
+#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
+#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
+#endif
+
+#ifndef GL_EXT_cmyka
+#define GL_CMYK_EXT                       0x800C
+#define GL_CMYKA_EXT                      0x800D
+#define GL_PACK_CMYK_HINT_EXT             0x800E
+#define GL_UNPACK_CMYK_HINT_EXT           0x800F
+#endif
+
+#ifndef GL_EXT_texture_object
+#define GL_TEXTURE_PRIORITY_EXT           0x8066
+#define GL_TEXTURE_RESIDENT_EXT           0x8067
+#define GL_TEXTURE_1D_BINDING_EXT         0x8068
+#define GL_TEXTURE_2D_BINDING_EXT         0x8069
+#define GL_TEXTURE_3D_BINDING_EXT         0x806A
+#endif
+
+#ifndef GL_SGIS_detail_texture
+#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
+#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
+#define GL_LINEAR_DETAIL_SGIS             0x8097
+#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
+#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
+#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
+#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
+#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
+#endif
+
+#ifndef GL_SGIS_sharpen_texture
+#define GL_LINEAR_SHARPEN_SGIS            0x80AD
+#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
+#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
+#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
+#endif
+
+#ifndef GL_EXT_packed_pixels
+#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
+#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
+#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
+#endif
+
+#ifndef GL_SGIS_texture_lod
+#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
+#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
+#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
+#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
+#endif
+
+#ifndef GL_SGIS_multisample
+#define GL_MULTISAMPLE_SGIS               0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
+#define GL_SAMPLE_MASK_SGIS               0x80A0
+#define GL_1PASS_SGIS                     0x80A1
+#define GL_2PASS_0_SGIS                   0x80A2
+#define GL_2PASS_1_SGIS                   0x80A3
+#define GL_4PASS_0_SGIS                   0x80A4
+#define GL_4PASS_1_SGIS                   0x80A5
+#define GL_4PASS_2_SGIS                   0x80A6
+#define GL_4PASS_3_SGIS                   0x80A7
+#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
+#define GL_SAMPLES_SGIS                   0x80A9
+#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
+#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
+#define GL_SAMPLE_PATTERN_SGIS            0x80AC
+#endif
+
+#ifndef GL_EXT_rescale_normal
+#define GL_RESCALE_NORMAL_EXT             0x803A
+#endif
+
+#ifndef GL_EXT_vertex_array
+#define GL_VERTEX_ARRAY_EXT               0x8074
+#define GL_NORMAL_ARRAY_EXT               0x8075
+#define GL_COLOR_ARRAY_EXT                0x8076
+#define GL_INDEX_ARRAY_EXT                0x8077
+#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
+#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
+#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
+#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
+#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
+#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
+#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
+#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
+#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
+#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
+#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
+#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
+#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
+#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
+#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
+#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
+#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
+#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
+#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
+#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
+#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
+#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
+#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
+#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
+#endif
+
+#ifndef GL_EXT_misc_attribute
+#endif
+
+#ifndef GL_SGIS_generate_mipmap
+#define GL_GENERATE_MIPMAP_SGIS           0x8191
+#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
+#endif
+
+#ifndef GL_SGIX_clipmap
+#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
+#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
+#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
+#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
+#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
+#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
+#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
+#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
+#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
+#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
+#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
+#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
+#endif
+
+#ifndef GL_SGIX_shadow
+#define GL_TEXTURE_COMPARE_SGIX           0x819A
+#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
+#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
+#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
+#endif
+
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_CLAMP_TO_EDGE_SGIS             0x812F
+#endif
+
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_CLAMP_TO_BORDER_SGIS           0x812D
+#endif
+
+#ifndef GL_EXT_blend_minmax
+#define GL_FUNC_ADD_EXT                   0x8006
+#define GL_MIN_EXT                        0x8007
+#define GL_MAX_EXT                        0x8008
+#define GL_BLEND_EQUATION_EXT             0x8009
+#endif
+
+#ifndef GL_EXT_blend_subtract
+#define GL_FUNC_SUBTRACT_EXT              0x800A
+#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
+#endif
+
+#ifndef GL_EXT_blend_logic_op
+#endif
+
+#ifndef GL_SGIX_interlace
+#define GL_INTERLACE_SGIX                 0x8094
+#endif
+
+#ifndef GL_SGIX_pixel_tiles
+#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
+#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
+#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
+#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
+#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
+#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
+#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
+#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
+#endif
+
+#ifndef GL_SGIS_texture_select
+#define GL_DUAL_ALPHA4_SGIS               0x8110
+#define GL_DUAL_ALPHA8_SGIS               0x8111
+#define GL_DUAL_ALPHA12_SGIS              0x8112
+#define GL_DUAL_ALPHA16_SGIS              0x8113
+#define GL_DUAL_LUMINANCE4_SGIS           0x8114
+#define GL_DUAL_LUMINANCE8_SGIS           0x8115
+#define GL_DUAL_LUMINANCE12_SGIS          0x8116
+#define GL_DUAL_LUMINANCE16_SGIS          0x8117
+#define GL_DUAL_INTENSITY4_SGIS           0x8118
+#define GL_DUAL_INTENSITY8_SGIS           0x8119
+#define GL_DUAL_INTENSITY12_SGIS          0x811A
+#define GL_DUAL_INTENSITY16_SGIS          0x811B
+#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
+#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
+#define GL_QUAD_ALPHA4_SGIS               0x811E
+#define GL_QUAD_ALPHA8_SGIS               0x811F
+#define GL_QUAD_LUMINANCE4_SGIS           0x8120
+#define GL_QUAD_LUMINANCE8_SGIS           0x8121
+#define GL_QUAD_INTENSITY4_SGIS           0x8122
+#define GL_QUAD_INTENSITY8_SGIS           0x8123
+#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
+#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
+#endif
+
+#ifndef GL_SGIX_sprite
+#define GL_SPRITE_SGIX                    0x8148
+#define GL_SPRITE_MODE_SGIX               0x8149
+#define GL_SPRITE_AXIS_SGIX               0x814A
+#define GL_SPRITE_TRANSLATION_SGIX        0x814B
+#define GL_SPRITE_AXIAL_SGIX              0x814C
+#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
+#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
+#endif
+
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
+#endif
+
+#ifndef GL_EXT_point_parameters
+#define GL_POINT_SIZE_MIN_EXT             0x8126
+#define GL_POINT_SIZE_MAX_EXT             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
+#define GL_DISTANCE_ATTENUATION_EXT       0x8129
+#endif
+
+#ifndef GL_SGIS_point_parameters
+#define GL_POINT_SIZE_MIN_SGIS            0x8126
+#define GL_POINT_SIZE_MAX_SGIS            0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
+#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
+#endif
+
+#ifndef GL_SGIX_instruments
+#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
+#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
+#endif
+
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
+#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
+#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
+#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
+#endif
+
+#ifndef GL_SGIX_framezoom
+#define GL_FRAMEZOOM_SGIX                 0x818B
+#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
+#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
+#endif
+
+#ifndef GL_SGIX_tag_sample_buffer
+#endif
+
+#ifndef GL_FfdMaskSGIX
+#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
+#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
+#endif
+
+#ifndef GL_SGIX_polynomial_ffd
+#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
+#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
+#define GL_DEFORMATIONS_MASK_SGIX         0x8196
+#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
+#endif
+
+#ifndef GL_SGIX_reference_plane
+#define GL_REFERENCE_PLANE_SGIX           0x817D
+#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
+#endif
+
+#ifndef GL_SGIX_flush_raster
+#endif
+
+#ifndef GL_SGIX_depth_texture
+#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
+#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
+#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
+#endif
+
+#ifndef GL_SGIS_fog_function
+#define GL_FOG_FUNC_SGIS                  0x812A
+#define GL_FOG_FUNC_POINTS_SGIS           0x812B
+#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
+#endif
+
+#ifndef GL_SGIX_fog_offset
+#define GL_FOG_OFFSET_SGIX                0x8198
+#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
+#endif
+
+#ifndef GL_HP_image_transform
+#define GL_IMAGE_SCALE_X_HP               0x8155
+#define GL_IMAGE_SCALE_Y_HP               0x8156
+#define GL_IMAGE_TRANSLATE_X_HP           0x8157
+#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
+#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
+#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
+#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
+#define GL_IMAGE_MAG_FILTER_HP            0x815C
+#define GL_IMAGE_MIN_FILTER_HP            0x815D
+#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
+#define GL_CUBIC_HP                       0x815F
+#define GL_AVERAGE_HP                     0x8160
+#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
+#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
+#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
+#endif
+
+#ifndef GL_HP_convolution_border_modes
+#define GL_IGNORE_BORDER_HP               0x8150
+#define GL_CONSTANT_BORDER_HP             0x8151
+#define GL_REPLICATE_BORDER_HP            0x8153
+#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
+#endif
+
+#ifndef GL_INGR_palette_buffer
+#endif
+
+#ifndef GL_SGIX_texture_add_env
+#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
+#endif
+
+#ifndef GL_EXT_color_subtable
+#endif
+
+#ifndef GL_PGI_vertex_hints
+#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
+#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
+#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
+#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
+#define GL_COLOR3_BIT_PGI                 0x00010000
+#define GL_COLOR4_BIT_PGI                 0x00020000
+#define GL_EDGEFLAG_BIT_PGI               0x00040000
+#define GL_INDEX_BIT_PGI                  0x00080000
+#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
+#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
+#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
+#define GL_MAT_EMISSION_BIT_PGI           0x00800000
+#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
+#define GL_MAT_SHININESS_BIT_PGI          0x02000000
+#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
+#define GL_NORMAL_BIT_PGI                 0x08000000
+#define GL_TEXCOORD1_BIT_PGI              0x10000000
+#define GL_TEXCOORD2_BIT_PGI              0x20000000
+#define GL_TEXCOORD3_BIT_PGI              0x40000000
+#define GL_TEXCOORD4_BIT_PGI              0x80000000
+#define GL_VERTEX23_BIT_PGI               0x00000004
+#define GL_VERTEX4_BIT_PGI                0x00000008
+#endif
+
+#ifndef GL_PGI_misc_hints
+#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
+#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
+#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
+#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
+#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
+#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
+#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
+#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
+#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
+#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
+#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
+#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
+#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
+#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
+#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
+#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
+#define GL_CLIP_NEAR_HINT_PGI             0x1A220
+#define GL_CLIP_FAR_HINT_PGI              0x1A221
+#define GL_WIDE_LINE_HINT_PGI             0x1A222
+#define GL_BACK_NORMALS_HINT_PGI          0x1A223
+#endif
+
+#ifndef GL_EXT_paletted_texture
+#define GL_COLOR_INDEX1_EXT               0x80E2
+#define GL_COLOR_INDEX2_EXT               0x80E3
+#define GL_COLOR_INDEX4_EXT               0x80E4
+#define GL_COLOR_INDEX8_EXT               0x80E5
+#define GL_COLOR_INDEX12_EXT              0x80E6
+#define GL_COLOR_INDEX16_EXT              0x80E7
+#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
+#endif
+
+#ifndef GL_EXT_clip_volume_hint
+#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
+#endif
+
+#ifndef GL_SGIX_list_priority
+#define GL_LIST_PRIORITY_SGIX             0x8182
+#endif
+
+#ifndef GL_SGIX_ir_instrument1
+#define GL_IR_INSTRUMENT1_SGIX            0x817F
+#endif
+
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
+#endif
+
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
+#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
+#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
+#endif
+
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SHADOW_AMBIENT_SGIX            0x80BF
+#endif
+
+#ifndef GL_EXT_index_texture
+#endif
+
+#ifndef GL_EXT_index_material
+#define GL_INDEX_MATERIAL_EXT             0x81B8
+#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
+#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
+#endif
+
+#ifndef GL_EXT_index_func
+#define GL_INDEX_TEST_EXT                 0x81B5
+#define GL_INDEX_TEST_FUNC_EXT            0x81B6
+#define GL_INDEX_TEST_REF_EXT             0x81B7
+#endif
+
+#ifndef GL_EXT_index_array_formats
+#define GL_IUI_V2F_EXT                    0x81AD
+#define GL_IUI_V3F_EXT                    0x81AE
+#define GL_IUI_N3F_V2F_EXT                0x81AF
+#define GL_IUI_N3F_V3F_EXT                0x81B0
+#define GL_T2F_IUI_V2F_EXT                0x81B1
+#define GL_T2F_IUI_V3F_EXT                0x81B2
+#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
+#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
+#endif
+
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
+#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
+#endif
+
+#ifndef GL_EXT_cull_vertex
+#define GL_CULL_VERTEX_EXT                0x81AA
+#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
+#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
+#endif
+
+#ifndef GL_SGIX_ycrcb
+#define GL_YCRCB_422_SGIX                 0x81BB
+#define GL_YCRCB_444_SGIX                 0x81BC
+#endif
+
+#ifndef GL_SGIX_fragment_lighting
+#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
+#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
+#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
+#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
+#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
+#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
+#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
+#define GL_LIGHT_ENV_MODE_SGIX            0x8407
+#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
+#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
+#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
+#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
+#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
+#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
+#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
+#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
+#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
+#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
+#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
+#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
+#endif
+
+#ifndef GL_IBM_rasterpos_clip
+#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
+#endif
+
+#ifndef GL_HP_texture_lighting
+#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
+#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
+#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
+#endif
+
+#ifndef GL_EXT_draw_range_elements
+#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
+#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
+#endif
+
+#ifndef GL_WIN_phong_shading
+#define GL_PHONG_WIN                      0x80EA
+#define GL_PHONG_HINT_WIN                 0x80EB
+#endif
+
+#ifndef GL_WIN_specular_fog
+#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
+#endif
+
+#ifndef GL_EXT_light_texture
+#define GL_FRAGMENT_MATERIAL_EXT          0x8349
+#define GL_FRAGMENT_NORMAL_EXT            0x834A
+#define GL_FRAGMENT_COLOR_EXT             0x834C
+#define GL_ATTENUATION_EXT                0x834D
+#define GL_SHADOW_ATTENUATION_EXT         0x834E
+#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
+#define GL_TEXTURE_LIGHT_EXT              0x8350
+#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
+#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
+/* reuse GL_FRAGMENT_DEPTH_EXT */
+#endif
+
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_ALPHA_MIN_SGIX                 0x8320
+#define GL_ALPHA_MAX_SGIX                 0x8321
+#endif
+
+#ifndef GL_SGIX_impact_pixel_texture
+#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX   0x8184
+#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX     0x8185
+#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX     0x8186
+#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187
+#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188
+#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX    0x8189
+#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX    0x818A
+#endif
+
+#ifndef GL_EXT_bgra
+#define GL_BGR_EXT                        0x80E0
+#define GL_BGRA_EXT                       0x80E1
+#endif
+
+#ifndef GL_SGIX_async
+#define GL_ASYNC_MARKER_SGIX              0x8329
+#endif
+
+#ifndef GL_SGIX_async_pixel
+#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
+#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
+#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
+#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
+#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
+#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
+#endif
+
+#ifndef GL_SGIX_async_histogram
+#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
+#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
+#endif
+
+#ifndef GL_INTEL_texture_scissor
+#endif
+
+#ifndef GL_INTEL_parallel_arrays
+#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
+#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
+#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
+#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
+#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
+#endif
+
+#ifndef GL_HP_occlusion_test
+#define GL_OCCLUSION_TEST_HP              0x8165
+#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
+#endif
+
+#ifndef GL_EXT_pixel_transform
+#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
+#define GL_PIXEL_MAG_FILTER_EXT           0x8331
+#define GL_PIXEL_MIN_FILTER_EXT           0x8332
+#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
+#define GL_CUBIC_EXT                      0x8334
+#define GL_AVERAGE_EXT                    0x8335
+#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
+#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
+#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
+#endif
+
+#ifndef GL_EXT_pixel_transform_color_table
+#endif
+
+#ifndef GL_EXT_shared_texture_palette
+#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
+#endif
+
+#ifndef GL_EXT_separate_specular_color
+#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
+#define GL_SINGLE_COLOR_EXT               0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
+#endif
+
+#ifndef GL_EXT_secondary_color
+#define GL_COLOR_SUM_EXT                  0x8458
+#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
+#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
+#endif
+
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_PERTURB_EXT                    0x85AE
+#define GL_TEXTURE_NORMAL_EXT             0x85AF
+#endif
+
+#ifndef GL_EXT_multi_draw_arrays
+#endif
+
+#ifndef GL_EXT_fog_coord
+#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
+#define GL_FOG_COORDINATE_EXT             0x8451
+#define GL_FRAGMENT_DEPTH_EXT             0x8452
+#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
+#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
+#endif
+
+#ifndef GL_REND_screen_coordinates
+#define GL_SCREEN_COORDINATES_REND        0x8490
+#define GL_INVERTED_SCREEN_W_REND         0x8491
+#endif
+
+#ifndef GL_EXT_coordinate_frame
+#define GL_TANGENT_ARRAY_EXT              0x8439
+#define GL_BINORMAL_ARRAY_EXT             0x843A
+#define GL_CURRENT_TANGENT_EXT            0x843B
+#define GL_CURRENT_BINORMAL_EXT           0x843C
+#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
+#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
+#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
+#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
+#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
+#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
+#define GL_MAP1_TANGENT_EXT               0x8444
+#define GL_MAP2_TANGENT_EXT               0x8445
+#define GL_MAP1_BINORMAL_EXT              0x8446
+#define GL_MAP2_BINORMAL_EXT              0x8447
+#endif
+
+#ifndef GL_EXT_texture_env_combine
+#define GL_COMBINE_EXT                    0x8570
+#define GL_COMBINE_RGB_EXT                0x8571
+#define GL_COMBINE_ALPHA_EXT              0x8572
+#define GL_RGB_SCALE_EXT                  0x8573
+#define GL_ADD_SIGNED_EXT                 0x8574
+#define GL_INTERPOLATE_EXT                0x8575
+#define GL_CONSTANT_EXT                   0x8576
+#define GL_PRIMARY_COLOR_EXT              0x8577
+#define GL_PREVIOUS_EXT                   0x8578
+#define GL_SOURCE0_RGB_EXT                0x8580
+#define GL_SOURCE1_RGB_EXT                0x8581
+#define GL_SOURCE2_RGB_EXT                0x8582
+#define GL_SOURCE0_ALPHA_EXT              0x8588
+#define GL_SOURCE1_ALPHA_EXT              0x8589
+#define GL_SOURCE2_ALPHA_EXT              0x858A
+#define GL_OPERAND0_RGB_EXT               0x8590
+#define GL_OPERAND1_RGB_EXT               0x8591
+#define GL_OPERAND2_RGB_EXT               0x8592
+#define GL_OPERAND0_ALPHA_EXT             0x8598
+#define GL_OPERAND1_ALPHA_EXT             0x8599
+#define GL_OPERAND2_ALPHA_EXT             0x859A
+#endif
+
+#ifndef GL_APPLE_specular_vector
+#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
+#endif
+
+#ifndef GL_APPLE_transform_hint
+#define GL_TRANSFORM_HINT_APPLE           0x85B1
+#endif
+
+#ifndef GL_SGIX_fog_scale
+#define GL_FOG_SCALE_SGIX                 0x81FC
+#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
+#endif
+
+#ifndef GL_SUNX_constant_data
+#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
+#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
+#endif
+
+#ifndef GL_SUN_global_alpha
+#define GL_GLOBAL_ALPHA_SUN               0x81D9
+#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
+#endif
+
+#ifndef GL_SUN_triangle_list
+#define GL_RESTART_SUN                    0x0001
+#define GL_REPLACE_MIDDLE_SUN             0x0002
+#define GL_REPLACE_OLDEST_SUN             0x0003
+#define GL_TRIANGLE_LIST_SUN              0x81D7
+#define GL_REPLACEMENT_CODE_SUN           0x81D8
+#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
+#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
+#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
+#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
+#define GL_R1UI_V3F_SUN                   0x85C4
+#define GL_R1UI_C4UB_V3F_SUN              0x85C5
+#define GL_R1UI_C3F_V3F_SUN               0x85C6
+#define GL_R1UI_N3F_V3F_SUN               0x85C7
+#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
+#define GL_R1UI_T2F_V3F_SUN               0x85C9
+#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
+#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
+#endif
+
+#ifndef GL_SUN_vertex
+#endif
+
+#ifndef GL_EXT_blend_func_separate
+#define GL_BLEND_DST_RGB_EXT              0x80C8
+#define GL_BLEND_SRC_RGB_EXT              0x80C9
+#define GL_BLEND_DST_ALPHA_EXT            0x80CA
+#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
+#endif
+
+#ifndef GL_INGR_color_clamp
+#define GL_RED_MIN_CLAMP_INGR             0x8560
+#define GL_GREEN_MIN_CLAMP_INGR           0x8561
+#define GL_BLUE_MIN_CLAMP_INGR            0x8562
+#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
+#define GL_RED_MAX_CLAMP_INGR             0x8564
+#define GL_GREEN_MAX_CLAMP_INGR           0x8565
+#define GL_BLUE_MAX_CLAMP_INGR            0x8566
+#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
+#endif
+
+#ifndef GL_INGR_interlace_read
+#define GL_INTERLACE_READ_INGR            0x8568
+#endif
+
+#ifndef GL_EXT_stencil_wrap
+#define GL_INCR_WRAP_EXT                  0x8507
+#define GL_DECR_WRAP_EXT                  0x8508
+#endif
+
+#ifndef GL_EXT_422_pixels
+#define GL_422_EXT                        0x80CC
+#define GL_422_REV_EXT                    0x80CD
+#define GL_422_AVERAGE_EXT                0x80CE
+#define GL_422_REV_AVERAGE_EXT            0x80CF
+#endif
+
+#ifndef GL_NV_texgen_reflection
+#define GL_NORMAL_MAP_NV                  0x8511
+#define GL_REFLECTION_MAP_NV              0x8512
+#endif
+
+#ifndef GL_EXT_texture_cube_map
+#define GL_NORMAL_MAP_EXT                 0x8511
+#define GL_REFLECTION_MAP_EXT             0x8512
+#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
+#endif
+
+#ifndef GL_SUN_convolution_border_modes
+#define GL_WRAP_BORDER_SUN                0x81D4
+#endif
+
+#ifndef GL_EXT_texture_env_add
+#endif
+
+#ifndef GL_EXT_texture_lod_bias
+#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
+#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
+#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
+#endif
+
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
+#endif
+
+#ifndef GL_EXT_vertex_weighting
+#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
+#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
+#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
+#define GL_MODELVIEW1_MATRIX_EXT          0x8506
+#define GL_VERTEX_WEIGHTING_EXT           0x8509
+#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
+#define GL_MODELVIEW1_EXT                 0x850A
+#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
+#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
+#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
+#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
+#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
+#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
+#endif
+
+#ifndef GL_NV_light_max_exponent
+#define GL_MAX_SHININESS_NV               0x8504
+#define GL_MAX_SPOT_EXPONENT_NV           0x8505
+#endif
+
+#ifndef GL_NV_vertex_array_range
+#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
+#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
+#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
+#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
+#endif
+
+#ifndef GL_NV_register_combiners
+#define GL_REGISTER_COMBINERS_NV          0x8522
+#define GL_VARIABLE_A_NV                  0x8523
+#define GL_VARIABLE_B_NV                  0x8524
+#define GL_VARIABLE_C_NV                  0x8525
+#define GL_VARIABLE_D_NV                  0x8526
+#define GL_VARIABLE_E_NV                  0x8527
+#define GL_VARIABLE_F_NV                  0x8528
+#define GL_VARIABLE_G_NV                  0x8529
+#define GL_CONSTANT_COLOR0_NV             0x852A
+#define GL_CONSTANT_COLOR1_NV             0x852B
+#define GL_PRIMARY_COLOR_NV               0x852C
+#define GL_SECONDARY_COLOR_NV             0x852D
+#define GL_SPARE0_NV                      0x852E
+#define GL_SPARE1_NV                      0x852F
+#define GL_DISCARD_NV                     0x8530
+#define GL_E_TIMES_F_NV                   0x8531
+#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
+#define GL_UNSIGNED_IDENTITY_NV           0x8536
+#define GL_UNSIGNED_INVERT_NV             0x8537
+#define GL_EXPAND_NORMAL_NV               0x8538
+#define GL_EXPAND_NEGATE_NV               0x8539
+#define GL_HALF_BIAS_NORMAL_NV            0x853A
+#define GL_HALF_BIAS_NEGATE_NV            0x853B
+#define GL_SIGNED_IDENTITY_NV             0x853C
+#define GL_SIGNED_NEGATE_NV               0x853D
+#define GL_SCALE_BY_TWO_NV                0x853E
+#define GL_SCALE_BY_FOUR_NV               0x853F
+#define GL_SCALE_BY_ONE_HALF_NV           0x8540
+#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
+#define GL_COMBINER_INPUT_NV              0x8542
+#define GL_COMBINER_MAPPING_NV            0x8543
+#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
+#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
+#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
+#define GL_COMBINER_MUX_SUM_NV            0x8547
+#define GL_COMBINER_SCALE_NV              0x8548
+#define GL_COMBINER_BIAS_NV               0x8549
+#define GL_COMBINER_AB_OUTPUT_NV          0x854A
+#define GL_COMBINER_CD_OUTPUT_NV          0x854B
+#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
+#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
+#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
+#define GL_COLOR_SUM_CLAMP_NV             0x854F
+#define GL_COMBINER0_NV                   0x8550
+#define GL_COMBINER1_NV                   0x8551
+#define GL_COMBINER2_NV                   0x8552
+#define GL_COMBINER3_NV                   0x8553
+#define GL_COMBINER4_NV                   0x8554
+#define GL_COMBINER5_NV                   0x8555
+#define GL_COMBINER6_NV                   0x8556
+#define GL_COMBINER7_NV                   0x8557
+/* reuse GL_TEXTURE0_ARB */
+/* reuse GL_TEXTURE1_ARB */
+/* reuse GL_ZERO */
+/* reuse GL_NONE */
+/* reuse GL_FOG */
+#endif
+
+#ifndef GL_NV_fog_distance
+#define GL_FOG_DISTANCE_MODE_NV           0x855A
+#define GL_EYE_RADIAL_NV                  0x855B
+#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
+/* reuse GL_EYE_PLANE */
+#endif
+
+#ifndef GL_NV_texgen_emboss
+#define GL_EMBOSS_LIGHT_NV                0x855D
+#define GL_EMBOSS_CONSTANT_NV             0x855E
+#define GL_EMBOSS_MAP_NV                  0x855F
+#endif
+
+#ifndef GL_NV_blend_square
+#endif
+
+#ifndef GL_NV_texture_env_combine4
+#define GL_COMBINE4_NV                    0x8503
+#define GL_SOURCE3_RGB_NV                 0x8583
+#define GL_SOURCE3_ALPHA_NV               0x858B
+#define GL_OPERAND3_RGB_NV                0x8593
+#define GL_OPERAND3_ALPHA_NV              0x859B
+#endif
+
+#ifndef GL_MESA_resize_buffers
+#endif
+
+#ifndef GL_MESA_window_pos
+#endif
+
+#ifndef GL_EXT_texture_compression_s3tc
+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
+#endif
+
+#ifndef GL_IBM_cull_vertex
+#define GL_CULL_VERTEX_IBM                103050
+#endif
+
+#ifndef GL_IBM_multimode_draw_arrays
+#endif
+
+#ifndef GL_IBM_vertex_array_lists
+#define GL_VERTEX_ARRAY_LIST_IBM          103070
+#define GL_NORMAL_ARRAY_LIST_IBM          103071
+#define GL_COLOR_ARRAY_LIST_IBM           103072
+#define GL_INDEX_ARRAY_LIST_IBM           103073
+#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
+#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
+#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
+#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
+#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
+#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
+#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
+#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
+#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
+#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
+#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
+#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
+#endif
+
+#ifndef GL_SGIX_subsample
+#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
+#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
+#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
+#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
+#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
+#endif
+
+#ifndef GL_SGIX_ycrcb_subsample
+#endif
+
+#ifndef GL_SGIX_ycrcba
+#define GL_YCRCB_SGIX                     0x8318
+#define GL_YCRCBA_SGIX                    0x8319
+#endif
+
+#ifndef GL_SGI_depth_pass_instrument
+#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
+#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
+#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
+#endif
+
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
+#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
+#endif
+
+#ifndef GL_3DFX_multisample
+#define GL_MULTISAMPLE_3DFX               0x86B2
+#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
+#define GL_SAMPLES_3DFX                   0x86B4
+#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
+#endif
+
+#ifndef GL_3DFX_tbuffer
+#endif
+
+#ifndef GL_EXT_multisample
+#define GL_MULTISAMPLE_EXT                0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
+#define GL_SAMPLE_MASK_EXT                0x80A0
+#define GL_1PASS_EXT                      0x80A1
+#define GL_2PASS_0_EXT                    0x80A2
+#define GL_2PASS_1_EXT                    0x80A3
+#define GL_4PASS_0_EXT                    0x80A4
+#define GL_4PASS_1_EXT                    0x80A5
+#define GL_4PASS_2_EXT                    0x80A6
+#define GL_4PASS_3_EXT                    0x80A7
+#define GL_SAMPLE_BUFFERS_EXT             0x80A8
+#define GL_SAMPLES_EXT                    0x80A9
+#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
+#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
+#define GL_SAMPLE_PATTERN_EXT             0x80AC
+#define GL_MULTISAMPLE_BIT_EXT            0x20000000
+#endif
+
+#ifndef GL_SGIX_vertex_preclip
+#define GL_VERTEX_PRECLIP_SGIX            0x83EE
+#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
+#endif
+
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_CONVOLUTION_HINT_SGIX          0x8316
+#endif
+
+#ifndef GL_SGIX_resample
+#define GL_PACK_RESAMPLE_SGIX             0x842C
+#define GL_UNPACK_RESAMPLE_SGIX           0x842D
+#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
+#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
+#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
+#endif
+
+#ifndef GL_SGIS_point_line_texgen
+#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
+#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
+#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
+#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
+#define GL_EYE_POINT_SGIS                 0x81F4
+#define GL_OBJECT_POINT_SGIS              0x81F5
+#define GL_EYE_LINE_SGIS                  0x81F6
+#define GL_OBJECT_LINE_SGIS               0x81F7
+#endif
+
+#ifndef GL_SGIS_texture_color_mask
+#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
+#endif
+
+#ifndef GL_EXT_texture_env_dot3
+#define GL_DOT3_RGB_EXT                   0x8740
+#define GL_DOT3_RGBA_EXT                  0x8741
+#endif
+
+#ifndef GL_ATI_texture_mirror_once
+#define GL_MIRROR_CLAMP_ATI               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
+#endif
+
+#ifndef GL_NV_fence
+#define GL_ALL_COMPLETED_NV               0x84F2
+#define GL_FENCE_STATUS_NV                0x84F3
+#define GL_FENCE_CONDITION_NV             0x84F4
+#endif
+
+#ifndef GL_IBM_texture_mirrored_repeat
+#define GL_MIRRORED_REPEAT_IBM            0x8370
+#endif
+
+#ifndef GL_NV_evaluators
+#define GL_EVAL_2D_NV                     0x86C0
+#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
+#define GL_MAP_TESSELLATION_NV            0x86C2
+#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
+#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
+#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
+#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
+#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
+#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
+#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
+#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
+#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
+#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
+#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
+#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
+#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
+#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
+#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
+#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
+#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
+#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
+#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
+#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
+#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
+#endif
+
+#ifndef GL_NV_packed_depth_stencil
+#define GL_DEPTH_STENCIL_NV               0x84F9
+#define GL_UNSIGNED_INT_24_8_NV           0x84FA
+#endif
+
+#ifndef GL_NV_register_combiners2
+#define GL_PER_STAGE_CONSTANTS_NV         0x8535
+#endif
+
+#ifndef GL_NV_texture_compression_vtc
+#endif
+
+#ifndef GL_NV_texture_rectangle
+#define GL_TEXTURE_RECTANGLE_NV           0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
+#endif
+
+#ifndef GL_NV_texture_shader
+#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
+#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
+#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
+#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
+#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
+#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
+#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
+#define GL_SHADER_CONSISTENT_NV           0x86DD
+#define GL_TEXTURE_SHADER_NV              0x86DE
+#define GL_SHADER_OPERATION_NV            0x86DF
+#define GL_CULL_MODES_NV                  0x86E0
+#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
+#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
+#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
+#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    GL_OFFSET_TEXTURE_MATRIX_NV
+#define GL_OFFSET_TEXTURE_2D_SCALE_NV     GL_OFFSET_TEXTURE_SCALE_NV
+#define GL_OFFSET_TEXTURE_2D_BIAS_NV      GL_OFFSET_TEXTURE_BIAS_NV
+#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
+#define GL_CONST_EYE_NV                   0x86E5
+#define GL_PASS_THROUGH_NV                0x86E6
+#define GL_CULL_FRAGMENT_NV               0x86E7
+#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
+#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
+#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
+#define GL_DOT_PRODUCT_NV                 0x86EC
+#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
+#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
+#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
+#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
+#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
+#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
+#define GL_HILO_NV                        0x86F4
+#define GL_DSDT_NV                        0x86F5
+#define GL_DSDT_MAG_NV                    0x86F6
+#define GL_DSDT_MAG_VIB_NV                0x86F7
+#define GL_HILO16_NV                      0x86F8
+#define GL_SIGNED_HILO_NV                 0x86F9
+#define GL_SIGNED_HILO16_NV               0x86FA
+#define GL_SIGNED_RGBA_NV                 0x86FB
+#define GL_SIGNED_RGBA8_NV                0x86FC
+#define GL_SIGNED_RGB_NV                  0x86FE
+#define GL_SIGNED_RGB8_NV                 0x86FF
+#define GL_SIGNED_LUMINANCE_NV            0x8701
+#define GL_SIGNED_LUMINANCE8_NV           0x8702
+#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
+#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
+#define GL_SIGNED_ALPHA_NV                0x8705
+#define GL_SIGNED_ALPHA8_NV               0x8706
+#define GL_SIGNED_INTENSITY_NV            0x8707
+#define GL_SIGNED_INTENSITY8_NV           0x8708
+#define GL_DSDT8_NV                       0x8709
+#define GL_DSDT8_MAG8_NV                  0x870A
+#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
+#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
+#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
+#define GL_HI_SCALE_NV                    0x870E
+#define GL_LO_SCALE_NV                    0x870F
+#define GL_DS_SCALE_NV                    0x8710
+#define GL_DT_SCALE_NV                    0x8711
+#define GL_MAGNITUDE_SCALE_NV             0x8712
+#define GL_VIBRANCE_SCALE_NV              0x8713
+#define GL_HI_BIAS_NV                     0x8714
+#define GL_LO_BIAS_NV                     0x8715
+#define GL_DS_BIAS_NV                     0x8716
+#define GL_DT_BIAS_NV                     0x8717
+#define GL_MAGNITUDE_BIAS_NV              0x8718
+#define GL_VIBRANCE_BIAS_NV               0x8719
+#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
+#define GL_TEXTURE_HI_SIZE_NV             0x871B
+#define GL_TEXTURE_LO_SIZE_NV             0x871C
+#define GL_TEXTURE_DS_SIZE_NV             0x871D
+#define GL_TEXTURE_DT_SIZE_NV             0x871E
+#define GL_TEXTURE_MAG_SIZE_NV            0x871F
+#endif
+
+#ifndef GL_NV_texture_shader2
+#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
+#endif
+
+#ifndef GL_NV_vertex_array_range2
+#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
+#endif
+
+#ifndef GL_NV_vertex_program
+#define GL_VERTEX_PROGRAM_NV              0x8620
+#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
+#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
+#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
+#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
+#define GL_CURRENT_ATTRIB_NV              0x8626
+#define GL_PROGRAM_LENGTH_NV              0x8627
+#define GL_PROGRAM_STRING_NV              0x8628
+#define GL_MODELVIEW_PROJECTION_NV        0x8629
+#define GL_IDENTITY_NV                    0x862A
+#define GL_INVERSE_NV                     0x862B
+#define GL_TRANSPOSE_NV                   0x862C
+#define GL_INVERSE_TRANSPOSE_NV           0x862D
+#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
+#define GL_MAX_TRACK_MATRICES_NV          0x862F
+#define GL_MATRIX0_NV                     0x8630
+#define GL_MATRIX1_NV                     0x8631
+#define GL_MATRIX2_NV                     0x8632
+#define GL_MATRIX3_NV                     0x8633
+#define GL_MATRIX4_NV                     0x8634
+#define GL_MATRIX5_NV                     0x8635
+#define GL_MATRIX6_NV                     0x8636
+#define GL_MATRIX7_NV                     0x8637
+#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
+#define GL_CURRENT_MATRIX_NV              0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
+#define GL_PROGRAM_PARAMETER_NV           0x8644
+#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
+#define GL_PROGRAM_TARGET_NV              0x8646
+#define GL_PROGRAM_RESIDENT_NV            0x8647
+#define GL_TRACK_MATRIX_NV                0x8648
+#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
+#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
+#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
+#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
+#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
+#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
+#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
+#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
+#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
+#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
+#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
+#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
+#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
+#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
+#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
+#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
+#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
+#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
+#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
+#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
+#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
+#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
+#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
+#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
+#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
+#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
+#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
+#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
+#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
+#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
+#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
+#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
+#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
+#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
+#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
+#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
+#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
+#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
+#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
+#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
+#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
+#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
+#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
+#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
+#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
+#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
+#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
+#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
+#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
+#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
+#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
+#endif
+
+#ifndef GL_SGIX_texture_coordinate_clamp
+#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
+#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
+#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
+#endif
+
+#ifndef GL_SGIX_scalebias_hint
+#define GL_SCALEBIAS_HINT_SGIX            0x8322
+#endif
+
+#ifndef GL_OML_interlace
+#define GL_INTERLACE_OML                  0x8980
+#define GL_INTERLACE_READ_OML             0x8981
+#endif
+
+#ifndef GL_OML_subsample
+#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
+#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
+#endif
+
+#ifndef GL_OML_resample
+#define GL_PACK_RESAMPLE_OML              0x8984
+#define GL_UNPACK_RESAMPLE_OML            0x8985
+#define GL_RESAMPLE_REPLICATE_OML         0x8986
+#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
+#define GL_RESAMPLE_AVERAGE_OML           0x8988
+#define GL_RESAMPLE_DECIMATE_OML          0x8989
+#endif
+
+#ifndef GL_NV_copy_depth_to_color
+#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
+#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
+#endif
+
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_BUMP_ROT_MATRIX_ATI            0x8775
+#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
+#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
+#define GL_BUMP_TEX_UNITS_ATI             0x8778
+#define GL_DUDV_ATI                       0x8779
+#define GL_DU8DV8_ATI                     0x877A
+#define GL_BUMP_ENVMAP_ATI                0x877B
+#define GL_BUMP_TARGET_ATI                0x877C
+#endif
+
+#ifndef GL_ATI_fragment_shader
+#define GL_FRAGMENT_SHADER_ATI            0x8920
+#define GL_REG_0_ATI                      0x8921
+#define GL_REG_1_ATI                      0x8922
+#define GL_REG_2_ATI                      0x8923
+#define GL_REG_3_ATI                      0x8924
+#define GL_REG_4_ATI                      0x8925
+#define GL_REG_5_ATI                      0x8926
+#define GL_REG_6_ATI                      0x8927
+#define GL_REG_7_ATI                      0x8928
+#define GL_REG_8_ATI                      0x8929
+#define GL_REG_9_ATI                      0x892A
+#define GL_REG_10_ATI                     0x892B
+#define GL_REG_11_ATI                     0x892C
+#define GL_REG_12_ATI                     0x892D
+#define GL_REG_13_ATI                     0x892E
+#define GL_REG_14_ATI                     0x892F
+#define GL_REG_15_ATI                     0x8930
+#define GL_REG_16_ATI                     0x8931
+#define GL_REG_17_ATI                     0x8932
+#define GL_REG_18_ATI                     0x8933
+#define GL_REG_19_ATI                     0x8934
+#define GL_REG_20_ATI                     0x8935
+#define GL_REG_21_ATI                     0x8936
+#define GL_REG_22_ATI                     0x8937
+#define GL_REG_23_ATI                     0x8938
+#define GL_REG_24_ATI                     0x8939
+#define GL_REG_25_ATI                     0x893A
+#define GL_REG_26_ATI                     0x893B
+#define GL_REG_27_ATI                     0x893C
+#define GL_REG_28_ATI                     0x893D
+#define GL_REG_29_ATI                     0x893E
+#define GL_REG_30_ATI                     0x893F
+#define GL_REG_31_ATI                     0x8940
+#define GL_CON_0_ATI                      0x8941
+#define GL_CON_1_ATI                      0x8942
+#define GL_CON_2_ATI                      0x8943
+#define GL_CON_3_ATI                      0x8944
+#define GL_CON_4_ATI                      0x8945
+#define GL_CON_5_ATI                      0x8946
+#define GL_CON_6_ATI                      0x8947
+#define GL_CON_7_ATI                      0x8948
+#define GL_CON_8_ATI                      0x8949
+#define GL_CON_9_ATI                      0x894A
+#define GL_CON_10_ATI                     0x894B
+#define GL_CON_11_ATI                     0x894C
+#define GL_CON_12_ATI                     0x894D
+#define GL_CON_13_ATI                     0x894E
+#define GL_CON_14_ATI                     0x894F
+#define GL_CON_15_ATI                     0x8950
+#define GL_CON_16_ATI                     0x8951
+#define GL_CON_17_ATI                     0x8952
+#define GL_CON_18_ATI                     0x8953
+#define GL_CON_19_ATI                     0x8954
+#define GL_CON_20_ATI                     0x8955
+#define GL_CON_21_ATI                     0x8956
+#define GL_CON_22_ATI                     0x8957
+#define GL_CON_23_ATI                     0x8958
+#define GL_CON_24_ATI                     0x8959
+#define GL_CON_25_ATI                     0x895A
+#define GL_CON_26_ATI                     0x895B
+#define GL_CON_27_ATI                     0x895C
+#define GL_CON_28_ATI                     0x895D
+#define GL_CON_29_ATI                     0x895E
+#define GL_CON_30_ATI                     0x895F
+#define GL_CON_31_ATI                     0x8960
+#define GL_MOV_ATI                        0x8961
+#define GL_ADD_ATI                        0x8963
+#define GL_MUL_ATI                        0x8964
+#define GL_SUB_ATI                        0x8965
+#define GL_DOT3_ATI                       0x8966
+#define GL_DOT4_ATI                       0x8967
+#define GL_MAD_ATI                        0x8968
+#define GL_LERP_ATI                       0x8969
+#define GL_CND_ATI                        0x896A
+#define GL_CND0_ATI                       0x896B
+#define GL_DOT2_ADD_ATI                   0x896C
+#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
+#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
+#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
+#define GL_NUM_PASSES_ATI                 0x8970
+#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
+#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
+#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
+#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
+#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
+#define GL_SWIZZLE_STR_ATI                0x8976
+#define GL_SWIZZLE_STQ_ATI                0x8977
+#define GL_SWIZZLE_STR_DR_ATI             0x8978
+#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
+#define GL_SWIZZLE_STRQ_ATI               0x897A
+#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
+#define GL_RED_BIT_ATI                    0x00000001
+#define GL_GREEN_BIT_ATI                  0x00000002
+#define GL_BLUE_BIT_ATI                   0x00000004
+#define GL_2X_BIT_ATI                     0x00000001
+#define GL_4X_BIT_ATI                     0x00000002
+#define GL_8X_BIT_ATI                     0x00000004
+#define GL_HALF_BIT_ATI                   0x00000008
+#define GL_QUARTER_BIT_ATI                0x00000010
+#define GL_EIGHTH_BIT_ATI                 0x00000020
+#define GL_SATURATE_BIT_ATI               0x00000040
+#define GL_COMP_BIT_ATI                   0x00000002
+#define GL_NEGATE_BIT_ATI                 0x00000004
+#define GL_BIAS_BIT_ATI                   0x00000008
+#endif
+
+#ifndef GL_ATI_pn_triangles
+#define GL_PN_TRIANGLES_ATI               0x87F0
+#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
+#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
+#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
+#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
+#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
+#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
+#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
+#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
+#endif
+
+#ifndef GL_ATI_vertex_array_object
+#define GL_STATIC_ATI                     0x8760
+#define GL_DYNAMIC_ATI                    0x8761
+#define GL_PRESERVE_ATI                   0x8762
+#define GL_DISCARD_ATI                    0x8763
+#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
+#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
+#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
+#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
+#endif
+
+#ifndef GL_EXT_vertex_shader
+#define GL_VERTEX_SHADER_EXT              0x8780
+#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
+#define GL_OP_INDEX_EXT                   0x8782
+#define GL_OP_NEGATE_EXT                  0x8783
+#define GL_OP_DOT3_EXT                    0x8784
+#define GL_OP_DOT4_EXT                    0x8785
+#define GL_OP_MUL_EXT                     0x8786
+#define GL_OP_ADD_EXT                     0x8787
+#define GL_OP_MADD_EXT                    0x8788
+#define GL_OP_FRAC_EXT                    0x8789
+#define GL_OP_MAX_EXT                     0x878A
+#define GL_OP_MIN_EXT                     0x878B
+#define GL_OP_SET_GE_EXT                  0x878C
+#define GL_OP_SET_LT_EXT                  0x878D
+#define GL_OP_CLAMP_EXT                   0x878E
+#define GL_OP_FLOOR_EXT                   0x878F
+#define GL_OP_ROUND_EXT                   0x8790
+#define GL_OP_EXP_BASE_2_EXT              0x8791
+#define GL_OP_LOG_BASE_2_EXT              0x8792
+#define GL_OP_POWER_EXT                   0x8793
+#define GL_OP_RECIP_EXT                   0x8794
+#define GL_OP_RECIP_SQRT_EXT              0x8795
+#define GL_OP_SUB_EXT                     0x8796
+#define GL_OP_CROSS_PRODUCT_EXT           0x8797
+#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
+#define GL_OP_MOV_EXT                     0x8799
+#define GL_OUTPUT_VERTEX_EXT              0x879A
+#define GL_OUTPUT_COLOR0_EXT              0x879B
+#define GL_OUTPUT_COLOR1_EXT              0x879C
+#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
+#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
+#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
+#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
+#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
+#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
+#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
+#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
+#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
+#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
+#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
+#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
+#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
+#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
+#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
+#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
+#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
+#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
+#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
+#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
+#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
+#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
+#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
+#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
+#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
+#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
+#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
+#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
+#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
+#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
+#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
+#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
+#define GL_OUTPUT_FOG_EXT                 0x87BD
+#define GL_SCALAR_EXT                     0x87BE
+#define GL_VECTOR_EXT                     0x87BF
+#define GL_MATRIX_EXT                     0x87C0
+#define GL_VARIANT_EXT                    0x87C1
+#define GL_INVARIANT_EXT                  0x87C2
+#define GL_LOCAL_CONSTANT_EXT             0x87C3
+#define GL_LOCAL_EXT                      0x87C4
+#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
+#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
+#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
+#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
+#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
+#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
+#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
+#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
+#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
+#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
+#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
+#define GL_X_EXT                          0x87D5
+#define GL_Y_EXT                          0x87D6
+#define GL_Z_EXT                          0x87D7
+#define GL_W_EXT                          0x87D8
+#define GL_NEGATIVE_X_EXT                 0x87D9
+#define GL_NEGATIVE_Y_EXT                 0x87DA
+#define GL_NEGATIVE_Z_EXT                 0x87DB
+#define GL_NEGATIVE_W_EXT                 0x87DC
+#define GL_ZERO_EXT                       0x87DD
+#define GL_ONE_EXT                        0x87DE
+#define GL_NEGATIVE_ONE_EXT               0x87DF
+#define GL_NORMALIZED_RANGE_EXT           0x87E0
+#define GL_FULL_RANGE_EXT                 0x87E1
+#define GL_CURRENT_VERTEX_EXT             0x87E2
+#define GL_MVP_MATRIX_EXT                 0x87E3
+#define GL_VARIANT_VALUE_EXT              0x87E4
+#define GL_VARIANT_DATATYPE_EXT           0x87E5
+#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
+#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
+#define GL_VARIANT_ARRAY_EXT              0x87E8
+#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
+#define GL_INVARIANT_VALUE_EXT            0x87EA
+#define GL_INVARIANT_DATATYPE_EXT         0x87EB
+#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
+#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
+#endif
+
+#ifndef GL_ATI_vertex_streams
+#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
+#define GL_VERTEX_STREAM0_ATI             0x876C
+#define GL_VERTEX_STREAM1_ATI             0x876D
+#define GL_VERTEX_STREAM2_ATI             0x876E
+#define GL_VERTEX_STREAM3_ATI             0x876F
+#define GL_VERTEX_STREAM4_ATI             0x8770
+#define GL_VERTEX_STREAM5_ATI             0x8771
+#define GL_VERTEX_STREAM6_ATI             0x8772
+#define GL_VERTEX_STREAM7_ATI             0x8773
+#define GL_VERTEX_SOURCE_ATI              0x8774
+#endif
+
+#ifndef GL_ATI_element_array
+#define GL_ELEMENT_ARRAY_ATI              0x8768
+#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
+#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
+#endif
+
+#ifndef GL_SUN_mesh_array
+#define GL_QUAD_MESH_SUN                  0x8614
+#define GL_TRIANGLE_MESH_SUN              0x8615
+#endif
+
+#ifndef GL_SUN_slice_accum
+#define GL_SLICE_ACCUM_SUN                0x85CC
+#endif
+
+#ifndef GL_NV_multisample_filter_hint
+#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
+#endif
+
+#ifndef GL_NV_depth_clamp
+#define GL_DEPTH_CLAMP_NV                 0x864F
+#endif
+
+#ifndef GL_NV_occlusion_query
+#define GL_PIXEL_COUNTER_BITS_NV          0x8864
+#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
+#define GL_PIXEL_COUNT_NV                 0x8866
+#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
+#endif
+
+#ifndef GL_NV_point_sprite
+#define GL_POINT_SPRITE_NV                0x8861
+#define GL_COORD_REPLACE_NV               0x8862
+#define GL_POINT_SPRITE_R_MODE_NV         0x8863
+#endif
+
+#ifndef GL_NV_texture_shader3
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
+#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
+#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
+#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
+#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
+#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
+#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
+#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
+#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
+#define GL_HILO8_NV                       0x885E
+#define GL_SIGNED_HILO8_NV                0x885F
+#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
+#endif
+
+#ifndef GL_NV_vertex_program1_1
+#endif
+
+#ifndef GL_EXT_shadow_funcs
+#endif
+
+#ifndef GL_EXT_stencil_two_side
+#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
+#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
+#endif
+
+#ifndef GL_ATI_text_fragment_shader
+#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
+#endif
+
+#ifndef GL_APPLE_client_storage
+#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
+#endif
+
+#ifndef GL_APPLE_element_array
+#define GL_ELEMENT_ARRAY_APPLE            0x8768
+#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8769
+#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x876A
+#endif
+
+#ifndef GL_APPLE_fence
+#define GL_DRAW_PIXELS_APPLE              0x8A0A
+#define GL_FENCE_APPLE                    0x8A0B
+#endif
+
+#ifndef GL_APPLE_vertex_array_object
+#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
+#endif
+
+#ifndef GL_APPLE_vertex_array_range
+#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
+#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
+#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
+#define GL_STORAGE_CACHED_APPLE           0x85BE
+#define GL_STORAGE_SHARED_APPLE           0x85BF
+#endif
+
+#ifndef GL_APPLE_ycbcr_422
+#define GL_YCBCR_422_APPLE                0x85B9
+#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
+#endif
+
+#ifndef GL_S3_s3tc
+#define GL_RGB_S3TC                       0x83A0
+#define GL_RGB4_S3TC                      0x83A1
+#define GL_RGBA_S3TC                      0x83A2
+#define GL_RGBA4_S3TC                     0x83A3
+#endif
+
+#ifndef GL_ATI_draw_buffers
+#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
+#define GL_DRAW_BUFFER0_ATI               0x8825
+#define GL_DRAW_BUFFER1_ATI               0x8826
+#define GL_DRAW_BUFFER2_ATI               0x8827
+#define GL_DRAW_BUFFER3_ATI               0x8828
+#define GL_DRAW_BUFFER4_ATI               0x8829
+#define GL_DRAW_BUFFER5_ATI               0x882A
+#define GL_DRAW_BUFFER6_ATI               0x882B
+#define GL_DRAW_BUFFER7_ATI               0x882C
+#define GL_DRAW_BUFFER8_ATI               0x882D
+#define GL_DRAW_BUFFER9_ATI               0x882E
+#define GL_DRAW_BUFFER10_ATI              0x882F
+#define GL_DRAW_BUFFER11_ATI              0x8830
+#define GL_DRAW_BUFFER12_ATI              0x8831
+#define GL_DRAW_BUFFER13_ATI              0x8832
+#define GL_DRAW_BUFFER14_ATI              0x8833
+#define GL_DRAW_BUFFER15_ATI              0x8834
+#endif
+
+#ifndef GL_ATI_pixel_format_float
+#define GL_TYPE_RGBA_FLOAT_ATI            0x8820
+#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
+#endif
+
+#ifndef GL_ATI_texture_env_combine3
+#define GL_MODULATE_ADD_ATI               0x8744
+#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
+#define GL_MODULATE_SUBTRACT_ATI          0x8746
+#endif
+
+#ifndef GL_ATI_texture_float
+#define GL_RGBA_FLOAT32_ATI               0x8814
+#define GL_RGB_FLOAT32_ATI                0x8815
+#define GL_ALPHA_FLOAT32_ATI              0x8816
+#define GL_INTENSITY_FLOAT32_ATI          0x8817
+#define GL_LUMINANCE_FLOAT32_ATI          0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
+#define GL_RGBA_FLOAT16_ATI               0x881A
+#define GL_RGB_FLOAT16_ATI                0x881B
+#define GL_ALPHA_FLOAT16_ATI              0x881C
+#define GL_INTENSITY_FLOAT16_ATI          0x881D
+#define GL_LUMINANCE_FLOAT16_ATI          0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
+#endif
+
+#ifndef GL_NV_float_buffer
+#define GL_FLOAT_R_NV                     0x8880
+#define GL_FLOAT_RG_NV                    0x8881
+#define GL_FLOAT_RGB_NV                   0x8882
+#define GL_FLOAT_RGBA_NV                  0x8883
+#define GL_FLOAT_R16_NV                   0x8884
+#define GL_FLOAT_R32_NV                   0x8885
+#define GL_FLOAT_RG16_NV                  0x8886
+#define GL_FLOAT_RG32_NV                  0x8887
+#define GL_FLOAT_RGB16_NV                 0x8888
+#define GL_FLOAT_RGB32_NV                 0x8889
+#define GL_FLOAT_RGBA16_NV                0x888A
+#define GL_FLOAT_RGBA32_NV                0x888B
+#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
+#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
+#define GL_FLOAT_RGBA_MODE_NV             0x888E
+#endif
+
+#ifndef GL_NV_fragment_program
+#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
+#define GL_FRAGMENT_PROGRAM_NV            0x8870
+#define GL_MAX_TEXTURE_COORDS_NV          0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
+#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
+#define GL_PROGRAM_ERROR_STRING_NV        0x8874
+#endif
+
+#ifndef GL_NV_half_float
+#define GL_HALF_FLOAT_NV                  0x140B
+#endif
+
+#ifndef GL_NV_pixel_data_range
+#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
+#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
+#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
+#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
+#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
+#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
+#endif
+
+#ifndef GL_NV_primitive_restart
+#define GL_PRIMITIVE_RESTART_NV           0x8558
+#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
+#endif
+
+#ifndef GL_NV_texture_expand_normal
+#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
+#endif
+
+#ifndef GL_NV_vertex_program2
+#endif
+
+#ifndef GL_ATI_map_object_buffer
+#endif
+
+#ifndef GL_ATI_separate_stencil
+#define GL_STENCIL_BACK_FUNC_ATI          0x8800
+#define GL_STENCIL_BACK_FAIL_ATI          0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
+#endif
+
+#ifndef GL_ATI_vertex_attrib_array_object
+#endif
+
+#ifndef GL_OES_read_format
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
+#endif
+
+#ifndef GL_EXT_depth_bounds_test
+#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
+#define GL_DEPTH_BOUNDS_EXT               0x8891
+#endif
+
+#ifndef GL_EXT_texture_mirror_clamp
+#define GL_MIRROR_CLAMP_EXT               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
+#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
+#endif
+
+#ifndef GL_EXT_blend_equation_separate
+#define GL_BLEND_EQUATION_RGB_EXT         GL_BLEND_EQUATION
+#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
+#endif
+
+#ifndef GL_MESA_pack_invert
+#define GL_PACK_INVERT_MESA               0x8758
+#endif
+
+#ifndef GL_MESA_ycbcr_texture
+#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
+#define GL_YCBCR_MESA                     0x8757
+#endif
+
+#ifndef GL_EXT_pixel_buffer_object
+#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
+#endif
+
+#ifndef GL_NV_fragment_program_option
+#endif
+
+#ifndef GL_NV_fragment_program2
+#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
+#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
+#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
+#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
+#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
+#endif
+
+#ifndef GL_NV_vertex_program2_option
+/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */
+#endif
+
+#ifndef GL_NV_vertex_program3
+/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+#endif
+
+#ifndef GL_EXT_framebuffer_object
+#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
+#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
+#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
+#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
+#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
+#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
+#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
+#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
+#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
+#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
+#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
+#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
+#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
+#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
+#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
+#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
+#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
+#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
+#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
+#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
+#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
+#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
+#define GL_FRAMEBUFFER_EXT                0x8D40
+#define GL_RENDERBUFFER_EXT               0x8D41
+#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
+#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
+#define GL_STENCIL_INDEX1_EXT             0x8D46
+#define GL_STENCIL_INDEX4_EXT             0x8D47
+#define GL_STENCIL_INDEX8_EXT             0x8D48
+#define GL_STENCIL_INDEX16_EXT            0x8D49
+#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
+#endif
+
+#ifndef GL_GREMEDY_string_marker
+#endif
+
+#ifndef GL_EXT_packed_depth_stencil
+#define GL_DEPTH_STENCIL_EXT              0x84F9
+#define GL_UNSIGNED_INT_24_8_EXT          0x84FA
+#define GL_DEPTH24_STENCIL8_EXT           0x88F0
+#define GL_TEXTURE_STENCIL_SIZE_EXT       0x88F1
+#endif
+
+#ifndef GL_EXT_stencil_clear_tag
+#define GL_STENCIL_TAG_BITS_EXT           0x88F2
+#define GL_STENCIL_CLEAR_TAG_VALUE_EXT    0x88F3
+#endif
+
+#ifndef GL_EXT_texture_sRGB
+#define GL_SRGB_EXT                       0x8C40
+#define GL_SRGB8_EXT                      0x8C41
+#define GL_SRGB_ALPHA_EXT                 0x8C42
+#define GL_SRGB8_ALPHA8_EXT               0x8C43
+#define GL_SLUMINANCE_ALPHA_EXT           0x8C44
+#define GL_SLUMINANCE8_ALPHA8_EXT         0x8C45
+#define GL_SLUMINANCE_EXT                 0x8C46
+#define GL_SLUMINANCE8_EXT                0x8C47
+#define GL_COMPRESSED_SRGB_EXT            0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA_EXT      0x8C49
+#define GL_COMPRESSED_SLUMINANCE_EXT      0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
+#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT  0x8C4C
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
+#endif
+
+#ifndef GL_EXT_framebuffer_blit
+#define GL_READ_FRAMEBUFFER_EXT           0x8CA8
+#define GL_DRAW_FRAMEBUFFER_EXT           0x8CA9
+#define GL_DRAW_FRAMEBUFFER_BINDING_EXT   GL_FRAMEBUFFER_BINDING_EXT
+#define GL_READ_FRAMEBUFFER_BINDING_EXT   0x8CAA
+#endif
+
+#ifndef GL_EXT_framebuffer_multisample
+#define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
+#define GL_MAX_SAMPLES_EXT                0x8D57
+#endif
+
+#ifndef GL_MESAX_texture_stack
+#define GL_TEXTURE_1D_STACK_MESAX         0x8759
+#define GL_TEXTURE_2D_STACK_MESAX         0x875A
+#define GL_PROXY_TEXTURE_1D_STACK_MESAX   0x875B
+#define GL_PROXY_TEXTURE_2D_STACK_MESAX   0x875C
+#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D
+#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
+#endif
+
+#ifndef GL_EXT_timer_query
+#define GL_TIME_ELAPSED_EXT               0x88BF
+#endif
+
+#ifndef GL_EXT_gpu_program_parameters
+#endif
+
+#ifndef GL_APPLE_flush_buffer_range
+#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12
+#define GL_BUFFER_FLUSHING_UNMAP_APPLE    0x8A13
+#endif
+
+#ifndef GL_NV_gpu_program4
+#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV    0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV    0x8905
+#define GL_PROGRAM_ATTRIB_COMPONENTS_NV   0x8906
+#define GL_PROGRAM_RESULT_COMPONENTS_NV   0x8907
+#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908
+#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909
+#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5
+#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6
+#endif
+
+#ifndef GL_NV_geometry_program4
+#define GL_LINES_ADJACENCY_EXT            0x000A
+#define GL_LINE_STRIP_ADJACENCY_EXT       0x000B
+#define GL_TRIANGLES_ADJACENCY_EXT        0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY_EXT   0x000D
+#define GL_GEOMETRY_PROGRAM_NV            0x8C26
+#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27
+#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28
+#define GL_GEOMETRY_VERTICES_OUT_EXT      0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_EXT        0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_EXT       0x8DDC
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
+#define GL_PROGRAM_POINT_SIZE_EXT         0x8642
+#endif
+
+#ifndef GL_EXT_geometry_shader4
+#define GL_GEOMETRY_SHADER_EXT            0x8DD9
+/* reuse GL_GEOMETRY_VERTICES_OUT_EXT */
+/* reuse GL_GEOMETRY_INPUT_TYPE_EXT */
+/* reuse GL_GEOMETRY_OUTPUT_TYPE_EXT */
+/* reuse GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT */
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE
+#define GL_MAX_VARYING_COMPONENTS_EXT     0x8B4B
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
+/* reuse GL_LINES_ADJACENCY_EXT */
+/* reuse GL_LINE_STRIP_ADJACENCY_EXT */
+/* reuse GL_TRIANGLES_ADJACENCY_EXT */
+/* reuse GL_TRIANGLE_STRIP_ADJACENCY_EXT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+/* reuse GL_PROGRAM_POINT_SIZE_EXT */
+#endif
+
+#ifndef GL_NV_vertex_program4
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD
+#endif
+
+#ifndef GL_EXT_gpu_shader4
+#define GL_SAMPLER_1D_ARRAY_EXT           0x8DC0
+#define GL_SAMPLER_2D_ARRAY_EXT           0x8DC1
+#define GL_SAMPLER_BUFFER_EXT             0x8DC2
+#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT    0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT    0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW_EXT        0x8DC5
+#define GL_UNSIGNED_INT_VEC2_EXT          0x8DC6
+#define GL_UNSIGNED_INT_VEC3_EXT          0x8DC7
+#define GL_UNSIGNED_INT_VEC4_EXT          0x8DC8
+#define GL_INT_SAMPLER_1D_EXT             0x8DC9
+#define GL_INT_SAMPLER_2D_EXT             0x8DCA
+#define GL_INT_SAMPLER_3D_EXT             0x8DCB
+#define GL_INT_SAMPLER_CUBE_EXT           0x8DCC
+#define GL_INT_SAMPLER_2D_RECT_EXT        0x8DCD
+#define GL_INT_SAMPLER_1D_ARRAY_EXT       0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY_EXT       0x8DCF
+#define GL_INT_SAMPLER_BUFFER_EXT         0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_1D_EXT    0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D_EXT    0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D_EXT    0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT  0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8
+#endif
+
+#ifndef GL_EXT_draw_instanced
+#endif
+
+#ifndef GL_EXT_packed_float
+#define GL_R11F_G11F_B10F_EXT             0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B
+#define GL_RGBA_SIGNED_COMPONENTS_EXT     0x8C3C
+#endif
+
+#ifndef GL_EXT_texture_array
+#define GL_TEXTURE_1D_ARRAY_EXT           0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY_EXT     0x8C19
+#define GL_TEXTURE_2D_ARRAY_EXT           0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY_EXT     0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY_EXT   0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY_EXT   0x8C1D
+#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT   0x88FF
+#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+#endif
+
+#ifndef GL_EXT_texture_buffer_object
+#define GL_TEXTURE_BUFFER_EXT             0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT    0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER_EXT     0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT_EXT      0x8C2E
+#endif
+
+#ifndef GL_EXT_texture_compression_latc
+#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
+#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71
+#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72
+#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73
+#endif
+
+#ifndef GL_EXT_texture_compression_rgtc
+#define GL_COMPRESSED_RED_RGTC1_EXT       0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
+#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
+#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
+#endif
+
+#ifndef GL_EXT_texture_shared_exponent
+#define GL_RGB9_E5_EXT                    0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT   0x8C3E
+#define GL_TEXTURE_SHARED_SIZE_EXT        0x8C3F
+#endif
+
+#ifndef GL_NV_depth_buffer_float
+#define GL_DEPTH_COMPONENT32F_NV          0x8DAB
+#define GL_DEPTH32F_STENCIL8_NV           0x8DAC
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD
+#define GL_DEPTH_BUFFER_FLOAT_MODE_NV     0x8DAF
+#endif
+
+#ifndef GL_NV_fragment_program4
+#endif
+
+#ifndef GL_NV_framebuffer_multisample_coverage
+#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB
+#define GL_RENDERBUFFER_COLOR_SAMPLES_NV  0x8E10
+#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11
+#define GL_MULTISAMPLE_COVERAGE_MODES_NV  0x8E12
+#endif
+
+#ifndef GL_EXT_framebuffer_sRGB
+#define GL_FRAMEBUFFER_SRGB_EXT           0x8DB9
+#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x8DBA
+#endif
+
+#ifndef GL_NV_geometry_shader4
+#endif
+
+#ifndef GL_NV_parameter_buffer_object
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1
+#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2
+#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3
+#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4
+#endif
+
+#ifndef GL_EXT_draw_buffers2
+#endif
+
+#ifndef GL_NV_transform_feedback
+#define GL_BACK_PRIMARY_COLOR_NV          0x8C77
+#define GL_BACK_SECONDARY_COLOR_NV        0x8C78
+#define GL_TEXTURE_COORD_NV               0x8C79
+#define GL_CLIP_DISTANCE_NV               0x8C7A
+#define GL_VERTEX_ID_NV                   0x8C7B
+#define GL_PRIMITIVE_ID_NV                0x8C7C
+#define GL_GENERIC_ATTRIB_NV              0x8C7D
+#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV  0x8C7E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80
+#define GL_ACTIVE_VARYINGS_NV             0x8C81
+#define GL_ACTIVE_VARYING_MAX_LENGTH_NV   0x8C82
+#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85
+#define GL_TRANSFORM_FEEDBACK_RECORD_NV   0x8C86
+#define GL_PRIMITIVES_GENERATED_NV        0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88
+#define GL_RASTERIZER_DISCARD_NV          0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS_NV         0x8C8C
+#define GL_SEPARATE_ATTRIBS_NV            0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER_NV   0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F
+#endif
+
+#ifndef GL_EXT_bindable_uniform
+#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2
+#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3
+#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4
+#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT  0x8DED
+#define GL_UNIFORM_BUFFER_EXT             0x8DEE
+#define GL_UNIFORM_BUFFER_BINDING_EXT     0x8DEF
+#endif
+
+#ifndef GL_EXT_texture_integer
+#define GL_RGBA32UI_EXT                   0x8D70
+#define GL_RGB32UI_EXT                    0x8D71
+#define GL_ALPHA32UI_EXT                  0x8D72
+#define GL_INTENSITY32UI_EXT              0x8D73
+#define GL_LUMINANCE32UI_EXT              0x8D74
+#define GL_LUMINANCE_ALPHA32UI_EXT        0x8D75
+#define GL_RGBA16UI_EXT                   0x8D76
+#define GL_RGB16UI_EXT                    0x8D77
+#define GL_ALPHA16UI_EXT                  0x8D78
+#define GL_INTENSITY16UI_EXT              0x8D79
+#define GL_LUMINANCE16UI_EXT              0x8D7A
+#define GL_LUMINANCE_ALPHA16UI_EXT        0x8D7B
+#define GL_RGBA8UI_EXT                    0x8D7C
+#define GL_RGB8UI_EXT                     0x8D7D
+#define GL_ALPHA8UI_EXT                   0x8D7E
+#define GL_INTENSITY8UI_EXT               0x8D7F
+#define GL_LUMINANCE8UI_EXT               0x8D80
+#define GL_LUMINANCE_ALPHA8UI_EXT         0x8D81
+#define GL_RGBA32I_EXT                    0x8D82
+#define GL_RGB32I_EXT                     0x8D83
+#define GL_ALPHA32I_EXT                   0x8D84
+#define GL_INTENSITY32I_EXT               0x8D85
+#define GL_LUMINANCE32I_EXT               0x8D86
+#define GL_LUMINANCE_ALPHA32I_EXT         0x8D87
+#define GL_RGBA16I_EXT                    0x8D88
+#define GL_RGB16I_EXT                     0x8D89
+#define GL_ALPHA16I_EXT                   0x8D8A
+#define GL_INTENSITY16I_EXT               0x8D8B
+#define GL_LUMINANCE16I_EXT               0x8D8C
+#define GL_LUMINANCE_ALPHA16I_EXT         0x8D8D
+#define GL_RGBA8I_EXT                     0x8D8E
+#define GL_RGB8I_EXT                      0x8D8F
+#define GL_ALPHA8I_EXT                    0x8D90
+#define GL_INTENSITY8I_EXT                0x8D91
+#define GL_LUMINANCE8I_EXT                0x8D92
+#define GL_LUMINANCE_ALPHA8I_EXT          0x8D93
+#define GL_RED_INTEGER_EXT                0x8D94
+#define GL_GREEN_INTEGER_EXT              0x8D95
+#define GL_BLUE_INTEGER_EXT               0x8D96
+#define GL_ALPHA_INTEGER_EXT              0x8D97
+#define GL_RGB_INTEGER_EXT                0x8D98
+#define GL_RGBA_INTEGER_EXT               0x8D99
+#define GL_BGR_INTEGER_EXT                0x8D9A
+#define GL_BGRA_INTEGER_EXT               0x8D9B
+#define GL_LUMINANCE_INTEGER_EXT          0x8D9C
+#define GL_LUMINANCE_ALPHA_INTEGER_EXT    0x8D9D
+#define GL_RGBA_INTEGER_MODE_EXT          0x8D9E
+#endif
+
+#ifndef GL_GREMEDY_frame_terminator
+#endif
+
+
+/*************************************************************/
+
+#include <stddef.h>
+#ifndef GL_VERSION_2_0
+/* GL type for program/shader text */
+typedef char GLchar;            /* native character */
+#endif
+
+#ifndef GL_VERSION_1_5
+/* GL types for handling large vertex buffer objects */
+typedef ptrdiff_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+/* GL types for handling large vertex buffer objects */
+typedef ptrdiff_t GLintptrARB;
+typedef ptrdiff_t GLsizeiptrARB;
+#endif
+
+#ifndef GL_ARB_shader_objects
+/* GL types for handling shader object handles and program/shader text */
+typedef char GLcharARB;     /* native character */
+typedef unsigned int GLhandleARB;   /* shader object handle */
+#endif
+
+/* GL types for "half" precision (s10e5) float data in host memory */
+#ifndef GL_ARB_half_float_pixel
+typedef unsigned short GLhalfARB;
+#endif
+
+#ifndef GL_NV_half_float
+typedef unsigned short GLhalfNV;
+#endif
+
+#ifndef GLEXT_64_TYPES_DEFINED
+/* This code block is duplicated in glext.h, so must be protected */
+#define GLEXT_64_TYPES_DEFINED
+/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
+/* (as used in the GL_EXT_timer_query extension). */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+#elif defined(__sun__)
+#include <inttypes.h>
+#if defined(__STDC__)
+#if defined(__arch64__)
+typedef long int int64_t;
+typedef unsigned long int uint64_t;
+#else
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#endif /* __arch64__ */
+#endif /* __STDC__ */
+#elif defined( __VMS )
+#include <inttypes.h>
+#elif defined(__SCO__) || defined(__USLC__)
+#include <stdint.h>
+#elif defined(__UNIXOS2__) || defined(__SOL64__)
+typedef long int int32_t;
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#elif defined(_WIN32) && defined(__GNUC__)
+#include <stdint.h>
+#elif defined(_WIN32)
+typedef __int32 int32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#else
+#include <inttypes.h>     /* Fallback option */
+#endif
+#endif
+
+#ifndef GL_EXT_timer_query
+typedef int64_t GLint64EXT;
+typedef uint64_t GLuint64EXT;
+#endif
+
+#ifndef GL_VERSION_1_2
+#define GL_VERSION_1_2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
+GLAPI void APIENTRY glBlendEquation (GLenum);
+GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
+GLAPI void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
+GLAPI void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
+GLAPI void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean);
+GLAPI void APIENTRY glMinmax (GLenum, GLenum, GLboolean);
+GLAPI void APIENTRY glResetHistogram (GLenum);
+GLAPI void APIENTRY glResetMinmax (GLenum);
+GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_VERSION_1_3 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTexture (GLenum);
+GLAPI void APIENTRY glClientActiveTexture (GLenum);
+GLAPI void APIENTRY glMultiTexCoord1d (GLenum, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord1dv (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord1f (GLenum, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord1fv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord1i (GLenum, GLint);
+GLAPI void APIENTRY glMultiTexCoord1iv (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord1s (GLenum, GLshort);
+GLAPI void APIENTRY glMultiTexCoord1sv (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord2d (GLenum, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord2dv (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord2fv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord2i (GLenum, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord2iv (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord2s (GLenum, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord2sv (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord3d (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord3dv (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord3f (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord3fv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord3i (GLenum, GLint, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord3iv (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord3s (GLenum, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord3sv (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord4d (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord4dv (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord4f (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord4fv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord4i (GLenum, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord4iv (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord4s (GLenum, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord4sv (GLenum, const GLshort *);
+GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *);
+GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *);
+GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *);
+GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *);
+GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean);
+GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
+#endif
+
+#ifndef GL_VERSION_1_4
+#define GL_VERSION_1_4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glFogCoordf (GLfloat);
+GLAPI void APIENTRY glFogCoordfv (const GLfloat *);
+GLAPI void APIENTRY glFogCoordd (GLdouble);
+GLAPI void APIENTRY glFogCoorddv (const GLdouble *);
+GLAPI void APIENTRY glFogCoordPointer (GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *, GLsizei);
+GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
+GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat);
+GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glPointParameteri (GLenum, GLint);
+GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *);
+GLAPI void APIENTRY glSecondaryColor3b (GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *);
+GLAPI void APIENTRY glSecondaryColor3d (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *);
+GLAPI void APIENTRY glSecondaryColor3f (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *);
+GLAPI void APIENTRY glSecondaryColor3i (GLint, GLint, GLint);
+GLAPI void APIENTRY glSecondaryColor3iv (const GLint *);
+GLAPI void APIENTRY glSecondaryColor3s (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *);
+GLAPI void APIENTRY glSecondaryColor3ub (GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *);
+GLAPI void APIENTRY glSecondaryColor3ui (GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *);
+GLAPI void APIENTRY glSecondaryColor3us (GLushort, GLushort, GLushort);
+GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *);
+GLAPI void APIENTRY glSecondaryColorPointer (GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glWindowPos2d (GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos2dv (const GLdouble *);
+GLAPI void APIENTRY glWindowPos2f (GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos2fv (const GLfloat *);
+GLAPI void APIENTRY glWindowPos2i (GLint, GLint);
+GLAPI void APIENTRY glWindowPos2iv (const GLint *);
+GLAPI void APIENTRY glWindowPos2s (GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos2sv (const GLshort *);
+GLAPI void APIENTRY glWindowPos3d (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos3dv (const GLdouble *);
+GLAPI void APIENTRY glWindowPos3f (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos3fv (const GLfloat *);
+GLAPI void APIENTRY glWindowPos3i (GLint, GLint, GLint);
+GLAPI void APIENTRY glWindowPos3iv (const GLint *);
+GLAPI void APIENTRY glWindowPos3s (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos3sv (const GLshort *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
+#endif
+
+#ifndef GL_VERSION_1_5
+#define GL_VERSION_1_5 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *);
+GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *);
+GLAPI GLboolean APIENTRY glIsQuery (GLuint);
+GLAPI void APIENTRY glBeginQuery (GLenum, GLuint);
+GLAPI void APIENTRY glEndQuery (GLenum);
+GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *);
+GLAPI void APIENTRY glBindBuffer (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsBuffer (GLuint);
+GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *, GLenum);
+GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr, const GLvoid *);
+GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr, GLvoid *);
+GLAPI GLvoid* APIENTRY glMapBuffer (GLenum, GLenum);
+GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum);
+GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid* *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
+#endif
+
+#ifndef GL_VERSION_2_0
+#define GL_VERSION_2_0 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum);
+GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *);
+GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint);
+GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint);
+GLAPI void APIENTRY glAttachShader (GLuint, GLuint);
+GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *);
+GLAPI void APIENTRY glCompileShader (GLuint);
+GLAPI GLuint APIENTRY glCreateProgram (void);
+GLAPI GLuint APIENTRY glCreateShader (GLenum);
+GLAPI void APIENTRY glDeleteProgram (GLuint);
+GLAPI void APIENTRY glDeleteShader (GLuint);
+GLAPI void APIENTRY glDetachShader (GLuint, GLuint);
+GLAPI void APIENTRY glDisableVertexAttribArray (GLuint);
+GLAPI void APIENTRY glEnableVertexAttribArray (GLuint);
+GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
+GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
+GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *, GLuint *);
+GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *);
+GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
+GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
+GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *, GLchar *);
+GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *);
+GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *);
+GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *);
+GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *);
+GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum, GLvoid* *);
+GLAPI GLboolean APIENTRY glIsProgram (GLuint);
+GLAPI GLboolean APIENTRY glIsShader (GLuint);
+GLAPI void APIENTRY glLinkProgram (GLuint);
+GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar* *, const GLint *);
+GLAPI void APIENTRY glUseProgram (GLuint);
+GLAPI void APIENTRY glUniform1f (GLint, GLfloat);
+GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform1i (GLint, GLint);
+GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glValidateProgram (GLuint);
+GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble);
+GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat);
+GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort);
+GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
+typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
+typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
+typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
+typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
+typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_VERSION_2_1
+#define GL_VERSION_2_1 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniformMatrix2x3fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix3x2fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix2x4fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix4x2fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix3x4fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix4x3fv (GLint, GLsizei, GLboolean, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#endif
+
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTextureARB (GLenum);
+GLAPI void APIENTRY glClientActiveTextureARB (GLenum);
+GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum, GLint);
+GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort);
+GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+#endif
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_ARB_transpose_matrix 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *);
+GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *);
+GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *);
+GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+#endif
+
+#ifndef GL_ARB_multisample
+#define GL_ARB_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleCoverageARB (GLclampf, GLboolean);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
+#endif
+
+#ifndef GL_ARB_texture_env_add
+#define GL_ARB_texture_env_add 1
+#endif
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_ARB_texture_cube_map 1
+#endif
+
+#ifndef GL_ARB_texture_compression
+#define GL_ARB_texture_compression 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img);
+#endif
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_ARB_texture_border_clamp 1
+#endif
+
+#ifndef GL_ARB_point_parameters
+#define GL_ARB_point_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfARB (GLenum, GLfloat);
+GLAPI void APIENTRY glPointParameterfvARB (GLenum, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_ARB_vertex_blend
+#define GL_ARB_vertex_blend 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWeightbvARB (GLint, const GLbyte *);
+GLAPI void APIENTRY glWeightsvARB (GLint, const GLshort *);
+GLAPI void APIENTRY glWeightivARB (GLint, const GLint *);
+GLAPI void APIENTRY glWeightfvARB (GLint, const GLfloat *);
+GLAPI void APIENTRY glWeightdvARB (GLint, const GLdouble *);
+GLAPI void APIENTRY glWeightubvARB (GLint, const GLubyte *);
+GLAPI void APIENTRY glWeightusvARB (GLint, const GLushort *);
+GLAPI void APIENTRY glWeightuivARB (GLint, const GLuint *);
+GLAPI void APIENTRY glWeightPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glVertexBlendARB (GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
+typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
+#endif
+
+#ifndef GL_ARB_matrix_palette
+#define GL_ARB_matrix_palette 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint);
+GLAPI void APIENTRY glMatrixIndexubvARB (GLint, const GLubyte *);
+GLAPI void APIENTRY glMatrixIndexusvARB (GLint, const GLushort *);
+GLAPI void APIENTRY glMatrixIndexuivARB (GLint, const GLuint *);
+GLAPI void APIENTRY glMatrixIndexPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_ARB_texture_env_combine 1
+#endif
+
+#ifndef GL_ARB_texture_env_crossbar
+#define GL_ARB_texture_env_crossbar 1
+#endif
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_ARB_texture_env_dot3 1
+#endif
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_ARB_texture_mirrored_repeat 1
+#endif
+
+#ifndef GL_ARB_depth_texture
+#define GL_ARB_depth_texture 1
+#endif
+
+#ifndef GL_ARB_shadow
+#define GL_ARB_shadow 1
+#endif
+
+#ifndef GL_ARB_shadow_ambient
+#define GL_ARB_shadow_ambient 1
+#endif
+
+#ifndef GL_ARB_window_pos
+#define GL_ARB_window_pos 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dARB (GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *);
+GLAPI void APIENTRY glWindowPos2fARB (GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *);
+GLAPI void APIENTRY glWindowPos2iARB (GLint, GLint);
+GLAPI void APIENTRY glWindowPos2ivARB (const GLint *);
+GLAPI void APIENTRY glWindowPos2sARB (GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos2svARB (const GLshort *);
+GLAPI void APIENTRY glWindowPos3dARB (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *);
+GLAPI void APIENTRY glWindowPos3fARB (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *);
+GLAPI void APIENTRY glWindowPos3iARB (GLint, GLint, GLint);
+GLAPI void APIENTRY glWindowPos3ivARB (const GLint *);
+GLAPI void APIENTRY glWindowPos3sARB (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos3svARB (const GLshort *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
+#endif
+
+#ifndef GL_ARB_vertex_program
+#define GL_ARB_vertex_program 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttrib1dARB (GLuint, GLdouble);
+GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib1fARB (GLuint, GLfloat);
+GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib1sARB (GLuint, GLshort);
+GLAPI void APIENTRY glVertexAttrib1svARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib2dARB (GLuint, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib2fARB (GLuint, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib2sARB (GLuint, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib2svARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib3dARB (GLuint, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib3fARB (GLuint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib3sARB (GLuint, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib3svARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttrib4dARB (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib4fARB (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttrib4sARB (GLuint, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib4svARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttribPointerARB (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint);
+GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint);
+GLAPI void APIENTRY glProgramStringARB (GLenum, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glBindProgramARB (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteProgramsARB (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenProgramsARB (GLsizei, GLuint *);
+GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum, GLuint, const GLdouble *);
+GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum, GLuint, const GLfloat *);
+GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum, GLuint, const GLdouble *);
+GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum, GLuint, const GLfloat *);
+GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum, GLuint, GLdouble *);
+GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum, GLuint, GLfloat *);
+GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum, GLuint, GLdouble *);
+GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum, GLuint, GLfloat *);
+GLAPI void APIENTRY glGetProgramivARB (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetProgramStringARB (GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint, GLenum, GLdouble *);
+GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVertexAttribivARB (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint, GLenum, GLvoid* *);
+GLAPI GLboolean APIENTRY glIsProgramARB (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
+typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
+#endif
+
+#ifndef GL_ARB_fragment_program
+#define GL_ARB_fragment_program 1
+/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_ARB_vertex_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindBufferARB (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteBuffersARB (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenBuffersARB (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsBufferARB (GLuint);
+GLAPI void APIENTRY glBufferDataARB (GLenum, GLsizeiptrARB, const GLvoid *, GLenum);
+GLAPI void APIENTRY glBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *);
+GLAPI void APIENTRY glGetBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *);
+GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum, GLenum);
+GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum);
+GLAPI void APIENTRY glGetBufferParameterivARB (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params);
+#endif
+
+#ifndef GL_ARB_occlusion_query
+#define GL_ARB_occlusion_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueriesARB (GLsizei, GLuint *);
+GLAPI void APIENTRY glDeleteQueriesARB (GLsizei, const GLuint *);
+GLAPI GLboolean APIENTRY glIsQueryARB (GLuint);
+GLAPI void APIENTRY glBeginQueryARB (GLenum, GLuint);
+GLAPI void APIENTRY glEndQueryARB (GLenum);
+GLAPI void APIENTRY glGetQueryivARB (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetQueryObjectivARB (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint, GLenum, GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
+#endif
+
+#ifndef GL_ARB_shader_objects
+#define GL_ARB_shader_objects 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB);
+GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum);
+GLAPI void APIENTRY glDetachObjectARB (GLhandleARB, GLhandleARB);
+GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum);
+GLAPI void APIENTRY glShaderSourceARB (GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
+GLAPI void APIENTRY glCompileShaderARB (GLhandleARB);
+GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
+GLAPI void APIENTRY glAttachObjectARB (GLhandleARB, GLhandleARB);
+GLAPI void APIENTRY glLinkProgramARB (GLhandleARB);
+GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB);
+GLAPI void APIENTRY glValidateProgramARB (GLhandleARB);
+GLAPI void APIENTRY glUniform1fARB (GLint, GLfloat);
+GLAPI void APIENTRY glUniform2fARB (GLint, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform3fARB (GLint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform4fARB (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform1iARB (GLint, GLint);
+GLAPI void APIENTRY glUniform2iARB (GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform3iARB (GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform4iARB (GLint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform1fvARB (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform2fvARB (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform3fvARB (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform4fvARB (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform1ivARB (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform2ivARB (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform3ivARB (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform4ivARB (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniformMatrix2fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix3fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix4fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB, GLenum, GLint *);
+GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
+GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);
+GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB, const GLcharARB *);
+GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
+GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB, GLint, GLfloat *);
+GLAPI void APIENTRY glGetUniformivARB (GLhandleARB, GLint, GLint *);
+GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
+typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
+typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
+typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
+typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
+typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
+typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
+#endif
+
+#ifndef GL_ARB_vertex_shader
+#define GL_ARB_vertex_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB, GLuint, const GLcharARB *);
+GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
+GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB, const GLcharARB *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+#endif
+
+#ifndef GL_ARB_fragment_shader
+#define GL_ARB_fragment_shader 1
+#endif
+
+#ifndef GL_ARB_shading_language_100
+#define GL_ARB_shading_language_100 1
+#endif
+
+#ifndef GL_ARB_texture_non_power_of_two
+#define GL_ARB_texture_non_power_of_two 1
+#endif
+
+#ifndef GL_ARB_point_sprite
+#define GL_ARB_point_sprite 1
+#endif
+
+#ifndef GL_ARB_fragment_program_shadow
+#define GL_ARB_fragment_program_shadow 1
+#endif
+
+#ifndef GL_ARB_draw_buffers
+#define GL_ARB_draw_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersARB (GLsizei, const GLenum *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
+#endif
+
+#ifndef GL_ARB_texture_rectangle
+#define GL_ARB_texture_rectangle 1
+#endif
+
+#ifndef GL_ARB_color_buffer_float
+#define GL_ARB_color_buffer_float 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClampColorARB (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
+#endif
+
+#ifndef GL_ARB_half_float_pixel
+#define GL_ARB_half_float_pixel 1
+#endif
+
+#ifndef GL_ARB_texture_float
+#define GL_ARB_texture_float 1
+#endif
+
+#ifndef GL_ARB_pixel_buffer_object
+#define GL_ARB_pixel_buffer_object 1
+#endif
+
+#ifndef GL_EXT_abgr
+#define GL_EXT_abgr 1
+#endif
+
+#ifndef GL_EXT_blend_color
+#define GL_EXT_blend_color 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendColorEXT (GLclampf, GLclampf, GLclampf, GLclampf);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+#endif
+
+#ifndef GL_EXT_polygon_offset
+#define GL_EXT_polygon_offset 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat, GLfloat);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
+#endif
+
+#ifndef GL_EXT_texture
+#define GL_EXT_texture 1
+#endif
+
+#ifndef GL_EXT_texture3D
+#define GL_EXT_texture3D 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+
+#ifndef GL_SGIS_texture_filter4
+#define GL_SGIS_texture_filter4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum, GLenum, GLsizei, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
+typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+#endif
+
+#ifndef GL_EXT_subtexture
+#define GL_EXT_subtexture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexSubImage1DEXT (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+
+#ifndef GL_EXT_copy_texture
+#define GL_EXT_copy_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
+GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
+GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_EXT_histogram
+#define GL_EXT_histogram 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetHistogramEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetMinmaxEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glHistogramEXT (GLenum, GLsizei, GLenum, GLboolean);
+GLAPI void APIENTRY glMinmaxEXT (GLenum, GLenum, GLboolean);
+GLAPI void APIENTRY glResetHistogramEXT (GLenum);
+GLAPI void APIENTRY glResetMinmaxEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
+#endif
+
+#ifndef GL_EXT_convolution
+#define GL_EXT_convolution 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum, GLenum, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
+GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+#endif
+
+#ifndef GL_SGI_color_matrix
+#define GL_SGI_color_matrix 1
+#endif
+
+#ifndef GL_SGI_color_table
+#define GL_SGI_color_table 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableSGI (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glColorTableParameterivSGI (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glCopyColorTableSGI (GLenum, GLenum, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glGetColorTableSGI (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum, GLenum, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_SGIX_pixel_texture
+#define GL_SGIX_pixel_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenSGIX (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
+#endif
+
+#ifndef GL_SGIS_pixel_texture
+#define GL_SGIS_pixel_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum, GLint);
+GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum, const GLint *);
+GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum, GLfloat);
+GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum, GLint *);
+GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_SGIS_texture4D
+#define GL_SGIS_texture4D 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage4DSGIS (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+
+#ifndef GL_SGI_texture_color_table
+#define GL_SGI_texture_color_table 1
+#endif
+
+#ifndef GL_EXT_cmyka
+#define GL_EXT_cmyka 1
+#endif
+
+#ifndef GL_EXT_texture_object
+#define GL_EXT_texture_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei, const GLuint *, GLboolean *);
+GLAPI void APIENTRY glBindTextureEXT (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenTexturesEXT (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint);
+GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei, const GLuint *, const GLclampf *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
+typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+#endif
+
+#ifndef GL_SGIS_detail_texture
+#define GL_SGIS_detail_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#endif
+
+#ifndef GL_SGIS_sharpen_texture
+#define GL_SGIS_sharpen_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#endif
+
+#ifndef GL_EXT_packed_pixels
+#define GL_EXT_packed_pixels 1
+#endif
+
+#ifndef GL_SGIS_texture_lod
+#define GL_SGIS_texture_lod 1
+#endif
+
+#ifndef GL_SGIS_multisample
+#define GL_SGIS_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskSGIS (GLclampf, GLboolean);
+GLAPI void APIENTRY glSamplePatternSGIS (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
+#endif
+
+#ifndef GL_EXT_rescale_normal
+#define GL_EXT_rescale_normal 1
+#endif
+
+#ifndef GL_EXT_vertex_array
+#define GL_EXT_vertex_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glArrayElementEXT (GLint);
+GLAPI void APIENTRY glColorPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glDrawArraysEXT (GLenum, GLint, GLsizei);
+GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei, GLsizei, const GLboolean *);
+GLAPI void APIENTRY glGetPointervEXT (GLenum, GLvoid* *);
+GLAPI void APIENTRY glIndexPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glNormalPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glTexCoordPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glVertexPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
+typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
+typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
+typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+#endif
+
+#ifndef GL_EXT_misc_attribute
+#define GL_EXT_misc_attribute 1
+#endif
+
+#ifndef GL_SGIS_generate_mipmap
+#define GL_SGIS_generate_mipmap 1
+#endif
+
+#ifndef GL_SGIX_clipmap
+#define GL_SGIX_clipmap 1
+#endif
+
+#ifndef GL_SGIX_shadow
+#define GL_SGIX_shadow 1
+#endif
+
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_SGIS_texture_edge_clamp 1
+#endif
+
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_SGIS_texture_border_clamp 1
+#endif
+
+#ifndef GL_EXT_blend_minmax
+#define GL_EXT_blend_minmax 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
+#endif
+
+#ifndef GL_EXT_blend_subtract
+#define GL_EXT_blend_subtract 1
+#endif
+
+#ifndef GL_EXT_blend_logic_op
+#define GL_EXT_blend_logic_op 1
+#endif
+
+#ifndef GL_SGIX_interlace
+#define GL_SGIX_interlace 1
+#endif
+
+#ifndef GL_SGIX_pixel_tiles
+#define GL_SGIX_pixel_tiles 1
+#endif
+
+#ifndef GL_SGIX_texture_select
+#define GL_SGIX_texture_select 1
+#endif
+
+#ifndef GL_SGIX_sprite
+#define GL_SGIX_sprite 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum, GLfloat);
+GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum, const GLfloat *);
+GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum, GLint);
+GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum, const GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_SGIX_texture_multi_buffer 1
+#endif
+
+#ifndef GL_EXT_point_parameters
+#define GL_EXT_point_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfEXT (GLenum, GLfloat);
+GLAPI void APIENTRY glPointParameterfvEXT (GLenum, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_SGIS_point_parameters
+#define GL_SGIS_point_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfSGIS (GLenum, GLfloat);
+GLAPI void APIENTRY glPointParameterfvSGIS (GLenum, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_SGIX_instruments
+#define GL_SGIX_instruments 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
+GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei, GLint *);
+GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *);
+GLAPI void APIENTRY glReadInstrumentsSGIX (GLint);
+GLAPI void APIENTRY glStartInstrumentsSGIX (void);
+GLAPI void APIENTRY glStopInstrumentsSGIX (GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
+typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
+typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
+typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
+#endif
+
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_SGIX_texture_scale_bias 1
+#endif
+
+#ifndef GL_SGIX_framezoom
+#define GL_SGIX_framezoom 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameZoomSGIX (GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
+#endif
+
+#ifndef GL_SGIX_tag_sample_buffer
+#define GL_SGIX_tag_sample_buffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTagSampleBufferSGIX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
+#endif
+
+#ifndef GL_SGIX_polynomial_ffd
+#define GL_SGIX_polynomial_ffd 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *);
+GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *);
+GLAPI void APIENTRY glDeformSGIX (GLbitfield);
+GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
+typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
+#endif
+
+#ifndef GL_SGIX_reference_plane
+#define GL_SGIX_reference_plane 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
+#endif
+
+#ifndef GL_SGIX_flush_raster
+#define GL_SGIX_flush_raster 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushRasterSGIX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
+#endif
+
+#ifndef GL_SGIX_depth_texture
+#define GL_SGIX_depth_texture 1
+#endif
+
+#ifndef GL_SGIS_fog_function
+#define GL_SGIS_fog_function 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogFuncSGIS (GLsizei, const GLfloat *);
+GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
+#endif
+
+#ifndef GL_SGIX_fog_offset
+#define GL_SGIX_fog_offset 1
+#endif
+
+#ifndef GL_HP_image_transform
+#define GL_HP_image_transform 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glImageTransformParameteriHP (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glImageTransformParameterfHP (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glImageTransformParameterivHP (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum, GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_HP_convolution_border_modes
+#define GL_HP_convolution_border_modes 1
+#endif
+
+#ifndef GL_SGIX_texture_add_env
+#define GL_SGIX_texture_add_env 1
+#endif
+
+#ifndef GL_EXT_color_subtable
+#define GL_EXT_color_subtable 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorSubTableEXT (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum, GLsizei, GLint, GLint, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+#endif
+
+#ifndef GL_PGI_vertex_hints
+#define GL_PGI_vertex_hints 1
+#endif
+
+#ifndef GL_PGI_misc_hints
+#define GL_PGI_misc_hints 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glHintPGI (GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
+#endif
+
+#ifndef GL_EXT_paletted_texture
+#define GL_EXT_paletted_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glGetColorTableEXT (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum, GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_EXT_clip_volume_hint
+#define GL_EXT_clip_volume_hint 1
+#endif
+
+#ifndef GL_SGIX_list_priority
+#define GL_SGIX_list_priority 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetListParameterivSGIX (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glListParameterfSGIX (GLuint, GLenum, GLfloat);
+GLAPI void APIENTRY glListParameterfvSGIX (GLuint, GLenum, const GLfloat *);
+GLAPI void APIENTRY glListParameteriSGIX (GLuint, GLenum, GLint);
+GLAPI void APIENTRY glListParameterivSGIX (GLuint, GLenum, const GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_SGIX_ir_instrument1
+#define GL_SGIX_ir_instrument1 1
+#endif
+
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_SGIX_calligraphic_fragment 1
+#endif
+
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_SGIX_texture_lod_bias 1
+#endif
+
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SGIX_shadow_ambient 1
+#endif
+
+#ifndef GL_EXT_index_texture
+#define GL_EXT_index_texture 1
+#endif
+
+#ifndef GL_EXT_index_material
+#define GL_EXT_index_material 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexMaterialEXT (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
+#endif
+
+#ifndef GL_EXT_index_func
+#define GL_EXT_index_func 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexFuncEXT (GLenum, GLclampf);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
+#endif
+
+#ifndef GL_EXT_index_array_formats
+#define GL_EXT_index_array_formats 1
+#endif
+
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_EXT_compiled_vertex_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLockArraysEXT (GLint, GLsizei);
+GLAPI void APIENTRY glUnlockArraysEXT (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
+#endif
+
+#ifndef GL_EXT_cull_vertex
+#define GL_EXT_cull_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCullParameterdvEXT (GLenum, GLdouble *);
+GLAPI void APIENTRY glCullParameterfvEXT (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_SGIX_ycrcb
+#define GL_SGIX_ycrcb 1
+#endif
+
+#ifndef GL_SGIX_fragment_lighting
+#define GL_SGIX_fragment_lighting 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum, GLenum);
+GLAPI void APIENTRY glFragmentLightfSGIX (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glFragmentLightiSGIX (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glFragmentLightivSGIX (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum, GLfloat);
+GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum, const GLfloat *);
+GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum, GLint);
+GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum, const GLint *);
+GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glLightEnviSGIX (GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
+#endif
+
+#ifndef GL_IBM_rasterpos_clip
+#define GL_IBM_rasterpos_clip 1
+#endif
+
+#ifndef GL_HP_texture_lighting
+#define GL_HP_texture_lighting 1
+#endif
+
+#ifndef GL_EXT_draw_range_elements
+#define GL_EXT_draw_range_elements 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+#endif
+
+#ifndef GL_WIN_phong_shading
+#define GL_WIN_phong_shading 1
+#endif
+
+#ifndef GL_WIN_specular_fog
+#define GL_WIN_specular_fog 1
+#endif
+
+#ifndef GL_EXT_light_texture
+#define GL_EXT_light_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glApplyTextureEXT (GLenum);
+GLAPI void APIENTRY glTextureLightEXT (GLenum);
+GLAPI void APIENTRY glTextureMaterialEXT (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
+#endif
+
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_SGIX_blend_alpha_minmax 1
+#endif
+
+#ifndef GL_EXT_bgra
+#define GL_EXT_bgra 1
+#endif
+
+#ifndef GL_SGIX_async
+#define GL_SGIX_async 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint);
+GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *);
+GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *);
+GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei);
+GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint, GLsizei);
+GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
+typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
+typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
+typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
+typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
+typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
+#endif
+
+#ifndef GL_SGIX_async_pixel
+#define GL_SGIX_async_pixel 1
+#endif
+
+#ifndef GL_SGIX_async_histogram
+#define GL_SGIX_async_histogram 1
+#endif
+
+#ifndef GL_INTEL_parallel_arrays
+#define GL_INTEL_parallel_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexPointervINTEL (GLint, GLenum, const GLvoid* *);
+GLAPI void APIENTRY glNormalPointervINTEL (GLenum, const GLvoid* *);
+GLAPI void APIENTRY glColorPointervINTEL (GLint, GLenum, const GLvoid* *);
+GLAPI void APIENTRY glTexCoordPointervINTEL (GLint, GLenum, const GLvoid* *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+#endif
+
+#ifndef GL_HP_occlusion_test
+#define GL_HP_occlusion_test 1
+#endif
+
+#ifndef GL_EXT_pixel_transform
+#define GL_EXT_pixel_transform 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum, GLenum, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_EXT_pixel_transform_color_table
+#define GL_EXT_pixel_transform_color_table 1
+#endif
+
+#ifndef GL_EXT_shared_texture_palette
+#define GL_EXT_shared_texture_palette 1
+#endif
+
+#ifndef GL_EXT_separate_specular_color
+#define GL_EXT_separate_specular_color 1
+#endif
+
+#ifndef GL_EXT_secondary_color
+#define GL_EXT_secondary_color 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *);
+GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *);
+GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *);
+GLAPI void APIENTRY glSecondaryColor3iEXT (GLint, GLint, GLint);
+GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *);
+GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *);
+GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *);
+GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *);
+GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort, GLushort, GLushort);
+GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *);
+GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_EXT_texture_perturb_normal 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureNormalEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
+#endif
+
+#ifndef GL_EXT_multi_draw_arrays
+#define GL_EXT_multi_draw_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei);
+GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+#endif
+
+#ifndef GL_EXT_fog_coord
+#define GL_EXT_fog_coord 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogCoordfEXT (GLfloat);
+GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *);
+GLAPI void APIENTRY glFogCoorddEXT (GLdouble);
+GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *);
+GLAPI void APIENTRY glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_REND_screen_coordinates
+#define GL_REND_screen_coordinates 1
+#endif
+
+#ifndef GL_EXT_coordinate_frame
+#define GL_EXT_coordinate_frame 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTangent3bEXT (GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *);
+GLAPI void APIENTRY glTangent3dEXT (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *);
+GLAPI void APIENTRY glTangent3fEXT (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *);
+GLAPI void APIENTRY glTangent3iEXT (GLint, GLint, GLint);
+GLAPI void APIENTRY glTangent3ivEXT (const GLint *);
+GLAPI void APIENTRY glTangent3sEXT (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glTangent3svEXT (const GLshort *);
+GLAPI void APIENTRY glBinormal3bEXT (GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *);
+GLAPI void APIENTRY glBinormal3dEXT (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *);
+GLAPI void APIENTRY glBinormal3fEXT (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *);
+GLAPI void APIENTRY glBinormal3iEXT (GLint, GLint, GLint);
+GLAPI void APIENTRY glBinormal3ivEXT (const GLint *);
+GLAPI void APIENTRY glBinormal3sEXT (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glBinormal3svEXT (const GLshort *);
+GLAPI void APIENTRY glTangentPointerEXT (GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glBinormalPointerEXT (GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
+typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
+typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
+typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
+typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
+typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
+typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
+typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
+typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
+typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
+typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_EXT_texture_env_combine
+#define GL_EXT_texture_env_combine 1
+#endif
+
+#ifndef GL_APPLE_specular_vector
+#define GL_APPLE_specular_vector 1
+#endif
+
+#ifndef GL_APPLE_transform_hint
+#define GL_APPLE_transform_hint 1
+#endif
+
+#ifndef GL_SGIX_fog_scale
+#define GL_SGIX_fog_scale 1
+#endif
+
+#ifndef GL_SUNX_constant_data
+#define GL_SUNX_constant_data 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFinishTextureSUNX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
+#endif
+
+#ifndef GL_SUN_global_alpha
+#define GL_SUN_global_alpha 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte);
+GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort);
+GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint);
+GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat);
+GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble);
+GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte);
+GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort);
+GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
+#endif
+
+#ifndef GL_SUN_triangle_list
+#define GL_SUN_triangle_list 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint);
+GLAPI void APIENTRY glReplacementCodeusSUN (GLushort);
+GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte);
+GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *);
+GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *);
+GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *);
+GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum, GLsizei, const GLvoid* *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
+#endif
+
+#ifndef GL_SUN_vertex
+#define GL_SUN_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat);
+GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *, const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *, const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+#endif
+
+#ifndef GL_EXT_blend_func_separate
+#define GL_EXT_blend_func_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum, GLenum, GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+
+#ifndef GL_INGR_blend_func_separate
+#define GL_INGR_blend_func_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum, GLenum, GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+
+#ifndef GL_INGR_color_clamp
+#define GL_INGR_color_clamp 1
+#endif
+
+#ifndef GL_INGR_interlace_read
+#define GL_INGR_interlace_read 1
+#endif
+
+#ifndef GL_EXT_stencil_wrap
+#define GL_EXT_stencil_wrap 1
+#endif
+
+#ifndef GL_EXT_422_pixels
+#define GL_EXT_422_pixels 1
+#endif
+
+#ifndef GL_NV_texgen_reflection
+#define GL_NV_texgen_reflection 1
+#endif
+
+#ifndef GL_SUN_convolution_border_modes
+#define GL_SUN_convolution_border_modes 1
+#endif
+
+#ifndef GL_EXT_texture_env_add
+#define GL_EXT_texture_env_add 1
+#endif
+
+#ifndef GL_EXT_texture_lod_bias
+#define GL_EXT_texture_lod_bias 1
+#endif
+
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_EXT_texture_filter_anisotropic 1
+#endif
+
+#ifndef GL_EXT_vertex_weighting
+#define GL_EXT_vertex_weighting 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexWeightfEXT (GLfloat);
+GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *);
+GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei, GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_NV_light_max_exponent
+#define GL_NV_light_max_exponent 1
+#endif
+
+#ifndef GL_NV_vertex_array_range
+#define GL_NV_vertex_array_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
+GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer);
+#endif
+
+#ifndef GL_NV_register_combiners
+#define GL_NV_register_combiners 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerParameterfvNV (GLenum, const GLfloat *);
+GLAPI void APIENTRY glCombinerParameterfNV (GLenum, GLfloat);
+GLAPI void APIENTRY glCombinerParameterivNV (GLenum, const GLint *);
+GLAPI void APIENTRY glCombinerParameteriNV (GLenum, GLint);
+GLAPI void APIENTRY glCombinerInputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glCombinerOutputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean);
+GLAPI void APIENTRY glFinalCombinerInputNV (GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum, GLenum, GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum, GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum, GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum, GLenum, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_NV_fog_distance
+#define GL_NV_fog_distance 1
+#endif
+
+#ifndef GL_NV_texgen_emboss
+#define GL_NV_texgen_emboss 1
+#endif
+
+#ifndef GL_NV_blend_square
+#define GL_NV_blend_square 1
+#endif
+
+#ifndef GL_NV_texture_env_combine4
+#define GL_NV_texture_env_combine4 1
+#endif
+
+#ifndef GL_MESA_resize_buffers
+#define GL_MESA_resize_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glResizeBuffersMESA (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
+#endif
+
+#ifndef GL_MESA_window_pos
+#define GL_MESA_window_pos 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dMESA (GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *);
+GLAPI void APIENTRY glWindowPos2fMESA (GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *);
+GLAPI void APIENTRY glWindowPos2iMESA (GLint, GLint);
+GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *);
+GLAPI void APIENTRY glWindowPos2sMESA (GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *);
+GLAPI void APIENTRY glWindowPos3dMESA (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *);
+GLAPI void APIENTRY glWindowPos3fMESA (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *);
+GLAPI void APIENTRY glWindowPos3iMESA (GLint, GLint, GLint);
+GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *);
+GLAPI void APIENTRY glWindowPos3sMESA (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *);
+GLAPI void APIENTRY glWindowPos4dMESA (GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *);
+GLAPI void APIENTRY glWindowPos4fMESA (GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *);
+GLAPI void APIENTRY glWindowPos4iMESA (GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *);
+GLAPI void APIENTRY glWindowPos4sMESA (GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
+#endif
+
+#ifndef GL_IBM_cull_vertex
+#define GL_IBM_cull_vertex 1
+#endif
+
+#ifndef GL_IBM_multimode_draw_arrays
+#define GL_IBM_multimode_draw_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint);
+GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* const *, GLsizei, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
+#endif
+
+#ifndef GL_IBM_vertex_array_lists
+#define GL_IBM_vertex_array_lists 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint, const GLboolean* *, GLint);
+GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glIndexPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glNormalPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glTexCoordPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glVertexPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+#endif
+
+#ifndef GL_SGIX_subsample
+#define GL_SGIX_subsample 1
+#endif
+
+#ifndef GL_SGIX_ycrcba
+#define GL_SGIX_ycrcba 1
+#endif
+
+#ifndef GL_SGIX_ycrcb_subsample
+#define GL_SGIX_ycrcb_subsample 1
+#endif
+
+#ifndef GL_SGIX_depth_pass_instrument
+#define GL_SGIX_depth_pass_instrument 1
+#endif
+
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_3DFX_texture_compression_FXT1 1
+#endif
+
+#ifndef GL_3DFX_multisample
+#define GL_3DFX_multisample 1
+#endif
+
+#ifndef GL_3DFX_tbuffer
+#define GL_3DFX_tbuffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTbufferMask3DFX (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
+#endif
+
+#ifndef GL_EXT_multisample
+#define GL_EXT_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskEXT (GLclampf, GLboolean);
+GLAPI void APIENTRY glSamplePatternEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
+#endif
+
+#ifndef GL_SGIX_vertex_preclip
+#define GL_SGIX_vertex_preclip 1
+#endif
+
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_SGIX_convolution_accuracy 1
+#endif
+
+#ifndef GL_SGIX_resample
+#define GL_SGIX_resample 1
+#endif
+
+#ifndef GL_SGIS_point_line_texgen
+#define GL_SGIS_point_line_texgen 1
+#endif
+
+#ifndef GL_SGIS_texture_color_mask
+#define GL_SGIS_texture_color_mask 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean, GLboolean, GLboolean, GLboolean);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+#endif
+
+#ifndef GL_SGIX_igloo_interface
+#define GL_SGIX_igloo_interface 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params);
+#endif
+
+#ifndef GL_EXT_texture_env_dot3
+#define GL_EXT_texture_env_dot3 1
+#endif
+
+#ifndef GL_ATI_texture_mirror_once
+#define GL_ATI_texture_mirror_once 1
+#endif
+
+#ifndef GL_NV_fence
+#define GL_NV_fence 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteFencesNV (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenFencesNV (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsFenceNV (GLuint);
+GLAPI GLboolean APIENTRY glTestFenceNV (GLuint);
+GLAPI void APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glFinishFenceNV (GLuint);
+GLAPI void APIENTRY glSetFenceNV (GLuint, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
+typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
+#endif
+
+#ifndef GL_NV_evaluators
+#define GL_NV_evaluators 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, const GLvoid *);
+GLAPI void APIENTRY glMapParameterivNV (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glMapParameterfvNV (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid *);
+GLAPI void APIENTRY glGetMapParameterivNV (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetMapParameterfvNV (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum, GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glEvalMapsNV (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
+typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
+#endif
+
+#ifndef GL_NV_packed_depth_stencil
+#define GL_NV_packed_depth_stencil 1
+#endif
+
+#ifndef GL_NV_register_combiners2
+#define GL_NV_register_combiners2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum, GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_NV_texture_compression_vtc
+#define GL_NV_texture_compression_vtc 1
+#endif
+
+#ifndef GL_NV_texture_rectangle
+#define GL_NV_texture_rectangle 1
+#endif
+
+#ifndef GL_NV_texture_shader
+#define GL_NV_texture_shader 1
+#endif
+
+#ifndef GL_NV_texture_shader2
+#define GL_NV_texture_shader2 1
+#endif
+
+#ifndef GL_NV_vertex_array_range2
+#define GL_NV_vertex_array_range2 1
+#endif
+
+#ifndef GL_NV_vertex_program
+#define GL_NV_vertex_program 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei, const GLuint *, GLboolean *);
+GLAPI void APIENTRY glBindProgramNV (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteProgramsNV (GLsizei, const GLuint *);
+GLAPI void APIENTRY glExecuteProgramNV (GLenum, GLuint, const GLfloat *);
+GLAPI void APIENTRY glGenProgramsNV (GLsizei, GLuint *);
+GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum, GLuint, GLenum, GLdouble *);
+GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetProgramivNV (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetProgramStringNV (GLuint, GLenum, GLubyte *);
+GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum, GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint, GLenum, GLdouble *);
+GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVertexAttribivNV (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint, GLenum, GLvoid* *);
+GLAPI GLboolean APIENTRY glIsProgramNV (GLuint);
+GLAPI void APIENTRY glLoadProgramNV (GLenum, GLuint, GLsizei, const GLubyte *);
+GLAPI void APIENTRY glProgramParameter4dNV (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glProgramParameter4dvNV (GLenum, GLuint, const GLdouble *);
+GLAPI void APIENTRY glProgramParameter4fNV (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramParameter4fvNV (GLenum, GLuint, const GLfloat *);
+GLAPI void APIENTRY glProgramParameters4dvNV (GLenum, GLuint, GLuint, const GLdouble *);
+GLAPI void APIENTRY glProgramParameters4fvNV (GLenum, GLuint, GLuint, const GLfloat *);
+GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei, const GLuint *);
+GLAPI void APIENTRY glTrackMatrixNV (GLenum, GLuint, GLenum, GLenum);
+GLAPI void APIENTRY glVertexAttribPointerNV (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glVertexAttrib1dNV (GLuint, GLdouble);
+GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib1fNV (GLuint, GLfloat);
+GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib1sNV (GLuint, GLshort);
+GLAPI void APIENTRY glVertexAttrib1svNV (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib2dNV (GLuint, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib2fNV (GLuint, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib2sNV (GLuint, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib2svNV (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib3dNV (GLuint, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib3fNV (GLuint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib3sNV (GLuint, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib3svNV (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4dNV (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib4fNV (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib4sNV (GLuint, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib4svNV (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint, GLsizei, const GLdouble *);
+GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glVertexAttribs1svNV (GLuint, GLsizei, const GLshort *);
+GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint, GLsizei, const GLdouble *);
+GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glVertexAttribs2svNV (GLuint, GLsizei, const GLshort *);
+GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint, GLsizei, const GLdouble *);
+GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glVertexAttribs3svNV (GLuint, GLsizei, const GLshort *);
+GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint, GLsizei, const GLdouble *);
+GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glVertexAttribs4svNV (GLuint, GLsizei, const GLshort *);
+GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint, GLsizei, const GLubyte *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
+typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
+#endif
+
+#ifndef GL_SGIX_texture_coordinate_clamp
+#define GL_SGIX_texture_coordinate_clamp 1
+#endif
+
+#ifndef GL_SGIX_scalebias_hint
+#define GL_SGIX_scalebias_hint 1
+#endif
+
+#ifndef GL_OML_interlace
+#define GL_OML_interlace 1
+#endif
+
+#ifndef GL_OML_subsample
+#define GL_OML_subsample 1
+#endif
+
+#ifndef GL_OML_resample
+#define GL_OML_resample 1
+#endif
+
+#ifndef GL_NV_copy_depth_to_color
+#define GL_NV_copy_depth_to_color 1
+#endif
+
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_ATI_envmap_bumpmap 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBumpParameterivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum, GLint *);
+GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
+#endif
+
+#ifndef GL_ATI_fragment_shader
+#define GL_ATI_fragment_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint);
+GLAPI void APIENTRY glBindFragmentShaderATI (GLuint);
+GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint);
+GLAPI void APIENTRY glBeginFragmentShaderATI (void);
+GLAPI void APIENTRY glEndFragmentShaderATI (void);
+GLAPI void APIENTRY glPassTexCoordATI (GLuint, GLuint, GLenum);
+GLAPI void APIENTRY glSampleMapATI (GLuint, GLuint, GLenum);
+GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
+typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
+#endif
+
+#ifndef GL_ATI_pn_triangles
+#define GL_ATI_pn_triangles 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPNTrianglesiATI (GLenum, GLint);
+GLAPI void APIENTRY glPNTrianglesfATI (GLenum, GLfloat);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
+#endif
+
+#ifndef GL_ATI_vertex_array_object
+#define GL_ATI_vertex_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei, const GLvoid *, GLenum);
+GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint);
+GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint, GLuint, GLsizei, const GLvoid *, GLenum);
+GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetObjectBufferivATI (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glFreeObjectBufferATI (GLuint);
+GLAPI void APIENTRY glArrayObjectATI (GLenum, GLint, GLenum, GLsizei, GLuint, GLuint);
+GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetArrayObjectivATI (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glVariantArrayObjectATI (GLuint, GLenum, GLsizei, GLuint, GLuint);
+GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint, GLenum, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage);
+typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_EXT_vertex_shader
+#define GL_EXT_vertex_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginVertexShaderEXT (void);
+GLAPI void APIENTRY glEndVertexShaderEXT (void);
+GLAPI void APIENTRY glBindVertexShaderEXT (GLuint);
+GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint);
+GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint);
+GLAPI void APIENTRY glShaderOp1EXT (GLenum, GLuint, GLuint);
+GLAPI void APIENTRY glShaderOp2EXT (GLenum, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glShaderOp3EXT (GLenum, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glSwizzleEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glWriteMaskEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glInsertComponentEXT (GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glExtractComponentEXT (GLuint, GLuint, GLuint);
+GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum, GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glSetInvariantEXT (GLuint, GLenum, const GLvoid *);
+GLAPI void APIENTRY glSetLocalConstantEXT (GLuint, GLenum, const GLvoid *);
+GLAPI void APIENTRY glVariantbvEXT (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVariantsvEXT (GLuint, const GLshort *);
+GLAPI void APIENTRY glVariantivEXT (GLuint, const GLint *);
+GLAPI void APIENTRY glVariantfvEXT (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVariantdvEXT (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVariantubvEXT (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVariantusvEXT (GLuint, const GLushort *);
+GLAPI void APIENTRY glVariantuivEXT (GLuint, const GLuint *);
+GLAPI void APIENTRY glVariantPointerEXT (GLuint, GLenum, GLuint, const GLvoid *);
+GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint);
+GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint);
+GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum, GLenum);
+GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum, GLenum);
+GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum, GLenum, GLenum);
+GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum, GLenum);
+GLAPI GLuint APIENTRY glBindParameterEXT (GLenum);
+GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint, GLenum);
+GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint, GLenum, GLboolean *);
+GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVariantPointervEXT (GLuint, GLenum, GLvoid* *);
+GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint, GLenum, GLboolean *);
+GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint, GLenum, GLboolean *);
+GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint, GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
+typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
+typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
+typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
+typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
+typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
+typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
+typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
+typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
+typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
+typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
+typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
+typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
+typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+#endif
+
+#ifndef GL_ATI_vertex_streams
+#define GL_ATI_vertex_streams 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexStream1sATI (GLenum, GLshort);
+GLAPI void APIENTRY glVertexStream1svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glVertexStream1iATI (GLenum, GLint);
+GLAPI void APIENTRY glVertexStream1ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glVertexStream1fATI (GLenum, GLfloat);
+GLAPI void APIENTRY glVertexStream1fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glVertexStream1dATI (GLenum, GLdouble);
+GLAPI void APIENTRY glVertexStream1dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glVertexStream2sATI (GLenum, GLshort, GLshort);
+GLAPI void APIENTRY glVertexStream2svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glVertexStream2iATI (GLenum, GLint, GLint);
+GLAPI void APIENTRY glVertexStream2ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glVertexStream2fATI (GLenum, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexStream2fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glVertexStream2dATI (GLenum, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexStream2dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glVertexStream3sATI (GLenum, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexStream3svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glVertexStream3iATI (GLenum, GLint, GLint, GLint);
+GLAPI void APIENTRY glVertexStream3ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glVertexStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexStream3fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glVertexStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexStream3dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glVertexStream4sATI (GLenum, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexStream4svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glVertexStream4iATI (GLenum, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glVertexStream4ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glVertexStream4fATI (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexStream4fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glVertexStream4dATI (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexStream4dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glNormalStream3bATI (GLenum, GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glNormalStream3bvATI (GLenum, const GLbyte *);
+GLAPI void APIENTRY glNormalStream3sATI (GLenum, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glNormalStream3svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glNormalStream3iATI (GLenum, GLint, GLint, GLint);
+GLAPI void APIENTRY glNormalStream3ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glNormalStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glNormalStream3fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glNormalStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glNormalStream3dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum);
+GLAPI void APIENTRY glVertexBlendEnviATI (GLenum, GLint);
+GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum, GLfloat);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
+#endif
+
+#ifndef GL_ATI_element_array
+#define GL_ATI_element_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerATI (GLenum, const GLvoid *);
+GLAPI void APIENTRY glDrawElementArrayATI (GLenum, GLsizei);
+GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum, GLuint, GLuint, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
+#endif
+
+#ifndef GL_SUN_mesh_array
+#define GL_SUN_mesh_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum, GLint, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
+#endif
+
+#ifndef GL_SUN_slice_accum
+#define GL_SUN_slice_accum 1
+#endif
+
+#ifndef GL_NV_multisample_filter_hint
+#define GL_NV_multisample_filter_hint 1
+#endif
+
+#ifndef GL_NV_depth_clamp
+#define GL_NV_depth_clamp 1
+#endif
+
+#ifndef GL_NV_occlusion_query
+#define GL_NV_occlusion_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei, GLuint *);
+GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei, const GLuint *);
+GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint);
+GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint);
+GLAPI void APIENTRY glEndOcclusionQueryNV (void);
+GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint, GLenum, GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
+#endif
+
+#ifndef GL_NV_point_sprite
+#define GL_NV_point_sprite 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameteriNV (GLenum, GLint);
+GLAPI void APIENTRY glPointParameterivNV (GLenum, const GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_NV_texture_shader3
+#define GL_NV_texture_shader3 1
+#endif
+
+#ifndef GL_NV_vertex_program1_1
+#define GL_NV_vertex_program1_1 1
+#endif
+
+#ifndef GL_EXT_shadow_funcs
+#define GL_EXT_shadow_funcs 1
+#endif
+
+#ifndef GL_EXT_stencil_two_side
+#define GL_EXT_stencil_two_side 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
+#endif
+
+#ifndef GL_ATI_text_fragment_shader
+#define GL_ATI_text_fragment_shader 1
+#endif
+
+#ifndef GL_APPLE_client_storage
+#define GL_APPLE_client_storage 1
+#endif
+
+#ifndef GL_APPLE_element_array
+#define GL_APPLE_element_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerAPPLE (GLenum, const GLvoid *);
+GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum, GLint, GLsizei);
+GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, GLint, GLsizei);
+GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum, const GLint *, const GLsizei *, GLsizei);
+GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, const GLint *, const GLsizei *, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
+#endif
+
+#ifndef GL_APPLE_fence
+#define GL_APPLE_fence 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenFencesAPPLE (GLsizei, GLuint *);
+GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei, const GLuint *);
+GLAPI void APIENTRY glSetFenceAPPLE (GLuint);
+GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint);
+GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint);
+GLAPI void APIENTRY glFinishFenceAPPLE (GLuint);
+GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum, GLuint);
+GLAPI void APIENTRY glFinishObjectAPPLE (GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
+typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
+typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
+#endif
+
+#ifndef GL_APPLE_vertex_array_object
+#define GL_APPLE_vertex_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint);
+GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
+#endif
+
+#ifndef GL_APPLE_vertex_array_range
+#define GL_APPLE_vertex_array_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei, GLvoid *);
+GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei, GLvoid *);
+GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
+#endif
+
+#ifndef GL_APPLE_ycbcr_422
+#define GL_APPLE_ycbcr_422 1
+#endif
+
+#ifndef GL_S3_s3tc
+#define GL_S3_s3tc 1
+#endif
+
+#ifndef GL_ATI_draw_buffers
+#define GL_ATI_draw_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersATI (GLsizei, const GLenum *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
+#endif
+
+#ifndef GL_ATI_pixel_format_float
+#define GL_ATI_pixel_format_float 1
+/* This is really a WGL extension, but defines some associated GL enums.
+ * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string.
+ */
+#endif
+
+#ifndef GL_ATI_texture_env_combine3
+#define GL_ATI_texture_env_combine3 1
+#endif
+
+#ifndef GL_ATI_texture_float
+#define GL_ATI_texture_float 1
+#endif
+
+#ifndef GL_NV_float_buffer
+#define GL_NV_float_buffer 1
+#endif
+
+#ifndef GL_NV_fragment_program
+#define GL_NV_fragment_program 1
+/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint, GLsizei, const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint, GLsizei, const GLubyte *, const GLdouble *);
+GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint, GLsizei, const GLubyte *, GLfloat *);
+GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint, GLsizei, const GLubyte *, GLdouble *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
+#endif
+
+#ifndef GL_NV_half_float
+#define GL_NV_half_float 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertex2hNV (GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glVertex3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glVertex4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glNormal3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glColor4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV);
+GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum, GLhalfNV);
+GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum, const GLhalfNV *);
+GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum, const GLhalfNV *);
+GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum, const GLhalfNV *);
+GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum, const GLhalfNV *);
+GLAPI void APIENTRY glFogCoordhNV (GLhalfNV);
+GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *);
+GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV);
+GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttrib1hNV (GLuint, GLhalfNV);
+GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttrib2hNV (GLuint, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttrib3hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttrib4hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint, GLsizei, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint, GLsizei, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint, GLsizei, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint, GLsizei, const GLhalfNV *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
+typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
+typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
+typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
+typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+#endif
+
+#ifndef GL_NV_pixel_data_range
+#define GL_NV_pixel_data_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelDataRangeNV (GLenum, GLsizei, GLvoid *);
+GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer);
+typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
+#endif
+
+#ifndef GL_NV_primitive_restart
+#define GL_NV_primitive_restart 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPrimitiveRestartNV (void);
+GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
+#endif
+
+#ifndef GL_NV_texture_expand_normal
+#define GL_NV_texture_expand_normal 1
+#endif
+
+#ifndef GL_NV_vertex_program2
+#define GL_NV_vertex_program2 1
+#endif
+
+#ifndef GL_ATI_map_object_buffer
+#define GL_ATI_map_object_buffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint);
+GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+#endif
+
+#ifndef GL_ATI_separate_stencil
+#define GL_ATI_separate_stencil 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilOpSeparateATI (GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum, GLenum, GLint, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+#endif
+
+#ifndef GL_ATI_vertex_attrib_array_object
+#define GL_ATI_vertex_attrib_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint, GLint, GLenum, GLboolean, GLsizei, GLuint, GLuint);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint, GLenum, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_OES_read_format
+#define GL_OES_read_format 1
+#endif
+
+#ifndef GL_EXT_depth_bounds_test
+#define GL_EXT_depth_bounds_test 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthBoundsEXT (GLclampd, GLclampd);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
+#endif
+
+#ifndef GL_EXT_texture_mirror_clamp
+#define GL_EXT_texture_mirror_clamp 1
+#endif
+
+#ifndef GL_EXT_blend_equation_separate
+#define GL_EXT_blend_equation_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
+#endif
+
+#ifndef GL_MESA_pack_invert
+#define GL_MESA_pack_invert 1
+#endif
+
+#ifndef GL_MESA_ycbcr_texture
+#define GL_MESA_ycbcr_texture 1
+#endif
+
+#ifndef GL_EXT_pixel_buffer_object
+#define GL_EXT_pixel_buffer_object 1
+#endif
+
+#ifndef GL_NV_fragment_program_option
+#define GL_NV_fragment_program_option 1
+#endif
+
+#ifndef GL_NV_fragment_program2
+#define GL_NV_fragment_program2 1
+#endif
+
+#ifndef GL_NV_vertex_program2_option
+#define GL_NV_vertex_program2_option 1
+#endif
+
+#ifndef GL_NV_vertex_program3
+#define GL_NV_vertex_program3 1
+#endif
+
+#ifndef GL_EXT_framebuffer_object
+#define GL_EXT_framebuffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint);
+GLAPI void APIENTRY glBindRenderbufferEXT (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei, GLuint *);
+GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum, GLenum, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint);
+GLAPI void APIENTRY glBindFramebufferEXT (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei, GLuint *);
+GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum);
+GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLint);
+GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum, GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGenerateMipmapEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
+#endif
+
+#ifndef GL_GREMEDY_string_marker
+#define GL_GREMEDY_string_marker 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string);
+#endif
+
+#ifndef GL_EXT_packed_depth_stencil
+#define GL_EXT_packed_depth_stencil 1
+#endif
+
+#ifndef GL_EXT_stencil_clear_tag
+#define GL_EXT_stencil_clear_tag 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilClearTagEXT (GLsizei, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag);
+#endif
+
+#ifndef GL_EXT_texture_sRGB
+#define GL_EXT_texture_sRGB 1
+#endif
+
+#ifndef GL_EXT_framebuffer_blit
+#define GL_EXT_framebuffer_blit 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlitFramebufferEXT (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif
+
+#ifndef GL_EXT_framebuffer_multisample
+#define GL_EXT_framebuffer_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_MESAX_texture_stack
+#define GL_MESAX_texture_stack 1
+#endif
+
+#ifndef GL_EXT_timer_query
+#define GL_EXT_timer_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint, GLenum, GLint64EXT *);
+GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint, GLenum, GLuint64EXT *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params);
+#endif
+
+#ifndef GL_EXT_gpu_program_parameters
+#define GL_EXT_gpu_program_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum, GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum, GLuint, GLsizei, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+#endif
+
+#ifndef GL_APPLE_flush_buffer_range
+#define GL_APPLE_flush_buffer_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum, GLintptr, GLsizeiptr);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size);
+#endif
+
+#ifndef GL_NV_gpu_program4
+#define GL_NV_gpu_program4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum, GLuint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum, GLuint, const GLint *);
+GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum, GLuint, GLsizei, const GLint *);
+GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum, GLuint, const GLuint *);
+GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum, GLuint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum, GLuint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum, GLuint, const GLint *);
+GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum, GLuint, GLsizei, const GLint *);
+GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum, GLuint, const GLuint *);
+GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum, GLuint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum, GLuint, GLint *);
+GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum, GLuint, GLuint *);
+GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum, GLuint, GLint *);
+GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum, GLuint, GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
+#endif
+
+#ifndef GL_NV_geometry_program4
+#define GL_NV_geometry_program4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramVertexLimitNV (GLenum, GLint);
+GLAPI void APIENTRY glFramebufferTextureEXT (GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum, GLenum, GLuint, GLint, GLint);
+GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum, GLenum, GLuint, GLint, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif
+
+#ifndef GL_EXT_geometry_shader4
+#define GL_EXT_geometry_shader4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramParameteriEXT (GLuint, GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
+#endif
+
+#ifndef GL_NV_vertex_program4
+#define GL_NV_vertex_program4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint, GLint);
+GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint, GLint, GLint);
+GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint, GLint, GLint, GLint);
+GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint, GLenum, GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
+#endif
+
+#ifndef GL_EXT_gpu_shader4
+#define GL_EXT_gpu_shader4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetUniformuivEXT (GLuint, GLint, GLuint *);
+GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint, GLuint, const GLchar *);
+GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint, const GLchar *);
+GLAPI void APIENTRY glUniform1uiEXT (GLint, GLuint);
+GLAPI void APIENTRY glUniform2uiEXT (GLint, GLuint, GLuint);
+GLAPI void APIENTRY glUniform3uiEXT (GLint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glUniform4uiEXT (GLint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glUniform1uivEXT (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glUniform2uivEXT (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glUniform3uivEXT (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glUniform4uivEXT (GLint, GLsizei, const GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+#endif
+
+#ifndef GL_EXT_draw_instanced
+#define GL_EXT_draw_instanced 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum, GLsizei, GLenum, const GLvoid *, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+#endif
+
+#ifndef GL_EXT_packed_float
+#define GL_EXT_packed_float 1
+#endif
+
+#ifndef GL_EXT_texture_array
+#define GL_EXT_texture_array 1
+#endif
+
+#ifndef GL_EXT_texture_buffer_object
+#define GL_EXT_texture_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBufferEXT (GLenum, GLenum, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+#endif
+
+#ifndef GL_EXT_texture_compression_latc
+#define GL_EXT_texture_compression_latc 1
+#endif
+
+#ifndef GL_EXT_texture_compression_rgtc
+#define GL_EXT_texture_compression_rgtc 1
+#endif
+
+#ifndef GL_EXT_texture_shared_exponent
+#define GL_EXT_texture_shared_exponent 1
+#endif
+
+#ifndef GL_NV_depth_buffer_float
+#define GL_NV_depth_buffer_float 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthRangedNV (GLdouble, GLdouble);
+GLAPI void APIENTRY glClearDepthdNV (GLdouble);
+GLAPI void APIENTRY glDepthBoundsdNV (GLdouble, GLdouble);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth);
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax);
+#endif
+
+#ifndef GL_NV_fragment_program4
+#define GL_NV_fragment_program4 1
+#endif
+
+#ifndef GL_NV_framebuffer_multisample_coverage
+#define GL_NV_framebuffer_multisample_coverage 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum, GLsizei, GLsizei, GLenum, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_EXT_framebuffer_sRGB
+#define GL_EXT_framebuffer_sRGB 1
+#endif
+
+#ifndef GL_NV_geometry_shader4
+#define GL_NV_geometry_shader4 1
+#endif
+
+#ifndef GL_NV_parameter_buffer_object
+#define GL_NV_parameter_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum, GLuint, GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum, GLuint, GLuint, GLsizei, const GLint *);
+GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum, GLuint, GLuint, GLsizei, const GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params);
+#endif
+
+#ifndef GL_EXT_draw_buffers2
+#define GL_EXT_draw_buffers2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint, GLboolean, GLboolean, GLboolean, GLboolean);
+GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum, GLuint, GLboolean *);
+GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum, GLuint, GLint *);
+GLAPI void APIENTRY glEnableIndexedEXT (GLenum, GLuint);
+GLAPI void APIENTRY glDisableIndexedEXT (GLenum, GLuint);
+GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index);
+#endif
+
+#ifndef GL_NV_transform_feedback
+#define GL_NV_transform_feedback 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum);
+GLAPI void APIENTRY glEndTransformFeedbackNV (void);
+GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLuint, const GLint *, GLenum);
+GLAPI void APIENTRY glBindBufferRangeNV (GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
+GLAPI void APIENTRY glBindBufferOffsetNV (GLenum, GLuint, GLuint, GLintptr);
+GLAPI void APIENTRY glBindBufferBaseNV (GLenum, GLuint, GLuint);
+GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint, GLsizei, const GLint *, GLenum);
+GLAPI void APIENTRY glActiveVaryingNV (GLuint, const GLchar *);
+GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint, const GLchar *);
+GLAPI void APIENTRY glGetActiveVaryingNV (GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *);
+GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint, GLuint, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location);
+#endif
+
+#ifndef GL_EXT_bindable_uniform
+#define GL_EXT_bindable_uniform 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniformBufferEXT (GLuint, GLint, GLuint);
+GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint, GLint);
+GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location);
+typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location);
+#endif
+
+#ifndef GL_EXT_texture_integer
+#define GL_EXT_texture_integer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexParameterIivEXT (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glTexParameterIuivEXT (GLenum, GLenum, const GLuint *);
+GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum, GLenum, GLuint *);
+GLAPI void APIENTRY glClearColorIiEXT (GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glClearColorIuiEXT (GLuint, GLuint, GLuint, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha);
+typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+#endif
+
+#ifndef GL_GREMEDY_frame_terminator
+#define GL_GREMEDY_frame_terminator 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameTerminatorGREMEDY (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFRAMETERMINATORGREMEDYPROC) (void);
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Mesa/inc/glu.h b/Mesa/inc/glu.h
new file mode 100644
index 000000000000..d7f5de9d1c76
--- /dev/null
+++ b/Mesa/inc/glu.h
@@ -0,0 +1,348 @@
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+**
+** http://oss.sgi.com/projects/FreeB
+**
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+**
+** Additional Notice Provisions: This software was created using the
+** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
+** not been independently verified as being compliant with the OpenGL(R)
+** version 1.2.1 Specification.
+*/
+
+#ifndef __glu_h__
+#define __glu_h__
+
+#if defined(USE_MGL_NAMESPACE)
+#include "glu_mangle.h"
+#endif
+
+#include <GL/gl.h>
+
+#ifndef GLAPIENTRY
+#define GLAPIENTRY
+#endif
+
+#ifndef GLAPIENTRYP
+#define GLAPIENTRYP GLAPIENTRY *
+#endif
+
+#if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GLU32)
+# undef GLAPI
+# define GLAPI __declspec(dllexport)
+#elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL)
+/* tag specifying we're building for DLL runtime support */
+# undef GLAPI
+# define GLAPI __declspec(dllimport)
+#elif !defined(GLAPI)
+/* for use with static link lib build of Win32 edition only */
+# define GLAPI extern
+#endif /* _STATIC_MESA support */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*************************************************************/
+
+/* Extensions */
+#define GLU_EXT_object_space_tess          1
+#define GLU_EXT_nurbs_tessellator          1
+
+/* Boolean */
+#define GLU_FALSE                          0
+#define GLU_TRUE                           1
+
+/* Version */
+#define GLU_VERSION_1_1                    1
+#define GLU_VERSION_1_2                    1
+#define GLU_VERSION_1_3                    1
+
+/* StringName */
+#define GLU_VERSION                        100800
+#define GLU_EXTENSIONS                     100801
+
+/* ErrorCode */
+#define GLU_INVALID_ENUM                   100900
+#define GLU_INVALID_VALUE                  100901
+#define GLU_OUT_OF_MEMORY                  100902
+#define GLU_INCOMPATIBLE_GL_VERSION        100903
+#define GLU_INVALID_OPERATION              100904
+
+/* NurbsDisplay */
+/*      GLU_FILL */
+#define GLU_OUTLINE_POLYGON                100240
+#define GLU_OUTLINE_PATCH                  100241
+
+/* NurbsCallback */
+#define GLU_NURBS_ERROR                    100103
+#define GLU_ERROR                          100103
+#define GLU_NURBS_BEGIN                    100164
+#define GLU_NURBS_BEGIN_EXT                100164
+#define GLU_NURBS_VERTEX                   100165
+#define GLU_NURBS_VERTEX_EXT               100165
+#define GLU_NURBS_NORMAL                   100166
+#define GLU_NURBS_NORMAL_EXT               100166
+#define GLU_NURBS_COLOR                    100167
+#define GLU_NURBS_COLOR_EXT                100167
+#define GLU_NURBS_TEXTURE_COORD            100168
+#define GLU_NURBS_TEX_COORD_EXT            100168
+#define GLU_NURBS_END                      100169
+#define GLU_NURBS_END_EXT                  100169
+#define GLU_NURBS_BEGIN_DATA               100170
+#define GLU_NURBS_BEGIN_DATA_EXT           100170
+#define GLU_NURBS_VERTEX_DATA              100171
+#define GLU_NURBS_VERTEX_DATA_EXT          100171
+#define GLU_NURBS_NORMAL_DATA              100172
+#define GLU_NURBS_NORMAL_DATA_EXT          100172
+#define GLU_NURBS_COLOR_DATA               100173
+#define GLU_NURBS_COLOR_DATA_EXT           100173
+#define GLU_NURBS_TEXTURE_COORD_DATA       100174
+#define GLU_NURBS_TEX_COORD_DATA_EXT       100174
+#define GLU_NURBS_END_DATA                 100175
+#define GLU_NURBS_END_DATA_EXT             100175
+
+/* NurbsError */
+#define GLU_NURBS_ERROR1                   100251
+#define GLU_NURBS_ERROR2                   100252
+#define GLU_NURBS_ERROR3                   100253
+#define GLU_NURBS_ERROR4                   100254
+#define GLU_NURBS_ERROR5                   100255
+#define GLU_NURBS_ERROR6                   100256
+#define GLU_NURBS_ERROR7                   100257
+#define GLU_NURBS_ERROR8                   100258
+#define GLU_NURBS_ERROR9                   100259
+#define GLU_NURBS_ERROR10                  100260
+#define GLU_NURBS_ERROR11                  100261
+#define GLU_NURBS_ERROR12                  100262
+#define GLU_NURBS_ERROR13                  100263
+#define GLU_NURBS_ERROR14                  100264
+#define GLU_NURBS_ERROR15                  100265
+#define GLU_NURBS_ERROR16                  100266
+#define GLU_NURBS_ERROR17                  100267
+#define GLU_NURBS_ERROR18                  100268
+#define GLU_NURBS_ERROR19                  100269
+#define GLU_NURBS_ERROR20                  100270
+#define GLU_NURBS_ERROR21                  100271
+#define GLU_NURBS_ERROR22                  100272
+#define GLU_NURBS_ERROR23                  100273
+#define GLU_NURBS_ERROR24                  100274
+#define GLU_NURBS_ERROR25                  100275
+#define GLU_NURBS_ERROR26                  100276
+#define GLU_NURBS_ERROR27                  100277
+#define GLU_NURBS_ERROR28                  100278
+#define GLU_NURBS_ERROR29                  100279
+#define GLU_NURBS_ERROR30                  100280
+#define GLU_NURBS_ERROR31                  100281
+#define GLU_NURBS_ERROR32                  100282
+#define GLU_NURBS_ERROR33                  100283
+#define GLU_NURBS_ERROR34                  100284
+#define GLU_NURBS_ERROR35                  100285
+#define GLU_NURBS_ERROR36                  100286
+#define GLU_NURBS_ERROR37                  100287
+
+/* NurbsProperty */
+#define GLU_AUTO_LOAD_MATRIX               100200
+#define GLU_CULLING                        100201
+#define GLU_SAMPLING_TOLERANCE             100203
+#define GLU_DISPLAY_MODE                   100204
+#define GLU_PARAMETRIC_TOLERANCE           100202
+#define GLU_SAMPLING_METHOD                100205
+#define GLU_U_STEP                         100206
+#define GLU_V_STEP                         100207
+#define GLU_NURBS_MODE                     100160
+#define GLU_NURBS_MODE_EXT                 100160
+#define GLU_NURBS_TESSELLATOR              100161
+#define GLU_NURBS_TESSELLATOR_EXT          100161
+#define GLU_NURBS_RENDERER                 100162
+#define GLU_NURBS_RENDERER_EXT             100162
+
+/* NurbsSampling */
+#define GLU_OBJECT_PARAMETRIC_ERROR        100208
+#define GLU_OBJECT_PARAMETRIC_ERROR_EXT    100208
+#define GLU_OBJECT_PATH_LENGTH             100209
+#define GLU_OBJECT_PATH_LENGTH_EXT         100209
+#define GLU_PATH_LENGTH                    100215
+#define GLU_PARAMETRIC_ERROR               100216
+#define GLU_DOMAIN_DISTANCE                100217
+
+/* NurbsTrim */
+#define GLU_MAP1_TRIM_2                    100210
+#define GLU_MAP1_TRIM_3                    100211
+
+/* QuadricDrawStyle */
+#define GLU_POINT                          100010
+#define GLU_LINE                           100011
+#define GLU_FILL                           100012
+#define GLU_SILHOUETTE                     100013
+
+/* QuadricCallback */
+/*      GLU_ERROR */
+
+/* QuadricNormal */
+#define GLU_SMOOTH                         100000
+#define GLU_FLAT                           100001
+#define GLU_NONE                           100002
+
+/* QuadricOrientation */
+#define GLU_OUTSIDE                        100020
+#define GLU_INSIDE                         100021
+
+/* TessCallback */
+#define GLU_TESS_BEGIN                     100100
+#define GLU_BEGIN                          100100
+#define GLU_TESS_VERTEX                    100101
+#define GLU_VERTEX                         100101
+#define GLU_TESS_END                       100102
+#define GLU_END                            100102
+#define GLU_TESS_ERROR                     100103
+#define GLU_TESS_EDGE_FLAG                 100104
+#define GLU_EDGE_FLAG                      100104
+#define GLU_TESS_COMBINE                   100105
+#define GLU_TESS_BEGIN_DATA                100106
+#define GLU_TESS_VERTEX_DATA               100107
+#define GLU_TESS_END_DATA                  100108
+#define GLU_TESS_ERROR_DATA                100109
+#define GLU_TESS_EDGE_FLAG_DATA            100110
+#define GLU_TESS_COMBINE_DATA              100111
+
+/* TessContour */
+#define GLU_CW                             100120
+#define GLU_CCW                            100121
+#define GLU_INTERIOR                       100122
+#define GLU_EXTERIOR                       100123
+#define GLU_UNKNOWN                        100124
+
+/* TessProperty */
+#define GLU_TESS_WINDING_RULE              100140
+#define GLU_TESS_BOUNDARY_ONLY             100141
+#define GLU_TESS_TOLERANCE                 100142
+
+/* TessError */
+#define GLU_TESS_ERROR1                    100151
+#define GLU_TESS_ERROR2                    100152
+#define GLU_TESS_ERROR3                    100153
+#define GLU_TESS_ERROR4                    100154
+#define GLU_TESS_ERROR5                    100155
+#define GLU_TESS_ERROR6                    100156
+#define GLU_TESS_ERROR7                    100157
+#define GLU_TESS_ERROR8                    100158
+#define GLU_TESS_MISSING_BEGIN_POLYGON     100151
+#define GLU_TESS_MISSING_BEGIN_CONTOUR     100152
+#define GLU_TESS_MISSING_END_POLYGON       100153
+#define GLU_TESS_MISSING_END_CONTOUR       100154
+#define GLU_TESS_COORD_TOO_LARGE           100155
+#define GLU_TESS_NEED_COMBINE_CALLBACK     100156
+
+/* TessWinding */
+#define GLU_TESS_WINDING_ODD               100130
+#define GLU_TESS_WINDING_NONZERO           100131
+#define GLU_TESS_WINDING_POSITIVE          100132
+#define GLU_TESS_WINDING_NEGATIVE          100133
+#define GLU_TESS_WINDING_ABS_GEQ_TWO       100134
+
+/*************************************************************/
+
+
+#ifdef __cplusplus
+class GLUnurbs;
+class GLUquadric;
+class GLUtesselator;
+#else
+typedef struct GLUnurbs GLUnurbs;
+typedef struct GLUquadric GLUquadric;
+typedef struct GLUtesselator GLUtesselator;
+#endif
+
+typedef GLUnurbs GLUnurbsObj;
+typedef GLUquadric GLUquadricObj;
+typedef GLUtesselator GLUtesselatorObj;
+typedef GLUtesselator GLUtriangulatorObj;
+
+#define GLU_TESS_MAX_COORD 1.0e150
+
+/* Internal convenience typedefs */
+typedef void (GLAPIENTRYP _GLUfuncptr)();
+
+GLAPI void GLAPIENTRY gluBeginCurve (GLUnurbs* nurb);
+GLAPI void GLAPIENTRY gluBeginPolygon (GLUtesselator* tess);
+GLAPI void GLAPIENTRY gluBeginSurface (GLUnurbs* nurb);
+GLAPI void GLAPIENTRY gluBeginTrim (GLUnurbs* nurb);
+GLAPI GLint GLAPIENTRY gluBuild1DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
+GLAPI GLint GLAPIENTRY gluBuild1DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *data);
+GLAPI GLint GLAPIENTRY gluBuild2DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
+GLAPI GLint GLAPIENTRY gluBuild2DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data);
+GLAPI GLint GLAPIENTRY gluBuild3DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data);
+GLAPI GLint GLAPIENTRY gluBuild3DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
+GLAPI GLboolean GLAPIENTRY gluCheckExtension (const GLubyte *extName, const GLubyte *extString);
+GLAPI void GLAPIENTRY gluCylinder (GLUquadric* quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks);
+GLAPI void GLAPIENTRY gluDeleteNurbsRenderer (GLUnurbs* nurb);
+GLAPI void GLAPIENTRY gluDeleteQuadric (GLUquadric* quad);
+GLAPI void GLAPIENTRY gluDeleteTess (GLUtesselator* tess);
+GLAPI void GLAPIENTRY gluDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops);
+GLAPI void GLAPIENTRY gluEndCurve (GLUnurbs* nurb);
+GLAPI void GLAPIENTRY gluEndPolygon (GLUtesselator* tess);
+GLAPI void GLAPIENTRY gluEndSurface (GLUnurbs* nurb);
+GLAPI void GLAPIENTRY gluEndTrim (GLUnurbs* nurb);
+GLAPI const GLubyte * GLAPIENTRY gluErrorString (GLenum error);
+GLAPI void GLAPIENTRY gluGetNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat* data);
+GLAPI const GLubyte * GLAPIENTRY gluGetString (GLenum name);
+GLAPI void GLAPIENTRY gluGetTessProperty (GLUtesselator* tess, GLenum which, GLdouble* data);
+GLAPI void GLAPIENTRY gluLoadSamplingMatrices (GLUnurbs* nurb, const GLfloat *model, const GLfloat *perspective, const GLint *view);
+GLAPI void GLAPIENTRY gluLookAt (GLdouble eyeX, GLdouble eyeY, GLdouble eyeZ, GLdouble centerX, GLdouble centerY, GLdouble centerZ, GLdouble upX, GLdouble upY, GLdouble upZ);
+GLAPI GLUnurbs* GLAPIENTRY gluNewNurbsRenderer (void);
+GLAPI GLUquadric* GLAPIENTRY gluNewQuadric (void);
+GLAPI GLUtesselator* GLAPIENTRY gluNewTess (void);
+GLAPI void GLAPIENTRY gluNextContour (GLUtesselator* tess, GLenum type);
+GLAPI void GLAPIENTRY gluNurbsCallback (GLUnurbs* nurb, GLenum which, _GLUfuncptr CallBackFunc);
+GLAPI void GLAPIENTRY gluNurbsCallbackData (GLUnurbs* nurb, GLvoid* userData);
+GLAPI void GLAPIENTRY gluNurbsCallbackDataEXT (GLUnurbs* nurb, GLvoid* userData);
+GLAPI void GLAPIENTRY gluNurbsCurve (GLUnurbs* nurb, GLint knotCount, GLfloat *knots, GLint stride, GLfloat *control, GLint order, GLenum type);
+GLAPI void GLAPIENTRY gluNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat value);
+GLAPI void GLAPIENTRY gluNurbsSurface (GLUnurbs* nurb, GLint sKnotCount, GLfloat* sKnots, GLint tKnotCount, GLfloat* tKnots, GLint sStride, GLint tStride, GLfloat* control, GLint sOrder, GLint tOrder, GLenum type);
+GLAPI void GLAPIENTRY gluOrtho2D (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top);
+GLAPI void GLAPIENTRY gluPartialDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops, GLdouble start, GLdouble sweep);
+GLAPI void GLAPIENTRY gluPerspective (GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar);
+GLAPI void GLAPIENTRY gluPickMatrix (GLdouble x, GLdouble y, GLdouble delX, GLdouble delY, GLint *viewport);
+GLAPI GLint GLAPIENTRY gluProject (GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* winX, GLdouble* winY, GLdouble* winZ);
+GLAPI void GLAPIENTRY gluPwlCurve (GLUnurbs* nurb, GLint count, GLfloat* data, GLint stride, GLenum type);
+GLAPI void GLAPIENTRY gluQuadricCallback (GLUquadric* quad, GLenum which, _GLUfuncptr CallBackFunc);
+GLAPI void GLAPIENTRY gluQuadricDrawStyle (GLUquadric* quad, GLenum draw);
+GLAPI void GLAPIENTRY gluQuadricNormals (GLUquadric* quad, GLenum normal);
+GLAPI void GLAPIENTRY gluQuadricOrientation (GLUquadric* quad, GLenum orientation);
+GLAPI void GLAPIENTRY gluQuadricTexture (GLUquadric* quad, GLboolean texture);
+GLAPI GLint GLAPIENTRY gluScaleImage (GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid* dataOut);
+GLAPI void GLAPIENTRY gluSphere (GLUquadric* quad, GLdouble radius, GLint slices, GLint stacks);
+GLAPI void GLAPIENTRY gluTessBeginContour (GLUtesselator* tess);
+GLAPI void GLAPIENTRY gluTessBeginPolygon (GLUtesselator* tess, GLvoid* data);
+GLAPI void GLAPIENTRY gluTessCallback (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc);
+GLAPI void GLAPIENTRY gluTessEndContour (GLUtesselator* tess);
+GLAPI void GLAPIENTRY gluTessEndPolygon (GLUtesselator* tess);
+GLAPI void GLAPIENTRY gluTessNormal (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ);
+GLAPI void GLAPIENTRY gluTessProperty (GLUtesselator* tess, GLenum which, GLdouble data);
+GLAPI void GLAPIENTRY gluTessVertex (GLUtesselator* tess, GLdouble *location, GLvoid* data);
+GLAPI GLint GLAPIENTRY gluUnProject (GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* objX, GLdouble* objY, GLdouble* objZ);
+GLAPI GLint GLAPIENTRY gluUnProject4 (GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble nearVal, GLdouble farVal, GLdouble* objX, GLdouble* objY, GLdouble* objZ, GLdouble* objW);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __glu_h__ */
diff --git a/Mesa/inc/glu_mangle.h b/Mesa/inc/glu_mangle.h
new file mode 100644
index 000000000000..9c25aa864c13
--- /dev/null
+++ b/Mesa/inc/glu_mangle.h
@@ -0,0 +1,86 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  3.0
+ * Copyright (C) 1995-1998  Brian Paul
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+#ifndef GLU_MANGLE_H
+#define GLU_MANGLE_H
+
+
+#define gluLookAt mgluLookAt
+#define gluOrtho2D mgluOrtho2D
+#define gluPerspective mgluPerspective
+#define gluPickMatrix mgluPickMatrix
+#define gluProject mgluProject
+#define gluUnProject mgluUnProject
+#define gluErrorString mgluErrorString
+#define gluScaleImage mgluScaleImage
+#define gluBuild1DMipmaps mgluBuild1DMipmaps
+#define gluBuild2DMipmaps mgluBuild2DMipmaps
+#define gluNewQuadric mgluNewQuadric
+#define gluDeleteQuadric mgluDeleteQuadric
+#define gluQuadricDrawStyle mgluQuadricDrawStyle
+#define gluQuadricOrientation mgluQuadricOrientation
+#define gluQuadricNormals mgluQuadricNormals
+#define gluQuadricTexture mgluQuadricTexture
+#define gluQuadricCallback mgluQuadricCallback
+#define gluCylinder mgluCylinder
+#define gluSphere mgluSphere
+#define gluDisk mgluDisk
+#define gluPartialDisk mgluPartialDisk
+#define gluNewNurbsRenderer mgluNewNurbsRenderer
+#define gluDeleteNurbsRenderer mgluDeleteNurbsRenderer
+#define gluLoadSamplingMatrices mgluLoadSamplingMatrices
+#define gluNurbsProperty mgluNurbsProperty
+#define gluGetNurbsProperty mgluGetNurbsProperty
+#define gluBeginCurve mgluBeginCurve
+#define gluEndCurve mgluEndCurve
+#define gluNurbsCurve mgluNurbsCurve
+#define gluBeginSurface mgluBeginSurface
+#define gluEndSurface mgluEndSurface
+#define gluNurbsSurface mgluNurbsSurface
+#define gluBeginTrim mgluBeginTrim
+#define gluEndTrim mgluEndTrim
+#define gluPwlCurve mgluPwlCurve
+#define gluNurbsCallback mgluNurbsCallback
+#define gluNewTess mgluNewTess
+#define gluDeleteTess mgluDeleteTess
+#define gluTessBeginPolygon mgluTessBeginPolygon
+#define gluTessBeginContour mgluTessBeginContour
+#define gluTessVertex mgluTessVertex
+#define gluTessEndPolygon mgluTessEndPolygon
+#define gluTessEndContour mgluTessEndContour
+#define gluTessProperty mgluTessProperty
+#define gluTessNormal mgluTessNormal
+#define gluTessCallback mgluTessCallback
+#define gluGetTessProperty mgluGetTessProperty
+#define gluBeginPolygon mgluBeginPolygon
+#define gluNextContour mgluNextContour
+#define gluEndPolygon mgluEndPolygon
+#define gluGetString mgluGetString
+#define gluBuild1DMipmapLevels mgluBuild1DMipmapLevels
+#define gluBuild2DMipmapLevels mgluBuild2DMipmapLevels
+#define gluBuild3DMipmapLevels mgluBuild3DMipmapLevels
+#define gluBuild3DMipmaps mgluBuild3DMipmaps
+#define gluCheckExtension mgluCheckExtension
+#define gluUnProject4 mgluUnProject4
+#define gluNurbsCallbackData mgluNurbsCallbackData
+#define gluNurbsCallbackDataEXT mgluNurbsCallbackDataEXT
+
+#endif
diff --git a/Mesa/inc/glx.h b/Mesa/inc/glx.h
new file mode 100644
index 000000000000..c91a91823048
--- /dev/null
+++ b/Mesa/inc/glx.h
@@ -0,0 +1,500 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.5
+ *
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef GLX_H
+#define GLX_H
+
+
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+# ifdef __cplusplus
+/* VMS Xlib.h gives problems with C++.
+ * this avoids a bunch of trivial warnings */
+#pragma message disable nosimpint
+#endif
+#endif
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#ifdef __VMS
+# ifdef __cplusplus
+#pragma message enable nosimpint
+#endif
+#endif
+#include <GL/gl.h>
+
+
+#if defined(USE_MGL_NAMESPACE)
+#include "glx_mangle.h"
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define GLX_VERSION_1_1     1
+#define GLX_VERSION_1_2     1
+#define GLX_VERSION_1_3     1
+#define GLX_VERSION_1_4     1
+
+#define GLX_EXTENSION_NAME   "GLX"
+
+
+
+/*
+ * Tokens for glXChooseVisual and glXGetConfig:
+ */
+#define GLX_USE_GL      1
+#define GLX_BUFFER_SIZE     2
+#define GLX_LEVEL       3
+#define GLX_RGBA        4
+#define GLX_DOUBLEBUFFER    5
+#define GLX_STEREO      6
+#define GLX_AUX_BUFFERS     7
+#define GLX_RED_SIZE        8
+#define GLX_GREEN_SIZE      9
+#define GLX_BLUE_SIZE       10
+#define GLX_ALPHA_SIZE      11
+#define GLX_DEPTH_SIZE      12
+#define GLX_STENCIL_SIZE    13
+#define GLX_ACCUM_RED_SIZE  14
+#define GLX_ACCUM_GREEN_SIZE    15
+#define GLX_ACCUM_BLUE_SIZE 16
+#define GLX_ACCUM_ALPHA_SIZE    17
+
+
+/*
+ * Error codes returned by glXGetConfig:
+ */
+#define GLX_BAD_SCREEN      1
+#define GLX_BAD_ATTRIBUTE   2
+#define GLX_NO_EXTENSION    3
+#define GLX_BAD_VISUAL      4
+#define GLX_BAD_CONTEXT     5
+#define GLX_BAD_VALUE           6
+#define GLX_BAD_ENUM        7
+
+
+/*
+ * GLX 1.1 and later:
+ */
+#define GLX_VENDOR      1
+#define GLX_VERSION     2
+#define GLX_EXTENSIONS      3
+
+
+/*
+ * GLX 1.3 and later:
+ */
+#define GLX_CONFIG_CAVEAT       0x20
+#define GLX_DONT_CARE           0xFFFFFFFF
+#define GLX_X_VISUAL_TYPE       0x22
+#define GLX_TRANSPARENT_TYPE        0x23
+#define GLX_TRANSPARENT_INDEX_VALUE 0x24
+#define GLX_TRANSPARENT_RED_VALUE   0x25
+#define GLX_TRANSPARENT_GREEN_VALUE 0x26
+#define GLX_TRANSPARENT_BLUE_VALUE  0x27
+#define GLX_TRANSPARENT_ALPHA_VALUE 0x28
+#define GLX_WINDOW_BIT          0x00000001
+#define GLX_PIXMAP_BIT          0x00000002
+#define GLX_PBUFFER_BIT         0x00000004
+#define GLX_AUX_BUFFERS_BIT     0x00000010
+#define GLX_FRONT_LEFT_BUFFER_BIT   0x00000001
+#define GLX_FRONT_RIGHT_BUFFER_BIT  0x00000002
+#define GLX_BACK_LEFT_BUFFER_BIT    0x00000004
+#define GLX_BACK_RIGHT_BUFFER_BIT   0x00000008
+#define GLX_DEPTH_BUFFER_BIT        0x00000020
+#define GLX_STENCIL_BUFFER_BIT      0x00000040
+#define GLX_ACCUM_BUFFER_BIT        0x00000080
+#define GLX_NONE            0x8000
+#define GLX_SLOW_CONFIG         0x8001
+#define GLX_TRUE_COLOR          0x8002
+#define GLX_DIRECT_COLOR        0x8003
+#define GLX_PSEUDO_COLOR        0x8004
+#define GLX_STATIC_COLOR        0x8005
+#define GLX_GRAY_SCALE          0x8006
+#define GLX_STATIC_GRAY         0x8007
+#define GLX_TRANSPARENT_RGB     0x8008
+#define GLX_TRANSPARENT_INDEX       0x8009
+#define GLX_VISUAL_ID           0x800B
+#define GLX_SCREEN          0x800C
+#define GLX_NON_CONFORMANT_CONFIG   0x800D
+#define GLX_DRAWABLE_TYPE       0x8010
+#define GLX_RENDER_TYPE         0x8011
+#define GLX_X_RENDERABLE        0x8012
+#define GLX_FBCONFIG_ID         0x8013
+#define GLX_RGBA_TYPE           0x8014
+#define GLX_COLOR_INDEX_TYPE        0x8015
+#define GLX_MAX_PBUFFER_WIDTH       0x8016
+#define GLX_MAX_PBUFFER_HEIGHT      0x8017
+#define GLX_MAX_PBUFFER_PIXELS      0x8018
+#define GLX_PRESERVED_CONTENTS      0x801B
+#define GLX_LARGEST_PBUFFER     0x801C
+#define GLX_WIDTH           0x801D
+#define GLX_HEIGHT          0x801E
+#define GLX_EVENT_MASK          0x801F
+#define GLX_DAMAGED         0x8020
+#define GLX_SAVED           0x8021
+#define GLX_WINDOW          0x8022
+#define GLX_PBUFFER         0x8023
+#define GLX_PBUFFER_HEIGHT              0x8040
+#define GLX_PBUFFER_WIDTH               0x8041
+#define GLX_RGBA_BIT            0x00000001
+#define GLX_COLOR_INDEX_BIT     0x00000002
+#define GLX_PBUFFER_CLOBBER_MASK    0x08000000
+
+
+/*
+ * GLX 1.4 and later:
+ */
+#define GLX_SAMPLE_BUFFERS              0x186a0 /*100000*/
+#define GLX_SAMPLES                     0x186a1 /*100001*/
+
+
+
+typedef struct __GLXcontextRec *GLXContext;
+typedef XID GLXPixmap;
+typedef XID GLXDrawable;
+/* GLX 1.3 and later */
+typedef struct __GLXFBConfigRec *GLXFBConfig;
+typedef XID GLXFBConfigID;
+typedef XID GLXContextID;
+typedef XID GLXWindow;
+typedef XID GLXPbuffer;
+
+
+
+extern XVisualInfo* glXChooseVisual( Display *dpy, int screen,
+                     int *attribList );
+
+extern GLXContext glXCreateContext( Display *dpy, XVisualInfo *vis,
+                    GLXContext shareList, Bool direct );
+
+extern void glXDestroyContext( Display *dpy, GLXContext ctx );
+
+extern Bool glXMakeCurrent( Display *dpy, GLXDrawable drawable,
+                GLXContext ctx);
+
+extern void glXCopyContext( Display *dpy, GLXContext src, GLXContext dst,
+                unsigned long mask );
+
+extern void glXSwapBuffers( Display *dpy, GLXDrawable drawable );
+
+extern GLXPixmap glXCreateGLXPixmap( Display *dpy, XVisualInfo *visual,
+                     Pixmap pixmap );
+
+extern void glXDestroyGLXPixmap( Display *dpy, GLXPixmap pixmap );
+
+extern Bool glXQueryExtension( Display *dpy, int *errorb, int *event );
+
+extern Bool glXQueryVersion( Display *dpy, int *maj, int *min );
+
+extern Bool glXIsDirect( Display *dpy, GLXContext ctx );
+
+extern int glXGetConfig( Display *dpy, XVisualInfo *visual,
+             int attrib, int *value );
+
+extern GLXContext glXGetCurrentContext( void );
+
+extern GLXDrawable glXGetCurrentDrawable( void );
+
+extern void glXWaitGL( void );
+
+extern void glXWaitX( void );
+
+extern void glXUseXFont( Font font, int first, int count, int list );
+
+
+
+/* GLX 1.1 and later */
+extern const char *glXQueryExtensionsString( Display *dpy, int screen );
+
+extern const char *glXQueryServerString( Display *dpy, int screen, int name );
+
+extern const char *glXGetClientString( Display *dpy, int name );
+
+
+/* GLX 1.2 and later */
+extern Display *glXGetCurrentDisplay( void );
+
+
+/* GLX 1.3 and later */
+extern GLXFBConfig *glXChooseFBConfig( Display *dpy, int screen,
+                                       const int *attribList, int *nitems );
+
+extern int glXGetFBConfigAttrib( Display *dpy, GLXFBConfig config,
+                                 int attribute, int *value );
+
+extern GLXFBConfig *glXGetFBConfigs( Display *dpy, int screen,
+                                     int *nelements );
+
+extern XVisualInfo *glXGetVisualFromFBConfig( Display *dpy,
+                                              GLXFBConfig config );
+
+extern GLXWindow glXCreateWindow( Display *dpy, GLXFBConfig config,
+                                  Window win, const int *attribList );
+
+extern void glXDestroyWindow( Display *dpy, GLXWindow window );
+
+extern GLXPixmap glXCreatePixmap( Display *dpy, GLXFBConfig config,
+                                  Pixmap pixmap, const int *attribList );
+
+extern void glXDestroyPixmap( Display *dpy, GLXPixmap pixmap );
+
+extern GLXPbuffer glXCreatePbuffer( Display *dpy, GLXFBConfig config,
+                                    const int *attribList );
+
+extern void glXDestroyPbuffer( Display *dpy, GLXPbuffer pbuf );
+
+extern void glXQueryDrawable( Display *dpy, GLXDrawable draw, int attribute,
+                              unsigned int *value );
+
+extern GLXContext glXCreateNewContext( Display *dpy, GLXFBConfig config,
+                                       int renderType, GLXContext shareList,
+                                       Bool direct );
+
+extern Bool glXMakeContextCurrent( Display *dpy, GLXDrawable draw,
+                                   GLXDrawable read, GLXContext ctx );
+
+extern GLXDrawable glXGetCurrentReadDrawable( void );
+
+extern int glXQueryContext( Display *dpy, GLXContext ctx, int attribute,
+                            int *value );
+
+extern void glXSelectEvent( Display *dpy, GLXDrawable drawable,
+                            unsigned long mask );
+
+extern void glXGetSelectedEvent( Display *dpy, GLXDrawable drawable,
+                                 unsigned long *mask );
+
+
+/* GLX 1.4 and later */
+extern void (*glXGetProcAddress(const GLubyte *procname))( void );
+
+
+#ifndef GLX_GLXEXT_LEGACY
+
+#include <GL/glxext.h>
+
+#else
+
+
+
+/*
+ * ARB 2. GLX_ARB_get_proc_address
+ */
+#ifndef GLX_ARB_get_proc_address
+#define GLX_ARB_get_proc_address 1
+
+typedef void (*__GLXextFuncPtr)(void);
+extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *);
+
+#endif /* GLX_ARB_get_proc_address */
+
+
+
+#endif /* GLX_GLXEXT_LEGACY */
+
+
+/**
+ ** The following aren't in glxext.h yet.
+ **/
+
+
+/*
+ * ???. GLX_NV_vertex_array_range
+ */
+#ifndef GLX_NV_vertex_array_range
+#define GLX_NV_vertex_array_range
+
+extern void *glXAllocateMemoryNV(GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
+extern void glXFreeMemoryNV(GLvoid *pointer);
+typedef void * ( * PFNGLXALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
+typedef void ( * PFNGLXFREEMEMORYNVPROC) (GLvoid *pointer);
+
+#endif /* GLX_NV_vertex_array_range */
+
+
+/*
+ * ???. GLX_MESA_allocate_memory
+ */
+#ifndef GLX_MESA_allocate_memory
+#define GLX_MESA_allocate_memory 1
+
+extern void *glXAllocateMemoryMESA(Display *dpy, int scrn, size_t size, float readfreq, float writefreq, float priority);
+extern void glXFreeMemoryMESA(Display *dpy, int scrn, void *pointer);
+extern GLuint glXGetMemoryOffsetMESA(Display *dpy, int scrn, const void *pointer);
+typedef void * ( * PFNGLXALLOCATEMEMORYMESAPROC) (Display *dpy, int scrn, size_t size, float readfreq, float writefreq, float priority);
+typedef void ( * PFNGLXFREEMEMORYMESAPROC) (Display *dpy, int scrn, void *pointer);
+typedef GLuint (* PFNGLXGETMEMORYOFFSETMESAPROC) (Display *dpy, int scrn, const void *pointer);
+
+#endif /* GLX_MESA_allocate_memory */
+
+
+/*
+ * ARB ?. GLX_ARB_render_texture
+ * XXX This was never finalized!
+ */
+#ifndef GLX_ARB_render_texture
+#define GLX_ARB_render_texture 1
+
+extern Bool glXBindTexImageARB(Display *dpy, GLXPbuffer pbuffer, int buffer);
+extern Bool glXReleaseTexImageARB(Display *dpy, GLXPbuffer pbuffer, int buffer);
+extern Bool glXDrawableAttribARB(Display *dpy, GLXDrawable draw, const int *attribList);
+
+#endif /* GLX_ARB_render_texture */
+
+
+/*
+ * Remove this when glxext.h is updated.
+ */
+#ifndef GLX_NV_float_buffer
+#define GLX_NV_float_buffer 1
+
+#define GLX_FLOAT_COMPONENTS_NV         0x20B0
+
+#endif /* GLX_NV_float_buffer */
+
+
+
+/*
+ * #?. GLX_MESA_swap_frame_usage
+ */
+#ifndef GLX_MESA_swap_frame_usage
+#define GLX_MESA_swap_frame_usage 1
+
+extern int glXGetFrameUsageMESA(Display *dpy, GLXDrawable drawable, float *usage);
+extern int glXBeginFrameTrackingMESA(Display *dpy, GLXDrawable drawable);
+extern int glXEndFrameTrackingMESA(Display *dpy, GLXDrawable drawable);
+extern int glXQueryFrameTrackingMESA(Display *dpy, GLXDrawable drawable, int64_t *swapCount, int64_t *missedFrames, float *lastMissedUsage);
+
+typedef int (*PFNGLXGETFRAMEUSAGEMESAPROC) (Display *dpy, GLXDrawable drawable, float *usage);
+typedef int (*PFNGLXBEGINFRAMETRACKINGMESAPROC)(Display *dpy, GLXDrawable drawable);
+typedef int (*PFNGLXENDFRAMETRACKINGMESAPROC)(Display *dpy, GLXDrawable drawable);
+typedef int (*PFNGLXQUERYFRAMETRACKINGMESAPROC)(Display *dpy, GLXDrawable drawable, int64_t *swapCount, int64_t *missedFrames, float *lastMissedUsage);
+
+#endif /* GLX_MESA_swap_frame_usage */
+
+
+
+/*
+ * #?. GLX_MESA_swap_control
+ */
+#ifndef GLX_MESA_swap_control
+#define GLX_MESA_swap_control 1
+
+extern int glXSwapIntervalMESA(unsigned int interval);
+extern int glXGetSwapIntervalMESA(void);
+
+typedef int (*PFNGLXSWAPINTERVALMESAPROC)(unsigned int interval);
+typedef int (*PFNGLXGETSWAPINTERVALMESAPROC)(void);
+
+#endif /* GLX_MESA_swap_control */
+
+
+
+/*
+ * #?. GLX_EXT_texture_from_pixmap
+ * XXX not finished?
+ */
+#ifndef GLX_EXT_texture_from_pixmap
+#define GLX_EXT_texture_from_pixmap 1
+
+#define GLX_BIND_TO_TEXTURE_RGB_EXT        0x20D0
+#define GLX_BIND_TO_TEXTURE_RGBA_EXT       0x20D1
+#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT     0x20D2
+#define GLX_BIND_TO_TEXTURE_TARGETS_EXT    0x20D3
+#define GLX_Y_INVERTED_EXT                 0x20D4
+
+#define GLX_TEXTURE_FORMAT_EXT             0x20D5
+#define GLX_TEXTURE_TARGET_EXT             0x20D6
+#define GLX_MIPMAP_TEXTURE_EXT             0x20D7
+
+#define GLX_TEXTURE_FORMAT_NONE_EXT        0x20D8
+#define GLX_TEXTURE_FORMAT_RGB_EXT         0x20D9
+#define GLX_TEXTURE_FORMAT_RGBA_EXT        0x20DA
+
+#define GLX_TEXTURE_1D_BIT_EXT             0x00000001
+#define GLX_TEXTURE_2D_BIT_EXT             0x00000002
+#define GLX_TEXTURE_RECTANGLE_BIT_EXT      0x00000004
+
+#define GLX_TEXTURE_1D_EXT                 0x20DB
+#define GLX_TEXTURE_2D_EXT                 0x20DC
+#define GLX_TEXTURE_RECTANGLE_EXT          0x20DD
+
+#define GLX_FRONT_LEFT_EXT                 0x20DE
+#define GLX_FRONT_RIGHT_EXT                0x20DF
+#define GLX_BACK_LEFT_EXT                  0x20E0
+#define GLX_BACK_RIGHT_EXT                 0x20E1
+#define GLX_FRONT_EXT                      GLX_FRONT_LEFT_EXT
+#define GLX_BACK_EXT                       GLX_BACK_LEFT_EXT
+#define GLX_AUX0_EXT                       0x20E2
+#define GLX_AUX1_EXT                       0x20E3
+#define GLX_AUX2_EXT                       0x20E4
+#define GLX_AUX3_EXT                       0x20E5
+#define GLX_AUX4_EXT                       0x20E6
+#define GLX_AUX5_EXT                       0x20E7
+#define GLX_AUX6_EXT                       0x20E8
+#define GLX_AUX7_EXT                       0x20E9
+#define GLX_AUX8_EXT                       0x20EA
+#define GLX_AUX9_EXT                       0x20EB
+
+extern void glXBindTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer, const int *attrib_list);
+extern void glXReleaseTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer);
+
+#endif /* GLX_EXT_texture_from_pixmap */
+
+
+
+
+/*** Should these go here, or in another header? */
+/*
+** GLX Events
+*/
+typedef struct {
+    int event_type;     /* GLX_DAMAGED or GLX_SAVED */
+    int draw_type;      /* GLX_WINDOW or GLX_PBUFFER */
+    unsigned long serial;   /* # of last request processed by server */
+    Bool send_event;        /* true if this came for SendEvent request */
+    Display *display;       /* display the event was read from */
+    GLXDrawable drawable;   /* XID of Drawable */
+    unsigned int buffer_mask;   /* mask indicating which buffers are affected */
+    unsigned int aux_buffer;    /* which aux buffer was affected */
+    int x, y;
+    int width, height;
+    int count;          /* if nonzero, at least this many more */
+} GLXPbufferClobberEvent;
+
+typedef union __GLXEvent {
+    GLXPbufferClobberEvent glxpbufferclobber;
+    long pad[24];
+} GLXEvent;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Mesa/inc/glx_mangle.h b/Mesa/inc/glx_mangle.h
new file mode 100644
index 000000000000..b0d3d39ac8c1
--- /dev/null
+++ b/Mesa/inc/glx_mangle.h
@@ -0,0 +1,81 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.5
+ *
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef GLX_MANGLE_H
+#define GLX_MANGLE_H
+
+#define glXChooseVisual mglXChooseVisual
+#define glXCreateContext mglXCreateContext
+#define glXDestroyContext mglXDestroyContext
+#define glXMakeCurrent mglXMakeCurrent
+#define glXCopyContext mglXCopyContext
+#define glXSwapBuffers mglXSwapBuffers
+#define glXCreateGLXPixmap mglXCreateGLXPixmap
+#define glXDestroyGLXPixmap mglXDestroyGLXPixmap
+#define glXQueryExtension mglXQueryExtension
+#define glXQueryVersion mglXQueryVersion
+#define glXIsDirect mglXIsDirect
+#define glXGetConfig mglXGetConfig
+#define glXGetCurrentContext mglXGetCurrentContext
+#define glXGetCurrentDrawable mglXGetCurrentDrawable
+#define glXWaitGL mglXWaitGL
+#define glXWaitX mglXWaitX
+#define glXUseXFont mglXUseXFont
+#define glXQueryExtensionsString mglXQueryExtensionsString
+#define glXQueryServerString mglXQueryServerString
+#define glXGetClientString mglXGetClientString
+#define glXCreateGLXPixmapMESA mglXCreateGLXPixmapMESA
+#define glXReleaseBuffersMESA mglXReleaseBuffersMESA
+#define glXCopySubBufferMESA mglXCopySubBufferMESA
+#define glXGetVideoSyncSGI mglXGetVideoSyncSGI
+#define glXWaitVideoSyncSGI mglXWaitVideoSyncSGI
+
+/* GLX 1.2 */
+#define glXGetCurrentDisplay mglXGetCurrentDisplay
+
+/* GLX 1.3 */
+#define glXChooseFBConfig mglXChooseFBConfig
+#define glXGetFBConfigAttrib mglXGetFBConfigAttrib
+#define glXGetFBConfigs mglXGetFBConfigs
+#define glXGetVisualFromFBConfig mglXGetVisualFromFBConfig
+#define glXCreateWindow mglXCreateWindow
+#define glXDestroyWindow mglXDestroyWindow
+#define glXCreatePixmap mglXCreatePixmap
+#define glXDestroyPixmap mglXDestroyPixmap
+#define glXCreatePbuffer mglXCreatePbuffer
+#define glXDestroyPbuffer mglXDestroyPbuffer
+#define glXQueryDrawable mglXQueryDrawable
+#define glXCreateNewContext mglXCreateNewContext
+#define glXMakeContextCurrent mglXMakeContextCurrent
+#define glXGetCurrentReadDrawable mglXGetCurrentReadDrawable
+#define glXQueryContext mglXQueryContext
+#define glXSelectEvent mglXSelectEvent
+#define glXGetSelectedEvent mglXGetSelectedEvent
+
+/* GLX 1.4 */
+#define glXGetProcAddress mglXGetProcAddress
+
+
+#endif
diff --git a/Mesa/inc/glxext.h b/Mesa/inc/glxext.h
new file mode 100644
index 000000000000..930289c05073
--- /dev/null
+++ b/Mesa/inc/glxext.h
@@ -0,0 +1,785 @@
+#ifndef __glxext_h_
+#define __glxext_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2007 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+/*************************************************************/
+
+/* Header file version number, required by OpenGL ABI for Linux */
+/* glxext.h last updated 2007/04/21 */
+/* Current version at http://www.opengl.org/registry/ */
+#define GLX_GLXEXT_VERSION 19
+
+#ifndef GLX_VERSION_1_3
+#define GLX_WINDOW_BIT                     0x00000001
+#define GLX_PIXMAP_BIT                     0x00000002
+#define GLX_PBUFFER_BIT                    0x00000004
+#define GLX_RGBA_BIT                       0x00000001
+#define GLX_COLOR_INDEX_BIT                0x00000002
+#define GLX_PBUFFER_CLOBBER_MASK           0x08000000
+#define GLX_FRONT_LEFT_BUFFER_BIT          0x00000001
+#define GLX_FRONT_RIGHT_BUFFER_BIT         0x00000002
+#define GLX_BACK_LEFT_BUFFER_BIT           0x00000004
+#define GLX_BACK_RIGHT_BUFFER_BIT          0x00000008
+#define GLX_AUX_BUFFERS_BIT                0x00000010
+#define GLX_DEPTH_BUFFER_BIT               0x00000020
+#define GLX_STENCIL_BUFFER_BIT             0x00000040
+#define GLX_ACCUM_BUFFER_BIT               0x00000080
+#define GLX_CONFIG_CAVEAT                  0x20
+#define GLX_X_VISUAL_TYPE                  0x22
+#define GLX_TRANSPARENT_TYPE               0x23
+#define GLX_TRANSPARENT_INDEX_VALUE        0x24
+#define GLX_TRANSPARENT_RED_VALUE          0x25
+#define GLX_TRANSPARENT_GREEN_VALUE        0x26
+#define GLX_TRANSPARENT_BLUE_VALUE         0x27
+#define GLX_TRANSPARENT_ALPHA_VALUE        0x28
+#define GLX_DONT_CARE                      0xFFFFFFFF
+#define GLX_NONE                           0x8000
+#define GLX_SLOW_CONFIG                    0x8001
+#define GLX_TRUE_COLOR                     0x8002
+#define GLX_DIRECT_COLOR                   0x8003
+#define GLX_PSEUDO_COLOR                   0x8004
+#define GLX_STATIC_COLOR                   0x8005
+#define GLX_GRAY_SCALE                     0x8006
+#define GLX_STATIC_GRAY                    0x8007
+#define GLX_TRANSPARENT_RGB                0x8008
+#define GLX_TRANSPARENT_INDEX              0x8009
+#define GLX_VISUAL_ID                      0x800B
+#define GLX_SCREEN                         0x800C
+#define GLX_NON_CONFORMANT_CONFIG          0x800D
+#define GLX_DRAWABLE_TYPE                  0x8010
+#define GLX_RENDER_TYPE                    0x8011
+#define GLX_X_RENDERABLE                   0x8012
+#define GLX_FBCONFIG_ID                    0x8013
+#define GLX_RGBA_TYPE                      0x8014
+#define GLX_COLOR_INDEX_TYPE               0x8015
+#define GLX_MAX_PBUFFER_WIDTH              0x8016
+#define GLX_MAX_PBUFFER_HEIGHT             0x8017
+#define GLX_MAX_PBUFFER_PIXELS             0x8018
+#define GLX_PRESERVED_CONTENTS             0x801B
+#define GLX_LARGEST_PBUFFER                0x801C
+#define GLX_WIDTH                          0x801D
+#define GLX_HEIGHT                         0x801E
+#define GLX_EVENT_MASK                     0x801F
+#define GLX_DAMAGED                        0x8020
+#define GLX_SAVED                          0x8021
+#define GLX_WINDOW                         0x8022
+#define GLX_PBUFFER                        0x8023
+#define GLX_PBUFFER_HEIGHT                 0x8040
+#define GLX_PBUFFER_WIDTH                  0x8041
+#endif
+
+#ifndef GLX_VERSION_1_4
+#define GLX_SAMPLE_BUFFERS                 100000
+#define GLX_SAMPLES                        100001
+#endif
+
+#ifndef GLX_ARB_get_proc_address
+#endif
+
+#ifndef GLX_ARB_multisample
+#define GLX_SAMPLE_BUFFERS_ARB             100000
+#define GLX_SAMPLES_ARB                    100001
+#endif
+
+#ifndef GLX_ARB_fbconfig_float
+#define GLX_RGBA_FLOAT_TYPE_ARB            0x20B9
+#define GLX_RGBA_FLOAT_BIT_ARB             0x00000004
+#endif
+
+#ifndef GLX_SGIS_multisample
+#define GLX_SAMPLE_BUFFERS_SGIS            100000
+#define GLX_SAMPLES_SGIS                   100001
+#endif
+
+#ifndef GLX_EXT_visual_info
+#define GLX_X_VISUAL_TYPE_EXT              0x22
+#define GLX_TRANSPARENT_TYPE_EXT           0x23
+#define GLX_TRANSPARENT_INDEX_VALUE_EXT    0x24
+#define GLX_TRANSPARENT_RED_VALUE_EXT      0x25
+#define GLX_TRANSPARENT_GREEN_VALUE_EXT    0x26
+#define GLX_TRANSPARENT_BLUE_VALUE_EXT     0x27
+#define GLX_TRANSPARENT_ALPHA_VALUE_EXT    0x28
+#define GLX_NONE_EXT                       0x8000
+#define GLX_TRUE_COLOR_EXT                 0x8002
+#define GLX_DIRECT_COLOR_EXT               0x8003
+#define GLX_PSEUDO_COLOR_EXT               0x8004
+#define GLX_STATIC_COLOR_EXT               0x8005
+#define GLX_GRAY_SCALE_EXT                 0x8006
+#define GLX_STATIC_GRAY_EXT                0x8007
+#define GLX_TRANSPARENT_RGB_EXT            0x8008
+#define GLX_TRANSPARENT_INDEX_EXT          0x8009
+#endif
+
+#ifndef GLX_SGI_swap_control
+#endif
+
+#ifndef GLX_SGI_video_sync
+#endif
+
+#ifndef GLX_SGI_make_current_read
+#endif
+
+#ifndef GLX_SGIX_video_source
+#endif
+
+#ifndef GLX_EXT_visual_rating
+#define GLX_VISUAL_CAVEAT_EXT              0x20
+#define GLX_SLOW_VISUAL_EXT                0x8001
+#define GLX_NON_CONFORMANT_VISUAL_EXT      0x800D
+/* reuse GLX_NONE_EXT */
+#endif
+
+#ifndef GLX_EXT_import_context
+#define GLX_SHARE_CONTEXT_EXT              0x800A
+#define GLX_VISUAL_ID_EXT                  0x800B
+#define GLX_SCREEN_EXT                     0x800C
+#endif
+
+#ifndef GLX_SGIX_fbconfig
+#define GLX_WINDOW_BIT_SGIX                0x00000001
+#define GLX_PIXMAP_BIT_SGIX                0x00000002
+#define GLX_RGBA_BIT_SGIX                  0x00000001
+#define GLX_COLOR_INDEX_BIT_SGIX           0x00000002
+#define GLX_DRAWABLE_TYPE_SGIX             0x8010
+#define GLX_RENDER_TYPE_SGIX               0x8011
+#define GLX_X_RENDERABLE_SGIX              0x8012
+#define GLX_FBCONFIG_ID_SGIX               0x8013
+#define GLX_RGBA_TYPE_SGIX                 0x8014
+#define GLX_COLOR_INDEX_TYPE_SGIX          0x8015
+/* reuse GLX_SCREEN_EXT */
+#endif
+
+#ifndef GLX_SGIX_pbuffer
+#define GLX_PBUFFER_BIT_SGIX               0x00000004
+#define GLX_BUFFER_CLOBBER_MASK_SGIX       0x08000000
+#define GLX_FRONT_LEFT_BUFFER_BIT_SGIX     0x00000001
+#define GLX_FRONT_RIGHT_BUFFER_BIT_SGIX    0x00000002
+#define GLX_BACK_LEFT_BUFFER_BIT_SGIX      0x00000004
+#define GLX_BACK_RIGHT_BUFFER_BIT_SGIX     0x00000008
+#define GLX_AUX_BUFFERS_BIT_SGIX           0x00000010
+#define GLX_DEPTH_BUFFER_BIT_SGIX          0x00000020
+#define GLX_STENCIL_BUFFER_BIT_SGIX        0x00000040
+#define GLX_ACCUM_BUFFER_BIT_SGIX          0x00000080
+#define GLX_SAMPLE_BUFFERS_BIT_SGIX        0x00000100
+#define GLX_MAX_PBUFFER_WIDTH_SGIX         0x8016
+#define GLX_MAX_PBUFFER_HEIGHT_SGIX        0x8017
+#define GLX_MAX_PBUFFER_PIXELS_SGIX        0x8018
+#define GLX_OPTIMAL_PBUFFER_WIDTH_SGIX     0x8019
+#define GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX    0x801A
+#define GLX_PRESERVED_CONTENTS_SGIX        0x801B
+#define GLX_LARGEST_PBUFFER_SGIX           0x801C
+#define GLX_WIDTH_SGIX                     0x801D
+#define GLX_HEIGHT_SGIX                    0x801E
+#define GLX_EVENT_MASK_SGIX                0x801F
+#define GLX_DAMAGED_SGIX                   0x8020
+#define GLX_SAVED_SGIX                     0x8021
+#define GLX_WINDOW_SGIX                    0x8022
+#define GLX_PBUFFER_SGIX                   0x8023
+#endif
+
+#ifndef GLX_SGI_cushion
+#endif
+
+#ifndef GLX_SGIX_video_resize
+#define GLX_SYNC_FRAME_SGIX                0x00000000
+#define GLX_SYNC_SWAP_SGIX                 0x00000001
+#endif
+
+#ifndef GLX_SGIX_dmbuffer
+#define GLX_DIGITAL_MEDIA_PBUFFER_SGIX     0x8024
+#endif
+
+#ifndef GLX_SGIX_swap_group
+#endif
+
+#ifndef GLX_SGIX_swap_barrier
+#endif
+
+#ifndef GLX_SGIS_blended_overlay
+#define GLX_BLENDED_RGBA_SGIS              0x8025
+#endif
+
+#ifndef GLX_SGIS_shared_multisample
+#define GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS 0x8026
+#define GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS 0x8027
+#endif
+
+#ifndef GLX_SUN_get_transparent_index
+#endif
+
+#ifndef GLX_3DFX_multisample
+#define GLX_SAMPLE_BUFFERS_3DFX            0x8050
+#define GLX_SAMPLES_3DFX                   0x8051
+#endif
+
+#ifndef GLX_MESA_copy_sub_buffer
+#endif
+
+#ifndef GLX_MESA_pixmap_colormap
+#endif
+
+#ifndef GLX_MESA_release_buffers
+#endif
+
+#ifndef GLX_MESA_set_3dfx_mode
+#define GLX_3DFX_WINDOW_MODE_MESA          0x1
+#define GLX_3DFX_FULLSCREEN_MODE_MESA      0x2
+#endif
+
+#ifndef GLX_SGIX_visual_select_group
+#define GLX_VISUAL_SELECT_GROUP_SGIX       0x8028
+#endif
+
+#ifndef GLX_OML_swap_method
+#define GLX_SWAP_METHOD_OML                0x8060
+#define GLX_SWAP_EXCHANGE_OML              0x8061
+#define GLX_SWAP_COPY_OML                  0x8062
+#define GLX_SWAP_UNDEFINED_OML             0x8063
+#endif
+
+#ifndef GLX_OML_sync_control
+#endif
+
+#ifndef GLX_NV_float_buffer
+#define GLX_FLOAT_COMPONENTS_NV            0x20B0
+#endif
+
+#ifndef GLX_SGIX_hyperpipe
+#define GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX 80
+#define GLX_BAD_HYPERPIPE_CONFIG_SGIX      91
+#define GLX_BAD_HYPERPIPE_SGIX             92
+#define GLX_HYPERPIPE_DISPLAY_PIPE_SGIX    0x00000001
+#define GLX_HYPERPIPE_RENDER_PIPE_SGIX     0x00000002
+#define GLX_PIPE_RECT_SGIX                 0x00000001
+#define GLX_PIPE_RECT_LIMITS_SGIX          0x00000002
+#define GLX_HYPERPIPE_STEREO_SGIX          0x00000003
+#define GLX_HYPERPIPE_PIXEL_AVERAGE_SGIX   0x00000004
+#define GLX_HYPERPIPE_ID_SGIX              0x8030
+#endif
+
+#ifndef GLX_MESA_agp_offset
+#endif
+
+#ifndef GLX_EXT_fbconfig_packed_float
+#define GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT   0x20B1
+#define GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT    0x00000008
+#endif
+
+#ifndef GLX_EXT_framebuffer_sRGB
+#define GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x20B2
+#endif
+
+#ifndef GLX_EXT_texture_from_pixmap
+#define GLX_TEXTURE_1D_BIT_EXT             0x00000001
+#define GLX_TEXTURE_2D_BIT_EXT             0x00000002
+#define GLX_TEXTURE_RECTANGLE_BIT_EXT      0x00000004
+#define GLX_BIND_TO_TEXTURE_RGB_EXT        0x20D0
+#define GLX_BIND_TO_TEXTURE_RGBA_EXT       0x20D1
+#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT     0x20D2
+#define GLX_BIND_TO_TEXTURE_TARGETS_EXT    0x20D3
+#define GLX_Y_INVERTED_EXT                 0x20D4
+#define GLX_TEXTURE_FORMAT_EXT             0x20D5
+#define GLX_TEXTURE_TARGET_EXT             0x20D6
+#define GLX_MIPMAP_TEXTURE_EXT             0x20D7
+#define GLX_TEXTURE_FORMAT_NONE_EXT        0x20D8
+#define GLX_TEXTURE_FORMAT_RGB_EXT         0x20D9
+#define GLX_TEXTURE_FORMAT_RGBA_EXT        0x20DA
+#define GLX_TEXTURE_1D_EXT                 0x20DB
+#define GLX_TEXTURE_2D_EXT                 0x20DC
+#define GLX_TEXTURE_RECTANGLE_EXT          0x20DD
+#define GLX_FRONT_LEFT_EXT                 0x20DE
+#define GLX_FRONT_RIGHT_EXT                0x20DF
+#define GLX_BACK_LEFT_EXT                  0x20E0
+#define GLX_BACK_RIGHT_EXT                 0x20E1
+#define GLX_FRONT_EXT                      GLX_FRONT_LEFT_EXT
+#define GLX_BACK_EXT                       GLX_BACK_LEFT_EXT
+#define GLX_AUX0_EXT                       0x20E2
+#define GLX_AUX1_EXT                       0x20E3
+#define GLX_AUX2_EXT                       0x20E4
+#define GLX_AUX3_EXT                       0x20E5
+#define GLX_AUX4_EXT                       0x20E6
+#define GLX_AUX5_EXT                       0x20E7
+#define GLX_AUX6_EXT                       0x20E8
+#define GLX_AUX7_EXT                       0x20E9
+#define GLX_AUX8_EXT                       0x20EA
+#define GLX_AUX9_EXT                       0x20EB
+#endif
+
+
+/*************************************************************/
+
+#ifndef GLX_ARB_get_proc_address
+typedef void (*__GLXextFuncPtr)(void);
+#endif
+
+#ifndef GLX_SGIX_video_source
+typedef XID GLXVideoSourceSGIX;
+#endif
+
+#ifndef GLX_SGIX_fbconfig
+typedef XID GLXFBConfigIDSGIX;
+typedef struct __GLXFBConfigRec *GLXFBConfigSGIX;
+#endif
+
+#ifndef GLX_SGIX_pbuffer
+typedef XID GLXPbufferSGIX;
+typedef struct {
+    int type;
+    unsigned long serial;     /* # of last request processed by server */
+    Bool send_event;          /* true if this came for SendEvent request */
+    Display *display;         /* display the event was read from */
+    GLXDrawable drawable;     /* i.d. of Drawable */
+    int event_type;       /* GLX_DAMAGED_SGIX or GLX_SAVED_SGIX */
+    int draw_type;        /* GLX_WINDOW_SGIX or GLX_PBUFFER_SGIX */
+    unsigned int mask;    /* mask indicating which buffers are affected*/
+    int x, y;
+    int width, height;
+    int count;        /* if nonzero, at least this many more */
+} GLXBufferClobberEventSGIX;
+#endif
+
+#ifndef GLEXT_64_TYPES_DEFINED
+/* This code block is duplicated in glxext.h, so must be protected */
+#define GLEXT_64_TYPES_DEFINED
+/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
+/* (as used in the GLX_OML_sync_control extension). */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+#elif defined(__sun__) || defined(__digital__)
+#include <inttypes.h>
+#if defined(__STDC__)
+#if defined(__arch64__)
+typedef long int int64_t;
+typedef unsigned long int uint64_t;
+#else
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#endif /* __arch64__ */
+#endif /* __STDC__ */
+#elif defined( __VMS )
+#include <inttypes.h>
+#elif defined(__SCO__) || defined(__USLC__)
+#include <stdint.h>
+#elif defined(__UNIXOS2__) || defined(__SOL64__)
+typedef long int int32_t;
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#elif defined(_WIN32) && defined(__GNUC__)
+#include <stdint.h>
+#elif defined(_WIN32)
+typedef __int32 int32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#else
+#include <inttypes.h>     /* Fallback option */
+#endif
+#endif
+
+#ifndef GLX_VERSION_1_3
+#define GLX_VERSION_1_3 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXFBConfig * glXGetFBConfigs (Display *, int, int *);
+extern GLXFBConfig * glXChooseFBConfig (Display *, int, const int *, int *);
+extern int glXGetFBConfigAttrib (Display *, GLXFBConfig, int, int *);
+extern XVisualInfo * glXGetVisualFromFBConfig (Display *, GLXFBConfig);
+extern GLXWindow glXCreateWindow (Display *, GLXFBConfig, Window, const int *);
+extern void glXDestroyWindow (Display *, GLXWindow);
+extern GLXPixmap glXCreatePixmap (Display *, GLXFBConfig, Pixmap, const int *);
+extern void glXDestroyPixmap (Display *, GLXPixmap);
+extern GLXPbuffer glXCreatePbuffer (Display *, GLXFBConfig, const int *);
+extern void glXDestroyPbuffer (Display *, GLXPbuffer);
+extern void glXQueryDrawable (Display *, GLXDrawable, int, unsigned int *);
+extern GLXContext glXCreateNewContext (Display *, GLXFBConfig, int, GLXContext, Bool);
+extern Bool glXMakeContextCurrent (Display *, GLXDrawable, GLXDrawable, GLXContext);
+extern GLXDrawable glXGetCurrentReadDrawable (void);
+extern Display * glXGetCurrentDisplay (void);
+extern int glXQueryContext (Display *, GLXContext, int, int *);
+extern void glXSelectEvent (Display *, GLXDrawable, unsigned long);
+extern void glXGetSelectedEvent (Display *, GLXDrawable, unsigned long *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXFBConfig * ( * PFNGLXGETFBCONFIGSPROC) (Display *dpy, int screen, int *nelements);
+typedef GLXFBConfig * ( * PFNGLXCHOOSEFBCONFIGPROC) (Display *dpy, int screen, const int *attrib_list, int *nelements);
+typedef int ( * PFNGLXGETFBCONFIGATTRIBPROC) (Display *dpy, GLXFBConfig config, int attribute, int *value);
+typedef XVisualInfo * ( * PFNGLXGETVISUALFROMFBCONFIGPROC) (Display *dpy, GLXFBConfig config);
+typedef GLXWindow ( * PFNGLXCREATEWINDOWPROC) (Display *dpy, GLXFBConfig config, Window win, const int *attrib_list);
+typedef void ( * PFNGLXDESTROYWINDOWPROC) (Display *dpy, GLXWindow win);
+typedef GLXPixmap ( * PFNGLXCREATEPIXMAPPROC) (Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list);
+typedef void ( * PFNGLXDESTROYPIXMAPPROC) (Display *dpy, GLXPixmap pixmap);
+typedef GLXPbuffer ( * PFNGLXCREATEPBUFFERPROC) (Display *dpy, GLXFBConfig config, const int *attrib_list);
+typedef void ( * PFNGLXDESTROYPBUFFERPROC) (Display *dpy, GLXPbuffer pbuf);
+typedef void ( * PFNGLXQUERYDRAWABLEPROC) (Display *dpy, GLXDrawable draw, int attribute, unsigned int *value);
+typedef GLXContext ( * PFNGLXCREATENEWCONTEXTPROC) (Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
+typedef Bool ( * PFNGLXMAKECONTEXTCURRENTPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
+typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLEPROC) (void);
+typedef Display * ( * PFNGLXGETCURRENTDISPLAYPROC) (void);
+typedef int ( * PFNGLXQUERYCONTEXTPROC) (Display *dpy, GLXContext ctx, int attribute, int *value);
+typedef void ( * PFNGLXSELECTEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long event_mask);
+typedef void ( * PFNGLXGETSELECTEDEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long *event_mask);
+#endif
+
+#ifndef GLX_VERSION_1_4
+#define GLX_VERSION_1_4 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern __GLXextFuncPtr glXGetProcAddress (const GLubyte *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSPROC) (const GLubyte *procName);
+#endif
+
+#ifndef GLX_ARB_get_proc_address
+#define GLX_ARB_get_proc_address 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSARBPROC) (const GLubyte *procName);
+#endif
+
+#ifndef GLX_ARB_multisample
+#define GLX_ARB_multisample 1
+#endif
+
+#ifndef GLX_ARB_fbconfig_float
+#define GLX_ARB_fbconfig_float 1
+#endif
+
+#ifndef GLX_SGIS_multisample
+#define GLX_SGIS_multisample 1
+#endif
+
+#ifndef GLX_EXT_visual_info
+#define GLX_EXT_visual_info 1
+#endif
+
+#ifndef GLX_SGI_swap_control
+#define GLX_SGI_swap_control 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern int glXSwapIntervalSGI (int);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
+#endif
+
+#ifndef GLX_SGI_video_sync
+#define GLX_SGI_video_sync 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern int glXGetVideoSyncSGI (unsigned int *);
+extern int glXWaitVideoSyncSGI (int, int, unsigned int *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef int ( * PFNGLXGETVIDEOSYNCSGIPROC) (unsigned int *count);
+typedef int ( * PFNGLXWAITVIDEOSYNCSGIPROC) (int divisor, int remainder, unsigned int *count);
+#endif
+
+#ifndef GLX_SGI_make_current_read
+#define GLX_SGI_make_current_read 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXMakeCurrentReadSGI (Display *, GLXDrawable, GLXDrawable, GLXContext);
+extern GLXDrawable glXGetCurrentReadDrawableSGI (void);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXMAKECURRENTREADSGIPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
+typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLESGIPROC) (void);
+#endif
+
+#ifndef GLX_SGIX_video_source
+#define GLX_SGIX_video_source 1
+#ifdef _VL_H
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXVideoSourceSGIX glXCreateGLXVideoSourceSGIX (Display *, int, VLServer, VLPath, int, VLNode);
+extern void glXDestroyGLXVideoSourceSGIX (Display *, GLXVideoSourceSGIX);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXVideoSourceSGIX ( * PFNGLXCREATEGLXVIDEOSOURCESGIXPROC) (Display *display, int screen, VLServer server, VLPath path, int nodeClass, VLNode drainNode);
+typedef void ( * PFNGLXDESTROYGLXVIDEOSOURCESGIXPROC) (Display *dpy, GLXVideoSourceSGIX glxvideosource);
+#endif /* _VL_H */
+#endif
+
+#ifndef GLX_EXT_visual_rating
+#define GLX_EXT_visual_rating 1
+#endif
+
+#ifndef GLX_EXT_import_context
+#define GLX_EXT_import_context 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Display * glXGetCurrentDisplayEXT (void);
+extern int glXQueryContextInfoEXT (Display *, GLXContext, int, int *);
+extern GLXContextID glXGetContextIDEXT (const GLXContext);
+extern GLXContext glXImportContextEXT (Display *, GLXContextID);
+extern void glXFreeContextEXT (Display *, GLXContext);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Display * ( * PFNGLXGETCURRENTDISPLAYEXTPROC) (void);
+typedef int ( * PFNGLXQUERYCONTEXTINFOEXTPROC) (Display *dpy, GLXContext context, int attribute, int *value);
+typedef GLXContextID ( * PFNGLXGETCONTEXTIDEXTPROC) (const GLXContext context);
+typedef GLXContext ( * PFNGLXIMPORTCONTEXTEXTPROC) (Display *dpy, GLXContextID contextID);
+typedef void ( * PFNGLXFREECONTEXTEXTPROC) (Display *dpy, GLXContext context);
+#endif
+
+#ifndef GLX_SGIX_fbconfig
+#define GLX_SGIX_fbconfig 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern int glXGetFBConfigAttribSGIX (Display *, GLXFBConfigSGIX, int, int *);
+extern GLXFBConfigSGIX * glXChooseFBConfigSGIX (Display *, int, int *, int *);
+extern GLXPixmap glXCreateGLXPixmapWithConfigSGIX (Display *, GLXFBConfigSGIX, Pixmap);
+extern GLXContext glXCreateContextWithConfigSGIX (Display *, GLXFBConfigSGIX, int, GLXContext, Bool);
+extern XVisualInfo * glXGetVisualFromFBConfigSGIX (Display *, GLXFBConfigSGIX);
+extern GLXFBConfigSGIX glXGetFBConfigFromVisualSGIX (Display *, XVisualInfo *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef int ( * PFNGLXGETFBCONFIGATTRIBSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, int attribute, int *value);
+typedef GLXFBConfigSGIX * ( * PFNGLXCHOOSEFBCONFIGSGIXPROC) (Display *dpy, int screen, int *attrib_list, int *nelements);
+typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap);
+typedef GLXContext ( * PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
+typedef XVisualInfo * ( * PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config);
+typedef GLXFBConfigSGIX ( * PFNGLXGETFBCONFIGFROMVISUALSGIXPROC) (Display *dpy, XVisualInfo *vis);
+#endif
+
+#ifndef GLX_SGIX_pbuffer
+#define GLX_SGIX_pbuffer 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXPbufferSGIX glXCreateGLXPbufferSGIX (Display *, GLXFBConfigSGIX, unsigned int, unsigned int, int *);
+extern void glXDestroyGLXPbufferSGIX (Display *, GLXPbufferSGIX);
+extern int glXQueryGLXPbufferSGIX (Display *, GLXPbufferSGIX, int, unsigned int *);
+extern void glXSelectEventSGIX (Display *, GLXDrawable, unsigned long);
+extern void glXGetSelectedEventSGIX (Display *, GLXDrawable, unsigned long *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXPbufferSGIX ( * PFNGLXCREATEGLXPBUFFERSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list);
+typedef void ( * PFNGLXDESTROYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf);
+typedef int ( * PFNGLXQUERYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value);
+typedef void ( * PFNGLXSELECTEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long mask);
+typedef void ( * PFNGLXGETSELECTEDEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long *mask);
+#endif
+
+#ifndef GLX_SGI_cushion
+#define GLX_SGI_cushion 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXCushionSGI (Display *, Window, float);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXCUSHIONSGIPROC) (Display *dpy, Window window, float cushion);
+#endif
+
+#ifndef GLX_SGIX_video_resize
+#define GLX_SGIX_video_resize 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern int glXBindChannelToWindowSGIX (Display *, int, int, Window);
+extern int glXChannelRectSGIX (Display *, int, int, int, int, int, int);
+extern int glXQueryChannelRectSGIX (Display *, int, int, int *, int *, int *, int *);
+extern int glXQueryChannelDeltasSGIX (Display *, int, int, int *, int *, int *, int *);
+extern int glXChannelRectSyncSGIX (Display *, int, int, GLenum);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef int ( * PFNGLXBINDCHANNELTOWINDOWSGIXPROC) (Display *display, int screen, int channel, Window window);
+typedef int ( * PFNGLXCHANNELRECTSGIXPROC) (Display *display, int screen, int channel, int x, int y, int w, int h);
+typedef int ( * PFNGLXQUERYCHANNELRECTSGIXPROC) (Display *display, int screen, int channel, int *dx, int *dy, int *dw, int *dh);
+typedef int ( * PFNGLXQUERYCHANNELDELTASSGIXPROC) (Display *display, int screen, int channel, int *x, int *y, int *w, int *h);
+typedef int ( * PFNGLXCHANNELRECTSYNCSGIXPROC) (Display *display, int screen, int channel, GLenum synctype);
+#endif
+
+#ifndef GLX_SGIX_dmbuffer
+#define GLX_SGIX_dmbuffer 1
+#ifdef _DM_BUFFER_H_
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXAssociateDMPbufferSGIX (Display *, GLXPbufferSGIX, DMparams *, DMbuffer);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXASSOCIATEDMPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params, DMbuffer dmbuffer);
+#endif /* _DM_BUFFER_H_ */
+#endif
+
+#ifndef GLX_SGIX_swap_group
+#define GLX_SGIX_swap_group 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXJoinSwapGroupSGIX (Display *, GLXDrawable, GLXDrawable);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXJOINSWAPGROUPSGIXPROC) (Display *dpy, GLXDrawable drawable, GLXDrawable member);
+#endif
+
+#ifndef GLX_SGIX_swap_barrier
+#define GLX_SGIX_swap_barrier 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXBindSwapBarrierSGIX (Display *, GLXDrawable, int);
+extern Bool glXQueryMaxSwapBarriersSGIX (Display *, int, int *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXBINDSWAPBARRIERSGIXPROC) (Display *dpy, GLXDrawable drawable, int barrier);
+typedef Bool ( * PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC) (Display *dpy, int screen, int *max);
+#endif
+
+#ifndef GLX_SUN_get_transparent_index
+#define GLX_SUN_get_transparent_index 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Status glXGetTransparentIndexSUN (Display *, Window, Window, long *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Status ( * PFNGLXGETTRANSPARENTINDEXSUNPROC) (Display *dpy, Window overlay, Window underlay, long *pTransparentIndex);
+#endif
+
+#ifndef GLX_MESA_copy_sub_buffer
+#define GLX_MESA_copy_sub_buffer 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXCopySubBufferMESA (Display *, GLXDrawable, int, int, int, int);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXCOPYSUBBUFFERMESAPROC) (Display *dpy, GLXDrawable drawable, int x, int y, int width, int height);
+#endif
+
+#ifndef GLX_MESA_pixmap_colormap
+#define GLX_MESA_pixmap_colormap 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXPixmap glXCreateGLXPixmapMESA (Display *, XVisualInfo *, Pixmap, Colormap);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPMESAPROC) (Display *dpy, XVisualInfo *visual, Pixmap pixmap, Colormap cmap);
+#endif
+
+#ifndef GLX_MESA_release_buffers
+#define GLX_MESA_release_buffers 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXReleaseBuffersMESA (Display *, GLXDrawable);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXRELEASEBUFFERSMESAPROC) (Display *dpy, GLXDrawable drawable);
+#endif
+
+#ifndef GLX_MESA_set_3dfx_mode
+#define GLX_MESA_set_3dfx_mode 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXSet3DfxModeMESA (int);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXSET3DFXMODEMESAPROC) (int mode);
+#endif
+
+#ifndef GLX_SGIX_visual_select_group
+#define GLX_SGIX_visual_select_group 1
+#endif
+
+#ifndef GLX_OML_swap_method
+#define GLX_OML_swap_method 1
+#endif
+
+#ifndef GLX_OML_sync_control
+#define GLX_OML_sync_control 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXGetSyncValuesOML (Display *, GLXDrawable, int64_t *, int64_t *, int64_t *);
+extern Bool glXGetMscRateOML (Display *, GLXDrawable, int32_t *, int32_t *);
+extern int64_t glXSwapBuffersMscOML (Display *, GLXDrawable, int64_t, int64_t, int64_t);
+extern Bool glXWaitForMscOML (Display *, GLXDrawable, int64_t, int64_t, int64_t, int64_t *, int64_t *, int64_t *);
+extern Bool glXWaitForSbcOML (Display *, GLXDrawable, int64_t, int64_t *, int64_t *, int64_t *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXGETSYNCVALUESOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t *ust, int64_t *msc, int64_t *sbc);
+typedef Bool ( * PFNGLXGETMSCRATEOMLPROC) (Display *dpy, GLXDrawable drawable, int32_t *numerator, int32_t *denominator);
+typedef int64_t ( * PFNGLXSWAPBUFFERSMSCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder);
+typedef Bool ( * PFNGLXWAITFORMSCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder, int64_t *ust, int64_t *msc, int64_t *sbc);
+typedef Bool ( * PFNGLXWAITFORSBCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_sbc, int64_t *ust, int64_t *msc, int64_t *sbc);
+#endif
+
+#ifndef GLX_NV_float_buffer
+#define GLX_NV_float_buffer 1
+#endif
+
+#ifndef GLX_SGIX_hyperpipe
+#define GLX_SGIX_hyperpipe 1
+
+typedef struct {
+    char    pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
+    int     networkId;
+} GLXHyperpipeNetworkSGIX;
+
+typedef struct {
+    char    pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
+    int     channel;
+    unsigned int
+      participationType;
+    int     timeSlice;
+} GLXHyperpipeConfigSGIX;
+
+typedef struct {
+    char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
+    int srcXOrigin, srcYOrigin, srcWidth, srcHeight;
+    int destXOrigin, destYOrigin, destWidth, destHeight;
+} GLXPipeRect;
+
+typedef struct {
+    char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
+    int XOrigin, YOrigin, maxHeight, maxWidth;
+} GLXPipeRectLimits;
+
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXHyperpipeNetworkSGIX * glXQueryHyperpipeNetworkSGIX (Display *, int *);
+extern int glXHyperpipeConfigSGIX (Display *, int, int, GLXHyperpipeConfigSGIX *, int *);
+extern GLXHyperpipeConfigSGIX * glXQueryHyperpipeConfigSGIX (Display *, int, int *);
+extern int glXDestroyHyperpipeConfigSGIX (Display *, int);
+extern int glXBindHyperpipeSGIX (Display *, int);
+extern int glXQueryHyperpipeBestAttribSGIX (Display *, int, int, int, void *, void *);
+extern int glXHyperpipeAttribSGIX (Display *, int, int, int, void *);
+extern int glXQueryHyperpipeAttribSGIX (Display *, int, int, int, void *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXHyperpipeNetworkSGIX * ( * PFNGLXQUERYHYPERPIPENETWORKSGIXPROC) (Display *dpy, int *npipes);
+typedef int ( * PFNGLXHYPERPIPECONFIGSGIXPROC) (Display *dpy, int networkId, int npipes, GLXHyperpipeConfigSGIX *cfg, int *hpId);
+typedef GLXHyperpipeConfigSGIX * ( * PFNGLXQUERYHYPERPIPECONFIGSGIXPROC) (Display *dpy, int hpId, int *npipes);
+typedef int ( * PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC) (Display *dpy, int hpId);
+typedef int ( * PFNGLXBINDHYPERPIPESGIXPROC) (Display *dpy, int hpId);
+typedef int ( * PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *attribList, void *returnAttribList);
+typedef int ( * PFNGLXHYPERPIPEATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *attribList);
+typedef int ( * PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *returnAttribList);
+#endif
+
+#ifndef GLX_MESA_agp_offset
+#define GLX_MESA_agp_offset 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern unsigned int glXGetAGPOffsetMESA (const void *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef unsigned int ( * PFNGLXGETAGPOFFSETMESAPROC) (const void *pointer);
+#endif
+
+#ifndef GLX_EXT_fbconfig_packed_float
+#define GLX_EXT_fbconfig_packed_float 1
+#endif
+
+#ifndef GLX_EXT_framebuffer_sRGB
+#define GLX_EXT_framebuffer_sRGB 1
+#endif
+
+#ifndef GLX_EXT_texture_from_pixmap
+#define GLX_EXT_texture_from_pixmap 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXBindTexImageEXT (Display *, GLXDrawable, int, const int *);
+extern void glXReleaseTexImageEXT (Display *, GLXDrawable, int);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXBINDTEXIMAGEEXTPROC) (Display *dpy, GLXDrawable drawable, int buffer, const int *attrib_list);
+typedef void ( * PFNGLXRELEASETEXIMAGEEXTPROC) (Display *dpy, GLXDrawable drawable, int buffer);
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Mesa/inc/vms_x_fix.h b/Mesa/inc/vms_x_fix.h
new file mode 100644
index 000000000000..70454e3d9f53
--- /dev/null
+++ b/Mesa/inc/vms_x_fix.h
@@ -0,0 +1,1224 @@
+/***************************************************************************
+ *                                                                         *
+ * Author : Jouk Jansen (joukj@hrem.nano.tudelft.nl)                       *
+ *                                                                         *
+ * Last revision : 31 August 2006                                          *
+ *                                                                         *
+ * Repair definitions of Runtime library functions when compiling with     *
+ * /name=(as_is) on OpenVMS                                                *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef VMS_X_FIX
+#define VMS_X_FIX
+
+#define decw$_select DECW$_SELECT
+#define DtSaverGetWindows DTSAVERGETWINDOWS
+#define MrmFetchWidget MRMFETCHWIDGET
+#define MrmInitialize MRMINITIALIZE
+#define MrmOpenHierarchy MRMOPENHIERARCHY
+#define MrmRegisterNames MRMREGISTERNAMES
+#define XAddExtension XADDEXTENSION
+#define XAddHosts XADDHOSTS
+#define XAllocClassHint XALLOCCLASSHINT
+#define XAllocColor XALLOCCOLOR
+#define XAllocColorCells XALLOCCOLORCELLS
+#define XAllocIconSize XALLOCICONSIZE
+#define XAllocNamedColor XALLOCNAMEDCOLOR
+#define XAllocSizeHints XALLOCSIZEHINTS
+#define XAllocStandardColormap XALLOCSTANDARDCOLORMAP
+#define XAllocWMHints XALLOCWMHINTS
+#define XAllowEvents XALLOWEVENTS
+#define XAutoRepeatOff XAUTOREPEATOFF
+#define XAutoRepeatOn XAUTOREPEATON
+#define XBaseFontNameListOfFontSet XBASEFONTNAMELISTOFFONTSET
+#define XBell XBELL
+#define XBitmapPad XBITMAPPAD
+#define XBlackPixel XBLACKPIXEL
+#define XBlackPixelOfScreen XBLACKPIXELOFSCREEN
+#define XCellsOfScreen XCELLSOFSCREEN
+#define XChangeActivePointerGrab XCHANGEACTIVEPOINTERGRAB
+#define XChangeGC XCHANGEGC
+#define XChangeKeyboardControl XCHANGEKEYBOARDCONTROL
+#define XChangePointerControl XCHANGEPOINTERCONTROL
+#define XChangeProperty XCHANGEPROPERTY
+#define XChangeWindowAttributes XCHANGEWINDOWATTRIBUTES
+#define XCheckIfEvent XCHECKIFEVENT
+#define XCheckMaskEvent XCHECKMASKEVENT
+#define XCheckTypedEvent XCHECKTYPEDEVENT
+#define XCheckTypedWindowEvent XCHECKTYPEDWINDOWEVENT
+#define XCheckWindowEvent XCHECKWINDOWEVENT
+#define XClearArea XCLEARAREA
+#define XClearWindow XCLEARWINDOW
+#define XClipBox XCLIPBOX
+#define XCloseDisplay XCLOSEDISPLAY
+#define XCloseIM XCLOSEIM
+#define XConfigureWindow XCONFIGUREWINDOW
+#define XConvertSelection XCONVERTSELECTION
+#define XCopyArea XCOPYAREA
+#define XCopyColormapAndFree XCOPYCOLORMAPANDFREE
+#define XCopyGC XCOPYGC
+#define XCopyPlane XCOPYPLANE
+#define XCreateBitmapFromData XCREATEBITMAPFROMDATA
+#define XCreateColormap XCREATECOLORMAP
+#define XCreateFontCursor XCREATEFONTCURSOR
+#define XCreateFontSet XCREATEFONTSET
+#define XCreateGC XCREATEGC
+#define XCreateGlyphCursor XCREATEGLYPHCURSOR
+#define XCreateIC XCREATEIC
+#define XCreateImage XCREATEIMAGE
+#define XCreatePixmap XCREATEPIXMAP
+#define XCreatePixmapCursor XCREATEPIXMAPCURSOR
+#define XCreatePixmapFromBitmapData XCREATEPIXMAPFROMBITMAPDATA
+#define XCreateRegion XCREATEREGION
+#define XCreateSimpleWindow XCREATESIMPLEWINDOW
+#define XCreateWindow XCREATEWINDOW
+#define XDefaultColormap XDEFAULTCOLORMAP
+#define XDefaultColormapOfScreen XDEFAULTCOLORMAPOFSCREEN
+#define XDefaultDepth XDEFAULTDEPTH
+#define XDefaultDepthOfScreen XDEFAULTDEPTHOFSCREEN
+#define XDefaultGC XDEFAULTGC
+#define XDefaultRootWindow XDEFAULTROOTWINDOW
+#define XDefaultScreen XDEFAULTSCREEN
+#define XDefaultScreenOfDisplay XDEFAULTSCREENOFDISPLAY
+#define XDefaultVisual XDEFAULTVISUAL
+#define XDefaultVisualOfScreen XDEFAULTVISUALOFSCREEN
+#define XDefineCursor XDEFINECURSOR
+#define XDeleteContext XDELETECONTEXT
+#define XDeleteProperty XDELETEPROPERTY
+#define XDestroyIC XDESTROYIC
+#define XDestroyRegion XDESTROYREGION
+#define XDestroySubwindows XDESTROYSUBWINDOWS
+#define XDestroyWindow XDESTROYWINDOW
+#define XDisableAccessControl XDISABLEACCESSCONTROL
+#define XDisplayCells XDISPLAYCELLS
+#define XDisplayHeight XDISPLAYHEIGHT
+#define XDisplayKeycodes XDISPLAYKEYCODES
+#define XDisplayName XDISPLAYNAME
+#define XDisplayOfIM XDISPLAYOFIM
+#define XDisplayOfScreen XDISPLAYOFSCREEN
+#define XDisplayString XDISPLAYSTRING
+#define XDisplayWidth XDISPLAYWIDTH
+#define XDoesBackingStore XDOESBACKINGSTORE
+#define XDrawArc XDRAWARC
+#define XDrawArcs XDRAWARCS
+#define XDrawImageString XDRAWIMAGESTRING
+#define XDrawImageString16 XDRAWIMAGESTRING16
+#define XDrawLine XDRAWLINE
+#define XDrawLines XDRAWLINES
+#define XDrawPoint XDRAWPOINT
+#define XDrawPoints XDRAWPOINTS
+#define XDrawRectangle XDRAWRECTANGLE
+#define XDrawRectangles XDRAWRECTANGLES
+#define XDrawSegments XDRAWSEGMENTS
+#define XDrawString XDRAWSTRING
+#define XDrawString16 XDRAWSTRING16
+#define XDrawText XDRAWTEXT
+#define XDrawText16 XDRAWTEXT16
+#define XESetCloseDisplay XESETCLOSEDISPLAY
+#define XEmptyRegion XEMPTYREGION
+#define XEnableAccessControl XENABLEACCESSCONTROL
+#define XEqualRegion XEQUALREGION
+#define XEventsQueued XEVENTSQUEUED
+#define XExtendedMaxRequestSize XEXTENDEDMAXREQUESTSIZE
+#define XExtentsOfFontSet XEXTENTSOFFONTSET
+#define XFetchBuffer XFETCHBUFFER
+#define XFetchBytes XFETCHBYTES
+#define XFetchName XFETCHNAME
+#define XFillArc XFILLARC
+#define XFillArcs XFILLARCS
+#define XFillPolygon XFILLPOLYGON
+#define XFillRectangle XFILLRECTANGLE
+#define XFillRectangles XFILLRECTANGLES
+#define XFilterEvent XFILTEREVENT
+#define XFindContext XFINDCONTEXT
+#define XFlush XFLUSH
+#define XFontsOfFontSet XFONTSOFFONTSET
+#define XForceScreenSaver XFORCESCREENSAVER
+#define XFree XFREE
+#define XFreeColormap XFREECOLORMAP
+#define XFreeColors XFREECOLORS
+#define XFreeCursor XFREECURSOR
+#define XFreeDeviceList XFREEDEVICELIST
+#define XFreeDeviceState XFREEDEVICESTATE
+#define XFreeFont XFREEFONT
+#define XFreeFontInfo XFREEFONTINFO
+#define XFreeFontNames XFREEFONTNAMES
+#define XFreeFontSet XFREEFONTSET
+#define XFreeGC XFREEGC
+#define XFreeModifiermap XFREEMODIFIERMAP
+#define XFreePixmap XFREEPIXMAP
+#define XFreeStringList XFREESTRINGLIST
+#define XGContextFromGC XGCONTEXTFROMGC
+#define XGeometry XGEOMETRY
+#define XGetAtomName XGETATOMNAME
+#define XGetClassHint XGETCLASSHINT
+#define XGetCommand XGETCOMMAND
+#define XGetDefault XGETDEFAULT
+#define XGetErrorDatabaseText XGETERRORDATABASETEXT
+#define XGetErrorText XGETERRORTEXT
+#define XGetExtensionVersion XGETEXTENSIONVERSION
+#define XGetFontProperty XGETFONTPROPERTY
+#define XGetGCValues XGETGCVALUES
+#define XGetGeometry XGETGEOMETRY
+#define XGetICValues XGETICVALUES
+#define XGetIMValues XGETIMVALUES
+#define XGetIconName XGETICONNAME
+#define XGetIconSizes XGETICONSIZES
+#define XGetImage XGETIMAGE
+#define XGetInputFocus XGETINPUTFOCUS
+#define XGetKeyboardControl XGETKEYBOARDCONTROL
+#define XGetKeyboardMapping XGETKEYBOARDMAPPING
+#define XGetModifierMapping XGETMODIFIERMAPPING
+#define XGetMotionEvents XGETMOTIONEVENTS
+#define XGetNormalHints XGETNORMALHINTS
+#define XGetPointerControl XGETPOINTERCONTROL
+#define XGetPointerMapping XGETPOINTERMAPPING
+#define XGetRGBColormaps XGETRGBCOLORMAPS
+#define XGetScreenSaver XGETSCREENSAVER
+#define XGetSelectionOwner XGETSELECTIONOWNER
+#define XGetStandardColormap XGETSTANDARDCOLORMAP
+#define XGetSubImage XGETSUBIMAGE
+#define XGetTextProperty XGETTEXTPROPERTY
+#define XGetVisualInfo XGETVISUALINFO
+#define XGetWMColormapWindows XGETWMCOLORMAPWINDOWS
+#define XGetWMHints XGETWMHINTS
+#define XGetWMIconName XGETWMICONNAME
+#define XGetWMName XGETWMNAME
+#define XGetWMNormalHints XGETWMNORMALHINTS
+#define XGetWindowAttributes XGETWINDOWATTRIBUTES
+#define XGetWindowProperty XGETWINDOWPROPERTY
+#define XGrabButton XGRABBUTTON
+#define XGrabKeyboard XGRABKEYBOARD
+#define XGrabPointer XGRABPOINTER
+#define XGrabServer XGRABSERVER
+#define XHeightMMOfScreen XHEIGHTMMOFSCREEN
+#define XHeightOfScreen XHEIGHTOFSCREEN
+#define XIconifyWindow XICONIFYWINDOW
+#define XIfEvent XIFEVENT
+#define XInitExtension XINITEXTENSION
+#define XInitImage XINITIMAGE
+#define XInstallColormap XINSTALLCOLORMAP
+#define XInternAtom XINTERNATOM
+#define XInternAtoms XINTERNATOMS
+#define XIntersectRegion XINTERSECTREGION
+#define XKeycodeToKeysym XKEYCODETOKEYSYM
+#define XKeysymToKeycode XKEYSYMTOKEYCODE
+#define XKeysymToString XKEYSYMTOSTRING
+#define XKillClient XKILLCLIENT
+#define XListDepths XLISTDEPTHS
+#define XListFonts XLISTFONTS
+#define XListFontsWithInfo XLISTFONTSWITHINFO
+#define XListHosts XLISTHOSTS
+#define XListInputDevices XLISTINPUTDEVICES
+#define XListInstalledColormaps XLISTINSTALLEDCOLORMAPS
+#define XListPixmapFormats XLISTPIXMAPFORMATS
+#define XListProperties XLISTPROPERTIES
+#define XLoadFont XLOADFONT
+#define XLoadQueryFont XLOADQUERYFONT
+#define XLookupColor XLOOKUPCOLOR
+#define XLookupKeysym XLOOKUPKEYSYM
+#define XLookupString XLOOKUPSTRING
+#define XLowerWindow XLOWERWINDOW
+#define XMapRaised XMAPRAISED
+#define XMapSubwindows XMAPSUBWINDOWS
+#define XMapWindow XMAPWINDOW
+#define XMaskEvent XMASKEVENT
+#define XMatchVisualInfo XMATCHVISUALINFO
+#define XMaxRequestSize XMAXREQUESTSIZE
+#define XMissingExtension XMISSINGEXTENSION
+#define XMoveResizeWindow XMOVERESIZEWINDOW
+#define XMoveWindow XMOVEWINDOW
+#define XNextEvent XNEXTEVENT
+#define XNextRequest XNEXTREQUEST
+#define XNoOp XNOOP
+#define XOffsetRegion XOFFSETREGION
+#define XOpenDevice XOPENDEVICE
+#define XOpenDisplay XOPENDISPLAY
+#define XOpenIM XOPENIM
+#define XParseColor XPARSECOLOR
+#define XParseGeometry XPARSEGEOMETRY
+#define XPeekEvent XPEEKEVENT
+#define XPeekIfEvent XPEEKIFEVENT
+#define XPending XPENDING
+#define XPointInRegion XPOINTINREGION
+#define XPolygonRegion XPOLYGONREGION
+#define XPutBackEvent XPUTBACKEVENT
+#define XPutImage XPUTIMAGE
+#define XQLength XQLENGTH
+#define XQueryBestCursor XQUERYBESTCURSOR
+#define XQueryBestStipple XQUERYBESTSTIPPLE
+#define XQueryColor XQUERYCOLOR
+#define XQueryColors XQUERYCOLORS
+#define XQueryDeviceState XQUERYDEVICESTATE
+#define XQueryExtension XQUERYEXTENSION
+#define XQueryFont XQUERYFONT
+#define XQueryKeymap XQUERYKEYMAP
+#define XQueryPointer XQUERYPOINTER
+#define XQueryTree XQUERYTREE
+#define XRaiseWindow XRAISEWINDOW
+#define XReadBitmapFile XREADBITMAPFILE
+#define XRecolorCursor XRECOLORCURSOR
+#define XReconfigureWMWindow XRECONFIGUREWMWINDOW
+#define XRectInRegion XRECTINREGION
+#define XRefreshKeyboardMapping XREFRESHKEYBOARDMAPPING
+#define XRemoveHosts XREMOVEHOSTS
+#define XReparentWindow XREPARENTWINDOW
+#define XResetScreenSaver XRESETSCREENSAVER
+#define XResizeWindow XRESIZEWINDOW
+#define XResourceManagerString XRESOURCEMANAGERSTRING
+#define XRestackWindows XRESTACKWINDOWS
+#define XRotateBuffers XROTATEBUFFERS
+#define XRootWindow XROOTWINDOW
+#define XRootWindowOfScreen XROOTWINDOWOFSCREEN
+#define XSaveContext XSAVECONTEXT
+#define XScreenNumberOfScreen XSCREENNUMBEROFSCREEN
+#define XScreenOfDisplay XSCREENOFDISPLAY
+#define XSelectAsyncEvent XSELECTASYNCEVENT
+#define XSelectAsyncInput XSELECTASYNCINPUT
+#define XSelectExtensionEvent XSELECTEXTENSIONEVENT
+#define XSelectInput XSELECTINPUT
+#define XSendEvent XSENDEVENT
+#define XServerVendor XSERVERVENDOR
+#define XSetArcMode XSETARCMODE
+#define XSetBackground XSETBACKGROUND
+#define XSetClassHint XSETCLASSHINT
+#define XSetClipMask XSETCLIPMASK
+#define XSetClipOrigin XSETCLIPORIGIN
+#define XSetClipRectangles XSETCLIPRECTANGLES
+#define XSetCloseDownMode XSETCLOSEDOWNMODE
+#define XSetCommand XSETCOMMAND
+#define XSetDashes XSETDASHES
+#define XSetErrorHandler XSETERRORHANDLER
+#define XSetExtensionErrorHandler XSETEXTENSIONERRORHANDLER
+#define XSetFillRule XSETFILLRULE
+#define XSetFillStyle XSETFILLSTYLE
+#define XSetFont XSETFONT
+#define XSetForeground XSETFOREGROUND
+#define XSetFunction XSETFUNCTION
+#define XSetGraphicsExposures XSETGRAPHICSEXPOSURES
+#define XSetICFocus XSETICFOCUS
+#define XSetICValues XSETICVALUES
+#define XSetIOErrorHandler XSETIOERRORHANDLER
+#define XSetIconName XSETICONNAME
+#define XSetInputFocus XSETINPUTFOCUS
+#define XSetLineAttributes XSETLINEATTRIBUTES
+#define XSetLocaleModifiers XSETLOCALEMODIFIERS
+#define XSetNormalHints XSETNORMALHINTS
+#define XSetPlaneMask XSETPLANEMASK
+#define XSetRegion XSETREGION
+#define XSetRGBColormaps XSETRGBCOLORMAPS
+#define XSetScreenSaver XSETSCREENSAVER
+#define XSetSelectionOwner XSETSELECTIONOWNER
+#define XSetStandardProperties XSETSTANDARDPROPERTIES
+#define XSetState XSETSTATE
+#define XSetStipple XSETSTIPPLE
+#define XSetSubwindowMode XSETSUBWINDOWMODE
+#define XSetTSOrigin XSETTSORIGIN
+#define XSetTextProperty XSETTEXTPROPERTY
+#define XSetTile XSETTILE
+#define XSetTransientForHint XSETTRANSIENTFORHINT
+#define XSetWMClientMachine XSETWMCLIENTMACHINE
+#define XSetWMColormapWindows XSETWMCOLORMAPWINDOWS
+#define XSetWMHints XSETWMHINTS
+#define XSetWMIconName XSETWMICONNAME
+#define XSetWMName XSETWMNAME
+#define XSetWMNormalHints XSETWMNORMALHINTS
+#define XSetWMProperties XSETWMPROPERTIES
+#define XSetWMProtocols XSETWMPROTOCOLS
+#define XSetWMSizeHints XSETWMSIZEHINTS
+#define XSetWindowBackground XSETWINDOWBACKGROUND
+#define XSetWindowBackgroundPixmap XSETWINDOWBACKGROUNDPIXMAP
+#define XSetWindowBorder XSETWINDOWBORDER
+#define XSetWindowBorderPixmap XSETWINDOWBORDERPIXMAP
+#define XSetWindowBorderWidth XSETWINDOWBORDERWIDTH
+#define XSetWindowColormap XSETWINDOWCOLORMAP
+#define XShapeCombineMask XSHAPECOMBINEMASK
+#define XShapeCombineRectangles XSHAPECOMBINERECTANGLES
+#define XShapeGetRectangles XSHAPEGETRECTANGLES
+#define XShapeQueryExtension XSHAPEQUERYEXTENSION
+#define XShmAttach XSHMATTACH
+#define XShmCreateImage XSHMCREATEIMAGE
+#define XShmCreatePixmap XSHMCREATEPIXMAP
+#define XShmDetach XSHMDETACH
+#define XShmGetEventBase XSHMGETEVENTBASE
+#define XShmPutImage XSHMPUTIMAGE
+#define XShmQueryExtension XSHMQUERYEXTENSION
+#define XShmQueryVersion XSHMQUERYVERSION
+#define XShrinkRegion XSHRINKREGION
+#define XStoreBuffer XSTOREBUFFER
+#define XStoreBytes XSTOREBYTES
+#define XStoreColor XSTORECOLOR
+#define XStoreColors XSTORECOLORS
+#define XStoreName XSTORENAME
+#define XStringListToTextProperty XSTRINGLISTTOTEXTPROPERTY
+#define XStringToKeysym XSTRINGTOKEYSYM
+#define XSubtractRegion XSUBTRACTREGION
+#define XSupportsLocale XSUPPORTSLOCALE
+#define XSync XSYNC
+#define XSynchronize XSYNCHRONIZE
+#define XTextExtents XTEXTEXTENTS
+#define XTextExtents16 XTEXTEXTENTS16
+#define XTextPropertyToStringList XTEXTPROPERTYTOSTRINGLIST
+#define XTextWidth XTEXTWIDTH
+#define XTextWidth16 XTEXTWIDTH16
+#define XTranslateCoordinates XTRANSLATECOORDINATES
+#define XUndefineCursor XUNDEFINECURSOR
+#define XUngrabButton XUNGRABBUTTON
+#define XUngrabKeyboard XUNGRABKEYBOARD
+#define XUngrabPointer XUNGRABPOINTER
+#define XUngrabServer XUNGRABSERVER
+#define XUninstallColormap XUNINSTALLCOLORMAP
+#define XUnionRectWithRegion XUNIONRECTWITHREGION
+#define XUnionRegion XUNIONREGION
+#define XUniqueContext XUNIQUECONTEXT
+#define XUnloadFont XUNLOADFONT
+#define XUnmapWindow XUNMAPWINDOW
+#define XUnsetICFocus XUNSETICFOCUS
+#define XVaCreateNestedList XVACREATENESTEDLIST
+#define XVisualIDFromVisual XVISUALIDFROMVISUAL
+#define XWMGeometry XWMGEOMETRY
+#define XWarpPointer XWARPPOINTER
+#define XWhitePixel XWHITEPIXEL
+#define XWhitePixelOfScreen XWHITEPIXELOFSCREEN
+#define XWidthMMOfScreen XWIDTHMMOFSCREEN
+#define XWidthOfScreen XWIDTHOFSCREEN
+#define XWindowEvent XWINDOWEVENT
+#define XWithdrawWindow XWITHDRAWWINDOW
+#define XXorRegion XXORREGION
+#define XcmsQueryColor XCMSQUERYCOLOR
+#define XdbeAllocateBackBufferName XDBEALLOCATEBACKBUFFERNAME
+#define XdbeFreeVisualInfo XDBEFREEVISUALINFO
+#define XdbeGetVisualInfo XDBEGETVISUALINFO
+#define XdbeQueryExtension XDBEQUERYEXTENSION
+#define XdbeSwapBuffers XDBESWAPBUFFERS
+#define XextAddDisplay XEXTADDDISPLAY
+#define XextFindDisplay XEXTFINDDISPLAY
+#define XextRemoveDisplay XEXTREMOVEDISPLAY
+#define XkbSetDetectableAutoRepeat XKBSETDETECTABLEAUTOREPEAT
+#define XmActivateProtocol XMACTIVATEPROTOCOL
+#define XmAddProtocolCallback XMADDPROTOCOLCALLBACK
+#define XmAddProtocols XMADDPROTOCOLS
+#define XmChangeColor XMCHANGECOLOR
+#define XmClipboardCopy XMCLIPBOARDCOPY
+#define XmClipboardCopyByName XMCLIPBOARDCOPYBYNAME
+#define XmClipboardEndCopy XMCLIPBOARDENDCOPY
+#define XmClipboardEndRetrieve XMCLIPBOARDENDRETRIEVE
+#define XmClipboardInquireCount XMCLIPBOARDINQUIRECOUNT
+#define XmClipboardInquireFormat XMCLIPBOARDINQUIREFORMAT
+#define XmClipboardInquireLength XMCLIPBOARDINQUIRELENGTH
+#define XmClipboardLock XMCLIPBOARDLOCK
+#define XmClipboardRetrieve XMCLIPBOARDRETRIEVE
+#define XmClipboardStartCopy XMCLIPBOARDSTARTCOPY
+#define XmClipboardStartRetrieve XMCLIPBOARDSTARTRETRIEVE
+#define XmClipboardUnlock XMCLIPBOARDUNLOCK
+#define XmCommandError XMCOMMANDERROR
+#define XmCommandGetChild XMCOMMANDGETCHILD
+#define XmCommandSetValue XMCOMMANDSETVALUE
+#define XmCreateArrowButton XMCREATEARROWBUTTON
+#define XmCreateArrowButtonGadget XMCREATEARROWBUTTONGADGET
+#define XmCreateBulletinBoardDialog XMCREATEBULLETINBOARDDIALOG
+#define XmCreateCascadeButton XMCREATECASCADEBUTTON
+#define XmCreateCascadeButtonGadget XMCREATECASCADEBUTTONGADGET
+#define XmCreateDialogShell XMCREATEDIALOGSHELL
+#define XmCreateDragIcon XMCREATEDRAGICON
+#define XmCreateDrawingArea XMCREATEDRAWINGAREA
+#define XmCreateDrawnButton XMCREATEDRAWNBUTTON
+#define XmCreateErrorDialog XMCREATEERRORDIALOG
+#define XmCreateFileSelectionBox XMCREATEFILESELECTIONBOX
+#define XmCreateFileSelectionDialog XMCREATEFILESELECTIONDIALOG
+#define XmCreateForm XMCREATEFORM
+#define XmCreateFormDialog XMCREATEFORMDIALOG
+#define XmCreateFrame XMCREATEFRAME
+#define XmCreateInformationDialog XMCREATEINFORMATIONDIALOG
+#define XmCreateLabel XMCREATELABEL
+#define XmCreateLabelGadget XMCREATELABELGADGET
+#define XmCreateList XMCREATELIST
+#define XmCreateMainWindow XMCREATEMAINWINDOW
+#define XmCreateMenuBar XMCREATEMENUBAR
+#define XmCreateMessageBox XMCREATEMESSAGEBOX
+#define XmCreateMessageDialog XMCREATEMESSAGEDIALOG
+#define XmCreateOptionMenu XMCREATEOPTIONMENU
+#define XmCreatePanedWindow XMCREATEPANEDWINDOW
+#define XmCreatePopupMenu XMCREATEPOPUPMENU
+#define XmCreatePromptDialog XMCREATEPROMPTDIALOG
+#define XmCreatePulldownMenu XMCREATEPULLDOWNMENU
+#define XmCreatePushButton XMCREATEPUSHBUTTON
+#define XmCreatePushButtonGadget XMCREATEPUSHBUTTONGADGET
+#define XmCreateQuestionDialog XMCREATEQUESTIONDIALOG
+#define XmCreateRadioBox XMCREATERADIOBOX
+#define XmCreateRowColumn XMCREATEROWCOLUMN
+#define XmCreateScale XMCREATESCALE
+#define XmCreateScrollBar XMCREATESCROLLBAR
+#define XmCreateScrolledList XMCREATESCROLLEDLIST
+#define XmCreateScrolledText XMCREATESCROLLEDTEXT
+#define XmCreateScrolledWindow XMCREATESCROLLEDWINDOW
+#define XmCreateSelectionDialog XMCREATESELECTIONDIALOG
+#define XmCreateSeparator XMCREATESEPARATOR
+#define XmCreateSeparatorGadget XMCREATESEPARATORGADGET
+#define XmCreateSimpleMenuBar XMCREATESIMPLEMENUBAR
+#define XmCreateTemplateDialog XMCREATETEMPLATEDIALOG
+#define XmCreateText XMCREATETEXT
+#define XmCreateTextField XMCREATETEXTFIELD
+#define XmCreateToggleButton XMCREATETOGGLEBUTTON
+#define XmCreateToggleButtonGadget XMCREATETOGGLEBUTTONGADGET
+#define XmCreateWarningDialog XMCREATEWARNINGDIALOG
+#define XmCvtCTToXmString XMCVTCTTOXMSTRING
+#define XmDestroyPixmap XMDESTROYPIXMAP
+#define XmDragStart XMDRAGSTART
+#define XmDropSiteRegister XMDROPSITEREGISTER
+#define XmDropSiteUnregister XMDROPSITEUNREGISTER
+#define XmDropSiteUpdate XMDROPSITEUPDATE
+#define XmDropTransferStart XMDROPTRANSFERSTART
+#define XmFileSelectionBoxGetChild XMFILESELECTIONBOXGETCHILD
+#define XmFileSelectionDoSearch XMFILESELECTIONDOSEARCH
+#define XmFontListAppendEntry XMFONTLISTAPPENDENTRY
+#define XmFontListCopy XMFONTLISTCOPY
+#define XmFontListCreate XMFONTLISTCREATE
+#define XmFontListEntryCreate XMFONTLISTENTRYCREATE
+#define XmFontListEntryFree XMFONTLISTENTRYFREE
+#define XmFontListEntryGetFont XMFONTLISTENTRYGETFONT
+#define XmFontListEntryGetTag XMFONTLISTENTRYGETTAG
+#define XmFontListEntryLoad XMFONTLISTENTRYLOAD
+#define XmFontListFree XMFONTLISTFREE
+#define XmFontListFreeFontContext XMFONTLISTFREEFONTCONTEXT
+#define XmFontListGetNextFont XMFONTLISTGETNEXTFONT
+#define XmFontListInitFontContext XMFONTLISTINITFONTCONTEXT
+#define XmFontListNextEntry XMFONTLISTNEXTENTRY
+#define XmGetColors XMGETCOLORS
+#define XmGetColorCalculation XMGETCOLORCALCULATION
+#define XmGetFocusWidget XMGETFOCUSWIDGET
+#define XmGetMenuCursor XMGETMENUCURSOR
+#define XmGetPixmap XMGETPIXMAP
+#define XmGetPixmapByDepth XMGETPIXMAPBYDEPTH
+#define XmGetTearOffControl XMGETTEAROFFCONTROL
+#define XmGetXmDisplay XMGETXMDISPLAY
+#define XmImMbLookupString XMIMMBLOOKUPSTRING
+#define XmImRegister XMIMREGISTER
+#define XmImSetFocusValues XMIMSETFOCUSVALUES
+#define XmImSetValues XMIMSETVALUES
+#define XmImUnregister XMIMUNREGISTER
+#define XmImUnsetFocus XMIMUNSETFOCUS
+#define XmInstallImage XMINSTALLIMAGE
+#define XmInternAtom XMINTERNATOM
+#define XmIsMotifWMRunning XMISMOTIFWMRUNNING
+#define XmListAddItem XMLISTADDITEM
+#define XmListAddItemUnselected XMLISTADDITEMUNSELECTED
+#define XmListAddItems XMLISTADDITEMS
+#define XmListAddItemsUnselected XMLISTADDITEMSUNSELECTED
+#define XmListDeleteAllItems XMLISTDELETEALLITEMS
+#define XmListDeleteItem XMLISTDELETEITEM
+#define XmListDeleteItemsPos XMLISTDELETEITEMSPOS
+#define XmListDeletePos XMLISTDELETEPOS
+#define XmListDeselectAllItems XMLISTDESELECTALLITEMS
+#define XmListDeselectPos XMLISTDESELECTPOS
+#define XmListGetKbdItemPos XMLISTGETKBDITEMPOS
+#define XmListGetMatchPos XMLISTGETMATCHPOS
+#define XmListGetSelectedPos XMLISTGETSELECTEDPOS
+#define XmListItemExists XMLISTITEMEXISTS
+#define XmListItemPos XMLISTITEMPOS
+#define XmListPosSelected XMLISTPOSSELECTED
+#define XmListReplaceItems XMLISTREPLACEITEMS
+#define XmListReplaceItemsPos XMLISTREPLACEITEMSPOS
+#define XmListSelectItem XMLISTSELECTITEM
+#define XmListSelectPos XMLISTSELECTPOS
+#define XmListSetBottomPos XMLISTSETBOTTOMPOS
+#define XmListSetItem XMLISTSETITEM
+#define XmListSetKbdItemPos XMLISTSETKBDITEMPOS
+#define XmListSetPos XMLISTSETPOS
+#define XmMainWindowSetAreas XMMAINWINDOWSETAREAS
+#define XmMenuPosition XMMENUPOSITION
+#define XmMessageBoxGetChild XMMESSAGEBOXGETCHILD
+#define XmOptionButtonGadget XMOPTIONBUTTONGADGET
+#define XmOptionLabelGadget XMOPTIONLABELGADGET
+#define XmProcessTraversal XMPROCESSTRAVERSAL
+#define XmQmotif XMQMOTIF
+#define XmRemoveProtocolCallback XMREMOVEPROTOCOLCALLBACK
+#define XmRemoveProtocols XMREMOVEPROTOCOLS
+#define XmRemoveTabGroup XMREMOVETABGROUP
+#define XmRepTypeGetId XMREPTYPEGETID
+#define XmRepTypeGetRecord XMREPTYPEGETRECORD
+#define XmRepTypeInstallTearOffModelCon XMREPTYPEINSTALLTEAROFFMODELCON
+#define XmRepTypeRegister XMREPTYPEREGISTER
+#define XmRepTypeValidValue XMREPTYPEVALIDVALUE
+#define XmScrollBarGetValues XMSCROLLBARGETVALUES
+#define XmScrollBarSetValues XMSCROLLBARSETVALUES
+#define XmScrolledWindowSetAreas XMSCROLLEDWINDOWSETAREAS
+#define XmSelectionBoxGetChild XMSELECTIONBOXGETCHILD
+#define XmSetColorCalculation XMSETCOLORCALCULATION
+#define XmStringByteCompare XMSTRINGBYTECOMPARE
+#define XmStringCompare XMSTRINGCOMPARE
+#define XmStringConcat XMSTRINGCONCAT
+#define XmStringCopy XMSTRINGCOPY
+#define XmStringCreate XMSTRINGCREATE
+#define XmStringCreateLocalized XMSTRINGCREATELOCALIZED
+#define XmStringCreateLtoR XMSTRINGCREATELTOR
+#define XmStringCreateSimple XMSTRINGCREATESIMPLE
+#define XmStringDraw XMSTRINGDRAW
+#define XmStringDrawUnderline XMSTRINGDRAWUNDERLINE
+#define XmStringExtent XMSTRINGEXTENT
+#define XmStringFree XMSTRINGFREE
+#define XmStringFreeContext XMSTRINGFREECONTEXT
+#define XmStringGetLtoR XMSTRINGGETLTOR
+#define XmStringGetNextComponent XMSTRINGGETNEXTCOMPONENT
+#define XmStringGetNextSegment XMSTRINGGETNEXTSEGMENT
+#define XmStringInitContext XMSTRINGINITCONTEXT
+#define XmStringLength XMSTRINGLENGTH
+#define XmStringLtoRCreate XMSTRINGLTORCREATE
+#define XmStringNConcat XMSTRINGNCONCAT
+#define XmStringSegmentCreate XMSTRINGSEGMENTCREATE
+#define XmStringSeparatorCreate XMSTRINGSEPARATORCREATE
+#define XmStringWidth XMSTRINGWIDTH
+#define XmTextClearSelection XMTEXTCLEARSELECTION
+#define XmTextCopy XMTEXTCOPY
+#define XmTextCut XMTEXTCUT
+#define XmTextFieldClearSelection XMTEXTFIELDCLEARSELECTION
+#define XmTextFieldCopy XMTEXTFIELDCOPY
+#define XmTextFieldCut XMTEXTFIELDCUT
+#define XmTextFieldGetEditable XMTEXTFIELDGETEDITABLE
+#define XmTextFieldGetInsertionPosition XMTEXTFIELDGETINSERTIONPOSITION
+#define XmTextFieldGetLastPosition XMTEXTFIELDGETLASTPOSITION
+#define XmTextFieldGetMaxLength XMTEXTFIELDGETMAXLENGTH
+#define XmTextFieldGetSelection XMTEXTFIELDGETSELECTION
+#define XmTextFieldGetSelectionPosition XMTEXTFIELDGETSELECTIONPOSITION
+#define XmTextFieldGetString XMTEXTFIELDGETSTRING
+#define XmTextFieldInsert XMTEXTFIELDINSERT
+#define XmTextFieldPaste XMTEXTFIELDPASTE
+#define XmTextFieldRemove XMTEXTFIELDREMOVE
+#define XmTextFieldReplace XMTEXTFIELDREPLACE
+#define XmTextFieldSetAddMode XMTEXTFIELDSETADDMODE
+#define XmTextFieldSetHighlight XMTEXTFIELDSETHIGHLIGHT
+#define XmTextFieldSetInsertionPosition XMTEXTFIELDSETINSERTIONPOSITION
+#define XmTextFieldSetMaxLength XMTEXTFIELDSETMAXLENGTH
+#define XmTextFieldSetSelection XMTEXTFIELDSETSELECTION
+#define XmTextFieldSetString XMTEXTFIELDSETSTRING
+#define XmTextFieldShowPosition XMTEXTFIELDSHOWPOSITION
+#define XmTextGetCursorPosition XMTEXTGETCURSORPOSITION
+#define XmTextGetEditable XMTEXTGETEDITABLE
+#define XmTextGetInsertionPosition XMTEXTGETINSERTIONPOSITION
+#define XmTextGetLastPosition XMTEXTGETLASTPOSITION
+#define XmTextGetMaxLength XMTEXTGETMAXLENGTH
+#define XmTextGetSelection XMTEXTGETSELECTION
+#define XmTextGetSelectionPosition XMTEXTGETSELECTIONPOSITION
+#define XmTextGetString XMTEXTGETSTRING
+#define XmTextInsert XMTEXTINSERT
+#define XmTextPaste XMTEXTPASTE
+#define XmTextPosToXY XMTEXTPOSTOXY
+#define XmTextRemove XMTEXTREMOVE
+#define XmTextReplace XMTEXTREPLACE
+#define XmTextSetCursorPosition XMTEXTSETCURSORPOSITION
+#define XmTextSetEditable XMTEXTSETEDITABLE
+#define XmTextSetHighlight XMTEXTSETHIGHLIGHT
+#define XmTextSetInsertionPosition XMTEXTSETINSERTIONPOSITION
+#define XmTextSetSelection XMTEXTSETSELECTION
+#define XmTextSetString XMTEXTSETSTRING
+#define XmTextSetTopCharacter XMTEXTSETTOPCHARACTER
+#define XmTextShowPosition XMTEXTSHOWPOSITION
+#define XmToggleButtonGadgetGetState XMTOGGLEBUTTONGADGETGETSTATE
+#define XmToggleButtonGadgetSetState XMTOGGLEBUTTONGADGETSETSTATE
+#define XmToggleButtonGetState XMTOGGLEBUTTONGETSTATE
+#define XmToggleButtonSetState XMTOGGLEBUTTONSETSTATE
+#define XmUninstallImage XMUNINSTALLIMAGE
+#define XmUpdateDisplay XMUPDATEDISPLAY
+#define XmVaCreateSimpleRadioBox XMVACREATESIMPLERADIOBOX
+#define XmbDrawString XMBDRAWSTRING
+#define XmbLookupString XMBLOOKUPSTRING
+#define XmbResetIC XMBRESETIC
+#define XmbSetWMProperties XMBSETWMPROPERTIES
+#define XmbTextEscapement XMBTEXTESCAPEMENT
+#define XmbTextExtents XMBTEXTEXTENTS
+#define XmbTextListToTextProperty XMBTEXTLISTTOTEXTPROPERTY
+#define XmbTextPropertyToTextList XMBTEXTPROPERTYTOTEXTLIST
+#define XmbufCreateBuffers XMBUFCREATEBUFFERS
+#define XmbufDestroyBuffers XMBUFDESTROYBUFFERS
+#define XmbufDisplayBuffers XMBUFDISPLAYBUFFERS
+#define XmbufQueryExtension XMBUFQUERYEXTENSION
+#define Xmemory_free XMEMORY_FREE
+#define Xmemory_malloc XMEMORY_MALLOC
+#define XmuClientWindow XMUCLIENTWINDOW
+#define XmuConvertStandardSelection XMUCONVERTSTANDARDSELECTION
+#define XmuCvtStringToBitmap XMUCVTSTRINGTOBITMAP
+#define XmuInternAtom XMUINTERNATOM
+#define XmuInternStrings XMUINTERNSTRINGS
+#define XmuLookupStandardColormap XMULOOKUPSTANDARDCOLORMAP
+#define XmuPrintDefaultErrorMessage XMUPRINTDEFAULTERRORMESSAGE
+#define XrmCombineDatabase XRMCOMBINEDATABASE
+#define XrmCombineFileDatabase XRMCOMBINEFILEDATABASE
+#define XrmDestroyDatabase XRMDESTROYDATABASE
+#define XrmGetDatabase XRMGETDATABASE
+#define XrmGetFileDatabase XRMGETFILEDATABASE
+#define XrmGetResource XRMGETRESOURCE
+#define XrmGetStringDatabase XRMGETSTRINGDATABASE
+#define XrmInitialize XRMINITIALIZE
+#define XrmMergeDatabases XRMMERGEDATABASES
+#define XrmParseCommand XRMPARSECOMMAND
+#define XrmPermStringToQuark XRMPERMSTRINGTOQUARK
+#define XrmPutFileDatabase XRMPUTFILEDATABASE
+#define XrmPutLineResource XRMPUTLINERESOURCE
+#define XrmPutStringResource XRMPUTSTRINGRESOURCE
+#define XrmQGetResource XRMQGETRESOURCE
+#define XrmQPutStringResource XRMQPUTSTRINGRESOURCE
+#define XrmQuarkToString XRMQUARKTOSTRING
+#define XrmSetDatabase XRMSETDATABASE
+#define XrmStringToBindingQuarkList XRMSTRINGTOBINDINGQUARKLIST
+#define XrmStringToQuark XRMSTRINGTOQUARK
+#define XtAddCallback XTADDCALLBACK
+#define XtAddCallbacks XTADDCALLBACKS
+#define XtAddConverter XTADDCONVERTER
+#define XtAddEventHandler XTADDEVENTHANDLER
+#define XtAddExposureToRegion XTADDEXPOSURETOREGION
+#define XtAddGrab XTADDGRAB
+#define XtAddRawEventHandler XTADDRAWEVENTHANDLER
+#define XtAllocateGC XTALLOCATEGC
+#define XtAppAddActions XTAPPADDACTIONS
+#define XtAppAddInput XTAPPADDINPUT
+#define XtAppAddTimeOut XTAPPADDTIMEOUT
+#define XtAppAddWorkProc XTAPPADDWORKPROC
+#define XtAppCreateShell XTAPPCREATESHELL
+#define XtAppError XTAPPERROR
+#define XtAppErrorMsg XTAPPERRORMSG
+#define XtAppGetErrorDatabase XTAPPGETERRORDATABASE
+#define XtAppGetErrorDatabaseText XTAPPGETERRORDATABASETEXT
+#define XtAppSetErrorMsgHandler XTAPPSETERRORMSGHANDLER
+#define XtAppInitialize XTAPPINITIALIZE
+#define XtAppMainLoop XTAPPMAINLOOP
+#define XtAppNextEvent XTAPPNEXTEVENT
+#define XtAppPeekEvent XTAPPPEEKEVENT
+#define XtAppPending XTAPPPENDING
+#define XtAppProcessEvent XTAPPPROCESSEVENT
+#define XtAppSetErrorHandler XTAPPSETERRORHANDLER
+#define XtAppSetFallbackResources XTAPPSETFALLBACKRESOURCES
+#define XtAppSetTypeConverter XTAPPSETTYPECONVERTER
+#define XtAppSetWarningHandler XTAPPSETWARNINGHANDLER
+#define XtAppWarningMsg XTAPPWARNINGMSG
+#define XtAppSetWarningMsgHandler XTAPPSETWARNINGMSGHANDLER
+#define XtAppWarning XTAPPWARNING
+#define XtAugmentTranslations XTAUGMENTTRANSLATIONS
+#define XtCallActionProc XTCALLACTIONPROC
+#define XtCallCallbackList XTCALLCALLBACKLIST
+#define XtCallCallbacks XTCALLCALLBACKS
+#define XtCallConverter XTCALLCONVERTER
+#define XtCalloc XTCALLOC
+#ifndef NOXTDISPLAY
+#define XtClass XTCLASS
+#endif
+#define XtCloseDisplay XTCLOSEDISPLAY
+#define XtConfigureWidget XTCONFIGUREWIDGET
+#define XtConvert XTCONVERT
+#define XtConvertAndStore XTCONVERTANDSTORE
+#define XtCreateApplicationContext XTCREATEAPPLICATIONCONTEXT
+#define XtCreateManagedWidget XTCREATEMANAGEDWIDGET
+#define XtCreatePopupShell XTCREATEPOPUPSHELL
+#define XtCreateWidget XTCREATEWIDGET
+#define XtCreateWindow XTCREATEWINDOW
+#define XtCvtStringToFont XTCVTSTRINGTOFONT
+#define XtDatabase XTDATABASE
+#define XtDestroyApplicationContext XTDESTROYAPPLICATIONCONTEXT
+#define XtDestroyWidget XTDESTROYWIDGET
+#define XtDisownSelection XTDISOWNSELECTION
+#define XtDispatchEvent XTDISPATCHEVENT
+#ifndef NOXTDISPLAY
+#define XtDisplay XTDISPLAY
+#endif
+#define XtDisplayInitialize XTDISPLAYINITIALIZE
+#define XtDisplayOfObject XTDISPLAYOFOBJECT
+#define XtDisplayStringConvWarning XTDISPLAYSTRINGCONVWARNING
+#define XtDisplayToApplicationContext XTDISPLAYTOAPPLICATIONCONTEXT
+#define XtError XTERROR
+#define XtErrorMsg XTERRORMSG
+#define XtFree XTFREE
+#define XtGetActionKeysym XTGETACTIONKEYSYM
+#define XtGetActionList XTGETACTIONLIST
+#define XtGetApplicationNameAndClass XTGETAPPLICATIONNAMEANDCLASS
+#define XtGetApplicationResources XTGETAPPLICATIONRESOURCES
+#define XtGetClassExtension XTGETCLASSEXTENSION
+#define XtGetConstraintResourceList XTGETCONSTRAINTRESOURCELIST
+#define XtGetGC XTGETGC
+#define XtGetMultiClickTime XTGETMULTICLICKTIME
+#define XtGetResourceList XTGETRESOURCELIST
+#define XtGetSelectionValue XTGETSELECTIONVALUE
+#define XtGetSelectionValues XTGETSELECTIONVALUES
+#define XtGetSubresources XTGETSUBRESOURCES
+#define XtGetValues XTGETVALUES
+#define XtGrabButton XTGRABBUTTON
+#define XtGrabKeyboard XTGRABKEYBOARD
+#define XtGrabPointer XTGRABPOINTER
+#define XtHasCallbacks XTHASCALLBACKS
+#define XtInitialize XTINITIALIZE
+#define XtInitializeWidgetClass XTINITIALIZEWIDGETCLASS
+#define XtInsertEventHandler XTINSERTEVENTHANDLER
+#define XtInsertRawEventHandler XTINSERTRAWEVENTHANDLER
+#define XtInstallAccelerators XTINSTALLACCELERATORS
+#define XtIsManaged XTISMANAGED
+#define XtIsObject XTISOBJECT
+#ifndef NOXTDISPLAY
+#define XtIsRealized XTISREALIZED
+#endif
+#define XtIsSensitive XTISSENSITIVE
+#define XtIsSubclass XTISSUBCLASS
+#define XtLastTimestampProcessed XTLASTTIMESTAMPPROCESSED
+#define XtMainLoop XTMAINLOOP
+#define XtMakeGeometryRequest XTMAKEGEOMETRYREQUEST
+#define XtMakeResizeRequest XTMAKERESIZEREQUEST
+#define XtMalloc XTMALLOC
+#define XtManageChild XTMANAGECHILD
+#define XtManageChildren XTMANAGECHILDREN
+#define XtMergeArgLists XTMERGEARGLISTS
+#define XtMoveWidget XTMOVEWIDGET
+#define XtName XTNAME
+#define XtNameToWidget XTNAMETOWIDGET
+#define XtOpenApplication XTOPENAPPLICATION
+#define XtOpenDisplay XTOPENDISPLAY
+#define XtOverrideTranslations XTOVERRIDETRANSLATIONS
+#define XtOwnSelection XTOWNSELECTION
+#ifndef NOXTDISPLAY
+#define XtParent XTPARENT
+#endif
+#define XtParseAcceleratorTable XTPARSEACCELERATORTABLE
+#define XtParseTranslationTable XTPARSETRANSLATIONTABLE
+#define XtPopdown XTPOPDOWN
+#define XtPopup XTPOPUP
+#define XtPopupSpringLoaded XTPOPUPSPRINGLOADED
+#define XtQueryGeometry XTQUERYGEOMETRY
+#define XtRealizeWidget XTREALIZEWIDGET
+#define XtRealloc XTREALLOC
+#define XtRegisterDrawable _XTREGISTERWINDOW
+#define XtRegisterGrabAction XTREGISTERGRABACTION
+#define XtReleaseGC XTRELEASEGC
+#define XtRemoveAllCallbacks XTREMOVEALLCALLBACKS
+#define XtRemoveCallback XTREMOVECALLBACK
+#define XtRemoveEventHandler XTREMOVEEVENTHANDLER
+#define XtRemoveGrab XTREMOVEGRAB
+#define XtRemoveInput XTREMOVEINPUT
+#define XtRemoveTimeOut XTREMOVETIMEOUT
+#define XtRemoveWorkProc XTREMOVEWORKPROC
+#define XtResizeWidget XTRESIZEWIDGET
+#define XtResolvePathname XTRESOLVEPATHNAME
+#ifndef NOXTDISPLAY
+#define XtScreen XTSCREEN
+#endif
+#define XtScreenDatabase XTSCREENDATABASE
+#define XtScreenOfObject XTSCREENOFOBJECT
+#define XtSessionReturnToken XTSESSIONRETURNTOKEN
+#define XtSetErrorHandler XTSETERRORHANDLER
+#define XtSetKeyboardFocus XTSETKEYBOARDFOCUS
+#define XtSetLanguageProc XTSETLANGUAGEPROC
+#define XtSetMappedWhenManaged XTSETMAPPEDWHENMANAGED
+#define XtSetSensitive XTSETSENSITIVE
+#define XtSetTypeConverter XTSETTYPECONVERTER
+#define XtSetValues XTSETVALUES
+#define XtShellStrings XTSHELLSTRINGS
+#define XtStringConversionWarning XTSTRINGCONVERSIONWARNING
+#define XtStrings XTSTRINGS
+#define XtToolkitInitialize XTTOOLKITINITIALIZE
+#define XtTranslateCoords XTTRANSLATECOORDS
+#define XtTranslateKeycode XTTRANSLATEKEYCODE
+#define XtUngrabButton XTUNGRABBUTTON
+#define XtUngrabKeyboard XTUNGRABKEYBOARD
+#define XtUngrabPointer XTUNGRABPOINTER
+#define XtUnmanageChild XTUNMANAGECHILD
+#define XtUnmanageChildren XTUNMANAGECHILDREN
+#define XtUnrealizeWidget XTUNREALIZEWIDGET
+#define XtUnregisterDrawable _XTUNREGISTERWINDOW
+#define XtVaAppCreateShell XTVAAPPCREATESHELL
+#define XtVaCreateManagedWidget XTVACREATEMANAGEDWIDGET
+#define XtVaCreatePopupShell XTVACREATEPOPUPSHELL
+#define XtVaCreateWidget XTVACREATEWIDGET
+#define XtVaGetApplicationResources XTVAGETAPPLICATIONRESOURCES
+#define XtVaGetValues XTVAGETVALUES
+#define XtVaSetValues XTVASETVALUES
+#define XtWarning XTWARNING
+#define XtWarningMsg XTWARNINGMSG
+#define XtWidgetToApplicationContext XTWIDGETTOAPPLICATIONCONTEXT
+#ifndef NOXTDISPLAY
+#define XtWindow XTWINDOW
+#endif
+#define XtWindowOfObject XTWINDOWOFOBJECT
+#define XtWindowToWidget XTWINDOWTOWIDGET
+#define XwcDrawImageString XWCDRAWIMAGESTRING
+#define XwcDrawString XWCDRAWSTRING
+#define XwcFreeStringList XWCFREESTRINGLIST
+#define XwcTextEscapement XWCTEXTESCAPEMENT
+#define XwcTextExtents XWCTEXTEXTENTS
+#define XwcTextListToTextProperty XWCTEXTLISTTOTEXTPROPERTY
+#define XwcLookupString XWCLOOKUPSTRING
+#define XwcTextPropertyToTextList XWCTEXTPROPERTYTOTEXTLIST
+#define _XAllocTemp _XALLOCTEMP
+#define _XDeqAsyncHandler _XDEQASYNCHANDLER
+#define _XEatData _XEATDATA
+#define _XFlush _XFLUSH
+#define _XFreeTemp _XFREETEMP
+#define _XGetAsyncReply _XGETASYNCREPLY
+#define _XInitImageFuncPtrs _XINITIMAGEFUNCPTRS
+#define _XRead _XREAD
+#define _XReadPad _XREADPAD
+#define _XRegisterFilterByType _XREGISTERFILTERBYTYPE
+#define _XReply _XREPLY
+#define _XSend _XSEND
+#define _XUnregisterFilter _XUNREGISTERFILTER
+#define _XVIDtoVisual _XVIDTOVISUAL
+#define _XmBottomShadowColorDefault _XMBOTTOMSHADOWCOLORDEFAULT
+#define _XmClearBorder _XMCLEARBORDER
+#define _XmConfigureObject _XMCONFIGUREOBJECT
+#define _XmDestroyParentCallback _XMDESTROYPARENTCALLBACK
+#define _XmDrawArrow _XMDRAWARROW
+#define _XmDrawShadows _XMDRAWSHADOWS
+#define _XmFontListGetDefaultFont _XMFONTLISTGETDEFAULTFONT
+#define _XmFromHorizontalPixels _XMFROMHORIZONTALPIXELS
+#define _XmFromVerticalPixels _XMFROMVERTICALPIXELS
+#define _XmGetClassExtensionPtr _XMGETCLASSEXTENSIONPTR
+#define _XmGetDefaultFontList _XMGETDEFAULTFONTLIST
+#define _XmGetTextualDragIcon _XMGETTEXTUALDRAGICON
+#define _XmGetWidgetExtData _XMGETWIDGETEXTDATA
+#define _XmGrabKeyboard _XMGRABKEYBOARD
+#define _XmGrabPointer _XMGRABPOINTER
+#define _XmInheritClass _XMINHERITCLASS
+#define _XmInputForGadget _XMINPUTFORGADGET
+#define _XmInputInGadget _XMINPUTINGADGET
+#define _XmMakeGeometryRequest _XMMAKEGEOMETRYREQUEST
+#define _XmMenuPopDown _XMMENUPOPDOWN
+#define _XmMoveObject _XMMOVEOBJECT
+#define _XmNavigChangeManaged _XMNAVIGCHANGEMANAGED
+#define _XmOSBuildFileList _XMOSBUILDFILELIST
+#define _XmOSFileCompare _XMOSFILECOMPARE
+#define _XmOSFindPatternPart _XMOSFINDPATTERNPART
+#define _XmOSQualifyFileSpec _XMOSQUALIFYFILESPEC
+#define _XmPostPopupMenu _XMPOSTPOPUPMENU
+#define _XmPrimitiveEnter _XMPRIMITIVEENTER
+#define _XmPrimitiveLeave _XMPRIMITIVELEAVE
+#define _XmRedisplayGadgets _XMREDISPLAYGADGETS
+#define _XmShellIsExclusive _XMSHELLISEXCLUSIVE
+#define _XmStringDraw _XMSTRINGDRAW
+#define _XmStringGetTextConcat _XMSTRINGGETTEXTCONCAT
+#define _XmStrings _XMSTRINGS
+#define _XmToHorizontalPixels _XMTOHORIZONTALPIXELS
+#define _XmToVerticalPixels _XMTOVERTICALPIXELS
+#define _XmTopShadowColorDefault _XMTOPSHADOWCOLORDEFAULT
+#define _Xm_fastPtr _XM_FASTPTR
+#define _XtCheckSubclassFlag _XTCHECKSUBCLASSFLAG
+#define _XtCopyFromArg _XTCOPYFROMARG
+#define _XtCountVaList _XTCOUNTVALIST
+#define _XtInherit _XTINHERIT
+#define _XtInheritTranslations _XTINHERITTRANSLATIONS
+#define _XtIsSubclassOf _XTISSUBCLASSOF
+#define _XtVaToArgList _XTVATOARGLIST
+#define applicationShellWidgetClass APPLICATIONSHELLWIDGETCLASS
+#define cli$dcl_parse CLI$DCL_PARSE
+#define cli$get_value CLI$GET_VALUE
+#define cli$present  CLI$PRESENT
+#define compositeClassRec COMPOSITECLASSREC
+#define compositeWidgetClass COMPOSITEWIDGETCLASS
+#define constraintClassRec CONSTRAINTCLASSREC
+#define constraintWidgetClass CONSTRAINTWIDGETCLASS
+#define coreWidgetClass COREWIDGETCLASS
+#define exe$getspi EXE$GETSPI
+#define lbr$close LBR$CLOSE
+#define lbr$get_header LBR$GET_HEADER
+#define lbr$get_index LBR$GET_INDEX
+#define lbr$get_record LBR$GET_RECORD
+#define lbr$ini_control LBR$INI_CONTROL
+#define lbr$lookup_key LBR$LOOKUP_KEY
+#define lbr$open LBR$OPEN
+#define lbr$output_help LBR$OUTPUT_HELP
+#define lib$add_times LIB$ADD_TIMES
+#define lib$addx LIB$ADDX
+#define lib$create_dir LIB$CREATE_DIR
+#define lib$create_vm_zone LIB$CREATE_VM_ZONE
+#define lib$cvt_from_internal_time LIB$CVT_FROM_INTERNAL_TIME
+#define lib$cvt_htb LIB$CVT_HTB
+#define lib$cvt_vectim LIB$CVT_VECTIM
+#define lib$day LIB$DAY
+#define lib$day_of_week LIB$DAY_OF_WEEK
+#define lib$delete_symbol LIB$DELETE_SYMBOL
+#define lib$delete_vm_zone LIB$DELETE_VM_ZONE
+#define lib$disable_ctrl LIB$DISABLE_CTRL
+#define lib$ediv LIB$EDIV
+#define lib$emul LIB$EMUL
+#define lib$enable_ctrl LIB$ENABLE_CTRL
+#define lib$find_vm_zone LIB$FIND_VM_ZONE
+#define lib$format_date_time LIB$FORMAT_DATE_TIME
+#define lib$free_timer LIB$FREE_TIMER
+#define lib$free_vm LIB$FREE_VM
+#define lib$get_ef LIB$GET_EF
+#define lib$get_foreign LIB$GET_FOREIGN
+#define lib$get_input LIB$GET_INPUT
+#define lib$get_users_language LIB$GET_USERS_LANGUAGE
+#define lib$get_vm LIB$GET_VM
+#define lib$get_symbol LIB$GET_SYMBOL
+#define lib$getdvi LIB$GETDVI
+#define lib$init_date_time_context LIB$INIT_DATE_TIME_CONTEXT
+#define lib$init_timer LIB$INIT_TIMER
+#define lib$find_file LIB$FIND_FILE
+#define lib$find_file_end LIB$FIND_FILE_END
+#define lib$find_image_symbol LIB$FIND_IMAGE_SYMBOL
+#define lib$mult_delta_time LIB$MULT_DELTA_TIME
+#define lib$put_output LIB$PUT_OUTPUT
+#define lib$rename_file LIB$RENAME_FILE
+#define lib$reset_vm_zone LIB$RESET_VM_ZONE
+#define lib$set_symbol LIB$SET_SYMBOL
+#define lib$sfree1_dd LIB$SFREE1_DD
+#define lib$show_vm LIB$SHOW_VM
+#define lib$show_vm_zone LIB$SHOW_VM_ZONE
+#define lib$spawn LIB$SPAWN
+#define lib$stat_timer LIB$STAT_TIMER
+#define lib$subx LIB$SUBX
+#define lib$sub_times LIB$SUB_TIMES
+#define lib$wait LIB$WAIT
+#define mail$send_add_address MAIL$SEND_ADD_ADDRESS
+#define mail$send_add_attribute MAIL$SEND_ADD_ATTRIBUTE
+#define mail$send_add_bodypart MAIL$SEND_ADD_BODYPART
+#define mail$send_begin MAIL$SEND_BEGIN
+#define mail$send_end MAIL$SEND_END
+#define mail$send_message MAIL$SEND_MESSAGE
+#define ncs$convert NCS$CONVERT
+#define ncs$get_cf NCS$GET_CF
+#define objectClass OBJECTCLASS
+#define objectClassRec OBJECTCLASSREC
+#define overrideShellClassRec OVERRIDESHELLCLASSREC
+#define overrideShellWidgetClass OVERRIDESHELLWIDGETCLASS
+#define pthread_attr_create PTHREAD_ATTR_CREATE
+#define pthread_attr_delete PTHREAD_ATTR_DELETE
+#define pthread_attr_destroy PTHREAD_ATTR_DESTROY
+#define pthread_attr_getdetach_np PTHREAD_ATTR_GETDETACH_NP
+#define pthread_attr_getguardsize_np PTHREAD_ATTR_GETGUARDSIZE_NP
+#define pthread_attr_getinheritsched PTHREAD_ATTR_GETINHERITSCHED
+#define pthread_attr_getprio PTHREAD_ATTR_GETPRIO
+#define pthread_attr_getsched PTHREAD_ATTR_GETSCHED
+#define pthread_attr_getschedparam PTHREAD_ATTR_GETSCHEDPARAM
+#define pthread_attr_getschedpolicy PTHREAD_ATTR_GETSCHEDPOLICY
+#define pthread_attr_getstacksize PTHREAD_ATTR_GETSTACKSIZE
+#define pthread_attr_init PTHREAD_ATTR_INIT
+#define pthread_attr_setdetach_np PTHREAD_ATTR_SETDETACH_NP
+#define pthread_attr_setdetachstate PTHREAD_ATTR_SETDETACHSTATE
+#define pthread_attr_setguardsize_np PTHREAD_ATTR_SETGUARDSIZE_NP
+#define pthread_attr_setinheritsched PTHREAD_ATTR_SETINHERITSCHED
+#define pthread_attr_setprio PTHREAD_ATTR_SETPRIO
+#define pthread_attr_setsched PTHREAD_ATTR_SETSCHED
+#define pthread_attr_setschedparam PTHREAD_ATTR_SETSCHEDPARAM
+#define pthread_attr_setschedpolicy PTHREAD_ATTR_SETSCHEDPOLICY
+#ifndef pthread_attr_setscope
+# define pthread_attr_setscope PTHREAD_ATTR_SETSCOPE
+#endif
+#define pthread_attr_setstacksize PTHREAD_ATTR_SETSTACKSIZE
+#define pthread_cancel PTHREAD_CANCEL
+#define pthread_cancel_e PTHREAD_CANCEL_E
+#define pthread_cond_broadcast PTHREAD_COND_BROADCAST
+#define pthread_cond_destroy PTHREAD_COND_DESTROY
+#define pthread_cond_init PTHREAD_COND_INIT
+#define pthread_cond_sig_preempt_int_np PTHREAD_COND_SIG_PREEMPT_INT_NP
+#define pthread_cond_signal PTHREAD_COND_SIGNAL
+#define pthread_cond_signal_int_np PTHREAD_COND_SIGNAL_INT_NP
+#define pthread_cond_timedwait PTHREAD_COND_TIMEDWAIT
+#define pthread_cond_wait PTHREAD_COND_WAIT
+#define pthread_condattr_create PTHREAD_CONDATTR_CREATE
+#define pthread_condattr_delete PTHREAD_CONDATTR_DELETE
+#define pthread_condattr_init PTHREAD_CONDATTR_INIT
+#define pthread_create PTHREAD_CREATE
+#define pthread_delay_np PTHREAD_DELAY_NP
+#define pthread_detach PTHREAD_DETACH
+#define pthread_equal PTHREAD_EQUAL
+#define pthread_exc_fetch_fp_np PTHREAD_EXC_FETCH_FP_NP
+#define pthread_exc_handler_np PTHREAD_EXC_HANDLER_NP
+#define pthread_exc_matches_np PTHREAD_EXC_MATCHES_NP
+#define pthread_exc_pop_ctx_np PTHREAD_EXC_POP_CTX_NP
+#define pthread_exc_push_ctx_np PTHREAD_EXC_PUSH_CTX_NP
+#define pthread_exc_raise_np PTHREAD_EXC_RAISE_NP
+#define pthread_exc_savecontext_np PTHREAD_EXC_SAVECONTEXT_NP
+#define pthread_exit PTHREAD_EXIT
+#define pthread_get_expiration_np PTHREAD_GET_EXPIRATION_NP
+#define pthread_getprio PTHREAD_GETPRIO
+#define pthread_getschedparam PTHREAD_GETSCHEDPARAM
+#define pthread_getscheduler PTHREAD_GETSCHEDULER
+#define pthread_getspecific PTHREAD_GETSPECIFIC
+#define pthread_getunique_np PTHREAD_GETUNIQUE_NP
+#define pthread_join PTHREAD_JOIN
+#define pthread_join32 PTHREAD_JOIN32
+#define pthread_key_create PTHREAD_KEY_CREATE
+#define pthread_key_delete PTHREAD_KEY_DELETE
+#define pthread_keycreate PTHREAD_KEYCREATE
+#define pthread_kill PTHREAD_KILL
+#define pthread_lock_global_np PTHREAD_LOCK_GLOBAL_NP
+#define pthread_mutex_destroy PTHREAD_MUTEX_DESTROY
+#define pthread_mutex_init PTHREAD_MUTEX_INIT
+#define pthread_mutex_lock PTHREAD_MUTEX_LOCK
+#define pthread_mutex_trylock PTHREAD_MUTEX_TRYLOCK
+#define pthread_mutex_unlock PTHREAD_MUTEX_UNLOCK
+#define pthread_mutexattr_create PTHREAD_MUTEXATTR_CREATE
+#define pthread_mutexattr_delete PTHREAD_MUTEXATTR_DELETE
+#define pthread_mutexattr_destroy PTHREAD_MUTEXATTR_DESTROY
+#define pthread_mutexattr_getkind_np PTHREAD_MUTEXATTR_GETKIND_NP
+#define pthread_mutexattr_init PTHREAD_MUTEXATTR_INIT
+#define pthread_mutexattr_setkind_np PTHREAD_MUTEXATTR_SETKIND_NP
+#define pthread_mutexattr_settype_np PTHREAD_MUTEXATTR_SETTYPE_NP
+#define pthread_once PTHREAD_ONCE
+#define pthread_resume_np PTHREAD_RESUME_NP
+#define pthread_self PTHREAD_SELF
+#define pthread_setasynccancel PTHREAD_SETASYNCCANCEL
+#define pthread_setcancel PTHREAD_SETCANCEL
+#define pthread_setcancelstate PTHREAD_SETCANCELSTATE
+#define pthread_setcanceltype PTHREAD_SETCANCELTYPE
+#define pthread_setprio PTHREAD_SETPRIO
+#define pthread_setschedparam PTHREAD_SETSCHEDPARAM
+#define pthread_setscheduler PTHREAD_SETSCHEDULER
+#define pthread_setspecific PTHREAD_SETSPECIFIC
+#define pthread_suspend_np PTHREAD_SUSPEND_NP
+#define pthread_testcancel PTHREAD_TESTCANCEL
+#define pthread_unlock_global_np PTHREAD_UNLOCK_GLOBAL_NP
+#define pthread_yield PTHREAD_YIELD
+#define pthread_yield_np PTHREAD_YIELD_NP
+#define rectObjClass RECTOBJCLASS
+#define rectObjClassRec RECTOBJCLASSREC
+#define sessionShellWidgetClass SESSIONSHELLWIDGETCLASS
+#define shellWidgetClass SHELLWIDGETCLASS
+#define shmat SHMAT
+#define shmctl SHMCTL
+#define shmdt SHMDT
+#define shmget SHMGET
+#define smg$create_key_table SMG$CREATE_KEY_TABLE
+#define smg$create_virtual_keyboard SMG$CREATE_VIRTUAL_KEYBOARD
+#define smg$read_composed_line SMG$READ_COMPOSED_LINE
+#define sys$add_ident SYS$ADD_IDENT
+#define sys$asctoid SYS$ASCTOID
+#define sys$assign SYS$ASSIGN
+#define sys$bintim SYS$BINTIM
+#define sys$cancel SYS$CANCEL
+#define sys$cantim SYS$CANTIM
+#define sys$check_access SYS$CHECK_ACCESS
+#define sys$close SYS$CLOSE
+#define sys$connect SYS$CONNECT
+#define sys$create SYS$CREATE
+#define sys$create_user_profile SYS$CREATE_USER_PROFILE
+#define sys$crembx SYS$CREMBX
+#define sys$creprc SYS$CREPRC
+#define sys$crmpsc SYS$CRMPSC
+#define sys$dassgn SYS$DASSGN
+#define sys$dclast SYS$DCLAST
+#define sys$dclexh SYS$DCLEXH
+#define sys$delprc SYS$DELPRC
+#define sys$deq SYS$DEQ
+#define sys$dgblsc SYS$DGBLSC
+#define sys$display SYS$DISPLAY
+#define sys$enq SYS$ENQ
+#define sys$enqw SYS$ENQW
+#define sys$erase SYS$ERASE
+#define sys$fao SYS$FAO
+#define sys$faol SYS$FAOL
+#define sys$find_held SYS$FIND_HELD
+#define sys$finish_rdb SYS$FINISH_RDB
+#define sys$flush SYS$FLUSH
+#define sys$forcex SYS$FORCEX
+#define sys$get SYS$GET
+#define sys$get_security SYS$GET_SECURITY
+#define sys$getdviw SYS$GETDVIW
+#define sys$getjpi SYS$GETJPI
+#define sys$getjpiw SYS$GETJPIW
+#define sys$getlkiw SYS$GETLKIW
+#define sys$getmsg SYS$GETMSG
+#define sys$getsyi SYS$GETSYI
+#define sys$getsyiw SYS$GETSYIW
+#define sys$gettim SYS$GETTIM
+#define sys$getuai SYS$GETUAI
+#define sys$grantid SYS$GRANTID
+#define sys$hash_password SYS$HASH_PASSWORD
+#define sys$hiber SYS$HIBER
+#define sys$mgblsc SYS$MGBLSC
+#define sys$numtim SYS$NUMTIM
+#define sys$open SYS$OPEN
+#define sys$parse SYS$PARSE
+#define sys$parse_acl SYS$PARSE_ACL
+#define sys$parse_acl SYS$PARSE_ACL
+#define sys$persona_assume SYS$PERSONA_ASSUME
+#define sys$persona_create SYS$PERSONA_CREATE
+#define sys$persona_delete SYS$PERSONA_DELETE
+#define sys$process_scan SYS$PROCESS_SCAN
+#define sys$put SYS$PUT
+#define sys$qio SYS$QIO
+#define sys$qiow SYS$QIOW
+#define sys$read SYS$READ
+#define sys$resched SYS$RESCHED
+#define sys$rewind SYS$REWIND
+#define sys$search SYS$SEARCH
+#define sys$set_security SYS$SET_SECURITY
+#define sys$setast SYS$SETAST
+#define sys$setef SYS$SETEF
+#define sys$setimr SYS$SETIMR
+#define sys$setpri SYS$SETPRI
+#define sys$setprn SYS$SETPRN
+#define sys$setprv SYS$SETPRV
+#define sys$setswm SYS$SETSWM
+#define sys$setuai SYS$SETUAI
+#define sys$sndopr SYS$SNDOPR
+#define sys$synch SYS$SYNCH
+#define sys$trnlnm SYS$TRNLNM
+#define sys$update SYS$UPDATE
+#define sys$wake SYS$WAKE
+#define sys$write SYS$WRITE
+#define topLevelShellClassRec TOPLEVELSHELLCLASSREC
+#define topLevelShellWidgetClass TOPLEVELSHELLWIDGETCLASS
+#define transientShellWidgetClass TRANSIENTSHELLWIDGETCLASS
+#define vendorShellClassRec VENDORSHELLCLASSREC
+#define vendorShellWidgetClass VENDORSHELLWIDGETCLASS
+#define widgetClass WIDGETCLASS
+#define widgetClassRec WIDGETCLASSREC
+#define wmShellClassRec WMSHELLCLASSREC
+#define wmShellWidgetClass WMSHELLWIDGETCLASS
+#define x$soft_ast_lib_lock X$SOFT_AST_LIB_LOCK
+#define x$soft_ast_lock_depth X$SOFT_AST_LOCK_DEPTH
+#define x$soft_reenable_asts X$SOFT_REENABLE_ASTS
+#define xmArrowButtonWidgetClass XMARROWBUTTONWIDGETCLASS
+#define xmBulletinBoardWidgetClass XMBULLETINBOARDWIDGETCLASS
+#define xmCascadeButtonClassRec XMCASCADEBUTTONCLASSREC
+#define xmCascadeButtonGadgetClass XMCASCADEBUTTONGADGETCLASS
+#define xmCascadeButtonWidgetClass XMCASCADEBUTTONWIDGETCLASS
+#define xmCommandWidgetClass XMCOMMANDWIDGETCLASS
+#define xmDialogShellWidgetClass XMDIALOGSHELLWIDGETCLASS
+#define xmDrawingAreaWidgetClass XMDRAWINGAREAWIDGETCLASS
+#define xmDrawnButtonWidgetClass XMDRAWNBUTTONWIDGETCLASS
+#define xmFileSelectionBoxWidgetClass XMFILESELECTIONBOXWIDGETCLASS
+#define xmFormWidgetClass XMFORMWIDGETCLASS
+#define xmFrameWidgetClass XMFRAMEWIDGETCLASS
+#define xmGadgetClass XMGADGETCLASS
+#define xmLabelGadgetClass XMLABELGADGETCLASS
+#define xmLabelWidgetClass XMLABELWIDGETCLASS
+#define xmListWidgetClass XMLISTWIDGETCLASS
+#define xmMainWindowWidgetClass XMMAINWINDOWWIDGETCLASS
+#define xmManagerClassRec XMMANAGERCLASSREC
+#define xmManagerWidgetClass XMMANAGERWIDGETCLASS
+#define xmMenuShellWidgetClass XMMENUSHELLWIDGETCLASS
+#define xmMessageBoxWidgetClass XMMESSAGEBOXWIDGETCLASS
+#define xmPrimitiveClassRec XMPRIMITIVECLASSREC
+#define xmPrimitiveWidgetClass XMPRIMITIVEWIDGETCLASS
+#define xmPushButtonClassRec XMPUSHBUTTONCLASSREC
+#define xmPushButtonGadgetClass XMPUSHBUTTONGADGETCLASS
+#define xmPushButtonWidgetClass XMPUSHBUTTONWIDGETCLASS
+#define xmRowColumnWidgetClass XMROWCOLUMNWIDGETCLASS
+#define xmSashWidgetClass XMSASHWIDGETCLASS
+#define xmScaleWidgetClass XMSCALEWIDGETCLASS
+#define xmScrollBarWidgetClass XMSCROLLBARWIDGETCLASS
+#define xmScrolledWindowClassRec XMSCROLLEDWINDOWCLASSREC
+#define xmScrolledWindowWidgetClass XMSCROLLEDWINDOWWIDGETCLASS
+#define xmSeparatorGadgetClass XMSEPARATORGADGETCLASS
+#define xmSeparatorWidgetClass XMSEPARATORWIDGETCLASS
+#define xmTextFieldWidgetClass XMTEXTFIELDWIDGETCLASS
+#define xmTextWidgetClass XMTEXTWIDGETCLASS
+#define xmToggleButtonGadgetClass XMTOGGLEBUTTONGADGETCLASS
+#define xmToggleButtonWidgetClass XMTOGGLEBUTTONWIDGETCLASS
+
+#if (__VMS_VER < 80200000)
+# define SetReqLen(req,n,badlen) \
+    if ((req->length + n) > (unsigned)65535) { \
+        n = badlen; \
+        req->length += n; \
+    } else \
+    req->length += n
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern void XtFree(char*);
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Mesa/prj/build.lst b/Mesa/prj/build.lst
new file mode 100644
index 000000000000..8910be4da8ea
--- /dev/null
+++ b/Mesa/prj/build.lst
@@ -0,0 +1,3 @@
+me  Mesa : solenv NULL
+me  Mesa                         usr1    -   u    me_mkout NULL
+me	Mesa\prj                     get     -   all  me_prj NULL
diff --git a/Mesa/prj/d.lst b/Mesa/prj/d.lst
new file mode 100644
index 000000000000..5991e2066540
--- /dev/null
+++ b/Mesa/prj/d.lst
@@ -0,0 +1,3 @@
+mkdir: %_DEST%\inc%_EXT%\GL
+
+..\inc\*.h %_DEST%\inc%_EXT%\GL\*.h
diff --git a/Module_ooo.mk b/Module_ooo.mk
new file mode 100644
index 000000000000..9835771e6da3
--- /dev/null
+++ b/Module_ooo.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.
+#
+#*************************************************************************
+
+$(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 \
+))
+
+# these have only migrated subsequentcheck for now
+$(eval $(call gb_Module_add_moduledirs,ooo,\
+	chart2 \
+	configmgr \
+	dbaccess \
+	forms \
+	linguistic \
+	qadevOOo \
+	sal \
+	ucb \
+	unotools \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/Repository.mk b/Repository.mk
new file mode 100644
index 000000000000..fc5aa93ceb08
--- /dev/null
+++ b/Repository.mk
@@ -0,0 +1,146 @@
+#*************************************************************************
+#
+# 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 \
+    for \
+    forui \
+    fwe \
+    fwi \
+    fwk \
+    fwl \
+    fwm \
+    i18npaper \
+    lng \
+    msfilter \
+    msword \
+    oox \
+    qstart_gtk \
+    sax \
+    sb \
+    sc \
+    scd \
+    scfilt \
+    scui \
+    sfx \
+    sm \
+    smd \
+    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, \
+	test \
+    cppunit \
+    icuuc \
+    rdf \
+    xslt \
+))
+
+
+$(eval $(call gb_Helper_register_libraries,RTLIBS, \
+    comphelper \
+    i18nisolang1 \
+    i18nutil \
+    ucbhelper \
+))
+
+$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
+    cppuhelper \
+    salhelper \
+))
+
+$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+    fsstorage \
+    hatchwindowfactory \
+    lomenubar \
+    msforms \
+    passwordcontainer \
+    productregistration \
+    vbaobj \
+    vbaswobj \
+))
+
+
+$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
+    cppu \
+    jvmfwk \
+    sal \
+))
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+    jpeglib \
+    ooopathutils \
+    salcpprt \
+    vclmain \
+    zlib \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
new file mode 100644
index 000000000000..15a0f878f8b4
--- /dev/null
+++ b/RepositoryFixes.mk
@@ -0,0 +1,177 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# fixes for all the libraries that are named with too much creativity and do
+# not follow any of the established nameschemes
+
+# Make has no support for 'or' clauses in conditionals,
+# we use a filter expression instead.
+ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
+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))
+
+
+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))
+
+
+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 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))
+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))
+
+
+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 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))
+gb_Library_NOILIBFILENAMES:=\
+    advapi32 \
+    gdi32 \
+    gnu_getopt \
+    icuuc \
+    kernel32 \
+    msvcrt \
+    msvcprt \
+    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 ($(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
+
+ifeq ($(SYSTEM_CPPUNIT),YES)
+gb_Library_TARGETS := $(filter-out cppunit,$(gb_Library_TARGETS))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/TEMPLATE.SOURCECODE.HEADER b/TEMPLATE.SOURCECODE.HEADER
new file mode 100644
index 000000000000..974b3219b7f0
--- /dev/null
+++ b/TEMPLATE.SOURCECODE.HEADER
@@ -0,0 +1,30 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       [ insert your name / company etc. here eg. Jim Bob <jim@bob.org> ]
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Major Contributor(s): 
+ * Ted <ted@bear.com>
+ * Portions created by the Ted are Copyright (C) 2010 Ted. All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx
new file mode 100644
index 000000000000..6d32b9d5bd3a
--- /dev/null
+++ b/UnoControls/inc/basecontainercontrol.hxx
@@ -0,0 +1,594 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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 <vector>
+
+//____________________________________________________________________________________________________________
+//  includes of my own project
+//____________________________________________________________________________________________________________
+#include "basecontrol.hxx"
+
+//____________________________________________________________________________________________________________
+//  "namespaces"
+//____________________________________________________________________________________________________________
+
+namespace unocontrols{
+
+#define CSS_UNO         ::com::sun::star::uno
+#define CSS_AWT         ::com::sun::star::awt
+#define CSS_LANG        ::com::sun::star::lang
+#define CSS_CONTAINER   ::com::sun::star::container
+
+//____________________________________________________________________________________________________________
+//  structs, types, forwards
+//____________________________________________________________________________________________________________
+
+struct IMPL_ControlInfo
+{
+    CSS_UNO::Reference< CSS_AWT::XControl > xControl ;
+    ::rtl::OUString                         sName    ;
+};
+
+//____________________________________________________________________________________________________________
+//  classes
+//____________________________________________________________________________________________________________
+
+class BaseContainerControl  : public CSS_AWT::XControlModel
+                            , public CSS_AWT::XControlContainer
+                            , public BaseControl
+{
+
+//____________________________________________________________________________________________________________
+//  public methods
+//____________________________________________________________________________________________________________
+
+public:
+
+    //________________________________________________________________________________________________________
+    //  construct/destruct
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+       BaseContainerControl( const CSS_UNO::Reference< CSS_LANG::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 CSS_UNO::Any SAL_CALL queryInterface(
+        const CSS_UNO::Type& aType
+    ) throw( CSS_UNO::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 CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes()
+        throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XAggregation
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_UNO::Any SAL_CALL queryAggregation(
+        const CSS_UNO::Type& aType
+    ) throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XControl
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL createPeer(
+        const CSS_UNO::Reference< CSS_AWT::XToolkit >&      xToolkit ,
+        const CSS_UNO::Reference< CSS_AWT::XWindowPeer >&   xParent
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual sal_Bool SAL_CALL setModel(
+        const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
+        throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XComponent
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XEventListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL disposing( const CSS_LANG::EventObject& rEvent ) throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XControlContainer
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addControl(
+        const ::rtl::OUString&                            sName    ,
+        const CSS_UNO::Reference< CSS_AWT::XControl >&    xControl
+    ) throw( CSS_UNO::RuntimeException  );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addContainerListener(
+        const CSS_UNO::Reference< CSS_CONTAINER::XContainerListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeControl(
+        const CSS_UNO::Reference< CSS_AWT::XControl >& xControl
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeContainerListener(
+        const CSS_UNO::Reference< CSS_CONTAINER::XContainerListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setStatusText(
+        const ::rtl::OUString& sStatusText
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_UNO::Reference< CSS_AWT::XControl > SAL_CALL getControl(
+        const ::rtl::OUString& sName
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XControl > > SAL_CALL getControls()
+        throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XUnoControlContainer
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addTabController(
+        const CSS_UNO::Reference< CSS_AWT::XTabController >& xTabController
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeTabController(
+        const CSS_UNO::Reference< CSS_AWT::XTabController >& xTabController
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setTabControllers(
+        const CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XTabController > >& xTabControllers
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XTabController > > SAL_CALL getTabControllers()
+        throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XWindow
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( CSS_UNO::RuntimeException );
+
+//____________________________________________________________________________________________________________
+//  protected methods
+//____________________________________________________________________________________________________________
+
+protected:
+    using OComponentHelper::disposing;
+    /**_______________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual CSS_AWT::WindowDescriptor* impl_getWindowDescriptor(
+        const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParentPeer
+    );
+
+    /**_______________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void impl_paint(
+        sal_Int32                                           nX ,
+        sal_Int32                                           nY ,
+        const   CSS_UNO::Reference< CSS_AWT::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:
+    // list of pointer of "struct IMPL_ControlInfo" to hold child-controls
+    ::std::vector< IMPL_ControlInfo* > maControlInfoList;
+
+    // list of references of XTabController to hold tab-order in this container
+    CSS_UNO::Sequence< CSS_UNO::Reference< CSS_AWT::XTabController > >  m_xTabControllerList    ;
+
+    ::cppu::OMultiTypeInterfaceContainerHelper                          m_aListeners            ;
+
+};  // class BaseContainerControl
+
+// The namespace aliases are only used in this header
+#undef CSS_UNO
+#undef CSS_AWT
+#undef CSS_LANG
+#undef CSS_CONTAINER
+
+}   // namespace unocontrols
+
+#endif  // ifndef _UNOCONTROLS_BASECONTAINERCONTROL_CTRL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
new file mode 100644
index 000000000000..e8eb59bce4ac
--- /dev/null
+++ b/UnoControls/inc/basecontrol.hxx
@@ -0,0 +1,1272 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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 CSS_UNO     ::com::sun::star::uno
+#define CSS_AWT     ::com::sun::star::awt
+#define CSS_LANG    ::com::sun::star::lang
+
+//____________________________________________________________________________________________________________
+//  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.
+    ::osl::Mutex m_aMutex ;
+};
+
+//____________________________________________________________________________________________________________
+//  classes
+//____________________________________________________________________________________________________________
+
+class BaseControl   : public CSS_LANG::XServiceInfo
+                    , public CSS_AWT::XPaintListener
+                    , public CSS_AWT::XWindowListener
+                    , public CSS_AWT::XView
+                    , public CSS_AWT::XWindow
+                    , public CSS_AWT::XControl
+                    , public IMPL_MutexContainer
+                    , public ::cppu::OComponentHelper
+{
+//____________________________________________________________________________________________________________
+//  public methods
+//____________________________________________________________________________________________________________
+
+public:
+
+    //________________________________________________________________________________________________________
+    //  construct/destruct
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    BaseControl( const CSS_UNO::Reference< CSS_LANG::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 CSS_UNO::Any SAL_CALL queryInterface(
+        const CSS_UNO::Type& aType
+    ) throw( CSS_UNO::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 CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes()
+        throw( CSS_UNO::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 CSS_UNO::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+        throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XAggregation
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setDelegator(
+        const CSS_UNO::Reference< CSS_UNO::XInterface >& xDelegator
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_UNO::Any SAL_CALL queryAggregation(
+        const CSS_UNO::Type& aType
+    ) throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XServiceInfo
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual sal_Bool SAL_CALL supportsService(
+        const ::rtl::OUString& sServiceName
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual ::rtl::OUString SAL_CALL getImplementationName()
+        throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_UNO::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+        throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XComponent
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addEventListener(
+        const CSS_UNO::Reference< CSS_LANG::XEventListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeEventListener(
+        const CSS_UNO::Reference< CSS_LANG::XEventListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XControl
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL createPeer(
+        const CSS_UNO::Reference< CSS_AWT::XToolkit >& xToolkit,
+        const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParent
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setContext(
+        const CSS_UNO::Reference< CSS_UNO::XInterface >& xContext
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual sal_Bool SAL_CALL setModel(
+        const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel
+    ) throw( CSS_UNO::RuntimeException ) = 0 ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_UNO::Reference< CSS_UNO::XInterface > SAL_CALL getContext()
+        throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
+        throw( CSS_UNO::RuntimeException ) = 0;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_UNO::Reference< CSS_AWT::XWindowPeer > SAL_CALL getPeer()
+        throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_UNO::Reference< CSS_AWT::XView > SAL_CALL getView()
+        throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual sal_Bool SAL_CALL isDesignMode() throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual sal_Bool SAL_CALL isTransparent() throw( CSS_UNO::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( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setFocus() throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_AWT::Rectangle SAL_CALL getPosSize() throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addWindowListener(
+        const CSS_UNO::Reference< CSS_AWT::XWindowListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addFocusListener(
+        const CSS_UNO::Reference< CSS_AWT::XFocusListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addKeyListener(
+        const CSS_UNO::Reference< CSS_AWT::XKeyListener >& xListener )
+    throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addMouseListener(
+        const CSS_UNO::Reference< CSS_AWT::XMouseListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addMouseMotionListener(
+        const CSS_UNO::Reference< CSS_AWT::XMouseMotionListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addPaintListener(
+        const CSS_UNO::Reference< CSS_AWT::XPaintListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeWindowListener(
+        const CSS_UNO::Reference< CSS_AWT::XWindowListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeFocusListener(
+        const CSS_UNO::Reference< CSS_AWT::XFocusListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeKeyListener(
+        const CSS_UNO::Reference< CSS_AWT::XKeyListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeMouseListener(
+        const CSS_UNO::Reference< CSS_AWT::XMouseListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeMouseMotionListener(
+        const CSS_UNO::Reference< CSS_AWT::XMouseMotionListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removePaintListener(
+        const CSS_UNO::Reference< CSS_AWT::XPaintListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XView
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL draw( sal_Int32   nX  ,
+                                sal_Int32   nY  ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual sal_Bool SAL_CALL setGraphics(
+        const CSS_UNO::Reference< CSS_AWT::XGraphics >& xDevice
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setZoom(  float   fZoomX  ,
+                                    float   fZoomY  ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_UNO::Reference< CSS_AWT::XGraphics > SAL_CALL getGraphics()
+        throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_AWT::Size SAL_CALL getSize() throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  CSS_LANG::XEventListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL disposing(
+        const CSS_LANG::EventObject& rSource
+    ) throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XPaintListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowPaint(
+        const CSS_AWT::PaintEvent& rEvent
+    ) throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XWindowListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowResized( const CSS_AWT::WindowEvent& aEvent ) throw( CSS_UNO::RuntimeException );
+    virtual void SAL_CALL windowMoved( const CSS_AWT::WindowEvent& aEvent ) throw( CSS_UNO::RuntimeException );
+    virtual void SAL_CALL windowShown( const CSS_LANG::EventObject& aEvent ) throw( CSS_UNO::RuntimeException );
+    virtual void SAL_CALL windowHidden( const CSS_LANG::EventObject& aEvent ) throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  impl but public method to register service
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    static const ::rtl::OUString impl_getStaticImplementationName();
+
+//____________________________________________________________________________________________________________
+//  protected methods
+//____________________________________________________________________________________________________________
+
+protected:
+    using OComponentHelper::disposing;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory > impl_getMultiServiceFactory();
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    const CSS_UNO::Reference< CSS_AWT::XWindow > impl_getPeerWindow();
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    const CSS_UNO::Reference< CSS_AWT::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 CSS_AWT::WindowDescriptor* impl_getWindowDescriptor(
+        const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParentPeer
+    );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void impl_paint(        sal_Int32               nX          ,
+                                    sal_Int32               nY          ,
+                            const   CSS_UNO::Reference< CSS_AWT::XGraphics >&   xGraphics   );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void impl_recalcLayout( const CSS_AWT::WindowEvent& aEvent );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    CSS_UNO::Reference< CSS_UNO::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:
+
+    CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >    m_xFactory              ;
+    CSS_UNO::Reference< CSS_UNO::XInterface >               m_xDelegator            ;
+    OMRCListenerMultiplexerHelper*                  m_pMultiplexer          ;   // multiplex events
+    CSS_UNO::Reference< CSS_UNO::XInterface >               m_xMultiplexer          ;
+    CSS_UNO::Reference< CSS_UNO::XInterface >               m_xContext              ;
+    CSS_UNO::Reference< CSS_AWT::XWindowPeer >              m_xPeer                 ;
+    CSS_UNO::Reference< CSS_AWT::XWindow >                  m_xPeerWindow           ;
+    CSS_UNO::Reference< CSS_AWT::XGraphics >                m_xGraphicsView         ;   // graphics for CSS_AWT::XView-operations
+    CSS_UNO::Reference< CSS_AWT::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
+
+// The namespace aliaes are only used in this header
+#undef CSS_UNO
+#undef CSS_AWT
+#undef CSS_LANG
+
+}   // namespace unocontrols
+
+#endif  // ifndef _UNOCONTROLS_BASECONTROL_CTRL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx
new file mode 100644
index 000000000000..b9a90c5a33f1
--- /dev/null
+++ b/UnoControls/inc/multiplexer.hxx
@@ -0,0 +1,784 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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 CSS_UNO     ::com::sun::star::uno
+#define CSS_AWT     ::com::sun::star::awt
+#define CSS_LANG    ::com::sun::star::lang
+
+//____________________________________________________________________________________________________________
+//  class
+//____________________________________________________________________________________________________________
+
+class OMRCListenerMultiplexerHelper : public CSS_AWT::XFocusListener
+                                    , public CSS_AWT::XWindowListener
+                                    , public CSS_AWT::XKeyListener
+                                    , public CSS_AWT::XMouseListener
+                                    , public CSS_AWT::XMouseMotionListener
+                                    , public CSS_AWT::XPaintListener
+                                    , public CSS_AWT::XTopWindowListener
+                                    , public ::cppu::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   CSS_UNO::Reference< CSS_AWT::XWindow >& xControl    ,
+                                    const   CSS_UNO::Reference< CSS_AWT::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 CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
+        throw( CSS_UNO::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 CSS_UNO::Reference< CSS_UNO::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 CSS_UNO::Reference< CSS_AWT::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   CSS_UNO::Type&                              aType       ,
+                    const   CSS_UNO::Reference< CSS_UNO::XInterface >&  xListener   );
+
+    /**_______________________________________________________________________________________________________
+        @short      Remove the specified listener from the source.
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    void unadvise(  const   CSS_UNO::Type&                              aType       ,
+                    const   CSS_UNO::Reference< CSS_UNO::XInterface >&  xListener   );
+
+    //________________________________________________________________________________________________________
+    //  XEventListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL disposing(const CSS_LANG::EventObject& aSource)
+        throw( CSS_UNO::RuntimeException ) ;
+
+    //________________________________________________________________________________________________________
+    //  XFocusListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL focusGained(const CSS_AWT::FocusEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL focusLost(const CSS_AWT::FocusEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    //________________________________________________________________________________________________________
+    //  XWindowListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowResized(const CSS_AWT::WindowEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowMoved(const CSS_AWT::WindowEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowShown(const CSS_LANG::EventObject& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowHidden(const CSS_LANG::EventObject& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    //________________________________________________________________________________________________________
+    //  XKeyListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL keyPressed( const CSS_AWT::KeyEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL keyReleased( const CSS_AWT::KeyEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    //________________________________________________________________________________________________________
+    //  XMouseListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL mousePressed(const CSS_AWT::MouseEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL mouseReleased(const CSS_AWT::MouseEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL mouseEntered(const CSS_AWT::MouseEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL mouseExited(const CSS_AWT::MouseEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    //________________________________________________________________________________________________________
+    //  XMouseMotionListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL mouseDragged(const CSS_AWT::MouseEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL mouseMoved(const CSS_AWT::MouseEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    //________________________________________________________________________________________________________
+    //  XPaintListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowPaint(const CSS_AWT::PaintEvent& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    //________________________________________________________________________________________________________
+    //  XTopWindowListener
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowOpened( const CSS_LANG::EventObject& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowClosing( const CSS_LANG::EventObject& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowClosed( const CSS_LANG::EventObject& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowMinimized( const CSS_LANG::EventObject& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowNormalized( const CSS_LANG::EventObject& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowActivated( const CSS_LANG::EventObject& aEvent )
+        throw( CSS_UNO::RuntimeException ) ;
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL windowDeactivated( const CSS_LANG::EventObject& aEvent )
+        throw( CSS_UNO::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   CSS_UNO::Reference< CSS_AWT::XWindow >& xPeer   ,
+                            const   CSS_UNO::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   CSS_UNO::Reference< CSS_AWT::XWindow >& xPeer   ,
+                                const   CSS_UNO::Type&                          aType   );
+
+//____________________________________________________________________________________________________________
+//  private variables
+//____________________________________________________________________________________________________________
+
+private:
+
+    ::osl::Mutex                                m_aMutex            ;
+    CSS_UNO::Reference< CSS_AWT::XWindow >      m_xPeer             ;   /// The source of the events. Normally this is the peer object.
+    CSS_UNO::WeakReference< CSS_AWT::XWindow >  m_xControl          ;
+    ::cppu::OMultiTypeInterfaceContainerHelper  m_aListenerHolder   ;
+
+};  // class OMRCListenerMultiplexerHelper
+
+// The namespace aliases are only used in this header
+#undef CSS_UNO
+#undef CSS_AWT
+#undef CSS_LANG
+
+
+}   // namespace unocontrols
+
+#endif  // ifndef _UNOCONTROLS_MULTIPLEXER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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..469146b018a5
--- /dev/null
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -0,0 +1,636 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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  )
+{
+}
+
+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();
+
+    }
+}
+
+//____________________________________________________________________________________________________________
+//  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();
+    size_t                              nMaxCount   =   maControlInfoList.size();
+    size_t                              nCount      =   0;
+
+    for ( nCount = 0; nCount < nMaxCount; ++nCount )
+    {
+        delete maControlInfoList[ nCount ];
+    }
+    maControlInfoList.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
+        maControlInfoList.push_back( pNewControl ) ;
+
+        // 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) ;
+
+        size_t nControls = maControlInfoList.size();
+
+        for ( size_t n = 0; n < nControls; n++ )
+        {
+            // Search for right control
+            IMPL_ControlInfo* pControl = maControlInfoList[ 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 ;
+                ::std::vector<IMPL_ControlInfo*>::iterator itr = maControlInfoList.begin();
+                ::std::advance(itr, n);
+                maControlInfoList.erase(itr);
+
+                // 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 > ();
+    size_t                  nControls   = maControlInfoList.size();
+
+    // Search for right control
+    for( size_t nCount = 0; nCount < nControls; ++nCount )
+    {
+        IMPL_ControlInfo* pSearchControl = maControlInfoList[ 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() ) ;
+
+    size_t                              nControls       = maControlInfoList.size();
+    size_t                              nCount          = 0;
+    Sequence< Reference< XControl > >   aDescriptor     ( nControls )                   ;
+    Reference< XControl > *             pDestination    = aDescriptor.getArray ()       ;
+
+    // Copy controls to sequence
+    for( nCount = 0; nCount < nControls; ++nCount )
+    {
+        IMPL_ControlInfo* pCopyControl = maControlInfoList[ 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 ( size_t n = maControlInfoList.size(); n; )
+        {
+            ControlInfo* pSearchControl = maControlInfoList[ --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.
+    size_t  nMaxCount   = maControlInfoList.size();
+    size_t  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 = maControlInfoList[ nCount ];
+        delete pSearchControl;
+    }
+
+    // Delete list himself.
+    maControlInfoList.clear ();
+}
+
+} // namespace unocontrols
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
new file mode 100644
index 000000000000..1240bb240671
--- /dev/null
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -0,0 +1,1022 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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(RTL_CONSTASCII_USTRINGPARAM( 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(RTL_CONSTASCII_USTRINGPARAM("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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/base/makefile.mk b/UnoControls/source/base/makefile.mk
new file mode 100644
index 000000000000..66b87395abfe
--- /dev/null
+++ b/UnoControls/source/base/makefile.mk
@@ -0,0 +1,46 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+PRJ=..$/..
+
+PRJNAME=UnoControls
+TARGET=base
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	$(PRJ)$/util$/makefile.pmk
+
+# --- Files --------------------------------------------------------
+
+SLOFILES=		$(SLO)$/multiplexer.obj				\
+                $(SLO)$/basecontrol.obj				\
+                $(SLO)$/basecontainercontrol.obj	\
+                $(SLO)$/registercontrols.obj
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :	target.mk
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
new file mode 100644
index 000000000000..c900d0276b04
--- /dev/null
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -0,0 +1,530 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "multiplexer.hxx"
+
+#include <osl/diagnose.h>
+
+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) ;
+}
+
+//____________________________________________________________________________________________________________
+//  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( RuntimeException )
+{
+    MULTIPLEX( XFocusListener, focusGained, FocusEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XFcousListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( RuntimeException )
+{
+    MULTIPLEX( XFocusListener, focusLost, FocusEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) throw( RuntimeException )
+{
+    MULTIPLEX( XWindowListener, windowResized, WindowEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) throw( RuntimeException )
+{
+    MULTIPLEX( XWindowListener, windowMoved, WindowEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) throw( RuntimeException )
+{
+    MULTIPLEX( XWindowListener, windowShown, EventObject, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) throw( RuntimeException )
+{
+    MULTIPLEX( XWindowListener, windowHidden, EventObject, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XKeyListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( RuntimeException )
+{
+    MULTIPLEX( XKeyListener, keyPressed, KeyEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XKeyListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( RuntimeException )
+{
+    MULTIPLEX( XKeyListener, keyReleased, KeyEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XMouseListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw( RuntimeException )
+{
+    MULTIPLEX( XMouseListener, mousePressed, MouseEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XMouseListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) throw( RuntimeException )
+{
+    MULTIPLEX( XMouseListener, mouseReleased, MouseEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XMouseListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw( RuntimeException )
+{
+    MULTIPLEX( XMouseListener, mouseEntered, MouseEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XMouseListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( RuntimeException )
+{
+    MULTIPLEX( XMouseListener, mouseExited, MouseEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XMouseMotionListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw( RuntimeException )
+{
+    MULTIPLEX( XMouseMotionListener, mouseDragged, MouseEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XMouseMotionListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( RuntimeException )
+{
+    MULTIPLEX( XMouseMotionListener, mouseMoved, MouseEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XPaintListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( RuntimeException )
+{
+    MULTIPLEX( XPaintListener, windowPaint, PaintEvent, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XTopWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) throw( RuntimeException )
+{
+    MULTIPLEX( XTopWindowListener, windowOpened, EventObject, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XTopWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) throw( RuntimeException )
+{
+    MULTIPLEX( XTopWindowListener, windowClosing, EventObject, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XTopWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) throw( RuntimeException )
+{
+    MULTIPLEX( XTopWindowListener, windowClosed, EventObject, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XTopWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) throw( RuntimeException )
+{
+    MULTIPLEX( XTopWindowListener, windowMinimized, EventObject, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XTopWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) throw( RuntimeException )
+{
+    MULTIPLEX( XTopWindowListener, windowNormalized, EventObject, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XTopWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) throw( RuntimeException )
+{
+    MULTIPLEX( XTopWindowListener, windowActivated, EventObject, aEvent )
+}
+
+//____________________________________________________________________________________________________________
+//  XTopWindowListener
+//____________________________________________________________________________________________________________
+
+void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) throw( 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
+    {
+        OSL_FAIL( "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
+    {
+        OSL_FAIL( "unknown listener" );
+    }
+}
+
+} // namespace unocontrols
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx
new file mode 100644
index 000000000000..e9c2d4a1261d
--- /dev/null
+++ b/UnoControls/source/base/registercontrols.cxx
@@ -0,0 +1,191 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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"
+//=============================================================================
+
+//______________________________________________________________________________________________________________
+//  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
+//______________________________________________________________________________________________________________
+
+//******************************************************************************************************************************
+#define CREATEINSTANCE(CLASS)                                                                                                               \
+                                                                                                                                            \
+    static Reference< XInterface > SAL_CALL CLASS##_createInstance ( const Reference< XMultiServiceFactory >& rServiceManager ) throw ( Exception ) \
+    {                                                                                                                                       \
+        return Reference< XInterface >( *(OWeakObject*)(new CLASS( rServiceManager )) );                                                    \
+    }
+
+//******************************************************************************************************************************
+#define CREATEFACTORY_ONEINSTANCE(CLASS)                                                                                \
+                                                                                                                        \
+    /* Create right factory ... */                                                                                      \
+    xFactory = Reference< XSingleServiceFactory >                                                                       \
+                    (                                                                                                   \
+                        cppu::createOneInstanceFactory  (   xServiceManager                                     ,       \
+                                                            CLASS::impl_getStaticImplementationName     ()  ,       \
+                                                            CLASS##_createInstance                              ,       \
+                                                            CLASS::impl_getStaticSupportedServiceNames  ()  )       \
+                    ) ;                                                                                                 \
+
+//******************************************************************************************************************************
+#define CREATEFACTORY_SINGLE(CLASS)                                                                                     \
+                                                                                                                        \
+    /* Create right factory ... */                                                                                      \
+    xFactory = Reference< XSingleServiceFactory >                                                                       \
+                    (                                                                                                   \
+                        cppu::createSingleFactory   (   xServiceManager                                     ,           \
+                                                        CLASS::impl_getStaticImplementationName     ()  ,           \
+                                                        CLASS##_createInstance                              ,           \
+                                                        CLASS::impl_getStaticSupportedServiceNames  ()  )           \
+                    ) ;                                                                                                 \
+
+//******************************************************************************************************************************
+#define IF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE(CLASS)                                                               \
+                                                                                                                        \
+    if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) )     \
+    {                                                                                                                   \
+        CREATEFACTORY_ONEINSTANCE ( CLASS )                                                                         \
+    }
+
+//******************************************************************************************************************************
+#define IF_NAME_CREATECOMPONENTFACTORY_SINGLE(CLASS)                                                                    \
+                                                                                                                        \
+    if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) )     \
+    {                                                                                                                   \
+        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*/        )
+{
+    // Set default return value for this operation - if it failed.
+    void* pReturn = NULL ;
+
+    if  (
+            ( pImplementationName   !=  NULL ) &&
+            ( pServiceManager       !=  NULL )
+        )
+    {
+        // 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() )
+        {
+            xFactory->acquire();
+            pReturn = xFactory.get();
+        }
+    }
+
+    // Return with result of this operation.
+    return pReturn ;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
new file mode 100644
index 000000000000..c5bd8cfce1e9
--- /dev/null
+++ b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx
@@ -0,0 +1,190 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/controls/OConnectionPointHelper.cxx b/UnoControls/source/controls/OConnectionPointHelper.cxx
new file mode 100644
index 000000000000..a8b174b01a3a
--- /dev/null
+++ b/UnoControls/source/controls/OConnectionPointHelper.cxx
@@ -0,0 +1,275 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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    ,
+    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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
new file mode 100644
index 000000000000..006924c85e4e
--- /dev/null
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -0,0 +1,606 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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/beans/PropertyAttribute.hpp>
+#include <cppuhelper/typeprovider.hxx>
+#include <osl/diagnose.h>
+
+//______________________________________________________________________________________________________________
+//  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(RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_FRAMECONTROL ));
+    return seqServiceNames ;
+}
+
+//____________________________________________________________________________________________________________
+//  impl but public method to register service
+//____________________________________________________________________________________________________________
+
+const OUString FrameControl::impl_getStaticImplementationName()
+{
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( 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 :                                       OSL_ENSURE ( 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 :                                   OSL_ENSURE ( 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(RTL_CONSTASCII_USTRINGPARAM("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(RTL_CONSTASCII_USTRINGPARAM("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(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_COMPONENTURL       )), PROPERTYHANDLE_COMPONENTURL     , ::getCppuType((const OUString*)0)                 , PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ),
+        Property( OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_FRAME              )), PROPERTYHANDLE_FRAME                , ::getCppuType((const Reference< XFrame >*)0)      , PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT   ),
+        Property( OUString(RTL_CONSTASCII_USTRINGPARAM( 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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..f1054089040d
--- /dev/null
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -0,0 +1,494 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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         (    PROGRESSBAR_DEFAULT_HORIZONTAL         )
+    , m_aBlockSize          (    PROGRESSBAR_DEFAULT_BLOCKDIMENSION     )
+    , m_nForegroundColor    (    PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR    )
+    , m_nBackgroundColor    (    PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR    )
+    , m_nMinRange           (    PROGRESSBAR_DEFAULT_MINRANGE           )
+    , m_nMaxRange           (    PROGRESSBAR_DEFAULT_MAXRANGE           )
+    , m_nBlockValue         (    PROGRESSBAR_DEFAULT_BLOCKVALUE         )
+    , m_nValue              (    PROGRESSBAR_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(RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_PROGRESSBAR ));
+    return seqServiceNames ;
+}
+
+//____________________________________________________________________________________________________________
+//  impl but public method to register service
+//____________________________________________________________________________________________________________
+
+const OUString ProgressBar::impl_getStaticImplementationName()
+{
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( 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 +=  PROGRESSBAR_FREESPACE   ;
+                // paint block
+                rGraphics->drawRect (nBlockStart, nY+PROGRESSBAR_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 -=  PROGRESSBAR_FREESPACE   ;
+                // paint block
+                rGraphics->drawRect (nX+PROGRESSBAR_FREESPACE, nBlockStart, m_aBlockSize.Width, m_aBlockSize.Height) ;
+                // step next free field
+                nBlockStart -=  m_aBlockSize.Height;
+            }
+        }
+
+        // Paint shadow border around the progressbar
+        rGraphics->setLineColor ( PROGRESSBAR_LINECOLOR_SHADOW                          ) ;
+        rGraphics->drawLine     ( nX, nY, impl_getWidth(), nY               ) ;
+        rGraphics->drawLine     ( nX, nY, nX             , impl_getHeight() ) ;
+
+        rGraphics->setLineColor ( PROGRESSBAR_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*PROGRESSBAR_FREESPACE))       ;
+        fBlockWidth   = fBlockHeight                        ;
+        fMaxBlocks    = nWindowWidth/(fBlockWidth+PROGRESSBAR_FREESPACE);
+    }
+    else
+    {
+        m_bHorizontal = sal_False                             ;
+        fBlockWidth   = (nWindowWidth-(2*PROGRESSBAR_FREESPACE))          ;
+        fBlockHeight  = fBlockWidth                           ;
+        fMaxBlocks    = nWindowHeight/(fBlockHeight+PROGRESSBAR_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 ;
+}
+
+}   // namespace unocontrols
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
new file mode 100644
index 000000000000..e039ff33925c
--- /dev/null
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -0,0 +1,1070 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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>
+#include <algorithm>
+//____________________________________________________________________________________________________________
+//  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 ::std::vector;
+using ::std::find;
+
+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(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_SERVICENAME    )) ), UNO_QUERY ) ;
+    m_xText_Top     = Reference< XFixedText >   ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_SERVICENAME    )) ), UNO_QUERY ) ;
+    m_xTopic_Bottom = Reference< XFixedText >   ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_SERVICENAME    )) ), UNO_QUERY ) ;
+    m_xText_Bottom  = Reference< XFixedText >   ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_SERVICENAME    )) ), UNO_QUERY ) ;
+    m_xButton       = Reference< XButton >      ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( BUTTON_SERVICENAME       )) ), UNO_QUERY ) ;
+    m_xProgressBar  = Reference< XProgressBar > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( 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(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_MODELNAME )) ), UNO_QUERY ) ) ;
+    xRef_Text_Top->setModel     ( Reference< XControlModel > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_MODELNAME )) ), UNO_QUERY ) ) ;
+    xRef_Topic_Bottom->setModel ( Reference< XControlModel > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_MODELNAME )) ), UNO_QUERY ) ) ;
+    xRef_Text_Bottom->setModel  ( Reference< XControlModel > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_MODELNAME )) ), UNO_QUERY ) ) ;
+    xRef_Button->setModel       ( Reference< XControlModel > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( BUTTON_MODELNAME    )) ), UNO_QUERY ) ) ;
+    // ProgressBar has no model !!!
+
+    // ... and add controls to basecontainercontrol!
+    addControl ( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_TEXT     )) , xRef_Topic_Top     ) ;
+    addControl ( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_TEXT     )) , xRef_Text_Top      ) ;
+    addControl ( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_TEXT     )) , xRef_Topic_Bottom  ) ;
+    addControl ( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_TEXT     )) , xRef_Text_Bottom   ) ;
+    addControl ( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_BUTTON       )) , xRef_Button            ) ;
+    addControl ( OUString(RTL_CONSTASCII_USTRINGPARAM( 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(RTL_CONSTASCII_USTRINGPARAM( DEFAULT_BUTTONLABEL           )) ) ;
+    m_xTopic_Top->setText    ( OUString(RTL_CONSTASCII_USTRINGPARAM( PROGRESSMONITOR_DEFAULT_TOPIC )) ) ;
+    m_xText_Top->setText     ( OUString(RTL_CONSTASCII_USTRINGPARAM( PROGRESSMONITOR_DEFAULT_TEXT  )) ) ;
+    m_xTopic_Bottom->setText ( OUString(RTL_CONSTASCII_USTRINGPARAM( PROGRESSMONITOR_DEFAULT_TOPIC )) ) ;
+    m_xText_Bottom->setText  ( OUString(RTL_CONSTASCII_USTRINGPARAM( PROGRESSMONITOR_DEFAULT_TEXT  )) ) ;
+
+    --m_refCount ;
+}
+
+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 )
+        {
+            maTextlist_Top.push_back( pTextItem );
+        }
+        else
+        {
+            maTextlist_Bottom.push_back( pTextItem );
+        }
+    }
+
+    // ... 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 )
+        {
+            vector< IMPL_TextlistItem* >::iterator
+                itr = find( maTextlist_Top.begin(), maTextlist_Top.end(), pSearchItem );
+            if (itr != maTextlist_Top.end())
+                maTextlist_Top.erase(itr);
+        }
+        else
+        {
+            vector< IMPL_TextlistItem* >::iterator
+                itr = find( maTextlist_Bottom.begin(), maTextlist_Bottom.end(), pSearchItem );
+            if (itr != maTextlist_Bottom.end())
+                maTextlist_Bottom.erase(itr);
+        }
+
+        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 (PROGRESSMONITOR_DEFAULT_WIDTH, PROGRESSMONITOR_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 * PROGRESSMONITOR_FREEBORDER          ;
+    nWidth  +=  aProgressBarSize.Width  ;
+
+    nHeight  =  6 * PROGRESSMONITOR_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 < PROGRESSMONITOR_DEFAULT_WIDTH )
+    {
+        nWidth = PROGRESSMONITOR_DEFAULT_WIDTH ;
+    }
+    if ( nHeight < PROGRESSMONITOR_DEFAULT_HEIGHT )
+    {
+        nHeight = PROGRESSMONITOR_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(RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_PROGRESSMONITOR ));
+    return seqServiceNames ;
+}
+
+//____________________________________________________________________________________________________________
+//  impl but public method to register service
+//____________________________________________________________________________________________________________
+
+const OUString ProgressMonitor::impl_getStaticImplementationName()
+{
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( 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 ( PROGRESSMONITOR_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 ( PROGRESSMONITOR_LINECOLOR_BRIGHT                          ) ;
+        rGraphics->drawLine     ( nX, nY, impl_getWidth(), nY               ) ;
+        rGraphics->drawLine     ( nX, nY, nX             , impl_getHeight() ) ;
+
+        // Paint 3D-line
+        rGraphics->setLineColor ( PROGRESSMONITOR_LINECOLOR_SHADOW  ) ;
+        rGraphics->drawLine     ( m_a3DLine.X, m_a3DLine.Y, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y ) ;
+
+        rGraphics->setLineColor ( PROGRESSMONITOR_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_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            =   PROGRESSMONITOR_FREEBORDER                              ;
+    nY_Topic_Top            =   PROGRESSMONITOR_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+PROGRESSMONITOR_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*PROGRESSMONITOR_FREEBORDER) ;
+    if ( nSummaryWidth < PROGRESSMONITOR_DEFAULT_WIDTH )
+        nWidth_Text_Top     =   PROGRESSMONITOR_DEFAULT_WIDTH-nWidth_Topic_Top-(3*PROGRESSMONITOR_FREEBORDER);
+    // Fix size of column to maximum!
+    if ( nSummaryWidth > impl_getWidth() )
+        nWidth_Text_Top     =   impl_getWidth()-nWidth_Topic_Top-(3*PROGRESSMONITOR_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+PROGRESSMONITOR_FREEBORDER       ;
+    nWidth_ProgressBar      =   PROGRESSMONITOR_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+PROGRESSMONITOR_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+PROGRESSMONITOR_FREEBORDER  ;
+    nY_Text_Bottom          =   nY_Topic_Bottom                                                 ;
+    nWidth_Text_Bottom      =   nWidth_Text_Top                                                 ;
+    nHeight_Text_Bottom     =   nHeight_Topic_Bottom                                            ;
+
+    // Oriented by progressbar.
+    nX_Button               =   nX_ProgressBar+nWidth_ProgressBar-nWidth_Button                 ;
+    nY_Button               =   nY_Topic_Bottom+nHeight_Topic_Bottom+PROGRESSMONITOR_FREEBORDER ;
+
+    // Calc offsets to center controls
+    sal_Int32   nDx ;
+    sal_Int32   nDy ;
+
+    nDx =   ( (2*PROGRESSMONITOR_FREEBORDER)+nWidth_ProgressBar                                                             ) ;
+    nDy =   ( (6*PROGRESSMONITOR_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+(PROGRESSMONITOR_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 ( PROGRESSMONITOR_LINECOLOR_SHADOW  ) ;
+    xGraphics->drawLine     ( m_a3DLine.X, m_a3DLine.Y, m_a3DLine.X+m_a3DLine.Width, m_a3DLine.Y ) ;
+
+    xGraphics->setLineColor ( PROGRESSMONITOR_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 ( size_t n = 0; n < maTextlist_Top.size(); ++n )
+        {
+            IMPL_TextlistItem* pSearchItem = maTextlist_Top[ n ];
+            aCollectString  +=  pSearchItem->sTopic ;
+            aCollectString  +=  OUString(RTL_CONSTASCII_USTRINGPARAM("\n"))             ;
+        }
+        aCollectString  +=  OUString(RTL_CONSTASCII_USTRINGPARAM("\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 ( size_t n = 0; n < maTextlist_Top.size(); ++n )
+        {
+            IMPL_TextlistItem* pSearchItem = maTextlist_Top[ n ];
+            aCollectString  +=  pSearchItem->sText ;
+            aCollectString  +=  OUString(RTL_CONSTASCII_USTRINGPARAM("\n"))            ;
+        }
+        aCollectString  +=  OUString(RTL_CONSTASCII_USTRINGPARAM("\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 ( size_t n = 0; n < maTextlist_Bottom.size(); ++n )
+        {
+            IMPL_TextlistItem* pSearchItem = maTextlist_Bottom[ n ];
+            aCollectString  +=  pSearchItem->sTopic ;
+            aCollectString  +=  OUString(RTL_CONSTASCII_USTRINGPARAM("\n"))             ;
+        }
+        aCollectString  +=  OUString(RTL_CONSTASCII_USTRINGPARAM("\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 ( size_t n = 0; n < maTextlist_Bottom.size(); ++n )
+        {
+            IMPL_TextlistItem* pSearchItem = maTextlist_Bottom[ n ];
+            aCollectString  +=  pSearchItem->sText ;
+            aCollectString  +=  OUString(RTL_CONSTASCII_USTRINGPARAM("\n"))            ;
+        }
+        aCollectString  +=  OUString(RTL_CONSTASCII_USTRINGPARAM("\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.
+
+    for ( size_t nPosition = 0; nPosition < maTextlist_Top.size() ; ++nPosition )
+    {
+        IMPL_TextlistItem* pSearchItem = maTextlist_Top[ nPosition ];
+        delete pSearchItem ;
+    }
+    maTextlist_Top.clear();
+
+    for ( size_t nPosition = 0; nPosition < maTextlist_Bottom.size() ; ++nPosition )
+    {
+        IMPL_TextlistItem* pSearchItem = maTextlist_Bottom[ nPosition ];
+        delete pSearchItem ;
+    }
+    maTextlist_Bottom.clear();
+}
+
+//____________________________________________________________________________________________________________
+//  private method
+//____________________________________________________________________________________________________________
+
+IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( const OUString& rTopic, sal_Bool bbeforeProgress )
+{
+    // Get right textlist for following operations.
+    ::std::vector< IMPL_TextlistItem* >* pTextList ;
+
+    // Ready for multithreading
+    ClearableMutexGuard aGuard ( m_aMutex ) ;
+
+    if ( bbeforeProgress == sal_True )
+    {
+        pTextList = &maTextlist_Top    ;
+    }
+    else
+    {
+        pTextList = &maTextlist_Bottom ;
+    }
+
+    // Switch off guard.
+    aGuard.clear () ;
+
+    // Search the topic in textlist.
+    size_t nPosition    = 0;
+    size_t nCount       = pTextList->size();
+
+    for ( nPosition = 0; nPosition < nCount ; ++nPosition )
+    {
+        IMPL_TextlistItem* pSearchItem = pTextList->at( 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
new file mode 100644
index 000000000000..1c5aed70a28c
--- /dev/null
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -0,0 +1,562 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_SERVICENAME )) ), UNO_QUERY );
+    m_xProgressBar  = Reference< XProgressBar > ( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( 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(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_MODELNAME )) ), UNO_QUERY ) );
+    // ... and add controls to basecontainercontrol!
+    addControl( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_TEXT          )), xTextControl    );
+    addControl( OUString(RTL_CONSTASCII_USTRINGPARAM( 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(RTL_CONSTASCII_USTRINGPARAM( STATUSINDICATOR_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 (STATUSINDICATOR_DEFAULT_WIDTH, STATUSINDICATOR_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*STATUSINDICATOR_FREEBORDER)+aTextSize.Height ;
+
+    // norm to minimum
+    if ( nWidth<STATUSINDICATOR_DEFAULT_WIDTH )
+    {
+        nWidth = STATUSINDICATOR_DEFAULT_WIDTH ;
+    }
+    if ( nHeight<STATUSINDICATOR_DEFAULT_HEIGHT )
+    {
+        nHeight = STATUSINDICATOR_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(RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_STATUSINDICATOR ));
+    return seqServiceNames ;
+}
+
+//____________________________________________________________________________________________________________
+//  impl but public method to register service
+//____________________________________________________________________________________________________________
+
+const OUString StatusIndicator::impl_getStaticImplementationName()
+{
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( 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(RTL_CONSTASCII_USTRINGPARAM("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( STATUSINDICATOR_BACKGROUNDCOLOR );
+
+        // FixedText background = gray
+        Reference< XControl > xTextControl( m_xText, UNO_QUERY );
+        xPeer = xTextControl->getPeer();
+        if( xPeer.is() == sal_True )
+            xPeer->setBackground( STATUSINDICATOR_BACKGROUNDCOLOR );
+
+        // Progress background = gray
+        xPeer = Reference< XWindowPeer >( m_xProgressBar, UNO_QUERY );
+        if( xPeer.is() == sal_True )
+            xPeer->setBackground( STATUSINDICATOR_BACKGROUNDCOLOR );
+
+        // paint shadow border
+        rGraphics->setLineColor ( STATUSINDICATOR_LINECOLOR_BRIGHT                          );
+        rGraphics->drawLine     ( nX, nY, impl_getWidth(), nY               );
+        rGraphics->drawLine     ( nX, nY, nX             , impl_getHeight() );
+
+        rGraphics->setLineColor ( STATUSINDICATOR_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 < STATUSINDICATOR_DEFAULT_WIDTH )
+    {
+        aWindowSize.Width = STATUSINDICATOR_DEFAULT_WIDTH;
+    }
+    if( aWindowSize.Height < STATUSINDICATOR_DEFAULT_HEIGHT )
+    {
+        aWindowSize.Height = STATUSINDICATOR_DEFAULT_HEIGHT;
+    }
+
+    // calc position and size of child controls
+    nX_Text             = STATUSINDICATOR_FREEBORDER                                    ;
+    nY_Text             = STATUSINDICATOR_FREEBORDER                                    ;
+    nWidth_Text         = aTextSize.Width                               ;
+    nHeight_Text        = aTextSize.Height                              ;
+
+    nX_ProgressBar      = nX_Text+nWidth_Text+STATUSINDICATOR_FREEBORDER                ;
+    nY_ProgressBar      = nY_Text                                       ;
+    nWidth_ProgressBar  = aWindowSize.Width-nWidth_Text-(3*STATUSINDICATOR_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 ) ;
+}
+
+}   // namespace unocontrols
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
new file mode 100644
index 000000000000..e0cc5a9b70b9
--- /dev/null
+++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
@@ -0,0 +1,265 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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 CSS_UNO     ::com::sun::star::uno
+#define CSS_LANG    ::com::sun::star::lang
+
+//______________________________________________________________________________________________________________
+//  defines
+//______________________________________________________________________________________________________________
+
+//______________________________________________________________________________________________________________
+//  class declaration OConnectionPointContainerHelper
+//______________________________________________________________________________________________________________
+
+class OConnectionPointContainerHelper   :   public  CSS_LANG::XConnectionPointContainer
+                                        ,   public  ::cppu::OWeakObject
+{
+
+//______________________________________________________________________________________________________________
+//  public methods
+//______________________________________________________________________________________________________________
+
+public:
+
+    //__________________________________________________________________________________________________________
+    //  construct/destruct
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    OConnectionPointContainerHelper( ::osl::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 CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
+        throw( CSS_UNO::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 CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getConnectionPointTypes()
+        throw( CSS_UNO::RuntimeException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual CSS_UNO::Reference< CSS_LANG::XConnectionPoint > SAL_CALL queryConnectionPoint(
+        const CSS_UNO::Type& aType
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL advise(
+        const   CSS_UNO::Type&                              aType ,
+        const   CSS_UNO::Reference< CSS_UNO::XInterface >&  xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL unadvise(
+        const   CSS_UNO::Type&                              aType       ,
+        const   CSS_UNO::Reference< CSS_UNO::XInterface >&  xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    ::cppu::OMultiTypeInterfaceContainerHelper& impl_getMultiTypeContainer();
+
+//______________________________________________________________________________________________________________
+//  private variables
+//______________________________________________________________________________________________________________
+
+private:
+
+    ::osl::Mutex&                                   m_aSharedMutex          ;
+    ::cppu::OMultiTypeInterfaceContainerHelper      m_aMultiTypeContainer   ;   // Container to hold listener
+
+};  // class OConnectionPointContainerHelper
+
+// The namespace aliases are only used in this header
+#undef CSS_UNO
+#undef CSS_LANG
+
+}   // namespace unocontrols
+
+#endif  // #ifndef _OCONNECTIONPOINTCONTAINERHELPER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx
new file mode 100644
index 000000000000..b36147e727cb
--- /dev/null
+++ b/UnoControls/source/inc/OConnectionPointHelper.hxx
@@ -0,0 +1,309 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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 CSS_UNO     ::com::sun::star::uno
+#define CSS_LANG    ::com::sun::star::lang
+
+//______________________________________________________________________________________________________________
+//  defines
+//______________________________________________________________________________________________________________
+
+//______________________________________________________________________________________________________________
+//  class declaration OConnectionPointHelper
+//______________________________________________________________________________________________________________
+
+class OConnectionPointHelper    :   public  CSS_LANG::XConnectionPoint
+                                ,   public  ::cppu::OWeakObject
+{
+
+//______________________________________________________________________________________________________________
+//  public methods
+//______________________________________________________________________________________________________________
+
+public:
+
+    //__________________________________________________________________________________________________________
+    //  construct/destruct
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    OConnectionPointHelper( ::osl::Mutex&                       aMutex                      ,
+                            OConnectionPointContainerHelper*    pContainerImplementation    ,
+                            CSS_UNO::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 CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
+        throw( CSS_UNO::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 CSS_UNO::Type SAL_CALL getConnectionType()
+        throw( CSS_UNO::RuntimeException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual CSS_UNO::Reference< CSS_LANG::XConnectionPointContainer > SAL_CALL getConnectionPointContainer()
+        throw( CSS_UNO::RuntimeException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL advise(
+        const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
+    ) throw (
+        CSS_LANG::ListenerExistException,
+        CSS_LANG::InvalidListenerException ,
+        CSS_UNO::RuntimeException
+    );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL unadvise( const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener )
+        throw( CSS_UNO::RuntimeException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual CSS_UNO::Sequence< CSS_UNO::Reference< CSS_UNO::XInterface > > SAL_CALL getConnections()
+        throw( CSS_UNO::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:
+
+    ::osl::Mutex&                                                   m_aSharedMutex              ;
+    CSS_UNO::WeakReference< CSS_LANG::XConnectionPointContainer >   m_oContainerWeakReference   ;   // Reference to container-class!. Don't use Reference<...>
+                                                                                            // It is a ring-reference => and must be a wekreference!
+    OConnectionPointContainerHelper*                                m_pContainerImplementation  ;
+    CSS_UNO::Type                                                   m_aInterfaceType            ;
+    CSS_UNO::Reference< CSS_UNO::XInterface >                       m_xLock                     ;
+
+};  // class OConnectionPointHelper
+
+// The namespace aliases are only used in this header
+#undef CSS_UNO
+#undef CSS_LANG
+
+}   // namespace unocontrols
+
+#endif  // #ifndef _OCONNECTIONPOINTHELPER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx
new file mode 100644
index 000000000000..5d068ad0cfa1
--- /dev/null
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -0,0 +1,641 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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 CSS_UNO     ::com::sun::star::uno
+#define CSS_LANG    ::com::sun::star::lang
+#define CSS_BEANS   ::com::sun::star::beans
+#define CSS_AWT     ::com::sun::star::awt
+#define CSS_FRAME   ::com::sun::star::frame
+
+//______________________________________________________________________________________________________________
+//  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 CSS_AWT::XControlModel
+                    , public CSS_LANG::XConnectionPointContainer
+                    , public BaseControl                                // This order is neccessary for right initialization of m_aMutex!
+                    , public ::cppu::OBroadcastHelper
+                    , public ::cppu::OPropertySetHelper
+{
+
+//______________________________________________________________________________________________________________
+//  public methods
+//______________________________________________________________________________________________________________
+
+public:
+
+    //__________________________________________________________________________________________________________
+    //  construct/destruct
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    FrameControl( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual ~FrameControl();
+
+    //__________________________________________________________________________________________________________
+    //  XInterface
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual CSS_UNO::Any SAL_CALL queryInterface(
+        const CSS_UNO::Type& aType
+    ) throw( CSS_UNO::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 CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes()
+        throw( CSS_UNO::RuntimeException );
+
+    //__________________________________________________________________________________________________________
+    //  XAggregation
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    CSS_UNO::Any SAL_CALL queryAggregation(
+        const CSS_UNO::Type& aType
+    ) throw( CSS_UNO::RuntimeException );
+
+    //__________________________________________________________________________________________________________
+    //  XControl
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL createPeer(
+        const CSS_UNO::Reference< CSS_AWT::XToolkit >&      xToolkit ,
+        const CSS_UNO::Reference< CSS_AWT::XWindowPeer >&   xParent
+    ) throw ( CSS_UNO::RuntimeException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual sal_Bool SAL_CALL setModel(
+        const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
+        throw( CSS_UNO::RuntimeException );
+
+    //__________________________________________________________________________________________________________
+    //  XComponent
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL dispose() throw( CSS_UNO::RuntimeException );
+
+    //__________________________________________________________________________________________________________
+    //  XView
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual sal_Bool SAL_CALL setGraphics(
+        const CSS_UNO::Reference< CSS_AWT::XGraphics >& xDevice
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual CSS_UNO::Reference< CSS_AWT::XGraphics > SAL_CALL getGraphics()
+        throw( CSS_UNO::RuntimeException );
+
+    //__________________________________________________________________________________________________________
+    //  XConnectionPointContainer
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getConnectionPointTypes()
+        throw( CSS_UNO::RuntimeException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual CSS_UNO::Reference< CSS_LANG::XConnectionPoint > SAL_CALL queryConnectionPoint(
+        const CSS_UNO::Type& aType
+    ) throw ( CSS_UNO::RuntimeException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL advise(
+        const CSS_UNO::Type&                                aType       ,
+        const CSS_UNO::Reference< CSS_UNO::XInterface >&    xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL unadvise(
+        const CSS_UNO::Type&                                aType ,
+        const CSS_UNO::Reference< CSS_UNO::XInterface >&    xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    //__________________________________________________________________________________________________________
+    //  impl but public methods to register service!
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    static const ::rtl::OUString impl_getStaticImplementationName();
+
+//______________________________________________________________________________________________________________
+//  protected methods
+//______________________________________________________________________________________________________________
+
+protected:
+    using OPropertySetHelper::getFastPropertyValue;
+    //__________________________________________________________________________________________________________
+    //  OPropertySetHelper
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual sal_Bool SAL_CALL convertFastPropertyValue(
+        CSS_UNO::Any&       rConvertedValue   ,
+        CSS_UNO::Any&       rOldValue         ,
+        sal_Int32           nHandle           ,
+        const CSS_UNO::Any& rValue
+    ) throw( CSS_LANG::IllegalArgumentException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
+        sal_Int32 nHandle ,
+        const CSS_UNO::Any& rValue
+    ) throw ( ::com::sun::star::uno::Exception );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL getFastPropertyValue( CSS_UNO::Any&   rValue  ,
+                                                sal_Int32       nHandle ) const ;
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
+
+    //__________________________________________________________________________________________________________
+    //  XPropertySet
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    CSS_UNO::Reference< CSS_BEANS::XPropertySetInfo > SAL_CALL getPropertySetInfo()
+        throw( CSS_UNO::RuntimeException );
+
+    //__________________________________________________________________________________________________________
+    //  BaseControl
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual CSS_AWT::WindowDescriptor* impl_getWindowDescriptor(
+        const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParentPeer
+    );
+
+//______________________________________________________________________________________________________________
+//  private methods
+//______________________________________________________________________________________________________________
+
+private:
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    void impl_createFrame(  const CSS_UNO::Reference< CSS_AWT::XWindowPeer >&       xPeer           ,
+                            const ::rtl::OUString&                                  sURL            ,
+                            const CSS_UNO::Sequence< CSS_BEANS::PropertyValue >&    seqArguments    );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    void impl_deleteFrame();
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    static const CSS_UNO::Sequence< CSS_BEANS::Property > impl_getStaticPropertyDescriptor();
+
+
+//______________________________________________________________________________________________________________
+//  private variables
+//______________________________________________________________________________________________________________
+
+private:
+
+    CSS_UNO::Reference< CSS_FRAME::XFrame >         m_xFrame                    ;
+    ::rtl::OUString                                 m_sComponentURL             ;
+    CSS_UNO::Sequence< CSS_BEANS::PropertyValue >   m_seqLoaderArguments        ;
+    ::cppu::OMultiTypeInterfaceContainerHelper      m_aInterfaceContainer       ;
+    OConnectionPointContainerHelper                 m_aConnectionPointContainer ;
+
+};  // class FrameControl
+
+// The namespace alaises are only used in the header
+#undef CSS_UNO
+#undef CSS_LANG
+#undef CSS_BEANS
+#undef CSS_AWT
+#undef CSS_FRAME
+
+}   // namespace unocontrols
+
+#endif  // #ifndef _UNOCONTROLS_FRAMECONTROL_CTRL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx
new file mode 100644
index 000000000000..97cad21816dd
--- /dev/null
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -0,0 +1,459 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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 CSS_UNO     ::com::sun::star::uno
+#define CSS_LANG    ::com::sun::star::lang
+#define CSS_AWT     ::com::sun::star::awt
+
+//____________________________________________________________________________________________________________
+//  defines
+//____________________________________________________________________________________________________________
+
+#define SERVICENAME_PROGRESSBAR             "com.sun.star.awt.XProgressBar"
+#define IMPLEMENTATIONNAME_PROGRESSBAR      "stardiv.UnoControls.ProgressBar"
+#define PROGRESSBAR_FREESPACE               4
+#define PROGRESSBAR_DEFAULT_HORIZONTAL      sal_True
+#define PROGRESSBAR_DEFAULT_BLOCKDIMENSION  Size(1,1)
+#define PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )    // lightgray
+#define PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR 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        TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )    // white
+#define PROGRESSBAR_LINECOLOR_SHADOW        TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )    // black
+
+//____________________________________________________________________________________________________________
+//  classes
+//____________________________________________________________________________________________________________
+
+class ProgressBar   : public CSS_AWT::XControlModel
+                    , public CSS_AWT::XProgressBar
+                    , public BaseControl
+{
+
+//____________________________________________________________________________________________________________
+//  public methods
+//____________________________________________________________________________________________________________
+
+public:
+
+    //________________________________________________________________________________________________________
+    //  construct/destruct
+    //________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    ProgressBar( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual ~ProgressBar();
+
+    //__________________________________________________________________________________________________________
+    //  XInterface
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
+        throw( CSS_UNO::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 CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes()
+        throw( CSS_UNO::RuntimeException );
+
+    //__________________________________________________________________________________________________________
+    //  XAggregation
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    CSS_UNO::Any SAL_CALL queryAggregation( const CSS_UNO::Type& aType )
+        throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XProgressBar
+    //________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL setForegroundColor( sal_Int32 nColor )
+        throw( CSS_UNO::RuntimeException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor )
+        throw( CSS_UNO::RuntimeException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( CSS_UNO::RuntimeException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void SAL_CALL setRange(
+        sal_Int32   nMin    ,
+        sal_Int32   nMax
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual sal_Int32 SAL_CALL getValue() throw( CSS_UNO::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( CSS_UNO::RuntimeException );
+
+    //__________________________________________________________________________________________________________
+    //  XControl
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual sal_Bool SAL_CALL setModel(
+        const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
+        throw( CSS_UNO::RuntimeException );
+
+    //__________________________________________________________________________________________________________
+    //  BaseControl
+    //__________________________________________________________________________________________________________
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    static const ::rtl::OUString impl_getStaticImplementationName();
+
+//____________________________________________________________________________________________________________
+//  protected methods
+//____________________________________________________________________________________________________________
+
+protected:
+
+    /**_________________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    virtual void impl_paint(
+        sal_Int32 nX ,
+        sal_Int32 nY ,
+        const CSS_UNO::Reference< CSS_AWT::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]
+    CSS_AWT::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
+
+// The namespace aliases are only used in the header
+#undef CSS_UNO
+#undef CSS_LANG
+#undef CSS_AWT
+
+}   // namespace unocontrols
+
+#endif  // #ifndef _UNOCONTROLS_PROGRESSBAR_CTRL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
new file mode 100644
index 000000000000..6d829249449f
--- /dev/null
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -0,0 +1,805 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+
+#include <vector>
+
+//____________________________________________________________________________________________________________
+//  includes of my own project
+//____________________________________________________________________________________________________________
+#include "basecontainercontrol.hxx"
+
+//____________________________________________________________________________________________________________
+//  namespace
+//____________________________________________________________________________________________________________
+
+namespace unocontrols{
+
+#define CSS_UNO     ::com::sun::star::uno
+#define CSS_AWT     ::com::sun::star::awt
+#define CSS_LANG    ::com::sun::star::lang
+
+//____________________________________________________________________________________________________________
+//  defines
+//____________________________________________________________________________________________________________
+
+#define SERVICENAME_PROGRESSMONITOR                     "com.sun.star.awt.XProgressMonitor"
+#define IMPLEMENTATIONNAME_PROGRESSMONITOR              "stardiv.UnoControls.ProgressMonitor"
+#define PROGRESSMONITOR_FREEBORDER                      10                                                      // border around and between the controls
+#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 PROGRESSMONITOR_DEFAULT_TOPIC                   "\0"
+#define PROGRESSMONITOR_DEFAULT_TEXT                    "\0"
+#define PROGRESSMONITOR_BACKGROUNDCOLOR                 TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )                // lighgray
+#define PROGRESSMONITOR_LINECOLOR_BRIGHT                TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )                // white
+#define PROGRESSMONITOR_LINECOLOR_SHADOW                TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )                // black
+#define PROGRESSMONITOR_DEFAULT_WIDTH                   350
+#define PROGRESSMONITOR_DEFAULT_HEIGHT                  100
+
+//____________________________________________________________________________________________________________
+//  structs, types
+//____________________________________________________________________________________________________________
+
+/// Item of TextList
+struct IMPL_TextlistItem
+{
+    ::rtl::OUString sTopic  ;   /// Left site of textline in dialog
+    ::rtl::OUString sText   ;   /// Right site of textline in dialog
+};
+
+//____________________________________________________________________________________________________________
+//  class declaration
+//____________________________________________________________________________________________________________
+
+class ProgressMonitor   : public CSS_AWT::XLayoutConstrains
+                        , public CSS_AWT::XButton
+                        , public CSS_AWT::XProgressMonitor
+                        , public BaseContainerControl
+{
+
+//____________________________________________________________________________________________________________
+//  public methods
+//____________________________________________________________________________________________________________
+
+public:
+
+    //________________________________________________________________________________________________________
+    //  construct/destruct
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short
+        @descr
+
+        @seealso
+
+        @param
+
+        @return
+
+        @onerror
+    */
+
+    ProgressMonitor( const CSS_UNO::Reference< CSS_LANG::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 CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
+        throw( CSS_UNO::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 CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes() throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XAggregation
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_UNO::Any SAL_CALL queryAggregation( const CSS_UNO::Type& aType )
+        throw( CSS_UNO::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 ::rtl::OUString& sTopic ,
+        const ::rtl::OUString& sText ,
+        sal_Bool bbeforeProgress
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeText(
+        const ::rtl::OUString& sTopic ,
+        sal_Bool bbeforeProgress
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL updateText(
+        const ::rtl::OUString&  sTopic ,
+        const ::rtl::OUString&  sText ,
+        sal_Bool bbeforeProgress
+    ) throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XProgressBar
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setRange( sal_Int32   nMin    ,
+                                    sal_Int32   nMax    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual sal_Int32 SAL_CALL getValue() throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XButton
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL addActionListener(
+        const CSS_UNO::Reference< CSS_AWT::XActionListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL removeActionListener(
+        const CSS_UNO::Reference< CSS_AWT::XActionListener >& xListener
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setLabel( const ::rtl::OUString& sLabel ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL setActionCommand( const ::rtl::OUString& sCommand )
+        throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XLayoutConstrains
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_AWT::Size SAL_CALL getMinimumSize() throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_AWT::Size SAL_CALL getPreferredSize() throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_AWT::Size SAL_CALL calcAdjustedSize( const CSS_AWT::Size& aNewSize )
+        throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XControl
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL createPeer(
+        const CSS_UNO::Reference< CSS_AWT::XToolkit     >& xToolkit ,
+        const CSS_UNO::Reference< CSS_AWT::XWindowPeer  >& xParent
+    ) throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual sal_Bool SAL_CALL setModel( const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel )
+        throw( CSS_UNO::RuntimeException );
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
+        throw( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  XComponent
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void SAL_CALL dispose() throw( CSS_UNO::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( CSS_UNO::RuntimeException );
+
+    //________________________________________________________________________________________________________
+    //  BaseControl
+    //________________________________________________________________________________________________________
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    static const ::rtl::OUString impl_getStaticImplementationName();
+
+//____________________________________________________________________________________________________________
+//  protected methods
+//____________________________________________________________________________________________________________
+
+protected:
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    virtual void impl_paint( sal_Int32 nX ,
+                             sal_Int32 nY ,
+                             const CSS_UNO::Reference< CSS_AWT::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 ::rtl::OUString& sTopic , sal_Bool bbeforeProgress );
+
+//____________________________________________________________________________________________________________
+// debug methods
+//____________________________________________________________________________________________________________
+
+private:
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+    #ifdef DBG_UTIL
+
+    sal_Bool impl_debug_checkParameter( const ::rtl::OUString& sTopic, const ::rtl::OUString& sText, sal_Bool bbeforeProgress );    // addText, updateText
+    sal_Bool impl_debug_checkParameter( const ::rtl::OUString& rTopic, sal_Bool bbeforeProgress );                              // removeText
+
+    #endif
+//____________________________________________________________________________________________________________
+// private variables
+//____________________________________________________________________________________________________________
+
+private:
+    ::std::vector < IMPL_TextlistItem* >        maTextlist_Top;         // Elements before progress
+    CSS_UNO::Reference< CSS_AWT::XFixedText >   m_xTopic_Top        ;   // (used, if parameter "beforeProgress"=sal_True in "addText, updateText, removeText")
+    CSS_UNO::Reference< CSS_AWT::XFixedText >   m_xText_Top         ;
+
+    ::std::vector < IMPL_TextlistItem* >        maTextlist_Bottom;      // Elements below of progress
+    CSS_UNO::Reference< CSS_AWT::XFixedText >   m_xTopic_Bottom     ;   // (used, if parameter "beforeProgress"=sal_False in "addText, updateText, removeText")
+    CSS_UNO::Reference< CSS_AWT::XFixedText >   m_xText_Bottom      ;
+
+    CSS_UNO::Reference< CSS_AWT::XProgressBar > m_xProgressBar      ;
+    CSS_UNO::Reference< CSS_AWT::XButton >      m_xButton           ;
+    CSS_AWT::Rectangle                          m_a3DLine           ;
+
+};  // class ProgressMonitor
+
+// The namespaces aliases are only used the this header
+#undef CSS_UNO
+#undef CSS_AWT
+#undef CSS_LANG
+
+}   // namespace unocontrols
+
+#endif  // #ifndef _UNOCONTROLS_PROGRESSMONITOR_CTRL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx
new file mode 100644
index 000000000000..d8e888f9dc42
--- /dev/null
+++ b/UnoControls/source/inc/statusindicator.hxx
@@ -0,0 +1,584 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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 CSS_UNO     ::com::sun::star::uno
+#define CSS_AWT     ::com::sun::star::awt
+#define CSS_LANG    ::com::sun::star::lang
+#define CSS_TASK    ::com::sun::star::task
+
+//____________________________________________________________________________________________________________
+//  defines
+//____________________________________________________________________________________________________________
+
+#define SERVICENAME_STATUSINDICATOR             "com.sun.star.task.XStatusIndicator"
+#define IMPLEMENTATIONNAME_STATUSINDICATOR      "stardiv.UnoControls.StatusIndicator"
+#define STATUSINDICATOR_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 STATUSINDICATOR_DEFAULT_TEXT            "\0"
+#define STATUSINDICATOR_BACKGROUNDCOLOR         TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )                // lighgray
+#define STATUSINDICATOR_LINECOLOR_BRIGHT        TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )                // white
+#define STATUSINDICATOR_LINECOLOR_SHADOW        TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )                // black
+#define STATUSINDICATOR_DEFAULT_WIDTH           300
+#define STATUSINDICATOR_DEFAULT_HEIGHT          25
+
+//____________________________________________________________________________________________________________
+//  structs, types
+//____________________________________________________________________________________________________________
+
+//____________________________________________________________________________________________________________
+//  class declaration
+//____________________________________________________________________________________________________________
+
+class StatusIndicator   : public CSS_AWT::XLayoutConstrains
+                        , public CSS_TASK::XStatusIndicator
+                        , public BaseContainerControl
+{
+
+    //-------------------------------------------------------------------------------------------------------------
+    //  public methods
+    //-------------------------------------------------------------------------------------------------------------
+
+    public:
+
+        //---------------------------------------------------------------------------------------------------------
+        //  construct/destruct
+        //---------------------------------------------------------------------------------------------------------
+
+        /**_______________________________________________________________________________________________________
+            @short
+            @descr
+
+            @seealso
+
+            @param
+
+            @return
+
+            @onerror
+        */
+
+        StatusIndicator( const CSS_UNO::Reference< CSS_LANG::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 CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
+            throw( CSS_UNO::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 CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes()
+            throw( CSS_UNO::RuntimeException );
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XAggregation
+        //---------------------------------------------------------------------------------------------------------
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual CSS_UNO::Any SAL_CALL queryAggregation( const CSS_UNO::Type& aType )
+            throw( CSS_UNO::RuntimeException );
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XStatusIndicator
+        //---------------------------------------------------------------------------------------------------------
+
+        /*-****************************************************************************************************//**
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        *//*-*****************************************************************************************************/
+
+        virtual void SAL_CALL start(
+            const ::rtl::OUString&  sText   ,
+            sal_Int32 nRange
+        ) throw( CSS_UNO::RuntimeException );
+
+        /*-****************************************************************************************************//**
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        *//*-*****************************************************************************************************/
+
+        virtual void SAL_CALL end() throw( CSS_UNO::RuntimeException );
+
+        /*-****************************************************************************************************//**
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        *//*-*****************************************************************************************************/
+
+        virtual void SAL_CALL reset() throw( CSS_UNO::RuntimeException );
+
+        /*-****************************************************************************************************//**
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        *//*-*****************************************************************************************************/
+
+        virtual void SAL_CALL setText( const ::rtl::OUString& sText ) throw( CSS_UNO::RuntimeException );
+
+        /*-****************************************************************************************************//**
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        *//*-*****************************************************************************************************/
+
+        virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( CSS_UNO::RuntimeException );
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XLayoutConstrains
+        //---------------------------------------------------------------------------------------------------------
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual CSS_AWT::Size SAL_CALL getMinimumSize() throw( CSS_UNO::RuntimeException );
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual CSS_AWT::Size SAL_CALL getPreferredSize() throw( CSS_UNO::RuntimeException );
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual CSS_AWT::Size SAL_CALL calcAdjustedSize( const CSS_AWT::Size& aNewSize )
+            throw( CSS_UNO::RuntimeException );
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XControl
+        //---------------------------------------------------------------------------------------------------------
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual void SAL_CALL createPeer(
+            const   CSS_UNO::Reference< CSS_AWT::XToolkit >&    xToolkit    ,
+            const   CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParent
+        ) throw( CSS_UNO::RuntimeException );
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual sal_Bool SAL_CALL setModel( const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel )
+            throw( CSS_UNO::RuntimeException );
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
+            throw( CSS_UNO::RuntimeException );
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XComponent
+        //---------------------------------------------------------------------------------------------------------
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual void SAL_CALL dispose() throw( CSS_UNO::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( CSS_UNO::RuntimeException );
+
+        //---------------------------------------------------------------------------------------------------------
+        //  BaseControl
+        //---------------------------------------------------------------------------------------------------------
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        static const ::rtl::OUString impl_getStaticImplementationName();
+
+//____________________________________________________________________________________________________________
+//  protected methods
+//____________________________________________________________________________________________________________
+
+protected:
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual CSS_AWT::WindowDescriptor* impl_getWindowDescriptor(
+            const CSS_UNO::Reference< CSS_AWT::XWindowPeer >& xParentPeer
+        );
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual void impl_paint (
+            sal_Int32 nX,
+            sal_Int32 nY,
+            const CSS_UNO::Reference< CSS_AWT::XGraphics > & rGraphics
+        );
+
+        /**_______________________________________________________________________________________________________
+            @short      -
+            @descr      -
+
+            @seealso    -
+
+            @param      -
+
+            @return     -
+
+            @onerror    -
+        */
+
+        virtual void impl_recalcLayout( const CSS_AWT::WindowEvent& aEvent );
+
+//____________________________________________________________________________________________________________
+// debug methods
+//____________________________________________________________________________________________________________
+
+private:
+
+    /**_______________________________________________________________________________________________________
+        @short      -
+        @descr      -
+
+        @seealso    -
+
+        @param      -
+
+        @return     -
+
+        @onerror    -
+    */
+
+//____________________________________________________________________________________________________________
+// private variables
+//____________________________________________________________________________________________________________
+
+private:
+
+    CSS_UNO::Reference< CSS_AWT::XFixedText >       m_xText         ;
+    CSS_UNO::Reference< CSS_AWT::XProgressBar >     m_xProgressBar  ;
+
+};  // class StatusIndicator
+
+// The name space aliases are only used in the header
+#undef CSS_UNO
+#undef CSS_AWT
+#undef CSS_LANG
+#undef CSS_TASK
+
+}   // namespace unocontrols
+
+#endif  // #ifndef _UNOCONTROLS_STATUSINDICATOR_CTRL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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..e54c2405c686
--- /dev/null
+++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
@@ -0,0 +1,317 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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
+//------------------------------------------------------------------------
+
+#ifdef WNT
+#include <prewin.h>
+#include <postwin.h>
+#endif
+
+#include <WindowsAccessBridgeAdapter.h>
+
+#include <wtypes.h>
+#include <rtl/process.h>
+#include <tools/link.hxx>
+
+#include <vcl/svapp.hxx>
+#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>
+
+#include "jvmaccess/unovirtualmachine.hxx"
+
+#include "jvmaccess/virtualmachine.hxx"
+
+#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 occurred */
+    }
+    g_jmRegisterTopWindow =
+        pJNIEnv->GetStaticMethodID(clazz, "registerTopWindow", "(ILcom/sun/star/accessibility/XAccessible;)V");
+    if (0 == g_jmRegisterTopWindow) {
+        return 0; /* jni error occurred */
+    }
+    g_jmRevokeTopWindow =
+        pJNIEnv->GetStaticMethodID(clazz, "revokeTopWindow", "(ILcom/sun/star/accessibility/XAccessible;)V");
+    if (0 == g_jmRevokeTopWindow) {
+        return 0; /* jni error occurred */
+    }
+
+    // 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 occurred.
+                    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;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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..5aeb21c112db
--- /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" && "$(SOLAR_JAVA)" != ""
+
+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" && "$(SOLAR_JAVA)" != ""
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :	target.mk
+
+.IF "$(GUI)"=="WNT" && "$(SOLAR_JAVA)" != ""
+
+$(SLO)$/WindowsAccessBridgeAdapter.obj : $(SHL1HEADER)
+
+$(SHL1HEADER) :
+    javah -classpath $(OUT)$/class -o $(SHL1HEADER) org.openoffice.accessibility.WindowsAccessBridgeAdapter
+
+.ENDIF			# "$(GUI)"=="WNT"  && "$(SOLAR_JAVA)" != ""
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
new file mode 100644
index 000000000000..82c09c8b13bc
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
@@ -0,0 +1,313 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
new file mode 100644
index 000000000000..67f0574ab436
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
@@ -0,0 +1,520 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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 {
+
+// ============================================================================
+
+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 SolarMutexGuard, public OslMutexGuard
+{
+public:
+    inline SolarMethodGuard( AccessibleBrowseBoxBase& _rOwner, bool _bEnsureAlive = true )
+        :SolarMutexGuard( )
+        ,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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
new file mode 100644
index 000000000000..74f0631d9670
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
@@ -0,0 +1,95 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+#include "accessibility/extended/accessiblebrowseboxcell.hxx"
+#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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx
new file mode 100644
index 000000000000..92cb1b5d2d71
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx
@@ -0,0 +1,283 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx
new file mode 100644
index 000000000000..2c55887462cb
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx
@@ -0,0 +1,83 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx
new file mode 100644
index 000000000000..021f1c614324
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx
@@ -0,0 +1,177 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
new file mode 100644
index 000000000000..d775104614c6
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
@@ -0,0 +1,282 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx
new file mode 100644
index 000000000000..b689235908c5
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx
@@ -0,0 +1,145 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
new file mode 100644
index 000000000000..ff31cb78bfaa
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
@@ -0,0 +1,267 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
new file mode 100644
index 000000000000..383c6410eaeb
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
@@ -0,0 +1,462 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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 {
+
+// ============================================================================
+
+// ============================================================================
+
+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 SolarMutexGuard, public OslMutexGuard
+{
+public:
+    inline TC_SolarMethodGuard( AccessibleGridControlBase& _rOwner, bool _bEnsureAlive = true )
+        : SolarMutexGuard(),
+        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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
new file mode 100644
index 000000000000..6732fa2b6576
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
@@ -0,0 +1,220 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
new file mode 100644
index 000000000000..f7f02f5828b0
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx
@@ -0,0 +1,104 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
new file mode 100644
index 000000000000..1d79e1d2d199
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
@@ -0,0 +1,228 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
new file mode 100644
index 000000000000..daa6fd179ef6
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
@@ -0,0 +1,230 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx
new file mode 100644
index 000000000000..7dd2d982e186
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx
@@ -0,0 +1,170 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
new file mode 100644
index 000000000000..fb8664e521e4
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
@@ -0,0 +1,94 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
new file mode 100644
index 000000000000..295d6e6624bd
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
@@ -0,0 +1,95 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
new file mode 100644
index 000000000000..83ca6d8101c7
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
@@ -0,0 +1,110 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx
new file mode 100644
index 000000000000..3314648ac6e7
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx
@@ -0,0 +1,89 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
new file mode 100644
index 000000000000..2abe7d871022
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
@@ -0,0 +1,156 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+#include "accessiblebrowseboxcell.hxx"
+#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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx
new file mode 100644
index 000000000000..2289dd45baec
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx
@@ -0,0 +1,121 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
new file mode 100644
index 000000000000..59b70062ffb3
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
@@ -0,0 +1,199 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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:
+        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_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx b/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
new file mode 100644
index 000000000000..9e81e7eed7d4
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
@@ -0,0 +1,127 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
new file mode 100644
index 000000000000..4521c0e0d03e
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx
@@ -0,0 +1,225 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessibletabbar.hxx b/accessibility/inc/accessibility/extended/accessibletabbar.hxx
new file mode 100644
index 000000000000..d7b43bc5870c
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessibletabbar.hxx
@@ -0,0 +1,122 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx b/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx
new file mode 100644
index 000000000000..b4e62f517d3f
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessibletabbarbase.hxx
@@ -0,0 +1,80 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx b/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx
new file mode 100644
index 000000000000..756d2fff4b35
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx
@@ -0,0 +1,139 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx
new file mode 100644
index 000000000000..cc5dc276cd24
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx
@@ -0,0 +1,143 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx
new file mode 100644
index 000000000000..4e6f03af3c9b
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx
@@ -0,0 +1,117 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
new file mode 100644
index 000000000000..153dc76f2a65
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx
@@ -0,0 +1,124 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/listboxaccessible.hxx b/accessibility/inc/accessibility/extended/listboxaccessible.hxx
new file mode 100644
index 000000000000..b82291f91e79
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/listboxaccessible.hxx
@@ -0,0 +1,98 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
new file mode 100644
index 000000000000..6fc675ba5b15
--- /dev/null
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -0,0 +1,714 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 <boost/unordered_map.hpp>
+
+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 ::boost::unordered_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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
new file mode 100644
index 000000000000..37bfd1997409
--- /dev/null
+++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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/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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/helper/acc_factory.hxx b/accessibility/inc/accessibility/helper/acc_factory.hxx
new file mode 100644
index 000000000000..b3dec4607517
--- /dev/null
+++ b/accessibility/inc/accessibility/helper/acc_factory.hxx
@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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..4208d6d80f06
--- /dev/null
+++ b/accessibility/inc/accessibility/helper/accresmgr.hxx
@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+#include <rtl/ustring.hxx>
+
+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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx b/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
new file mode 100644
index 000000000000..16e37f4e103c
--- /dev/null
+++ b/accessibility/inc/accessibility/helper/characterattributeshelper.hxx
@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+#include <com/sun/star/uno/Sequence.hxx>
+#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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/helper/listboxhelper.hxx b/accessibility/inc/accessibility/helper/listboxhelper.hxx
new file mode 100644
index 000000000000..c928735e42ea
--- /dev/null
+++ b/accessibility/inc/accessibility/helper/listboxhelper.hxx
@@ -0,0 +1,198 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx
new file mode 100644
index 000000000000..9dee945787ff
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx
@@ -0,0 +1,157 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+#include <cppuhelper/implbase2.hxx>
+#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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx
new file mode 100644
index 000000000000..d33d3e05e0dd
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx
@@ -0,0 +1,102 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+#include <cppuhelper/implbase1.hxx>
+
+
+//  ----------------------------------------------------
+//  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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx
new file mode 100644
index 000000000000..730175e685a2
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx
@@ -0,0 +1,98 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
new file mode 100644
index 000000000000..1aa73ab26a2b
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
@@ -0,0 +1,182 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp>
+#include <cppuhelper/implbase2.hxx>
+
+
+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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx
new file mode 100644
index 000000000000..f1e74db2fb2e
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx
@@ -0,0 +1,88 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+
+#include <cppuhelper/implbase2.hxx>
+
+
+//  ----------------------------------------------------
+//  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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx
new file mode 100644
index 000000000000..7545a7c93756
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx
@@ -0,0 +1,95 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+
+#include <cppuhelper/implbase2.hxx>
+
+
+//  ----------------------------------------------------
+//  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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx
new file mode 100644
index 000000000000..3eba57f58bca
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx
@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <cppuhelper/implbase1.hxx>
+
+
+/** 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx
new file mode 100644
index 000000000000..c90e91b179d5
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx
@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+#include <accessibility/standard/vclxaccessibleedit.hxx>
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/weakref.hxx>
+
+
+/** 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx
new file mode 100644
index 000000000000..67e942b7a917
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx
@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/weakref.hxx>
+
+
+/** 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx b/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx
new file mode 100644
index 000000000000..9fc77a0c8e7c
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx
@@ -0,0 +1,121 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+
+#include <cppuhelper/implbase2.hxx>
+
+
+//  ----------------------------------------------------
+//  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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx
new file mode 100644
index 000000000000..9777ed472104
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx
@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx
new file mode 100644
index 000000000000..2caaee09f7e6
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx
@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
new file mode 100644
index 000000000000..f0c640e901f1
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
@@ -0,0 +1,226 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
+#include <cppuhelper/implbase2.hxx>
+
+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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx
new file mode 100644
index 000000000000..52c07318c720
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx
@@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
new file mode 100644
index 000000000000..9dc4936988a8
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx
@@ -0,0 +1,198 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+#include <cppuhelper/compbase6.hxx>
+#include <comphelper/broadcasthelper.hxx>
+#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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
new file mode 100644
index 000000000000..6103dbeb6fe7
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx
@@ -0,0 +1,86 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+
+#include <cppuhelper/implbase1.hxx>
+
+
+//  ----------------------------------------------------
+//  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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
new file mode 100644
index 000000000000..ffe565fcd1db
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx
@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
new file mode 100644
index 000000000000..78e08bc4d0af
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx
@@ -0,0 +1,119 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+
+#include <cppuhelper/implbase3.hxx>
+#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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx
new file mode 100644
index 000000000000..0cfb3e50545b
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx
@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx
new file mode 100644
index 000000000000..536241abab4e
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx
@@ -0,0 +1,62 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx
new file mode 100644
index 000000000000..649b844a0159
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx
@@ -0,0 +1,86 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+
+#include <cppuhelper/implbase2.hxx>
+
+
+//  ----------------------------------------------------
+//  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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx
new file mode 100644
index 000000000000..b1d26c84f7cb
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx
@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+
+#include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#include <com/sun/star/accessibility/XAccessibleValue.hpp>
+
+#include <cppuhelper/implbase2.hxx>
+
+
+//  ----------------------------------------------------
+//  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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx
new file mode 100644
index 000000000000..60d88e1c9f14
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx
@@ -0,0 +1,82 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx
new file mode 100644
index 000000000000..1c7525764c40
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx
@@ -0,0 +1,144 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+#include <cppuhelper/implbase2.hxx>
+
+
+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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx
new file mode 100644
index 000000000000..b46eadcd9a23
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx
@@ -0,0 +1,105 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx
new file mode 100644
index 000000000000..9380d517158c
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx
@@ -0,0 +1,148 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+#include <cppuhelper/implbase2.hxx>
+
+
+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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx
new file mode 100644
index 000000000000..cf7c2de10d3c
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx
@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx
new file mode 100644
index 000000000000..187bfb107f8a
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx
@@ -0,0 +1,95 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx
new file mode 100644
index 000000000000..b01c63fe8e4e
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx
@@ -0,0 +1,105 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+
+#include <cppuhelper/implbase1.hxx>
+
+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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
new file mode 100644
index 000000000000..846dfea93967
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx
@@ -0,0 +1,115 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
new file mode 100644
index 000000000000..df08e601eae0
--- /dev/null
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
@@ -0,0 +1,168 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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>
+#include <com/sun/star/accessibility/XAccessibleAction.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/accessibility/XAccessibleValue.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <cppuhelper/implbase4.hxx>
+#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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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..291aae11e94a
--- /dev/null
+++ b/accessibility/inc/pch/precompiled_accessibility.cxx
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/inc/pch/precompiled_accessibility.hxx b/accessibility/inc/pch/precompiled_accessibility.hxx
new file mode 100644
index 000000000000..18f4375ba801
--- /dev/null
+++ b/accessibility/inc/pch/precompiled_accessibility.hxx
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/prj/build.lst b/accessibility/prj/build.lst
new file mode 100644
index 000000000000..469a59e79351
--- /dev/null
+++ b/accessibility/prj/build.lst
@@ -0,0 +1,18 @@
+ac  accessibility	:    TRANSLATIONS:translations 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..f0a97b33bb24
--- /dev/null
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -0,0 +1,395 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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;
+}
+
+// XAccessibleComponent -------------------------------------------------------
+
+Reference< XAccessible > SAL_CALL
+AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint )
+    throw ( uno::RuntimeException )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 (there is no listener, so it won't tell us explicitily when this happens),
+    // then reset and 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
new file mode 100644
index 000000000000..24cc3ce52f2a
--- /dev/null
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -0,0 +1,660 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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() )
+    {
+        SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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)
+{
+    SolarMutexGuard 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)
+{
+    SolarMutexGuard 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
+
+// ============================================================================
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
new file mode 100644
index 000000000000..2353a25007aa
--- /dev/null
+++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
@@ -0,0 +1,174 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 );
+    }
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
new file mode 100644
index 000000000000..b40253c2e100
--- /dev/null
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -0,0 +1,421 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    mpBrowseBox->SetNoSelection();
+}
+
+void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAllAccessibleChildren()
+    throw ( uno::RuntimeException )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return isRowBar() ? implGetSelectedRowCount() : implGetSelectedColumnCount();
+}
+
+Reference< XAccessible > SAL_CALL
+AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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
+
+// ============================================================================
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
new file mode 100644
index 000000000000..8fa50319f5db
--- /dev/null
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
@@ -0,0 +1,175 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 );
+
+        SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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
+// -----------------------------------------------------------------------------
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
new file mode 100644
index 000000000000..1e10f902cf2a
--- /dev/null
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -0,0 +1,280 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+
+    Sequence< sal_Int32 > aSelSeq;
+    implGetSelectedRows( aSelSeq );
+    return aSelSeq;
+}
+
+Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleColumns()
+    throw ( uno::RuntimeException )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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& )
+        {
+            OSL_FAIL( "implGetHeaderBar - wrong child index" );
+        }
+        // RuntimeException goes to caller
+    }
+    return Reference< XAccessibleTable >( xRet, uno::UNO_QUERY );
+}
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
new file mode 100644
index 000000000000..825689cf3185
--- /dev/null
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
@@ -0,0 +1,357 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return implGetRowCount();
+}
+
+sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumnCount()
+    throw ( uno::RuntimeException )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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
+
+// ============================================================================
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
new file mode 100644
index 000000000000..a8d1ac975ad5
--- /dev/null
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -0,0 +1,357 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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
+    {
+        static 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();
+        }
+
+        static 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)
+    {
+        SolarMutexGuard 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!");
+        SolarMutexGuard 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()
+    {
+        SolarMutexGuard 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 )
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getCharacterCount(  );
+    }
+
+    ::rtl::OUString SAL_CALL AccessibleBrowseBoxTableCell::getSelectedText(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        SolarMutexGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getSelectedText(  );
+    }
+    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getSelectionStart(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        SolarMutexGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getSelectionStart(  );
+    }
+    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getSelectionEnd(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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();
+            }
+    }
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
new file mode 100644
index 000000000000..f48415e518d4
--- /dev/null
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -0,0 +1,375 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 )
+{
+    SolarMutexGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return m_aTable.GetAccessibleControlCount();
+}
+// -----------------------------------------------------------------------------
+
+Reference< XAccessible > SAL_CALL
+AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex )
+    throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
new file mode 100644
index 000000000000..bf1fb2cca520
--- /dev/null
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -0,0 +1,537 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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)
+{
+    SolarMutexGuard 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)
+{
+    SolarMutexGuard 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
+
+// ============================================================================
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
new file mode 100644
index 000000000000..464d5842163d
--- /dev/null
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -0,0 +1,286 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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
+
+// ============================================================================
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
new file mode 100644
index 000000000000..830f1e876aa7
--- /dev/null
+++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
@@ -0,0 +1,172 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 );
+
+        SolarMutexGuard 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
+// -----------------------------------------------------------------------------
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
new file mode 100644
index 000000000000..4c2c5d130582
--- /dev/null
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -0,0 +1,378 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    m_aTable.SelectAllRows( false );
+}
+void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren()
+    throw ( uno::RuntimeException )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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& )
+        {
+            OSL_FAIL( "implGetHeaderBar - wrong child index" );
+        }
+        // RuntimeException goes to caller
+    }
+    return Reference< XAccessibleTable >( xRet, uno::UNO_QUERY );
+}
+
+// ============================================================================
+
+} // namespace accessibility
+
+// ============================================================================
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
new file mode 100644
index 000000000000..5dc6032eab7a
--- /dev/null
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -0,0 +1,293 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard aSolarGuard;
+    ::osl::MutexGuard aGuard( getOslMutex() );
+    ensureIsAlive();
+    return  m_aTable.GetRowCount();
+}
+
+sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumnCount()
+    throw ( uno::RuntimeException )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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 )
+{
+    SolarMutexGuard 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
+
+// ============================================================================
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
new file mode 100644
index 000000000000..12a70990c41f
--- /dev/null
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -0,0 +1,370 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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
+    {
+        // FIXME this is a copy'n'paste from
+        // source/extended/AccessibleBrowseBoxTableCell.cxx, get rid of that...
+        static 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();
+        }
+    }
+    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 )
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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()
+    {
+        SolarMutexGuard 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 )
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getCharacterCount(  );
+    }
+
+    ::rtl::OUString SAL_CALL AccessibleGridControlTableCell::getSelectedText(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        SolarMutexGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getSelectedText(  );
+    }
+    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionStart(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        SolarMutexGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( getOslMutex() );
+        return OCommonAccessibleText::getSelectionStart(  );
+    }
+    sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionEnd(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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
+    }
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
new file mode 100644
index 000000000000..be2245474174
--- /dev/null
+++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx
@@ -0,0 +1,410 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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 <osl/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()
+            {
+                i_rImpl.checkDisposed();
+            }
+            ~MethodGuard()
+            {
+            }
+
+        private:
+            SolarMutexGuard  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
+//......................................................................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
new file mode 100644
index 000000000000..f4864c95a860
--- /dev/null
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -0,0 +1,457 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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 <osl/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()
+            {
+                i_rImpl.checkDisposed();
+            }
+            ~MethodGuard()
+            {
+            }
+
+        private:
+            SolarMutexGuard  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
+//......................................................................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
new file mode 100644
index 000000000000..b621124cbe5f
--- /dev/null
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
@@ -0,0 +1,453 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public 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 <osl/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()
+        {
+            i_rImpl.checkDisposed();
+        }
+        ~ItemMethodGuard()
+        {
+        }
+
+    private:
+        SolarMutexGuard  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
+//......................................................................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx
new file mode 100644
index 000000000000..708d7bb0aabc
--- /dev/null
+++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx
@@ -0,0 +1,94 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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
+// .................................................................................
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
new file mode 100644
index 000000000000..30c300ced2a8
--- /dev/null
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -0,0 +1,276 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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_FAIL( "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
+// .................................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
new file mode 100644
index 000000000000..ec970a5db414
--- /dev/null
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -0,0 +1,374 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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
+//........................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
new file mode 100644
index 000000000000..117975bcd6f4
--- /dev/null
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -0,0 +1,734 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 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();
+        }
+    }
+    // -----------------------------------------------------------------------------
+    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 )
+    {
+        SolarMutexGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+        return GetBoundingBox_Impl();
+    }
+    // -----------------------------------------------------------------------------
+    Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen() throw ( lang::DisposedException )
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getCharacterCount(  );
+    }
+
+    ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectedText(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        SolarMutexGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getSelectedText(  );
+    }
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectionStart(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        SolarMutexGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getSelectionStart(  );
+    }
+    sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectionEnd(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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
+//........................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
new file mode 100644
index 000000000000..5ad861d9da12
--- /dev/null
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -0,0 +1,434 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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;
+
+                // #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
+//........................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
new file mode 100644
index 000000000000..27390c51ce1c
--- /dev/null
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -0,0 +1,962 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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 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 )
+    {
+        SolarMutexGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        EnsureIsAlive();
+        return GetBoundingBox_Impl();
+    }
+    // -----------------------------------------------------------------------------
+    Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen() throw ( lang::DisposedException )
+    {
+        SolarMutexGuard 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()
+    {
+        SolarMutexGuard();
+        ::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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getCharacterCount(  );
+    }
+
+    ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getSelectedText(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        SolarMutexGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getSelectedText(  );
+    }
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectionStart(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        SolarMutexGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+        return OCommonAccessibleText::getSelectionStart(  );
+    }
+    sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectionEnd(  ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard 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)
+    {
+        SolarMutexGuard aSolarGuard;
+        ::osl::MutexGuard aGuard( m_aMutex );
+        EnsureIsAlive();
+
+        return OCommonAccessibleText::getTextBehindIndex( nIndex ,aTextType);
+    }
+//........................................................................
+}// namespace accessibility
+//........................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
new file mode 100644
index 000000000000..61bd754c8d6a
--- /dev/null
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -0,0 +1,557 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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( RTL_CONSTASCII_USTRINGPARAM( "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( RTL_CONSTASCII_USTRINGPARAM( "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
+//.........................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx
new file mode 100644
index 000000000000..4fa22f9bc602
--- /dev/null
+++ b/accessibility/source/extended/accessibletabbarbase.cxx
@@ -0,0 +1,116 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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
+//.........................................................................
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx
new file mode 100644
index 000000000000..201187701bbb
--- /dev/null
+++ b/accessibility/source/extended/accessibletabbarpage.cxx
@@ -0,0 +1,514 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General 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( RTL_CONSTASCII_USTRINGPARAM( "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( RTL_CONSTASCII_USTRINGPARAM( "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 >();
+    }
+
+    // -----------------------------------------------------------------------------
author	Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>	2017-05-28 17:51:40 +0200
committer	Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>	2017-05-28 18:20:52 +0200
commit	f12656527a34992d7b1a20618c359859f5c8e4a1 (patch)
tree	a0803ca6ba16a19a1727e1d7985d7abec2a45994 /source/hsb/svl
parent	ffe364726be8d78394cc5080d928b354e65febfb (diff)