update translations for master/6.1 beta1

Change-Id: Id00bd53ed610ba876b177611fec18813fe7f0e36
Merge branch 'master' into feature/gsoc2011_wizards
author: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> 2018-05-23 11:50:50 +0200
committer: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> 2018-05-23 12:11:07 +0200
commit: e33719de813bcef0fd2285ff6b6748f3513a3108 (patch)
tree: ef26a62b1faaf1d0a8168c843e352744bb3ee364 /source/ru/starmath
parent: 70836fdf7467a34f5a5ac03c576e9ebe535f5cde (diff)
1 files changed, 66 insertions, 71 deletions
diff --git a/source/ru/starmath/messages.po b/source/ru/starmath/messages.po
index bbc671c8769..02b1647faa3 100644
--- a/source/ru/starmath/messages.po
+++ b/source/ru/starmath/messages.po
@@ -3,7 +3,7 @@ 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: 2018-04-24 12:21+0200\n"
+"POT-Creation-Date: 2018-05-08 15:10+0200\n"
 "PO-Revision-Date: 2017-10-18 12:11+0000\n"
 "Last-Translator: bormant <bormant@mail.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1941,32 +1941,27 @@ msgctxt "alignmentdialog|label1"
 msgid "Horizontal"
 msgstr "Горизонтальное"
 
-#: starmath/uiconfig/smath/ui/catalogdialog.ui:9
+#: starmath/uiconfig/smath/ui/catalogdialog.ui:8
 msgctxt "catalogdialog|CatalogDialog"
 msgid "Symbols"
 msgstr "Символы"
 
 #: starmath/uiconfig/smath/ui/catalogdialog.ui:24
-msgctxt "catalogdialog|insert"
-msgid "_Insert"
-msgstr "Вставить"
-
-#: starmath/uiconfig/smath/ui/catalogdialog.ui:55
 msgctxt "catalogdialog|edit"
 msgid "_Edit..."
 msgstr "Изменить..."
 
-#: starmath/uiconfig/smath/ui/catalogdialog.ui:102
+#: starmath/uiconfig/smath/ui/catalogdialog.ui:38
+msgctxt "catalogdialog|insert"
+msgid "_Insert"
+msgstr "Вставить"
+
+#: starmath/uiconfig/smath/ui/catalogdialog.ui:103
 msgctxt "catalogdialog|label1"
 msgid "_Symbol set:"
 msgstr "Набор символов:"
 
-#: starmath/uiconfig/smath/ui/catalogdialog.ui:123
-msgctxt "catalogdialog|symbolsetdisplay"
-msgid "button"
-msgstr "кнопка"
-
-#: starmath/uiconfig/smath/ui/catalogdialog.ui:152
+#: starmath/uiconfig/smath/ui/catalogdialog.ui:127
 msgctxt "catalogdialog|symbolname"
 msgid "Unknown"
 msgstr "Неизвестный"
@@ -1986,12 +1981,12 @@ msgctxt "fontdialog|formulaL"
 msgid "Font"
 msgstr "Шрифт"
 
-#: starmath/uiconfig/smath/ui/fontdialog.ui:150
+#: starmath/uiconfig/smath/ui/fontdialog.ui:151
 msgctxt "fontdialog|bold"
 msgid "_Bold"
 msgstr "Жирный"
 
-#: starmath/uiconfig/smath/ui/fontdialog.ui:165
+#: starmath/uiconfig/smath/ui/fontdialog.ui:166
 msgctxt "fontdialog|italic"
 msgid "_Italic"
 msgstr "Курсив"
@@ -2046,101 +2041,101 @@ msgctxt "fontsizedialog|label1"
 msgid "Relative Sizes"
 msgstr "Относительные"
 
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:9
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:12
+msgctxt "fonttypedialog|menuitem1"
+msgid "_Variables"
+msgstr "Переменные"
+
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:20
+msgctxt "fonttypedialog|menuitem2"
+msgid "_Functions"
+msgstr "Функции"
+
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:28
+msgctxt "fonttypedialog|menuitem3"
+msgid "_Numbers"
+msgstr "Числа"
+
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:36
+msgctxt "fonttypedialog|menuitem4"
+msgid "_Text"
+msgstr "Текст"
+
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:44
+msgctxt "fonttypedialog|menuitem5"
+msgid "_Serif"
+msgstr "С засечками"
+
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:52
+msgctxt "fonttypedialog|menuitem6"
+msgid "S_ans-serif"
+msgstr "Без засечек"
+
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:60
+msgctxt "fonttypedialog|menuitem7"
+msgid "Fixe_d-width"
+msgstr "Моноширинный"
+
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:68
 msgctxt "fonttypedialog|FontsDialog"
 msgid "Fonts"
 msgstr "Шрифты"
 
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:24
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:83
 msgctxt "fonttypedialog|modify"
 msgid "_Modify"
 msgstr "Изменить"
 
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:53
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:117
 msgctxt "fonttypedialog|default"
 msgid "_Default"
 msgstr "По умолчанию"
 
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:135
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:199
 msgctxt "fonttypedialog|label1"
 msgid "_Variables:"
 msgstr "Переменные:"
 
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:152
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:216
 msgctxt "fonttypedialog|label2"
 msgid "_Functions:"
 msgstr "Функции:"
 
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:169
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:233
 msgctxt "fonttypedialog|label3"
 msgid "_Numbers:"
 msgstr "Числа:"
 
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:186
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:250
 msgctxt "fonttypedialog|label4"
 msgid "_Text:"
 msgstr "Текст:"
 
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:251
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:315
 msgctxt "fonttypedialog|formulaL"
 msgid "Formula Fonts"
 msgstr "Шрифты формул"
 
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:288
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:352
 msgctxt "fonttypedialog|label5"
 msgid "_Serif:"
 msgstr "С засечками:"
 
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:305
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:369
 msgctxt "fonttypedialog|label6"
 msgid "S_ans-serif:"
 msgstr "Без засечек:"
 
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:322
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:386
 msgctxt "fonttypedialog|label7"
 msgid "F_ixed-width:"
 msgstr "Моноширинный:"
 
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:376
+#: starmath/uiconfig/smath/ui/fonttypedialog.ui:440
 msgctxt "fonttypedialog|customL"
 msgid "Custom Fonts"
 msgstr "Шрифты пользователя"
 
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:424
-msgctxt "fonttypedialog|menuitem1"
-msgid "_Variables"
-msgstr "Переменные"
-
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:432
-msgctxt "fonttypedialog|menuitem2"
-msgid "_Functions"
-msgstr "Функции"
-
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:440
-msgctxt "fonttypedialog|menuitem3"
-msgid "_Numbers"
-msgstr "Числа"
-
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:448
-msgctxt "fonttypedialog|menuitem4"
-msgid "_Text"
-msgstr "Текст"
-
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:456
-msgctxt "fonttypedialog|menuitem5"
-msgid "_Serif"
-msgstr "С засечками"
-
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:464
-msgctxt "fonttypedialog|menuitem6"
-msgid "S_ans-serif"
-msgstr "Без засечек"
-
-#: starmath/uiconfig/smath/ui/fonttypedialog.ui:472
-msgctxt "fonttypedialog|menuitem7"
-msgid "Fixe_d-width"
-msgstr "Моноширинный"
-
 #: starmath/uiconfig/smath/ui/printeroptions.ui:32
 msgctxt "printeroptions|title"
 msgid "Title"
@@ -2506,42 +2501,42 @@ msgctxt "symdefinedialog|EditSymbols"
 msgid "Edit Symbols"
 msgstr "Правка символов"
 
-#: starmath/uiconfig/smath/ui/symdefinedialog.ui:101
+#: starmath/uiconfig/smath/ui/symdefinedialog.ui:103
 msgctxt "symdefinedialog|oldSymbolSetText"
 msgid "O_ld symbol set:"
 msgstr "Прежний набор:"
 
-#: starmath/uiconfig/smath/ui/symdefinedialog.ui:146
+#: starmath/uiconfig/smath/ui/symdefinedialog.ui:148
 msgctxt "symdefinedialog|oldSymbolText"
 msgid "_Old symbol:"
 msgstr "_Прежний символ:"
 
-#: starmath/uiconfig/smath/ui/symdefinedialog.ui:244
+#: starmath/uiconfig/smath/ui/symdefinedialog.ui:246
 msgctxt "symdefinedialog|modify"
 msgid "_Modify"
 msgstr "Изменить"
 
-#: starmath/uiconfig/smath/ui/symdefinedialog.ui:299
+#: starmath/uiconfig/smath/ui/symdefinedialog.ui:301
 msgctxt "symdefinedialog|symbolText"
 msgid "_Symbol:"
 msgstr "Символ:"
 
-#: starmath/uiconfig/smath/ui/symdefinedialog.ui:313
+#: starmath/uiconfig/smath/ui/symdefinedialog.ui:315
 msgctxt "symdefinedialog|symbolSetText"
 msgid "Symbol s_et:"
 msgstr "Набор символов:"
 
-#: starmath/uiconfig/smath/ui/symdefinedialog.ui:327
+#: starmath/uiconfig/smath/ui/symdefinedialog.ui:329
 msgctxt "symdefinedialog|fontText"
 msgid "_Font:"
 msgstr "Шрифт:"
 
-#: starmath/uiconfig/smath/ui/symdefinedialog.ui:341
+#: starmath/uiconfig/smath/ui/symdefinedialog.ui:343
 msgctxt "symdefinedialog|styleText"
 msgid "S_tyle:"
 msgstr "Стиль:"
 
-#: starmath/uiconfig/smath/ui/symdefinedialog.ui:355
+#: starmath/uiconfig/smath/ui/symdefinedialog.ui:357
 msgctxt "symdefinedialog|fontsSubsetFT"
 msgid "S_ubset:"
 msgstr "Подмножество:"
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 9ea0cd6ebaf0..ddc5d8042ab4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,87 @@
 # backup and temporary files
 *~
 .*.sw[op]
-.gitattributes
+
+# 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..e25b46e61189
--- /dev/null
+++ b/GNUmakefile.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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)/RepositoryModule_*.mk))))
+
+# vim: set noet sw=4 ts=4:
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 000000000000..8090bcb6e740
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,136 @@
+# @configure_input@
+
+SHELL=/usr/bin/env bash
+
+ifeq ($(USE_GMAKE),)
+GBUILD_OPT:=
+else
+GBUILD_OPT:=--gmake
+endif
+
+all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded cross-build-toolset.built
+	@. ./Env.Host.sh && \
+        cd instsetoo_native && \
+        build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
+
+cross-build-toolset.built:
+ifeq (@CROSS_COMPILING@,YES)
+	@. ./Env.Build.sh && \
+	cd cross_toolset && \
+	build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ && \
+	touch $@
+else
+	touch $@
+endif
+
+install:
+	@. ./Env.Host.sh && \
+	echo "Installing in @INSTALLDIR@..." && \
+	ooinstall "@INSTALLDIR@" && \
+	echo "" && \
+	echo "Installation finished, you can now execute:" && \
+	echo "@INSTALLDIR@/program/soffice"
+
+distro-pack-install: install
+	./bin/distro-install-clean-up
+	./bin/distro-install-desktop-integration
+	./bin/distro-install-sdk
+	./bin/distro-install-file-lists
+
+dev-install:
+	@. ./Env.Host.sh && \
+	cd smoketestoo_native && \
+		export SAL_USE_VCLPLUGIN="svp" && \
+		build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all:instsetoo_native -- -P@BUILD_MAX_JOBS@ && \
+		cd @abs_builddir@ && ln -s $$SOLARVER/$$INPATH/installation/opt/ install && \
+		echo "" && \
+	$$SOLARENV/bin/linkoo $$SRC_ROOT/install $$SRC_ROOT && \
+	echo && echo "Developer installation finished, you can now execute:" && echo && \
+	if test `uname -s` = Darwin; then \
+		echo open install/LibreOffice.app; \
+	else \
+		echo "cd @abs_builddir@/install/program" && \
+		echo ". ./ooenv" && \
+		echo "./soffice.bin"; \
+	fi
+
+distclean:
+	-rm config.cache
+	-rm config.log
+ifeq (@BUILD_DMAKE@,YES)
+	-$(GNUMAKE) -C dmake distclean
+endif
+
+clean:
+	. ./Env.Host.sh && \
+	rm -rf */$$INPATH && \
+	rm -rf solver/*/$$INPATH && \
+	rm -rf workdir && \
+	rm -rf install
+ifeq (@BUILD_DMAKE@,YES)
+	. ./Env.Host.sh && \
+	(if [ -f dmake/Makefile ] ; then $$GNUMAKE -C dmake clean; fi) && \
+	rm -f solenv/*/bin/dmake*
+endif
+ifeq (@CROSS_COMPILING@,YES)
+	. ./Env.Host.sh && \
+	rm -rf */$$INPATH_FOR_BUILD && \
+	rm -rf solver/*/$$INPATH_FOR_BUILD
+endif
+
+dmake/dmake@EXEEXT_FOR_BUILD@:
+	./bootstrap
+	-rm cross-build-toolset.built
+
+src.downloaded: ooo.lst download
+ifeq (@DO_FETCH_TARBALLS@,YES)
+	@. ./Env.Host.sh && \
+	$$SRC_ROOT/download $$SRC_ROOT/ooo.lst && touch $@
+else
+	@echo "Automatic fetching of external tarballs is disabled."
+endif
+
+fetch: src.downloaded
+
+Makefile: configure.in ooo.lst.in set_soenv.in Makefile.in
+	./autogen.sh
+
+check: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ fetch
+	@. ./Env.Host.sh && \
+	cd smoketestoo_native && \
+	export SAL_USE_VCLPLUGIN="svp" && \
+        build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
+	@. ./Env.Host.sh && $$SOLARENV/bin/subsequenttests
+
+id:
+	@. ./Env.Host.sh && \
+		create-ids
+
+tags:
+	@. ./Env.Host.sh && \
+		create-tags
+
+docs:
+	@. ./Env.Host.sh && \
+		mkdocs.sh $$SRC_ROOT/docs $$SOLARENV/inc/doxygen.cfg
+
+findunusedcode:
+# experimental callcatcher target
+# http://www.skynet.ie/~caolan/Packages/callcatcher.html
+	@which callcatcher > /dev/null 2>&1 || \
+	 (echo "callcatcher not installed" && false)
+	@. ./Env.Host.sh && \
+	   source <(sed -e s,$$INPATH,callcatcher,g ./Env.Host.sh) && \
+	   . ./solenv/bin/callcatchEnv.Set.sh && \
+	   cd instsetoo_native && \
+	   build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
+	@. ./Env.Host.sh && \
+	   source <(sed -e s,$$INPATH,callcatcher,g ./Env.Host.sh) && \
+	   callanalyse \
+	       $$WORKDIR/LinkTarget/*/* \
+	       */$$OUTPATH/bin/* \
+	       */$$OUTPATH/lib/* > unusedcode.all
+#because non-c++ symbols could be dlsymed lets make a list of class level
+#unused methods which don't require much effort to determine if they need
+#to be just removed, or put behind appropiate platform or debug level ifdefs
+	@grep ::.*\( unusedcode.all | grep -v cppu::bootstrap > unusedcode.easy
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..9690bd4d2cd4
--- /dev/null
+++ b/Mesa/prj/d.lst
@@ -0,0 +1,3 @@
+mkdir: %_DEST%\inc\GL
+
+..\inc\*.h %_DEST%\inc\GL\*.h
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
new file mode 100644
index 000000000000..2cf5cdba0d3a
--- /dev/null
+++ b/Module_tail_build.mk
@@ -0,0 +1,54 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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. 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
+# Norbert Thiebaud <nthiebaud@gmail.com> (C) 2011, All Rights Reserved.
+#
+# 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.
+
+
+$(eval $(call gb_Module_Module,tail_end))
+
+$(eval $(call gb_Module_add_moduledirs,tail_end,\
+    animations \
+    basctl \
+    chart2 \
+    cui \
+    dbaccess \
+    fileaccess \
+    forms \
+    formula \
+    hwpfilter \
+    lotuswordpro \
+    oox \
+    padmin \
+    reportdesign \
+    sc \
+    sccomp \
+    sd \
+    slideshow \
+    starmath \
+    sw \
+    unoxml \
+    uui \
+    wizards \
+    writerfilter \
+    writerperfect \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/README.cross b/README.cross
new file mode 100644
index 000000000000..640b63055cc3
--- /dev/null
+++ b/README.cross
@@ -0,0 +1,271 @@
+Cross-compiling LibreOffice
+===========================
+
+Notes on cross-compiling LibreOffice, written by Tor Lillqvist
+<tlillqvist@novell.com> <tml@iki.fi> in May, 2011.
+
+Cross-compilation of LibreOffice is not possible yet. Some initial
+work is done, "baby steps", but a lot remains. This work is highly
+experimental and done mostly in my own spare time just for the hacking
+pleasure. No promise, explicit or implied, is given that it will ever
+be finished.
+
+Searching for information about cross-compilation of OpenOffice.org
+(the predecessor of LibreOffice) you will find information about what
+actually was not cross-compilation, but using QEMU.
+
+My cross-compilation experimentation is going on for four platforms:
+Windows, iOS, Android and PowerPC Mac OS X. I work on the master
+branch of LibreOffice. Some other people have talked about setting up
+a separate branch for Android work, or even separate clones at
+github. I am not interested in that.
+
+
+General
+-------
+
+In GNU Autoconf terminology, "build" is the platform on which you are
+running a build on some software and "host" is the platform on which
+the software you are building will run. Only in the specific case of
+building compilers and other programming tools is the term "target"
+used to indicate the platform for which the tools your are building
+will produce code. As LibreOffice is not a compiler, the "target" term
+should not be used in the context of cross-compilation.
+
+(For a case where all three of "build", "host" and "target" are
+different: consider a gcc cross-compiler running on Windows, producing
+code for Android, where the cross-compiler itself was built on
+Linux. (This is a real case.) An interesting tidbit is that such
+configurations are called "Canadian Cross".)
+
+Even though the LibreOffice build mechanism is highly unorthodox, the
+configure script takes the normal --build and --host options like any
+GNU Autoconf -based configure script. To cross-compile, you basically
+need just to specify a suitable --host option and things should work
+out nicely. In practise, some more details might be needed. See
+examples below.
+
+
+What is so hard, then?
+----------------------
+
+Despite the fact that the configure script takes normal --build and
+--host options, that is just the beginning. In practise a lot of work
+was necessary to separate tests for "host" and "build" platforms in
+the configure script. See the git log for details. And the reasonably
+"standard" configure.in is just the top level; when we get down to the
+actual makefilery used to build the bits of LibreOffice, it gets much
+worse.
+
+
+Windows
+-------
+
+There is some support in LibreOffice already (from OpenOffice.org) for
+building it locally on Windows but with the GNU tool-chain, i.e. what
+is commonly known as MinGW. But as far as I know, that work has never
+attempted cross-compilation.
+
+This OOo-originated MinGW support attempts to support both running
+Cygwin gcc in its -mno-cygwin mode, and a native MinGW compiler.  The
+-mno-cygwin mechanism in the Cygwin gcc is rapidly being obsoleted, if
+it isn't already, and I have not attempted to check that it keeps
+working. Ditto for native MinGW; if one compiles natively on Windows,
+why not use Microsoft's compiler, as OOo/LO has been build for Windows
+all the time using that and it works fine.
+
+In my opinion, the only case where it makes sense to use MinGW is for
+cross-compilation. There is just too much crack on Windows anyway, and
+it is a semi-miracle (well, make that the result of years of work)
+that the MSVC build under Cygwin works as nicely as it does.
+
+MinGW is available as cross-build toolchains pre-packaged in more or
+less official packages for many Linux distros including Debian, Fedora
+and openSUSE. Personally I use the mingw32 packages in the openSUSE
+Build Service, running on openSUSE:
+
+http://download.opensuse.org/repositories/windows:/mingw:/win32/
+
+[You can install it like:
+
+zypper ar http://download.opensuse.org/repositories/windows:/mingw:/win32/SLE_11_SP1/windows:mingw:win32.repo
+zypper in mingw32-cross-gcc mingw32-python-devel mingw32-libexpat-devel \
+    mingw32-libexpat mingw32-boost-devel mingw32-libhyphen-devel \
+    mingw32-libhyphen mingw32-hyphen-en mingw32-liblpsolve-devel
+
+There might be more that are missing, please read carefully what autogen.sh
+tells you, and either remove one of the --with-system-*, or install the
+missing dependency. ]
+
+It is somewhat unclear how well thought-out the conditionals and code
+for MinGW inside the OOo-originated code in LibreOffice actually
+is. The little I have seen of it seems a bit randomish, with
+copy-pasting having been preferred to factoring out differences.
+
+The autogen.lastrun I use for my MinGW cross-compilation experimentation is:
+
+CC=ccache i686-w64-mingw32-gcc
+CXX=ccache i686-w64-mingw32-g++
+CC_FOR_BUILD=ccache gcc
+CXX_FOR_BUILD=ccache g++
+--build=x86_64-unknown-linux-gnu
+--host=i686-w64-mingw32
+--with-distro=LibreOfficeWin32
+--disable-binfilter
+--disable-build-mozilla
+--disable-directx
+--disable-ext-nlpsolver
+--disable-ext-pdfimport
+--disable-ext-presenter-console
+--disable-ext-presenter-minimizer
+--disable-ext-report-builder
+--disable-ext-scripting-beanshell
+--disable-ext-scripting-javascript
+--disable-ext-wiki-publisher
+--disable-ext-wiki-publisher
+--disable-mozilla
+--disable-zenity
+--enable-python=system
+--with-external-tar=/mnt/hemulen/ooo/git/master/src
+--with-num-cpus=1
+--with-max-jobs=1
+--with-system-altlinuxhyph
+--with-system-boost
+--with-system-cairo
+--with-system-cppunit
+--with-system-curl
+--with-system-db
+--with-system-expat
+--with-system-gettext
+--with-system-hunspell
+--with-system-icu
+--with-system-libpng
+--with-system-libwpd
+--with-system-libwpg
+--with-system-libwps
+--with-system-libxml
+--with-system-libxslt
+--with-system-lpsolve
+--with-system-mythes
+--with-system-neon
+--with-system-openssl
+--with-system-redland
+--with-vendor=no
+
+
+iOS
+---
+
+iOS is the operating system of Apple's mobile devices. Clearly for a
+device like the iPad it would be totally unacceptable to run a normal
+LibreOffice application with a overlapping windows and mouse-oriented
+GUI widgets. No work has been done (at least publicly) to design a
+touch GUI for LibreOffice, so the work on cross-compiling LibreOffice
+for iOS is extremely experimental, and of course partly pointless;)
+But it is interesting and fun nonetheless.
+
+Obviously it will make sense to build only a part of LibreOffice's
+code for iOS. Most likely all GUI-oriented code should be left out,
+and some iOS app that eventually wants to use the remaining bits will
+handle all its GUI in a platform-dependent manner. How well it will be
+possible to do such a split remains to be seen. As I said, this is
+highly experimental and just in its baby steps phase.
+
+Technically, one important special aspect of iOS is that apps are not
+allowed to load own dynamic libraries. (System libraries are used in
+the form of dynamic libraries, just like on MacOSX, of which iOS is a
+variant.) So all the libraries in LibreOffice that normally are shared
+libraries (DLLs on Windows, shared objects (.so) on Linux, dynamic
+libraries on MacOSX (.dylib)) need to be built as static archives
+instead. Obviously this will have some interesting consequences for
+how UNO is implemented and used. None of that has been spared much
+thought yet.
+
+The Apple tool-chain for iOS cross-building is available only for
+MacOSX, so that is where I have been doing it.
+
+Here is my autogen.lastrun for iOS (device):
+CXX=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
+CC=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk
+CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0
+CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0
+--with-distro=LibreOfficeiOS
+--with-external-tar=/Volumes/ooo/git/master/src
+--with-num-cpus=1
+--with-max-jobs=1
+
+And here for the iOS simulator:
+CXX=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++-4.2 -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
+CC=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc-4.2 -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
+CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0
+CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0
+--with-distro=LibreOfficeiOS
+--with-external-tar=/Volumes/ooo/git/master/src
+--with-num-cpus=1
+--with-max-jobs=1
+--disable-librsvg
+--enable-debug
+
+
+Android
+-------
+
+I don't know much about Android, but from a technical point of view it
+is a kind of Linux, of course. As far as I know it is allowed for an
+Android app to use shared objects, but if it isn't, then just the same
+approach as used on iOS will need to be used.
+
+As for the GUI, the same holds as said above for iOS.
+
+I have done my Android cross-compilation work on Linux (openSUSE in
+particular), but it could as well be done on MacOSX. The Android
+cross-buld tool-chain (the "Native Development Kit", or NDK) is
+available for Linux, MacOSX and Windows. (Trying to cross-compile from
+Windows will probably drive you insane.)
+
+Here is my autogen.lastrun for Android:
+SYSBASE=/home/tml/android-ndk-r5c/platforms/android-9/arch-arm
+CC=ccache /home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot /home/tml/android-ndk-r5c/platforms/android-9/arch-arm
+CXX=ccache /home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ --sysroot /home/tml/android-ndk-r5c/platforms/android-9/arch-arm -I /home/tml/android-ndk-r5c/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r5c/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r5c/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti
+AR=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar
+NM=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm
+OBJDUMP=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump
+RANLIB=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ranlib
+STRIP=/home/tml/android-ndk-r5c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-strip
+CC_FOR_BUILD=ccache gcc
+CXX_FOR_BUILD=ccache g++
+--build=x86_64-unknown-linux-gnu
+--disable-zenity
+--with-distro=LibreOfficeAndroid
+--with-external-tar=/mnt/hemulen/ooo/git/master/src
+--disable-python
+--with-num-cpus=1
+--with-max-jobs=1
+
+
+PowerPC Mac OS X
+----------------
+
+Cross-compiling for PowerPC Mac OS X from Intel Mac OS X will probably
+be easy. The APIs available should after all be closely identical to
+those on Intel Mac OS X, and LibreOffice builds fine natively on
+PowerPC Mac already. I have just started experimenting with it. My
+autogen.lastrun looks like this:
+
+CC=ccache /Xcode3/usr/bin/gcc-4.0 -arch ppc
+CXX=ccache /Xcode3/usr/bin/g++-4.0 -arch ppc
+CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0
+CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0
+--build=i386-apple-darwin10.7.0
+--host=powerpc-apple-darwin10
+--disable-mozilla
+--disable-build-mozilla
+--with-external-tar=/Volumes/ooo/git/master/src
+
+
+
+That's all, thank you, and have a nice day. People with commit access,
+feel free to edit this document, and add yourself below. Sorry for
+writing now initially from such a personal point of view.
+
+--Tor Lillqvist <tlillqvist@novell.com>, <tml@iki.fi>
diff --git a/Repository.mk b/Repository.mk
new file mode 100644
index 000000000000..381fd61403be
--- /dev/null
+++ b/Repository.mk
@@ -0,0 +1,261 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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 \
+))
+
+$(eval $(call gb_Helper_register_executables,OOO, \
+    spadmin.bin \
+))
+
+$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+	adabas \
+	adabasui \
+	agg \
+	analysis \
+	animcore \
+	basctl \
+	basebmp \
+	canvastools \
+	date \
+	forui \
+	odbc \
+	odbcbase \
+	oox \
+	ooxml \
+	sdbc \
+    AppleRemote \
+    avmedia \
+    basegfx \
+    chartcontroller \
+    chartmodel \
+    charttools \
+    chartview \
+    cppcanvas \
+    cui \
+    dba \
+    dbaxml \
+    dbmm \
+    dbtools \
+    dbu \
+    desktop_detector \
+    doctok \
+    drawinglayer \
+    editeng \
+    for \
+    frm \
+    fwe \
+    fwi \
+    fwk \
+    fwl \
+    fwm \
+    hwp \
+    i18npaper \
+    i18nregexp \
+    lng \
+    lwpft \
+    msfilter \
+    msword \
+	msworks \
+    qstart_gtk \
+    resourcemodel \
+    rpt \
+    rptui \
+    rptxml \
+	rtftok \
+    sax \
+    sb \
+    sc \
+    scd \
+    scfilt \
+    scui \
+    sd \
+    sdbt \
+    sdd \
+    sdfilt \
+    sdui \
+    sfx \
+    sm \
+    smd \
+	solver \
+    sot \
+    spa \
+    svl \
+    svt \
+    svx \
+    svxcore \
+    sw \
+    swd \
+    swui \
+    textconversiondlgs \
+    tk \
+    tl \
+    unordf \
+    unoxml \
+    utl \
+	uui \
+    vbahelper \
+    vcl \
+    vclplug_gen \
+    vclplug_gtk \
+    vclplug_gtk3 \
+    vclplug_kde \
+    vclplug_kde4 \
+    vclplug_svp \
+	visioimport \
+	wpft \
+	wpgimport \
+    writerfilter \
+    xcr \
+    xo \
+    xof \
+))
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+	xmlreader \
+))
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	collator_data \
+	dict_ja \
+	dict_zh \
+	fileacc \
+	index_data \
+	localedata_en \
+	localedata_es \
+	localedata_euro \
+	localedata_others \
+	mcnttype \
+	neon \
+	test \
+	textconv_dict \
+	xmlsecurity \
+	xsec_fw \
+	xsec_xmlsec \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	dnd \
+	dtrans \
+	ftransl \
+	sysdtrans \
+))
+endif
+
+ifeq ($(OS),IOS)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+    sal_textenc \
+))
+endif
+
+$(eval $(call gb_Helper_register_libraries,RTLIBS, \
+    comphelper \
+    i18nisolang1 \
+    i18nutil \
+    jvmaccess \
+    ucbhelper \
+))
+
+$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
+    cppuhelper \
+    salhelper \
+))
+
+$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+	cairocanvas \
+	canvasfactory \
+	directx5canvas \
+	directx9canvas \
+	expwrap \
+	fastsax \
+    fsstorage \
+	gdipluscanvas \
+    hatchwindowfactory \
+	i18npool \
+	i18nsearch \
+    lomenubar \
+    msforms \
+	mtfrenderer \
+	nullcanvas \
+    OGLTrans \
+    passwordcontainer \
+    productregistration \
+	simplecanvas \
+    slideshow \
+    vbaobj \
+    vbaswobj \
+	vclcanvas \
+    writerfilter_uno \
+	writerfilter_debug \
+))
+
+
+$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
+    cppu \
+    jvmfwk \
+    sal \
+))
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+	app \
+	basegfx_s \
+    dtobj \
+    libeay32 \
+    ssleay32 \
+    ooopathutils \
+	sample \
+    salcpprt \
+	vclmain \
+	writerperfect \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	xmlsec1 \
+	xmlsec1-nss \
+	xmlsec1-mscrypto \
+))
+else
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+	xmlsec1 \
+	xmlsec1-nss \
+	xmlsec1-mscrypto \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
new file mode 100644
index 000000000000..08c34dc8f3f8
--- /dev/null
+++ b/RepositoryExternal.mk
@@ -0,0 +1,741 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+# this file describes all the external libraries
+# depending on the configure options these may be taken from the system,
+# or the internal/bundled copy may be built.
+
+# for every external, a function gb_LinkTarget_use__FOO is defined,
+# once for the system case, once for the internal case.
+
+# in the system case, no libraries should be registered, but the target-local
+# variable LIBS should be set to FOO_LIBS, and INCLUDES to FOO_CFLAGS.
+
+ifeq ($(SYSTEM_CPPUNIT),YES)
+
+define gb_LinkTarget__use_cppunit
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+    $(CPPUNIT_CFLAGS) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+    $(CPPUNIT_LIBS) \
+)
+
+endef
+
+else
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
+    cppunit \
+))
+
+define gb_LinkTarget__use_cppunit
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+    cppunit \
+)
+
+endef
+
+endif
+
+ifeq ($(SYSTEM_ZLIB),YES)
+
+define gb_LinkTarget__use_zlib
+$(call gb_LinkTarget_add_defs,$(1),\
+	-DSYSTEM_ZLIB \
+)
+$(call gb_LinkTarget_add_libs,$(1),-lz)
+
+endef
+
+else # !SYSTEM_ZLIB
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+	zlib \
+))
+
+define gb_LinkTarget__use_zlib
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+	zlib \
+)
+
+endef
+
+endif # SYSTEM_ZLIB
+
+
+ifeq ($(SYSTEM_JPEG),YES)
+
+define gb_LinkTarget__use_jpeg
+$(call gb_LinkTarget_add_libs,$(1),-ljpeg)
+$(call gb_LinkTarget_set_ldflags,$(1),\
+	$$(filter-out -L/usr/lib/jvm%,$$(T_LDFLAGS)) \
+)
+
+endef
+
+else # !SYSTEM_JPEG
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+	jpeglib \
+))
+
+define gb_LinkTarget__use_jpeg
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+	jpeglib \
+)
+
+endef
+
+endif # SYSTEM_JPEG
+
+
+ifeq ($(SYSTEM_EXPAT),YES)
+
+define gb_LinkTarget__use_expat
+$(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter))
+
+$(call gb_LinkTarget_add_defs,$(1),\
+	-DSYSTEM_EXPAT \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),-lexpat)
+
+endef
+
+else # !SYSTEM_EXPAT
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+	ascii_expat_xmlparse \
+	expat_xmlparse \
+	expat_xmltok \
+))
+
+define gb_LinkTarget__use_expat
+$(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter))
+
+$(if $(filter-out ascii_expat_xmlparse,$(2)),\
+	$(call gb_LinkTarget_add_defs,$(1),\
+		-DXML_UNICODE \
+))
+
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+	$(2) \
+	expat_xmltok \
+)
+
+endef
+
+endif # SYSTEM_EXPAT
+
+# now define 2 wrappers that select which internal static library to use...
+define gb_LinkTarget__use_expat_utf8
+$(call gb_LinkTarget__use_expat,$(1),ascii_expat_xmlparse)
+
+endef
+
+define gb_LinkTarget__use_expat_utf16
+$(call gb_LinkTarget__use_expat,$(1),expat_xmlparse)
+
+endef
+
+
+ifeq ($(SYSTEM_LIBXML),YES)
+
+define gb_LinkTarget__use_libxml2
+$(call gb_LinkTarget_add_defs,$(1),\
+	-DSYSTEM_LIBXML \
+)
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(LIBXML_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBXML_LIBS))
+
+endef
+
+else # !SYSTEM_LIBXML
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+	xml2 \
+))
+
+define gb_LinkTarget__use_libxml2
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	xml2 \
+)
+
+endef
+
+endif # SYSTEM_LIBXML
+
+
+ifeq ($(SYSTEM_LIBXSLT),YES)
+
+define gb_LinkTarget__use_libxslt
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(LIBXSLT_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBXSLT_LIBS))
+
+endef
+
+else # !SYSTEM_LIBXSLT
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	xslt \
+))
+
+define gb_LinkTarget__use_libxslt
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	xslt \
+)
+
+endef
+
+endif # SYSTEM_LIBXSLT
+
+
+ifeq ($(SYSTEM_REDLAND),YES)
+
+define gb_LinkTarget__use_librdf
+$(call gb_LinkTarget_add_defs,$(1),\
+	-DSYSTEM_REDLAND \
+)
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(REDLAND_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(REDLAND_LIBS))
+
+endef
+
+else # !SYSTEM_REDLAND
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	rdf \
+))
+
+define gb_LinkTarget__use_librdf
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	rdf \
+)
+
+endef
+
+endif # SYSTEM_REDLAND
+
+
+ifeq ($(SYSTEM_CAIRO),YES)
+
+# FREETYPE_CLAGS from environment if ENABLE_CAIRO is used
+define gb_LinkTarget__use_cairo
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(FREETYPE_CFLAGS) \
+	$(CAIRO_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(CAIRO_LIBS))
+
+endef
+
+else # !SYSTEM_CAIRO
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	cairo \
+))
+ifneq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	pixman-1 \
+))
+endif # WNT
+
+define gb_LinkTarget__use_cairo
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc/cairo \
+	$(FREETYPE_CFLAGS) \
+)
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	cairo \
+)
+ifneq ($(OS),WNT)
+ifeq ($(OS),MACOSX)
+$(call gb_LinkTarget_add_static_libs,$(1),\
+	pixman-1 \
+)
+else
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	pixman-1 \
+)
+endif
+endif
+
+endef
+
+endif # SYSTEM_CAIRO
+
+define gb_LinkTarget__use_freetype
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(FREETYPE_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
+
+endef
+
+define gb_LinkTarget__use_fontconfig
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(FONTCONFIG_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS))
+
+endef
+
+ifeq ($(SYSTEM_GRAPHITE),YES)
+
+define gb_LinkTarget__use_graphite
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(GRAPHITE_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(GRAPHITE_LIBS))
+
+endef
+
+else # !SYSTEM_GRAPHITE
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+	graphite2_off \
+))
+define gb_LinkTarget__use_graphite
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+    graphite2_off \
+)
+
+endef
+
+endif # SYSTEM_GRAPHITE
+
+
+ifeq ($(SYSTEM_ICU),YES)
+
+define gb_LinkTarget__use_icudata
+$(call gb_LinkTarget_add_libs,$(1),-licudata)
+
+endef
+define gb_LinkTarget__use_icui18n
+$(call gb_LinkTarget_add_libs,$(1),-licui18n)
+
+endef
+define gb_LinkTarget__use_icule
+$(call gb_LinkTarget_add_libs,$(1),-licule)
+
+endef
+define gb_LinkTarget__use_icutu
+$(call gb_LinkTarget_add_libs,$(1),-licutu)
+
+endef
+define gb_LinkTarget__use_icuuc
+$(call gb_LinkTarget_add_libs,$(1),-licuuc)
+
+endef
+
+else # !SYSTEM_ICU
+
+# icudata and icui18n is called icudt and icuin when built with MSVC :-(
+ifeq ($(OS)$(COM),WNTMSC)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	icudt \
+	icuin \
+	icule \
+	icutu \
+	icuuc \
+))
+
+define gb_LinkTarget__use_icudt
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	icudt \
+)
+
+endef
+define gb_LinkTarget__use_icuin
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	icuin \
+)
+
+endef
+else
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	icudata \
+	icui18n \
+	icule \
+	icutu \
+	icuuc \
+))
+
+define gb_LinkTarget__use_icudata
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	icudata \
+)
+
+endef
+define gb_LinkTarget__use_icui18n
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	icui18n \
+)
+
+endef
+endif
+
+define gb_LinkTarget__use_icule
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	icule \
+)
+
+endef
+define gb_LinkTarget__use_icutu
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	icutu \
+)
+
+endef
+define gb_LinkTarget__use_icuuc
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	icuuc \
+)
+
+endef
+
+endif # SYSTEM_ICU
+
+
+ifeq ($(SYSTEM_OPENSSL),YES)
+
+define gb_LinkTarget__use_openssl
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(OPENSSL_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS))
+
+endef
+
+else # !SYSTEM_OPENSSL
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+    crypto \
+    ssl \
+))
+else
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+    crypto \
+    ssl \
+))
+endif
+
+define gb_LinkTarget__use_openssl
+ifeq ($(OS),WNT)
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	crypto \
+	ssl \
+)
+else
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+	crypto \
+	ssl \
+)
+ifeq ($(OS),SOLARIS)
+$(call gb_LinkTarget_add_libs,$(1),\
+	-lnsl \
+	-lsocket \
+)
+endif
+endif
+
+endef
+
+endif # SYSTEM_OPENSSL
+
+
+ifeq ($(SYSTEM_LIBVISIO),YES)
+
+define gb_LinkTarget__use_visio
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+    $(LIBVISIO_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBVISIO_LIBS))
+
+endef
+
+else # !SYSTEM_LIBVISIO
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+	visiolib \
+))
+
+define gb_LinkTarget__use_visio
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+	visiolib \
+)
+
+endef
+
+endif # SYSTEM_LIBVISIO
+
+
+ifeq ($(SYSTEM_LIBWPD),YES)
+
+define gb_LinkTarget__use_wpd
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+    $(LIBWPD_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBWPD_LIBS))
+
+endef
+
+else # !SYSTEM_LIBWPD
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+	wpdlib \
+))
+
+define gb_LinkTarget__use_wpd
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+	wpdlib \
+)
+
+endef
+
+endif # SYSTEM_LIBWPD
+
+
+ifeq ($(SYSTEM_LIBWPG),YES)
+
+define gb_LinkTarget__use_wpg
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+    $(LIBWPG_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBWPG_LIBS))
+
+endef
+
+else # !SYSTEM_LIBWPG
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+	wpglib \
+))
+
+define gb_LinkTarget__use_wpg
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+	wpglib \
+)
+
+endef
+
+endif # SYSTEM_LIBWPG
+
+
+ifeq ($(SYSTEM_LIBWPS),YES)
+
+define gb_LinkTarget__use_wps
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+    $(LIBWPS_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBWPS_LIBS))
+
+endef
+
+else # !SYSTEM_LIBWPS
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+	wpslib \
+))
+
+define gb_LinkTarget__use_wps
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+	wpslib \
+)
+
+endef
+
+endif # SYSTEM_LIBWPS
+
+
+ifeq ($(SYSTEM_LPSOLVE),YES)
+
+define gb_LinkTarget__use_lpsolve55
+$(call gb_LinkTarget_add_libs,$(1),-llpsolve55)
+
+endef
+
+else # !SYSTEM_LPSOLVE
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	lpsolve55 \
+))
+
+define gb_LinkTarget__use_lpsolve55
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	lpsolve55 \
+)
+
+endef
+
+endif # SYSTEM_LPSOLVE
+
+
+define gb_LinkTarget__use_gtk
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(GTK_CFLAGS) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),$(GTK_LIBS))
+
+endef
+
+define gb_LinkTarget__use_gthread
+$(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS))
+
+endef
+
+define gb_LinkTarget__use_dbusmenugtk
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(DBUSMENUGTK_CFLAGS) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),$(DBUSMENUGTK_LIBS))
+
+endef
+
+# MacOSX-only frameworks
+# (in alphabetical order)
+
+define gb_LinkTarget__use_carbon
+$(call gb_LinkTarget_add_libs,$(1), \
+	-framework Carbon \
+)
+
+endef
+
+define gb_LinkTarget__use_cocoa
+$(call gb_LinkTarget_add_libs,$(1), \
+	-framework Cocoa \
+)
+
+endef
+
+define gb_LinkTarget__use_quicktime
+$(call gb_LinkTarget_add_libs,$(1), \
+	-framework QuickTime \
+)
+
+endef
+
+# Common MacOSX and iOS frameworks
+
+define gb_LinkTarget__use_corefoundation
+$(call gb_LinkTarget_add_libs,$(1), \
+	-framework CoreFoundation \
+)
+
+endef
+
+define gb_LinkTarget__use_coregraphics
+$(call gb_Library_add_libs,$(1), \
+	-framework CoreGraphics \
+)
+
+endef
+
+define gb_LinkTarget__use_coretext
+$(call gb_Library_add_libs,$(1), \
+	-framework CoreText \
+)
+
+endef
+
+define gb_LinkTarget__use_foundation
+$(call gb_LinkTarget_add_libs,$(1), \
+	-framework Foundation \
+)
+
+endef
+
+# iOS-only frameworks
+
+define gb_LinkTarget__use_uikit
+$(call gb_LinkTarget_add_libs,$(1), \
+	-framework UIKit \
+)
+
+endef
+
+ifeq ($(SYSTEM_MOZILLA),YES)
+
+define gb_LinkTarget__use_plc4
+$(call gb_LinkTarget_set_include,$(1),\
+    $$(INCLUDE) \
+    $(MOZ_NSS_CFLAGS) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+    $(MOZ_NSS_LIBS) \
+)
+
+endef
+
+else
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
+    nspr4 \
+    nss3 \
+    plc4 \
+))
+
+define gb_LinkTarget__use_plc4
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+    plc4 \
+)
+
+endef
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
new file mode 100644
index 000000000000..40a9f8337a59
--- /dev/null
+++ b/RepositoryFixes.mk
@@ -0,0 +1,167 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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-GCC MACOSX-GCC WNT-GCC DRAGONFLY-GCC OPENBSD-GCC FREEBSD-GCC NETBSD-GCC IOS-GCC ANDROID-GCC, $(OS)-$(COM)))
+# Could we in fact just check for $(COM) == "GCC" here?
+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),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))
+endif
+
+ifeq ($(OS),WNT)
+
+ifeq ($(COM),GCC)
+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 crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(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_FILENAMES := $(patsubst graphite2_off:%.dll.a,graphite2_off:%.a,$(gb_Library_FILENAMES))
+gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
+
+
+# handle libraries in msvc format that don't use an "i" prefix for their import library
+# these are libraries built by OOo, but only a few of them
+# all other libraries built by OOo and all platform libraries (exceptions see below) are used without an import library
+# we link against their dlls in gcc format directly
+
+# Libraries not provided by mingw(-w64), available only in the Windows
+# SDK. So if these actually are liked with somewhere, we can't
+# cross-compile that module then using MinGW. That needs to be fixed
+# then, and we need to use these libraries through run-time lookup of
+# APIs. Or something.
+gb_Library_SDKLIBFILENAMES:=\
+    unicows \
+
+# some Windows platform libraries are missing in mingw library set
+# we have to use them from the PSDK by linking against their ilibs
+gb_Library_ILIBFILENAMES:=\
+    unicows \
+    uuid \
+    winmm \
+
+gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):$(WINDOWS_SDK_HOME)/lib/$(lib).lib)
+
+gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst crypto:crypto%,crypto:libeay32%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst ssl:ssl%,ssl:ssleay32%,$(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 #ifneq ($(USE_MINGW),)
+
+gb_Library_FILENAMES := $(patsubst cairo:icairo%,cairo:cairo%,$(gb_Library_FILENAMES))
+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 crypto:icrypto%,crypto:libeay32%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst crypto:libcrypto%,crypto:libcrypto_static%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst lpsolve55:ilpsolve55%,lpsolve55:lpsolve55%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(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 ssl:issl%,ssl:ssleay32%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ssl:libssl%,ssl:libssl_static%,$(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 xmlsec1-mscrypto:ixmlsec1-mscrypto%,xmlsec-mscrypto:libxmlsec-mscrypto%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xmlsec1:ixmlsec1%,xmlsec:libxmlsec%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
+gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
+
+
+# change the names of all import libraries that don't have an "i" prefix as in our standard naming schema
+gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE)
+gb_Library_NOILIBFILENAMES += \
+    graphite2_off \
+	icudt icuin icule icuuc \
+    msvcprt \
+    nspr4 \
+    nss3 \
+    shlwapi \
+    version \
+
+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_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES))
+
+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 # ifneq ($(USE_MINGW),)
+
+endif # ifeq ($(OS),WNT)
+
+# Some external libraries get built as static libraries for Android
+# because we haven't bothered fixing their configury to recognize that
+# shared libraries can be built for the platform.
+ifeq ($(OS),ANDROID)
+gb_Library_FILENAMES := $(patsubst cppunit:%.so,cppunit:%.a,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xml2:%.so,xml2:%.a,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst rdf:%.so,rdf:%.a,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xslt:%.so,xslt:%.a,$(gb_Library_FILENAMES))
+
+endif
+
+
+ifeq ($(SYSTEM_CAIRO),YES)
+gb_Library_TARGETS := $(filter-out cairo,$(gb_Library_TARGETS))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
new file mode 100644
index 000000000000..ad5cbdde3562
--- /dev/null
+++ b/RepositoryModule_ooo.mk
@@ -0,0 +1,101 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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,\
+    animations \
+    basctl \
+    basebmp \
+    basegfx \
+    basic \
+    canvas \
+    chart2 \
+    comphelper \
+    cppcanvas \
+    cui \
+    dbaccess \
+    drawinglayer \
+    dtrans \
+    editeng \
+    fileaccess \
+    forms \
+    formula \
+    framework \
+    hwpfilter \
+    i18npool \
+    i18nutil \
+    idl \
+    linguistic \
+    lotuswordpro \
+    o3tl \
+    offapi \
+    oovbaapi \
+    oox \
+    padmin \
+    psprint_config \
+    regexp \
+    reportdesign \
+    sax \
+    sc \
+    scaddins \
+    sccomp \
+    sd \
+    sfx2 \
+    slideshow \
+    sot \
+    starmath \
+    svl \
+    svtools \
+    svx \
+    sw \
+    toolkit \
+    tools \
+    ucbhelper \
+    udkapi \
+    unotools \
+    unoxml \
+    vbahelper \
+    vcl \
+    wizards \
+    writerfilter \
+    writerperfect \
+    xmloff \
+    xmlreader \
+    xmlscript \
+))
+
+# these have only migrated subsequentcheck for now
+$(eval $(call gb_Module_add_moduledirs,ooo,\
+    configmgr \
+    qadevOOo \
+    sal \
+    ucb \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/TEMPLATE.SOURCECODE.HEADER b/TEMPLATE.SOURCECODE.HEADER
new file mode 100644
index 000000000000..07fe450eedc7
--- /dev/null
+++ b/TEMPLATE.SOURCECODE.HEADER
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ *
+ * Major Contributor(s):
+<<<<<<<
+ * [ Copyright (C) 2011 Jim Bob <jim@bob.org> (initial developer) ]
+ * [ Copyright (C) 2011 Ted <ted@bear.com> ]
+>>>>>>>
+ *
+ * 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/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx
index 5c46eec49460..969e246ea51a 100644
--- a/UnoControls/source/base/registercontrols.cxx
+++ b/UnoControls/source/base/registercontrols.cxx
@@ -132,16 +132,6 @@ CREATEINSTANCE  ( StatusIndicator   )
 //=============================================================================
 
 //______________________________________________________________________________________________________________
-//  return environment
-//______________________________________________________________________________________________________________
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(   const   sal_Char**          ppEnvironmentTypeName   ,
-                                                                            uno_Environment**   /*ppEnvironment*/           )
-{
-    *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
-}
-
-//______________________________________________________________________________________________________________
 //  create right component factory
 //______________________________________________________________________________________________________________
 
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
index 1e10f902cf2a..e1f3156485e9 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -262,7 +262,7 @@ Reference< XAccessibleTable > AccessibleBrowseBoxTable::implGetHeaderBar(
         {
             xRet = xContext->getAccessibleChild( nChildIndex );
         }
-        catch( lang::IndexOutOfBoundsException& )
+        catch (const lang::IndexOutOfBoundsException&)
         {
             OSL_FAIL( "implGetHeaderBar - wrong child index" );
         }
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 4c2c5d130582..70976a1494eb 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -360,7 +360,7 @@ Reference< XAccessibleTable > AccessibleGridControlTable::implGetHeaderBar(
         {
             xRet = xContext->getAccessibleChild( nChildIndex );
         }
-        catch( lang::IndexOutOfBoundsException& )
+        catch (const lang::IndexOutOfBoundsException&)
         {
             OSL_FAIL( "implGetHeaderBar - wrong child index" );
         }
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 3dbe462c227a..622ef04664c9 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -305,7 +305,7 @@ void SAL_CALL ParagraphImpl::grabFocus() throw (::css::uno::RuntimeException)
     {
         m_xDocument->changeParagraphSelection(this, 0, 0);
     }
-    catch (::css::lang::IndexOutOfBoundsException & rEx)
+    catch (const ::css::lang::IndexOutOfBoundsException & rEx)
     {
         OSL_TRACE(
             "textwindowaccessibility.cxx: ParagraphImpl::grabFocus:"
diff --git a/accessibility/workben/org/openoffice/accessibility/awb/view/StateSetView.java b/accessibility/workben/org/openoffice/accessibility/awb/view/StateSetView.java
index 44638b099edc..1820f4e57f6c 100644
--- a/accessibility/workben/org/openoffice/accessibility/awb/view/StateSetView.java
+++ b/accessibility/workben/org/openoffice/accessibility/awb/view/StateSetView.java
@@ -174,17 +174,17 @@ public class StateSetView
             }
 
             // Draw string of set states.
-            String sStates = new String ();
+            StringBuffer sStates = new StringBuffer ();
             for (int i=0; i<aStates.length; i++)
             {
                 if (i > 0)
-                    sStates = sStates + ", ";
-                sStates = sStates + NameProvider.getStateName(aStates[i]);
+                    sStates.append(", ");
+                sStates.append(NameProvider.getStateName(aStates[i]));
             }
             g.setTransform (aTransform);
             g.translate (10,aWidgetArea.y+aWidgetArea.height-3);
             g.scale (0.9,0.9);
-            g.drawString (sStates,0,0);
+            g.drawString (sStates.toString(),0,0);
         }
     }
 
diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644
index 000000000000..a42a0f1ce830
--- /dev/null
+++ b/acinclude.m4
@@ -0,0 +1,120 @@
+dnl @synopsis AX_FUNC_WHICH_GETSPNAM_R
+dnl
+dnl Determines which historical variant of the getspnam_r() call
+dnl (taking four or five arguments) is available on the system
+dnl and sets NEW_SHADOW_API=YES if there are five arguments.
+dnl
+dnl Originally named "AX_FUNC_WHICH_GETHOSTBYNAME_R". Rewritten
+dnl for AX_FUNC_WHICH_GETSPNAM_R
+dnl
+dnl @author Caolan McNamara <caolan@skynet.ie>
+dnl @author Daniel Richard G. <skunk@iskunk.org>
+dnl @version 2006-05-01
+dnl @license LGPL
+
+AC_DEFUN([AX_FUNC_WHICH_GETSPNAM_R], [
+
+    AC_LANG_PUSH(C)
+    AC_MSG_CHECKING([how many arguments getspnam_r() takes])
+
+    AC_CACHE_VAL(ac_cv_func_which_getspnam_r, [
+
+################################################################
+
+ac_cv_func_which_getspnam_r=unknown
+
+#
+# ONE ARGUMENT (sanity check)
+#
+
+# This should fail, as there is no variant of getspnam_r() that takes
+# a single argument. If it actually compiles, then we can assume that
+# netdb.h is not declaring the function, and the compiler is thereby
+# assuming an implicit prototype. In which case, we're out of luck.
+#
+AC_COMPILE_IFELSE(
+    AC_LANG_PROGRAM(
+	[[
+	    #include <sys/types.h>
+	    #include <shadow.h>
+	]],
+	[[
+	    const char *name = "myname";
+	    getspnam_r(name) /* ; */
+	]]),
+    ac_cv_func_which_getspnam_r=no)
+
+#
+# FIVE ARGUMENTS
+#
+
+if test "$ac_cv_func_which_getspnam_r" = "unknown"; then
+
+AC_COMPILE_IFELSE(
+    AC_LANG_PROGRAM(
+	[[
+	    #include <sys/types.h>
+	    #include <shadow.h>
+	]],
+	[[
+	    char buffer[[]] = { '\0' };
+	    struct spwd spwdStruct;
+	    const char *name = "myname";
+	    getspnam_r(name, &spwdStruct, buffer, sizeof buffer, 0) /* ; */
+	]]),
+    ac_cv_func_which_getspnam_r=five)
+
+fi
+
+#
+# FOUR ARGUMENTS
+#
+
+if test "$ac_cv_func_which_getspnam_r" = "unknown"; then
+
+AC_COMPILE_IFELSE(
+    AC_LANG_PROGRAM(
+	[[
+	    #include <sys/types.h>
+	    #include <shadow.h>
+	]],
+	[[
+	    char buffer[[]] = { '\0' };
+	    struct spwd spwdStruct;
+	    const char *name = "myname";
+	    getspnam_r(name, &spwdStruct, buffer, sizeof buffer) /* ; */
+	]]),
+    ac_cv_func_which_getspnam_r=four)
+
+fi
+
+################################################################
+
+]) dnl end AC_CACHE_VAL
+
+case "$ac_cv_func_which_getspnam_r" in
+    five)
+    AC_MSG_RESULT([five])
+    NEW_SHADOW_API=YES
+    ;;
+
+    four)
+    AC_MSG_RESULT([four])
+    ;;
+
+    no)
+    AC_MSG_RESULT([cannot find function declaration in shadow.h])
+    ;;
+
+    unknown)
+    AC_MSG_RESULT([can't tell])
+    ;;
+
+    *)
+    AC_MSG_ERROR([internal error])
+    ;;
+esac
+
+AC_LANG_POP(C)
+
+]) dnl end AC_DEFUN
diff --git a/afms/delzip b/afms/delzip
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/afms/delzip
diff --git a/afms/makefile.mk b/afms/makefile.mk
new file mode 100644
index 000000000000..5952adaac9ac
--- /dev/null
+++ b/afms/makefile.mk
@@ -0,0 +1,61 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=afms
+TARGET=afms
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+.IF "$(L10N_framework)"==""
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=Adobe-Core35_AFMs-314
+TARFILE_MD5=1756c4fa6c616ae15973c104cd8cb256
+TARFILE_ROOTDIR=Adobe-Core35_AFMs-314
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+
+ZIP1DIR         = $(MISC)$/build$/$(TARFILE_NAME)
+ZIP1TARGET      = fontunxafm
+ZIP1LIST        = *.afm -x "*Helvetica-Narrow*"
+
+.ENDIF # L10N_framework
+.INCLUDE : target.mk
+
+.INCLUDE : tg_ext.mk
+.IF "$(L10N_framework)"==""
+.IF "$(ZIP1TARGETN)"!=""
+$(ZIP1TARGETN):	$(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE)
+
+.ENDIF          # "$(ZIP1TARGETN)"!=""
+
+.ENDIF # L10N_framework
diff --git a/afms/prj/build.lst b/afms/prj/build.lst
new file mode 100644
index 000000000000..ed3d01fd2909
--- /dev/null
+++ b/afms/prj/build.lst
@@ -0,0 +1,3 @@
+af	afms : solenv NULL
+af	afms		usr1	-	all	af_mkout NULL
+af	afms		nmake	-	all	af_fonts NULL
diff --git a/afms/prj/d.lst b/afms/prj/d.lst
new file mode 100644
index 000000000000..1652d1f97cb5
--- /dev/null
+++ b/afms/prj/d.lst
@@ -0,0 +1,3 @@
+mkdir: %_DEST%\pck
+..\%__SRC%\bin\*.zip %_DEST%\pck\*.zip
+
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk
new file mode 100644
index 000000000000..cbc702b72adc
--- /dev/null
+++ b/animations/Library_animcore.mk
@@ -0,0 +1,58 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Library_Library,animcore))
+
+$(eval $(call gb_Library_add_package_headers,animcore,animations_inc))
+
+$(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore))
+
+$(eval $(call gb_Library_set_include,animcore,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/animcore/source/animcore) \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,animcore,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,animcore,\
+    cppu \
+	cppuhelper \
+    sal \
+))
+
+$(eval $(call gb_Library_add_exception_objects,animcore,\
+    animations/source/animcore/animcore \
+	animations/source/animcore/factreg \
+    animations/source/animcore/targetpropertiescreator \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/animations/Makefile b/animations/Makefile
new file mode 100644
index 000000000000..6c4d53b5f316
--- /dev/null
+++ b/animations/Makefile
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/animations/Module_animations.mk b/animations/Module_animations.mk
new file mode 100644
index 000000000000..66789d505591
--- /dev/null
+++ b/animations/Module_animations.mk
@@ -0,0 +1,37 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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,animations))
+
+$(eval $(call gb_Module_add_targets,animations,\
+    Library_animcore \
+	Package_inc \
+	Package_xml \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/animations/Package_inc.mk b/animations/Package_inc.mk
new file mode 100644
index 000000000000..c72b909f5750
--- /dev/null
+++ b/animations/Package_inc.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Package_Package,animations_inc,$(SRCDIR)/animations/inc))
+
+$(eval $(call gb_Package_add_file,animations_inc,inc/animations/animationnodehelper.hxx,animations/animationnodehelper.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/animations/Package_xml.mk b/animations/Package_xml.mk
new file mode 100644
index 000000000000..c97bec07db94
--- /dev/null
+++ b/animations/Package_xml.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General 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_Package_Package,animations_xml,$(SRCDIR)/animations/source/animcore))
+
+$(eval $(call gb_Package_add_file,animations_xml,xml/animcore.xml,animcore.xml))
+
+# vim: set noet sw=4 ts=4:
diff --git a/animations/inc/animations/animationnodehelper.hxx b/animations/inc/animations/animationnodehelper.hxx
new file mode 100644
index 000000000000..969e3326105d
--- /dev/null
+++ b/animations/inc/animations/animationnodehelper.hxx
@@ -0,0 +1,133 @@
+/* -*- 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 INCLUDED_ANIMATIONS_ANIMATIONNODEHELPER_HXX
+#define INCLUDED_ANIMATIONS_ANIMATIONNODEHELPER_HXX
+
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/animations/XAnimationNode.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/container/XEnumeration.hpp>
+
+#include <vector>
+
+/* Declaration and definition of AnimationNode helper */
+
+namespace anim
+{
+    // TODO(Q1): this could possibly be implemented with a somewhat
+    // more lightweight template, by having the actual worker receive
+    // only a function pointer, and a thin templated wrapper around
+    // that which converts member functions into that.
+
+    /** Apply given functor to every animation node child.
+
+        @param xNode
+        Parent node
+
+        @param rFunctor
+        Functor to apply. The functor must have an appropriate
+        operator()( const ::com::sun::star::uno::Reference<
+        ::com::sun::star::animations::XAnimationNode >& ) member.
+
+        @return true, if the functor was successfully applied to
+        all children, false otherwise.
+    */
+    template< typename Functor > inline bool for_each_childNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >&    xNode,
+                                                          Functor&                                                                                  rFunctor )
+    {
+        try
+        {
+            // get an XEnumerationAccess to the children
+            ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess >
+                  xEnumerationAccess( xNode,
+                                      ::com::sun::star::uno::UNO_QUERY_THROW );
+            ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >
+                  xEnumeration( xEnumerationAccess->createEnumeration(),
+                                ::com::sun::star::uno::UNO_QUERY_THROW );
+
+            while( xEnumeration->hasMoreElements() )
+            {
+                ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >
+                      xChildNode( xEnumeration->nextElement(),
+                                  ::com::sun::star::uno::UNO_QUERY_THROW );
+
+                rFunctor( xChildNode );
+            }
+
+            return true;
+        }
+        catch( ::com::sun::star::uno::Exception& )
+        {
+            return false;
+        }
+    }
+
+
+    /** pushes the given node to the given vector and recursivly calls itself for each child node.
+    */
+    inline void create_deep_vector( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode,
+                                std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& rVector )
+    {
+        rVector.push_back( xNode );
+
+        try
+        {
+            // get an XEnumerationAccess to the children
+            ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess >
+                  xEnumerationAccess( xNode,
+                                      ::com::sun::star::uno::UNO_QUERY );
+
+            if( xEnumerationAccess.is() )
+            {
+                ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >
+                      xEnumeration( xEnumerationAccess->createEnumeration(),
+                                    ::com::sun::star::uno::UNO_QUERY );
+
+                if( xEnumeration.is() )
+                {
+                    while( xEnumeration->hasMoreElements() )
+                    {
+                        ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >
+                            xChildNode( xEnumeration->nextElement(),
+                                        ::com::sun::star::uno::UNO_QUERY_THROW );
+
+                        create_deep_vector( xChildNode, rVector );
+                    }
+                }
+            }
+        }
+        catch( ::com::sun::star::uno::Exception& )
+        {
+        }
+    }
+}
+
+#endif /* INCLUDED_ANIMATIONS_ANIMATIONNODEHELPER_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/animations/prj/build.lst b/animations/prj/build.lst
new file mode 100644
index 000000000000..65baa77fe1e3
--- /dev/null
+++ b/animations/prj/build.lst
@@ -0,0 +1,3 @@
+animations	animations	:	cppuhelper comphelper offapi LIBXSLT:libxslt NULL
+animations	animations						usr1	-	all	animations_mkout NULL
+animations	animations\prj                  nmake	-	all	animations_prj NULL
diff --git a/animations/prj/d.lst b/animations/prj/d.lst
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/animations/prj/d.lst
diff --git a/animations/prj/makefile.mk b/animations/prj/makefile.mk
new file mode 100755
index 000000000000..95b2a0f2f1e5
--- /dev/null
+++ b/animations/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/animations/source/animcore/animcore.component b/animations/source/animcore/animcore.component
new file mode 100644
index 000000000000..e0d28e164717
--- /dev/null
+++ b/animations/source/animcore/animcore.component
@@ -0,0 +1,67 @@
+<?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" prefix="animcore"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="animcore::Animate">
+    <service name="com.sun.star.animations.Animate"/>
+  </implementation>
+  <implementation name="animcore::AnimateColor">
+    <service name="com.sun.star.animations.AnimateColor"/>
+  </implementation>
+  <implementation name="animcore::AnimateMotion">
+    <service name="com.sun.star.animations.AnimateMotion"/>
+  </implementation>
+  <implementation name="animcore::AnimateSet">
+    <service name="com.sun.star.animations.AnimateSet"/>
+  </implementation>
+  <implementation name="animcore::AnimateTransform">
+    <service name="com.sun.star.animations.AnimateTransform"/>
+  </implementation>
+  <implementation name="animcore::Audio">
+    <service name="com.sun.star.animations.Audio"/>
+  </implementation>
+  <implementation name="animcore::Command">
+    <service name="com.sun.star.animations.Command"/>
+  </implementation>
+  <implementation name="animcore::IterateContainer">
+    <service name="com.sun.star.animations.IterateContainer"/>
+  </implementation>
+  <implementation name="animcore::ParallelTimeContainer">
+    <service name="com.sun.star.animations.ParallelTimeContainer"/>
+  </implementation>
+  <implementation name="animcore::SequenceTimeContainer">
+    <service name="com.sun.star.animations.SequenceTimeContainer"/>
+  </implementation>
+  <implementation name="animcore::TargetPropertiesCreator">
+    <service name="com.sun.star.animations.TargetPropertiesCreator"/>
+  </implementation>
+  <implementation name="animcore::TransitionFilter">
+    <service name="com.sun.star.animations.TransitionFilter"/>
+  </implementation>
+</component>
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
new file mode 100644
index 000000000000..1a1258f7312f
--- /dev/null
+++ b/animations/source/animcore/animcore.cxx
@@ -0,0 +1,2082 @@
+/* -*- 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 <com/sun/star/util/XCloneable.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/animations/XAnimateColor.hpp>
+#include <com/sun/star/animations/XAnimateSet.hpp>
+#include <com/sun/star/animations/XAnimateMotion.hpp>
+#include <com/sun/star/animations/XAnimateTransform.hpp>
+#include <com/sun/star/animations/XTransitionFilter.hpp>
+#include <com/sun/star/animations/XTimeContainer.hpp>
+#include <com/sun/star/animations/XIterateContainer.hpp>
+#include <com/sun/star/animations/XAudio.hpp>
+#include <com/sun/star/animations/XCommand.hpp>
+#include <com/sun/star/animations/AnimationNodeType.hpp>
+#include <com/sun/star/animations/AnimationCalcMode.hpp>
+#include <com/sun/star/animations/AnimationFill.hpp>
+#include <com/sun/star/animations/AnimationRestart.hpp>
+#include <com/sun/star/animations/AnimationColorSpace.hpp>
+#include <com/sun/star/animations/AnimationAdditiveMode.hpp>
+#include <com/sun/star/animations/AnimationTransformType.hpp>
+#include <com/sun/star/animations/TransitionType.hpp>
+#include <com/sun/star/animations/TransitionSubType.hpp>
+#include <com/sun/star/presentation/ShapeAnimationSubType.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/util/XChangesNotifier.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <comphelper/servicehelper.hxx>
+#include <cppuhelper/interfacecontainer.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <rtl/uuid.h>
+
+#include <osl/mutex.hxx>
+#include <list>
+#include <algorithm>
+
+using ::osl::Mutex;
+using ::osl::Guard;
+using ::rtl::OUString;
+using ::cppu::OInterfaceContainerHelper;
+using ::cppu::OInterfaceIteratorHelper;
+using ::com::sun::star::uno::Any;
+using ::com::sun::star::uno::UNO_QUERY;
+using ::com::sun::star::uno::XInterface;
+using ::com::sun::star::uno::RuntimeException;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::XComponentContext;
+using ::com::sun::star::uno::Exception;
+using ::com::sun::star::uno::XWeak;
+using ::com::sun::star::uno::Type;
+using ::com::sun::star::uno::makeAny;
+using ::com::sun::star::lang::NoSupportException;
+using ::com::sun::star::lang::IllegalArgumentException;
+using ::com::sun::star::lang::WrappedTargetException;
+using ::com::sun::star::lang::NoSupportException;
+using ::com::sun::star::lang::XServiceInfo;
+using ::com::sun::star::lang::XTypeProvider;
+using ::com::sun::star::container::NoSuchElementException;
+using ::com::sun::star::container::ElementExistException;
+using ::com::sun::star::container::XEnumeration;
+using ::com::sun::star::container::XEnumerationAccess;
+using ::com::sun::star::beans::NamedValue;
+using ::com::sun::star::util::XCloneable;
+using ::com::sun::star::lang::XUnoTunnel;
+using ::com::sun::star::util::XChangesNotifier;
+using ::com::sun::star::util::XChangesListener;
+using ::com::sun::star::util::ElementChange;
+using ::com::sun::star::util::ChangesEvent;
+
+using ::cppu::OWeakObject;
+
+using namespace ::com::sun::star::animations;
+using namespace ::com::sun::star::animations::AnimationNodeType;
+
+namespace animcore
+{
+
+// ====================================================================
+
+typedef ::std::list< Reference< XAnimationNode > > ChildList_t;
+
+// ====================================================================
+
+class AnimationNodeBase :   public XAnimateMotion,
+                            public XAnimateColor,
+                            public XTransitionFilter,
+                            public XAnimateSet,
+                            public XAnimateTransform,
+                            public XIterateContainer,
+                            public XEnumerationAccess,
+                            public XServiceInfo,
+                            public XTypeProvider,
+                            public XAudio,
+                            public XCommand,
+                            public XCloneable,
+                            public XChangesNotifier,
+                            public XUnoTunnel,
+                            public OWeakObject
+{
+public:
+    // our first, last and only protection from mutli-threads!
+    Mutex maMutex;
+};
+
+class AnimationNode : public AnimationNodeBase
+{
+public:
+    AnimationNode( sal_Int16 nNodeType );
+    AnimationNode( const AnimationNode& rNode );
+    virtual ~AnimationNode();
+
+    // XInterface
+    virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException);
+    virtual void SAL_CALL acquire() throw ();
+    virtual void SAL_CALL release() throw ();
+
+    // XTypeProvider
+    virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException);
+    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException);
+
+    // XServiceInfo
+    OUString SAL_CALL getImplementationName() throw();
+    Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw();
+    sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw();
+
+    // XChild
+    virtual Reference< XInterface > SAL_CALL getParent() throw (RuntimeException);
+    virtual void SAL_CALL setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException);
+
+    // XCloneable
+    virtual Reference< XCloneable > SAL_CALL createClone() throw (RuntimeException);
+
+    // XAnimationNode
+    virtual sal_Int16 SAL_CALL getType() throw (RuntimeException);
+    virtual Any SAL_CALL getBegin() throw (RuntimeException);
+    virtual void SAL_CALL setBegin( const Any& _begin ) throw (RuntimeException);
+    virtual Any SAL_CALL getDuration() throw (RuntimeException);
+    virtual void SAL_CALL setDuration( const Any& _duration ) throw (RuntimeException);
+    virtual Any SAL_CALL getEnd() throw (RuntimeException);
+    virtual void SAL_CALL setEnd( const Any& _end ) throw (RuntimeException);
+    virtual Any SAL_CALL getEndSync() throw (RuntimeException);
+    virtual void SAL_CALL setEndSync( const Any& _endsync ) throw (RuntimeException);
+    virtual Any SAL_CALL getRepeatCount() throw (RuntimeException);
+    virtual void SAL_CALL setRepeatCount( const Any& _repeatcount ) throw (RuntimeException);
+    virtual Any SAL_CALL getRepeatDuration() throw (RuntimeException);
+    virtual void SAL_CALL setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getFill() throw (RuntimeException);
+    virtual void SAL_CALL setFill( sal_Int16 _fill ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getFillDefault() throw (RuntimeException);
+    virtual void SAL_CALL setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getRestart() throw (RuntimeException);
+    virtual void SAL_CALL setRestart( sal_Int16 _restart ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getRestartDefault() throw (RuntimeException);
+    virtual void SAL_CALL setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException);
+    virtual double SAL_CALL getAcceleration() throw (RuntimeException);
+    virtual void SAL_CALL setAcceleration( double _acceleration ) throw (RuntimeException);
+    virtual double SAL_CALL getDecelerate() throw (RuntimeException);
+    virtual void SAL_CALL setDecelerate( double _decelerate ) throw (RuntimeException);
+    virtual sal_Bool SAL_CALL getAutoReverse() throw (RuntimeException);
+    virtual void SAL_CALL setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException);
+    virtual Sequence< NamedValue > SAL_CALL getUserData() throw (RuntimeException);
+    virtual void SAL_CALL setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException);
+
+    // XAnimate
+    virtual Any SAL_CALL getTarget() throw (RuntimeException);
+    virtual void SAL_CALL setTarget( const Any& _target ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getSubItem() throw (RuntimeException);
+    virtual void SAL_CALL setSubItem( sal_Int16 _subitem ) throw (RuntimeException);
+    virtual OUString SAL_CALL getAttributeName() throw (RuntimeException);
+    virtual void SAL_CALL setAttributeName( const OUString& _attribute ) throw (RuntimeException);
+    virtual Sequence< Any > SAL_CALL getValues() throw (RuntimeException);
+    virtual void SAL_CALL setValues( const Sequence< Any >& _values ) throw (RuntimeException);
+    virtual Sequence< double > SAL_CALL getKeyTimes() throw (RuntimeException);
+    virtual void SAL_CALL setKeyTimes( const Sequence< double >& _keytimes ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getValueType() throw (RuntimeException);
+    virtual void SAL_CALL setValueType( sal_Int16 _valuetype ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getCalcMode() throw (RuntimeException);
+    virtual void SAL_CALL setCalcMode( sal_Int16 _calcmode ) throw (RuntimeException);
+    virtual sal_Bool SAL_CALL getAccumulate() throw (RuntimeException);
+    virtual void SAL_CALL setAccumulate( sal_Bool _accumulate ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getAdditive() throw (RuntimeException);
+    virtual void SAL_CALL setAdditive( sal_Int16 _additive ) throw (RuntimeException);
+    virtual Any SAL_CALL getFrom() throw (RuntimeException);
+    virtual void SAL_CALL setFrom( const Any& _from ) throw (RuntimeException);
+    virtual Any SAL_CALL getTo() throw (RuntimeException);
+    virtual void SAL_CALL setTo( const Any& _to ) throw (RuntimeException);
+    virtual Any SAL_CALL getBy() throw (RuntimeException);
+    virtual void SAL_CALL setBy( const Any& _by ) throw (RuntimeException);
+    virtual Sequence< TimeFilterPair > SAL_CALL getTimeFilter() throw (RuntimeException);
+    virtual void SAL_CALL setTimeFilter( const Sequence< TimeFilterPair >& _timefilter ) throw (RuntimeException);
+    virtual OUString SAL_CALL getFormula() throw (RuntimeException);
+    virtual void SAL_CALL setFormula( const OUString& _formula ) throw (RuntimeException);
+
+    // XAnimateColor
+    virtual sal_Int16 SAL_CALL getColorInterpolation() throw (RuntimeException);
+    virtual void SAL_CALL setColorInterpolation( sal_Int16 _colorspace ) throw (RuntimeException);
+    virtual sal_Bool SAL_CALL getDirection() throw (RuntimeException);
+    virtual void SAL_CALL setDirection( sal_Bool _direction ) throw (RuntimeException);
+
+    // XAnimateMotion
+    virtual Any SAL_CALL getPath() throw (RuntimeException);
+    virtual void SAL_CALL setPath( const Any& _path ) throw (RuntimeException);
+    virtual Any SAL_CALL getOrigin() throw (RuntimeException);
+    virtual void SAL_CALL setOrigin( const Any& _origin ) throw (RuntimeException);
+
+    // XAnimateTransform
+    virtual sal_Int16 SAL_CALL getTransformType() throw (RuntimeException);
+    virtual void SAL_CALL setTransformType( sal_Int16 _transformtype ) throw (RuntimeException);
+
+    // XTransitionFilter
+    virtual sal_Int16 SAL_CALL getTransition() throw (RuntimeException);
+    virtual void SAL_CALL setTransition( sal_Int16 _transition ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getSubtype() throw (RuntimeException);
+    virtual void SAL_CALL setSubtype( sal_Int16 _subtype ) throw (RuntimeException);
+    virtual sal_Bool SAL_CALL getMode() throw (RuntimeException);
+    virtual void SAL_CALL setMode( sal_Bool _mode ) throw (RuntimeException);
+    virtual sal_Int32 SAL_CALL getFadeColor() throw (RuntimeException);
+    virtual void SAL_CALL setFadeColor( sal_Int32 _fadecolor ) throw (RuntimeException);
+
+    // XAudio
+    virtual Any SAL_CALL getSource() throw (RuntimeException);
+    virtual void SAL_CALL setSource( const Any& _source ) throw (RuntimeException);
+    virtual double SAL_CALL getVolume() throw (RuntimeException);
+    virtual void SAL_CALL setVolume( double _volume ) throw (RuntimeException);
+
+
+    // XCommand - the following two shadowed by animate, unfortunately
+//    virtual Any SAL_CALL getTarget() throw (RuntimeException);
+//    virtual void SAL_CALL setTarget( const Any& _target ) throw (RuntimeException);
+    virtual sal_Int16 SAL_CALL getCommand() throw (RuntimeException);
+    virtual void SAL_CALL setCommand( sal_Int16 _command ) throw (RuntimeException);
+    virtual Any SAL_CALL getParameter() throw (RuntimeException);
+    virtual void SAL_CALL setParameter( const Any& _parameter ) throw (RuntimeException);
+
+    // XElementAccess
+    virtual Type SAL_CALL getElementType() throw (RuntimeException);
+    virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException);
+
+    // XEnumerationAccess
+    virtual Reference< XEnumeration > SAL_CALL createEnumeration() throw (RuntimeException);
+
+    // XTimeContainer
+    virtual Reference< XAnimationNode > SAL_CALL insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException);
+    virtual Reference< XAnimationNode > SAL_CALL insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException);
+    virtual Reference< XAnimationNode > SAL_CALL replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild ) throw( IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException);
+    virtual Reference< XAnimationNode > SAL_CALL removeChild( const Reference< XAnimationNode >& oldChild ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException);
+    virtual Reference< XAnimationNode > SAL_CALL appendChild( const Reference< XAnimationNode >& newChild ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException);
+
+    // XIterateContainer
+    virtual sal_Int16 SAL_CALL getIterateType() throw (RuntimeException);
+    virtual void SAL_CALL setIterateType( sal_Int16 _iteratetype ) throw (RuntimeException);
+    virtual double SAL_CALL getIterateInterval() throw (RuntimeException);
+    virtual void SAL_CALL setIterateInterval( double _iterateinterval ) throw (RuntimeException);
+
+    // XChangesNotifier
+    virtual void SAL_CALL addChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException);
+    virtual void SAL_CALL removeChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException);
+
+    // XUnoTunnel
+    virtual ::sal_Int64 SAL_CALL getSomething( const Sequence< ::sal_Int8 >& aIdentifier ) throw (RuntimeException);
+
+    static const Sequence< sal_Int8 > & getUnoTunnelId();
+    void fireChangeListener();
+
+private:
+    OInterfaceContainerHelper   maChangeListener;
+
+    static void initTypeProvider( sal_Int16 nNodeType ) throw();
+
+    const sal_Int16 mnNodeType;
+
+    // for XTypeProvider
+    static Sequence< Type >* mpTypes[12];
+    static Sequence< sal_Int8 >* mpId[12];
+
+    // attributes for the XAnimationNode interface implementation
+    Any maBegin, maDuration, maEnd, maEndSync, maRepeatCount, maRepeatDuration;
+    sal_Int16 mnFill, mnFillDefault, mnRestart, mnRestartDefault;
+    double mfAcceleration, mfDecelerate;
+    sal_Bool mbAutoReverse;
+    Sequence< NamedValue > maUserData;
+
+    // parent interface for XChild interface implementation
+    Reference<XInterface>   mxParent;
+    AnimationNode*          mpParent;
+
+    // attributes for XAnimate
+    Any maTarget;
+    OUString maAttributeName, maFormula;
+    Sequence< Any > maValues;
+    Sequence< double > maKeyTimes;
+    sal_Int16 mnValueType, mnSubItem;
+    sal_Int16 mnCalcMode, mnAdditive;
+    sal_Bool mbAccumulate;
+    Any maFrom, maTo, maBy;
+    Sequence< TimeFilterPair > maTimeFilter;
+
+    // attributes for XAnimateColor
+    sal_Int16 mnColorSpace;
+    sal_Bool mbDirection;
+
+    // atributes for XAnimateMotion
+    Any maPath, maOrigin;
+
+    // attributes for XAnimateTransform
+    sal_Int16 mnTransformType;
+
+    // attributes for XTransitionFilter
+    sal_Int16 mnTransition;
+    sal_Int16 mnSubtype;
+    sal_Bool mbMode;
+    sal_Int32 mnFadeColor;
+
+    // XAudio
+    double mfVolume;
+
+    // XCommand
+    sal_Int16 mnCommand;
+    Any maParameter;
+
+    // XIterateContainer
+    sal_Int16 mnIterateType;
+    double  mfIterateInterval;
+
+    /** sorted list of child nodes for XTimeContainer*/
+    ChildList_t             maChilds;
+};
+
+// ====================================================================
+
+class TimeContainerEnumeration : public ::cppu::WeakImplHelper1< XEnumeration >
+{
+public:
+    TimeContainerEnumeration( const ChildList_t &rChilds );
+    virtual ~TimeContainerEnumeration();
+
+    // Methods
+    virtual sal_Bool SAL_CALL hasMoreElements() throw (RuntimeException);
+    virtual Any SAL_CALL nextElement(  ) throw (NoSuchElementException, WrappedTargetException, RuntimeException);
+
+private:
+    /** sorted list of child nodes */
+    ChildList_t             maChilds;
+
+    /** current iteration position */
+    ChildList_t::iterator   maIter;
+
+    /** our first, last and only protection from mutli-threads! */
+    Mutex                   maMutex;
+};
+
+TimeContainerEnumeration::TimeContainerEnumeration( const ChildList_t &rChilds )
+: maChilds( rChilds )
+{
+    maIter = maChilds.begin();
+}
+
+TimeContainerEnumeration::~TimeContainerEnumeration()
+{
+}
+
+// Methods
+sal_Bool SAL_CALL TimeContainerEnumeration::hasMoreElements() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    return maIter != maChilds.end();
+}
+
+Any SAL_CALL TimeContainerEnumeration::nextElement()
+    throw (NoSuchElementException, WrappedTargetException, RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    if( maIter == maChilds.end() )
+        throw NoSuchElementException();
+
+    return makeAny( (*maIter++) );
+}
+
+// ====================================================================
+
+Sequence< Type >* AnimationNode::mpTypes[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
+Sequence< sal_Int8 >* AnimationNode::mpId[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
+
+AnimationNode::AnimationNode( sal_Int16 nNodeType )
+:   maChangeListener(maMutex),
+    mnNodeType( nNodeType ),
+    mnFill( AnimationFill::DEFAULT ),
+    mnFillDefault( AnimationFill::INHERIT ),
+    mnRestart( AnimationRestart:: DEFAULT ),
+    mnRestartDefault( AnimationRestart:: INHERIT ),
+    mfAcceleration( 0.0 ),
+    mfDecelerate( 0.0 ),
+    mbAutoReverse( sal_False ),
+    mpParent(0),
+    mnValueType( 0 ),
+    mnSubItem( 0 ),
+    mnCalcMode( (nNodeType == AnimationNodeType::ANIMATEMOTION) ? AnimationCalcMode::PACED : AnimationCalcMode::LINEAR),
+    mnAdditive(AnimationAdditiveMode::REPLACE),
+    mbAccumulate(sal_False),
+    mnColorSpace( AnimationColorSpace::RGB ),
+    mbDirection( sal_True ),
+    mnTransformType( AnimationTransformType::TRANSLATE ),
+    mnTransition(TransitionType::BARWIPE),
+    mnSubtype(TransitionSubType::DEFAULT),
+    mbMode(true),
+    mnFadeColor(0),
+    mfVolume(1.0),
+    mnCommand(0),
+    mnIterateType( ::com::sun::star::presentation::ShapeAnimationSubType::AS_WHOLE ),
+    mfIterateInterval(0.0)
+{
+    OSL_ENSURE((sal_uInt32)nNodeType < sizeof(mpTypes)/sizeof(Sequence<Type>*), "NodeType out of range");
+}
+
+AnimationNode::AnimationNode( const AnimationNode& rNode )
+:   AnimationNodeBase(),
+    maChangeListener(maMutex),
+    mnNodeType( rNode.mnNodeType ),
+
+    // attributes for the XAnimationNode interface implementation
+    maBegin( rNode.maBegin ),
+    maDuration( rNode.maDuration ),
+    maEnd( rNode.maEnd ),
+    maEndSync( rNode.maEndSync ),
+    maRepeatCount( rNode.maRepeatCount ),
+    maRepeatDuration( rNode.maRepeatDuration ),
+    mnFill( rNode.mnFill ),
+    mnFillDefault( rNode.mnFillDefault ),
+    mnRestart( rNode.mnRestart ),
+    mnRestartDefault( rNode.mnRestartDefault ),
+    mfAcceleration( rNode.mfAcceleration ),
+    mfDecelerate( rNode.mfDecelerate ),
+    mbAutoReverse( rNode.mbAutoReverse ),
+    maUserData( rNode.maUserData ),
+    mpParent(0),
+
+    // attributes for XAnimate
+    maTarget( rNode.maTarget ),
+    maAttributeName( rNode.maAttributeName ),
+    maFormula( rNode.maFormula ),
+    maValues( rNode.maValues ),
+    maKeyTimes( rNode.maKeyTimes ),
+    mnValueType( rNode.mnValueType ),
+    mnSubItem( rNode.mnSubItem ),
+    mnCalcMode( rNode.mnCalcMode ),
+    mnAdditive( rNode.mnAdditive ),
+    mbAccumulate( rNode.mbAccumulate ),
+    maFrom( rNode.maFrom ),
+    maTo( rNode.maTo ),
+    maBy( rNode.maBy ),
+    maTimeFilter( rNode.maTimeFilter ),
+
+    // attributes for XAnimateColor
+    mnColorSpace( rNode.mnColorSpace ),
+    mbDirection( rNode.mbDirection ),
+
+    // atributes for XAnimateMotion
+    maPath( rNode.maPath ),
+    maOrigin( rNode.maOrigin ),
+
+    // attributes for XAnimateTransform
+    mnTransformType( rNode.mnTransformType ),
+
+    // attributes for XTransitionFilter
+    mnTransition( rNode.mnTransition ),
+    mnSubtype( rNode.mnSubtype ),
+    mbMode( rNode.mbMode ),
+    mnFadeColor( rNode.mnFadeColor ),
+
+    // XAudio
+    mfVolume( rNode.mfVolume ),
+
+    // XCommand
+    mnCommand( rNode.mnCommand ),
+    maParameter( rNode.maParameter ),
+
+    // XIterateContainer
+    mnIterateType( rNode.mnIterateType ),
+    mfIterateInterval( rNode.mfIterateInterval )
+{
+}
+
+AnimationNode::~AnimationNode()
+{
+}
+
+// --------------------------------------------------------------------
+
+#define IMPL_NODE_FACTORY(N,IN,SN)\
+Reference< XInterface > SAL_CALL createInstance_##N( const Reference< XComponentContext > &  ) throw (Exception)\
+{\
+    return Reference < XInterface > ( SAL_STATIC_CAST( ::cppu::OWeakObject * , new AnimationNode( N ) ) );\
+}\
+OUString getImplementationName_##N()\
+{\
+    return OUString( RTL_CONSTASCII_USTRINGPARAM ( IN ) );\
+}\
+Sequence<OUString> getSupportedServiceNames_##N(void)\
+{\
+    Sequence<OUString> aRet(1);\
+    aRet.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SN ));\
+    return aRet;\
+}
+
+IMPL_NODE_FACTORY( PAR, "animcore::ParallelTimeContainer", "com.sun.star.animations.ParallelTimeContainer" )
+IMPL_NODE_FACTORY( SEQ, "animcore::SequenceTimeContainer", "com.sun.star.animations.SequenceTimeContainer" )
+IMPL_NODE_FACTORY( ITERATE, "animcore::IterateContainer", "com.sun.star.animations.IterateContainer" )
+IMPL_NODE_FACTORY( ANIMATE, "animcore::Animate", "com.sun.star.animations.Animate" )
+IMPL_NODE_FACTORY( SET, "animcore::AnimateSet", "com.sun.star.animations.AnimateSet" )
+IMPL_NODE_FACTORY( ANIMATECOLOR, "animcore::AnimateColor", "com.sun.star.animations.AnimateColor" )
+IMPL_NODE_FACTORY( ANIMATEMOTION, "animcore::AnimateMotion", "com.sun.star.animations.AnimateMotion" )
+IMPL_NODE_FACTORY( ANIMATETRANSFORM, "animcore::AnimateTransform", "com.sun.star.animations.AnimateTransform" )
+IMPL_NODE_FACTORY( TRANSITIONFILTER, "animcore::TransitionFilter", "com.sun.star.animations.TransitionFilter" )
+IMPL_NODE_FACTORY( AUDIO, "animcore::Audio", "com.sun.star.animations.Audio" );
+IMPL_NODE_FACTORY( COMMAND, "animcore::Command", "com.sun.star.animations.Command" );
+
+// --------------------------------------------------------------------
+
+// XInterface
+Any SAL_CALL AnimationNode::queryInterface( const Type& aType ) throw (RuntimeException)
+{
+    Any aRet( ::cppu::queryInterface(
+        aType,
+        static_cast< XServiceInfo * >( this ),
+        static_cast< XTypeProvider * >( this ),
+        static_cast< XChild * >( static_cast< XTimeContainer * >(this) ),
+        static_cast< XCloneable* >( this ),
+        static_cast< XAnimationNode* >( static_cast< XTimeContainer * >(this) ),
+        static_cast< XInterface* >(static_cast< OWeakObject * >(this)),
+        static_cast< XWeak* >(static_cast< OWeakObject * >(this)),
+        static_cast< XChangesNotifier* >( this ),
+        static_cast< XUnoTunnel* >( this ) ) );
+
+    if(!aRet.hasValue())
+    {
+        switch( mnNodeType )
+        {
+        case AnimationNodeType::PAR:
+        case AnimationNodeType::SEQ:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XTimeContainer * >( this ),
+                static_cast< XEnumerationAccess * >( this ),
+                static_cast< XElementAccess * >( this ) );
+            break;
+        case AnimationNodeType::ITERATE:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XTimeContainer * >( this ),
+                static_cast< XIterateContainer * >( this ),
+                static_cast< XEnumerationAccess * >( this ),
+                static_cast< XElementAccess * >( this ) );
+            break;
+        case AnimationNodeType::ANIMATE:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XAnimate * >( static_cast< XAnimateMotion * >(this) ) );
+            break;
+        case AnimationNodeType::ANIMATEMOTION:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XAnimate * >( static_cast< XAnimateMotion * >(this) ),
+                static_cast< XAnimateMotion * >( this ) );
+            break;
+        case AnimationNodeType::ANIMATECOLOR:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XAnimate * >( static_cast< XAnimateColor * >(this) ),
+                static_cast< XAnimateColor * >( this ) );
+            break;
+        case AnimationNodeType::SET:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XAnimate * >( static_cast< XAnimateSet * >(this) ),
+                static_cast< XAnimateSet * >( this ) );
+            break;
+        case AnimationNodeType::ANIMATETRANSFORM:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XAnimate * >( static_cast< XAnimateTransform * >(this) ),
+                static_cast< XAnimateTransform * >( this ) );
+            break;
+        case AnimationNodeType::AUDIO:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XAudio * >( static_cast< XAudio * >(this) ) );
+            break;
+        case AnimationNodeType::COMMAND:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XCommand * >( static_cast< XCommand * >(this) ) );
+            break;
+        case AnimationNodeType::TRANSITIONFILTER:
+            aRet = ::cppu::queryInterface(
+                aType,
+                static_cast< XAnimate * >( static_cast< XTransitionFilter * >(this) ),
+                static_cast< XTransitionFilter * >( this ) );
+            break;
+        }
+    }
+
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( aType );
+}
+
+// --------------------------------------------------------------------
+
+void AnimationNode::initTypeProvider( sal_Int16 nNodeType ) throw()
+{
+    ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+
+    if(! mpTypes[nNodeType] )
+    {
+        // create id
+        mpId[nNodeType] = new Sequence< sal_Int8 >( 16 );
+        rtl_createUuid( (sal_uInt8 *)mpId[nNodeType]->getArray(), 0, sal_True );
+
+        static sal_Int32 type_numbers[] =
+        {
+            7, // CUSTOM
+            9, // PAR
+            9, // SEQ
+            9, // ITERATE
+            8, // ANIMATE
+            8, // SET
+            8, // ANIMATEMOTION
+            8, // ANIMATECOLOR
+            8, // ANIMATETRANSFORM
+            8, // TRANSITIONFILTER
+            8, // AUDIO
+            8, // COMMAND
+        };
+
+        // collect types
+        Sequence< Type > * types = new Sequence< Type >( type_numbers[nNodeType] );
+        Type * pTypeAr = types->getArray();
+        sal_Int32 nPos = 0;
+
+        pTypeAr[nPos++] = ::getCppuType( (const Reference< XWeak > *)0 );
+        pTypeAr[nPos++] = ::getCppuType( (const Reference< XChild > *)0 );
+        pTypeAr[nPos++] = ::getCppuType( (const Reference< XCloneable > *)0 );
+        pTypeAr[nPos++] = ::getCppuType( (const Reference< XTypeProvider > *)0 );
+        pTypeAr[nPos++] = ::getCppuType( (const Reference< XServiceInfo > *)0 );
+        pTypeAr[nPos++] = ::getCppuType( (const Reference< XUnoTunnel > *)0 );
+        pTypeAr[nPos++] = ::getCppuType( (const Reference< XChangesNotifier> *)0 );
+
+        switch( nNodeType )
+        {
+        case AnimationNodeType::PAR:
+        case AnimationNodeType::SEQ:
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XTimeContainer > *)0 );
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XEnumerationAccess > *)0 );
+            break;
+        case AnimationNodeType::ITERATE:
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XIterateContainer > *)0 );
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XEnumerationAccess > *)0 );
+            break;
+        case AnimationNodeType::ANIMATE:
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XAnimate > *)0 );
+            break;
+        case AnimationNodeType::ANIMATEMOTION:
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XAnimateMotion > *)0 );
+            break;
+        case AnimationNodeType::ANIMATECOLOR:
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XAnimateColor > *)0 );
+            break;
+        case AnimationNodeType::ANIMATETRANSFORM:
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XAnimateTransform > *)0 );
+            break;
+        case AnimationNodeType::SET:
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XAnimateSet > *)0 );
+            break;
+        case AnimationNodeType::TRANSITIONFILTER:
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XTransitionFilter > *)0 );
+            break;
+        case AnimationNodeType::AUDIO:
+            pTypeAr[nPos++] = ::getCppuType( (const Reference< XAudio > *)0 );
+            break;
+        case AnimationNodeType::COMMAND:
+            pTypeAr[nPos++] = ::getCppuType( ( const Reference< XCommand > *)0 );
+            break;
+        }
+        mpTypes[nNodeType] = types;
+    }
+}
+
+// --------------------------------------------------------------------
+
+Sequence< Type > AnimationNode::getTypes() throw (RuntimeException)
+{
+    if (! mpTypes[mnNodeType])
+        initTypeProvider(mnNodeType);
+    return *mpTypes[mnNodeType];
+}
+// --------------------------------------------------------------------
+
+Sequence< sal_Int8 > AnimationNode::getImplementationId() throw (RuntimeException)
+{
+    if (! mpId[mnNodeType])
+        initTypeProvider(mnNodeType);
+    return *mpId[mnNodeType];
+}
+
+// --------------------------------------------------------------------
+
+// XInterface
+void SAL_CALL AnimationNode::acquire(  ) throw ()
+{
+    OWeakObject::acquire();
+}
+
+// --------------------------------------------------------------------
+
+// XInterface
+void SAL_CALL AnimationNode::release(  ) throw ()
+{
+    OWeakObject::release();
+}
+
+// --------------------------------------------------------------------
+
+// XServiceInfo
+OUString AnimationNode::getImplementationName() throw()
+{
+    switch( mnNodeType )
+    {
+    case AnimationNodeType::PAR:
+        return getImplementationName_PAR();
+    case AnimationNodeType::SEQ:
+        return getImplementationName_SEQ();
+    case AnimationNodeType::ITERATE:
+        return getImplementationName_ITERATE();
+    case AnimationNodeType::SET:
+        return getImplementationName_SET();
+    case AnimationNodeType::ANIMATECOLOR:
+        return getImplementationName_ANIMATECOLOR();
+    case AnimationNodeType::ANIMATEMOTION:
+        return getImplementationName_ANIMATEMOTION();
+    case AnimationNodeType::TRANSITIONFILTER:
+        return getImplementationName_TRANSITIONFILTER();
+    case AnimationNodeType::ANIMATETRANSFORM:
+        return getImplementationName_ANIMATETRANSFORM();
+    case AnimationNodeType::AUDIO:
+        return getImplementationName_AUDIO();
+    case AnimationNodeType::COMMAND:
+        return getImplementationName_COMMAND();
+    case AnimationNodeType::ANIMATE:
+    default:
+        return getImplementationName_ANIMATE();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XServiceInfo
+sal_Bool AnimationNode::supportsService(const OUString& ServiceName) throw()
+{
+    Sequence< OUString > aSNL( getSupportedServiceNames() );
+    const OUString * pArray = aSNL.getConstArray();
+
+    for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
+        if( pArray[i] == ServiceName )
+            return sal_True;
+
+    return sal_False;
+}
+
+// --------------------------------------------------------------------
+
+// XServiceInfo
+Sequence< OUString > AnimationNode::getSupportedServiceNames(void) throw()
+{
+    switch( mnNodeType )
+    {
+    case AnimationNodeType::PAR:
+        return getSupportedServiceNames_PAR();
+    case AnimationNodeType::SEQ:
+        return getSupportedServiceNames_SEQ();
+    case AnimationNodeType::ITERATE:
+        return getSupportedServiceNames_ITERATE();
+    case AnimationNodeType::SET:
+        return getSupportedServiceNames_SET();
+    case AnimationNodeType::ANIMATECOLOR:
+        return getSupportedServiceNames_ANIMATECOLOR();
+    case AnimationNodeType::ANIMATEMOTION:
+        return getSupportedServiceNames_ANIMATEMOTION();
+    case AnimationNodeType::TRANSITIONFILTER:
+        return getSupportedServiceNames_TRANSITIONFILTER();
+    case AnimationNodeType::AUDIO:
+        return getSupportedServiceNames_AUDIO();
+    case AnimationNodeType::COMMAND:
+        return getSupportedServiceNames_COMMAND();
+    case AnimationNodeType::ANIMATE:
+    default:
+        return getSupportedServiceNames_ANIMATE();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+sal_Int16 SAL_CALL AnimationNode::getType() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnNodeType;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+Any SAL_CALL AnimationNode::getBegin() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maBegin;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setBegin( const Any& _begin ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _begin != maBegin )
+    {
+        maBegin = _begin;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+Any SAL_CALL AnimationNode::getDuration() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maDuration;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setDuration( const Any& _duration ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _duration != maDuration )
+    {
+        maDuration = _duration;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+Any SAL_CALL AnimationNode::getEnd() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maEnd;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setEnd( const Any& _end ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _end != maEnd )
+    {
+        maEnd = _end;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+Any SAL_CALL AnimationNode::getEndSync() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maEndSync;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _endsync != maEndSync )
+    {
+        maEndSync = _endsync;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+Any SAL_CALL AnimationNode::getRepeatCount() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maRepeatCount;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setRepeatCount( const Any& _repeatcount ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _repeatcount != maRepeatCount )
+    {
+        maRepeatCount = _repeatcount;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+Any SAL_CALL AnimationNode::getRepeatDuration() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maRepeatDuration;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _repeatduration != maRepeatDuration )
+    {
+        maRepeatDuration = _repeatduration;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+sal_Int16 SAL_CALL AnimationNode::getFill() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnFill;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _fill != mnFill )
+    {
+        mnFill = _fill;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+sal_Int16 SAL_CALL AnimationNode::getFillDefault() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnFillDefault;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _filldefault != mnFillDefault )
+    {
+        mnFillDefault = _filldefault;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+sal_Int16 SAL_CALL AnimationNode::getRestart() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnRestart;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _restart != mnRestart )
+    {
+        mnRestart = _restart;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+sal_Int16 SAL_CALL AnimationNode::getRestartDefault() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnRestartDefault;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _restartdefault != mnRestartDefault )
+    {
+        mnRestartDefault = _restartdefault;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+double SAL_CALL AnimationNode::getAcceleration() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mfAcceleration;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setAcceleration( double _acceleration ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _acceleration != mfAcceleration )
+    {
+        mfAcceleration = _acceleration;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+double SAL_CALL AnimationNode::getDecelerate() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mfDecelerate;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setDecelerate( double _decelerate ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _decelerate != mfDecelerate )
+    {
+        mfDecelerate = _decelerate;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+sal_Bool SAL_CALL AnimationNode::getAutoReverse() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mbAutoReverse;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimationNode
+void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _autoreverse != mbAutoReverse )
+    {
+        mbAutoReverse = _autoreverse;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+Sequence< NamedValue > SAL_CALL AnimationNode::getUserData() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maUserData;
+}
+
+// --------------------------------------------------------------------
+
+void SAL_CALL AnimationNode::setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    maUserData = _userdata;
+    fireChangeListener();
+}
+
+// --------------------------------------------------------------------
+
+// XChild
+Reference< XInterface > SAL_CALL AnimationNode::getParent() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mxParent;
+}
+
+// --------------------------------------------------------------------
+
+// XChild
+void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( Parent != mxParent )
+    {
+        mxParent = Parent;
+
+        mpParent = 0;
+        Reference< XUnoTunnel > xTunnel( mxParent, UNO_QUERY );
+        if( xTunnel.is() )
+            mpParent = reinterpret_cast< AnimationNode* >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething( getUnoTunnelId() )));
+
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XCloneable
+Reference< XCloneable > SAL_CALL AnimationNode::createClone() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    Reference< XCloneable > xNewNode;
+    try
+    {
+        xNewNode = new AnimationNode( *this );
+
+        if( maChilds.size() )
+        {
+            Reference< XTimeContainer > xContainer( xNewNode, UNO_QUERY );
+            if( xContainer.is() )
+            {
+                ChildList_t::iterator aIter( maChilds.begin() );
+                ChildList_t::iterator aEnd( maChilds.end() );
+                while( aIter != aEnd )
+                {
+                    Reference< XCloneable > xCloneable((*aIter++), UNO_QUERY );
+                    if( xCloneable.is() ) try
+                    {
+                        Reference< XAnimationNode > xNewChildNode( xCloneable->createClone(), UNO_QUERY );
+                        if( xNewChildNode.is() )
+                            xContainer->appendChild( xNewChildNode );
+                    }
+                    catch( Exception& e )
+                    {
+                        (void)e;
+                        OSL_TRACE( "animations::AnimationNode::createClone(), exception caught!" );
+                    }
+                }
+            }
+        }
+    }
+    catch( Exception& e )
+    {
+        (void)e;
+        OSL_TRACE( "animations::AnimationNode::createClone(), exception caught!" );
+    }
+
+    return xNewNode;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+Any SAL_CALL AnimationNode::getTarget()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maTarget;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setTarget( const Any& _target )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _target != maTarget )
+    {
+        maTarget= _target;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+OUString SAL_CALL AnimationNode::getAttributeName() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maAttributeName;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setAttributeName( const OUString& _attribute )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _attribute != maAttributeName )
+    {
+        maAttributeName = _attribute;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+Sequence< Any > SAL_CALL AnimationNode::getValues()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maValues;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setValues( const Sequence< Any >& _values )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    maValues = _values;
+    fireChangeListener();
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+sal_Int16 SAL_CALL AnimationNode::getSubItem() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnSubItem;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setSubItem( sal_Int16 _subitem ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _subitem != mnSubItem )
+    {
+        mnSubItem = _subitem;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+Sequence< double > SAL_CALL AnimationNode::getKeyTimes() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maKeyTimes;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setKeyTimes( const Sequence< double >& _keytimes ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    maKeyTimes = _keytimes;
+    fireChangeListener();
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+sal_Int16 SAL_CALL AnimationNode::getValueType() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnValueType;
+}
+
+// --------------------------------------------------------------------
+
+void SAL_CALL AnimationNode::setValueType( sal_Int16 _valuetype ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _valuetype != mnValueType )
+    {
+        mnValueType = _valuetype;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+sal_Int16 SAL_CALL AnimationNode::getCalcMode()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnCalcMode;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setCalcMode( sal_Int16 _calcmode )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _calcmode != mnCalcMode )
+    {
+        mnCalcMode = _calcmode;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+sal_Bool SAL_CALL AnimationNode::getAccumulate()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mbAccumulate;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setAccumulate( sal_Bool _accumulate )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _accumulate != mbAccumulate )
+    {
+        mbAccumulate = _accumulate;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+sal_Int16 SAL_CALL AnimationNode::getAdditive()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnAdditive;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setAdditive( sal_Int16 _additive )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _additive != mnAdditive )
+    {
+        mnAdditive = _additive;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+Any SAL_CALL AnimationNode::getFrom()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maFrom;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setFrom( const Any& _from )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _from != maFrom )
+    {
+        maFrom = _from;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+Any SAL_CALL AnimationNode::getTo()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maTo;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setTo( const Any& _to )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _to != maTo )
+    {
+        maTo = _to;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+Any SAL_CALL AnimationNode::getBy()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maBy;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setBy( const Any& _by )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _by != maBy )
+    {
+        maBy = _by;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+Sequence< TimeFilterPair > SAL_CALL AnimationNode::getTimeFilter()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maTimeFilter;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimate
+void SAL_CALL AnimationNode::setTimeFilter( const Sequence< TimeFilterPair >& _timefilter )
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    maTimeFilter = _timefilter;
+    fireChangeListener();
+}
+
+// --------------------------------------------------------------------
+
+OUString SAL_CALL AnimationNode::getFormula() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maFormula;
+}
+
+// --------------------------------------------------------------------
+
+void SAL_CALL AnimationNode::setFormula( const OUString& _formula ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _formula != maFormula )
+    {
+        maFormula = _formula;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateColor
+sal_Int16 SAL_CALL AnimationNode::getColorInterpolation() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnColorSpace;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateColor
+void SAL_CALL AnimationNode::setColorInterpolation( sal_Int16 _colorspace ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _colorspace != mnColorSpace )
+    {
+        mnColorSpace = _colorspace;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateColor
+sal_Bool SAL_CALL AnimationNode::getDirection() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mbDirection;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateColor
+void SAL_CALL AnimationNode::setDirection( sal_Bool _direction ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _direction != mbDirection )
+    {
+        mbDirection = _direction;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateMotion
+Any SAL_CALL AnimationNode::getPath() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maPath;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateMotion
+void SAL_CALL AnimationNode::setPath( const Any& _path ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    maPath = _path;
+    fireChangeListener();
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateMotion
+Any SAL_CALL AnimationNode::getOrigin() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maOrigin;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateMotion
+void SAL_CALL AnimationNode::setOrigin( const Any& _origin ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    maOrigin = _origin;
+    fireChangeListener();
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateTransform
+sal_Int16 SAL_CALL AnimationNode::getTransformType() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnTransformType;
+}
+
+// --------------------------------------------------------------------
+
+// XAnimateTransform
+void SAL_CALL AnimationNode::setTransformType( sal_Int16 _transformtype ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _transformtype != mnTransformType )
+    {
+        mnTransformType = _transformtype;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XTransitionFilter
+sal_Int16 SAL_CALL AnimationNode::getTransition() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnTransition;
+}
+
+// --------------------------------------------------------------------
+
+// XTransitionFilter
+void SAL_CALL AnimationNode::setTransition( sal_Int16 _transition ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _transition != mnTransition )
+    {
+        mnTransition = _transition;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XTransitionFilter
+sal_Int16 SAL_CALL AnimationNode::getSubtype() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnSubtype;
+}
+
+// --------------------------------------------------------------------
+
+// XTransitionFilter
+void SAL_CALL AnimationNode::setSubtype( sal_Int16 _subtype ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _subtype != mnSubtype )
+    {
+        mnSubtype = _subtype;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XTransitionFilter
+sal_Bool SAL_CALL AnimationNode::getMode() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mbMode;
+}
+
+// --------------------------------------------------------------------
+
+// XTransitionFilter
+void SAL_CALL AnimationNode::setMode( sal_Bool _mode ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _mode != mbMode )
+    {
+        mbMode = _mode;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XTransitionFilter
+sal_Int32 SAL_CALL AnimationNode::getFadeColor() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnFadeColor;
+}
+
+// --------------------------------------------------------------------
+
+// XTransitionFilter
+void SAL_CALL AnimationNode::setFadeColor( sal_Int32 _fadecolor ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _fadecolor != mnFadeColor )
+    {
+        mnFadeColor = _fadecolor;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XAudio
+Any SAL_CALL AnimationNode::getSource() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maTarget;
+}
+
+// --------------------------------------------------------------------
+
+// XAudio
+void SAL_CALL AnimationNode::setSource( const Any& _source ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    maTarget = _source;
+    fireChangeListener();
+}
+
+// --------------------------------------------------------------------
+
+// XAudio
+double SAL_CALL AnimationNode::getVolume() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mfVolume;
+}
+
+// --------------------------------------------------------------------
+
+// XAudio
+void SAL_CALL AnimationNode::setVolume( double _volume ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _volume != mfVolume )
+    {
+        mfVolume = _volume;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XCommand
+sal_Int16 SAL_CALL AnimationNode::getCommand() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnCommand;
+}
+
+// --------------------------------------------------------------------
+
+// XCommand
+void SAL_CALL AnimationNode::setCommand( sal_Int16 _command ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _command != mnCommand )
+    {
+        mnCommand = _command;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XCommand
+Any SAL_CALL AnimationNode::getParameter() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return maParameter;
+}
+
+// --------------------------------------------------------------------
+
+// XCommand
+void SAL_CALL AnimationNode::setParameter( const Any& _parameter ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    maParameter = _parameter;
+    fireChangeListener();
+}
+
+// --------------------------------------------------------------------
+
+// XElementAccess
+Type SAL_CALL AnimationNode::getElementType() throw (RuntimeException)
+{
+    return ::getCppuType((const Reference< XAnimationNode >*)0);
+}
+
+// --------------------------------------------------------------------
+
+// XElementAccess
+sal_Bool SAL_CALL AnimationNode::hasElements() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return !maChilds.empty();
+}
+
+// --------------------------------------------------------------------
+
+// XEnumerationAccess
+Reference< XEnumeration > SAL_CALL AnimationNode::createEnumeration()
+    throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    return new TimeContainerEnumeration( maChilds);
+}
+
+// --------------------------------------------------------------------
+
+
+// XTimeContainer
+Reference< XAnimationNode > SAL_CALL AnimationNode::insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild )
+    throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    if( !newChild.is() || !refChild.is() )
+        throw IllegalArgumentException();
+
+    ChildList_t::iterator before = ::std::find(maChilds.begin(), maChilds.end(), refChild);
+    if( before == maChilds.end() )
+        throw NoSuchElementException();
+
+    if( ::std::find(maChilds.begin(), maChilds.end(), newChild) != maChilds.end() )
+        throw ElementExistException();
+
+    maChilds.insert( before, newChild );
+
+    Reference< XInterface > xThis( static_cast< OWeakObject * >(this) );
+    newChild->setParent( xThis );
+
+    return newChild;
+}
+
+// --------------------------------------------------------------------
+
+// XTimeContainer
+Reference< XAnimationNode > SAL_CALL AnimationNode::insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild )
+    throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    if( !newChild.is() || !refChild.is() )
+        throw IllegalArgumentException();
+
+    ChildList_t::iterator before = ::std::find(maChilds.begin(), maChilds.end(), refChild);
+    if( before == maChilds.end() )
+        throw NoSuchElementException();
+
+    if( ::std::find(maChilds.begin(), maChilds.end(), newChild) != maChilds.end() )
+        throw ElementExistException();
+
+    ++before;
+    if( before != maChilds.end() )
+        maChilds.insert( before, newChild );
+    else
+        maChilds.push_back( newChild );
+
+    Reference< XInterface > xThis( static_cast< OWeakObject * >(this) );
+    newChild->setParent( xThis );
+
+    return newChild;
+}
+
+// --------------------------------------------------------------------
+
+// XTimeContainer
+Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild )
+    throw( IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    if( !newChild.is() || !oldChild.is() )
+        throw IllegalArgumentException();
+
+    ChildList_t::iterator replace = ::std::find(maChilds.begin(), maChilds.end(), oldChild);
+    if( replace == maChilds.end() )
+        throw NoSuchElementException();
+
+    if( ::std::find(maChilds.begin(), maChilds.end(), newChild) != maChilds.end() )
+        throw ElementExistException();
+
+    Reference< XInterface > xNull( 0 );
+    oldChild->setParent( xNull );
+
+    (*replace) = newChild;
+
+    Reference< XInterface > xThis( static_cast< OWeakObject * >(this) );
+    newChild->setParent( xThis );
+
+    return newChild;
+}
+
+// --------------------------------------------------------------------
+
+// XTimeContainer
+Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference< XAnimationNode >& oldChild )
+    throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    if( !oldChild.is() )
+        throw IllegalArgumentException();
+
+    ChildList_t::iterator old = ::std::find(maChilds.begin(), maChilds.end(), oldChild);
+    if( old == maChilds.end() )
+        throw NoSuchElementException();
+
+    Reference< XInterface > xNull( 0 );
+    oldChild->setParent( xNull );
+
+    maChilds.erase( old );
+
+    return oldChild;
+}
+
+// --------------------------------------------------------------------
+
+// XTimeContainer
+Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const Reference< XAnimationNode >& newChild )
+    throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    if( !newChild.is() )
+        throw IllegalArgumentException();
+
+    if( ::std::find(maChilds.begin(), maChilds.end(), newChild) != maChilds.end() )
+        throw ElementExistException();
+
+    Reference< XInterface > xThis( static_cast< OWeakObject * >(this) );
+    Reference< XInterface > xChild( newChild );
+
+    if( xThis == xChild )
+        throw IllegalArgumentException();
+
+    maChilds.push_back( newChild );
+
+    newChild->setParent( xThis );
+
+    return newChild;
+}
+
+// --------------------------------------------------------------------
+
+// XIterateContainer
+sal_Int16 SAL_CALL AnimationNode::getIterateType() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mnIterateType;
+}
+
+// --------------------------------------------------------------------
+
+// XIterateContainer
+void SAL_CALL AnimationNode::setIterateType( sal_Int16 _iteratetype ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _iteratetype != mnIterateType )
+    {
+        mnIterateType = _iteratetype;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XIterateContainer
+double SAL_CALL AnimationNode::getIterateInterval() throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    return mfIterateInterval;
+}
+
+// --------------------------------------------------------------------
+
+// XIterateContainer
+void SAL_CALL AnimationNode::setIterateInterval( double _iterateinterval ) throw (RuntimeException)
+{
+    Guard< Mutex > aGuard( maMutex );
+    if( _iterateinterval != mfIterateInterval )
+    {
+        mfIterateInterval = _iterateinterval;
+        fireChangeListener();
+    }
+}
+
+// --------------------------------------------------------------------
+
+// XChangesNotifier
+void SAL_CALL AnimationNode::addChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException)
+{
+    maChangeListener.addInterface( aListener );
+}
+
+// --------------------------------------------------------------------
+
+// XChangesNotifier
+void SAL_CALL AnimationNode::removeChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException)
+{
+    maChangeListener.removeInterface(aListener);
+}
+
+// --------------------------------------------------------------------
+
+// XUnoTunnel
+::sal_Int64 SAL_CALL AnimationNode::getSomething( const Sequence< ::sal_Int8 >& rId ) throw (RuntimeException)
+{
+    if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) )
+    {
+        return sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_IntPtr >(this));
+
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+namespace
+{
+    class theAnimationNodeUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theAnimationNodeUnoTunnelId > {};
+}
+
+const ::com::sun::star::uno::Sequence< sal_Int8 > & AnimationNode::getUnoTunnelId()
+{
+    return theAnimationNodeUnoTunnelId::get().getSeq();
+}
+
+// --------------------------------------------------------------------
+
+void AnimationNode::fireChangeListener()
+{
+    Guard< Mutex > aGuard( maMutex );
+
+    OInterfaceIteratorHelper aIterator( maChangeListener );
+    if( aIterator.hasMoreElements() )
+    {
+        Reference< XInterface > xSource( static_cast<OWeakObject*>(this), UNO_QUERY );
+        Sequence< ElementChange > aChanges;
+        const ChangesEvent aEvent( xSource, makeAny( mxParent ), aChanges );
+        while( aIterator.hasMoreElements() )
+        {
+            Reference< XChangesListener > xListener( aIterator.next(), UNO_QUERY );
+            if( xListener.is() )
+                xListener->changesOccurred( aEvent );
+        }
+    }
+
+    if( mpParent )
+        mpParent->fireChangeListener();
+}
+
+// --------------------------------------------------------------------
+
+} // namespace animcore
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/animations/source/animcore/animcore.xml b/animations/source/animcore/animcore.xml
new file mode 100644
index 000000000000..f6d105ea0794
--- /dev/null
+++ b/animations/source/animcore/animcore.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name> animations </module-name>
+
+    <component-description>
+        <author> Christian Lippka </author>
+        <name> todo </name>
+        <description>
+            This component provides ...
+        </description>
+        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <language>  c++ </language>
+        <status value="draft"/>
+        <supported-service> </supported-service>
+        <service-dependency> ... </service-dependency>
+        <type> ... </type>
+    </component-description>
+
+    <project-build-dependency>  cppuhelper  </project-build-dependency>
+    <project-build-dependency>  cppu        </project-build-dependency>
+    <project-build-dependency>  sal         </project-build-dependency>
+
+    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
+    <runtime-module-dependency> cppu2       </runtime-module-dependency>
+    <runtime-module-dependency> sal2        </runtime-module-dependency>
+</module-description>
+
diff --git a/animations/source/animcore/factreg.cxx b/animations/source/animcore/factreg.cxx
new file mode 100644
index 000000000000..97ebacf48cb3
--- /dev/null
+++ b/animations/source/animcore/factreg.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <osl/diagnose.h>
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/implementationentry.hxx>
+
+#include <com/sun/star/registry/XRegistryKey.hpp>
+
+using namespace ::rtl;
+using namespace ::cppu;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::registry;
+
+#include "factreg.hxx"
+
+namespace animcore
+{
+    rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
+}
+
+using namespace animcore;
+
+#define IMPLEMENTATION_ENTRY(N)\
+{\
+    createInstance_##N, getImplementationName_##N ,\
+    getSupportedServiceNames_##N, createSingleComponentFactory ,\
+    &g_moduleCount.modCnt , 0\
+}\
+
+static struct ImplementationEntry g_entries[] =
+{
+    IMPLEMENTATION_ENTRY( PAR ),
+    IMPLEMENTATION_ENTRY( SEQ ),
+    IMPLEMENTATION_ENTRY( ITERATE ),
+    IMPLEMENTATION_ENTRY( ANIMATE ),
+    IMPLEMENTATION_ENTRY( SET ),
+    IMPLEMENTATION_ENTRY( ANIMATECOLOR ),
+    IMPLEMENTATION_ENTRY( ANIMATEMOTION ),
+    IMPLEMENTATION_ENTRY( ANIMATETRANSFORM ),
+    IMPLEMENTATION_ENTRY( TRANSITIONFILTER ),
+    IMPLEMENTATION_ENTRY( AUDIO ),
+    IMPLEMENTATION_ENTRY( COMMAND ),
+    IMPLEMENTATION_ENTRY( TargetPropertiesCreator ),
+    { 0, 0, 0, 0, 0, 0 }
+};
+
+extern "C"
+{
+
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL animcore_component_getFactory(
+    const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+{
+    return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/animations/source/animcore/factreg.hxx b/animations/source/animcore/factreg.hxx
new file mode 100644
index 000000000000..c877d1b53c95
--- /dev/null
+++ b/animations/source/animcore/factreg.hxx
@@ -0,0 +1,54 @@
+/* -*- 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 <rtl/unload.h>
+
+namespace animcore {
+
+extern rtl_StandardModuleCount g_moduleCount;
+
+#define DECL_NODE_FACTORY(N)\
+extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance_##N( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rSMgr ) throw (::com::sun::star::uno::Exception);\
+extern ::rtl::OUString getImplementationName_##N();\
+extern ::com::sun::star::uno::Sequence< ::rtl::OUString> getSupportedServiceNames_##N(void)
+
+DECL_NODE_FACTORY( PAR );
+DECL_NODE_FACTORY( SEQ );
+DECL_NODE_FACTORY( ITERATE );
+DECL_NODE_FACTORY( ANIMATE );
+DECL_NODE_FACTORY( SET );
+DECL_NODE_FACTORY( ANIMATECOLOR );
+DECL_NODE_FACTORY( ANIMATEMOTION );
+DECL_NODE_FACTORY( ANIMATETRANSFORM );
+DECL_NODE_FACTORY( TRANSITIONFILTER );
+DECL_NODE_FACTORY( AUDIO );
+DECL_NODE_FACTORY( COMMAND );
+DECL_NODE_FACTORY( TargetPropertiesCreator );
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/animations/source/animcore/targetpropertiescreator.cxx b/animations/source/animcore/targetpropertiescreator.cxx
new file mode 100644
index 000000000000..fb953ee67f37
--- /dev/null
+++ b/animations/source/animcore/targetpropertiescreator.cxx
@@ -0,0 +1,499 @@
+/* -*- 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 <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/animations/XTargetPropertiesCreator.hpp>
+#include <com/sun/star/animations/XIterateContainer.hpp>
+#include <com/sun/star/animations/TargetProperties.hpp>
+#include <com/sun/star/presentation/ParagraphTarget.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XServiceName.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/animations/AnimationNodeType.hpp>
+#include <com/sun/star/animations/XAnimate.hpp>
+#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/implementationentry.hxx>
+#include <comphelper/broadcasthelper.hxx>
+#include <comphelper/sequence.hxx>
+
+#include <animations/animationnodehelper.hxx>
+
+#include <vector>
+#include <boost/unordered_map.hpp>
+
+
+using namespace ::com::sun::star;
+
+#define IMPLEMENTATION_NAME "animcore::TargetPropertiesCreator"
+#define SERVICE_NAME "com.sun.star.animations.TargetPropertiesCreator"
+
+namespace animcore
+{
+    typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::animations::XTargetPropertiesCreator,
+                                              lang::XServiceInfo,
+                                              lang::XServiceName >  TargetPropertiesCreator_Base;
+
+    class TargetPropertiesCreator : public ::comphelper::OBaseMutex,
+                                    public TargetPropertiesCreator_Base
+    {
+    public:
+        static uno::Reference< uno::XInterface > SAL_CALL createInstance( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::Exception )
+        {
+            return uno::Reference< uno::XInterface >( static_cast<cppu::OWeakObject*>(new TargetPropertiesCreator( xContext )) );
+        }
+
+        /// Dispose all internal references
+        virtual void SAL_CALL disposing();
+
+        // XTargetPropertiesCreator
+        virtual uno::Sequence< animations::TargetProperties > SAL_CALL createInitialTargetProperties( const uno::Reference< animations::XAnimationNode >& rootNode ) throw (uno::RuntimeException);
+
+        // XServiceInfo
+        virtual ::rtl::OUString SAL_CALL getImplementationName() throw( uno::RuntimeException );
+        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException );
+        virtual uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw( uno::RuntimeException );
+
+        // XServiceName
+        virtual ::rtl::OUString SAL_CALL getServiceName(  ) throw (uno::RuntimeException);
+
+    protected:
+        ~TargetPropertiesCreator(); // we're a ref-counted UNO class. _We_ destroy ourselves.
+
+    private:
+        // default: disabled copy/assignment
+        TargetPropertiesCreator(const TargetPropertiesCreator&);
+        TargetPropertiesCreator& operator=( const TargetPropertiesCreator& );
+
+        TargetPropertiesCreator( const uno::Reference< uno::XComponentContext >& rxContext );
+    };
+
+    // --------------------------------------------------------------------
+
+    uno::Reference< uno::XInterface > SAL_CALL createInstance_TargetPropertiesCreator( const uno::Reference< uno::XComponentContext > & rSMgr ) throw (uno::Exception)
+    {
+        return TargetPropertiesCreator::createInstance( rSMgr );
+    }
+
+    ::rtl::OUString getImplementationName_TargetPropertiesCreator()
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
+    }
+
+    uno::Sequence< ::rtl::OUString > getSupportedServiceNames_TargetPropertiesCreator(void)
+    {
+        uno::Sequence< ::rtl::OUString > aRet(1);
+        aRet.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
+        return aRet;
+    }
+
+    // --------------------------------------------------------------------
+
+    namespace
+    {
+        // Vector containing all properties for a given shape
+        typedef ::std::vector< beans::NamedValue > VectorOfNamedValues;
+
+        /** The hash map key
+
+            This key contains both XShape reference and a paragraph
+            index, as we somehow have to handle shape and paragraph
+            targets with the same data structure.
+         */
+        struct ShapeHashKey
+        {
+            /// Shape target
+            uno::Reference< drawing::XShape >   mxRef;
+
+            /** Paragraph index.
+
+                If this is a pure shape target, mnParagraphIndex is
+                set to -1.
+             */
+            sal_Int16                           mnParagraphIndex;
+
+            /// Comparison needed for boost::unordered_map
+            bool operator==( const ShapeHashKey& rRHS ) const
+            {
+                return mxRef == rRHS.mxRef && mnParagraphIndex == rRHS.mnParagraphIndex;
+            }
+        };
+
+        // A hash map which maps a XShape to the corresponding vector of initial properties
+        typedef ::boost::unordered_map< ShapeHashKey,
+                                 VectorOfNamedValues,
+                                 ::std::size_t (*)(const ShapeHashKey&) > XShapeHash;
+
+        ::std::size_t refhasher( const ShapeHashKey& rKey )
+        {
+            // TODO(P2): Maybe a better hash function would be to
+            // spread mnParagraphIndex to 32 bit: a0b0c0d0e0... Hakmem
+            // should have a formula.
+            //
+            // Yes it has:
+            // x = (x & 0x0000FF00) << 8) | (x >> 8) & 0x0000FF00 | x & 0xFF0000FF;
+            // x = (x & 0x00F000F0) << 4) | (x >> 4) & 0x00F000F0 | x & 0xF00FF00F;
+            // x = (x & 0x0C0C0C0C) << 2) | (x >> 2) & 0x0C0C0C0C | x & 0xC3C3C3C3;
+            // x = (x & 0x22222222) << 1) | (x >> 1) & 0x22222222 | x & 0x99999999;
+            //
+            // Costs about 17 cycles on a RISC machine with infinite
+            // instruction level parallelism (~42 basic
+            // instructions). Thus I truly doubt this pays off...
+            return reinterpret_cast< ::std::size_t >(rKey.mxRef.get()) ^ (rKey.mnParagraphIndex << 16L);
+        }
+
+
+        class NodeFunctor
+        {
+        public:
+            explicit NodeFunctor( XShapeHash& rShapeHash ) :
+                mrShapeHash( rShapeHash ),
+                mxTargetShape(),
+                mnParagraphIndex( -1 )
+            {
+            }
+
+            NodeFunctor( XShapeHash&                                rShapeHash,
+                         const uno::Reference< drawing::XShape >&   rTargetShape,
+                         sal_Int16                                  nParagraphIndex ) :
+                mrShapeHash( rShapeHash ),
+                mxTargetShape( rTargetShape ),
+                mnParagraphIndex( nParagraphIndex )
+            {
+            }
+
+            void operator()( const uno::Reference< animations::XAnimationNode >& xNode ) const
+            {
+                if( !xNode.is() )
+                {
+                    OSL_FAIL( "AnimCore: NodeFunctor::operator(): invalid XAnimationNode" );
+                    return;
+                }
+
+                uno::Reference< drawing::XShape > xTargetShape( mxTargetShape );
+                sal_Int16                         nParagraphIndex( mnParagraphIndex );
+
+                switch( xNode->getType() )
+                {
+                    case animations::AnimationNodeType::ITERATE:
+                    {
+                        // extract target shape from iterate node
+                        // (will override the target for all children)
+                        // --------------------------------------------------
+
+                        uno::Reference< animations::XIterateContainer > xIterNode( xNode,
+                                                                                   uno::UNO_QUERY );
+
+                        // TODO(E1): I'm not too sure what to expect here...
+                        if( !xIterNode->getTarget().hasValue() )
+                        {
+                            OSL_FAIL( "animcore: NodeFunctor::operator(): no target on ITERATE node" );
+                            return;
+                        }
+
+                        xTargetShape.set( xIterNode->getTarget(),
+                                          uno::UNO_QUERY );
+
+                        if( !xTargetShape.is() )
+                        {
+                            ::com::sun::star::presentation::ParagraphTarget aTarget;
+
+                            // no shape provided. Maybe a ParagraphTarget?
+                            if( !(xIterNode->getTarget() >>= aTarget) )
+                            {
+                                OSL_FAIL( "animcore: NodeFunctor::operator(): could not extract any "
+                                            "target information" );
+                                return;
+                            }
+
+                            xTargetShape = aTarget.Shape;
+                            nParagraphIndex = aTarget.Paragraph;
+
+                            if( !xTargetShape.is() )
+                            {
+                                OSL_FAIL( "animcore: NodeFunctor::operator(): invalid shape in ParagraphTarget" );
+                                return;
+                            }
+                        }
+                    }
+                        // FALLTHROUGH intended
+                    case animations::AnimationNodeType::PAR:
+                        // FALLTHROUGH intended
+                    case animations::AnimationNodeType::SEQ:
+                    {
+                        NodeFunctor aFunctor( mrShapeHash,
+                                              xTargetShape,
+                                              nParagraphIndex );
+                        if( !::anim::for_each_childNode( xNode,
+                                                         aFunctor ) )
+                        {
+                            OSL_FAIL( "AnimCore: NodeFunctor::operator(): child node iteration failed, "
+                                        "or extraneous container nodes encountered" );
+                        }
+                    }
+                    break;
+
+                    case animations::AnimationNodeType::CUSTOM:
+                        // FALLTHROUGH intended
+                    case animations::AnimationNodeType::ANIMATE:
+                        // FALLTHROUGH intended
+                    case animations::AnimationNodeType::ANIMATEMOTION:
+                        // FALLTHROUGH intended
+                    case animations::AnimationNodeType::ANIMATECOLOR:
+                        // FALLTHROUGH intended
+                    case animations::AnimationNodeType::ANIMATETRANSFORM:
+                        // FALLTHROUGH intended
+                    case animations::AnimationNodeType::TRANSITIONFILTER:
+                        // FALLTHROUGH intended
+                    case animations::AnimationNodeType::AUDIO:
+                        // FALLTHROUGH intended
+                    default:
+                        // ignore this node, no valuable content for now.
+                        break;
+
+                    case animations::AnimationNodeType::SET:
+                    {
+                        // evaluate set node content
+                        uno::Reference< animations::XAnimate > xAnimateNode( xNode,
+                                                                             uno::UNO_QUERY );
+
+                        if( !xAnimateNode.is() )
+                            break; // invalid node
+
+                        // determine target shape (if any)
+                        ShapeHashKey aTarget;
+                        if( xTargetShape.is() )
+                        {
+                            // override target shape with parent-supplied
+                            aTarget.mxRef = xTargetShape;
+                            aTarget.mnParagraphIndex = nParagraphIndex;
+                        }
+                        else
+                        {
+                            // no parent-supplied target, retrieve
+                            // node target
+                            if( (xAnimateNode->getTarget() >>= aTarget.mxRef) )
+                            {
+                                // pure shape target - set paragraph
+                                // index to magic
+                                aTarget.mnParagraphIndex = -1;
+                            }
+                            else
+                            {
+                                // not a pure shape target - maybe a
+                                // ParagraphTarget?
+                                presentation::ParagraphTarget aUnoTarget;
+
+                                if( !(xAnimateNode->getTarget() >>= aUnoTarget) )
+                                {
+                                    OSL_FAIL( "AnimCore: NodeFunctor::operator(): unknown target type encountered" );
+                                    break;
+                                }
+
+                                aTarget.mxRef = aUnoTarget.Shape;
+                                aTarget.mnParagraphIndex = aUnoTarget.Paragraph;
+                            }
+                        }
+
+                        if( !aTarget.mxRef.is() )
+                        {
+                            OSL_FAIL( "AnimCore: NodeFunctor::operator(): Found target, but XShape is NULL" );
+                            break; // invalid target XShape
+                        }
+
+                        // check whether we already have an entry for
+                        // this target (we only take the first set
+                        // effect for every shape)
+                        XShapeHash::const_iterator aIter;
+                        if( (aIter=mrShapeHash.find( aTarget )) != mrShapeHash.end() )
+                            break; // already an entry in existence for given XShape
+
+                        // if this is an appear effect, hide shape
+                        // initially. This is currently the only place
+                        // where a shape effect influences shape
+                        // attributes outside it's effective duration.
+                        if( xAnimateNode->getAttributeName().equalsIgnoreAsciiCaseAscii("visibility") )
+                        {
+                            sal_Bool bVisible( sal_False );
+
+                            uno::Any aAny( xAnimateNode->getTo() );
+
+                            // try to extract bool value
+                            if( !(aAny >>= bVisible) )
+                            {
+                                // try to extract string
+                                ::rtl::OUString aString;
+                                if( (aAny >>= aString) )
+                                {
+                                    // we also take the strings "true" and "false",
+                                    // as well as "on" and "off" here
+                                    if( aString.equalsIgnoreAsciiCaseAscii("true") ||
+                                        aString.equalsIgnoreAsciiCaseAscii("on") )
+                                    {
+                                        bVisible = sal_True;
+                                    }
+                                    if( aString.equalsIgnoreAsciiCaseAscii("false") ||
+                                        aString.equalsIgnoreAsciiCaseAscii("off") )
+                                    {
+                                        bVisible = sal_False;
+                                    }
+                                }
+                            }
+
+                            if( bVisible )
+                            {
+                                // target is set to 'visible' at the
+                                // first relevant effect. Thus, target
+                                // must be initially _hidden_, for the
+                                // effect to have visible impact.
+                                mrShapeHash.insert(
+                                    XShapeHash::value_type(
+                                        aTarget,
+                                        VectorOfNamedValues(
+                                            1,
+                                            beans::NamedValue(
+                                                xAnimateNode->getAttributeName(),
+                                                uno::makeAny( sal_False ) ) ) ) );
+                            }
+                        }
+                    }
+                    break;
+                }
+            }
+
+        private:
+            XShapeHash&                         mrShapeHash;
+            uno::Reference< drawing::XShape >   mxTargetShape;
+            sal_Int16                           mnParagraphIndex;
+        };
+    }
+
+    // --------------------------------------------------------------------
+
+    TargetPropertiesCreator::TargetPropertiesCreator( const uno::Reference< uno::XComponentContext >&  ) :
+        TargetPropertiesCreator_Base( m_aMutex )
+    {
+    }
+
+    TargetPropertiesCreator::~TargetPropertiesCreator()
+    {
+    }
+
+    void SAL_CALL TargetPropertiesCreator::disposing()
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+    }
+
+    // XTargetPropertiesCreator
+    uno::Sequence< animations::TargetProperties > SAL_CALL TargetPropertiesCreator::createInitialTargetProperties
+        (
+            const uno::Reference< animations::XAnimationNode >& xRootNode
+        ) throw (uno::RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        // scan all nodes for visibility changes, and record first
+        // 'visibility=true' for each shape
+        XShapeHash aShapeHash( 101,
+                               &refhasher );
+
+        NodeFunctor aFunctor( aShapeHash );
+
+        // TODO(F1): Maybe limit functor application to main sequence
+        // alone (CL said something that shape visibility is only
+        // affected by effects in the main sequence for PPT).
+        //
+        // OTOH, client code can pass us only the main sequence (which
+        // it actually does right now, for the slideshow implementation).
+        aFunctor( xRootNode );
+
+
+        // output to result sequence
+        // ----------------------------------------------------------------------
+
+        uno::Sequence< animations::TargetProperties > aRes( aShapeHash.size() );
+
+        ::std::size_t                       nCurrIndex(0);
+        XShapeHash::const_iterator          aCurr( aShapeHash.begin() );
+        const XShapeHash::const_iterator    aEnd ( aShapeHash.end()   );
+        while( aCurr != aEnd )
+        {
+            animations::TargetProperties& rCurrProps( aRes[ nCurrIndex++ ] );
+
+            if( aCurr->first.mnParagraphIndex == -1 )
+            {
+                rCurrProps.Target = uno::makeAny( aCurr->first.mxRef );
+            }
+            else
+            {
+                rCurrProps.Target = uno::makeAny(
+                    presentation::ParagraphTarget(
+                        aCurr->first.mxRef,
+                        aCurr->first.mnParagraphIndex ) );
+            }
+
+            rCurrProps.Properties = ::comphelper::containerToSequence( aCurr->second );
+
+            ++aCurr;
+        }
+
+        return aRes;
+    }
+
+    // XServiceInfo
+    ::rtl::OUString SAL_CALL TargetPropertiesCreator::getImplementationName() throw( uno::RuntimeException )
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ) );
+    }
+
+    sal_Bool SAL_CALL TargetPropertiesCreator::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException )
+    {
+        return ServiceName.equalsIgnoreAsciiCaseAscii( SERVICE_NAME );
+    }
+
+    uno::Sequence< ::rtl::OUString > SAL_CALL TargetPropertiesCreator::getSupportedServiceNames()  throw( uno::RuntimeException )
+    {
+        uno::Sequence< ::rtl::OUString > aRet(1);
+        aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+
+        return aRet;
+    }
+
+    // XServiceName
+    ::rtl::OUString SAL_CALL TargetPropertiesCreator::getServiceName(  ) throw (uno::RuntimeException)
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) );
+    }
+
+} // namespace animcore
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/apache-commons/java/codec/makefile.mk b/apache-commons/java/codec/makefile.mk
new file mode 100644
index 000000000000..84643530eb16
--- /dev/null
+++ b/apache-commons/java/codec/makefile.mk
@@ -0,0 +1,75 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=apache-commons
+TARGET=commons-codec
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# override buildfile
+ANT_BUILDFILE=build.xml
+
+.INCLUDE : antsettings.mk
+
+.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=commons-codec-1.3-src
+TARFILE_MD5=af3c3acf618de6108d65fcdc92b492e1
+
+TARFILE_ROOTDIR=commons-codec-1.3
+
+PATCH_FILES=$(PRJ)$/patches$/codec.patch
+
+OUT2CLASS=dist$/commons-codec-1.3.jar
+
+ANT_OPTS+="-Dfile.encoding=ISO-8859-1"
+.EXPORT : ANT_OPTS
+
+.IF "$(JAVACISGCJ)"=="yes"
+JAVA_HOME=
+.EXPORT : JAVA_HOME
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+.ELSE
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar
+.ENDIF
+
+.ENDIF # $(SOLAR_JAVA)!= ""
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+.INCLUDE : tg_ext.mk
+.ENDIF
+
diff --git a/apache-commons/java/httpclient/makefile.mk b/apache-commons/java/httpclient/makefile.mk
new file mode 100644
index 000000000000..55302e8c2f6a
--- /dev/null
+++ b/apache-commons/java/httpclient/makefile.mk
@@ -0,0 +1,78 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=apache-commons
+TARGET=commons-httpclient
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# override buildfile
+ANT_BUILDFILE=build.xml
+
+.INCLUDE : antsettings.mk
+
+TAR!:=$(GNUTAR)
+
+.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=commons-httpclient-3.1-src
+TARFILE_MD5=2c9b0f83ed5890af02c0df1c1776f39b
+
+TARFILE_ROOTDIR=commons-httpclient-3.1
+
+OUT2CLASS=dist$/commons-httpclient.jar
+
+COMMONS_LOGGING_JAR=..$/..$/..$/..$/$(INPATH)$/class$/commons-logging-1.1.1-SNAPSHOT.jar
+COMMONS_CODEC_JAR=..$/..$/..$/..$/$/$(INPATH)$/class$/commons-codec-1.3.jar
+
+ANT_OPTS+="-Dfile.encoding=ISO-8859-1"
+.EXPORT : ANT_OPTS
+
+.IF "$(JAVACISGCJ)"=="yes"
+JAVA_HOME=
+.EXPORT : JAVA_HOME
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
+.ELSE
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)"  -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) dist
+.ENDIF
+
+.ENDIF # $(SOLAR_JAVA)!= ""
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+.INCLUDE : tg_ext.mk
+.ENDIF
+
diff --git a/apache-commons/java/lang/makefile.mk b/apache-commons/java/lang/makefile.mk
new file mode 100644
index 000000000000..88a7e1f78dc8
--- /dev/null
+++ b/apache-commons/java/lang/makefile.mk
@@ -0,0 +1,75 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=apache-commons
+TARGET=commons-lang
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# override buildfile
+ANT_BUILDFILE=build.xml
+
+.INCLUDE : antsettings.mk
+
+TAR!:=$(GNUTAR)
+
+.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=commons-lang-2.3-src
+TARFILE_MD5=2ae988b339daec234019a7066f96733e
+
+TARFILE_ROOTDIR=commons-lang-2.3-src
+
+OUT2CLASS=dist$/commons-lang-2.3.jar
+
+ANT_OPTS+="-Dfile.encoding=ISO-8859-1"
+.EXPORT : ANT_OPTS
+
+.IF "$(JAVACISGCJ)"=="yes"
+JAVA_HOME=
+.EXPORT : JAVA_HOME
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+.ELSE
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+.ENDIF
+
+.ENDIF # $(SOLAR_JAVA)!= ""
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+.INCLUDE : tg_ext.mk
+.ENDIF
+
diff --git a/apache-commons/java/logging/makefile.mk b/apache-commons/java/logging/makefile.mk
new file mode 100644
index 000000000000..cc1f1a6e8aaa
--- /dev/null
+++ b/apache-commons/java/logging/makefile.mk
@@ -0,0 +1,81 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=apache-commons
+TARGET=commons-logging
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# override buildfile
+ANT_BUILDFILE=build.xml
+
+.INCLUDE : antsettings.mk
+
+.IF "$(SOLAR_JAVA)" != "" && ( "$(ENABLE_MEDIAWIKI)" == "YES" || "$(ENABLE_REPORTBUILDER)" == "YES" )
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=commons-logging-1.1.1-src
+TARFILE_MD5=3c219630e4302863a9a83d0efde889db
+
+TARFILE_ROOTDIR=commons-logging-1.1.1-src
+
+PATCH_FILES=$(PRJ)$/patches$/logging.patch
+
+CONVERTFILES=build.xml
+                
+OUT2CLASS=target$/commons-logging-1.1.1-SNAPSHOT.jar
+
+ANT_OPTS+="-Dfile.encoding=ISO-8859-1"
+.EXPORT : ANT_OPTS
+
+.IF "$(SYSTEM_TOMCAT)" != "YES"
+SERVLETAPI_JAR := $(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/servlet-api.jar
+.ENDIF
+
+.IF "$(JAVACISGCJ)"=="yes"
+JAVA_HOME=
+.EXPORT : JAVA_HOME
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -Dservletapi.jar=$(SERVLETAPI_JAR) -f $(ANT_BUILDFILE) compile build-jar
+.ELSE
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) -Dservletapi.jar=$(SERVLETAPI_JAR) compile build-jar
+.ENDIF
+
+.ENDIF # $(SOLAR_JAVA)!= ""
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.IF "$(SOLAR_JAVA)" != "" && ( "$(ENABLE_MEDIAWIKI)" == "YES" || "$(ENABLE_REPORTBUILDER)" == "YES" )
+.INCLUDE : tg_ext.mk
+.ENDIF
+
diff --git a/apache-commons/patches/codec.patch b/apache-commons/patches/codec.patch
new file mode 100644
index 000000000000..dea25ad263d2
--- /dev/null
+++ b/apache-commons/patches/codec.patch
@@ -0,0 +1,17 @@
+--- misc/build/commons-codec-1.3/build.xml-old	2008-01-31 15:28:58.000000000 +0100
++++ misc/build/commons-codec-1.3/build.xml	2008-01-31 15:29:21.000000000 +0100
+@@ -90,14 +90,12 @@
+     </target>
+     <target name="dist" depends="compile,javadoc" description="Create binary distribution">
+         <mkdir dir="${dist.home}"/>
+-        <copy file="../LICENSE" todir="${dist.home}"/>
+         <copy file="${basedir}/RELEASE-NOTES.txt" todir="${dist.home}"/>
+         <antcall target="jar"/>
+     </target>
+     <target name="jar" depends="compile" description="Create jar">
+         <mkdir dir="${dist.home}"/>
+         <mkdir dir="${build.home}/classes/META-INF"/>
+-        <copy file="../LICENSE" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+         <jar jarfile="${dist.home}/${final.name}.jar" basedir="${build.home}/classes" manifest="${build.home}/conf/MANIFEST.MF"/>
+     </target>
+     <target name="install-jar" depends="jar" description="--> Installs jar file in ${lib.repo}">
diff --git a/apache-commons/patches/logging.patch b/apache-commons/patches/logging.patch
new file mode 100644
index 000000000000..63b93dcbd6f2
--- /dev/null
+++ b/apache-commons/patches/logging.patch
@@ -0,0 +1,15 @@
+--- misc/commons-logging-1.1.1-src/build.xml	2007-11-22 00:27:52.000000000 +0100
++++ misc/build/commons-logging-1.1.1-src/build.xml	2008-06-24 14:23:56.316301736 +0200
+@@ -127,10 +127,10 @@
+ <!-- ========== Compiler Defaults ========================================= -->
+ 
+   <!-- Version of java class files to generate. -->
+-  <property name="target.version" value="1.1"/>
++  <property name="target.version" value="1.3"/>
+ 
+   <!-- Version of java source to accept -->
+-  <property name="source.version" value="1.2"/>
++  <property name="source.version" value="1.3"/>
+ 
+   <!-- Should Java compilations set the 'debug' compiler option? -->
+   <property name="compile.debug"           value="true"/>
diff --git a/apache-commons/prj/build.lst b/apache-commons/prj/build.lst
new file mode 100644
index 000000000000..c509ce0336dd
--- /dev/null
+++ b/apache-commons/prj/build.lst
@@ -0,0 +1,6 @@
+ac      apache-commons  :       solenv TOMCAT:tomcat NULL
+ac	apache-commons								usr1	-	all	ac_mkout 							NULL
+ac	apache-commons\java\codec					nmake	-	all	ac_codec								NULL
+ac	apache-commons\java\lang					nmake	-	all	ac_lang									NULL
+ac	apache-commons\java\logging					nmake	-	all	ac_logging								NULL
+ac	apache-commons\java\httpclient					nmake	-	all	ac_httpclient ac_logging ac_codec					NULL
diff --git a/apache-commons/prj/d.lst b/apache-commons/prj/d.lst
new file mode 100644
index 000000000000..03eec2a853ad
--- /dev/null
+++ b/apache-commons/prj/d.lst
@@ -0,0 +1,5 @@
+..\%__SRC%\class\commons-logging-1.1.1-SNAPSHOT.jar %_DEST%\bin\commons-logging-1.1.1.jar
+..\%__SRC%\class\commons-codec-1.3.jar %_DEST%\bin\commons-codec-1.3.jar
+..\%__SRC%\class\commons-httpclient.jar %_DEST%\bin\commons-httpclient-3.1.jar
+..\%__SRC%\class\commons-lang-2.3.jar %_DEST%\bin\commons-lang-2.3.jar
+
diff --git a/apple_remote/AppleRemote.m b/apple_remote/AppleRemote.m
new file mode 100644
index 000000000000..a65cc6440b41
--- /dev/null
+++ b/apple_remote/AppleRemote.m
@@ -0,0 +1,125 @@
+/*****************************************************************************
+ * RemoteControlWrapper.m
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org 
+ * by Eric Bachard on 11.08.2008 under the same license
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import "AppleRemote.h"
+
+#import <mach/mach.h>
+#import <mach/mach_error.h>
+#import <IOKit/IOKitLib.h>
+#import <IOKit/IOCFPlugIn.h>
+#import <IOKit/hid/IOHIDKeys.h>
+
+const char* AppleRemoteDeviceName = "AppleIRController";
+
+// the WWDC 07 Leopard Build is missing the constant
+#ifndef NSAppKitVersionNumber10_4
+	#define NSAppKitVersionNumber10_4 824
+#endif
+#ifndef NSAppKitVersionNumber10_5
+	#define NSAppKitVersionNumber10_5 949
+#endif
+
+@implementation AppleRemote
+
++ (const char*) remoteControlDeviceName {
+	return AppleRemoteDeviceName;
+}
+
+- (void) setCookieMappingInDictionary: (NSMutableDictionary*) _cookieToButtonMapping	{	
+    
+    // TODO : avoid such magics 
+	if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) {
+	    #ifdef DEBUG
+	    NSLog( @"setting 10.4 cookies" );
+	    #endif
+		// 10.4.x Tiger
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"14_12_11_6_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		forKey:@"14_13_11_6_"];		
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu]		forKey:@"14_7_6_14_7_6_"];			
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay]		forKey:@"14_8_6_14_8_6_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight]		forKey:@"14_9_6_14_9_6_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft]		forKey:@"14_10_6_14_10_6_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold]	forKey:@"14_6_4_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold]	forKey:@"14_6_3_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"14_6_14_6_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold]	forKey:@"18_14_6_18_14_6_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];			
+	} else if( floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_5 ) {
+	    #ifdef DEBUG
+	    NSLog( @"setting 10.5 cookies" );
+	    #endif
+		// 10.5.x Leopard
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"31_29_28_19_18_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		forKey:@"31_30_28_19_18_"];	
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu]		forKey:@"31_20_19_18_31_20_19_18_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay]		forKey:@"31_21_19_18_31_21_19_18_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight]		forKey:@"31_22_19_18_31_22_19_18_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft]		forKey:@"31_23_19_18_31_23_19_18_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold]	forKey:@"31_19_18_4_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold]	forKey:@"31_19_18_3_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"31_19_18_31_19_18_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold]	forKey:@"35_31_19_18_35_31_19_18_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];			
+	}
+	else
+	{
+	    #ifdef DEBUG
+	    NSLog( @"setting 10.6 cookies" );
+	    #endif
+	    // 10.6.x Snow Leopard
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"33_31_30_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		forKey:@"33_32_30_21_20_2_"];	
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu]		forKey:@"33_22_21_20_2_33_22_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay]		forKey:@"33_23_21_20_2_33_23_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight]		forKey:@"33_24_21_20_2_33_24_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft]		forKey:@"33_25_21_20_2_33_25_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold]	forKey:@"33_21_20_14_12_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold]	forKey:@"33_21_20_13_12_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"33_21_20_2_33_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold]	forKey:@"37_33_21_20_2_37_33_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];
+	}
+}
+
+- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown {
+	if (pressedDown == NO && event == kRemoteButtonMenu_Hold) {
+		// There is no seperate event for pressed down on menu hold. We are simulating that event here
+		[super sendRemoteButtonEvent:event pressedDown:YES];
+	}	
+	
+	[super sendRemoteButtonEvent:event pressedDown:pressedDown];
+	
+	if (pressedDown && (event == kRemoteButtonRight || event == kRemoteButtonLeft || event == kRemoteButtonPlay || event == kRemoteButtonMenu || event == kRemoteButtonPlay_Hold)) {
+		// There is no seperate event when the button is being released. We are simulating that event here
+		[super sendRemoteButtonEvent:event pressedDown:NO];
+	}
+}
+
+@end
diff --git a/apple_remote/GlobalKeyboardDevice.m b/apple_remote/GlobalKeyboardDevice.m
new file mode 100644
index 000000000000..14bf558a0511
--- /dev/null
+++ b/apple_remote/GlobalKeyboardDevice.m
@@ -0,0 +1,249 @@
+/*****************************************************************************
+ * GlobalKeyboardDevice.m
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org 
+ * by Eric Bachard on 11.08.2008 under the same license
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+
+#import "GlobalKeyboardDevice.h"
+
+#define F1 122
+#define F2 120
+#define F3 99
+#define F4 118
+#define F5 96
+#define F6 97
+#define F7 98
+
+/*
+ the following default keys are read and shall be used to change the keyboard mapping
+ 
+ mac.remotecontrols.GlobalKeyboardDevice.plus_modifiers
+ mac.remotecontrols.GlobalKeyboardDevice.plus_keycode
+ mac.remotecontrols.GlobalKeyboardDevice.minus_modifiers
+ mac.remotecontrols.GlobalKeyboardDevice.minus_keycode
+ mac.remotecontrols.GlobalKeyboardDevice.play_modifiers
+ mac.remotecontrols.GlobalKeyboardDevice.play_keycode
+ mac.remotecontrols.GlobalKeyboardDevice.left_modifiers
+ mac.remotecontrols.GlobalKeyboardDevice.left_keycode
+ mac.remotecontrols.GlobalKeyboardDevice.right_modifiers
+ mac.remotecontrols.GlobalKeyboardDevice.right_keycode
+ mac.remotecontrols.GlobalKeyboardDevice.menu_modifiers
+ mac.remotecontrols.GlobalKeyboardDevice.menu_keycode
+ mac.remotecontrols.GlobalKeyboardDevice.playhold_modifiers
+ mac.remotecontrols.GlobalKeyboardDevice.playhold_keycode
+ */
+
+static OSStatus hotKeyEventHandler(EventHandlerCallRef, EventRef, void*);
+
+@implementation GlobalKeyboardDevice
+
+- (id) initWithDelegate: (id) _remoteControlDelegate {	
+	if ( (self = [super initWithDelegate: _remoteControlDelegate]) ) {
+		hotKeyRemoteEventMapping = [[NSMutableDictionary alloc] init];
+		
+		unsigned int modifiers = cmdKey + shiftKey /*+ optionKey*/ + controlKey;
+				
+		[self mapRemoteButton:kRemoteButtonPlus			defaultKeycode:F1 defaultModifiers:modifiers];
+		[self mapRemoteButton:kRemoteButtonMinus		defaultKeycode:F2 defaultModifiers:modifiers];
+		[self mapRemoteButton:kRemoteButtonPlay			defaultKeycode:F3 defaultModifiers:modifiers];
+		[self mapRemoteButton:kRemoteButtonLeft			defaultKeycode:F4 defaultModifiers:modifiers];
+		[self mapRemoteButton:kRemoteButtonRight		defaultKeycode:F5 defaultModifiers:modifiers];
+		[self mapRemoteButton:kRemoteButtonMenu			defaultKeycode:F6 defaultModifiers:modifiers];
+		[self mapRemoteButton:kRemoteButtonPlay_Hold	defaultKeycode:F7 defaultModifiers:modifiers];		
+	}
+	return self;
+}
+
+- (void) dealloc {
+	[hotKeyRemoteEventMapping release];
+	[super dealloc];
+}
+
+- (void) mapRemoteButton: (RemoteControlEventIdentifier) remoteButtonIdentifier defaultKeycode: (unsigned int) defaultKeycode defaultModifiers: (unsigned int) defaultModifiers {
+	NSString* defaultsKey = NULL;	
+	
+	switch(remoteButtonIdentifier) {
+		case kRemoteButtonPlus:
+			defaultsKey = @"plus";
+			break;
+		case kRemoteButtonMinus:
+			defaultsKey = @"minus";
+			break;			
+		case kRemoteButtonMenu:
+			defaultsKey = @"menu";
+			break;			
+		case kRemoteButtonPlay:
+			defaultsKey = @"play";
+			break;
+		case kRemoteButtonRight:
+			defaultsKey = @"right";
+			break;			
+		case kRemoteButtonLeft:			
+			defaultsKey = @"left";
+			break;
+		case kRemoteButtonPlay_Hold:
+			defaultsKey = @"playhold";
+			break;			
+		default: 
+#ifdef DEBUG
+			NSLog(@"Unknown global keyboard defaults key for remote button identifier %d", remoteButtonIdentifier);
+#endif
+            break;
+	}
+	
+	NSNumber* modifiersCfg = [[NSUserDefaults standardUserDefaults] objectForKey: [NSString stringWithFormat: @"mac.remotecontrols.GlobalKeyboardDevice.%@_modifiers", defaultsKey]];
+	NSNumber* keycodeCfg   = [[NSUserDefaults standardUserDefaults] objectForKey: [NSString stringWithFormat: @"mac.remotecontrols.GlobalKeyboardDevice.%@_keycode", defaultsKey]];
+	
+	unsigned int modifiers = defaultModifiers;
+	if (modifiersCfg) modifiers = [modifiersCfg unsignedIntValue];
+	
+	unsigned int keycode = defaultKeycode;
+	if (keycodeCfg) keycode = [keycodeCfg unsignedIntValue];
+				  
+    [self registerHotKeyCode: keycode  modifiers: modifiers remoteEventIdentifier: remoteButtonIdentifier];
+}	
+
+- (void) setListeningToRemote: (BOOL) value {
+	if (value == [self isListeningToRemote]) return;
+	if (value) {
+		[self startListening: self];
+	} else {
+		[self stopListening: self];
+	}
+}
+- (BOOL) isListeningToRemote {	
+	return (eventHandlerRef!=NULL);
+}
+
+- (void) startListening: (id) sender {
+	
+	if (eventHandlerRef) return;
+		
+	EventTypeSpec eventSpec[2] = {
+		{ kEventClassKeyboard, kEventHotKeyPressed },
+		{ kEventClassKeyboard, kEventHotKeyReleased }
+	};    
+	
+	InstallEventHandler( GetEventDispatcherTarget(),
+						 (EventHandlerProcPtr)hotKeyEventHandler, 
+						 2, eventSpec, self, &eventHandlerRef);	
+}
+- (void) stopListening: (id) sender {
+	RemoveEventHandler(eventHandlerRef);
+	eventHandlerRef = NULL;
+}
+
+- (BOOL) sendsEventForButtonIdentifier: (RemoteControlEventIdentifier) identifier {
+	NSEnumerator* values = [hotKeyRemoteEventMapping objectEnumerator];
+	NSNumber* remoteIdentifier;
+	while( (remoteIdentifier = [values nextObject]) ) {
+		if ([remoteIdentifier unsignedIntValue] == identifier) return YES;
+	}
+	return NO;
+}
+
++ (const char*) remoteControlDeviceName {
+	return "Keyboard";
+}
+
+- (BOOL)registerHotKeyCode: (unsigned int) keycode modifiers: (unsigned int) modifiers remoteEventIdentifier: (RemoteControlEventIdentifier) identifier {	
+	OSStatus err;
+	EventHotKeyID hotKeyID;
+	EventHotKeyRef carbonHotKey;
+
+	hotKeyID.signature = 'PTHk';
+	hotKeyID.id = (long)keycode;
+	
+	err = RegisterEventHotKey(keycode, modifiers, hotKeyID, GetEventDispatcherTarget(), 0, &carbonHotKey );
+	
+	if( err )
+		return NO;
+	
+	[hotKeyRemoteEventMapping setObject: [NSNumber numberWithInt:identifier] forKey: [NSNumber numberWithUnsignedInt: hotKeyID.id]];
+	
+	return YES;
+}
+/*
+- (void)unregisterHotKey: (PTHotKey*)hotKey
+{
+	OSStatus err;
+	EventHotKeyRef carbonHotKey;
+	NSValue* key;
+	
+	if( [[self allHotKeys] containsObject: hotKey] == NO )
+		return;
+	
+	carbonHotKey = [self _carbonHotKeyForHotKey: hotKey];
+	NSAssert( carbonHotKey != nil, @"" );
+	
+	err = UnregisterEventHotKey( carbonHotKey );
+	//Watch as we ignore 'err':
+	
+	key = [NSValue valueWithPointer: carbonHotKey];
+	[mHotKeys removeObjectForKey: key];
+	
+	[self _updateEventHandler];
+	
+	//See that? Completely ignored
+}
+*/
+
+- (RemoteControlEventIdentifier) remoteControlEventIdentifierForID: (unsigned int) id {
+	NSNumber* remoteEventIdentifier = [hotKeyRemoteEventMapping objectForKey:[NSNumber numberWithUnsignedInt: id]];
+	return [remoteEventIdentifier unsignedIntValue];
+}
+
+- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown {
+	[delegate sendRemoteButtonEvent: event pressedDown: pressedDown remoteControl:self];
+}
+
+static RemoteControlEventIdentifier lastEvent;
+
+
+static OSStatus hotKeyEventHandler(EventHandlerCallRef inHandlerRef, EventRef inEvent, void* userData )
+{
+	GlobalKeyboardDevice* keyboardDevice = (GlobalKeyboardDevice*) userData;
+	EventHotKeyID hkCom;
+	GetEventParameter(inEvent,kEventParamDirectObject,typeEventHotKeyID,NULL,sizeof(hkCom),NULL,&hkCom);
+
+	RemoteControlEventIdentifier identifier = [keyboardDevice remoteControlEventIdentifierForID:hkCom.id];
+	if (identifier == 0) return noErr;
+	
+	BOOL pressedDown = YES;
+	if (identifier != lastEvent) {
+		lastEvent = identifier;
+	} else {
+		lastEvent = 0;
+	    pressedDown = NO;
+	}
+	[keyboardDevice sendRemoteButtonEvent: identifier pressedDown: pressedDown];
+	
+	return noErr;
+}
+
+@end
diff --git a/apple_remote/HIDRemoteControlDevice.m b/apple_remote/HIDRemoteControlDevice.m
new file mode 100644
index 000000000000..94215900717b
--- /dev/null
+++ b/apple_remote/HIDRemoteControlDevice.m
@@ -0,0 +1,518 @@
+/*****************************************************************************
+ * HIDRemoteControlDevice.m
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org 
+ * by Eric Bachard on 11.08.2008 under the same license
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import "HIDRemoteControlDevice.h"
+
+#import <mach/mach.h>
+#import <mach/mach_error.h>
+#import <IOKit/IOKitLib.h>
+#import <IOKit/IOCFPlugIn.h>
+#import <IOKit/hid/IOHIDKeys.h>
+#import <Carbon/Carbon.h>
+
+@interface HIDRemoteControlDevice (PrivateMethods) 
+- (NSDictionary*) cookieToButtonMapping; // Creates the dictionary using the magics, depending on the remote
+- (IOHIDQueueInterface**) queue;
+- (IOHIDDeviceInterface**) hidDeviceInterface;
+- (void) handleEventWithCookieString: (NSString*) cookieString sumOfValues: (SInt32) sumOfValues; 
+- (void) removeNotifcationObserver;
+- (void) remoteControlAvailable:(NSNotification *)notification;
+
+@end
+
+@interface HIDRemoteControlDevice (IOKitMethods) 
++ (io_object_t) findRemoteDevice;
+- (IOHIDDeviceInterface**) createInterfaceForDevice: (io_object_t) hidDevice;
+- (BOOL) initializeCookies;
+- (BOOL) openDevice;
+@end
+
+@implementation HIDRemoteControlDevice
+
++ (const char*) remoteControlDeviceName {
+	return "";
+}
+
++ (BOOL) isRemoteAvailable {	
+	io_object_t hidDevice = [self findRemoteDevice];
+	if (hidDevice != 0) {
+		IOObjectRelease(hidDevice);
+		return YES;
+	} else {
+		return NO;		
+	}
+}
+
+- (id) initWithDelegate: (id) _remoteControlDelegate {	
+	if ([[self class] isRemoteAvailable] == NO) return nil;
+	
+	if ( (self = [super initWithDelegate: _remoteControlDelegate]) ) {
+		openInExclusiveMode = YES;
+		queue = NULL;
+		hidDeviceInterface = NULL;
+		cookieToButtonMapping = [[NSMutableDictionary alloc] init];
+		
+		[self setCookieMappingInDictionary: cookieToButtonMapping];
+
+		NSEnumerator* enumerator = [cookieToButtonMapping objectEnumerator];
+		NSNumber* identifier;
+		supportedButtonEvents = 0;
+		while( (identifier = [enumerator nextObject]) ) {
+			supportedButtonEvents |= [identifier intValue];
+		}
+		
+		fixSecureEventInputBug = [[NSUserDefaults standardUserDefaults] boolForKey: @"remoteControlWrapperFixSecureEventInputBug"];
+	}
+	
+	return self;
+}
+
+- (void) dealloc {
+	[self removeNotifcationObserver];
+	[self stopListening:self];
+	[cookieToButtonMapping release];
+	[super dealloc];
+}
+
+- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown {
+	[delegate sendRemoteButtonEvent: event pressedDown: pressedDown remoteControl:self];
+}
+
+- (void) setCookieMappingInDictionary: (NSMutableDictionary*) cookieToButtonMapping {
+}
+- (int) remoteIdSwitchCookie {
+	return 0;
+}
+
+- (BOOL) sendsEventForButtonIdentifier: (RemoteControlEventIdentifier) identifier {
+	return (supportedButtonEvents & identifier) == identifier;
+}
+	
+- (BOOL) isListeningToRemote {
+	return (hidDeviceInterface != NULL && allCookies != NULL && queue != NULL);	
+}
+
+- (void) setListeningToRemote: (BOOL) value {
+	if (value == NO) {
+		[self stopListening:self];
+	} else {
+		[self startListening:self];
+	}
+}
+
+- (BOOL) isOpenInExclusiveMode {
+	return openInExclusiveMode;
+}
+- (void) setOpenInExclusiveMode: (BOOL) value {
+	openInExclusiveMode = value;
+}
+
+- (BOOL) processesBacklog {
+	return processesBacklog;
+}
+- (void) setProcessesBacklog: (BOOL) value {
+	processesBacklog = value;
+}
+
+- (void) startListening: (id) sender {	
+	if ([self isListeningToRemote]) return;
+	
+	// 4th July 2007
+	// 
+	// A security update in february of 2007 introduced an odd behavior.
+	// Whenever SecureEventInput is activated or deactivated the exclusive access
+	// to the remote control device is lost. This leads to very strange behavior where
+	// a press on the Menu button activates FrontRow while your app still gets the event.
+	// A great number of people have complained about this.	
+	// 
+	// Enabling the SecureEventInput and keeping it enabled does the trick.
+	//
+	// I'm pretty sure this is a kind of bug at Apple and I'm in contact with the responsible
+	// Apple Engineer. This solution is not a perfect one - I know. 	
+	// One of the side effects is that applications that listen for special global keyboard shortcuts (like Quicksilver)
+	// may get into problems as they no longer get the events.
+	// As there is no official Apple Remote API from Apple I also failed to open a technical incident on this.
+	// 
+	// Note that there is a corresponding DisableSecureEventInput in the stopListening method below.
+	// 
+	if ([self isOpenInExclusiveMode] && fixSecureEventInputBug) EnableSecureEventInput();	
+	
+	[self removeNotifcationObserver];
+	
+	io_object_t hidDevice = [[self class] findRemoteDevice];
+	if (hidDevice == 0) return;
+	
+	if ([self createInterfaceForDevice:hidDevice] == NULL) {
+		goto error;
+	}
+	
+	if ([self initializeCookies]==NO) {
+		goto error;
+	}
+
+	if ([self openDevice]==NO) {
+		goto error;
+	}
+	// be KVO friendly
+	[self willChangeValueForKey:@"listeningToRemote"];
+	[self didChangeValueForKey:@"listeningToRemote"];
+	goto cleanup;
+	
+error:
+	[self stopListening:self];
+	DisableSecureEventInput();
+	
+cleanup:	
+	IOObjectRelease(hidDevice);	
+}
+
+- (void) stopListening: (id) sender {
+	if ([self isListeningToRemote]==NO) return;
+	
+	BOOL sendNotification = NO;
+	
+	if (eventSource != NULL) {
+		CFRunLoopRemoveSource(CFRunLoopGetCurrent(), eventSource, kCFRunLoopDefaultMode);
+		CFRelease(eventSource);
+		eventSource = NULL;
+	}
+	if (queue != NULL) {
+		(*queue)->stop(queue);		
+		
+		//dispose of queue
+		(*queue)->dispose(queue);		
+		
+		//release the queue we allocated
+		(*queue)->Release(queue);	
+		
+		queue = NULL;
+		
+		sendNotification = YES;
+	}
+	
+	if (allCookies != nil) {
+		[allCookies autorelease];
+		allCookies = nil;
+	}
+	
+	if (hidDeviceInterface != NULL) {
+		//close the device
+		(*hidDeviceInterface)->close(hidDeviceInterface);
+		
+		//release the interface	
+		(*hidDeviceInterface)->Release(hidDeviceInterface);
+		
+		hidDeviceInterface = NULL;
+	}
+	
+	if ([self isOpenInExclusiveMode] && fixSecureEventInputBug) DisableSecureEventInput();
+	
+	if ([self isOpenInExclusiveMode] && sendNotification) {
+		[[self class] sendFinishedNotifcationForAppIdentifier: nil];		
+	}
+	// be KVO friendly
+	[self willChangeValueForKey:@"listeningToRemote"];
+	[self didChangeValueForKey:@"listeningToRemote"];	
+}
+
+@end
+
+@implementation HIDRemoteControlDevice (PrivateMethods) 
+
+- (IOHIDQueueInterface**) queue {
+	return queue;
+}
+
+- (IOHIDDeviceInterface**) hidDeviceInterface {
+	return hidDeviceInterface;
+}
+
+
+- (NSDictionary*) cookieToButtonMapping {
+	return cookieToButtonMapping;
+}
+
+- (NSString*) validCookieSubstring: (NSString*) cookieString {
+	if (cookieString == nil || [cookieString length] == 0) return nil;
+	NSEnumerator* keyEnum = [[self cookieToButtonMapping] keyEnumerator];
+	NSString* key;
+	while( (key = [keyEnum nextObject]) ) {
+		NSRange range = [cookieString rangeOfString:key];
+		if (range.location == 0) return key; 
+	}
+	return nil;
+}
+
+- (void) handleEventWithCookieString: (NSString*) cookieString sumOfValues: (SInt32) sumOfValues {
+	/*
+	if (previousRemainingCookieString) {
+		cookieString = [previousRemainingCookieString stringByAppendingString: cookieString];
+		NSLog(@"New cookie string is %@", cookieString);
+		[previousRemainingCookieString release], previousRemainingCookieString=nil;							
+	}*/
+	if (cookieString == nil || [cookieString length] == 0) return;
+		
+	NSNumber* buttonId = [[self cookieToButtonMapping] objectForKey: cookieString];
+	if (buttonId != nil) {
+		[self sendRemoteButtonEvent: [buttonId intValue] pressedDown: (sumOfValues>0)];
+	} else {
+		// let's see if a number of events are stored in the cookie string. this does
+		// happen when the main thread is too busy to handle all incoming events in time.
+		NSString* subCookieString;
+		NSString* lastSubCookieString=nil;
+		while( (subCookieString = [self validCookieSubstring: cookieString]) ) {
+			cookieString = [cookieString substringFromIndex: [subCookieString length]];
+			lastSubCookieString = subCookieString;
+			if (processesBacklog) [self handleEventWithCookieString: subCookieString sumOfValues:sumOfValues];
+		}
+		if (processesBacklog == NO && lastSubCookieString != nil) {
+			// process the last event of the backlog and assume that the button is not pressed down any longer.
+			// The events in the backlog do not seem to be in order and therefore (in rare cases) the last event might be 
+			// a button pressed down event while in reality the user has released it. 
+			// NSLog(@"processing last event of backlog");
+			[self handleEventWithCookieString: lastSubCookieString sumOfValues:0];
+		}
+		if ([cookieString length] > 0) {
+			NSLog(@"Unknown button for cookiestring %@", cookieString);
+		}		
+	}
+}
+
+- (void) removeNotifcationObserver {
+	[[NSDistributedNotificationCenter defaultCenter] removeObserver:self name:FINISHED_USING_REMOTE_CONTROL_NOTIFICATION object:nil];
+}
+
+- (void) remoteControlAvailable:(NSNotification *)notification {
+	[self removeNotifcationObserver];
+	[self startListening: self];
+}
+
+@end
+
+/*	Callback method for the device queue
+Will be called for any event of any type (cookie) to which we subscribe
+*/
+static void QueueCallbackFunction(void* target,  IOReturn result, void* refcon, void* sender) {	
+	if (target < 0) {
+		NSLog(@"QueueCallbackFunction called with invalid target!");
+		return;
+	}
+	NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+	
+	HIDRemoteControlDevice* remote = (HIDRemoteControlDevice*)target;	
+	IOHIDEventStruct event;	
+	AbsoluteTime 	 zeroTime = {0,0};
+	NSMutableString* cookieString = [NSMutableString string];
+	SInt32			 sumOfValues = 0;
+	while (result == kIOReturnSuccess)
+	{
+		result = (*[remote queue])->getNextEvent([remote queue], &event, zeroTime, 0);		
+		if ( result != kIOReturnSuccess )
+			continue;
+	
+		//printf("%d %d %d\n", event.elementCookie, event.value, event.longValue);		
+		
+		if (((int)event.elementCookie)!=5) {
+			sumOfValues+=event.value;
+			[cookieString appendString:[NSString stringWithFormat:@"%d_", event.elementCookie]];
+		}
+	}
+	[remote handleEventWithCookieString: cookieString sumOfValues: sumOfValues];
+	
+	[pool release];
+}
+
+@implementation HIDRemoteControlDevice (IOKitMethods)
+
+- (IOHIDDeviceInterface**) createInterfaceForDevice: (io_object_t) hidDevice {
+	io_name_t				className;
+	IOCFPlugInInterface**   plugInInterface = NULL;
+	HRESULT					plugInResult = S_OK;
+	SInt32					score = 0;
+	IOReturn				ioReturnValue = kIOReturnSuccess;
+	
+	hidDeviceInterface = NULL;
+	
+	ioReturnValue = IOObjectGetClass(hidDevice, className);
+	
+	if (ioReturnValue != kIOReturnSuccess) {
+		NSLog(@"Error: Failed to get class name.");
+		return NULL;
+	}
+	
+	ioReturnValue = IOCreatePlugInInterfaceForService(hidDevice,
+													  kIOHIDDeviceUserClientTypeID,
+													  kIOCFPlugInInterfaceID,
+													  &plugInInterface,
+													  &score);
+	if (ioReturnValue == kIOReturnSuccess)
+	{
+		//Call a method of the intermediate plug-in to create the device interface
+		plugInResult = (*plugInInterface)->QueryInterface(plugInInterface, CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID), (LPVOID) &hidDeviceInterface);
+		
+		if (plugInResult != S_OK) {
+			NSLog(@"Error: Couldn't create HID class device interface");
+		}
+		// Release
+		if (plugInInterface) (*plugInInterface)->Release(plugInInterface);
+	}
+	return hidDeviceInterface;
+}
+
+- (BOOL) initializeCookies {
+	IOHIDDeviceInterface122** handle = (IOHIDDeviceInterface122**)hidDeviceInterface;
+	IOHIDElementCookie		cookie;
+	long					usage;
+	long					usagePage;
+	id						object;
+	NSArray*				elements = nil;
+	NSDictionary*			element;
+	IOReturn success;
+	
+	if (!handle || !(*handle)) return NO;
+	
+	// Copy all elements, since we're grabbing most of the elements
+	// for this device anyway, and thus, it's faster to iterate them
+	// ourselves. When grabbing only one or two elements, a matching
+	// dictionary should be passed in here instead of NULL.
+	success = (*handle)->copyMatchingElements(handle, NULL, (CFArrayRef*)&elements);
+	
+	if (success == kIOReturnSuccess) {
+		
+		[elements autorelease];		
+		/*
+		cookies = calloc(NUMBER_OF_APPLE_REMOTE_ACTIONS, sizeof(IOHIDElementCookie)); 
+		memset(cookies, 0, sizeof(IOHIDElementCookie) * NUMBER_OF_APPLE_REMOTE_ACTIONS);
+		*/
+		allCookies = [[NSMutableArray alloc] init];
+		
+		NSEnumerator *elementsEnumerator = [elements objectEnumerator];
+		
+		while ( (element = [elementsEnumerator nextObject]) ) {						
+			//Get cookie
+			object = [element valueForKey: (NSString*)CFSTR(kIOHIDElementCookieKey) ];
+			if (object == nil || ![object isKindOfClass:[NSNumber class]]) continue;
+			if (object == 0 || CFGetTypeID(object) != CFNumberGetTypeID()) continue;
+			cookie = (IOHIDElementCookie) [object longValue];
+			
+			//Get usage
+			object = [element valueForKey: (NSString*)CFSTR(kIOHIDElementUsageKey) ];
+			if (object == nil || ![object isKindOfClass:[NSNumber class]]) continue;			
+			usage = [object longValue];
+			
+			//Get usage page
+			object = [element valueForKey: (NSString*)CFSTR(kIOHIDElementUsagePageKey) ];
+			if (object == nil || ![object isKindOfClass:[NSNumber class]]) continue;			
+			usagePage = [object longValue];
+
+			[allCookies addObject: [NSNumber numberWithInt:(int)cookie]];
+		}
+	} else {
+		return NO;
+	}
+	
+	return YES;
+}
+
+- (BOOL) openDevice {
+	HRESULT  result;
+	
+	IOHIDOptionsType openMode = kIOHIDOptionsTypeNone;
+	if ([self isOpenInExclusiveMode]) openMode = kIOHIDOptionsTypeSeizeDevice;	
+	IOReturn ioReturnValue = (*hidDeviceInterface)->open(hidDeviceInterface, openMode);	
+	
+	if (ioReturnValue == KERN_SUCCESS) {		
+		queue = (*hidDeviceInterface)->allocQueue(hidDeviceInterface);
+		if (queue) {
+			result = (*queue)->create(queue, 0, 12);	//depth: maximum number of elements in queue before oldest elements in queue begin to be lost.
+
+			IOHIDElementCookie cookie;
+			NSEnumerator *allCookiesEnumerator = [allCookies objectEnumerator];
+			
+			while ( (cookie = (IOHIDElementCookie)[[allCookiesEnumerator nextObject] intValue]) ) {
+				(*queue)->addElement(queue, cookie, 0);
+			}
+									  
+			// add callback for async events			
+			ioReturnValue = (*queue)->createAsyncEventSource(queue, &eventSource);			
+			if (ioReturnValue == KERN_SUCCESS) {
+				ioReturnValue = (*queue)->setEventCallout(queue,QueueCallbackFunction, self, NULL);
+				if (ioReturnValue == KERN_SUCCESS) {
+					CFRunLoopAddSource(CFRunLoopGetCurrent(), eventSource, kCFRunLoopDefaultMode);
+					
+					//start data delivery to queue
+					(*queue)->start(queue);	
+					return YES;
+				} else {
+					NSLog(@"Error when setting event callback");
+				}
+			} else {
+				NSLog(@"Error when creating async event source");
+			}
+		} else {
+			NSLog(@"Error when opening device");
+		}
+	} else if (ioReturnValue == kIOReturnExclusiveAccess) {
+		// the device is used exclusive by another application
+		
+		// 1. we register for the FINISHED_USING_REMOTE_CONTROL_NOTIFICATION notification
+		[[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(remoteControlAvailable:) name:FINISHED_USING_REMOTE_CONTROL_NOTIFICATION object:nil];
+		
+		// 2. send a distributed notification that we wanted to use the remote control				
+		[[self class] sendRequestForRemoteControlNotification];
+	}
+	return NO;				
+}
+
++ (io_object_t) findRemoteDevice {
+	CFMutableDictionaryRef hidMatchDictionary = NULL;
+	IOReturn ioReturnValue = kIOReturnSuccess;	
+	io_iterator_t hidObjectIterator = 0;
+	io_object_t	hidDevice = 0;
+	
+	// Set up a matching dictionary to search the I/O Registry by class
+	// name for all HID class devices
+	hidMatchDictionary = IOServiceMatching([self remoteControlDeviceName]);
+	
+	// Now search I/O Registry for matching devices.
+	ioReturnValue = IOServiceGetMatchingServices(kIOMasterPortDefault, hidMatchDictionary, &hidObjectIterator);
+	
+	if ((ioReturnValue == kIOReturnSuccess) && (hidObjectIterator != 0)) {
+		hidDevice = IOIteratorNext(hidObjectIterator);
+	}
+	
+	// release the iterator
+	IOObjectRelease(hidObjectIterator);
+	
+	return hidDevice;
+}
+
+@end
+
diff --git a/apple_remote/KeyspanFrontRowControl.m b/apple_remote/KeyspanFrontRowControl.m
new file mode 100644
index 000000000000..dd86475b12b1
--- /dev/null
+++ b/apple_remote/KeyspanFrontRowControl.m
@@ -0,0 +1,97 @@
+/*****************************************************************************
+ * KeyspanFrontRowControl.m
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org 
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+ 
+#import "KeyspanFrontRowControl.h"
+#import <mach/mach.h>
+#import <mach/mach_error.h>
+#import <IOKit/IOKitLib.h>
+#import <IOKit/IOCFPlugIn.h>
+#import <IOKit/hid/IOHIDKeys.h>
+
+@implementation KeyspanFrontRowControl
+
+- (void) setCookieMappingInDictionary: (NSMutableDictionary*) _cookieToButtonMapping	{	
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		 forKey:@"11_18_99_10_"];
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		 forKey:@"11_18_98_10_"];		
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu]		 forKey:@"11_18_58_10_"];		
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay]		 forKey:@"11_18_61_10_"];
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight]		 forKey:@"11_18_96_10_"];
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft]		 forKey:@"11_18_97_10_"];
+	/* hold events are not being send by this device
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold]	forKey:@"14_6_4_2_"];
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold]	forKey:@"14_6_3_2_"];
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"14_6_14_6_"];
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Sleep]	forKey:@"18_14_6_18_14_6_"];
+	[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];			
+	*/
+}
+
++ (io_object_t) findRemoteDevice {
+	CFMutableDictionaryRef hidMatchDictionary = NULL;
+	IOReturn ioReturnValue = kIOReturnSuccess;	
+	io_iterator_t hidObjectIterator = 0;
+	io_object_t	hidDevice = 0;
+	SInt32                  idVendor = 1741;
+	SInt32                  idProduct = 0x420;	
+	
+	// Set up a matching dictionary to search the I/O Registry by class
+	// name for all HID class devices
+	hidMatchDictionary = IOServiceMatching(kIOHIDDeviceKey);
+	
+	CFNumberRef numberRefVendor = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &idVendor);
+    if ( numberRefVendor )
+    {
+        CFDictionaryAddValue(hidMatchDictionary, CFSTR(kIOHIDVendorIDKey), numberRefVendor);
+        CFRelease(numberRefVendor);
+	}
+
+    CFNumberRef numberRefProduct = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &idProduct);
+    if ( numberRefProduct )
+    {
+        CFDictionaryAddValue(hidMatchDictionary, CFSTR(kIOHIDProductIDKey), numberRefProduct);
+        CFRelease(numberRefProduct);	
+	}
+
+	// Now search I/O Registry for matching devices.
+	ioReturnValue = IOServiceGetMatchingServices(kIOMasterPortDefault, hidMatchDictionary, &hidObjectIterator);
+	
+	if ((ioReturnValue == kIOReturnSuccess) && (hidObjectIterator != 0)) {
+		hidDevice = IOIteratorNext(hidObjectIterator);
+	}
+	
+	// release the iterator
+    if ( hidObjectIterator )
+        IOObjectRelease(hidObjectIterator);
+
+	return hidDevice;
+	
+}
+
+@end
diff --git a/apple_remote/MultiClickRemoteBehavior.m b/apple_remote/MultiClickRemoteBehavior.m
new file mode 100644
index 000000000000..03b24978d93b
--- /dev/null
+++ b/apple_remote/MultiClickRemoteBehavior.m
@@ -0,0 +1,213 @@
+/*****************************************************************************
+ * MultiClickRemoteBehavior.m
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org 
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import "MultiClickRemoteBehavior.h"
+
+const NSTimeInterval DEFAULT_MAXIMUM_CLICK_TIME_DIFFERENCE = 0.35;
+const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL = 0.4;
+
+@implementation MultiClickRemoteBehavior
+
+- (id) init {
+	if ( (self = [super init]) ) {
+		maxClickTimeDifference = DEFAULT_MAXIMUM_CLICK_TIME_DIFFERENCE;
+	}
+	return self;
+}
+
+// Delegates are not retained!
+// http://developer.apple.com/documentation/Cocoa/Conceptual/CocoaFundamentals/CommunicatingWithObjects/chapter_6_section_4.html
+// Delegating objects do not (and should not) retain their delegates. 
+// However, clients of delegating objects (applications, usually) are responsible for ensuring that their delegates are around
+// to receive delegation messages. To do this, they may have to retain the delegate.
+- (void) setDelegate: (id) _delegate {
+	if ( _delegate && ( [_delegate respondsToSelector:@selector(remoteButton:pressedDown:clickCount:)] == NO )) return; // return what ?
+	
+	delegate = _delegate;
+}
+- (id) delegate {
+	return delegate;
+}
+
+- (BOOL) simulateHoldEvent {
+	return simulateHoldEvents;
+}
+- (void) setSimulateHoldEvent: (BOOL) value {
+	simulateHoldEvents = value;
+}
+
+- (BOOL) simulatesHoldForButtonIdentifier: (RemoteControlEventIdentifier) identifier remoteControl: (RemoteControl*) remoteControl {
+	// we do that check only for the normal button identifiers as we would check for hold support for hold events instead
+	if (identifier > (1 << EVENT_TO_HOLD_EVENT_OFFSET)) return NO; 
+	
+	return [self simulateHoldEvent] && [remoteControl sendsEventForButtonIdentifier: (identifier << EVENT_TO_HOLD_EVENT_OFFSET)]==NO;
+}
+
+- (BOOL) clickCountingEnabled {
+	return clickCountEnabledButtons != 0;
+}
+- (void) setClickCountingEnabled: (BOOL) value {
+	if (value) {
+		[self setClickCountEnabledButtons: kRemoteButtonPlus | kRemoteButtonMinus | kRemoteButtonPlay | kRemoteButtonLeft | kRemoteButtonRight | kRemoteButtonMenu];
+	} else {
+		[self setClickCountEnabledButtons: 0];
+	}
+}
+
+- (unsigned int) clickCountEnabledButtons {
+	return clickCountEnabledButtons;
+}
+- (void) setClickCountEnabledButtons: (unsigned int)value {
+	clickCountEnabledButtons = value;
+}
+
+- (NSTimeInterval) maximumClickCountTimeDifference {
+	return maxClickTimeDifference;
+}
+- (void) setMaximumClickCountTimeDifference: (NSTimeInterval) timeDiff {
+	maxClickTimeDifference = timeDiff;
+}
+
+- (void) sendSimulatedHoldEvent: (id) time {
+	BOOL startSimulateHold = NO;
+	RemoteControlEventIdentifier event = lastHoldEvent;
+	@synchronized(self) {
+		startSimulateHold = (lastHoldEvent>0 && lastHoldEventTime == [time doubleValue]);
+	}
+	if (startSimulateHold) {
+		lastEventSimulatedHold = YES;
+		event = (event << EVENT_TO_HOLD_EVENT_OFFSET);
+		[delegate remoteButton:event pressedDown: YES clickCount: 1];
+	}
+}
+
+- (void) executeClickCountEvent: (NSArray*) values {
+	RemoteControlEventIdentifier event = [[values objectAtIndex: 0] unsignedIntValue]; 
+	NSTimeInterval eventTimePoint = [[values objectAtIndex: 1] doubleValue];
+	
+	BOOL finishedClicking = NO;
+	int finalClickCount = eventClickCount;	
+	
+	@synchronized(self) {
+		finishedClicking = (event != lastClickCountEvent || eventTimePoint == lastClickCountEventTime);
+		if (finishedClicking) {
+			eventClickCount = 0;		
+			lastClickCountEvent = 0;
+			lastClickCountEventTime = 0;
+		}
+	}
+	
+	if (finishedClicking) {	
+		[delegate remoteButton:event pressedDown: YES clickCount:finalClickCount];		
+		// trigger a button release event, too
+		[NSThread sleepUntilDate: [NSDate dateWithTimeIntervalSinceNow:0.1]];
+		[delegate remoteButton:event pressedDown: NO clickCount:finalClickCount];
+	}
+}
+
+- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown remoteControl: (RemoteControl*) remoteControl {	
+	if (!delegate)  return;
+	
+	BOOL clickCountingForEvent = ([self clickCountEnabledButtons] & event) == event;
+
+	if ([self simulatesHoldForButtonIdentifier: event remoteControl: remoteControl] && lastClickCountEvent==0) {
+		if (pressedDown) {
+			// wait to see if it is a hold
+			lastHoldEvent = event;
+			lastHoldEventTime = [NSDate timeIntervalSinceReferenceDate];
+			[self performSelector:@selector(sendSimulatedHoldEvent:) 
+					   withObject:[NSNumber numberWithDouble:lastHoldEventTime]
+					   afterDelay:HOLD_RECOGNITION_TIME_INTERVAL];
+			return;
+		} else {
+			if (lastEventSimulatedHold) {
+				// it was a hold
+				// send an event for "hold release"
+				event = (event << EVENT_TO_HOLD_EVENT_OFFSET);
+				lastHoldEvent = 0;
+				lastEventSimulatedHold = NO;
+
+				[delegate remoteButton:event pressedDown: pressedDown clickCount:1];
+				return;
+			} else {
+				RemoteControlEventIdentifier previousEvent = lastHoldEvent;
+				@synchronized(self) {
+					lastHoldEvent = 0;
+				}						
+				
+				// in case click counting is enabled we have to setup the state for that, too
+				if (clickCountingForEvent) {
+					lastClickCountEvent = previousEvent;
+					lastClickCountEventTime = lastHoldEventTime;
+					NSNumber* eventNumber;
+					NSNumber* timeNumber;		
+					eventClickCount = 1;
+					timeNumber = [NSNumber numberWithDouble:lastClickCountEventTime];
+					eventNumber= [NSNumber numberWithUnsignedInt:previousEvent];
+					NSTimeInterval diffTime = maxClickTimeDifference-([NSDate timeIntervalSinceReferenceDate]-lastHoldEventTime);
+					[self performSelector: @selector(executeClickCountEvent:) 
+							   withObject: [NSArray arrayWithObjects:eventNumber, timeNumber, nil]
+							   afterDelay: diffTime];							
+					// we do not return here because we are still in the press-release event
+					// that will be consumed below
+				} else {
+					// trigger the pressed down event that we consumed first
+					[delegate remoteButton:event pressedDown: YES clickCount:1];							
+				}
+			}										
+		}
+	}
+	
+	if (clickCountingForEvent) {
+		if (pressedDown == NO) return;
+
+		NSNumber* eventNumber;
+		NSNumber* timeNumber;
+		@synchronized(self) {
+			lastClickCountEventTime = [NSDate timeIntervalSinceReferenceDate];
+			if (lastClickCountEvent == event) {
+				eventClickCount = eventClickCount + 1;
+			} else {
+				eventClickCount = 1;
+			}
+			lastClickCountEvent = event;
+			timeNumber = [NSNumber numberWithDouble:lastClickCountEventTime];
+			eventNumber= [NSNumber numberWithUnsignedInt:event];
+		}
+		[self performSelector: @selector(executeClickCountEvent:) 
+				   withObject: [NSArray arrayWithObjects:eventNumber, timeNumber, nil]
+				   afterDelay: maxClickTimeDifference];
+	} else {
+		[delegate remoteButton:event pressedDown: pressedDown clickCount:1];
+	}		
+
+}
+
+@end
diff --git a/apple_remote/RemoteControl.m b/apple_remote/RemoteControl.m
new file mode 100644
index 000000000000..d0812d384b3e
--- /dev/null
+++ b/apple_remote/RemoteControl.m
@@ -0,0 +1,146 @@
+/*****************************************************************************
+ * RemoteControl.m
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org 
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+ 
+#import "RemoteControl.h"
+
+// notifaction names that are being used to signal that an application wants to 
+// have access to the remote control device or if the application has finished
+// using the remote control device
+NSString* REQUEST_FOR_REMOTE_CONTROL_NOTIFCATION     = @"mac.remotecontrols.RequestForRemoteControl";
+NSString* FINISHED_USING_REMOTE_CONTROL_NOTIFICATION = @"mac.remotecontrols.FinishedUsingRemoteControl";
+
+// keys used in user objects for distributed notifications
+NSString* kRemoteControlDeviceName = @"RemoteControlDeviceName";
+NSString* kApplicationIdentifier   = @"CFBundleIdentifier";
+// bundle identifier of the application that should get access to the remote control
+// this key is being used in the FINISHED notification only
+NSString* kTargetApplicationIdentifier = @"TargetBundleIdentifier";
+
+
+@implementation RemoteControl
+
+// returns nil if the remote control device is not available
+- (id) initWithDelegate: (id) _remoteControlDelegate {	
+	if ( (self = [super init]) ) {
+		delegate = [_remoteControlDelegate retain];
+#ifdef DEBUG
+        NSLog(@"RemoteControl initWithDelegate ok");
+#endif
+    }
+	return self;
+}
+
+- (void) dealloc {
+	[delegate release];
+	[super dealloc];
+}
+
+- (void) setListeningToRemote: (BOOL) value {
+#ifdef DEBUG
+        NSLog(@"setListeningToRemote ok");
+#endif
+}
+- (BOOL) isListeningToRemote {
+	return NO;
+}
+
+- (void) startListening: (id) sender {
+#ifdef DEBUG
+            NSLog(@"startListening ok");
+#endif
+}
+- (void) stopListening: (id) sender {
+#ifdef DEBUG
+            NSLog(@"stopListening ok");
+#endif
+}
+
+- (BOOL) isOpenInExclusiveMode {
+	return YES;
+}
+- (void) setOpenInExclusiveMode: (BOOL) value {
+}
+
+- (BOOL) sendsEventForButtonIdentifier: (RemoteControlEventIdentifier) identifier {
+#ifdef DEBUG
+   NSLog(@"sending event for button identifier \n");
+#endif
+	return YES;
+}
+
++ (void) sendDistributedNotification: (NSString*) notificationName targetBundleIdentifier: (NSString*) targetIdentifier
+{
+    if ( (self = [super init]) ) {
+    NSDictionary* userInfo = [NSDictionary dictionaryWithObjectsAndKeys: [NSString stringWithCString:[self remoteControlDeviceName] encoding:NSASCIIStringEncoding],
+                            kRemoteControlDeviceName /* key = RemoteControlDeviceName  -> OK */,
+                            [[NSBundle mainBundle] bundleIdentifier] /* value = org.openoffice.script -> OK */,
+                            kApplicationIdentifier/* key = CFBundleIdentifier -> OK */,
+                            targetIdentifier /*value = AppleIRController -> OK */,
+                            kTargetApplicationIdentifier /*targetBundleIdentifier -> does not appear, since the peer is nil*/,
+                            nil];
+#ifdef DEBUG
+    // Debug purpose: returns all the existing dictionary keys. 
+    NSString *s;
+    NSEnumerator *e = [userInfo keyEnumerator];
+    while ( (s = [e nextObject]) ) {
+        NSLog(@"key = %@ ",s);
+    }
+    NSEnumerator *f = [userInfo objectEnumerator ];
+    while ( (s = [f nextObject]) ) {
+        NSLog(@"value = %@ ",s);
+    }
+    NSLog(@"sendDistributedNotification ...");
+#endif
+
+	[[NSDistributedNotificationCenter defaultCenter] postNotificationName:notificationName
+																   object:nil
+																 userInfo:userInfo
+													   deliverImmediately:YES];	
+    }
+}
+
++ (void) sendFinishedNotifcationForAppIdentifier: (NSString*) identifier {
+    [self sendDistributedNotification:FINISHED_USING_REMOTE_CONTROL_NOTIFICATION targetBundleIdentifier:identifier];
+#ifdef DEBUG
+    NSLog(@"sendFinishedNotifcationForAppIdentifier ...");
+#endif
+}
++ (void) sendRequestForRemoteControlNotification {
+    [self sendDistributedNotification:REQUEST_FOR_REMOTE_CONTROL_NOTIFCATION targetBundleIdentifier:nil];
+#ifdef DEBUG
+    NSLog(@"sendRequestForRemoteControlNotification ...");
+#endif
+}
+
++ (const char*) remoteControlDeviceName {
+	return NULL;
+}
+
+@end
diff --git a/apple_remote/RemoteControlContainer.m b/apple_remote/RemoteControlContainer.m
new file mode 100644
index 000000000000..40a222f2d829
--- /dev/null
+++ b/apple_remote/RemoteControlContainer.m
@@ -0,0 +1,140 @@
+/*****************************************************************************
+ * RemoteControlContainer.m
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org 
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import "RemoteControlContainer.h"
+
+@implementation RemoteControlContainer
+
+- (id) initWithDelegate: (id) _remoteControlDelegate {
+	if ( (self = [super initWithDelegate:_remoteControlDelegate]) ) {
+		remoteControls = [[NSMutableArray alloc] init];
+#ifdef DEBUG
+        NSLog(@"RemoteControlContainer initWithDelegate ok");
+	}
+    else {
+        NSLog(@"RemoteControlContainer initWithDelegate failed");
+#endif
+    }
+
+	return self;
+}
+
+- (void) dealloc {
+	[self stopListening: self];
+	[remoteControls release];
+	[super dealloc];
+}
+
+- (BOOL) instantiateAndAddRemoteControlDeviceWithClass: (Class) clazz {
+    BOOL toReturn = NO;
+    RemoteControl* remoteControl = [[clazz alloc] initWithDelegate: delegate];
+    if (remoteControl) {
+        [remoteControls addObject: remoteControl];
+        [remoteControl addObserver: self forKeyPath:@"listeningToRemote" options:NSKeyValueObservingOptionNew context:nil];
+        toReturn = YES;		
+    }
+#ifdef DEBUG
+    else {
+        NSLog(@"RemoteControlContainer instantiateAndAddRemoteControlDeviceWithClass failed");
+        toReturn = NO;	
+    }
+#endif
+    return toReturn;
+}
+
+- (unsigned int) count {
+	return [remoteControls count];
+}
+
+- (void) reset {
+	[self willChangeValueForKey:@"listeningToRemote"];
+	[self didChangeValueForKey:@"listeningToRemote"];
+#ifdef DEBUG
+	// debug purpose
+    NSLog(@"reset... (after listening to remote)");
+#endif
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
+	[self reset];
+}
+
+- (void) setListeningToRemote: (BOOL) value {
+	int i;
+	for(i=0; i < [remoteControls count]; i++) {
+		[[remoteControls objectAtIndex: i] setListeningToRemote: value];
+	}
+	if (value && value != [self isListeningToRemote]) [self performSelector:@selector(reset) withObject:nil afterDelay:0.01];
+}
+- (BOOL) isListeningToRemote {
+	int i;
+	for(i=0; i < [remoteControls count]; i++) {
+		if ([[remoteControls objectAtIndex: i] isListeningToRemote]) {
+			return YES;
+		}
+	}
+	return NO;
+}
+
+- (void) startListening: (id) sender {
+#ifdef DEBUG
+	NSLog(@"startListening to events... ");
+#endif
+	int i;
+	for(i=0; i < [remoteControls count]; i++) {
+		[[remoteControls objectAtIndex: i] startListening: sender];
+	}	
+}
+- (void) stopListening: (id) sender {
+#ifdef DEBUG
+	NSLog(@"stopListening to events... ");
+#endif
+	int i;
+	for(i=0; i < [remoteControls count]; i++) {
+		[[remoteControls objectAtIndex: i] stopListening: sender];
+	}	
+}
+
+- (BOOL) isOpenInExclusiveMode {
+	BOOL mode = YES;
+	int i;
+	for(i=0; i < [remoteControls count]; i++) {
+		mode = mode && ([[remoteControls objectAtIndex: i] isOpenInExclusiveMode]);
+	}
+	return mode;	
+}
+- (void) setOpenInExclusiveMode: (BOOL) value {
+	int i;
+	for(i=0; i < [remoteControls count]; i++) {
+		[[remoteControls objectAtIndex: i] setOpenInExclusiveMode:value];
+	}	
+}
+
+@end
diff --git a/apple_remote/RemoteMainController.m b/apple_remote/RemoteMainController.m
new file mode 100644
index 000000000000..5b3b893adafc
--- /dev/null
+++ b/apple_remote/RemoteMainController.m
@@ -0,0 +1,177 @@
+/*****************************************************************************
+ * RemoteMainController.m
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org 
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import "RemoteMainController.h"
+#import "AppleRemote.h"
+#import "KeyspanFrontRowControl.h"
+#import "GlobalKeyboardDevice.h"
+#import "RemoteControlContainer.h"
+#import "MultiClickRemoteBehavior.h"
+
+// -------------------------------------------------------------------------------------------
+// Sample Code 3: Multi Click Behavior and Hold Event Simulation
+// -------------------------------------------------------------------------------------------
+
+@implementation MainController
+
+- (id) init {
+    self = [super init];  // because we redefined our own init instead of use the fu..nny awakeFromNib 
+    if (self != nil) {
+
+        // 1. instantiate the desired behavior for the remote control device
+        remoteControlBehavior = [[MultiClickRemoteBehavior alloc] init];	
+
+        // 2. configure the behavior
+        [remoteControlBehavior setDelegate: self];
+		
+        // 3. a Remote Control Container manages a number of devices and conforms to the RemoteControl interface
+        //    Therefore you can enable or disable all the devices of the container with a single "startListening:" call.
+        RemoteControlContainer* container = [[RemoteControlContainer alloc] initWithDelegate: remoteControlBehavior];
+
+        if ( [container instantiateAndAddRemoteControlDeviceWithClass: [AppleRemote class]] != 0 ) {
+#ifdef DEBUG
+            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [AppleRemote class]] successfull");
+        }
+        else {
+            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [AppleRemote class]] failed");
+#endif
+        }
+
+        if ( [container instantiateAndAddRemoteControlDeviceWithClass: [KeyspanFrontRowControl class]] != 0 ) {
+#ifdef DEBUG
+            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [KeyspanFrontRowControl class]] successfull");
+        }
+        else {
+            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [KeyspanFrontRowControl class]] failed");
+#endif
+        }
+
+        if ( [container instantiateAndAddRemoteControlDeviceWithClass: [GlobalKeyboardDevice class]] != 0 ) {
+#ifdef DEBUG
+            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [GlobalKeyboardDevice class]] successfull");
+        }
+        else {
+            NSLog(@"[container instantiateAndAddRemoteControlDeviceWithClass: [GlobalKeyboardDevice class]] failed");
+#endif
+        }	
+        // to give the binding mechanism a chance to see the change of the attribute
+        [self setValue: container forKey: @"remoteControl"];	
+#ifdef DEBUG
+            NSLog(@"MainController init done");
+#endif
+    }
+    else 
+        NSLog(@"MainController init failed");
+    return self;
+}
+
+- (void) postTheEvent: (short int)buttonIdentifier modifierFlags:(int)modifierFlags
+{
+    [NSApp postEvent: 
+    [NSEvent    otherEventWithType:NSApplicationDefined
+                location:NSZeroPoint
+                modifierFlags:modifierFlags
+                timestamp: 0
+                windowNumber:[[NSApp keyWindow] windowNumber]
+                context:nil
+                subtype:AppleRemoteControlEvent
+                data1: buttonIdentifier 
+                data2: 0]
+    atStart: NO];
+}
+
+
+- (void) remoteButton: (RemoteControlEventIdentifier)buttonIdentifier pressedDown: (BOOL) pressedDown clickCount: (unsigned int)clickCount
+{
+    NSString* pressed = @"";
+#ifdef DEBUG
+    NSString* buttonName = nil;
+#endif
+    if (pressedDown)
+    {
+        pressed = @"(pressed)";
+
+#ifdef DEBUG
+        switch(buttonIdentifier) 
+        {
+            case kRemoteButtonPlus:         buttonName = @"Volume up";              break;  // MEDIA_COMMAND_VOLUME_UP  ( see vcl/inc/vcl/cmdevt.hxx )
+            case kRemoteButtonMinus:        buttonName = @"Volume down";            break;  // MEDIA_COMMAND_VOLUME_DOWN
+            case kRemoteButtonMenu:         buttonName = @"Menu";                   break;  // MEDIA_COMMAND_MENU
+            case kRemoteButtonPlay:         buttonName = @"Play";                   break;  // MEDIA_COMMAND_PLAY
+            case kRemoteButtonRight:        buttonName = @"Next slide";             break;  // MEDIA_COMMAND_NEXTTRACK
+            case kRemoteButtonLeft:         buttonName = @"Left";                   break;  // MEDIA_COMMAND_PREVIOUSTRACK
+            case kRemoteButtonRight_Hold:   buttonName = @"Last slide";             break;  // MEDIA_COMMAND_NEXTTRACK_HOLD
+            case kRemoteButtonLeft_Hold:    buttonName = @"First slide";            break;  // MEDIA_COMMAND_PREVIOUSTRACK_HOLD
+            case kRemoteButtonPlus_Hold:    buttonName = @"Volume up holding";      break;
+            case kRemoteButtonMinus_Hold:   buttonName = @"Volume down holding";    break;
+            case kRemoteButtonPlay_Hold:    buttonName = @"Play (sleep mode)";      break;  // MEDIA_COMMAND_PLAY_HOLD
+            case kRemoteButtonMenu_Hold:    buttonName = @"Menu (long)";            break;  // MEDIA_COMMAND_MENU_HOLD
+            case kRemoteControl_Switched:   buttonName = @"Remote Control Switched";break;
+
+            default:    NSLog(@"Unmapped event for button %d", buttonIdentifier);   break;
+        }
+#endif
+        [ self postTheEvent:buttonIdentifier modifierFlags: 0 ];
+    }
+    else // not pressed
+    {
+        pressed = @"(released)";
+    }
+
+#ifdef DEBUG
+	//NSLog(@"Button %@ pressed %@", buttonName, pressed);
+	NSString* clickCountString = @"";
+	if (clickCount > 1) clickCountString = [NSString stringWithFormat: @"%d clicks", clickCount];
+	NSString* feedbackString = [NSString stringWithFormat:@"(Value:%4d) %@  %@ %@",buttonIdentifier, buttonName, pressed, clickCountString];
+
+	// print out events
+	NSLog(@"%@", feedbackString);
+
+    if (pressedDown == NO) printf("\n");
+	// simulate slow processing of events
+	// [NSThread sleepUntilDate: [NSDate dateWithTimeIntervalSinceNow: 0.5]];
+#endif
+}
+
+- (void) dealloc {
+    [remoteControl autorelease];
+	[remoteControlBehavior autorelease];
+	[super dealloc];
+}
+
+// for bindings access
+- (RemoteControl*) remoteControl {
+	return remoteControl;
+}
+
+- (MultiClickRemoteBehavior*) remoteBehavior {
+	return remoteControlBehavior;
+}
+
+@end
+\ No newline at end of file
diff --git a/apple_remote/inc/AppleRemote.h b/apple_remote/inc/AppleRemote.h
new file mode 100644
index 000000000000..aeb32f9f3892
--- /dev/null
+++ b/apple_remote/inc/AppleRemote.h
@@ -0,0 +1,40 @@
+/*****************************************************************************
+ * RemoteControlWrapper.h
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org
+ * by Eric Bachard on 11.08.2008 under the same license
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED ‚ÄúAS IS‚Äù, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+#import "HIDRemoteControlDevice.h"
+
+/*  Interacts with the Apple Remote Control HID device
+    The class is not thread safe
+*/
+@interface AppleRemote : HIDRemoteControlDevice {
+}
+
+@end
diff --git a/apple_remote/inc/GlobalKeyboardDevice.h b/apple_remote/inc/GlobalKeyboardDevice.h
new file mode 100644
index 000000000000..8e2aede3f34c
--- /dev/null
+++ b/apple_remote/inc/GlobalKeyboardDevice.h
@@ -0,0 +1,54 @@
+/*****************************************************************************
+ * GlobalKeyboardDevice.h
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org
+ * by Eric Bachard on 11.08.2008 under the same license
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+#import <Carbon/Carbon.h>
+
+#import "RemoteControl.h"
+
+
+/*
+ This class registers for a number of global keyboard shortcuts to simulate a remote control
+ */
+
+@interface GlobalKeyboardDevice : RemoteControl {
+
+    NSMutableDictionary* hotKeyRemoteEventMapping;
+    EventHandlerRef eventHandlerRef;
+
+}
+
+- (void) mapRemoteButton: (RemoteControlEventIdentifier) remoteButtonIdentifier defaultKeycode: (unsigned int) defaultKeycode defaultModifiers: (unsigned int) defaultModifiers;
+
+- (BOOL)registerHotKeyCode: (unsigned int) keycode modifiers: (unsigned int) modifiers remoteEventIdentifier: (RemoteControlEventIdentifier) identifier;
+
+
+
+@end
diff --git a/apple_remote/inc/HIDRemoteControlDevice.h b/apple_remote/inc/HIDRemoteControlDevice.h
new file mode 100644
index 000000000000..622441fce83c
--- /dev/null
+++ b/apple_remote/inc/HIDRemoteControlDevice.h
@@ -0,0 +1,67 @@
+/*****************************************************************************
+ * HIDRemoteControlDevice.h
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org
+ * by Eric Bachard on 11.08.2008 under the same license
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED ‚ÄúAS IS‚Äù, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+#import <IOKit/hid/IOHIDLib.h>
+
+#import "RemoteControl.h"
+
+/*
+    Base class for HID based remote control devices
+ */
+@interface HIDRemoteControlDevice : RemoteControl {
+    IOHIDDeviceInterface** hidDeviceInterface; // see IOKit/hid/IOHIDLib.h
+    IOHIDQueueInterface**  queue;  // IOKit/hid/IOHIDLib.h
+    NSMutableArray*        allCookies;
+    NSMutableDictionary*   cookieToButtonMapping;
+    CFRunLoopSourceRef     eventSource;
+
+    BOOL fixSecureEventInputBug;
+    BOOL openInExclusiveMode;
+    BOOL processesBacklog;
+
+    int supportedButtonEvents;
+}
+
+// When your application needs to much time on the main thread when processing an event other events
+// may already be received which are put on a backlog. As soon as your main thread
+// has some spare time this backlog is processed and may flood your delegate with calls.
+// Backlog processing is turned off by default.
+- (BOOL) processesBacklog;
+- (void) setProcessesBacklog: (BOOL) value;
+
+// methods that should be overwritten by subclasses
+- (void) setCookieMappingInDictionary: (NSMutableDictionary*) cookieToButtonMapping;
+
+- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown;
+
++ (BOOL) isRemoteAvailable;
+
+@end
diff --git a/apple_remote/inc/KeyspanFrontRowControl.h b/apple_remote/inc/KeyspanFrontRowControl.h
new file mode 100644
index 000000000000..a67ce4a96111
--- /dev/null
+++ b/apple_remote/inc/KeyspanFrontRowControl.h
@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * KeyspanFrontRowControl.h
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+
+#import <Cocoa/Cocoa.h>
+#import "HIDRemoteControlDevice.h"
+
+/*  Interacts with the Keyspan FrontRow Remote Control HID device
+    The class is not thread safe
+*/
+@interface KeyspanFrontRowControl : HIDRemoteControlDevice {
+
+}
+
+@end
diff --git a/apple_remote/inc/MultiClickRemoteBehavior.h b/apple_remote/inc/MultiClickRemoteBehavior.h
new file mode 100644
index 000000000000..9cffa35fae2f
--- /dev/null
+++ b/apple_remote/inc/MultiClickRemoteBehavior.h
@@ -0,0 +1,93 @@
+/*****************************************************************************
+ * MultiClickRemoteBehavior.h
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+
+#import <Cocoa/Cocoa.h>
+#import "RemoteControl.h"
+
+/**
+    A behavior that adds multiclick and hold events on top of a device.
+    Events are generated and send to a delegate
+ */
+@interface MultiClickRemoteBehavior : NSObject {
+    id delegate;
+
+    // state for simulating plus/minus hold
+    BOOL simulateHoldEvents;
+    BOOL lastEventSimulatedHold;
+    RemoteControlEventIdentifier lastHoldEvent;
+    NSTimeInterval lastHoldEventTime;
+
+    // state for multi click
+    unsigned int clickCountEnabledButtons;
+    NSTimeInterval maxClickTimeDifference;
+    NSTimeInterval lastClickCountEventTime;
+    RemoteControlEventIdentifier lastClickCountEvent;
+    unsigned int eventClickCount;
+}
+
+- (id) init;
+
+// Delegates are not retained
+- (void) setDelegate: (id) delegate;
+- (id) delegate;
+
+// Simulating hold events does deactivate sending of individual requests for pressed down/released.
+// Instead special hold events are being triggered when the user is pressing and holding a button for a small period.
+// Simulation is activated only for those buttons and remote control that do not have a seperate event already
+- (BOOL) simulateHoldEvent;
+- (void) setSimulateHoldEvent: (BOOL) value;
+
+// click counting makes it possible to recognize if the user has pressed a button repeatedly
+// click counting does delay each event as it has to wait if there is another event (second click)
+// therefore there is a slight time difference (maximumClickCountTimeDifference) between a single click
+// of the user and the call of your delegate method
+// click counting can be enabled individually for specific buttons. Use the property clickCountEnableButtons to
+// set the buttons for which click counting shall be enabled
+- (BOOL) clickCountingEnabled;
+- (void) setClickCountingEnabled: (BOOL) value;
+
+- (unsigned int) clickCountEnabledButtons;
+- (void) setClickCountEnabledButtons: (unsigned int)value;
+
+// the maximum time difference till which clicks are recognized as multi clicks
+- (NSTimeInterval) maximumClickCountTimeDifference;
+- (void) setMaximumClickCountTimeDifference: (NSTimeInterval) timeDiff;
+
+@end
+
+/*
+ * Method definitions for the delegate of the MultiClickRemoteBehavior class
+ */
+@interface NSObject(MultiClickRemoteBehaviorDelegate)
+
+- (void) remoteButton: (RemoteControlEventIdentifier)buttonIdentifier pressedDown: (BOOL) pressedDown clickCount: (unsigned int) count;
+
+@end
diff --git a/apple_remote/inc/RemoteControl.h b/apple_remote/inc/RemoteControl.h
new file mode 100644
index 000000000000..cbf8fd856235
--- /dev/null
+++ b/apple_remote/inc/RemoteControl.h
@@ -0,0 +1,105 @@
+/*****************************************************************************
+ * RemoteControl.h
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+// notifaction names that are being used to signal that an application wants to
+// have access to the remote control device or if the application has finished
+// using the remote control device
+extern NSString* REQUEST_FOR_REMOTE_CONTROL_NOTIFCATION;
+extern NSString* FINISHED_USING_REMOTE_CONTROL_NOTIFICATION;
+
+// keys used in user objects for distributed notifications
+extern NSString* kRemoteControlDeviceName;
+extern NSString* kApplicationIdentifier;
+extern NSString* kTargetApplicationIdentifier;
+
+// we have a 6 bit offset to make a hold event out of a normal event
+#define EVENT_TO_HOLD_EVENT_OFFSET 6
+
+@class RemoteControl;
+
+typedef enum _RemoteControlEventIdentifier {
+    // normal events
+    kRemoteButtonPlus               =1<<1,
+    kRemoteButtonMinus              =1<<2,
+    kRemoteButtonMenu               =1<<3,
+    kRemoteButtonPlay               =1<<4,
+    kRemoteButtonRight              =1<<5,
+    kRemoteButtonLeft               =1<<6,
+
+    // hold events
+    kRemoteButtonPlus_Hold          =1<<7,
+    kRemoteButtonMinus_Hold         =1<<8,
+    kRemoteButtonMenu_Hold          =1<<9,
+    kRemoteButtonPlay_Hold          =1<<10,
+    kRemoteButtonRight_Hold         =1<<11,
+    kRemoteButtonLeft_Hold          =1<<12,
+
+    // special events (not supported by all devices)
+    kRemoteControl_Switched         =1<<13,
+} RemoteControlEventIdentifier;
+
+@interface NSObject(RemoteControlDelegate)
+
+- (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown remoteControl: (RemoteControl*) remoteControl;
+
+@end
+
+/*
+    Base Interface for Remote Control devices
+*/
+@interface RemoteControl : NSObject {
+    id delegate;
+}
+
+// returns nil if the remote control device is not available
+- (id) initWithDelegate: (id) remoteControlDelegate;
+
+- (void) setListeningToRemote: (BOOL) value;
+- (BOOL) isListeningToRemote;
+
+- (BOOL) isOpenInExclusiveMode;
+- (void) setOpenInExclusiveMode: (BOOL) value;
+
+- (void) startListening: (id) sender;
+- (void) stopListening: (id) sender;
+
+// is this remote control sending the given event?
+- (BOOL) sendsEventForButtonIdentifier: (RemoteControlEventIdentifier) identifier;
+
+// sending of notifications between applications
++ (void) sendFinishedNotifcationForAppIdentifier: (NSString*) identifier;
++ (void) sendRequestForRemoteControlNotification;
+
+// name of the device
++ (const char*) remoteControlDeviceName;
+
+@end
diff --git a/apple_remote/inc/RemoteControlContainer.h b/apple_remote/inc/RemoteControlContainer.h
new file mode 100644
index 000000000000..f6cd40ba1178
--- /dev/null
+++ b/apple_remote/inc/RemoteControlContainer.h
@@ -0,0 +1,41 @@
+/*****************************************************************************
+ * RemoteControlContainer.h
+ * RemoteControlWrapper
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+#import "RemoteControl.h"
+
+@interface RemoteControlContainer : RemoteControl {
+    NSMutableArray* remoteControls;
+}
+
+- (BOOL) instantiateAndAddRemoteControlDeviceWithClass: (Class) clazz;
+- (unsigned int) count;
+
+@end
diff --git a/apple_remote/inc/RemoteMainController.h b/apple_remote/inc/RemoteMainController.h
new file mode 100644
index 000000000000..7143f1f1eda9
--- /dev/null
+++ b/apple_remote/inc/RemoteMainController.h
@@ -0,0 +1,49 @@
+/*****************************************************************************
+ * RemoteMainController.h
+ *
+ *
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Copyright (c) 2006 martinkahr.com. All rights reserved.
+ *
+ * Code modified and adapted to OpenOffice.org
+ * by Eric Bachard on 11.08.2008 under the same License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+#define AppleRemoteControlEvent 15
+
+@class RemoteControl;
+@class MultiClickRemoteBehavior;
+
+//static void sendTheEvent( unichar, int );
+
+@interface MainController : NSObject {
+@public // else remoteControl is not reachable from GetSalData()->mpMainController
+    RemoteControl* remoteControl;
+@private
+    MultiClickRemoteBehavior* remoteControlBehavior;
+}
+- (RemoteControl*) remoteControl;
+- (MultiClickRemoteBehavior*) remoteBehavior;
+
+@end
diff --git a/apple_remote/makefile.mk b/apple_remote/makefile.mk
new file mode 100644
index 000000000000..d261d5192708
--- /dev/null
+++ b/apple_remote/makefile.mk
@@ -0,0 +1,82 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=external
+TARGET=AppleRemote
+
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+# --- Files --------------------------------------------------------
+
+.IF "$(GUIBASE)"!="aqua"
+
+dummy:
+    @echo "Nothing to build for GUIBASE $(GUIBASE)"
+
+.ELSE		# "$(GUIBASE)"!="aqua"
+
+SHL1STDLIBS+= \
+    -framework Cocoa -framework Carbon -framework IOKit
+
+LIB1FILES+= \
+        $(SLB)$/AppleRemote.lib
+
+SLOFILES=	\
+        $(SLO)$/KeyspanFrontRowControl.obj 	\
+        $(SLO)$/AppleRemote.obj 		\
+        $(SLO)$/RemoteControl.obj		\
+        $(SLO)$/RemoteControlContainer.obj	\
+        $(SLO)$/GlobalKeyboardDevice.obj	\
+        $(SLO)$/HIDRemoteControlDevice.obj	\
+        $(SLO)$/MultiClickRemoteBehavior.obj	\
+        $(SLO)$/RemoteMainController.obj
+
+SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
+SHL1OBJS= $(SLOFILES)
+
+OUT2INC = \
+        $(BUILDDIR)$/KeyspaFrontRowControl.h	\
+        $(BUILDDIR)$/AppleRemote.h		\
+        $(BUILDDIR)$/RemoteControl.h		\
+        $(BUILDDIR)$/RemoteControlContainer.h	\
+        $(BUILDDIR)$/GlobalKeyboardDevice.h	\
+        $(BUILDDIR)$/HIDRemoteControlDevice.h	\
+        $(BUILDDIR)$/MultiClickRemoteBehavior.h	\
+        $(BUILDDIR)$/RemoteMainController.h
+
+
+.ENDIF		# "$(GUIBASE)"!="aqua"
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
diff --git a/apple_remote/prj/build.lst b/apple_remote/prj/build.lst
new file mode 100644
index 000000000000..ff4ee577408a
--- /dev/null
+++ b/apple_remote/prj/build.lst
@@ -0,0 +1,2 @@
+apr	apple_remote :	solenv	soltools NULL
+apr	apple_remote	nmake	-	u	apr_aprem	NULL
diff --git a/apple_remote/prj/d.lst b/apple_remote/prj/d.lst
new file mode 100644
index 000000000000..8d05687ba9f1
--- /dev/null
+++ b/apple_remote/prj/d.lst
@@ -0,0 +1,5 @@
+mkdir: %_DEST%\inc\apple_remote
+..\inc\*.h %_DEST%\inc\apple_remote\*
+
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+
diff --git a/autodoc/inc/ary/actions.hxx b/autodoc/inc/ary/actions.hxx
new file mode 100644
index 000000000000..5e2536ccd063
--- /dev/null
+++ b/autodoc/inc/ary/actions.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 ARY_ACTIONS_HXX
+#define ARY_ACTIONS_HXX
+//  KORR_DEPRECATED_3.0
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+    class RepositoryCenter;
+
+
+/*
+enum E_Action
+{
+    action_Parse,
+    action_SecondaryProductions,
+    action_Save,
+    action_Load,
+    action_ReadyForRead
+};
+*/
+
+
+/** @resp
+    Performs such commands on the repository, which refer to
+    large parts of it.
+
+    @collab ::ary::Repository
+            and its components and derivates.
+    @descr
+    This class works in kind of double dispatch way:
+
+    // Client code:
+    Command_Xy  aMyCommand;
+    ary::Repository::The_().PerformCommand( aMyCommand );
+
+    // Repository_Implementation::PerformCommand() code:
+    aMyCommand.Run(*this);
+
+    // Command_Xy::Run(Repository_Implementation & rRepository) code:
+    rRepository.Run_Command_Xy(*this);
+*/
+class Command
+{
+  public:
+    virtual             ~Command() {}
+
+    void                Run(
+                            n22::RepositoryCenter &
+                                                io_rReposy );
+  private:
+    virtual void        do_Run(
+                            n22::RepositoryCenter &
+                                                io_rReposy ) = 0;
+};
+
+
+// IMPLEMENTATION
+
+inline void
+Command::Run(n22::RepositoryCenter & io_rReposy)
+    { do_Run(io_rReposy); }
+
+
+} // namespace ary
+
+
+#endif
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/ary.hxx b/autodoc/inc/ary/ary.hxx
new file mode 100644
index 000000000000..d15ed4d83f66
--- /dev/null
+++ b/autodoc/inc/ary/ary.hxx
@@ -0,0 +1,93 @@
+/* -*- 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 ARY_ARY_HXX
+#define ARY_ARY_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+
+namespace ary
+{
+namespace idl
+{
+    class Gate;
+}
+
+namespace cpp
+{
+    class Gate;
+}
+}
+
+
+
+namespace ary
+{
+
+/** Starting point for all work with the
+    Autodoc Sourcecode Repository.
+
+    Create and destroy the repository and
+    give access to the "Gates" for different tasks.
+
+    @collab ::ary::cpp::Gate
+    @collab ::ary::idl::Gate
+*/
+
+class Repository
+{
+  public:
+    //  LIFECYCLE
+    virtual             ~Repository() {}
+    static DYN Repository &
+                        Create_();
+    // INQUIRY
+    virtual const String &
+                        Title() const = 0;
+    virtual const ::ary::cpp::Gate &
+                        Gate_Cpp() const = 0;
+    virtual const ::ary::idl::Gate &
+                        Gate_Idl() const = 0;
+    // ACCESS
+    virtual ::ary::cpp::Gate &
+                        Gate_Cpp() = 0;
+    virtual ::ary::idl::Gate &
+                        Gate_Idl() = 0;
+    virtual void        Set_Title(
+                            const String &      i_sName ) = 0;
+};
+
+
+
+} // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/ary_disp.hxx b/autodoc/inc/ary/ary_disp.hxx
new file mode 100644
index 000000000000..566f3209be20
--- /dev/null
+++ b/autodoc/inc/ary/ary_disp.hxx
@@ -0,0 +1,114 @@
+/* -*- 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 ARY_ARY_DISP_HXX
+#define ARY_ARY_DISP_HXX
+//  KORR_DEPRECATED_3.0
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cosv/tpl/processor.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/types.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class Gate;
+}
+
+class Display : public csv::ProcessorIfc
+{
+  public:
+    virtual             ~Display() {}
+
+    // OPERATIONS
+    void                StartSlot();
+    void                FinishSlot();
+
+    /** This method depends on the result of Get_ReFinder().
+        If Get_ReFinder() != 0, then DisplayGate::Find_Re() is called
+        and if valid, cpp::CppEntity::Accept( *this ) is called.
+        If Get_ReFinder() == 0, simply do_DisplaySlot_Rid() is called
+        with just the id as parameter.
+    */
+    void                DisplaySlot_Rid(
+                            ary::Rid            i_nId );
+//    void                DisplaySlot_Lid(
+//                          ary::Lid            i_nId );
+    /** This method depends on the result of Get_ReFinder().
+        If Get_ReFinder() != 0, then DisplayGate::Find_Re() is called
+        and if valid, cpp::CppEntity::Accept( *this ) is called.
+        If Get_ReFinder() == 0, simply do_DisplaySlot_LocalCe() is called
+        with just the id as parameter.
+    */
+    void                DisplaySlot_LocalCe(
+                            ary::cpp::Ce_id     i_nId,
+                            const String  &     i_sName );
+    // INQUIRY
+    const cpp::Gate *   Get_ReFinder() const;
+
+  private:
+    virtual void        do_StartSlot();
+    virtual void        do_FinishSlot();
+
+
+    virtual void        do_DisplaySlot_Rid(
+                            ary::Rid            i_nId );
+    virtual void        do_DisplaySlot_LocalCe(
+                            ary::cpp::Ce_id     i_nId,
+                            const String  &     i_sName );
+    virtual const cpp::Gate *
+                        inq_Get_ReFinder() const = 0;
+};
+
+
+// IMPLEMENTATION
+
+
+inline void
+Display::StartSlot()
+    { do_StartSlot(); }
+inline void
+Display::FinishSlot()
+    { do_FinishSlot(); }
+inline const cpp::Gate *
+Display::Get_ReFinder() const
+    { return inq_Get_ReFinder(); }
+
+
+
+
+} // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/arygroup.hxx b/autodoc/inc/ary/arygroup.hxx
new file mode 100644
index 000000000000..1acb07e076dc
--- /dev/null
+++ b/autodoc/inc/ary/arygroup.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 ARY_ARYGROUP_HXX
+#define ARY_ARYGROUP_HXX
+//  KORR_DEPRECATED_3.0
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <ary/types.hxx>
+
+
+namespace ary
+{
+namespace cpp
+{
+    class CppEntity;
+}
+
+class Slot;
+
+namespace group
+{
+    typedef std::vector< SlotAccessId > SlotList;
+}
+}
+
+
+
+
+namespace ary
+{
+
+
+
+class AryGroup
+{
+  public:
+    // LIFECYCLE
+    virtual             ~AryGroup() {}
+
+    // INQUIRY
+    Gid                 Id_Group() const;
+    const cpp::CppEntity &
+                        RE_Group() const;
+    const group::SlotList &
+                        Slots() const;
+    DYN Slot *          Create_Slot(
+                            SlotAccessId        i_nSlot ) const;
+
+
+  private:
+    virtual Gid         inq_Id_Group() const = 0;
+    virtual const cpp::CppEntity &
+                        inq_RE_Group() const = 0;
+    virtual const group::SlotList &
+                        inq_Slots() const = 0;
+    virtual DYN Slot *  inq_Create_Slot(
+                            SlotAccessId        i_nSlot ) const = 0;
+};
+
+
+
+// IMPLEMENTATION
+inline Gid
+AryGroup::Id_Group() const
+    { return inq_Id_Group(); }
+inline const cpp::CppEntity &
+AryGroup::RE_Group() const
+    { return inq_RE_Group(); }
+inline const group::SlotList &
+AryGroup::Slots() const
+    { return inq_Slots(); }
+inline DYN Slot *
+AryGroup::Create_Slot( SlotAccessId i_nSlot ) const
+    { return inq_Create_Slot(i_nSlot); }
+
+
+
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/ceslot.hxx b/autodoc/inc/ary/ceslot.hxx
new file mode 100644
index 000000000000..ae0beb2d3f14
--- /dev/null
+++ b/autodoc/inc/ary/ceslot.hxx
@@ -0,0 +1,106 @@
+/* -*- 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 ARY_CESLOT_HXX
+#define ARY_CESLOT_HXX
+//  KORR_DEPRECATED_3.0
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+
+class Display;
+
+/** Unterscheidungen von Slots
+
+    Slots:
+    -   ReadWrite or ReadOnly
+    -   ContentType
+        -   Groups
+        -   MemberLink              'EnumValue from Enum' or 'Class from Namespace'
+        -   MemberData              'Parameter from Operation'
+        -   SimpleLink
+        -   CommentedLink           'Baseclass from Class'
+        -   DefaultCommentedLink    'Class from GlobaIndex'
+*/
+
+class Slot
+{
+  public:
+    virtual             ~Slot() {}
+
+    virtual void        StoreAt(
+                            Display     &       o_rDestination ) const;
+    virtual uintt       Size() const = 0;
+
+  private:
+    virtual void        StoreEntries(
+                            Display     &       o_rDestination ) const = 0;
+};
+
+class Slot_AutoPtr
+{
+  public:
+                        Slot_AutoPtr(
+                            Slot *              i_pSlot = 0 )
+                                                :   pSlot(i_pSlot) {}
+                        ~Slot_AutoPtr()         { if (pSlot != 0) delete pSlot; }
+
+    Slot_AutoPtr &      operator=(
+                            Slot *              i_pSlot )
+                                                { if (pSlot != 0) delete pSlot;
+                                                  pSlot = i_pSlot;
+                                                  return *this; }
+                        operator bool() const   { return pSlot != 0; }
+
+    const Slot &        operator*()             { csv_assert(pSlot != 0);
+                                                  return *pSlot; }
+    const Slot *        operator->()            { csv_assert(pSlot != 0);
+                                                  return pSlot; }
+
+  private:
+    // Forbidden functions
+                        Slot_AutoPtr(const Slot_AutoPtr &);
+    Slot_AutoPtr &      operator=(const Slot_AutoPtr &);
+
+    // DATA
+    Slot *              pSlot;
+};
+
+
+
+
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cessentl.hxx b/autodoc/inc/ary/cessentl.hxx
new file mode 100644
index 000000000000..cc402ae25eac
--- /dev/null
+++ b/autodoc/inc/ary/cessentl.hxx
@@ -0,0 +1,91 @@
+/* -*- 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 ARY_CESSENTL_HXX
+#define ARY_CESSENTL_HXX
+//  KORR_DEPRECATED_3.0
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/loc/loc_types4loc.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+class CeEssentials
+{   // Non inline functions are implemented in ceworker.cxx .
+  public:
+    // LIFECYCLE
+                        CeEssentials();
+                        CeEssentials(
+                            const String  &     i_sLocalName,
+                            Ce_id               i_nOwner,
+                            loc::Le_id          i_nLocation );
+                        ~CeEssentials();
+    // INQUIRY
+    const String  &     LocalName() const;
+    Ce_id               Owner() const;
+    loc::Le_id          Location() const;
+
+    // ACCESS
+  private:
+    String              sLocalName;
+    Ce_id               nOwner;
+    loc::Le_id          nLocation;
+};
+
+
+
+// IMPLEMENTATION
+inline const String     &
+CeEssentials::LocalName() const
+    { return sLocalName; }
+inline Ce_id
+CeEssentials::Owner() const
+    { return nOwner; }
+inline loc::Le_id
+CeEssentials::Location() const
+    { return nLocation; }
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_builtintype.hxx b/autodoc/inc/ary/cpp/c_builtintype.hxx
new file mode 100644
index 000000000000..0fff94d1e5fc
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_builtintype.hxx
@@ -0,0 +1,100 @@
+/* -*- 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 ARY_CPP_C_BUILTINTYPE_HXX
+#define ARY_CPP_C_BUILTINTYPE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_type.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** Represents types like void, int, double.
+*/
+class BuiltInType : public Type
+{
+  public:
+    enum E_ClassId { class_id = 1200 };
+
+                        BuiltInType(
+                            const String  &     i_sName,
+                            E_TypeSpecialisation
+                                                i_Specialisation );
+
+    String              SpecializedName() const;
+
+    static String       SpecializedName_(
+                            const char *        i_sName,
+                            E_TypeSpecialisation
+                                                i_eTypeSpecialisation );
+  private:
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface Type:
+    virtual bool        inq_IsConst() const;
+    virtual void        inq_Get_Text(
+                            StreamStr &         o_rPreName,
+                            StreamStr &         o_rName,
+                            StreamStr &         o_rPostName,
+                            const Gate &        i_rGate ) const;
+    // DATA
+    String              sName;
+    E_TypeSpecialisation
+                        eSpecialisation;
+};
+
+
+
+inline String
+BuiltInType::SpecializedName() const
+{
+    return SpecializedName_(sName, eSpecialisation);
+}
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_ce.hxx b/autodoc/inc/ary/cpp/c_ce.hxx
new file mode 100644
index 000000000000..5f7e6353e90a
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_ce.hxx
@@ -0,0 +1,106 @@
+/* -*- 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 ARY_CPP_C_CE_HXX
+#define ARY_CPP_C_CE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_cppentity.hxx>
+    // COMPONENTS
+#include <ary/doc/d_docu.hxx>
+    // PARAMETERS
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_traits.hxx>
+#include <ary/loc/loc_types4loc.hxx>
+
+
+namespace ary
+{
+namespace cpp
+{
+
+typedef loc::Le_id  Lid;
+
+
+
+/** Represents a C++ code entity.
+*/
+class CodeEntity : public ary::cpp::CppEntity
+{
+  public:
+    typedef Ce_Traits       traits_t;
+
+    // LIFECYCLE
+    virtual             ~CodeEntity() {}
+
+    // INQUIRY
+    Ce_id               CeId() const            { return Ce_id(Id()); }
+    const String  &     LocalName() const;
+    Cid                 Owner() const;
+    Lid                 Location() const;
+    bool                IsVisible() const;
+
+    // ACCESS
+    void                Set_InVisible()         { bIsVisible = false; }
+
+  protected:
+                        CodeEntity() : bIsVisible(true) {}
+
+  private:
+    // Locals
+    virtual const String  &
+                        inq_LocalName() const = 0;
+    virtual Cid         inq_Owner() const = 0;
+    virtual Lid         inq_Location() const = 0;
+
+    // DATA
+    mutable bool        bIsVisible;
+};
+
+
+// IMPLEMENTATION
+inline const String  &
+CodeEntity::LocalName() const
+    { return inq_LocalName(); }
+inline Cid
+CodeEntity::Owner() const
+    { return inq_Owner(); }
+inline Lid
+CodeEntity::Location() const
+    { return inq_Location(); }
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_class.hxx b/autodoc/inc/ary/cpp/c_class.hxx
new file mode 100644
index 000000000000..49b75b72902f
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_class.hxx
@@ -0,0 +1,248 @@
+/* -*- 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 ARY_CPP_C_CLASS_HXX
+#define ARY_CPP_C_CLASS_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_ce.hxx>
+#include <ary/arygroup.hxx>
+    // OTHER
+#include <ary/symtreenode.hxx>
+#include <ary/cessentl.hxx>
+#include <ary/sequentialids.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_slntry.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class Enum;
+    class Typedef;
+    class Function;
+    class Variable;
+}
+}
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** A C++ class.
+*/
+class Class : public CodeEntity,
+              public AryGroup
+{
+  public:
+    enum E_ClassId { class_id = 1001 };
+
+    enum E_Slots
+    {
+        SLOT_Bases = 1,
+        SLOT_NestedClasses,
+        SLOT_Enums,
+        SLOT_Typedefs,
+        SLOT_Operations,
+        SLOT_StaticOperations,
+        SLOT_Data,
+        SLOT_StaticData,
+        SLOT_FriendClasses,
+        SLOT_FriendOperations
+    };
+
+    typedef ::ary::symtree::Node<CeNode_Traits>    node_t;
+
+
+    // LIFECYCLE
+                        Class(
+                            const String  &     i_sLocalName,
+                            Ce_id               i_nOwner,
+                            E_Protection        i_eProtection,
+                            loc::Le_id          i_nFile,
+                            E_ClassKey          i_eClassKey );
+                        ~Class();
+
+    // OPERATIONS
+    void                Add_BaseClass(
+                            const S_Classes_Base &
+                                                i_rBaseClass );
+    void                Add_TemplateParameterType(
+                            const String  &     i_sLocalName,
+                            Type_id             i_nIdAsType );
+    void                Add_KnownDerivative(
+                            Ce_id               i_nId )
+                                                { aKnownDerivatives.Add(i_nId); }
+
+    void                Add_LocalClass(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalEnum(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalTypedef(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalOperation(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalStaticOperation(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalData(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalStaticData(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+
+    void                UpdateVirtuality(
+                            E_Virtuality        i_eVirtuality )
+                                                { if ( int(i_eVirtuality) > int(eVirtuality) )
+                                                     eVirtuality = i_eVirtuality; }
+    const List_TplParam &
+                        TemplateParameters() const
+                                                { return aTemplateParameterTypes; }
+    const List_Bases &  BaseClasses() const     { return aBaseClasses; }
+    const SequentialIds<Ce_id> &
+                        KnownDerivatives() const
+                                                { return aKnownDerivatives; }
+
+    // INQUIRY
+    E_ClassKey          ClassKey() const;
+    E_Protection        Protection() const;
+    E_Virtuality        Virtuality() const      { return eVirtuality; }
+
+    Ce_id               Search_Child(
+                            const String &      i_key ) const;
+    Rid                 Search_LocalClass(
+                            const String  &     i_sName ) const;
+    const node_t &      AsNode() const;
+
+    // ACCESS
+    node_t &            AsNode();
+
+  private:
+    NON_COPYABLE(Class);
+
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+
+    // Interface ary::cpp::CodeEntity
+    virtual const String  &
+                        inq_LocalName() const;
+    virtual Cid         inq_Owner() const;
+    virtual loc::Le_id  inq_Location() const;
+
+    // Interface ary::cpp::CppEntity
+    virtual ClassId     get_AryClass() const;
+
+    // Interface ary::AryGroup
+    virtual Gid         inq_Id_Group() const;
+    virtual const cpp::CppEntity &
+                        inq_RE_Group() const;
+    virtual const group::SlotList &
+                        inq_Slots() const;
+    virtual DYN Slot *  inq_Create_Slot(
+                            SlotAccessId        i_nSlot ) const;
+    // Local
+     typedef List_LocalCe::const_iterator        CIterator_Locals;
+     typedef List_LocalCe::iterator              Iterator_Locals;
+    typedef SequentialIds<Ce_id>                IdSequence;
+
+    CIterator_Locals    PosOfName(
+                            const List_LocalCe& i_rList,
+                            const String  &     i_sName ) const;
+    // DATA
+    CeEssentials        aEssentials;
+    node_t              aAssignedNode;
+
+    List_Bases          aBaseClasses;
+    List_TplParam       aTemplateParameterTypes;
+
+    List_LocalCe        aClasses;
+    List_LocalCe        aEnums;
+    List_LocalCe        aTypedefs;
+    List_LocalCe        aOperations;
+    List_LocalCe        aStaticOperations;
+    List_LocalCe        aData;
+    List_LocalCe        aStaticData;
+
+    IdSequence          aFriendClasses;
+    IdSequence          aFriendOperations;
+    IdSequence          aKnownDerivatives;
+
+    E_ClassKey          eClassKey;
+    E_Protection        eProtection;
+    E_Virtuality        eVirtuality;
+};
+
+
+
+
+// IMPLEMENTATION
+inline E_ClassKey
+Class::ClassKey() const
+{
+    return eClassKey;
+}
+
+inline E_Protection
+Class::Protection() const
+{
+    return eProtection;
+}
+
+inline const Class::node_t &
+Class::AsNode() const
+{
+    return aAssignedNode;
+}
+
+inline Class::node_t &
+Class::AsNode()
+{
+    return aAssignedNode;
+}
+
+
+
+
+}   //  namespace cpp
+}   //  namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_cppentity.hxx b/autodoc/inc/ary/cpp/c_cppentity.hxx
new file mode 100644
index 000000000000..fab3d2f728fe
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_cppentity.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 ARY_CPP_C_CPPENTITY_HXX
+#define ARY_CPP_C_CPPENTITY_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/entity.hxx>
+    // OTHER
+#include <ary/doc/d_docu.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** A C++ code entity as parsed by Autodoc.
+*/
+class CppEntity : public Entity
+{
+  public:
+    // LIFECYCLE
+    virtual             ~CppEntity() {}
+
+    // OPERATIONS
+
+    // INQUIRY
+    const ary::doc::Documentation &
+                        Docu() const;
+    // ACCESS
+    void                Set_Docu(
+                            DYN ary::doc::Node &
+                                                pass_docudata );
+  private:
+    // DATA
+    ary::doc::Documentation
+                        aDocu;
+};
+
+
+
+
+// IMPLEMENTATION
+inline const doc::Documentation &
+CppEntity::Docu() const
+{
+    return aDocu;
+}
+
+inline void
+CppEntity::Set_Docu(ary::doc::Node & pass_docudata)
+{
+    aDocu.Set_Data(pass_docudata);
+}
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_de.hxx b/autodoc/inc/ary/cpp/c_de.hxx
new file mode 100644
index 000000000000..8426222ab3b4
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_de.hxx
@@ -0,0 +1,107 @@
+/* -*- 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 ARY_CPP_C_DE_HXX
+#define ARY_CPP_C_DE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_cppentity.hxx>
+    // OTHER
+#include <ary/loc/loc_types4loc.hxx>
+#include <ary/cpp/c_traits.hxx>
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** Describes a C/C++ #define statement. May be a define or a macro, for which
+    two cases the two different constructors are to be used.
+
+    This class is used by cpp::PreProcessor.
+*/
+class DefineEntity : public ary::cpp::CppEntity
+{
+  public:
+    typedef Def_Traits       traits_t;
+
+    virtual             ~DefineEntity() {}
+
+    // INQUIRY
+    De_id               DefId() const           { return De_id(Id()); }
+    const String  &     LocalName() const;
+    loc::Le_id          Location() const;
+    const StringVector &
+                        DefinitionText() const;
+    // ACCESS
+  protected:
+                        DefineEntity(
+                            const String  &     i_name,
+                            loc::Le_id          i_declaringFile );
+  private:
+    // Locals
+    virtual const StringVector &
+                        inq_DefinitionText() const = 0;
+
+    // DATA
+    String              sName;
+    loc::Le_id          nLocation;
+};
+
+
+
+
+// IMPLEMENTATION
+inline const String  &
+DefineEntity::LocalName() const
+    { return sName; }
+
+inline loc::Le_id
+DefineEntity::Location() const
+    { return nLocation; }
+
+inline const StringVector &
+DefineEntity::DefinitionText() const
+    { return inq_DefinitionText(); }
+
+
+
+
+
+}   // end namespace cpp
+}   // end namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_define.hxx b/autodoc/inc/ary/cpp/c_define.hxx
new file mode 100644
index 000000000000..460ddb79ac1b
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_define.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 ARY_CPP_C_DEFINE_HXX
+#define ARY_CPP_C_DEFINE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_de.hxx>
+    // OTHER
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** A C/C++ #define ("#define DEF") statement, but no macro.
+
+    @see Macro
+*/
+class Define : public DefineEntity
+{
+  public:
+    enum E_ClassId { class_id = 1601 };
+
+                        Define(      /// Used for: #define DEFINE xyz
+                            const String  &     i_name,
+                            const StringVector &
+                                                i_definition,
+                            loc::Le_id          i_declaringFile );
+    virtual             ~Define();
+  private:
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface DefineEntity:
+    virtual const StringVector &
+                        inq_DefinitionText() const;
+    // DATA
+    StringVector        aDefinition;
+};
+
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_enum.hxx b/autodoc/inc/ary/cpp/c_enum.hxx
new file mode 100644
index 000000000000..4704c700773f
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_enum.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 ARY_CPP_C_ENUM_HXX
+#define ARY_CPP_C_ENUM_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_ce.hxx>
+#include <ary/arygroup.hxx>
+    // OTHER
+#include <ary/cessentl.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/sequentialids.hxx>
+
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** A C++ enum declaration.
+*/
+class Enum : public CodeEntity,
+             public AryGroup
+{
+  public:
+    enum E_ClassId { class_id = 1002 };
+
+    enum E_Slots
+    {
+        SLOT_Values = 1
+    };
+
+    // LIFECYCLE
+                        Enum(
+                            const String  &     i_sLocalName,
+                            Ce_id               i_nOwner,
+                            E_Protection        i_eProtection,
+                            Lid                 i_nFile );
+                        ~Enum();
+
+    // OPERATIONS
+    void                Add_Value(
+                            Ce_id               i_nId );
+
+    // INQUIRY
+    E_Protection        Protection() const      { return eProtection; }
+
+  private:
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+
+    // Interface ary::cpp::CodeEntity
+    virtual const String  &
+                        inq_LocalName() const;
+    virtual Cid         inq_Owner() const;
+    virtual Lid         inq_Location() const;
+
+    // Interface ary::cpp::CppEntity
+    virtual ClassId     get_AryClass() const;
+
+    // Interface ary::AryGroup
+    virtual Gid         inq_Id_Group() const;
+    virtual const cpp::CppEntity &
+                        inq_RE_Group() const;
+    virtual const group::SlotList &
+                        inq_Slots() const;
+    virtual DYN Slot *  inq_Create_Slot(
+                            SlotAccessId        i_nSlot ) const;
+
+    // DATA
+       CeEssentials     aEssentials;
+    SequentialIds<Ce_id>
+                        aValues;
+    E_Protection        eProtection;
+};
+
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_enuval.hxx b/autodoc/inc/ary/cpp/c_enuval.hxx
new file mode 100644
index 000000000000..3ed523baa3f3
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_enuval.hxx
@@ -0,0 +1,99 @@
+/* -*- 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 ARY_CPP_C_ENUVAL_HXX
+#define ARY_CPP_C_ENUVAL_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_ce.hxx>
+    // OTHER
+#include <ary/cessentl.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** A C++ enum value declaration and definition.
+*/
+class EnumValue : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 1006 };
+
+    // LIFECYCLE
+                        EnumValue(
+                            const String  &     i_sLocalName,
+                            Ce_id               i_nOwner,
+                            String              i_sInitialisation );
+                        ~EnumValue();
+    // INQUIRY
+    const String  &     Initialisation() const;
+
+  private:
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+
+    // Interface ary::cpp::CodeEntity
+    virtual const String  &
+                        inq_LocalName() const;
+    virtual Cid         inq_Owner() const;
+    virtual Lid         inq_Location() const;
+
+    // Interface ary::cpp::CppEntity
+    virtual ClassId     get_AryClass() const;
+
+    // DATA
+    CeEssentials        aEssentials;
+    String              sInitialisation;
+};
+
+
+
+
+// IMPLEMENTATION
+inline const String  &
+EnumValue::Initialisation() const
+    { return sInitialisation; }
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_funct.hxx b/autodoc/inc/ary/cpp/c_funct.hxx
new file mode 100644
index 000000000000..917ff823f151
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_funct.hxx
@@ -0,0 +1,152 @@
+/* -*- 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 ARY_CPP_C_FUNCT_HXX
+#define ARY_CPP_C_FUNCT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_ce.hxx>
+    // OTHER
+#include <ary/cessentl.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_slntry.hxx>
+#include <ary/cpp/c_vfflag.hxx>
+#include <ary/cpp/c_osigna.hxx>
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** A C++ function declaration.
+*/
+class Function : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 1004 };
+
+                        Function(
+                            const String  &     i_sLocalName,
+                            Ce_id               i_nOwner,
+                            E_Protection        i_eProtection,
+                            loc::Le_id          i_nFile,
+                            Type_id             i_nReturnType,
+                            const std::vector<S_Parameter> &
+                                                i_parameters,
+                            E_ConVol            i_conVol,
+                            E_Virtuality        i_eVirtuality,
+                            FunctionFlags       i_aFlags,
+                            bool                i_bThrowExists,
+                            const std::vector<Type_id> &
+                                                i_rExceptions );
+                        ~Function();
+
+
+    // OPERATIONS
+    void                Add_TemplateParameterType(
+                            const String  &     i_sLocalName,
+                            Type_id             i_nIdAsType );
+
+    // INQUIRY
+    const OperationSignature &
+                        Signature() const;
+    Type_id             ReturnType() const;
+    E_Protection        Protection() const      { return eProtection; }
+    E_Virtuality        Virtuality() const      { return eVirtuality; }
+    const FunctionFlags &
+                        Flags() const           { return aFlags; }
+    const StringVector &
+                        ParamInfos() const      { return aParameterInfos; }
+    const std::vector<Type_id> *
+                        Exceptions() const      { return pExceptions.Ptr(); }
+
+    const List_TplParam &
+                        TemplateParameters() const
+                                                { return aTemplateParameterTypes; }
+    bool                IsIdentical(
+                            const Function &    i_f ) const;
+
+  private:
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+
+    // Interface ary::cpp::CodeEntity
+    virtual const String  &
+                        inq_LocalName() const;
+    virtual Cid         inq_Owner() const;
+    virtual Lid         inq_Location() const;
+
+    // Interface ary::cpp::CppEntity
+    virtual ClassId     get_AryClass() const;
+
+    // Local Types
+    typedef StringVector                ParameterInfoList;
+    typedef std::vector<Type_id>        ExceptionTypeList;
+
+    // DATA
+    CeEssentials        aEssentials;
+    List_TplParam       aTemplateParameterTypes;
+    OperationSignature  aSignature;
+    Type_id             nReturnType;
+    E_Protection        eProtection;
+    E_Virtuality        eVirtuality;
+    FunctionFlags       aFlags;
+    ParameterInfoList   aParameterInfos;
+    Dyn<ExceptionTypeList>
+                        pExceptions;            //  if (NOT pExceptions) there is no throw,
+                                                //    else, there is one, but the list still may be empty.
+};
+
+
+
+
+// IMPLEMENTATION
+inline const OperationSignature &
+Function::Signature() const
+    { return aSignature; }
+inline Type_id
+Function::ReturnType() const
+    { return nReturnType; }
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_gate.hxx b/autodoc/inc/ary/cpp/c_gate.hxx
new file mode 100644
index 000000000000..df0af5afbd19
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_gate.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 ARY_CPP_C_GATE_HXX
+#define ARY_CPP_C_GATE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <ary/cpp/c_types4cpp.hxx>
+
+
+
+namespace autodoc
+{
+    class Options;
+}
+namespace ary
+{
+    class Entity;
+
+namespace cpp
+{
+    class CodeEntity;
+    class CppEntity;
+    class CePilot;
+    class DefPilot;
+    class TypePilot;
+}
+namespace loc
+{
+    class LocationPilot;
+}
+}
+
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** Acess to all stored objcts in the repository, which are
+    relevant to C++.
+*/
+class Gate
+{
+  public:
+    // LIFECYCLE
+    virtual             ~Gate() {}
+
+
+    // OPERATIONS
+    virtual void        Calculate_AllSecondaryInformation() = 0;
+//                            const ::autodoc::Options &
+//                                                i_options ) = 0;
+
+    // INQUIRY
+    virtual const String &
+                        RepositoryTitle() const = 0;
+    virtual const CodeEntity *
+                        Search_RelatedCe(
+                            Type_id             i_type ) const = 0;
+    virtual const ::ary::cpp::CppEntity *
+                        Search_Entity(
+                            GlobalId            i_id ) const = 0;
+    virtual uintt       Get_AlphabeticalList(
+                            List_GlobalIds &    o_result,
+                            const char *        i_begin,
+                            const char *        i_end ) const = 0;
+    virtual const CePilot &
+                        Ces() const = 0;
+    virtual const DefPilot &
+                        Defs() const = 0;
+    virtual const TypePilot &
+                        Types() const = 0;
+    virtual const loc::LocationPilot &
+                        Locations() const = 0;
+
+    // ACCESS
+    virtual CePilot &   Ces() = 0;
+    virtual DefPilot &  Defs() = 0;
+    virtual TypePilot & Types() = 0;
+    virtual loc::LocationPilot &
+                        Locations() = 0;
+};
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_macro.hxx b/autodoc/inc/ary/cpp/c_macro.hxx
new file mode 100644
index 000000000000..8740c2e94015
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_macro.hxx
@@ -0,0 +1,87 @@
+/* -*- 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 ARY_CPP_C_MACRO_HXX
+#define ARY_CPP_C_MACRO_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_de.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** A C/C++ macro ("#define ABC(a,b)") statement, but no simple define.
+
+    @see Define
+*/
+class Macro : public DefineEntity
+{
+  public:
+    enum E_ClassId { class_id = 1602 };
+
+                        Macro();
+                        Macro(      /// Used for: #define DEFINE xyz
+                            const String  &     i_name,
+                            const StringVector &
+                                                i_params,
+                            const StringVector &
+                                                i_definition,
+                            loc::Le_id          i_declaringFile );
+                        ~Macro();
+    const StringVector &  Params() const          { return aParams; }
+
+  private:
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object
+    virtual ClassId     get_AryClass() const;
+
+    // Interface DefineEntity:
+    virtual const StringVector &
+                        inq_DefinitionText() const;
+    // DATA
+    StringVector          aParams;
+    StringVector          aDefinition;
+};
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_namesp.hxx b/autodoc/inc/ary/cpp/c_namesp.hxx
new file mode 100644
index 000000000000..d15c526394f3
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_namesp.hxx
@@ -0,0 +1,197 @@
+/* -*- 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 ARY_CPP_C_NAMESP_HXX
+#define ARY_CPP_C_NAMESP_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_ce.hxx>
+#include <ary/arygroup.hxx>
+    // OTHER
+#include <ary/symtreenode.hxx>
+#include <ary/cessentl.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_slntry.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class Gate;
+    class OperationSignature;
+}
+}
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** A C++ namespace.
+*/
+class Namespace : public CodeEntity,
+                  public AryGroup
+{
+  public:
+    enum E_ClassId { class_id = 1000 };
+
+    enum E_Slots
+    {
+        SLOT_SubNamespaces = 1,
+        SLOT_Classes,
+        SLOT_Enums,
+        SLOT_Typedefs,
+        SLOT_Operations,
+        SLOT_Variables,
+        SLOT_Constants
+    };
+
+    typedef ::ary::symtree::Node<CeNode_Traits>    node_t;
+
+                        Namespace();
+                        Namespace(
+                            const String  &     i_sName,
+                            Namespace &         i_rParent );
+                        ~Namespace();
+    // OPERATIONS
+    void                Add_LocalNamespace(
+                            Namespace &         io_rLocalNamespace );
+    void                Add_LocalClass(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalEnum(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalTypedef(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalOperation(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalVariable(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    void                Add_LocalConstant(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+
+    // INQUIRY
+    virtual uintt       Depth() const;
+    Namespace *         Parent() const;
+
+    Ce_id               Search_Child(
+                            const String &      i_key ) const;
+    Namespace *         Search_LocalNamespace(
+                            const String  &     i_sLocalName ) const;
+    uintt               Get_SubNamespaces(
+                            std::vector< const Namespace* > &
+                                                o_rResultList ) const;
+    Ce_id               Search_LocalClass(
+                            const String &      i_sName ) const;
+    void                Search_LocalOperations(
+                            std::vector<Ce_id> &
+                                                o_result,
+                            const String &      i_sName ) const;
+    const node_t &      AsNode() const;
+
+    // ACCESS
+    node_t &            AsNode();
+
+  private:
+    NON_COPYABLE(Namespace);
+
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+
+    // Interface CodeEntity
+    virtual const String  &
+                        inq_LocalName() const;
+    virtual Cid         inq_Owner() const;
+    virtual Lid         inq_Location() const;
+
+    // Interface ary::cpp::CppEntity
+    virtual ClassId     get_AryClass() const;
+
+        // Interface AryGroup
+    virtual Gid         inq_Id_Group() const;
+    virtual const cpp::CppEntity &
+                        inq_RE_Group() const;
+    virtual const ary::group::SlotList &
+                        inq_Slots() const;
+    virtual DYN Slot *  inq_Create_Slot(
+                            SlotAccessId        i_nSlot ) const;
+    // Local
+    typedef std::multimap<String, Ce_id>  Map_Operations;
+
+    // DATA
+    CeEssentials        aEssentials;
+    node_t              aAssignedNode;
+
+    Map_NamespacePtr    aLocalNamespaces;
+    Map_LocalCe         aLocalClasses;
+    Map_LocalCe         aLocalEnums;
+    Map_LocalCe         aLocalTypedefs;
+    Map_Operations      aLocalOperations;
+    Map_LocalCe         aLocalVariables;
+    Map_LocalCe         aLocalConstants;
+
+    Namespace *         pParent;
+    uintt               nDepth;
+};
+
+
+
+// IMPLEMENTATION
+inline const Namespace::node_t &
+Namespace::AsNode() const
+{
+    return aAssignedNode;
+}
+
+inline Namespace::node_t &
+Namespace::AsNode()
+{
+    return aAssignedNode;
+}
+
+
+
+
+}   // namespace cpp
+}   // ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_osigna.hxx b/autodoc/inc/ary/cpp/c_osigna.hxx
new file mode 100644
index 000000000000..4434f65b877e
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_osigna.hxx
@@ -0,0 +1,125 @@
+/* -*- 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 ARY_CPP_C_OSIGNA_HXX
+#define ARY_CPP_C_OSIGNA_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <ary/cpp/c_types4cpp.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class Gate;
+}
+}
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** The signature of a C++ function. That is: parameter types and
+    const/volatile modifiers.
+*/
+class OperationSignature
+{
+  public:
+    typedef std::vector<Type_id>    ParameterTypeList;
+
+                        OperationSignature(
+                            ParameterTypeList   i_parameterTypes,  // Non const, because it will be swapped with aParameterTypes.
+                            E_ConVol            i_conVol );
+
+    bool                operator==(
+                            const OperationSignature &
+                                                i_rSig ) const;
+    bool                operator<(
+                            const OperationSignature &
+                                                i_rSig ) const;
+
+    // INQUIRY
+    const ParameterTypeList &
+                        Parameters() const;
+    E_ConVol            ConVol() const;
+
+    /** Compares the signatures by length an then by ids of
+        parameter types. So the result is not always human
+        reconstructable.
+        @return like in strcmp().
+    */
+    int                 Compare(
+                            const OperationSignature &
+                                                i_rSig ) const;
+  private:
+    // DATA
+    ParameterTypeList   aParameterTypes;
+    E_ConVol            eConVol;
+};
+
+
+
+
+// IMPLEMENTATION
+inline bool
+OperationSignature::operator==( const OperationSignature & i_rSign ) const
+{
+    return Compare(i_rSign) == 0;
+}
+
+inline bool
+OperationSignature::operator<( const OperationSignature & i_rSign ) const
+{
+    return Compare(i_rSign) < 0;
+}
+
+inline const OperationSignature::ParameterTypeList &
+OperationSignature::Parameters() const
+{
+    return aParameterTypes;
+}
+
+inline E_ConVol
+OperationSignature::ConVol() const
+{
+    return eConVol;
+}
+
+
+
+} // namespace cpp
+} // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_slntry.hxx b/autodoc/inc/ary/cpp/c_slntry.hxx
new file mode 100644
index 000000000000..3ce842494304
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_slntry.hxx
@@ -0,0 +1,113 @@
+/* -*- 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 ARY_CPP_C_SLNTRY_HXX
+#define ARY_CPP_C_SLNTRY_HXX
+//  KORR_DEPRECATED_3.0
+
+// USED SERVICES
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/namesort.hxx>
+
+
+namespace ary
+{
+namespace cpp
+{
+    class Namespace;
+
+
+
+typedef Namespace * NamespacePtr;
+struct Less_NamespacePtr
+{
+    bool                operator()(             /// @return true if (i_p1->Name() < i_p2->Name()) .
+                            const NamespacePtr& i_p1,
+                            const NamespacePtr& i_p2 );
+};
+
+
+
+
+struct S_Classes_Base
+{
+    Type_id             nId;
+    E_Protection        eProtection;
+    E_Virtuality        eVirtuality;
+    String              sComment;
+
+                        S_Classes_Base()
+                            :   nId(0),
+                                eProtection(PROTECT_global),
+                                eVirtuality(VIRTUAL_none)
+                                // sComment
+                                { }
+};
+
+struct S_TplParam
+{
+    String              sName;
+    Type_id             nId;
+
+                        S_TplParam(
+                            String              i_sName,
+                            Type_id             i_nId )
+                            :   sName(i_sName), nId(i_nId) {}
+    const String  &     Name() const            { return sName; }
+};
+
+
+struct S_LocalCe
+{
+    String              sLocalName;
+    Ce_id               nId;
+
+                        S_LocalCe()             : nId(0) {}
+                        S_LocalCe(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId )
+                                                : sLocalName(i_sLocalName), nId(i_nId) {}
+    bool                operator<(
+                            const S_LocalCe &   i_rCe ) const
+                                                { return LesserName()(sLocalName,i_rCe.sLocalName); }
+};
+
+typedef std::vector< S_LocalCe >        List_LocalCe;
+
+
+typedef std::map<String, NamespacePtr>          Map_NamespacePtr;
+typedef std::vector< S_Classes_Base >           List_Bases;
+typedef std::vector< S_TplParam >               List_TplParam;
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_traits.hxx b/autodoc/inc/ary/cpp/c_traits.hxx
new file mode 100644
index 000000000000..060b0d2ea0ce
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_traits.hxx
@@ -0,0 +1,219 @@
+/* -*- 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 ARY_CPP_C_TRAITS_HXX
+#define ARY_CPP_C_TRAITS_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <ary/cpp/c_types4cpp.hxx>
+
+
+
+namespace ary
+{
+namespace symtree
+{
+    template <class X> class Node;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** Basic traits for derived ones of ->CodeEntity.
+*/
+struct Ce_Traits
+{
+    typedef CodeEntity          entity_base_type;
+    typedef Ce_id               id_type;
+
+    static entity_base_type &
+                        EntityOf_(
+                            id_type             i_id );
+};
+
+
+/** An instance of SYMBOL_TRAITS for ->::ary::SortedIds<>.
+
+    @see ::ary::SortedIds<>
+*/
+struct CeNode_Traits : public Ce_Traits
+{
+    static const symtree::Node<CeNode_Traits> *
+                        NodeOf_(
+                            const entity_base_type &
+                                                i_entity );
+    static symtree::Node<CeNode_Traits> *
+                        NodeOf_(
+                            entity_base_type &  i_entity );
+    static entity_base_type *
+                        ParentOf_(
+                            const entity_base_type &
+                                                i_entity );
+    template <class KEY>
+    static id_type      Search_(
+                            const entity_base_type &
+                                                i_entity,
+                            const KEY &         i_localKey );
+};
+
+
+/** An instance of COMPARE for ->::ary::SortedIds<>.
+
+    @see ::ary::SortedIds<>
+*/
+struct Ce_Compare : public Ce_Traits
+{
+    typedef  String             key_type;
+
+    static const key_type &
+                        KeyOf_(
+                            const entity_base_type &
+                                                i_entity );
+    static bool         Lesser_(
+                            const key_type &    i_1,
+                            const key_type &    i_2 );
+};
+
+/** An instance of COMPARE for ->::ary::SortedIds<>.
+
+    @see ::ary::SortedIds<>
+*/
+struct Ce_GlobalCompare : public Ce_Traits
+{
+    typedef  entity_base_type   key_type;
+
+    static const key_type &
+                        KeyOf_(
+                            const entity_base_type &
+                                                i_entity )
+                            { return i_entity; }
+    static bool         Lesser_(
+                            const key_type &    i_1,
+                            const key_type &    i_2 );
+};
+
+
+/** Basic traits for derivd ones of ->DefineEntity.
+*/
+struct Def_Traits
+{
+    typedef DefineEntity        entity_base_type;
+    typedef De_id               id_type;
+
+    static entity_base_type &
+                        EntityOf_(
+                            id_type             i_id );
+};
+
+
+/** An instance of COMPARE for ->::ary::SortedIds<>.
+
+    @see ::ary::SortedIds<>
+*/
+struct Def_Compare : public Def_Traits
+{
+    typedef  String             key_type;
+
+    static const key_type &
+                        KeyOf_(
+                            const entity_base_type &
+                                                i_entity );
+    static bool         Lesser_(
+                            const key_type &    i_1,
+                            const key_type &    i_2 );
+};
+
+/** Basic traits for derivd ones of ->Type.
+*/
+struct Type_Traits
+{
+    typedef Type                entity_base_type;
+    typedef Type_id             id_type;
+
+    static entity_base_type &
+                        EntityOf_(
+                            id_type             i_id );
+};
+
+/** An instance of COMPARE for ->::ary::SortedIds<>.
+
+    @see ::ary::SortedIds<>
+*/
+struct UsedType_Compare : public Type_Traits
+{
+    typedef  UsedType           key_type;
+
+    static const key_type &
+                        KeyOf_(
+                            const entity_base_type &
+                                                i_entity );
+    static bool         Lesser_(
+                            const key_type &    i_1,
+                            const key_type &    i_2 );
+};
+
+
+
+
+
+
+// IMPLEMENTATION
+
+/// Implementation helper for ->CeNode_Traits::Search_ .
+Ce_id                   CeNode_Search(
+                            const CodeEntity &  i_entity,
+                            const String &      i_localKey );
+
+
+template <class KEY>
+Ce_Traits::id_type
+CeNode_Traits::Search_( const entity_base_type & i_entity,
+                        const KEY &              i_localKey )
+{
+    return CeNode_Search(i_entity, i_localKey);
+}
+
+
+
+
+}   //  namespace cpp
+}   //  namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_tydef.hxx b/autodoc/inc/ary/cpp/c_tydef.hxx
new file mode 100644
index 000000000000..eefbda569484
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_tydef.hxx
@@ -0,0 +1,103 @@
+/* -*- 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 ARY_CPP_C_TYDEF_HXX
+#define ARY_CPP_C_TYDEF_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_ce.hxx>
+    // OTHER
+#include <ary/cessentl.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** A C++ typedef declaration.
+*/
+class Typedef : public CodeEntity
+{
+  public:
+    // LIFECYCLE
+    enum E_ClassId { class_id = 1003 };
+
+                        Typedef(
+                            const String  &     i_sLocalName,
+                            Ce_id               i_nOwner,
+                            E_Protection        i_eProtection,
+                            Lid                 i_nFile,
+                            Type_id             i_nDescribingType );
+                        ~Typedef();
+    // INQUIRY
+    Type_id             DescribingType() const;
+    E_Protection        Protection() const      { return eProtection; }
+
+  private:
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+
+    // Interface ary::cpp::CodeEntity
+    virtual const String  &
+                        inq_LocalName() const;
+    virtual Cid         inq_Owner() const;
+    virtual Lid         inq_Location() const;
+
+    // Interface ary::cpp::CppEntity
+    virtual ClassId     get_AryClass() const;
+
+    // DATA
+    CeEssentials        aEssentials;
+    Type_id             nDescribingType;
+    E_Protection        eProtection;
+};
+
+
+
+// IMPLEMENTATION
+inline Type_id
+Typedef::DescribingType() const
+{
+    return nDescribingType;
+}
+
+
+
+}   //  namespace cpp
+}   //  namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_type.hxx b/autodoc/inc/ary/cpp/c_type.hxx
new file mode 100644
index 000000000000..513ec0cefb5f
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_type.hxx
@@ -0,0 +1,136 @@
+/* -*- 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 ARY_CPP_C_TYPE_HXX
+#define ARY_CPP_C_TYPE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/entity.hxx>
+    // OTHER
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_traits.hxx>
+
+
+namespace ary
+{
+namespace cpp
+{
+    class Gate;
+}
+}
+
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** Base of all C++ types
+*/
+class Type : public ::ary::Entity
+{
+  public:
+    typedef Type_Traits       traits_t;
+
+    virtual             ~Type() {}
+
+    Type_id             TypeId() const          { return Type_id(Id()); }
+    Ce_id               RelatedCe() const;
+    bool                IsConst() const;
+    void                Get_Text(
+                            StreamStr &         o_rOut,
+                            const Gate &        i_rGate ) const;
+
+    /** It is guaranteed, that the output is correct, also,
+        if all three output-streams are the same instance.
+    */
+    void                Get_Text(
+                            StreamStr &         o_rPreName,
+                            StreamStr &         o_rName,
+                            StreamStr &         o_rPostName,
+                            const Gate &        i_rGate ) const;
+
+  private:
+    virtual Rid         inq_RelatedCe() const;  // Defaulted to 0. Implemented in c_builtintype.cxx.
+    virtual bool        inq_IsConst() const = 0;
+    virtual void        inq_Get_Text(
+                            StreamStr &         o_rPreName,
+                            StreamStr &         o_rName,
+                            StreamStr &         o_rPostName,
+                            const Gate &        i_rGate ) const = 0;
+};
+
+
+
+
+// IMPLEMENTATION
+inline Ce_id
+Type::RelatedCe() const
+{
+    return Ce_id(inq_RelatedCe());
+}
+
+inline bool
+Type::IsConst() const
+{
+    return inq_IsConst();
+}
+
+inline void
+Type::Get_Text( StreamStr &         o_rOut,
+                const Gate &        i_rGate ) const
+{
+    inq_Get_Text( o_rOut, o_rOut, o_rOut, i_rGate );
+}
+
+inline void
+Type::Get_Text( StreamStr &         o_rPreName,
+                StreamStr &         o_rName,
+                StreamStr &         o_rPostName,
+                const Gate &        i_rGate ) const
+{
+    inq_Get_Text( o_rPreName,o_rName,o_rPostName, i_rGate );
+}
+
+
+
+
+
+}   // namespace  cpp
+}   // namespace  ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_types4cpp.hxx b/autodoc/inc/ary/cpp/c_types4cpp.hxx
new file mode 100644
index 000000000000..2d39819ae458
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_types4cpp.hxx
@@ -0,0 +1,137 @@
+/* -*- 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 ARY_CPP_C_TYPES4CPP_HXX
+#define ARY_CPP_C_TYPES4CPP_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <cosv/tpl/range.hxx>
+#include <ary/types.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+class Namespace;
+class CodeEntity;
+class Type;
+class DefineEntity;
+class Gate;
+class CePilot;
+class TypePilot;
+class SecondariesPilot;
+class Ce_Storage;
+class Def_Storage;
+class Type_Storage;
+class UsedType;
+
+
+typedef TypedId< ::ary::cpp::CodeEntity >       Ce_id;
+typedef TypedId< ::ary::cpp::Type >             Type_id;
+typedef TypedId< ::ary::cpp::DefineEntity >     De_id;
+
+
+typedef std::vector<Ce_id>                      CesList;
+typedef std::vector<De_id>                      DefsList;
+typedef std::vector<Type_id>                    TypesList;
+
+typedef std::vector<Ce_id>::const_iterator      CesConstIterator;
+typedef std::vector<De_id>::const_iterator      DefsConstIterator;
+typedef std::vector<Type_id>::const_iterator    TypesConstIterator;
+
+typedef csv::range< CesConstIterator >          CesResultList;
+typedef csv::range< DefsConstIterator >         DefsResultList;
+typedef csv::range< TypesConstIterator >        TypesResultList;
+
+
+typedef std::map<String, Ce_id>                 Map_LocalCe;
+
+
+
+enum E_Protection
+{
+    PROTECT_global = 0,
+    PROTECT_local,          /// within Functions
+    PROTECT_public,
+    PROTECT_protected,
+    PROTECT_private
+};
+
+/** The sequence of E_Virtuality's values must not be changed,
+    because they are used in int-comparisons.
+*/
+enum E_Virtuality
+{
+    VIRTUAL_none = 0,
+    VIRTUAL_virtual,
+    VIRTUAL_abstract
+};
+
+enum E_ClassKey
+{
+    CK_class,
+    CK_struct,
+    CK_union
+};
+
+enum E_TypeSpecialisation
+{
+    TYSP_none = 0,
+    TYSP_unsigned,
+    TYSP_signed
+};
+
+enum E_ConVol
+{
+    CONVOL_none = 0,
+    CONVOL_const = 0x0001,
+    CONVOL_volatile = 0x0002,
+    CONVOL_both = 0x0003
+};
+
+
+
+// Backwards compatibility:
+typedef Ce_id                           Cid;
+typedef Type_id                         Tid;
+
+
+
+
+}   //  namespace cpp
+}   //  namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_vari.hxx b/autodoc/inc/ary/cpp/c_vari.hxx
new file mode 100644
index 000000000000..e8b2e442486e
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_vari.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 ARY_CPP_C_VARI_HXX
+#define ARY_CPP_C_VARI_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_ce.hxx>
+    // OTHER
+#include <ary/cessentl.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_vfflag.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** A C++ variable or constant declaration.
+*/
+class Variable : public CodeEntity
+{
+  public:
+    // LIFECYCLE
+    enum E_ClassId { class_id = 1005 };
+
+                        Variable(
+                            const String  &     i_sLocalName,
+                            Ce_id               i_nOwner,
+                            E_Protection        i_eProtection,
+                            loc::Le_id          i_nFile,
+                            Type_id             i_nType,
+                            VariableFlags       i_aFlags,
+                            const String  &     i_sArraySize,
+                            const String  &     i_sInitValue );
+                        ~Variable();
+
+
+    // INQUIRY
+    Type_id             Type() const;
+    const String  &     ArraySize() const;
+    const String  &     Initialisation() const;
+    E_Protection        Protection() const      { return eProtection; }
+
+  private:
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+
+    // Interface ary::cpp::CodeEntity
+    virtual const String  &
+                        inq_LocalName() const;
+    virtual Cid         inq_Owner() const;
+    virtual Lid         inq_Location() const;
+
+    // Interface ary::cpp::CppEntity
+    virtual ClassId     get_AryClass() const;
+
+    // DATA
+    CeEssentials        aEssentials;
+    Type_id             nType;
+    E_Protection        eProtection;
+    VariableFlags       aFlags;
+    String              sArraySize;
+    String              sInitialisation;
+};
+
+
+
+// IMPLEMENTATION
+inline Type_id
+Variable::Type() const
+    { return nType; }
+inline const String  &
+Variable::ArraySize() const
+    { return sArraySize; }
+inline const String  &
+Variable::Initialisation() const
+    { return sInitialisation; }
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/c_vfflag.hxx b/autodoc/inc/ary/cpp/c_vfflag.hxx
new file mode 100644
index 000000000000..c198dac67267
--- /dev/null
+++ b/autodoc/inc/ary/cpp/c_vfflag.hxx
@@ -0,0 +1,154 @@
+/* -*- 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 ARY_CPP_C_VFFLAG_HXX
+#define ARY_CPP_C_VFFLAG_HXX
+
+// USED SERVICES
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** Properties of C++ variables.
+*/
+struct VariableFlags
+{
+  public:
+    enum E_Flags
+    {
+        f_static_local      = 0x0001,
+        f_static_member     = 0x0002,
+        f_extern            = 0x0004,
+        f_mutable           = 0x0008
+    };
+
+                        VariableFlags(
+                            UINT16              i_nFlags = 0 )
+                                                :   nFlags(i_nFlags) {}
+
+    void                Reset()                 { nFlags = 0; }
+
+    void                SetStaticLocal()        { nFlags |= f_static_local; }
+    void                SetStaticMember()       { nFlags |= f_static_member; }
+    void                SetExtern()             { nFlags |= f_extern; }
+    void                SetMutable()            { nFlags |= f_mutable; }
+
+    bool                IsStaticLocal() const   { return (nFlags & f_static_local) != 0; }
+    bool                IsStaticMember() const  { return (nFlags & f_static_member) != 0; }
+    bool                IsExtern() const        { return (nFlags & f_extern) != 0; }
+    bool                IsMutable() const       { return (nFlags & f_mutable) != 0; }
+
+  private:
+    UINT16              nFlags;
+};
+
+
+/** Properties of C++ functions.
+*/
+struct FunctionFlags
+{
+  public:
+    enum E_Flags
+    {
+        f_static_local      = 0x0001,
+        f_static_member     = 0x0002,
+        f_extern            = 0x0004,
+        f_externC           = 0x0008,
+        f_mutable           = 0x0010,
+        f_inline            = 0x0100,
+        f_register          = 0x0200,
+        f_explicit          = 0x0400
+    };
+
+                        FunctionFlags(
+                            UINT16              i_nFlags = 0 )
+                                                :   nFlags(i_nFlags) {}
+
+    bool                operator==(
+                            const FunctionFlags &
+                                                i_ff ) const
+                                                { return nFlags == i_ff.nFlags; }
+    bool                operator!=(
+                            const FunctionFlags &
+                                                i_ff ) const
+                                                { return NOT operator==(i_ff); }
+
+    void                Reset()                 { nFlags = 0; }
+
+    void                SetStaticLocal()        { nFlags |= f_static_local; }
+    void                SetStaticMember()       { nFlags |= f_static_member; }
+    void                SetExtern()             { nFlags |= f_extern; }
+    void                SetExternC()            { nFlags |= f_externC; }
+    void                SetMutable()            { nFlags |= f_mutable; }
+    void                SetInline()             { nFlags |= f_inline; }
+    void                SetRegister()           { nFlags |= f_register; }
+    void                SetExplicit()           { nFlags |= f_explicit; }
+
+    bool                IsStaticLocal() const   { return (nFlags & f_static_local) != 0; }
+    bool                IsStaticMember() const  { return (nFlags & f_static_member) != 0; }
+    bool                IsExtern() const        { return (nFlags & f_extern) != 0; }
+    bool                IsExternC() const       { return (nFlags & f_externC) != 0; }
+    bool                IsMutable() const       { return (nFlags & f_mutable) != 0; }
+    bool                IsInline() const        { return (nFlags & f_inline) != 0; }
+    bool                IsRegister() const      { return (nFlags & f_register) != 0; }
+    bool                IsExplicit() const      { return (nFlags & f_explicit) != 0; }
+
+  private:
+    UINT16              nFlags;
+};
+
+
+/** A C++ function parameter.
+*/
+struct S_Parameter
+{
+    String              sName;
+    String              sSizeExpression;
+    String              sInitExpression;
+    Type_id             nType;
+
+                        S_Parameter()           : nType(0) {}
+                        ~S_Parameter()          {}
+    void                Empty()                 { nType = Type_id(0);
+                                                  sName.clear();
+                                                  sSizeExpression.clear();
+                                                  sInitExpression.clear(); }
+};
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/cp_ce.hxx b/autodoc/inc/ary/cpp/cp_ce.hxx
new file mode 100644
index 000000000000..cb86e44b17d4
--- /dev/null
+++ b/autodoc/inc/ary/cpp/cp_ce.hxx
@@ -0,0 +1,176 @@
+/* -*- 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 ARY_CPP_CP_CE_HXX
+#define ARY_CPP_CP_CE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <ary/cpp/c_types4cpp.hxx>
+
+namespace ary
+{
+    class QualifiedName;
+
+namespace cpp
+{
+    class Class;
+    class CodeEntity;
+    class Enum;
+    class EnumValue;
+    class Function;
+    class InputContext;
+    class Namespace;
+    class OperationSignature;
+    class Typedef;
+    class Variable;
+
+    struct FunctionFlags;
+    struct S_Parameter;
+    struct VariableFlags;
+}
+}
+
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** Acess to all declared C++ code entites (types, variables, operations)
+    in the repository.
+*/
+class CePilot
+{
+  public:
+    // LIFECYCLE
+    virtual             ~CePilot() {}
+
+    // OPERATIONS
+    virtual Namespace &
+                        CheckIn_Namespace(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName ) = 0;
+    virtual Class &     Store_Class(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            E_ClassKey          i_classKey ) = 0;
+    virtual Enum &      Store_Enum(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName ) = 0;
+    virtual Typedef &   Store_Typedef(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            Type_id             i_referredType ) = 0;
+
+    /// @return 0, if the function is duplicate.
+    virtual Function *  Store_Operation(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            Type_id             i_returnType,
+                            const std::vector<S_Parameter> &
+                                                i_parameters,
+                            E_Virtuality        i_virtuality,
+                            E_ConVol            i_conVol,
+                            FunctionFlags       i_flags,
+                            bool                i_throwExists,
+                            const std::vector<Tid> &
+                                                i_exceptions ) = 0;
+    virtual Variable &  Store_Variable(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            Type_id             i_type,
+                            VariableFlags       i_flags,
+                            const String  &     i_arraySize,
+                            const String  &     i_initValue ) = 0;
+    virtual EnumValue & Store_EnumValue(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            const String  &     i_initValue ) = 0;
+    // INQUIRY
+    virtual const Namespace &
+                        GlobalNamespace() const = 0;
+    virtual const CodeEntity &
+                        Find_Ce(
+                            Ce_id               i_id ) const = 0;
+    virtual const CodeEntity *
+                        Search_Ce(
+                            Ce_id               i_id ) const = 0;
+
+    /// It's assumed that i_rSearchedName is an absolute name.
+    virtual const CodeEntity *
+                        Search_CeAbsolute(
+                            const CodeEntity &  i_curScope,
+                            const QualifiedName &
+                                                i_absoluteName ) const = 0;
+    virtual const CodeEntity *
+                        Search_CeLocal(
+                            const String  &     i_relativeName,
+                            bool                i_isFunction,
+                            const Namespace &   i_curNamespace,
+                            const Class *       i_curClass ) const = 0;
+    virtual void        Get_QualifiedName(
+                            StreamStr &         o_result,
+                            const String  &     i_localName,
+                            Ce_id               i_owner,
+                            const char *        i_delimiter = "::" ) const = 0;
+    virtual void        Get_SignatureText(
+                            StreamStr &         o_rOut,
+                            const OperationSignature &
+                                                i_signature,
+                            const StringVector *
+                                                i_sParameterNames = 0 ) const = 0;
+    virtual CesResultList
+                        Search_TypeName(
+                            const String  &     i_sName ) const = 0;
+    // ACCESS
+       virtual Namespace & GlobalNamespace() = 0;
+};
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/cp_def.hxx b/autodoc/inc/ary/cpp/cp_def.hxx
new file mode 100644
index 000000000000..8fd44074523b
--- /dev/null
+++ b/autodoc/inc/ary/cpp/cp_def.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 ARY_CPP_CP_DEF_HXX
+#define ARY_CPP_CP_DEF_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <ary/cpp/c_types4cpp.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class Define;
+    class InputContext;
+    class Macro;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** Acess to C++ defines and macros in the repository.
+*/
+class DefPilot
+{
+  public:
+    typedef DefsList::const_iterator                DefsIterator;
+
+
+
+    // LIFECYCLE
+    virtual             ~DefPilot() {}
+
+
+    // OPERATIONS
+    virtual Define &    Store_Define(
+                            const InputContext& i_rContext,
+                            const String  &     i_sName,
+                            const StringVector &
+                                                i_rDefinition ) = 0;
+    virtual Macro &     Store_Macro(
+                            const InputContext& i_rContext,
+                            const String  &     i_sName,
+                            const StringVector &
+                                                i_rParams,
+                            const StringVector &
+                                                i_rDefinition ) = 0;
+    // INQUIRY
+    virtual const DefineEntity &
+                        Find_Def(
+                            De_id               i_id ) const = 0;
+    virtual DefsResultList
+                        AllDefines() const = 0;
+    virtual DefsResultList
+                        AllMacros() const = 0;
+};
+
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/cp_type.hxx b/autodoc/inc/ary/cpp/cp_type.hxx
new file mode 100644
index 000000000000..edc536fcea71
--- /dev/null
+++ b/autodoc/inc/ary/cpp/cp_type.hxx
@@ -0,0 +1,99 @@
+/* -*- 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 ARY_CPP_CP_TYPE_HXX
+#define ARY_CPP_CP_TYPE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <ary/cpp/c_types4cpp.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class InputContext;
+    class Type;
+    class UsedType;
+}
+}
+
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+
+/** Acess to all found C++ types (as they are used in declarations)
+    in the repository.
+*/
+class TypePilot
+{
+  public:
+
+    // LIFECYCLE
+    virtual             ~TypePilot() {}
+
+
+    // OPERATIONS
+    virtual const Type &
+                        CheckIn_UsedType(
+                            const InputContext &
+                                                i_context,
+                            DYN UsedType &      pass_type ) = 0;
+    // INQUIRY
+    virtual const Type &
+                        Find_Type(
+                            Type_id             i_type ) const = 0;
+    virtual bool        Get_TypeText(
+                            StreamStr &         o_result,
+                            Type_id             i_type ) const = 0;
+    virtual bool        Get_TypeText(
+                            StreamStr &         o_preName,              ///  ::ary::cpp::
+                            StreamStr &         o_name,                 ///  MyClass
+                            StreamStr &         o_postName,             ///  <TplArgument> * const &
+                            Type_id             i_type ) const = 0;
+    virtual Type_id     Tid_Ellipse() const = 0;
+};
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/inpcontx.hxx b/autodoc/inc/ary/cpp/inpcontx.hxx
new file mode 100644
index 000000000000..9fea2e2053b7
--- /dev/null
+++ b/autodoc/inc/ary/cpp/inpcontx.hxx
@@ -0,0 +1,219 @@
+/* -*- 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 ARY_CPP_INPCONTX_HXX
+#define ARY_CPP_INPCONTX_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <ary/cpp/c_types4cpp.hxx>
+
+
+
+namespace ary
+{
+namespace loc
+{
+    class File;
+}
+namespace cpp
+{
+    class Gate;
+    class Namespace;
+    class Class;
+    class Enum;
+
+    class OperationSignature;
+}
+}
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** The context of a CodeEntity, which is going to be stored in the
+    repository. The information is used mainly by ->ary::cpp::CeAdmin.
+*/
+class InputContext
+{
+  public:
+    class Owner
+    {
+      public:
+        // LIFECYCLE
+        virtual             ~Owner() {}
+
+        // OPERATIONS
+        /// Adds Class data to current inner scope (Namespace or Class).
+        void                Add_Class(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId );
+        /// Adds Enum data to current inner scope (Namespace or Class).
+        void                Add_Enum(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId );
+        /// Adds Typedef data to current inner scope (Namespace or Class).
+        void                Add_Typedef(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId );
+        /// Adds Operation data to current inner scope (Namespace or Class).
+        void                Add_Operation(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId,
+                                bool                i_bIsStaticMember );    /// True only for static class members.
+        /// Adds Variable data to current inner scope (Namespace or Class).
+        void                Add_Variable(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId,
+                                bool                i_bIsConst,
+                                bool                i_bIsStaticMember );    /// True only for static class members.
+        // INQUIRY
+        Ce_id               CeId() const;
+
+        /** @attention Must only be used by ary::cpp::GatePilot!
+            Will work nowhere else!
+        */
+        virtual bool        HasClass(
+                                const String  &     i_sLocalName ) = 0;
+      private:
+        virtual void        do_Add_Class(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId ) = 0;
+        virtual void        do_Add_Enum(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId ) = 0;
+        virtual void        do_Add_Typedef(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId ) = 0;
+        virtual void        do_Add_Operation(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId,
+                                bool                i_bIsStatic ) = 0;
+        virtual void        do_Add_Variable(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId,
+                                bool                i_bIsConst,
+                                bool                i_bIsStatic ) = 0;
+        virtual Ce_id       inq_CeId() const = 0;
+    };
+
+    // LIFECYCLE
+    virtual             ~InputContext() {}
+
+    // OPERATIONS
+
+    // INQUIRY
+    loc::File &         CurFile() const;
+
+    Namespace &         CurNamespace() const;
+    Class *             CurClass() const;
+    Enum *              CurEnum() const;
+
+    Owner &             CurOwner() const;
+    E_Protection        CurProtection() const;
+
+  private:
+    virtual loc::File & inq_CurFile() const = 0;
+
+    virtual Namespace & inq_CurNamespace() const = 0;
+    virtual Class *     inq_CurClass() const = 0;
+    virtual Enum *      inq_CurEnum() const = 0;
+
+    virtual Owner &     inq_CurOwner() const = 0;
+    virtual E_Protection
+                        inq_CurProtection() const = 0;
+};
+
+
+
+
+// IMPLEMENTATION
+inline loc::File &
+InputContext::CurFile() const
+    { return inq_CurFile(); }
+
+inline Namespace &
+InputContext::CurNamespace() const
+    { return inq_CurNamespace(); }
+inline Class *
+InputContext::CurClass() const
+    { return inq_CurClass(); }
+inline Enum *
+InputContext::CurEnum() const
+    { return inq_CurEnum(); }
+inline InputContext::Owner &
+InputContext::CurOwner() const
+    { return inq_CurOwner(); }
+inline E_Protection
+InputContext::CurProtection() const
+    { return inq_CurProtection(); }
+
+
+inline void
+InputContext::Owner::Add_Class( const String  &     i_sLocalName,
+                                Cid                 i_nId )
+    { do_Add_Class(i_sLocalName, i_nId); }
+inline void
+InputContext::Owner::Add_Enum( const String  &     i_sLocalName,
+                               Cid                 i_nId )
+    { do_Add_Enum(i_sLocalName, i_nId); }
+inline void
+InputContext::Owner::Add_Typedef( const String  &     i_sLocalName,
+                                  Cid                 i_nId )
+    { do_Add_Typedef(i_sLocalName, i_nId); }
+inline void
+InputContext::Owner::Add_Operation( const String  &             i_sLocalName,
+                                    Cid                         i_nId,
+                                    bool                        i_bIsStatic )
+    { do_Add_Operation( i_sLocalName, i_nId, i_bIsStatic ); }
+inline void
+InputContext::Owner::Add_Variable( const String  &     i_sLocalName,
+                                   Cid                 i_nId,
+                                   bool                i_bIsConst,
+                                   bool                i_bIsStatic )
+    { do_Add_Variable( i_sLocalName, i_nId, i_bIsConst, i_bIsStatic ); }
+inline Ce_id
+InputContext::Owner::CeId() const
+    { return inq_CeId(); }
+
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/namechain.hxx b/autodoc/inc/ary/cpp/namechain.hxx
new file mode 100644
index 000000000000..9e85b4ee4b0d
--- /dev/null
+++ b/autodoc/inc/ary/cpp/namechain.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 ARY_CPP_NAMECHAI_HXX
+#define ARY_CPP_NAMECHAI_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+
+
+namespace ary
+{
+namespace cpp
+{
+    class Gate;
+
+namespace ut
+{
+    class List_TplParameter;
+
+class NameSegment
+{
+  public:
+                        NameSegment(
+                            const char *        i_sName );
+    /** @precond MPT pTemplate.
+        This cannot be used, except of inserting a new element
+        in the segment list of ary::cpp::ut::NameChain. In that
+        case, the template parameter list doe snot yet exist.
+    */
+                        NameSegment(
+                            const NameSegment & i_rSeg );
+                        ~NameSegment();
+
+    // OPERATIONS
+    List_TplParameter & AddTemplate();
+
+    // INQUIRY
+    const String  &     Name() const;
+
+        /// @return as strcmp().
+    intt                Compare(
+                            const NameSegment & i_rOther ) const;
+    void                Get_Text_AsScope(
+                            StreamStr &         o_rOut,
+                            const ary::cpp::Gate &
+                                                i_rGate ) const;
+    void                Get_Text_AsMainType(
+                            StreamStr &         o_rName,
+                            StreamStr &         o_rPostName,
+                            const ary::cpp::Gate &
+                                                i_rGate ) const;
+
+    NameSegment& operator=(const NameSegment&);
+  private:
+    String              sName;
+    Dyn<List_TplParameter>
+                        pTemplate;
+};
+
+class NameChain
+{
+  public:
+    typedef std::vector<NameSegment>::const_iterator
+            const_iterator;
+
+                        NameChain();
+                        ~NameChain();
+
+    // OPERATIONS
+    void                Add_Segment(
+                            const char *        i_sSeg );
+    /** @precond  aSegments.size() > 0.
+        Which means: Add_Segment() has to be called at least once before.
+    */
+    List_TplParameter & Templatize_LastSegment();
+
+    // INQUIRY
+    const_iterator      begin() const          { return aSegments.begin(); }
+    const_iterator      end() const            { return aSegments.end(); }
+
+    /// @return like strcmp.
+    intt                Compare(
+                            const NameChain &   i_rChain ) const;
+    /// @ATTENTION Return value is volatile. Not reentrance enabled.
+    const String  &     LastSegment() const;
+
+    void                Get_Text(
+                            StreamStr &         o_rPreName,
+                            StreamStr &         o_rName,
+                            StreamStr &         o_rPostName,
+                            const ary::cpp::Gate &
+                                                i_rGate ) const;
+  private:
+    std::vector< NameSegment >
+                        aSegments;
+};
+
+
+
+// IMPLEMENTATION
+inline const String  &
+NameSegment::Name() const
+    { return sName; }
+
+
+
+
+
+
+}   // namespace ut
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/cpp/usedtype.hxx b/autodoc/inc/ary/cpp/usedtype.hxx
new file mode 100644
index 000000000000..b7f6d68ac4cc
--- /dev/null
+++ b/autodoc/inc/ary/cpp/usedtype.hxx
@@ -0,0 +1,215 @@
+/* -*- 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 ARY_CPP_USEDTYPE_HXX
+#define ARY_CPP_USEDTYPE_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/c_type.hxx>
+    // OTHER
+#include <ary/cpp/namechain.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class CePilot;
+
+namespace ut
+{
+    class List_TplParameter;
+}
+}
+}
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** This class represents a type in textual form, like it is parsed out of
+    source code as a variable type or function return type.
+*/
+class UsedType : public Type
+{
+  public:
+    enum E_ClassId { class_id = 1203 };
+
+    explicit            UsedType(
+                            Ce_id               i_scope );
+                        ~UsedType();
+    // OPERATORS
+    bool                operator<(
+                            const UsedType &    i_rType ) const;
+    // OPERATIONS
+
+        // Operations to build up the used type from parsing:
+    void                Set_Absolute();         /// "::" is in front.
+    void                Add_NameSegment(
+                            const char *        i_sSeg );
+    ut::List_TplParameter &
+                        Enter_Template();
+    void                Set_Unsigned();
+    void                Set_Signed();
+    void                Set_BuiltIn(
+                            const char *        i_sType );
+    void                Set_Const();            /// Sets CV to the type or the present pointer level, whatever is highest.
+    void                Set_Volatile();         /// Sets CV to the type or the present pointer level, whatever is highest.
+    void                Add_PtrLevel();         /// For an '*'.
+    void                Set_Reference();        /// For an '&'.
+
+        // Operations to find the relating CodeEntity:
+    /** This needs to be called only one time. After that
+        RelatedCe() will return the value.
+
+        When connectiing all parsed types, there are three steps:
+            1. Find related types in the same scope and namespaces above.
+            2. Then all classes can be connected to their base classes.
+            3. Lastly types can be connected to Ces only known via their base
+               classes. This is not possible at step 1.
+
+        @see Connect2CeOnlyKnownViaBaseClass()
+    */
+    void                Connect2Ce(
+                            const CePilot &     i_ces );
+
+    /** @see Connect2Ce()
+    */
+    void                Connect2CeOnlyKnownViaBaseClass(
+                            const Gate &        i_gate );
+
+    // INQUIRY
+    /** @return True, if type consists of one built-in typename and
+                nothing else.
+    */
+    bool                IsBuiltInType() const;
+    /** @return the full local name, including template instantiation, but without
+        '*','&' or modifiers.
+    */
+    const String  &     LocalName() const;
+    E_TypeSpecialisation
+                        TypeSpecialisation() const;
+
+  private:
+    // Interface csv::ConstProcessorClient
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface ary::cpp::Type:
+    virtual Rid         inq_RelatedCe() const;
+    virtual bool        inq_IsConst() const;
+    virtual void        inq_Get_Text(
+                            StreamStr &         o_rPreName,
+                            StreamStr &         o_rName,
+                            StreamStr &         o_rPostName,
+                            const ary::cpp::Gate &
+                                                i_rGate ) const;
+    // Local
+    typedef std::vector< ary::cpp::E_ConVol >   PtrLevelVector;
+
+    uintt               PtrLevel() const        { return uintt(aPtrLevels.size()); }
+    Ce_id               RecursiveSearchCe_InBaseClassesOf(
+                            const CodeEntity &  i_mayBeClass,
+                            const StringVector &
+                                                i_myQualification,
+                            const String &      i_myName,
+                            const Gate &        i_gate ) const;
+    void                Get_NameParts(
+                            StringVector &      o_qualification,
+                            String &            o_name );
+
+    // Forbidden functions
+                        UsedType(
+                            const UsedType &    i_rType );
+    bool                operator=(
+                            const UsedType &    i_rType );
+
+    // DATA
+    ut::NameChain       aPath;
+    PtrLevelVector      aPtrLevels;
+    ary::cpp::E_ConVol  eConVol_Type;
+    bool                bIsReference;
+    bool                bIsAbsolute;
+    bool                bRefers2BuiltInType;
+    E_TypeSpecialisation
+                        eTypeSpecialisation;
+    Ce_id               nRelatedCe;
+
+    /// Namespace or class scope where the type occurred.
+    Ce_id               nScope;
+};
+
+
+namespace ut
+{
+    class TemplateParameter;
+
+class List_TplParameter
+{
+  public:
+    typedef std::vector< DYN TemplateParameter * >::const_iterator  const_iterator;
+
+                        List_TplParameter();
+                        ~List_TplParameter();
+
+    void                AddParam_Type(
+                            Type_id             i_nType );
+    /// puts "< " TemplateArgumentList " >" to o_rOut.
+    void                Get_Text(
+                            StreamStr &         o_rOut,
+                            const ary::cpp::Gate &
+                                                i_rGate ) const;
+    /// @return as strcmp().
+    intt                Compare(
+                            const List_TplParameter &
+                                                i_rOther ) const;
+
+  private:
+    typedef std::vector< DYN TemplateParameter * >  Vector_TplArgument;
+
+    Vector_TplArgument  aTplParameters;
+};
+
+}   // namespace ut
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/doc/d_boolean.hxx b/autodoc/inc/ary/doc/d_boolean.hxx
new file mode 100644
index 000000000000..1bf7bc3e307e
--- /dev/null
+++ b/autodoc/inc/ary/doc/d_boolean.hxx
@@ -0,0 +1,99 @@
+/* -*- 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 ARY_DOC_D_BOOLEAN_HXX
+#define ARY_DOC_D_BOOLEAN_HXX
+
+// BASE CLASSES
+#include <ary/doc/d_node.hxx>
+
+// USED SERVICES
+
+
+
+
+namespace ary
+{
+namespace doc
+{
+
+
+/** Repesents a boolean documentation item like "optional" or "not optional".
+*/
+class Boolean : public Node
+{
+  public:
+    // LIFECYCLE
+    explicit            Boolean(
+                            nodetype::id        i_type );
+    virtual             ~Boolean();
+
+    // OPERATIONS
+    void                Set(
+                            bool                i_b );
+    // INQUIRY
+    bool                IsTrue() const;
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // DATA
+    bool                b;
+};
+
+
+
+
+// IMPLEMENTATION
+inline
+Boolean::Boolean(nodetype::id i_type)
+    :   Node(i_type),
+        b(false)
+{
+}
+
+inline bool
+Boolean::IsTrue() const
+{
+    return b;
+}
+
+inline void
+Boolean::Set( bool i_b )
+{
+    b = i_b;
+}
+
+
+
+}   // namespace doc
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/doc/d_docu.hxx b/autodoc/inc/ary/doc/d_docu.hxx
new file mode 100644
index 000000000000..8469d9646220
--- /dev/null
+++ b/autodoc/inc/ary/doc/d_docu.hxx
@@ -0,0 +1,109 @@
+/* -*- 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 ARY_DOC_D_DOCU_HXX
+#define ARY_DOC_D_DOCU_HXX
+
+// BASE CLASSES
+#include <cosv/tpl/processor.hxx>
+
+// USED SERVICES
+#include <ary/doc/d_node.hxx>
+
+
+
+
+namespace ary
+{
+namespace doc
+{
+
+
+/** Represents a documentation which is assigned to an Autodoc
+    repository entity.
+*/
+class Documentation : public csv::ConstProcessorClient
+{
+  public:
+                        Documentation();
+                        ~Documentation();
+    // OPERATIONS
+    void                Clear();
+
+    // INQUIRY
+    const Node *        Data() const;
+
+    // ACCESS
+    Node *              Data();
+    void                Set_Data(
+                            ary::doc::Node &    i_data );
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // DATA
+    Dyn<Node>           pData;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+Documentation::Clear()
+{
+    pData = 0;
+}
+
+inline const Node *
+Documentation::Data() const
+{
+    return pData.Ptr();
+}
+
+inline Node *
+Documentation::Data()
+{
+    return pData.Ptr();
+}
+
+inline void
+Documentation::Set_Data(ary::doc::Node & i_data)
+{
+    pData = &i_data;
+}
+
+
+
+
+}   // namespace doc
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/doc/d_node.hxx b/autodoc/inc/ary/doc/d_node.hxx
new file mode 100644
index 000000000000..8dd96b8f657b
--- /dev/null
+++ b/autodoc/inc/ary/doc/d_node.hxx
@@ -0,0 +1,112 @@
+/* -*- 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 ARY_DOC_D_NODE_HXX
+#define ARY_DOC_D_NODE_HXX
+
+// BASE CLASSES
+#include <cosv/tpl/processor.hxx>
+// USED SERVICES
+#include <cosv/tpl/vvector.hxx>
+#include <ary/doc/d_types4doc.hxx>
+
+
+
+
+namespace ary
+{
+namespace doc
+{
+
+
+/** The abstract base class for any type of documentation content.
+
+    A ->Documentation has as content a hierarchy of Nodes, each can be a
+    different kind of content, like descriptions of single items or structs
+    or lists of Nodes.
+*/
+class Node : public csv::ConstProcessorClient
+{
+  public:
+    // LIFECYCLE
+    virtual             ~Node();
+
+    // OPERATIONS
+    void                Add_toChain(
+                            DYN Node &          pass_nextNode );
+    // INQUIRY
+    nodetype::id        Type() const;
+    const Node *        Next() const;
+    bool                IsSingle() const;
+    uintt               ListSize() const;
+
+  protected:
+    explicit            Node(
+                            nodetype::id        i_type);
+  private:
+    // Forbid copies:
+    Node(const Node&);
+    Node & operator=(const Node&);
+
+    // DATA
+    nodetype::id        nType;
+    Dyn<Node>           pNext;      /// Next ->Node in same list.
+};
+
+typedef csv::VirtualVector<Node>    NodeList;
+
+
+
+
+// IMPLEMENTATION
+inline nodetype::id
+Node::Type() const
+{
+    return nType;
+}
+
+inline const Node *
+Node::Next() const
+{
+    return pNext.Ptr();
+}
+
+inline bool
+Node::IsSingle() const
+{
+    return pNext.operator bool();
+}
+
+
+
+
+}   // namespace doc
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/doc/d_oldcppdocu.hxx b/autodoc/inc/ary/doc/d_oldcppdocu.hxx
new file mode 100644
index 000000000000..0429ab312d66
--- /dev/null
+++ b/autodoc/inc/ary/doc/d_oldcppdocu.hxx
@@ -0,0 +1,133 @@
+/* -*- 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 ARY_DOC_D_OLDCPPDOCU_HXX
+#define ARY_DOC_D_OLDCPPDOCU_HXX
+//  KORR_DEPRECATED_3.0
+
+// BASE CLASSES
+#include <ary/doc/d_node.hxx>
+// USED SERVICES
+#include <ary/info/inftypes.hxx>
+#include <ary/ary_disp.hxx>
+
+namespace ary
+{
+namespace info
+{
+    class AtTag;
+    class DocuStore;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace doc
+{
+    using ::ary::info::AtTag;
+    using ::ary::info::E_AtTagId;
+
+
+/** Wrapper class for old C++ documentation format.
+
+    To be replaced by using the standard format.
+*/
+class OldCppDocu : public Node
+{
+  public:
+    typedef std::vector< DYN AtTag * >  TagList;
+
+    // LIFECYCLE
+                        OldCppDocu();
+    virtual             ~OldCppDocu();
+
+    void                Store2(
+                            info::DocuStore &   o_rDocuStore );
+
+    virtual AtTag *     Create_StdTag(
+                            E_AtTagId           i_eId );
+    virtual AtTag *     CheckIn_BaseTag();
+    virtual AtTag *     CheckIn_ExceptionTag();
+    virtual AtTag *     Create_ImplementsTag();
+    virtual AtTag *     Create_KeywordTag();
+    virtual AtTag *     CheckIn_ParameterTag();
+    virtual AtTag *     CheckIn_SeeTag();
+    virtual AtTag *     CheckIn_TemplateTag();
+    virtual AtTag *     Create_LabelTag();
+    virtual AtTag *     Create_DefaultTag();
+    virtual AtTag *     Create_SinceTag();          /// @return always the first one created.
+
+    virtual void        Replace_AtShort_By_AtDescr();
+
+    virtual void        Set_Obsolete();
+    virtual void        Set_Internal();
+    virtual void        Set_Interface()         { bIsInterface = true; }
+
+  // INQUIRY
+    const TagList &     Tags() const            { return aTags; }
+    const AtTag &       Short() const;
+    bool                IsObsolete() const      { return bIsObsolete; }
+    virtual bool        IsInternal() const;
+    virtual bool        IsInterface() const;
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // DATA
+    unsigned char       nTags[ary::info::C_eAtTag_NrOfClasses];
+
+    /** Creates a new AtTag at the end of aTags.
+        The index of this new AtTag is inserted in nTags at position
+        i_nIndex.
+    */
+    AtTag * &           NewTag(
+                            UINT8               i_nIndex );
+    /** Returns the Tag with the position nTags[i_nIndex]
+        in aTags.
+    */
+    AtTag &             GetTag(
+                            UINT8               i_nIndex );
+
+    TagList             aTags;
+    bool                bIsObsolete;
+    bool                bIsInternal;
+    bool                bIsInterface;
+};
+
+
+
+
+}   // namespace doc
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/doc/d_oldidldocu.hxx b/autodoc/inc/ary/doc/d_oldidldocu.hxx
new file mode 100644
index 000000000000..542711784973
--- /dev/null
+++ b/autodoc/inc/ary/doc/d_oldidldocu.hxx
@@ -0,0 +1,114 @@
+/* -*- 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 ARY_DOC_D_OLDIDLDOCU_HXX
+#define ARY_DOC_D_OLDIDLDOCU_HXX
+
+// BASE CLASSES
+#include <ary/doc/d_node.hxx>
+// USED SERVICES
+#include <ary_i/ci_text2.hxx>
+
+
+
+
+namespace ary
+{
+namespace inf
+{
+    class AtTag2;
+    class DocuToken;
+    class DocuTex2;
+}
+namespace doc
+{
+    using ::ary::inf::AtTag2;
+    using ::ary::inf::DocuToken;
+    using ::ary::inf::DocuTex2;
+
+
+
+/** Wrapper for the old idl documentation format.
+*/
+class OldIdlDocu : public Node
+{
+  public:
+                        OldIdlDocu();
+                        ~OldIdlDocu();
+
+    void                AddToken2Short(
+                            DYN DocuToken &     let_drToken )
+                                                { aShort.AddToken(let_drToken); }
+    void                AddToken2Description(
+                            DYN DocuToken &     let_drToken )
+                                                { aDescription.AddToken(let_drToken); }
+    void                AddToken2DeprecatedText(
+                            DYN DocuToken &     let_drToken );
+    void                AddAtTag(
+                            DYN AtTag2 &        let_drAtTag )
+                                                { aTags.push_back(&let_drAtTag); }
+    void                SetPublished()          { bIsPublished = true; }
+    void                SetDeprecated()         { bIsDeprecated = true; }
+    void                SetOptional()           { bIsOptional = true; }
+    void                SetExternShort(
+                            const DocuTex2 &    i_pExternShort )
+                                                { pExternShort = &i_pExternShort; }
+
+    const DocuTex2 &    Short() const           { return pExternShort != 0 ? *pExternShort : aShort; }
+    const DocuTex2 &    Description() const     { return aDescription; }
+    const DocuTex2 &    DeprecatedText() const  { return aDeprecatedText; }
+    const std::vector< AtTag2* > &
+                        Tags() const            { return aTags; }
+    bool                IsPublished() const     { return bIsPublished; }
+    bool                IsDeprecated() const    { return bIsDeprecated; }
+    bool                IsOptional() const      { return bIsOptional; }
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // DATA
+    DocuTex2            aShort;
+    DocuTex2            aDescription;
+    DocuTex2            aDeprecatedText;
+    std::vector< AtTag2* >
+                        aTags;
+    const DocuTex2 *    pExternShort;
+    bool                bIsPublished;
+    bool                bIsDeprecated;
+    bool                bIsOptional;
+};
+
+
+
+
+}   // namespace doc
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/doc/d_parametrized.hxx b/autodoc/inc/ary/doc/d_parametrized.hxx
new file mode 100644
index 000000000000..78659e701441
--- /dev/null
+++ b/autodoc/inc/ary/doc/d_parametrized.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 ARY_DOC_D_PARAMETER_HXX
+#define ARY_DOC_D_PARAMETER_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/doc/d_node.hxx>
+
+namespace ary
+{
+namespace doc
+{
+
+
+/** Documentation unit with Parameter.
+*/
+template <class T>
+class Parametrized : public Node
+{
+  public:
+    // LIFECYCLE
+    explicit            Parametrized(
+                            nodetype::id        i_id,
+                            T                   i_Parameter );
+    virtual             ~Parametrized();
+
+    // INQUIRY
+    const HyperText &   Doc() const;
+    const T &           Parameter() const;
+
+    // ACESS
+    HyperText &         Doc();
+    void                Set_Parameter(
+                            const T &           i_param );
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // DATA
+    HyperText           aDoc;
+    T                   aParameter;
+};
+
+
+
+
+// IMPLEMENTATION
+template <class T>
+Parametrized<T>::Parametrized( nodetype::id     i_id,
+                               T                i_Parameter )
+    :   Node(i_id),
+        aDoc(),
+        aParameter(i_Parameter)
+{
+}
+
+template <class T>
+Parametrized<T>::~Parametrized()
+{
+}
+
+template <class T>
+const HyperText &
+Parametrized<T>::Doc() const
+{
+    return aDoc;
+}
+
+template <class T>
+const T &
+Parametrized<T>::Parameter() const
+{
+    return aParameter;
+}
+
+template <class T>
+HyperText &
+Parametrized<T>::Doc()
+{
+    return aDoc;
+}
+
+template <class T>
+inline void
+Parametrized<T>::Set_Parameter(const T & i_param)
+{
+    aParameter = i_param;
+}
+
+
+
+
+}   // namespace doc
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/doc/d_types4doc.hxx b/autodoc/inc/ary/doc/d_types4doc.hxx
new file mode 100644
index 000000000000..dbf614af6c56
--- /dev/null
+++ b/autodoc/inc/ary/doc/d_types4doc.hxx
@@ -0,0 +1,73 @@
+/* -*- 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 ARY_DOC_D_TYPES4DOC_HXX
+#define ARY_DOC_D_TYPES4DOC_HXX
+
+// USED SERVICES
+
+
+
+namespace ary
+{
+namespace doc
+{
+
+
+/** Type of a documentation: multiple lines or single line.
+*/
+enum E_BlockType
+{
+    dbt_none = 0,
+    dbt_multiline,
+    dbt_singleline
+};
+
+/** Type of documentation text: with html or without.
+*/
+enum E_TextType
+{
+    dtt_none = 0,
+    dtt_plain,
+    dtt_html
+};
+
+namespace nodetype
+{
+
+typedef int id;
+
+}   //  namespace nodetype
+
+
+
+}   //  namespace doc
+}   //  namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/doc/ht/dht_interpreter.hxx b/autodoc/inc/ary/doc/ht/dht_interpreter.hxx
new file mode 100644
index 000000000000..874f3425bf48
--- /dev/null
+++ b/autodoc/inc/ary/doc/ht/dht_interpreter.hxx
@@ -0,0 +1,79 @@
+/* -*- 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 ARY_DHT_INTERPRETER_HXX
+#define ARY_DHT_INTERPRETER_HXX
+
+
+
+
+namespace ary
+{
+namespace doc
+{
+namespace ht
+{
+    class Processor;
+
+
+/** Interface for all interpreters of a ->Component.
+*/
+class Interpreter
+{
+  public:
+    virtual             ~Interpreter() {}
+
+    void                Accept(
+                            Processor &         io_processor,
+                            const String &      i_data ) const;
+  private:
+    virtual void        do_Accept(
+                            Processor &         io_processor,
+                            const String &      i_data ) const = 0;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+Interpreter::Accept( Processor &     io_processor,
+                     const String &  i_data ) const
+{
+    do_Accept(io_processor, i_data);
+}
+
+
+
+
+}   // namespace ht
+}   // namespace doc
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/entity.hxx b/autodoc/inc/ary/entity.hxx
new file mode 100644
index 000000000000..85ecc26a49a0
--- /dev/null
+++ b/autodoc/inc/ary/entity.hxx
@@ -0,0 +1,84 @@
+/* -*- 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 ARY_ENTITY_HXX
+#define ARY_ENTITY_HXX
+
+// BASE CLASSES
+#include <ary/object.hxx>
+
+
+
+
+namespace ary
+{
+
+
+/** Interface for every class, whose objects are searchable within the
+    Autodoc Repository by an id.
+
+    @todo
+    Possibly make ->Set_Id() less public accessible.
+*/
+class Entity : public Object
+{
+  public:
+    virtual             ~Entity() {}
+
+    Rid                 Id() const;
+
+    /// @attention Must be used only by ->ary::stg::Storage<>
+    void                Set_Id(
+                            Rid                 i_nId );
+  protected:
+                        Entity()      : nId(0) {}
+  private:
+    // DATA
+    Rid                 nId;
+};
+
+
+inline Rid
+Entity::Id() const
+{
+    return nId;
+}
+
+inline void
+Entity::Set_Id(Rid i_nId)
+{
+    nId = i_nId;
+}
+
+
+
+
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/getncast.hxx b/autodoc/inc/ary/getncast.hxx
new file mode 100644
index 000000000000..cc5a0afbfd65
--- /dev/null
+++ b/autodoc/inc/ary/getncast.hxx
@@ -0,0 +1,91 @@
+/* -*- 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 ARY_GETNCAST_HXX
+#define ARY_GETNCAST_HXX
+
+
+// USED SERVICES
+#include <ary/object.hxx>
+
+
+
+
+namespace ary
+{
+
+
+template <class DEST>
+inline bool
+is_type(const ary::Object & i_obj)
+{
+    return i_obj.AryClass() == DEST::class_id;
+}
+
+
+template <class DEST>
+inline const DEST &
+ary_cast( const Object & ce)
+{
+    csv_assert( is_type<DEST>(ce) );
+    return static_cast< const DEST& >(ce);
+}
+
+template <class DEST>
+inline DEST &
+ary_cast( Object & ce)
+{
+    csv_assert( is_type<DEST>(ce) );
+    return static_cast< DEST& >(ce);
+}
+
+template <class DEST>
+inline const DEST *
+ary_cast( const Object * ce)
+{
+    if ( ce ? is_type<DEST>(*ce) : false )
+        return static_cast< const DEST* >(ce);
+    return 0;
+}
+
+template <class DEST>
+inline DEST *
+ary_cast( Object * ce)
+{
+    if ( ce ? is_type<DEST>(*ce) : false )
+        return static_cast< DEST* >(ce);
+    return 0;
+}
+
+
+
+
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_attribute.hxx b/autodoc/inc/ary/idl/i_attribute.hxx
new file mode 100644
index 000000000000..42686e22e330
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_attribute.hxx
@@ -0,0 +1,138 @@
+/* -*- 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 ARY_IDL_I_ATTRIBUTE_HXX
+#define ARY_IDL_I_ATTRIBUTE_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_attribute
+{
+    struct attr;
+}
+
+
+
+
+/** @resp
+    Represents an IDL property.
+*/
+class Attribute : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2014 };
+
+    // LIFECYCLE
+                        Attribute(
+                            const String &      i_sName,
+                            Ce_id               i_nInterface,
+                            Ce_id               i_nModule,
+                            Type_id             i_nType,
+                            bool                i_bReadonly,
+                            bool                i_bBound );
+                        ~Attribute();
+    // OPERATIONS
+    void                Add_GetException(
+                            Type_id             i_nException );
+    void                Add_SetException(
+                            Type_id             i_nException );
+
+    // INQUIRY
+    Type_id             Type() const;
+    bool                IsReadonly() const;
+    bool                IsBound() const;
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Local
+    typedef std::vector< Type_id >      ExceptionList;
+    friend struct ifc_attribute::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+    Ce_id               nNameRoom;
+
+    Type_id             nType;
+    ExceptionList       aGetExceptions;
+    ExceptionList       aSetExceptions;
+    bool                bReadonly;
+    bool                bBound;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+Attribute::Add_GetException( Type_id i_nException )
+    { aGetExceptions.push_back(i_nException); }
+
+inline void
+Attribute::Add_SetException( Type_id i_nException )
+    { aSetExceptions.push_back(i_nException); }
+
+inline Type_id
+Attribute::Type() const
+    { return nType; }
+
+inline bool
+Attribute::IsReadonly() const
+    { return bReadonly; }
+
+inline bool
+Attribute::IsBound() const
+    { return bBound; }
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_ce.hxx b/autodoc/inc/ary/idl/i_ce.hxx
new file mode 100644
index 000000000000..e2d0dce21007
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_ce.hxx
@@ -0,0 +1,138 @@
+/* -*- 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 ARY_IDL_I_CE_HXX
+#define ARY_IDL_I_CE_HXX
+
+// BASE CLASSES
+#include <ary/entity.hxx>
+// USED SERVICES
+#include <ary/doc/d_docu.hxx>
+#include <ary/idl/i_ce2s.hxx>
+#include <ary/idl/i_types4idl.hxx>
+
+
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** @resp Base class for all IDL code entities.
+
+    A @->CodeEntity is a namespace, type, data or function, which occures in
+    the parsed UNO IDL code and is described and/or commented within the
+    Autodoc repository.
+
+    This is a storage base class, where more special classes are
+    derived from.
+*/
+class CodeEntity : public ary::Entity
+{
+  public:
+    // LIFECYCLE
+    virtual             ~CodeEntity();
+
+    // OPERATION
+
+    // INQUIRY
+    Ce_id               CeId() const            { return Ce_id(Id()); }
+    const String &      LocalName() const;
+    Ce_id               NameRoom() const;
+    Ce_id               Owner() const;
+    E_SightLevel        SightLevel() const;
+
+    const ary::doc::Documentation &
+                        Docu() const;
+    const Ce_2s &       Secondaries() const;
+
+    static const CodeEntity &
+                        Null_();
+    // ACCESS
+    void                Set_Docu(
+                            DYN ary::doc::Node &
+                                                pass_data );
+    Ce_2s &             Secondaries();
+
+  protected:
+                        CodeEntity();
+  private:
+    // Locals
+    virtual const String &  inq_LocalName() const = 0;
+    virtual Ce_id           inq_NameRoom() const = 0;
+    virtual Ce_id           inq_Owner() const = 0;
+    virtual E_SightLevel    inq_SightLevel() const = 0;
+
+    // DATA
+    ary::doc::Documentation
+                        aDocu;
+    Dyn<Ce_2s>          p2s;
+};
+
+
+
+
+// IMPLEMENTATION
+inline const String &
+CodeEntity::LocalName() const
+    { return inq_LocalName(); }
+
+inline Ce_id
+CodeEntity::NameRoom() const
+    { return inq_NameRoom(); }
+
+inline Ce_id
+CodeEntity::Owner() const
+    { return inq_Owner(); }
+
+inline E_SightLevel
+CodeEntity::SightLevel() const
+    { return inq_SightLevel(); }
+
+inline const ary::doc::Documentation &
+CodeEntity::Docu() const
+    { return aDocu; }
+
+inline void
+CodeEntity::Set_Docu(DYN ary::doc::Node & pass_data)
+{
+    aDocu.Set_Data(pass_data);
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_ce2s.hxx b/autodoc/inc/ary/idl/i_ce2s.hxx
new file mode 100644
index 000000000000..09774d36e09f
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_ce2s.hxx
@@ -0,0 +1,99 @@
+/* -*- 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 ARY_IDL_I_CE2S_HXX
+#define ARY_IDL_I_CE2S_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_types4idl.hxx>
+
+
+namespace ary
+{
+
+namespace idl
+{
+
+
+
+/** Abstract base for all secondary productions of code entities
+*/
+class Ce_2s
+{
+  public:
+    // LIFECYCLE
+    Ce_2s() {}
+    virtual             ~Ce_2s();
+
+    static DYN Ce_2s *  Create_(
+                            ClassId             i_nCeClass );
+    // OPERATIONS
+    void                Add_Link2DescriptionInManual(
+                            const String &      i_link,
+                            const String &      i_linkUI )
+                                                { aDescriptionsInManual.push_back(i_link); aDescriptionsInManual.push_back(i_linkUI); }
+    void                Add_Link2RefInManual(
+                            const String &      i_link,
+                            const String &      i_linkUI )
+                                                { aRefsInManual.push_back(i_link); aRefsInManual.push_back(i_linkUI); }
+    std::vector<Ce_id> &
+                        Access_List(
+                            int                 i_indexOfList );
+    // INQUIRY
+    const StringVector &
+                        Links2DescriptionInManual() const
+                                                { return aDescriptionsInManual; }
+    const StringVector &
+                        Links2RefsInManual() const
+                                                { return aRefsInManual; }
+    int                 CountXrefLists() const  { return aXrefLists.size(); }
+    const std::vector<Ce_id> &
+                        List(
+                            int                 i_indexOfList ) const;
+  private:
+    typedef DYN std::vector<Ce_id> * ListPtr;
+
+    // DATA
+    StringVector        aDescriptionsInManual;
+    StringVector        aRefsInManual;
+    std::vector<ListPtr>
+                        aXrefLists;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_comrela.hxx b/autodoc/inc/ary/idl/i_comrela.hxx
new file mode 100644
index 000000000000..424431fed783
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_comrela.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 ARY_IDL_I_COMRELA_HXX
+#define ARY_IDL_I_COMRELA_HXX
+
+// USED SERVICES
+#include <ary/idl/i_types4idl.hxx>
+
+namespace ary
+{
+namespace doc
+{
+    class OldIdlDocu;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** Contains data for an IDL code entity related to another one like a base of
+    an interface or of a service or the supported interface of a service.
+*/
+class CommentedRelation
+{
+  public:
+    // LIFECYCLE
+
+                        CommentedRelation(
+                            Type_id             i_nType,
+                            doc::OldIdlDocu *   i_pInfo )
+                                                :   nType(i_nType),
+                                                    pInfo(i_pInfo)
+                                                {}
+    // INQUIRY
+    Type_id             Type() const            { return nType; }
+    doc::OldIdlDocu *   Info() const            { return pInfo; }
+
+  private:
+    // DATA
+    Type_id             nType;
+    doc::OldIdlDocu *   pInfo;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_constant.hxx b/autodoc/inc/ary/idl/i_constant.hxx
new file mode 100644
index 000000000000..3e850680427a
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_constant.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 ARY_IDL_I_CONSTANT_HXX
+#define ARY_IDL_I_CONSTANT_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_constant
+{
+    struct attr;
+}
+
+
+/** Represents an IDL constant.
+*/
+class Constant : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2012 };
+
+    // LIFECYCLE
+                        Constant(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Ce_id               i_nNameRoom,
+                            Type_id             i_nType,
+                            const String &      i_sInitValue );
+                        ~Constant();
+    // INQUIRY
+    Type_id             Type() const;
+    const String &      Value() const;
+
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    friend struct ifc_constant::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nNameRoom;
+    Ce_id               nOwner;
+
+    Type_id             nType;
+    String              sInitValue;
+};
+
+
+
+
+// IMPLEMENTATION
+inline Type_id
+Constant::Type() const
+{
+    return nType;
+}
+
+inline const String &
+Constant::Value() const
+{
+    return sInitValue;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_constgroup.hxx b/autodoc/inc/ary/idl/i_constgroup.hxx
new file mode 100644
index 000000000000..7b9d90b35116
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_constgroup.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 ARY_IDL_I_CONSTGROUP_HXX
+#define ARY_IDL_I_CONSTGROUP_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_constgroup
+{
+    struct attr;
+}
+
+
+/** Represents an IDL constants group.
+*/
+class ConstantsGroup : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2011 };
+
+    // LIFECYCLE
+                        ConstantsGroup(
+                            const String &      i_sName,
+                            Ce_id               i_nModule );
+                        ~ConstantsGroup();
+    // ACCESS
+    void                Add_Constant(
+                            Ce_id               i_nConstant );
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Locals
+    typedef std::vector<Ce_id>    ConstantList;
+    friend struct ifc_constgroup::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nModule;
+
+    ConstantList        aConstants;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+ConstantsGroup::Add_Constant( Ce_id i_nConstant )
+{
+    aConstants.push_back(i_nConstant);
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_enum.hxx b/autodoc/inc/ary/idl/i_enum.hxx
new file mode 100644
index 000000000000..b53147e459ae
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_enum.hxx
@@ -0,0 +1,103 @@
+/* -*- 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 ARY_IDL_I_ENUM_HXX
+#define ARY_IDL_I_ENUM_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_enum
+{
+    struct attr;
+}
+
+
+/** Represents an IDL enum.
+*/
+class Enum : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2005 };
+    // LIFECYCLE
+                        Enum(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner );
+                        ~Enum();
+    // ACCESS
+    void                Add_Value(
+                            Ce_id               i_nValue );
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Locals
+    typedef std::vector<Ce_id>   ValueList;
+    friend struct ifc_enum::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+
+    ValueList           aValues;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+Enum::Add_Value( Ce_id i_nValue )
+{
+    aValues.push_back(i_nValue);
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_enumvalue.hxx b/autodoc/inc/ary/idl/i_enumvalue.hxx
new file mode 100644
index 000000000000..56dc39b86ebd
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_enumvalue.hxx
@@ -0,0 +1,106 @@
+/* -*- 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 ARY_IDL_I_ENUMVALUE_HXX
+#define ARY_IDL_I_ENUMVALUE_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_enumvalue
+{
+    struct attr;
+}
+
+
+/** @resp
+    Represents an IDL enum value.
+*/
+class EnumValue : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2006 };
+
+    // LIFECYCLE
+                        EnumValue(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Ce_id               i_nNameRoom,
+                            const String &      i_sInitValue );
+                        ~EnumValue();
+    // INQUIRY
+    const String &      Value() const;
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    friend struct ifc_enumvalue::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+    Ce_id               nNameRoom;
+
+    String              sValue;
+};
+
+
+
+
+// IMPLEMENTATION
+inline const String &
+EnumValue::Value() const
+{
+    return sValue;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_exception.hxx b/autodoc/inc/ary/idl/i_exception.hxx
new file mode 100644
index 000000000000..0c2658dbbc33
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_exception.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 ARY_IDL_I_EXCEPTION_HXX
+#define ARY_IDL_I_EXCEPTION_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_exception
+{
+    struct attr;
+}
+
+
+/** Represents an IDL exception.
+*/
+class Exception : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2010 };
+
+    // LIFECYCLE
+                        Exception(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Type_id             i_nBase );
+                        ~Exception();
+    // INQUIRY
+    Type_id             Base() const            { return nBase; }
+
+    // ACCESS
+    void                Add_Member(
+                            Ce_id               i_nMember );
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Locals
+    typedef std::vector<Ce_id>     ElementList;
+    friend struct ifc_exception::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+
+    Type_id             nBase;
+    ElementList         aElements;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+Exception::Add_Member( Ce_id i_nMember )
+{
+    aElements.push_back(i_nMember);
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_function.hxx b/autodoc/inc/ary/idl/i_function.hxx
new file mode 100644
index 000000000000..43fd91dfa501
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_function.hxx
@@ -0,0 +1,163 @@
+/* -*- 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 ARY_IDL_I_FUNCTION_HXX
+#define ARY_IDL_I_FUNCTION_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+// USED SERVICES
+#include <ary/idl/i_param.hxx>
+#include <ary/idl/ik_function.hxx>
+#include <ary/stdconstiter.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** Represents an IDL function.
+
+    Special case constructor:
+    Constructors have return type "0".
+*/
+class Function : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2002 };
+
+    typedef std::vector< Parameter >    ParamList;
+    typedef std::vector< Type_id >      ExceptionList;
+
+    // LIFECYCLE
+    /// Normal function
+                        Function(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Ce_id               i_nNameRoom,
+                            Type_id             i_nReturnType,
+                            bool                i_bOneWay );
+    /// Constructor
+                        Function(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Ce_id               i_nNameRoom );
+                        ~Function();
+
+    // OPERATIONS
+    void                Add_Parameter(
+                            const String &      i_sName,
+                            Type_id             i_nType,
+                            E_ParameterDirection
+                                                i_eDirection );
+    /// The function's parameter list ends with the ellipse "..." .
+    void                Set_Ellipse();
+    void                Add_Exception(
+                            Type_id             i_nException );
+
+    // INQUIRY
+    Type_id             ReturnType() const;
+    const ParamList &   Parameters() const      { return aParameters; }
+    const ExceptionList &
+                        Exceptions() const      { return aExceptions; }
+    bool                IsOneway() const;
+    bool                HasEllipse() const      { return bEllipse; }
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Locals
+    friend struct ifc_function::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+    Ce_id               nNameRoom;
+
+    Type_id             nReturnType;
+    ParamList           aParameters;
+    ExceptionList       aExceptions;
+    bool                bOneWay;
+    bool                bEllipse;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+Function::Add_Parameter( const String &         i_sName,
+                         Type_id                i_nType,
+                         E_ParameterDirection   i_eDirection )
+{
+    aParameters.push_back( Parameter(i_sName,i_nType,i_eDirection) );
+}
+
+inline void
+Function::Set_Ellipse()
+{
+    bEllipse = true;
+}
+
+inline void
+Function::Add_Exception( Type_id i_nException )
+{
+    aExceptions.push_back(i_nException);
+}
+
+inline Type_id
+Function::ReturnType() const
+    { return nReturnType; }
+
+inline bool
+Function::IsOneway() const
+    { return bOneWay; }
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_gate.hxx b/autodoc/inc/ary/idl/i_gate.hxx
new file mode 100644
index 000000000000..59595743aa91
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_gate.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 ARY_IDL_I_GATE_HXX
+#define ARY_IDL_I_GATE_HXX
+
+// USED SERVICES
+
+namespace autodoc
+{
+    class Options;
+}
+namespace ary
+{
+namespace idl
+{
+    class CePilot;
+    class TypePilot;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** Main entry to access the IDL parts of the repository.
+*/
+class Gate
+{
+  public:
+    // LIFECYCLE
+    virtual             ~Gate() {}
+
+    // OPERATIONS
+    virtual void        Calculate_AllSecondaryInformation(
+                            const String &      i_devman_reffilepath ) = 0;
+//                            const ::autodoc::Options &
+//                                                i_options ) = 0;
+    // INQUIRY
+    virtual const CePilot &
+                        Ces() const = 0;
+    virtual const TypePilot &
+                        Types() const = 0;
+    // ACCESS
+    virtual CePilot &   Ces() = 0;
+    virtual TypePilot & Types() = 0;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_interface.hxx b/autodoc/inc/ary/idl/i_interface.hxx
new file mode 100644
index 000000000000..bcf92b287bb4
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_interface.hxx
@@ -0,0 +1,130 @@
+/* -*- 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 ARY_IDL_I_INTERFACE_HXX
+#define ARY_IDL_I_INTERFACE_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+// USED SERVICES
+#include <ary/idl/i_comrela.hxx>
+#include <ary/stdconstiter.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_interface
+{
+    struct attr;
+}
+    class Interface_2s;
+
+
+/** Represents an IDL interface.
+*/
+class Interface : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2001 };
+
+    // LIFECYCLE
+                        Interface(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner );
+                        ~Interface();
+    // INQUIRY
+    bool                HasBase() const;
+
+    // ACCESS
+    void                Add_Function(
+                            Ce_id               i_nId );
+    void                Add_Attribute(
+                            Ce_id               i_nId );
+    void                Add_Base(
+                            Type_id             i_nInterface,
+                            DYN doc::OldIdlDocu *
+                                                pass_dpDocu );
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity:
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Local
+    typedef std::vector< CommentedRelation >    RelationList;
+    typedef std::vector<Ce_id>                  MemberList;
+    friend struct ifc_interface::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+    RelationList        aBases;
+    MemberList          aFunctions;
+    MemberList          aAttributes;
+    Dyn<Interface_2s>   p2s;
+};
+
+
+
+
+// IMPLEMENTATION
+inline bool
+Interface::HasBase() const
+    { return aBases.size() > 0; }
+inline void
+Interface::Add_Function( Ce_id i_nId )
+    { aFunctions.push_back(i_nId); }
+inline void
+Interface::Add_Attribute( Ce_id i_nId )
+    { aAttributes.push_back(i_nId); }
+inline void
+Interface::Add_Base( Type_id                i_nInterface,
+                     DYN doc::OldIdlDocu *  pass_dpDocu )
+    { aBases.push_back( CommentedRelation(i_nInterface, pass_dpDocu) ); }
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_module.hxx b/autodoc/inc/ary/idl/i_module.hxx
new file mode 100644
index 000000000000..0e7c0300a872
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_module.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 ARY_IDL_I_MODULE_HXX
+#define ARY_IDL_I_MODULE_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+// USED SERVICES
+#include <ary/stdconstiter.hxx>
+
+
+
+
+namespace ary
+{
+    template <class> class NameTreeNode;
+
+namespace idl
+{
+namespace ifc_module
+{
+    struct attr;
+}
+    class Gate;
+
+
+/** Represents an IDL module.
+
+    "Name" in methods means all code entities which belong into
+    this namespace (not in a subnamespace of this one), but not
+    to the subnamespaces.
+
+    "SubNamespace" in method names refers to all direct subnamespaces.
+*/
+class Module : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2000 };
+
+        // LIFECYCLE
+                        Module();
+                        Module(
+                            const String &      i_sName,
+                            const Module &      i_rParent );
+                        ~Module();
+    // OPERATIONS
+    void                Add_Name(
+                            const String &      i_sName,
+                            Ce_id               i_nId );
+    // INQUIRY
+    Ce_id               Search_Name(
+                            const String &      i_sName ) const;
+    void                Get_Names(
+                            Dyn_StdConstIterator<Ce_id> &
+                                                o_rResult ) const;
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    friend struct ifc_module::attr;
+
+    // DATA
+    Dyn< NameTreeNode<Ce_id> >
+                            pImpl;
+};
+
+
+inline bool
+is_Module( const CodeEntity & i_rCe )
+{
+    return i_rCe.AryClass() == Module::class_id;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_namelookup.hxx b/autodoc/inc/ary/idl/i_namelookup.hxx
new file mode 100644
index 000000000000..b4066a64ab4f
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_namelookup.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 ARY_IDL_I_NAMELOOKUP_HXX
+#define ARY_IDL_I_NAMELOOKUP_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_types4idl.hxx>
+
+// USED SERVICES
+#include <ary/stdconstiter.hxx>
+#include <ary/itrange.hxx>
+#include <vector>
+#include <map>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** This class finds all occurrences in the current language of a
+    name in the repository.
+*/
+class NameLookup
+{
+  public:
+    struct NameProperties
+    {
+                            NameProperties()
+                                :   nId(0),
+                                    nClass(0),
+                                    nOwner(0) {}
+                            NameProperties(
+                                Ce_id               i_id,
+                                ClassId             i_class,
+                                Ce_id               i_owner )
+                                :   nId(i_id),
+                                    nClass(i_class),
+                                    nOwner(i_owner) {}
+        Ce_id               nId;
+        ClassId             nClass;
+        Ce_id               nOwner;
+    };
+
+    /// Map from Name to NameProperties.
+    typedef std::multimap<String, NameProperties>   Map_Names;
+
+    // LIFECYCLE
+                        NameLookup();
+                        ~NameLookup();
+    // OPERATIONS
+    void                Add_Name(
+                            const String &      i_name,
+                            Ce_id               i_id,
+                            ClassId             i_class,
+                            Ce_id               i_owner );
+  private:
+    // DATA
+    Map_Names           aNames;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_param.hxx b/autodoc/inc/ary/idl/i_param.hxx
new file mode 100644
index 000000000000..f504713a6828
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_param.hxx
@@ -0,0 +1,78 @@
+/* -*- 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 ARY_IDL_I_PARAM_HXX
+#define ARY_IDL_I_PARAM_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_types4idl.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** Represents a parameter in an IDL function.
+*/
+class Parameter
+{
+  public:
+    // LIFECYCLE
+                        Parameter(
+                            const String &      i_sName,
+                            Type_id             i_nType,
+                            E_ParameterDirection
+                                                i_eDirection );
+                        ~Parameter();
+
+    // INQUIRY
+    const String &      Name() const            { return sName; }
+    Type_id             Type() const            { return nType; }
+    E_ParameterDirection
+                        Direction() const       { return eDirection; }
+
+  private:
+    // DATA
+    String              sName;
+    Type_id             nType;
+    E_ParameterDirection
+                        eDirection;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_property.hxx b/autodoc/inc/ary/idl/i_property.hxx
new file mode 100644
index 000000000000..7a8bf026034f
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_property.hxx
@@ -0,0 +1,146 @@
+/* -*- 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 ARY_IDL_I_PROPERTY_HXX
+#define ARY_IDL_I_PROPERTY_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_property
+{
+    struct attr;
+}
+
+
+/** Represents an IDL property.
+*/
+class Property : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2004 };
+
+    class Stereotypes
+    {
+      public:
+        enum E_Flags
+        {
+            readonly = 1,
+            bound = 2,
+            constrained = 4,
+            maybeambiguous = 8,
+            maybedefault = 16,
+            maybevoid = 32,
+            removable = 64,
+            transient = 128,
+            s_MAX
+        };
+                            Stereotypes()       : nFlags(0) {}
+
+        bool                HasAny() const      { return nFlags != 0; }
+        bool                IsReadOnly() const  { return (nFlags & UINT32(readonly)) != 0; }
+        bool                IsBound() const     { return (nFlags & UINT32(bound)) != 0; }
+        bool                IsConstrained() const
+                                                { return (nFlags & UINT32(constrained)) != 0; }
+        bool                IsMayBeAmbiguous() const
+                                                { return (nFlags & UINT32(maybeambiguous)) != 0; }
+        bool                IsMayBeDefault() const
+                                                { return (nFlags & UINT32(maybedefault)) != 0; }
+        bool                IsMayBeVoid() const { return (nFlags & UINT32(maybevoid)) != 0; }
+        bool                IsRemovable() const { return (nFlags & UINT32(removable)) != 0; }
+        bool                IsTransient() const { return (nFlags & UINT32(transient)) != 0; }
+
+        void                Set_Flag(
+                                E_Flags         i_flag )
+                                                { nFlags |= UINT32(i_flag); }
+      private:
+        // DATA
+        UINT32              nFlags;
+    };
+
+
+    // LIFECYCLE
+                        Property(
+                            const String &      i_sName,
+                            Ce_id               i_nService,
+                            Ce_id               i_nModule,
+                            Type_id             i_nType,
+                            Stereotypes         i_stereotypes );
+                        ~Property();
+    // INQUIRY
+    Type_id             Type() const;
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    friend struct ifc_property::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+    Ce_id               nNameRoom;
+
+    Type_id             nType;
+    Stereotypes         aStereotypes;
+};
+
+
+
+
+// IMPLEMENTATION
+inline Type_id
+Property::Type() const
+{
+    return nType;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_service.hxx b/autodoc/inc/ary/idl/i_service.hxx
new file mode 100644
index 000000000000..50d13583f380
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_service.hxx
@@ -0,0 +1,142 @@
+/* -*- 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 ARY_IDL_I_SERVICE_HXX
+#define ARY_IDL_I_SERVICE_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+// USED SERVICES
+#include <ary/idl/i_comrela.hxx>
+#include <ary/stdconstiter.hxx>
+#include <ary/idl/ik_service.hxx>
+
+
+
+
+namespace ary
+{
+namespace info
+{
+    class CodeInformation;
+}
+namespace idl
+{
+namespace ifc_service
+{
+    struct attr;
+}
+
+
+/** Represents an IDL service.
+*/
+class Service : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2003 };     // See reposy.cxx
+
+    // LIFECYCLE
+                        Service(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner );
+                        ~Service();
+
+    // INQUIRY
+    void                Get_SupportedInterfaces(
+                            Dyn_StdConstIterator<CommentedRelation> &
+                                                o_rResult ) const;
+    void                Get_IncludedServices(
+                            Dyn_StdConstIterator<CommentedRelation> &
+                                                o_rResult ) const;
+
+    // ACCESS
+    void                Add_Property(
+                            Ce_id               i_nProperty );
+    void                AddRef_IncludedService(
+                            Type_id             i_nService,
+                            DYN doc::OldIdlDocu *
+                                                pass_dpDocu );
+    void                AddRef_SupportedInterface(
+                            Type_id             i_nInterface,
+                            DYN doc::OldIdlDocu *
+                                                pass_dpDocu );
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Locals
+    typedef std::vector< CommentedRelation >    RelationList;
+    typedef std::vector<Ce_id>                  PropertyList;
+    friend struct ifc_service::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+
+    RelationList        aIncludedServices;
+    RelationList        aSupportedInterfaces;
+    PropertyList        aProperties;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+Service::Add_Property( Ce_id i_nProperty )
+    { aProperties.push_back(i_nProperty); }
+
+inline void
+Service::AddRef_IncludedService( Type_id                    i_nService,
+                                 DYN doc::OldIdlDocu  *     pass_dpDocu )
+    { aIncludedServices.push_back( CommentedRelation(i_nService, pass_dpDocu) ); }
+
+inline void
+Service::AddRef_SupportedInterface( Type_id                 i_nInterface,
+                                    DYN doc::OldIdlDocu *   pass_dpDocu )
+    { aSupportedInterfaces.push_back( CommentedRelation(i_nInterface, pass_dpDocu) ); }
+
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_singleton.hxx b/autodoc/inc/ary/idl/i_singleton.hxx
new file mode 100644
index 000000000000..c264b3efa2f2
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_singleton.hxx
@@ -0,0 +1,108 @@
+/* -*- 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 ARY_IDL_I_SINGLETON_HXX
+#define ARY_IDL_I_SINGLETON_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_singleton
+{
+    struct attr;
+}
+
+
+/** Represents an IDL singleton.
+*/
+class Singleton : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2013 };
+
+    // LIFECYCLE
+                        Singleton(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner );
+                        ~Singleton();
+    // INQUIRY
+    Type_id             AssociatedService() const
+                                                { return nService; }
+
+    // ACCESS
+    void                Set_Service(
+                            Type_id             i_nService );
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Locals
+    friend struct ifc_singleton::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+
+    Type_id             nService;
+};
+
+
+
+
+
+// IMPLEMENTATION
+inline void
+Singleton::Set_Service( Type_id i_nService )
+{
+    nService = i_nService;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_siservice.hxx b/autodoc/inc/ary/idl/i_siservice.hxx
new file mode 100644
index 000000000000..bdfe987d6827
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_siservice.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 ARY_IDL_I_SISERVICE_HXX
+#define ARY_IDL_I_SISERVICE_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_sglifcservice
+{
+    struct attr;
+}
+
+
+/** Represents an IDL single interface service.
+*/
+class SglIfcService : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2015 };     // See reposy.cxx
+
+    // LIFECYCLE
+                        SglIfcService(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Type_id             i_nBaseInterface );
+                        ~SglIfcService();
+    // ACCESS
+    void                Add_Constructor(
+                            Ce_id               i_nId );
+
+    // INFO
+    Type_id             BaseInterface() const   { return nBaseInterface; }
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity:
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Local
+    typedef std::vector<Ce_id>          CtorList;
+    friend struct ifc_sglifcservice::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+    Type_id             nBaseInterface;
+
+    CtorList            aConstructors;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+SglIfcService::Add_Constructor( Ce_id i_nId )
+{
+    aConstructors.push_back(i_nId);
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_sisingleton.hxx b/autodoc/inc/ary/idl/i_sisingleton.hxx
new file mode 100644
index 000000000000..3ddcbede3332
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_sisingleton.hxx
@@ -0,0 +1,103 @@
+/* -*- 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 ARY_IDL_I_SISINGLETON_HXX
+#define ARY_IDL_I_SISINGLETON_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_sglifcsingleton
+{
+    struct attr;
+}
+
+
+/** Represents an IDL interface.
+*/
+class SglIfcSingleton : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2016 };     // See reposy.cxx
+
+    // LIFECYCLE
+                        SglIfcSingleton(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Type_id             i_nBaseInterface );
+                        ~SglIfcSingleton();
+    // INQUIRY
+    Type_id             BaseInterface() const;
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity:
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Local
+    friend struct ifc_sglifcsingleton::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+    Type_id             nBaseInterface;
+};
+
+
+
+
+// IMPLEMENTATION
+inline Type_id
+SglIfcSingleton::BaseInterface() const
+{
+    return nBaseInterface;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_struct.hxx b/autodoc/inc/ary/idl/i_struct.hxx
new file mode 100644
index 000000000000..d118d18ba4f1
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_struct.hxx
@@ -0,0 +1,133 @@
+/* -*- 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 ARY_IDL_I_STRUCT_HXX
+#define ARY_IDL_I_STRUCT_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_struct
+{
+    struct attr;
+}
+
+
+/** Represents an IDL struct.
+*/
+class Struct : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2008 };
+
+    // LIFECYCLE
+                        Struct(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Type_id             i_nBase,
+                            const String &      i_sTemplateParameter,
+                            Type_id             i_nTemplateParameterType );
+                        ~Struct();
+    // INQUIRY
+    Type_id             Base() const;
+    String              TemplateParameter() const;
+    Type_id             TemplateParameterType() const;
+
+    // ACCESS
+    void                Add_Member(
+                            Ce_id               i_nMember );
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    // Locals
+    typedef std::vector<Ce_id>     ElementList;
+    friend struct ifc_struct::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+
+    Type_id             nBase;
+    String              sTemplateParameter;
+    Type_id             nTemplateParameterType;
+    ElementList         aElements;
+};
+
+
+
+
+// IMPLEMENTATION
+inline Type_id
+Struct::Base() const
+{
+    return nBase;
+}
+
+inline String
+Struct::TemplateParameter() const
+{
+    return sTemplateParameter;
+}
+
+inline Type_id
+Struct::TemplateParameterType() const
+{
+    return nTemplateParameterType;
+}
+
+inline void
+Struct::Add_Member( Ce_id i_nMember )
+{
+    aElements.push_back(i_nMember);
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_structelem.hxx b/autodoc/inc/ary/idl/i_structelem.hxx
new file mode 100644
index 000000000000..98e8a1018093
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_structelem.hxx
@@ -0,0 +1,106 @@
+/* -*- 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 ARY_IDL_I_STRUCTELEM_HXX
+#define ARY_IDL_I_STRUCTELEM_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_structelement
+{
+    struct attr;
+}
+
+
+/** Represents an IDL struct element.
+*/
+class StructElement : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2009 };
+
+    // LIFECYCLE
+                        StructElement(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Ce_id               i_nNameRoom,
+                            Type_id             i_nType );
+                        ~StructElement();
+
+    // INQUIRY
+    Type_id             Type() const;
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    friend struct ifc_structelement::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+    Ce_id               nNameRoom;
+
+    Type_id             nType;
+};
+
+
+
+
+// IMPLEMENTATION
+inline Type_id
+StructElement::Type() const
+{
+    return nType;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_traits.hxx b/autodoc/inc/ary/idl/i_traits.hxx
new file mode 100644
index 000000000000..b8077ce5194e
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_traits.hxx
@@ -0,0 +1,81 @@
+/* -*- 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 ARY_IDL_I_TRAITS_HXX
+#define ARY_IDL_I_TRAITS_HXX
+
+// USED SERVICES
+#include <ary/idl/i_types4idl.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** Basic traits for derivd ones of ->CodeEntity.
+*/
+struct Ce_Traits
+{
+    typedef CodeEntity          entity_base_type;
+    typedef Ce_id               id_type;
+
+    static entity_base_type &
+                        EntityOf_(
+                            id_type             i_id );
+};
+
+
+/** An instance of COMPARE for ->::ary::SortedIds<>.
+
+    @see ::ary::SortedIds<>
+*/
+struct Ce_Compare : public Ce_Traits
+{
+    typedef  String             key_type;
+
+    static const key_type &
+                        KeyOf_(
+                            const entity_base_type &
+                                                i_entity );
+    static bool         Lesser_(
+                            const key_type &    i_1,
+                            const key_type &    i_2 );
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_type.hxx b/autodoc/inc/ary/idl/i_type.hxx
new file mode 100644
index 000000000000..88e063c3d919
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_type.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 ARY_IDL_I_TYPE_HXX
+#define ARY_IDL_I_TYPE_HXX
+
+// USED SERVICES
+#include <ary/entity.hxx>
+#include <ary/idl/i_types4idl.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+    class Gate;
+
+
+/** Abstract base for all secondary productions of types
+*/
+class Type_2s
+{
+  public:
+    virtual             ~Type_2s() {}
+
+    static DYN Type_2s *
+                        Create_(
+                            ClassId             i_nCeId );
+};
+
+
+/** Base of all IDL types.
+
+    Type represents the occurrence of a type as base,
+    parameter, return type or element type in UNO IDL code.
+    Some of them relate to a ->CodeEntity, but
+    the ->Type "MyInterface" is something different than
+    the ->CodeEntity "MyInterface".
+
+    This is a storage base class, where more special
+    classes are derived from.
+*/
+class Type : public ary::Entity
+{
+  public:
+    typedef Type_2s secondary_productions;
+
+    // LIFECYCLE
+    virtual             ~Type() {}
+
+    // INQUIRY
+    Type_id             TypeId() const          { return Type_id(Id()); }
+
+    /** Does NOT clear the output-parameters.
+
+        @attention
+        If this is a sequence, the text of the first non-sequence, enclosed type
+        is returned.
+    */
+    void                Get_Text(
+                            StringVector &      o_module,
+                            String &            o_name,
+                            Ce_id &             o_nRelatedCe,
+                            int &               o_nSequenceCount,
+                            const Gate &        i_rGate ) const;
+    const std::vector<Type_id> *
+                        TemplateParameters() const;
+    const Type &        FirstEnclosedNonSequenceType(   /// @return *this, if this is not a ->Sequence.
+                            const Gate &        i_rGate ) const;
+
+  private:
+    virtual void        inq_Get_Text(
+                            StringVector &      o_module,
+                            String &            o_name,
+                            Ce_id &             o_nRelatedCe,
+                            int &               o_nSequemceCount,
+                            const Gate &        i_rGate ) const = 0;
+    virtual const std::vector<Type_id> *
+                        inq_TemplateParameters() const;
+    virtual const Type &
+                        inq_FirstEnclosedNonSequenceType(
+                            const Gate &        i_rGate ) const;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+Type::Get_Text( StringVector &      o_module,
+                String &            o_name,
+                Ce_id &             o_nRelatedCe,
+                int &               o_nSequenceCount,
+                const Gate &        i_rGate ) const
+{
+    inq_Get_Text(o_module,o_name,o_nRelatedCe,o_nSequenceCount,i_rGate);
+}
+
+inline const std::vector<Type_id> *
+Type::TemplateParameters() const
+{
+    return inq_TemplateParameters();
+}
+
+inline const Type &
+Type::FirstEnclosedNonSequenceType(const Gate & i_rGate) const
+{
+    return inq_FirstEnclosedNonSequenceType(i_rGate);
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_typedef.hxx b/autodoc/inc/ary/idl/i_typedef.hxx
new file mode 100644
index 000000000000..228e097ca136
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_typedef.hxx
@@ -0,0 +1,93 @@
+/* -*- 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 ARY_IDL_I_TYPEDEF_HXX
+#define ARY_IDL_I_TYPEDEF_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+namespace ifc_typedef
+{
+    struct attr;
+}
+
+
+/** Represents an IDL typedef.
+*/
+class Typedef : public CodeEntity
+{
+  public:
+    enum E_ClassId { class_id = 2007 };
+
+    // LIFECYCLE
+                        Typedef(
+                            const String &      i_sName,
+                            Ce_id               i_nOwner,
+                            Type_id             i_nDefiningType );
+                        ~Typedef();
+
+    Type_id             DefiningType() const    { return nDefiningType; }
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface CodeEntity
+    virtual const String &  inq_LocalName() const;
+    virtual Ce_id           inq_NameRoom() const;
+    virtual Ce_id           inq_Owner() const;
+    virtual E_SightLevel    inq_SightLevel() const;
+
+    friend struct ifc_typedef::attr;
+
+    // DATA
+    String              sName;
+    Ce_id               nOwner;
+
+    Type_id             nDefiningType;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/i_types4idl.hxx b/autodoc/inc/ary/idl/i_types4idl.hxx
new file mode 100644
index 000000000000..f4b3d5224902
--- /dev/null
+++ b/autodoc/inc/ary/idl/i_types4idl.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 ARY_IDL_I_TYPES4IDL_HXX
+#define ARY_IDL_I_TYPES4IDL_HXX
+
+// USED SERVICES
+#include <ary/types.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+    class Module;
+    class CodeEntity;
+    class Type;
+    class Gate;
+    class CePilot;
+    class TypePilot;
+
+
+typedef TypedId<CodeEntity>         Ce_id;
+typedef TypedId<Type>               Type_id;
+
+
+/** This is used when an ->ary::idl::ExplicitType
+    represents a templated struct and is sorted into the
+    dictionary of an ->ary::idl::XNameRoom.
+    Then local type name and template type id are concatenated
+    to one string with this char as delimiter.
+*/
+const char C_cTemplateDelimiter = '<';
+
+typedef std::vector<Ce_id>          Ce_idList;
+
+
+enum E_ParameterDirection
+{
+    param_in,
+    param_out,
+    param_inout
+};
+
+
+enum E_SightLevel
+{
+    sl_Module,          // not file bound entities, like modules
+    sl_File,            // entities on top level within one file, like interface or enum
+    sl_Member           // member entities, like enumvalue or function
+};
+
+inline Ce_id
+Ce_id_Null()
+{
+    return Ce_id(0);
+}
+
+inline void
+NullPush_IdList(Ce_idList * o_pList)
+{
+    if (o_pList)
+        o_pList->push_back( Ce_id_Null() );
+}
+
+inline void
+NullPush_IdList_2(Ce_idList * o_pList)
+{
+    if (o_pList)
+    {
+        o_pList->push_back( Ce_id_Null() );
+        o_pList->push_back( Ce_id_Null() );
+    }
+}
+
+namespace alphabetical_index
+{
+    enum E_Letter
+    {
+        a = int('a'),
+        b,
+        c,
+        d,
+        e,
+        f,
+        g,
+        h,
+        i,
+        j,
+        k,
+        l,
+        m,
+        n,
+        o,
+        p,
+        q,
+        r,
+        s,
+        t,
+        u,
+        v,
+        w,
+        x,
+        y,
+        z,
+        non_alpha = int('_'),
+        MAX
+    };
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ik_attribute.hxx b/autodoc/inc/ary/idl/ik_attribute.hxx
new file mode 100644
index 000000000000..d0e96c9131d5
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_attribute.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 ARY_IDL_IK_ATTRIBUTE_HXX
+#define ARY_IDL_IK_ATTRIBUTE_HXX
+//  KORR_DEPRECATED_3.0
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_attribute
+{
+
+using ifc_ce::DocText;
+using ::ary::idl::ifc_ce::Dyn_TypeIterator;
+
+
+struct attr: public ifc_ce::attr
+{
+    static bool         HasAnyStereotype(
+                            const CodeEntity &  i_ce );
+    static bool         IsReadOnly(
+                            const CodeEntity &  i_ce );
+    static bool         IsBound(
+                            const CodeEntity &  i_ce );
+    static Type_id      Type(
+                            const CodeEntity &  i_ce );
+    static void         Get_GetExceptions(
+                            Dyn_TypeIterator &  o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_SetExceptions(
+                            Dyn_TypeIterator &  o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+
+}   // namespace ifc_attribute
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ik_ce.hxx b/autodoc/inc/ary/idl/ik_ce.hxx
new file mode 100644
index 000000000000..7a82402fc9f0
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_ce.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 ARY_IDL_IK_CE_HXX
+#define ARY_IDL_IK_CE_HXX
+//  KORR_DEPRECATED_3.0
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_types4idl.hxx>
+#include <ary/stdconstiter.hxx>
+
+namespace ary
+{
+namespace info
+{
+     class Text;
+}
+namespace idl
+{
+
+
+namespace ifc_ce
+{
+
+
+typedef ::ary::Dyn_StdConstIterator<Ce_id>      Dyn_CeIterator;
+typedef ::ary::Dyn_StdConstIterator<Type_id>    Dyn_TypeIterator;
+typedef ::ary::info::Text                       DocText;
+
+
+
+struct attr
+{
+    static Ce_id        CeId(
+                            const CodeEntity &  i_ce );
+    static const String &
+                        LocalName(
+                            const CodeEntity &  i_ce );
+    static Ce_id        NameRoom(
+                            const CodeEntity &  i_ce );
+    static Rid          Owner(
+                            const CodeEntity &  i_ce );
+    static E_SightLevel SightLevel(
+                            const CodeEntity &  i_ce );
+    static bool         Search_Member(
+                            const CodeEntity &  ,
+                            const String &      )
+                            { return true; }    // KORR_FUTURE
+};
+
+struct xref
+{
+};
+
+struct doc
+{
+    static const DocText &
+                        ShortInfo(          /// @return a short description of the CodeEntity
+                            const CodeEntity &  i_ce );
+
+    static const DocText &
+                        TagAuthor(
+                            const CodeEntity &  i_ce );
+    static const DocText &
+                        TagExample(
+                            const CodeEntity &  i_ce );
+    static const DocText &
+                        TagDescr(
+                            const CodeEntity &  i_ce );
+    static const DocText &
+                        TagGuarantees(
+                            const CodeEntity &  i_ce );
+    static const DocText &
+                        TagKey(
+                            const CodeEntity &  i_ce );
+    static const DocText &
+                        TagMissing(
+                            const CodeEntity &  i_ce );
+    static const DocText &
+                        TagSee(
+                            const CodeEntity &  i_ce );
+    static const DocText &
+                        TagShort(
+                            const CodeEntity &  i_ce );
+    static const DocText &
+                        TagVersion(
+                            const CodeEntity &  i_ce );
+
+    void                Get_UnkownTags(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+
+    bool                IsDeprecated(
+                            const CodeEntity &  i_ce );
+    bool                IsIncomplete(
+                            const CodeEntity &  i_ce );
+    bool                IsInternal(
+                            const CodeEntity &  i_ce );
+    bool                IsNodoc(
+                            const CodeEntity &  i_ce );
+    bool                IsOptional(
+                            const CodeEntity &  i_ce );
+    bool                IsSuspicious(
+                            const CodeEntity &  i_ce );
+
+};
+
+
+}   // namespace ifc_ce
+
+
+}   // namspace idl
+}   // namspace ary
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ik_constant.hxx b/autodoc/inc/ary/idl/ik_constant.hxx
new file mode 100644
index 000000000000..a19bfc0af2d5
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_constant.hxx
@@ -0,0 +1,78 @@
+/* -*- 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 ARY_IDL_IK_CONSTANT_HXX
+#define ARY_IDL_IK_CONSTANT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_constant
+{
+
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static Type_id      Type(
+                            const CodeEntity &  i_ce );
+    static const String &
+                        Value(
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+
+}   // namespace ifc_constant
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ik_constgroup.hxx b/autodoc/inc/ary/idl/ik_constgroup.hxx
new file mode 100644
index 000000000000..460386d5734c
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_constgroup.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 ARY_IDL_IK_CONSTGROUP_HXX
+#define ARY_IDL_IK_CONSTGROUP_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_constgroup
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static void         Get_Constants(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+}   // namespace ifc_constgroup
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ik_enum.hxx b/autodoc/inc/ary/idl/ik_enum.hxx
new file mode 100644
index 000000000000..2523b9a8a805
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_enum.hxx
@@ -0,0 +1,87 @@
+/* -*- 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 ARY_IDL_IK_ENUM_HXX
+#define ARY_IDL_IK_ENUM_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_enum
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static void         Get_Values(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+    static void         Get_SynonymTypedefs(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsReturns(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsParameters(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsDataTypes(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+}   // namespace ifc_enum
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ik_enumvalue.hxx b/autodoc/inc/ary/idl/ik_enumvalue.hxx
new file mode 100644
index 000000000000..26f7557a92f8
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_enumvalue.hxx
@@ -0,0 +1,76 @@
+/* -*- 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 ARY_IDL_IK_ENUMVALUE_HXX
+#define ARY_IDL_IK_ENUMVALUE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_enumvalue
+{
+
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static const String &
+                        Value(
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+
+}   // namespace ifc_enumvalue
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ik_exception.hxx b/autodoc/inc/ary/idl/ik_exception.hxx
new file mode 100644
index 000000000000..ab1f19540898
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_exception.hxx
@@ -0,0 +1,84 @@
+/* -*- 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 ARY_IDL_IK_EXCEPTION_HXX
+#define ARY_IDL_IK_EXCEPTION_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_exception
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static Type_id      Base(
+                            const CodeEntity &  i_ce );
+    static void         Get_Elements(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+    static void         Get_Derivations(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_RaisingFunctions(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+}   // namespace ifc_exception
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ik_function.hxx b/autodoc/inc/ary/idl/ik_function.hxx
new file mode 100644
index 000000000000..fb57bd036ed0
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_function.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 ARY_IDL_IK_SERVICE_HXX
+#define ARY_IDL_IK_SERVICE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/i_param.hxx>
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+
+namespace ifc_function
+{
+
+using ::ary::idl::ifc_ce::Dyn_CeIterator;
+using ::ary::idl::ifc_ce::Dyn_TypeIterator;
+using ::ary::idl::ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static Type_id      ReturnType(
+                            const CodeEntity &  i_ce );
+    static bool         IsOneway(
+                            const CodeEntity &  i_ce );
+    static bool         HasEllipse(
+                            const CodeEntity &  i_ce );
+    static void         Get_Parameters(
+                            Dyn_StdConstIterator<ary::idl::Parameter> &
+                                                o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Exceptions(
+                            Dyn_TypeIterator &  o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+//  aStateMachine.AddToken( "@param",   nTok_at_param,       A_nAtTagDefStatus, finAtTag );
+//  aStateMachine.AddToken( "@throws",  nTok_at_throws,      A_nAtTagDefStatus, finAtTag );
+//  aStateMachine.AddToken( "@exception",
+//  aStateMachine.AddToken( "@return",  nTok_at_return,      A_nAtTagDefStatus, finAtTag );
+//  aStateMachine.AddToken( "@returns", nTok_at_return,      A_nAtTagDefStatus, finAtTag );
+};
+
+
+}   // namespace ifc_function
+
+
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ik_interface.hxx b/autodoc/inc/ary/idl/ik_interface.hxx
new file mode 100644
index 000000000000..9ef89066dea6
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_interface.hxx
@@ -0,0 +1,103 @@
+/* -*- 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 ARY_IDL_IK_INTERFACE_HXX
+#define ARY_IDL_IK_INTERFACE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+class CommentedRelation;
+
+namespace ifc_interface
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static void         Get_Bases(
+                            Dyn_StdConstIterator<CommentedRelation> &
+                                                o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Functions(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Attributes(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+    static void         Get_Derivations(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_SynonymTypedefs(     /// like: typedef i_ce.LocalName() newName;
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_ExportingServices(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_ExportingSingletons(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsReturns(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsParameters(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsDataTypes(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+}   // namespace ifc_interface
+
+}   // namespace idl
+}   // namespace ary
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ik_module.hxx b/autodoc/inc/ary/idl/ik_module.hxx
new file mode 100644
index 000000000000..6b64582fbf01
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_module.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 ARY_IDL_IK_MODULE_HXX
+#define ARY_IDL_IK_MODULE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+class CePilot;
+
+namespace ifc_module
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr : public ifc_ce::attr
+{
+    // KORR_FUTURE
+    //   This has to be changed that way, that the differencing takes place
+    //   within hfi_module.cxx and not here.
+    //   So the class CePilot is not needed here, etc.
+    //   Too much scope pollution.
+    static void         Get_AllChildrenSeparated(
+                            std::vector< const CodeEntity* > & o_nestedModules,
+                            std::vector< const CodeEntity* > & o_services,
+                            std::vector< const CodeEntity* > & o_interfaces,
+                            std::vector< const CodeEntity* > & o_structs,
+                            std::vector< const CodeEntity* > & o_exceptions,
+                            std::vector< const CodeEntity* > & o_enums,
+                            std::vector< const CodeEntity* > & o_typedefs,
+                            std::vector< const CodeEntity* > & o_constantGroups,
+                            std::vector< const CodeEntity* > & o_singletons,
+                            const CePilot &     i_pilot,
+                            const CodeEntity &  i_ce );
+
+    static void         Get_SubModules(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Services(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Interfaces(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Structs(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Exceptions(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Enums(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Typedefs(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_ConstantsGroups(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+}   // namespace ifc_module
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ik_property.hxx b/autodoc/inc/ary/idl/ik_property.hxx
new file mode 100644
index 000000000000..ece8489454e1
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_property.hxx
@@ -0,0 +1,92 @@
+/* -*- 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 ARY_IDL_IK_PROPERTY_HXX
+#define ARY_IDL_IK_PROPERTY_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_property
+{
+
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static bool         HasAnyStereotype(
+                            const CodeEntity &  i_ce );
+    static bool         IsReadOnly(
+                            const CodeEntity &  i_ce );
+    static bool         IsBound(
+                            const CodeEntity &  i_ce );
+    static bool         IsConstrained(
+                            const CodeEntity &  i_ce );
+    static bool         IsMayBeAmbiguous(
+                            const CodeEntity &  i_ce );
+    static bool         IsMayBeDefault(
+                            const CodeEntity &  i_ce );
+    static bool         IsMayBeVoid(
+                            const CodeEntity &  i_ce );
+    static bool         IsRemovable(
+                            const CodeEntity &  i_ce );
+    static bool         IsTransient(
+                            const CodeEntity &  i_ce );
+    static Type_id      Type(
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+
+}   // namespace ifc_property
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ik_service.hxx b/autodoc/inc/ary/idl/ik_service.hxx
new file mode 100644
index 000000000000..552f32bd3bcf
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_service.hxx
@@ -0,0 +1,91 @@
+/* -*- 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 ARY_IDL_IK_SERVICE_HXX
+#define ARY_IDL_IK_SERVICE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_service
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static void         Get_IncludedServices(
+                            Dyn_StdConstIterator<CommentedRelation> &
+                                                o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_ExportedInterfaces(
+                            Dyn_StdConstIterator<CommentedRelation> &
+                                                o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_Properties(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+    static void         Get_IncludingServices(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_InstantiatingSingletons(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+
+}   // namespace ifc_service
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ik_singleton.hxx b/autodoc/inc/ary/idl/ik_singleton.hxx
new file mode 100644
index 000000000000..9c8186a97e70
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_singleton.hxx
@@ -0,0 +1,76 @@
+/* -*- 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 ARY_IDL_IK_SINGLETON_HXX
+#define ARY_IDL_IK_SINGLETON_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_singleton
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static Type_id      AssociatedService(
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+
+}   // namespace ifc_singleton
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ik_siservice.hxx b/autodoc/inc/ary/idl/ik_siservice.hxx
new file mode 100644
index 000000000000..3534fef5d9ea
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_siservice.hxx
@@ -0,0 +1,78 @@
+/* -*- 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 ARY_IDL_IK_SISERVICE_HXX
+#define ARY_IDL_IK_SISERVICE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_sglifcservice
+{
+
+using ifc_ce::Dyn_CeIterator;
+
+
+struct attr: public ifc_ce::attr
+{
+    static Type_id      BaseInterface(
+                            const CodeEntity &  i_ce );
+    static void         Get_Constructors(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+
+}   // namespace ifc_sglifcservice
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ik_sisingleton.hxx b/autodoc/inc/ary/idl/ik_sisingleton.hxx
new file mode 100644
index 000000000000..46f033351120
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_sisingleton.hxx
@@ -0,0 +1,76 @@
+/* -*- 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 ARY_IDL_IK_SISINGLETON_HXX
+#define ARY_IDL_IK_SISINGLETON_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_sglifcsingleton
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static Type_id      BaseInterface(
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+
+}   // namespace ifc_sglifcsingleton
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ik_struct.hxx b/autodoc/inc/ary/idl/ik_struct.hxx
new file mode 100644
index 000000000000..79d7c1f39dd2
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_struct.hxx
@@ -0,0 +1,93 @@
+/* -*- 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 ARY_IDL_IK_STRUCT_HXX
+#define ARY_IDL_IK_STRUCT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_struct
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static Type_id      Base(
+                            const CodeEntity &  i_ce );
+    static void         Get_Elements(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+    static void         Get_Derivations(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_SynonymTypedefs(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsReturns(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsParameters(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsDataTypes(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+}   // namespace ifc_struct
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ik_structelem.hxx b/autodoc/inc/ary/idl/ik_structelem.hxx
new file mode 100644
index 000000000000..235008fc7446
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_structelem.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 ARY_IDL_IK_STRUCTELEM_HXX
+#define ARY_IDL_IK_STRUCTELEM_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_structelement
+{
+
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static Type_id      Type(
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+
+}   // namespace ifc_structelement
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ik_typedef.hxx b/autodoc/inc/ary/idl/ik_typedef.hxx
new file mode 100644
index 000000000000..856928223034
--- /dev/null
+++ b/autodoc/inc/ary/idl/ik_typedef.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 ARY_IDL_IK_TYPEDEF_HXX
+#define ARY_IDL_IK_TYPEDEF_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ik_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+namespace idl
+{
+
+namespace ifc_typedef
+{
+
+using ifc_ce::Dyn_CeIterator;
+using ifc_ce::DocText;
+
+
+struct attr: public ifc_ce::attr
+{
+    static Type_id      DefiningType(
+                            const CodeEntity &  i_ce );
+};
+
+struct xref : public ifc_ce::xref
+{
+    static void         Get_SynonymTypedefs(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsReturns(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsParameters(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_AsDataTypes(
+                            Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce );
+};
+
+struct doc : public ifc_ce::doc
+{
+};
+
+}   // namespace ifc_typedef
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ip_ce.hxx b/autodoc/inc/ary/idl/ip_ce.hxx
new file mode 100644
index 000000000000..a1d4990c4cb5
--- /dev/null
+++ b/autodoc/inc/ary/idl/ip_ce.hxx
@@ -0,0 +1,213 @@
+/* -*- 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 ARY_IDL_IP_CE_HXX
+#define ARY_IDL_IP_CE_HXX
+
+// USED SERVICES
+#include <ary/idl/i_types4idl.hxx>
+#include <ary/idl/i_property.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+    class Module;
+
+    class ConstantsGroup;
+    class Enum;
+    class Exception;
+    class Interface;
+    class Service;
+    class SglIfcService;
+    class Singleton;
+    class SglIfcSingleton;
+    class Struct;
+    class Typedef;
+
+    class Attribute;
+    class Constant;
+    class EnumValue;
+    class Function;
+    class Property;
+    class StructElement;
+    class Variable;
+
+    class NameLookup;
+
+
+/** Provides the access logic for all code entities.
+*/
+class CePilot
+{
+  public:
+    // LIFECYCLE
+    virtual             ~CePilot() {}
+
+    // OPERATIONS
+    virtual Module &    CheckIn_Module(
+                            Ce_id               i_nParentId,
+                            const String &      i_sName ) = 0;
+    virtual Service &   Store_Service(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName ) = 0;
+    virtual SglIfcService &
+                        Store_SglIfcService(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBaseInterface ) = 0;
+    virtual Interface & Store_Interface(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBase ) = 0;
+    virtual Struct &    Store_Struct(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBase,
+                            const String &      i_sTemplateParam = String::Null_() ) = 0;
+    virtual Exception & Store_Exception(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBase ) = 0;
+    virtual Enum &      Store_Enum(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName ) = 0;
+    virtual Typedef &   Store_Typedef(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nDefiningType ) = 0;
+    virtual ConstantsGroup &
+                        Store_ConstantsGroup(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName ) = 0;
+    virtual Singleton & Store_Singleton(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName ) = 0;
+    virtual SglIfcSingleton &
+                        Store_SglIfcSingleton(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBaseInterface ) = 0;
+
+    virtual Constant &  Store_Constant(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType,
+                            const String &      i_sValue ) = 0;
+    virtual Property &  Store_Property(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType,
+                            Property::Stereotypes
+                                                i_stereotypes ) = 0;
+    virtual Function &  Store_Function(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nReturnType,
+                            bool                i_bOneWay ) = 0;
+    virtual Function &  Store_ServiceConstructor(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName ) = 0;
+    virtual StructElement &
+                        Store_StructMember(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType ) = 0;
+    virtual StructElement &
+                        Store_ExceptionMember(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType ) = 0;
+    virtual EnumValue & Store_EnumValue(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            const String &      i_sValue ) = 0;
+    virtual Attribute & Store_Attribute(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType,
+                            bool                i_bReadOnly,
+                            bool                i_bBound ) = 0;
+    // INQUIRY
+    virtual const Module &
+                        GlobalNamespace() const = 0;
+    virtual const CodeEntity &
+                        Find_Ce(
+                            Ce_id               i_nId ) const = 0;
+
+    virtual const Module &
+                        Find_Module(
+                            Ce_id               i_nId ) const = 0;
+    virtual const Module *
+                        Search_Module(
+                            Ce_id               i_nId ) const = 0;
+    virtual const Function &
+                        Find_Function(
+                            Ce_id               i_nId ) const = 0;
+    virtual const Property &
+                        Find_Property(
+                            Ce_id               i_nId ) const = 0;
+    virtual const EnumValue &
+                        Find_EnumValue(
+                            Ce_id               i_nId ) const = 0;
+    virtual const Constant &
+                        Find_Constant(
+                            Ce_id               i_nId ) const = 0;
+    virtual const StructElement &
+                        Find_StructElement(
+                            Ce_id               i_nId ) const = 0;
+    virtual void        Get_Text(
+                            StringVector &      o_module,
+                            String &            o_ce,
+                            String &            o_member,
+                            const CodeEntity &  i_ce ) const = 0;
+    virtual const NameLookup &
+                        NameDictionary() const = 0;
+    virtual void        Get_AlphabeticalIndex(
+                            std::vector<Ce_id> &
+                                                o_rResult,
+                            alphabetical_index::E_Letter
+                                                i_cLetter) const = 0;
+    // ACCESS
+    virtual Module &    GlobalNamespace() = 0;
+    virtual CodeEntity &
+                        Find_Ce(
+                            Ce_id               i_nId ) = 0;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/idl/ip_type.hxx b/autodoc/inc/ary/idl/ip_type.hxx
new file mode 100644
index 000000000000..a4f070b78c81
--- /dev/null
+++ b/autodoc/inc/ary/idl/ip_type.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 ARY_IDL_IP_TYPE_HXX
+#define ARY_IDL_IP_TYPE_HXX
+
+// USED SERVICES
+#include <ary/idl/i_types4idl.hxx>
+
+
+
+
+namespace ary
+{
+    class QualifiedName;
+
+namespace idl
+{
+    class Type;
+    class ExplicitNameRoom;
+
+
+/** Access point to all {->Type}s in IDL.
+*/
+class TypePilot
+{
+  public:
+    // LIFECYCLE
+    virtual             ~TypePilot() {}
+
+    // OPERATIONS
+    virtual const Type &
+                        CheckIn_Type(
+                            QualifiedName &     i_rFullName,
+                            uintt               i_nSequenceCount,
+                            Ce_id               i_nModuleOfOccurrence,
+                            const std::vector<Type_id> *
+                                                i_templateParameters ) = 0;
+    // INQUIRY
+    virtual const Type &
+                        Find_Type(
+                            Type_id             i_nType ) const = 0;
+    virtual String      Search_LocalNameOf(
+                            Type_id             i_nType ) const = 0;
+    virtual Ce_id       Search_CeRelatedTo(
+                            Type_id             i_nType ) const = 0;
+    virtual const ExplicitNameRoom &
+                        Find_XNameRoom(
+                            Type_id             i_nType ) const = 0;
+    virtual bool        IsBuiltInOrRelated(
+                            const Type &        i_rType ) const = 0;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/info/all_dts.hxx b/autodoc/inc/ary/info/all_dts.hxx
new file mode 100644
index 000000000000..2508248f860f
--- /dev/null
+++ b/autodoc/inc/ary/info/all_dts.hxx
@@ -0,0 +1,162 @@
+/* -*- 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 ARY_INFO_ALL_DTS_HXX
+#define ARY_INFO_ALL_DTS_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace info
+{
+
+class DocuDisplay;
+
+class DocuToken
+{
+  public:
+    virtual             ~DocuToken() {}
+
+    void                StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    bool                IsWhite() const;
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const = 0;
+    virtual bool        inq_IsWhite() const = 0;
+};
+
+class DT_Text : public DocuToken
+{
+  public:
+                        DT_Text(
+                            const char *        i_sText )
+                                                :   sText( i_sText ) {}
+
+    const String  &     Text() const            { return sText; }
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual bool        inq_IsWhite() const;
+
+    String              sText;
+};
+
+class DT_MaybeLink : public DocuToken
+{
+  public:
+                        DT_MaybeLink(
+                            const char *        i_sText,
+                            bool                i_bIsGlobal,
+                            bool                i_bIsFunction  )
+                                                :   sText( i_sText ),
+                                                    bIsGlobal(i_bIsGlobal),
+                                                    bIsFunction(i_bIsFunction) { }
+
+    const String  &     Text() const            { return sText; }
+    bool                IsAbsolute() const      { return bIsGlobal; }
+    bool                IsFunction() const      { return bIsFunction; }
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual bool        inq_IsWhite() const;
+
+    String              sText;
+    bool                bIsGlobal;
+    bool                bIsFunction;
+};
+
+class DT_Whitespace : public DocuToken
+{
+  public:
+                        DT_Whitespace(
+                            UINT8               i_nLength )
+                                                :   nLength( i_nLength ) {}
+    UINT8               Length() const          { return nLength; }
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual bool        inq_IsWhite() const;
+
+    UINT8               nLength;
+};
+
+
+class DT_Eol : public DocuToken
+{
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual bool        inq_IsWhite() const;
+};
+
+class DT_Xml : public DocuToken
+{
+  public:
+                        DT_Xml(
+                            const char *        i_sText )
+                                                :   sText( i_sText ) {}
+
+    const String  &     Text() const            { return sText; }
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual bool        inq_IsWhite() const;
+
+    String              sText;
+};
+
+
+// IMPLEMENTATION
+
+inline void
+DocuToken::StoreAt( DocuDisplay & o_rDisplay ) const
+    { do_StoreAt(o_rDisplay); }
+inline bool
+DocuToken::IsWhite() const
+    { return inq_IsWhite(); }
+
+
+
+}
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/info/all_tags.hxx b/autodoc/inc/ary/info/all_tags.hxx
new file mode 100644
index 000000000000..79bb4de3bc1e
--- /dev/null
+++ b/autodoc/inc/ary/info/all_tags.hxx
@@ -0,0 +1,291 @@
+/* -*- 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 ARY_INFO_ALL_TAGS_HXX
+#define ARY_INFO_ALL_TAGS_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/info/ci_attag.hxx>
+    // COMPONENTS
+#include <ary/info/inftypes.hxx>
+#include <ary/info/ci_text.hxx>
+#include <ary/qualiname.hxx>
+    // PARAMETERS
+
+
+
+namespace ary
+{
+namespace info
+{
+
+
+class StdTag : public AtTag
+{
+  public:
+                        StdTag(
+                            E_AtTagId       i_eId );
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+    void                ChangeId2(
+                            E_AtTagId           i_eId )
+                                                { eId = i_eId; }
+
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual AtTag *     GetFollower();
+
+    E_AtTagId           Std_Id() const          { return eId; }
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual DocuText *  Text();
+
+    E_AtTagId           eId;
+    DocuText            aText;
+    StdTag *            pNext;
+};
+
+class BaseTag : public AtTag
+{
+  public:
+                        BaseTag();
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+    virtual const char *
+                        Title() const;
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual AtTag *     GetFollower();
+
+  private:
+    virtual DocuText *  Text();
+
+    QualifiedName       sBase;
+    DocuText            aText;
+    AtTag *             pNext;
+};
+
+class ExceptionTag : public AtTag
+{
+  public:
+                        ExceptionTag();
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+    virtual const char *
+                        Title() const;
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual AtTag *     GetFollower();
+
+  private:
+    virtual DocuText *  Text();
+
+    QualifiedName       sException;
+    DocuText            aText;
+    AtTag *             pNext;
+};
+
+class ImplementsTag : public AtTag
+{
+  public:
+                        ImplementsTag();
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+    virtual const char *
+                        Title() const;
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual AtTag *     GetFollower();
+
+  private:
+    virtual DocuText *  Text();
+
+    QualifiedName   sName;
+    AtTag *         pNext;
+};
+
+class KeywordTag : public AtTag
+{
+  public:
+                        KeywordTag();
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+    virtual const char *
+                        Title() const;
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual AtTag *     GetFollower();
+
+  private:
+    virtual DocuText *  Text();
+
+    StringVector        sKeys;
+};
+
+class ParameterTag : public AtTag
+{
+  public:
+                        ParameterTag();
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+
+    const String  &     ParamName() const       { return sName; }
+    const DocuText &    CText() const           { return aText; }
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual const ParameterTag *
+                        GetNext() const         { return dynamic_cast< ParameterTag* >(pNext); }
+    virtual AtTag *     GetFollower();
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual DocuText *  Text();
+
+    String              sName;
+    String              sValidRange;
+    DocuText            aText;
+    AtTag *             pNext;
+};
+
+class SeeTag : public AtTag
+{
+  public:
+                        SeeTag();
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+    virtual const char *
+                        Title() const;
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual AtTag *     GetFollower();
+
+    const std::vector< QualifiedName > &
+                        References() const      { return sReferences; }
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual DocuText *  Text();
+
+    std::vector< QualifiedName >
+                        sReferences;
+};
+
+class TemplateTag : public AtTag
+{
+  public:
+                        TemplateTag();
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+    const DocuText &    CText() const           { return aText; }
+    virtual const char *
+                        Title() const;
+    const String  &     TplParamName() const    { return sName; }
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual const TemplateTag *
+                        GetNext() const         { return dynamic_cast< TemplateTag* >(pNext); }
+    virtual AtTag *     GetFollower();
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual DocuText *  Text();
+
+    String              sName;
+    DocuText            aText;
+    AtTag *             pNext;
+};
+
+class LabelTag : public AtTag
+{
+  public:
+                        LabelTag();
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+    virtual const char *
+                        Title() const;
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual AtTag *     GetFollower();
+
+  private:
+    virtual DocuText *  Text();
+
+    String              sLabel;
+};
+
+class SinceTag : public AtTag
+{
+  public:
+                        SinceTag();
+
+    virtual bool        Add_SpecialMeaningToken(
+                            const char *        i_sText,
+                            intt                i_nNr );
+    virtual const char *
+                        Title() const;
+    virtual UINT8       NrOfSpecialMeaningTokens() const;
+    virtual AtTag *     GetFollower();
+
+    const String &      Version() const         { return sVersion; }
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    virtual DocuText *  Text();
+
+    // Data
+    String              sVersion;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/info/ci_attag.hxx b/autodoc/inc/ary/info/ci_attag.hxx
new file mode 100644
index 000000000000..720e6014bce5
--- /dev/null
+++ b/autodoc/inc/ary/info/ci_attag.hxx
@@ -0,0 +1,103 @@
+/* -*- 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 ARY_INFO_CI_ATTAG_HXX
+#define ARY_INFO_CI_ATTAG_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+
+namespace ary
+{
+namespace info
+{
+
+class DocuText;
+class DocuDisplay;
+
+class AtTag
+{
+  public:
+    virtual             ~AtTag() {}
+
+    void                Set_HtmlUseInDocuText(
+                            bool                i_bUseIt );
+    virtual bool        Add_SpecialMeaningToken(    /// @return false, if token was not sp�ecial.
+                            const char *        i_sText,
+                            intt                i_nNr ) = 0;
+    virtual void        Add_Token(
+                            const char *        i_sText );
+    virtual void        Add_PotentialLink(
+                            const char *        i_sText,
+                            bool                i_bIsGlobal,
+                            bool                i_bIsFunction );
+    virtual void        Add_Whitespace(
+                            UINT8               i_nLength );
+    virtual void        Add_Eol();
+
+    virtual UINT8       NrOfSpecialMeaningTokens() const = 0;
+    virtual AtTag *     GetFollower() = 0;
+
+    void                StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    const DocuText &    CText() const;
+
+  private:
+    virtual void        do_StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;   // later becoming abstract
+
+    virtual DocuText *  Text() = 0;
+};
+
+
+
+// IMPLEMENTATION
+
+inline void
+AtTag::StoreAt( DocuDisplay & o_rDisplay ) const
+    { do_StoreAt(o_rDisplay); }
+inline const DocuText &
+AtTag::CText() const
+    { DocuText * ret = const_cast< AtTag* >(this)->Text();
+      csv_assert( ret != 0 );
+      return *ret;
+    }
+
+
+}
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/info/ci_text.hxx b/autodoc/inc/ary/info/ci_text.hxx
new file mode 100644
index 000000000000..9c4331c6b7bb
--- /dev/null
+++ b/autodoc/inc/ary/info/ci_text.hxx
@@ -0,0 +1,87 @@
+/* -*- 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 ARY_INFO_CI_TEXT_HXX
+#define ARY_INFO_CI_TEXT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace info
+{
+
+class DocuToken;
+class DocuDisplay;
+
+
+class DocuText
+{
+  public:
+    typedef std::vector< DocuToken * >  TokenList;
+
+                        DocuText();
+                        ~DocuText();
+
+    void                Set_HtmlUse(
+                            bool                i_bUseIt )
+                                                { bUsesHtml = i_bUseIt; }
+    void                Add_Token(
+                            DYN DocuToken &     let_drToken )
+                                                { aTokens.push_back(&let_drToken); }
+    const TokenList &   Tokens() const          { return aTokens; }
+    void                StoreAt(
+                            DocuDisplay &       o_rDisplay ) const;
+    bool                IsNoHtml() const        { return NOT bUsesHtml; }
+    bool                IsEmpty() const         { return aTokens.size() == 0; }
+
+  private:
+    TokenList           aTokens;
+    bool                bUsesHtml;
+};
+
+
+
+
+
+
+// IMPLEMENTATION
+
+
+}
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/info/docstore.hxx b/autodoc/inc/ary/info/docstore.hxx
new file mode 100644
index 000000000000..4c95d2e32824
--- /dev/null
+++ b/autodoc/inc/ary/info/docstore.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 ARY_INFO_DOCSTORE_HXX
+#define ARY_INFO_DOCSTORE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/info/inftypes.hxx>
+
+namespace ary
+{
+namespace doc
+{
+    class Node;
+}
+
+
+
+namespace info
+{
+
+class DocuStore
+{
+  public:
+    virtual             ~DocuStore() {}
+
+    void                Store2CurFile(
+                            DYN doc::Node     & let_drDocu );
+    void                Store2CurNamespace(
+                            DYN doc::Node     & let_drDocu );
+
+    void                Store2ConnectedDeclaration(
+                            DYN doc::Node     & let_drDocu );
+
+    void                Store2Glossary(
+                            DYN doc::Node     & let_drDocu,
+                            const String  &     i_sExplainedTerm );
+    void                Store2GlobalTexts(
+                            DYN doc::Node     & let_drDocu,
+                            ary::info::GlobalTextId
+                                                i_nId );
+  private:
+    virtual void        do_Store2CurFile(
+                            DYN doc::Node     & let_drDocu ) = 0;
+    virtual void        do_Store2CurNamespace(
+                            DYN doc::Node     & let_drDocu ) = 0;
+
+    virtual void        do_Store2ConnectedDeclaration(
+                            DYN doc::Node     & let_drDocu ) = 0;
+
+    virtual void        do_Store2Glossary(
+                            DYN doc::Node     & let_drDocu,
+                            const String  &     i_sExplainedTerm ) = 0;
+    virtual void        do_Store2GlobalTexts(
+                            DYN doc::Node     & let_drDocu,
+                            ary::info::GlobalTextId
+                                                i_nId ) = 0;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+DocuStore::Store2CurFile( DYN doc::Node     & let_drDocu )
+    { do_Store2CurFile(let_drDocu);  }
+inline void
+DocuStore::Store2CurNamespace( DYN doc::Node     & let_drDocu )
+    { do_Store2CurNamespace(let_drDocu);  }
+inline void
+DocuStore::Store2ConnectedDeclaration( DYN doc::Node     & let_drDocu )
+    { do_Store2ConnectedDeclaration(let_drDocu);  }
+inline void
+DocuStore::Store2Glossary( DYN doc::Node     &  let_drDocu,
+                           const String  &      i_sExplainedTerm )
+    { do_Store2Glossary(let_drDocu, i_sExplainedTerm);  }
+inline void
+DocuStore::Store2GlobalTexts( DYN doc::Node     &       let_drDocu,
+                              ary::info::GlobalTextId   i_nId )
+    { do_Store2GlobalTexts(let_drDocu, i_nId);  }
+
+
+
+
+}   // namespace info
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/info/infodisp.hxx b/autodoc/inc/ary/info/infodisp.hxx
new file mode 100644
index 000000000000..38aae93b0feb
--- /dev/null
+++ b/autodoc/inc/ary/info/infodisp.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 ARY_INFO_INFODISP_HXX
+#define ARY_INFO_INFODISP_HXX
+//  KORR_DEPRECATED_3.0
+
+// BASE CLASSES
+// USED SERVICES
+
+
+
+
+namespace ary
+{
+namespace info
+{
+    class StdTag;
+    class BaseTag;
+    class ExceptionTag;
+    class ImplementsTag;
+    class KeywordTag;
+    class ParameterTag;
+    class SeeTag;
+    class TemplateTag;
+    class LabelTag;
+    class SinceTag;
+    class DT_Text;
+    class DT_MaybeLink;
+    class DT_Whitespace;
+    class DT_Eol;
+    class DT_Xml;
+
+
+
+/** Displaying an ary::doc::OldCppDocu.
+
+    @descr
+    This class is an interface, but the functions are defaulted,
+    to do nothing. so a derived class needn't implement all of them.
+*/
+class DocuDisplay
+{
+  public:
+    virtual             ~DocuDisplay() {}
+
+    virtual void        Display_StdTag(
+                            const StdTag &      i_rData ) = 0;
+    virtual void        Display_BaseTag(
+                            const BaseTag &     i_rData ) = 0;
+    virtual void        Display_ExceptionTag(
+                            const ExceptionTag &
+                                                i_rData ) = 0;
+    virtual void        Display_ImplementsTag(
+                            const ImplementsTag &
+                                                i_rData ) = 0;
+    virtual void        Display_KeywordTag(
+                            const KeywordTag &  i_rData ) = 0;
+    virtual void        Display_ParameterTag(
+                            const ParameterTag &
+                                                i_rData ) = 0;
+    virtual void        Display_SeeTag(
+                            const SeeTag &      i_rData ) = 0;
+    virtual void        Display_TemplateTag(
+                            const TemplateTag & i_rData ) = 0;
+    virtual void        Display_LabelTag(
+                            const LabelTag &    i_rData ) = 0;
+    virtual void        Display_SinceTag(
+                            const ary::info::SinceTag &
+                                                i_rData ) = 0;
+    virtual void        Display_DT_Text(
+                            const DT_Text &     i_rData ) = 0;
+    virtual void        Display_DT_MaybeLink(
+                            const DT_MaybeLink& i_rData ) = 0;
+    virtual void        Display_DT_Whitespace(
+                            const DT_Whitespace &
+                                                i_rData ) = 0;
+    virtual void        Display_DT_Eol(
+                            const DT_Eol &      i_rData ) = 0;
+    virtual void        Display_DT_Xml(
+                            const ary::info::DT_Xml &
+                                                i_rData ) = 0;
+};
+
+
+
+
+}
+}
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/info/inftypes.hxx b/autodoc/inc/ary/info/inftypes.hxx
new file mode 100644
index 000000000000..1539346fb7d5
--- /dev/null
+++ b/autodoc/inc/ary/info/inftypes.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 ARY_INFO_INFTYPES_HXX
+#define ARY_INFO_INFTYPES_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace info
+{
+
+
+
+
+typedef uintt GlobalTextId;
+
+
+
+/** Because this enum is used as index list for displayed
+    tag headlines, the items must neither be moved nor deleted.
+    Only adding to the end is allowed. atid_MAX always has to exist
+    and to be the last used value.
+    Also assigning numbers to the values is forbidden.
+*/
+enum E_AtTagId
+{
+    atid_ATT = 0,
+    atid_author,
+    atid_change,
+    atid_collab,
+    atid_contact,
+
+    atid_copyright,
+    atid_deprecated,
+    atid_descr,
+    atid_docdate,
+    atid_derive,
+
+    atid_dyn,
+    atid_instance,
+    atid_interface,
+    atid_invariant,
+    atid_life,
+
+    atid_multi,
+    atid_onerror,
+    atid_persist,
+    atid_postcond,
+    atid_precond,
+
+    atid_resp,
+    atid_return,
+    atid_short,
+    atid_todo,
+    atid_version,
+
+    atid_MAX
+};
+
+/** Because this enum is used as index list for displayed
+    tag headlines, the items must neither be moved nor deleted.
+    Only adding to the end is allowed. C_eAtTag_NrOfClasses always has to exist
+    and to be the last used value.
+    Also assigning other numbers to the values, than in this
+    existing scheme, is forbidden.
+*/
+enum E_AtTagClass
+{
+    atc_std = 0,
+
+    atc_base = atid_MAX,
+    atc_exception = atid_MAX + 1,
+    atc_implements = atid_MAX + 2,
+    atc_keyword = atid_MAX + 3,
+    atc_parameter = atid_MAX + 4,
+
+    atc_see = atid_MAX + 5,
+    atc_template = atid_MAX + 6,
+    atc_label = atid_MAX + 7,
+    atc_since = atid_MAX + 8,
+    C_eAtTag_NrOfClasses
+};
+
+
+
+}   // namespace info
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/itrange.hxx b/autodoc/inc/ary/itrange.hxx
new file mode 100644
index 000000000000..fb2fb3cb0d7a
--- /dev/null
+++ b/autodoc/inc/ary/itrange.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 ARY_ITRANGE_HXX
+#define ARY_ITRANGE_HXX
+//  KORR_DEPRECATED_3.0
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <utility>
+
+
+
+
+namespace ary
+{
+
+template <typename ITER>
+class IteratorRange
+{
+  public:
+                        IteratorRange(
+                            ITER                i_begin,
+                            ITER                i_end )
+                                                :   itCurrent(i_begin),
+                                                    itEnd(i_end)
+                                                {}
+                        IteratorRange(
+                            std::pair<ITER,ITER>
+                                                i_range )
+                                                :   itCurrent(i_range.first),
+                                                    itEnd(i_range.second)
+                                                {}
+
+                        operator bool() const   { return itCurrent != itEnd; }
+    IteratorRange &     operator++()            { ++itCurrent; return *this; }
+
+    ITER                cur() const             { return itCurrent; }
+    ITER                end() const             { return itEnd; }
+
+
+  private:
+    // DATA
+    ITER                itCurrent;
+    ITER                itEnd;
+};
+
+
+
+
+
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/loc/loc_dir.hxx b/autodoc/inc/ary/loc/loc_dir.hxx
new file mode 100644
index 000000000000..f8abf70cf062
--- /dev/null
+++ b/autodoc/inc/ary/loc/loc_dir.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 ARY_LOC_DIR_HXX
+#define ARY_LOC_DIR_HXX
+
+// BASE CLASSES
+#include <ary/loc/loc_le.hxx>
+
+// USED SERVICES
+#include <ary/loc/loc_traits.hxx>
+#include <ary/symtreenode.hxx>
+
+namespace ary
+{
+namespace loc
+{
+    class File;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+/** Represents a directory for source code files.
+*/
+class Directory : public LocationEntity
+{
+  public:
+    enum E_ClassId { class_id = 7030 };
+
+    typedef ::ary::symtree::Node<LeNode_Traits>    node_t;
+
+    /// Used for root directories.
+    explicit            Directory(
+                            Le_id               i_assignedRoot );
+
+    /// Used for subdirectories which have a parent directory.
+                        Directory(
+                            const String  &     i_localName,
+                            Le_id               i_parentDirectory );
+    virtual             ~Directory();
+
+    void                Add_Dir(
+                            const Directory  &  i_dir );
+    void                Add_File(
+                            const File &        i_file );
+
+    Le_id               Parent() const;
+    Le_id               AssignedRoot() const;
+
+    Le_id               Search_Dir(
+                            const String &      i_name ) const;
+    Le_id               Search_File(
+                            const String &      i_name ) const;
+
+    const node_t &      AsNode() const;
+    node_t &            AsNode();
+
+  private:
+    struct Container;
+
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface LocationEntity:
+    virtual const String &
+                        inq_LocalName() const;
+    virtual Le_id       inq_ParentDirectory() const;
+
+    // DATA
+    String              sLocalName;
+    Le_id               nParentDirectory;
+    Le_id               nAssignedRoot;
+    node_t              aAssignedNode;
+    Dyn<Container>      pChildren;
+};
+
+
+
+
+// IMPLEMENTATION
+inline Le_id
+Directory::Parent() const
+{
+    return nParentDirectory;
+}
+
+inline Le_id
+Directory::AssignedRoot() const
+{
+    return nAssignedRoot;
+}
+
+inline const Directory::node_t &
+Directory::AsNode() const
+{
+    return aAssignedNode;
+}
+
+inline Directory::node_t &
+Directory::AsNode()
+{
+    return aAssignedNode;
+}
+
+
+
+
+} // namespace loc
+} // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/loc/loc_file.hxx b/autodoc/inc/ary/loc/loc_file.hxx
new file mode 100644
index 000000000000..1afdd650a7c1
--- /dev/null
+++ b/autodoc/inc/ary/loc/loc_file.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 ARY_LOC_FILE_HXX
+#define ARY_LOC_FILE_HXX
+
+// BASE CLASSES
+#include <ary/loc/loc_filebase.hxx>
+
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+/** Represents an unspecified source code file.
+*/
+class File : public FileBase
+{
+  public:
+    enum E_ClassId { class_id = 7100 };
+
+                        File(
+                            const String  &     i_sLocalName,
+                            Le_id               i_nParentDirectory );
+    virtual             ~File();
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+};
+
+
+
+
+} // namespace loc
+} // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/loc/loc_filebase.hxx b/autodoc/inc/ary/loc/loc_filebase.hxx
new file mode 100644
index 000000000000..04550d4c8da4
--- /dev/null
+++ b/autodoc/inc/ary/loc/loc_filebase.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 ARY_LOC_FILEBASE_HXX
+#define ARY_LOC_FILEBASE_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/loc/loc_le.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+
+/** Base class for classes representing source code files.
+*/
+class FileBase : public LocationEntity
+{
+  public:
+    virtual             ~FileBase() {}
+
+  protected:
+                        FileBase(
+                            const String  &     i_localName ,
+                            Le_id               i_parentDirectory );
+  private:
+    // Interface LocationEntity:
+    virtual const String &
+                        inq_LocalName() const;
+    virtual Le_id       inq_ParentDirectory() const;
+
+    // DATA
+    String              sLocalName;
+    Le_id               nParentDirectory;
+};
+
+
+
+
+} // namespace loc
+} // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/loc/loc_le.hxx b/autodoc/inc/ary/loc/loc_le.hxx
new file mode 100644
index 000000000000..b2c0e602083e
--- /dev/null
+++ b/autodoc/inc/ary/loc/loc_le.hxx
@@ -0,0 +1,97 @@
+/* -*- 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 ARY_LOC_LE_HXX
+#define ARY_LOC_LE_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/entity.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/loc/loc_types4loc.hxx>
+#include <ary/loc/loc_traits.hxx>
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+/** Base class for all file locations in the Autodoc repository.
+*/
+class LocationEntity : public ::ary::Entity
+{
+  public:
+    typedef Le_Traits       traits_t;
+
+    virtual             ~LocationEntity() {}
+
+    Le_id               LeId() const;
+    const String &      LocalName() const;
+    Le_id               ParentDirectory() const;
+
+  private:
+    virtual const String &
+                        inq_LocalName() const = 0;
+    virtual Le_id       inq_ParentDirectory() const = 0;
+};
+
+
+
+
+// IMPLEMENTATION
+inline Le_id
+LocationEntity::LeId() const
+{
+    return TypedId<LocationEntity>(Id());
+}
+
+inline const String &
+LocationEntity::LocalName() const
+{
+    return inq_LocalName();
+}
+
+inline Le_id
+LocationEntity::ParentDirectory() const
+{
+    return inq_ParentDirectory();
+}
+
+
+
+
+
+} // namespace loc
+} // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/loc/loc_root.hxx b/autodoc/inc/ary/loc/loc_root.hxx
new file mode 100644
index 000000000000..e8b3a66b6209
--- /dev/null
+++ b/autodoc/inc/ary/loc/loc_root.hxx
@@ -0,0 +1,113 @@
+/* -*- 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 ARY_LOC_PROJECT_HXX
+#define ARY_LOC_PROJECT_HXX
+
+// BASE CLASSES
+#include <ary/loc/loc_le.hxx>
+// USED SERVICES
+#include <cosv/ploc.hxx>
+#include <ary/loc/loc_dir.hxx>
+
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+/** Represents a root directory for source files.
+*/
+class Root : public LocationEntity
+{
+  public:
+    enum E_ClassId { class_id = 7000 };
+
+    explicit            Root(
+                            const csv::ploc::Path &
+                                                i_rRootDirectoryPath );
+    void                Assign_Directory(
+                            Le_id               i_assignedDirectory );
+    virtual             ~Root();
+
+    // INQUIRY
+    const csv::ploc::Path &
+                        Path() const;
+    Le_id               MyDir() const;
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface ary::Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface LocationEntity:
+    virtual const String &
+                        inq_LocalName() const;
+    virtual Le_id       inq_ParentDirectory() const;
+
+    // DATA
+    csv::ploc::Path     aPath;
+    String              sPathAsString;
+    Le_id               aMyDirectory;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+Root::Assign_Directory(Le_id i_assignedDirectory)
+{
+    aMyDirectory = i_assignedDirectory;
+}
+
+inline const csv::ploc::Path &
+Root::Path() const
+{
+    return aPath;
+}
+
+inline Le_id
+Root::MyDir() const
+{
+    return aMyDirectory;
+}
+
+
+
+
+} // namespace loc
+} // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/loc/loc_traits.hxx b/autodoc/inc/ary/loc/loc_traits.hxx
new file mode 100644
index 000000000000..d07fdeebf334
--- /dev/null
+++ b/autodoc/inc/ary/loc/loc_traits.hxx
@@ -0,0 +1,118 @@
+/* -*- 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 ARY_LOC_TRAITS_HXX
+#define ARY_LOC_TRAITS_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/loc/loc_types4loc.hxx>
+
+
+namespace ary
+{
+namespace symtree
+{
+    template <class> class Node;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+
+/** Basic traits for derived ones of ->LocationEntity.
+*/
+struct Le_Traits
+{
+    typedef LocationEntity      entity_base_type;
+    typedef Le_id               id_type;
+
+    static entity_base_type &
+                        EntityOf_(
+                            id_type             i_id );
+};
+
+
+/** An instance of SYMBOL_TRAITS for ->::ary::symtree::Node.
+
+    @see ::ary::symtree::Node
+*/
+struct LeNode_Traits : public Le_Traits
+{
+    static symtree::Node<LeNode_Traits> *
+                        NodeOf_(
+                            entity_base_type &  i_entity );
+
+    static entity_base_type *
+                        ParentOf_(
+                            const entity_base_type &
+                                                i_entity );
+    template <class KEY>
+    static id_type      Search_(
+                            const entity_base_type &
+                                                i_entity,
+                            const KEY &         i_localKey );
+};
+
+
+
+/** An instance of COMPARE for ->::ary::SortedIds<>.
+
+    @see ::ary::SortedIds<>
+*/
+struct Le_Compare : public Le_Traits
+{
+    typedef  String             key_type;
+
+    static const key_type &
+                        KeyOf_(
+                            const entity_base_type &
+                                                i_entity );
+    static bool         Lesser_(
+                            const key_type &    i_1,
+                            const key_type &    i_2 );
+};
+
+
+
+
+
+} // namespace loc
+} // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/loc/loc_types4loc.hxx b/autodoc/inc/ary/loc/loc_types4loc.hxx
new file mode 100644
index 000000000000..64b2a0b76261
--- /dev/null
+++ b/autodoc/inc/ary/loc/loc_types4loc.hxx
@@ -0,0 +1,57 @@
+/* -*- 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 ARY_LOC_TYPES4LOC_HXX
+#define ARY_LOC_TYPES4LOC_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/types.hxx>
+
+
+namespace ary
+{
+namespace loc
+{
+
+class LocationEntity;
+
+
+
+typedef ::ary::TypedId<LocationEntity>  Le_id;
+
+
+
+
+} // namespace loc
+} // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/loc/locp_le.hxx b/autodoc/inc/ary/loc/locp_le.hxx
new file mode 100644
index 000000000000..1d6f201cdf6b
--- /dev/null
+++ b/autodoc/inc/ary/loc/locp_le.hxx
@@ -0,0 +1,91 @@
+/* -*- 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 ARY_LOCP_LE_HXX
+#define ARY_LOCP_LE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <cosv/ploc.hxx>
+#include <ary/loc/loc_types4loc.hxx>
+
+
+namespace ary
+{
+namespace loc
+{
+    class Root;
+    class Directory;
+    class File;
+}
+}
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+
+/** Provides access to files and directories stored in the
+    repository.
+*/
+class LocationPilot
+{
+  public:
+    virtual             ~LocationPilot() {}
+
+    virtual Root &      CheckIn_Root(
+                            const csv::ploc::Path &
+                                                i_rPath ) = 0;
+    virtual File &      CheckIn_File(
+                            const String  &     i_name,
+                            const csv::ploc::DirectoryChain &
+                                                i_subPath,
+                            Le_id               i_root ) = 0;
+
+    virtual Root &      Find_Root(
+                            Le_id               i_id ) const = 0;
+    virtual Directory & Find_Directory(
+                            Le_id               i_id ) const = 0;
+    virtual File &      Find_File(
+                            Le_id               i_id ) const = 0;
+};
+
+
+
+
+}   // namespace loc
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/namesort.hxx b/autodoc/inc/ary/namesort.hxx
new file mode 100644
index 000000000000..a44eb256d439
--- /dev/null
+++ b/autodoc/inc/ary/namesort.hxx
@@ -0,0 +1,78 @@
+/* -*- 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 ARY_NAMESORT_HXX
+#define ARY_NAMESORT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+
+/** Provides sensible sorting of ASCII names in programming languages.
+
+    @descr
+    Names are compared case insensitive first. Only after they appear
+    equal that way, there is an additional case sensitive comparison.
+    The second comparison sorts upper case before lower case.
+
+*/
+struct LesserName
+{
+    bool                operator()(
+                            const String &      i_s1,
+                            const String &      i_s2 ) const;
+  private:
+    // DATA
+
+    static const csv::CharOrder_Table
+                        aOrdering1_;
+    static const csv::CharOrder_Table
+                        aOrdering2_;
+};
+
+inline bool
+LesserName::operator()( const String &      i_s1,
+                        const String &      i_s2 ) const
+{
+    int result = i_s1.compare(aOrdering1_,i_s2);
+    if (result == 0)
+        result = i_s1.compare(aOrdering2_,i_s2);
+    return result < 0;
+}
+
+
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/object.hxx b/autodoc/inc/ary/object.hxx
new file mode 100644
index 000000000000..272c4354dca8
--- /dev/null
+++ b/autodoc/inc/ary/object.hxx
@@ -0,0 +1,73 @@
+/* -*- 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 ARY_OBJECT_HXX
+#define ARY_OBJECT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cosv/tpl/processor.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/types.hxx>
+
+
+namespace ary
+{
+
+
+/** Interface for every class, that is stored within the
+    Autodoc Repository.
+*/
+class Object : public csv::ConstProcessorClient
+{
+  public:
+    virtual             ~Object() {}
+
+    /// @return Type id of most derived class.
+    ClassId             AryClass() const;
+
+  private:
+    virtual ClassId     get_AryClass() const = 0;
+};
+
+
+
+inline ClassId
+Object::AryClass() const
+{
+    return get_AryClass();
+}
+
+
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/qualiname.hxx b/autodoc/inc/ary/qualiname.hxx
new file mode 100644
index 000000000000..eb669433a99f
--- /dev/null
+++ b/autodoc/inc/ary/qualiname.hxx
@@ -0,0 +1,106 @@
+/* -*- 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 ARY_QUALINAME_HXX
+#define ARY_QUALINAME_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <cosv/tpl/tpltools.hxx>
+
+
+namespace ary
+{
+
+class QualifiedName
+{
+  public:
+    typedef StringVector::const_iterator  namespace_iterator;
+
+                        QualifiedName(
+                            uintt               i_nSize = 0);
+
+    /// @see AssignText()
+                        QualifiedName(
+                            const char *        i_sText,
+                            const char *        i_sSeparator );
+                        ~QualifiedName();
+
+    QualifiedName &     operator+=(
+                            const String &      i_sNamespaceName )
+                                                { if (i_sNamespaceName.length() > 0)
+                                                        aNamespace.push_back(i_sNamespaceName);
+                                                  return *this; }
+    /// @precond i_nIndex < NamespaceDepth().
+    String &            operator[](
+                            uintt               i_nIndex )
+                                                { csv_assert(i_nIndex < aNamespace.size());
+                                                  return aNamespace[i_nIndex]; }
+    void                Init(
+                            bool                i_bAbsolute )
+                                                { Empty(); bIsAbsolute = i_bAbsolute; }
+    /** Reads a qualified name from a string.
+        If the last two charcters are "()", the inquiry IsFunction() will return
+        true.
+    */
+    void                AssignText(
+                            const char *        i_sText,
+                            const char *        i_sSeparator );
+    void                SetLocalName(
+                            const String &      i_sLocalName )
+                                                { sLocalName = i_sLocalName; }
+    void                Empty()                 { csv::erase_container(aNamespace); sLocalName.clear(); bIsAbsolute = false; }
+
+    const String &      LocalName() const       { return sLocalName; }
+    namespace_iterator  first_namespace() const { return aNamespace.begin(); }
+    namespace_iterator  end_namespace() const   { return aNamespace.end(); }
+    uintt               NamespaceDepth() const  { return aNamespace.size(); }
+
+    bool                IsAbsolute() const      { return bIsAbsolute; }
+    bool                IsQualified() const     { return aNamespace.size() > 0; }
+    bool                IsFunction() const      { return bIsFunction; }
+
+  private:
+    // DATA
+    StringVector        aNamespace;
+    String              sLocalName;
+    bool                bIsAbsolute;            /// true := beginning with "::".
+    bool                bIsFunction;            /// true := ending with "()"
+};
+
+
+
+
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/sequentialids.hxx b/autodoc/inc/ary/sequentialids.hxx
new file mode 100644
index 000000000000..828ad1f310e1
--- /dev/null
+++ b/autodoc/inc/ary/sequentialids.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 ARY_SEQUENTIALIDS_HXX
+#define ARY_SEQUENTIALIDS_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+#include <algorithm>
+
+
+
+namespace ary
+{
+
+
+/** Implementation of a set of children to an entity in the Autodoc
+    repository. The children are in the sequence of addition.
+*/
+template<class ID>
+class SequentialIds
+{
+  public:
+    typedef std::vector<ID>                     data_t;
+    typedef typename data_t::const_iterator     const_iterator;
+
+    // LIFECYCLE
+    explicit            SequentialIds(
+                            std::size_t         i_reserve = 0 );
+                        ~SequentialIds();
+
+    // OPERATIONS
+    void                Add(
+                            const ID &       i_child );
+    // INQUIRY
+    const_iterator      Begin() const;
+    const_iterator      End() const;
+    std::size_t         Size() const;
+
+    template <class IDENTIFY>
+    ID                  Find(
+                            IDENTIFY            i_find ) const;
+    template <class IDENTIFY>
+    // Workaround for Solaris8 compiler: return type has to match alphabetically
+    typename std::vector<ID>::const_iterator
+                        Search(
+                            IDENTIFY            i_find ) const;
+  private:
+    // DATA
+    data_t              aData;
+};
+
+
+
+
+
+
+
+// IMPLEMENTATION
+
+template <class ID>
+SequentialIds<ID>::SequentialIds(std::size_t i_reserve)
+    :   aData()
+{
+    if (i_reserve > 0)
+        aData.reserve(i_reserve);
+}
+
+template <class ID>
+SequentialIds<ID>::~SequentialIds()
+{
+}
+
+template <class ID>
+inline void
+SequentialIds<ID>::Add(const ID & i_child)
+{
+    aData.push_back(i_child);
+}
+
+template <class ID>
+inline typename SequentialIds<ID>::const_iterator
+SequentialIds<ID>::Begin() const
+{
+    return aData.begin();
+}
+
+template <class ID>
+inline typename SequentialIds<ID>::const_iterator
+SequentialIds<ID>::End() const
+{
+    return aData.end();
+}
+
+template <class ID>
+inline std::size_t
+SequentialIds<ID>::Size() const
+{
+    return aData.size();
+}
+
+template <class ID>
+template <class IDENTIFY>
+ID
+SequentialIds<ID>::Find(IDENTIFY i_find) const
+{
+    const_iterator
+        ret = std::find_if(aData.begin(), aData.end(), i_find);
+    csv_assert(ret != aData.end());
+    return *ret;
+}
+
+template <class ID>
+template <class IDENTIFY>
+// Workaround for Solaris8 compiler: return type has to match alphabetically
+// typename SequentialIds<ID>::const_iterator
+typename std::vector<ID>::const_iterator
+SequentialIds<ID>::Search(IDENTIFY i_find) const
+{
+    return std::find_if(aData.begin(), aData.end(), i_find);
+}
+
+
+
+
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/stdconstiter.hxx b/autodoc/inc/ary/stdconstiter.hxx
new file mode 100644
index 000000000000..40408bab8f42
--- /dev/null
+++ b/autodoc/inc/ary/stdconstiter.hxx
@@ -0,0 +1,101 @@
+/* -*- 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 ARY_STDCONSTITER_HXX
+#define ARY_STDCONSTITER_HXX
+//  KORR_DEPRECATED_3.0
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+
+template <class ELEM>
+
+class StdConstIterator
+{
+  public:
+    virtual             ~StdConstIterator() {}
+
+    void                operator++()            { do_Advance(); }
+    const ELEM &        operator*() const       { return *inq_CurElement(); }
+                        operator bool() const   { return inq_CurElement() != 0; }
+
+    /// Needed as replacement for operator bool() in gcc 2.95.
+    bool                IsValid() const         { return operator bool(); }
+    bool                IsSorted() const        { return inq_IsSorted(); }
+
+  protected:
+                        StdConstIterator() {}
+
+  private:
+    //Locals
+    virtual void        do_Advance() = 0;
+    virtual const ELEM *
+                        inq_CurElement() const = 0;
+    virtual bool        inq_IsSorted() const = 0;
+
+    // Forbidden:
+    StdConstIterator(const StdConstIterator<ELEM>&);
+    StdConstIterator<ELEM> & operator=(const StdConstIterator<ELEM>&);
+};
+
+
+template <class ELEM>
+class Dyn_StdConstIterator
+{
+  public:
+    typedef StdConstIterator<ELEM> client_type;
+
+                        Dyn_StdConstIterator(
+                            DYN client_type *   pass_dpIterator = 0 )
+                                                : pClient(pass_dpIterator) {}
+    Dyn_StdConstIterator<ELEM> &
+                        operator=(
+                            DYN client_type *   pass_dpIterator )
+                                                { pClient = pass_dpIterator;
+                                                  return *this; }
+    client_type &       operator*() const       { return *pClient.MutablePtr(); }
+
+  private:
+    Dyn<client_type>    pClient;
+};
+
+
+
+
+
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/symtreenode.hxx b/autodoc/inc/ary/symtreenode.hxx
new file mode 100644
index 000000000000..6eccef6c81ca
--- /dev/null
+++ b/autodoc/inc/ary/symtreenode.hxx
@@ -0,0 +1,347 @@
+/* -*- 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 ARY_SYMTREE_NODE_HXX
+#define ARY_SYMTREE_NODE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+
+
+
+namespace ary
+{
+namespace symtree
+{
+
+
+
+/** Represents a node in a tree of symbols like a namespace tree or a
+    directory tree.
+
+    @tpl NODE_TRAITS
+    Needs to define the types:
+        entity_base_type:   The type of the entities in that storage,
+                            e.g. ->ary::cpp::CodeEntity.
+        id_type:            The type of the ids of those entities,
+                            e.g. ->ary::cpp::Ce_id.
+
+    Needs to define the functions:
+     1. static entity_base_type &
+                            EntityOf_(
+                                id_type             i_id );
+     2. static symtree::Node<LeNode_Traits> *
+                            NodeOf_(
+                                const entity_base_type &
+                                                    i_entity );
+     3. static const String &
+                            LocalNameOf_(
+                                const entity_base_type &
+                                                    i_entity );
+     4. static entity_base_type *
+                            ParentOf_(
+                                const entity_base_type &
+                                                    i_entity );
+     5. template <class KEY>
+        static id_t         Search_(
+                                const entity_base_type &
+                                                    i_entity,
+                                const KEY &         i_localKey );
+*/
+template <class NODE_TRAITS>
+class Node
+{
+  public:
+    typedef Node<NODE_TRAITS>                         node_self;
+    typedef typename NODE_TRAITS::entity_base_type    entity_t;
+    typedef typename NODE_TRAITS::id_type             id_t;
+
+
+    // LIFECYCLE
+    /// @attention Always needs to be followed by ->Assign_Entity()!
+                        Node();
+    explicit            Node(
+                            entity_t &          i_entity );
+    void                Assign_Entity(
+                            entity_t &          i_entity );
+                        ~Node();
+    // INQUIRY
+    id_t                Id();
+    const String        Name() const;
+    int                 Depth() const;
+    const entity_t &    Entity() const;
+    const node_self *   Parent() const;
+
+    /** Gets a child with a specific name and of a specific type.
+
+        There may be more childs with the same name.
+
+        @return id_t(0), if no matching child is found.
+    */
+    template <class KEY>
+    typename NODE_TRAITS::id_type
+                        Search(
+                            const KEY &         i_localKey ) const
+    {
+        // Inline here to workaround SUNW8 compiler bug, works in SUNW12.
+        return NODE_TRAITS::Search_(Entity(), i_localKey);
+    }
+
+
+    /** Gets a child with a specific qualified name below this node.
+
+        The child may not exists.
+    */
+    template <class KEY>
+    void                SearchBelow(
+                            id_t &              o_return,   // Workaround SUNW8 compiler bug
+                            StringVector::const_iterator
+                                                i_qualifiedSearchedName_begin,
+                            StringVector::const_iterator
+                                                i_qualifiedSearchedName_end,
+                            const KEY &         i_localKey ) const;
+
+    /** Gets a child with a specific qualified name, either below this node
+        or below any of the parent nodes.
+
+        The child may not exists.
+    */
+    template <class KEY>
+    void                SearchUp(
+                            id_t &              o_return,   // Workaround SUNW8 compiler bug
+                            StringVector::const_iterator
+                                                i_qualifiedSearchedName_begin,
+                            StringVector::const_iterator
+                                                i_qualifiedSearchedName_end,
+                            const KEY &         i_localKey ) const;
+    // ACCESS
+    entity_t &          Entity();
+    node_self *         Parent();
+
+  private:
+    // Forbid copying:
+    Node(const node_self&);
+    node_self& operator=(const node_self&);
+
+    // Locals
+    void                InitDepth();
+    node_self *         Get_Parent() const;
+    node_self *         NodeOf(
+                            id_t                i_id ) const;
+
+    // DATA
+    entity_t *          pEntity;
+    int                 nDepth;
+};
+
+
+
+
+// IMPLEMENTATION
+
+template <class NODE_TRAITS>
+inline const typename Node<NODE_TRAITS>::entity_t &
+Node<NODE_TRAITS>::Entity() const
+{
+    csv_assert(pEntity != 0);
+    return *pEntity;
+}
+
+template <class NODE_TRAITS>
+inline Node<NODE_TRAITS> *
+Node<NODE_TRAITS>::NodeOf(id_t i_id) const
+{
+    if (i_id.IsValid())
+        return NODE_TRAITS::NodeOf_(NODE_TRAITS::EntityOf_(i_id));
+    return 0;
+}
+
+template <class NODE_TRAITS>
+inline Node<NODE_TRAITS> *
+Node<NODE_TRAITS>::Get_Parent() const
+{
+    entity_t *
+        parent = NODE_TRAITS::ParentOf_(Entity());
+    if (parent != 0)
+        return NODE_TRAITS::NodeOf_(*parent);
+    return 0;
+}
+
+template <class NODE_TRAITS>
+Node<NODE_TRAITS>::Node()
+    :   pEntity(0),
+        nDepth(0)
+{
+}
+
+template <class NODE_TRAITS>
+Node<NODE_TRAITS>::Node(entity_t & i_entity)
+    :   pEntity(&i_entity),
+        nDepth(0)
+{
+    InitDepth();
+}
+
+template <class NODE_TRAITS>
+void
+Node<NODE_TRAITS>::Assign_Entity(entity_t & i_entity)
+{
+    pEntity = &i_entity;
+    InitDepth();
+}
+
+template <class NODE_TRAITS>
+Node<NODE_TRAITS>::~Node()
+{
+}
+
+template <class NODE_TRAITS>
+inline typename Node<NODE_TRAITS>::id_t
+Node<NODE_TRAITS>::Id()
+{
+    return NODE_TRAITS::IdOf(Entity());
+}
+
+template <class NODE_TRAITS>
+inline const String
+Node<NODE_TRAITS>::Name() const
+{
+    return NODE_TRAITS::LocalNameOf_(Entity());
+}
+
+template <class NODE_TRAITS>
+inline int
+Node<NODE_TRAITS>::Depth() const
+{
+    return nDepth;
+}
+
+template <class NODE_TRAITS>
+inline const Node<NODE_TRAITS> *
+Node<NODE_TRAITS>::Parent() const
+{
+    return Get_Parent();
+}
+
+template <class NODE_TRAITS>
+template <class KEY>
+void
+Node<NODE_TRAITS>::SearchBelow(
+                          id_t &              o_return,   // Workaround SUNW8 compiler bug
+                          StringVector::const_iterator i_qualifiedSearchedName_begin,
+                          StringVector::const_iterator i_qualifiedSearchedName_end,
+                          const KEY &                  i_localKey ) const
+{
+    if (i_qualifiedSearchedName_begin != i_qualifiedSearchedName_end)
+    {
+        id_t
+            next = Search(*i_qualifiedSearchedName_begin);
+        if (next.IsValid())
+        {
+            const node_self *
+                subnode = NodeOf(next);
+            if (subnode != 0)
+            {
+                subnode->SearchBelow( o_return,
+                                      i_qualifiedSearchedName_begin+1,
+                                      i_qualifiedSearchedName_end   ,
+                                      i_localKey );
+                return;
+            }
+        }
+        o_return = id_t(0);
+        return;
+    }
+
+    o_return = Search(i_localKey);
+}
+
+template <class NODE_TRAITS>
+template <class KEY>
+void
+Node<NODE_TRAITS>::SearchUp(
+                          id_t &              o_return,   // Workaround SUNW8 compiler bug
+                          StringVector::const_iterator i_qualifiedSearchedName_begin,
+                          StringVector::const_iterator i_qualifiedSearchedName_end,
+                          const KEY &                  i_localKey ) const
+{
+    SearchBelow( o_return,
+                 i_qualifiedSearchedName_begin,
+                 i_qualifiedSearchedName_end,
+                 i_localKey );
+    if (o_return.IsValid())
+        return;
+
+    node_self *
+        parent = Get_Parent();
+    if (parent != 0)
+    {
+        parent->SearchUp( o_return,
+                          i_qualifiedSearchedName_begin,
+                          i_qualifiedSearchedName_end,
+                          i_localKey );
+    }
+}
+
+template <class NODE_TRAITS>
+typename Node<NODE_TRAITS>::entity_t &
+Node<NODE_TRAITS>::Entity()
+{
+    csv_assert(pEntity != 0);
+    return *pEntity;
+}
+
+template <class NODE_TRAITS>
+inline Node<NODE_TRAITS> *
+Node<NODE_TRAITS>::Parent()
+{
+    return Get_Parent();
+}
+
+template <class NODE_TRAITS>
+void
+Node<NODE_TRAITS>::InitDepth()
+{
+    Node<NODE_TRAITS> *
+        pp = Get_Parent();
+    if (pp != 0)
+        nDepth = pp->Depth() + 1;
+    else
+        nDepth = 0;
+}
+
+
+
+
+}   // namespace symtree
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/types.hxx b/autodoc/inc/ary/types.hxx
new file mode 100644
index 000000000000..aec5198976cc
--- /dev/null
+++ b/autodoc/inc/ary/types.hxx
@@ -0,0 +1,133 @@
+/* -*- 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 ARY_TYPES_HXX
+#define ARY_TYPES_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // OTHER
+
+
+namespace ary
+{
+
+
+typedef uintt           Rid;
+typedef uintt           ClassId;
+
+
+
+// Deprecated:
+typedef Rid             Gid;        /// Group Id. Id of a group.
+typedef UINT8           SlotAccessId;   /// Access to a Slot
+typedef std::set< Rid, std::less< Rid > >   Set_Rid;
+typedef std::vector<Rid>                    List_Rid;
+
+
+
+
+
+/** This is a global id, providing as well an entity's class as its
+    id.
+*/
+class GlobalId
+{
+  public:
+                        GlobalId()
+                            :   nClass(0),
+                                nId(0) {}
+                        GlobalId(
+                            ClassId             i_class,
+                            Rid                 i_id )
+                            :   nClass(i_class),
+                                nId(i_id) {}
+                        ~GlobalId() {}
+
+    bool                IsValid() const         { return nClass != 0
+                                                  AND
+                                                  nId != 0; }
+    ClassId             Class() const           { return nClass; }
+    Rid                 Id() const              { return nId; }
+
+  private:
+    // DATA
+    ClassId             nClass;
+    Rid                 nId;
+};
+
+
+typedef std::vector<GlobalId>   List_GlobalIds;
+
+
+/** This is a typed repository id. It allows to get
+    an object of a specific type.
+*/
+template <class IFC>
+class TypedId
+{
+  public:
+    typedef TypedId<IFC>                        self;
+
+
+    explicit            TypedId(
+                            Rid                 i_nId = 0 )
+                                                : nId(i_nId) {}
+    TypedId<IFC> &      operator=(
+                            Rid                 i_nId )
+                                                { nId = i_nId; return *this; }
+    bool                operator==(
+                            const TypedId<IFC> &
+                                                i_nId ) const
+                                                { return nId == i_nId.nId; }
+    bool                operator!=(
+                            const TypedId<IFC> &
+                                                i_nId ) const
+                                                { return NOT operator==(i_nId); }
+    bool                operator<(
+                            const TypedId<IFC> &
+                                                i_nId ) const
+                                                { return nId < i_nId.nId; }
+
+    bool                IsValid() const         { return nId != 0; }
+    Rid                 Value() const           { return nId; }
+
+    static self         Null_()                 { return self(0); }
+
+  private:
+    // DATA
+    Rid                 nId;
+};
+
+
+
+
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary/udmhost.hxx b/autodoc/inc/ary/udmhost.hxx
new file mode 100644
index 000000000000..13d8c2377d82
--- /dev/null
+++ b/autodoc/inc/ary/udmhost.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 ARY_UDMHOST_HXX
+#define ARY_UDMHOST_HXX
+//  KORR_DEPRECATED_3.0
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/host.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+
+
+
+class UdmHost : public Host
+{
+  public:
+    enum E_ClassId { class_id = 1000 };
+
+                        UdmHost();
+    virtual             ~UdmHost();
+
+  private:
+    virtual Host_ClassId
+                       inq_ClassId() const;
+};
+
+
+
+
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary_i/ci_atag2.hxx b/autodoc/inc/ary_i/ci_atag2.hxx
new file mode 100644
index 000000000000..ec02190002c0
--- /dev/null
+++ b/autodoc/inc/ary_i/ci_atag2.hxx
@@ -0,0 +1,81 @@
+/* -*- 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 ARY_CI_ATAG2_HXX
+#define ARY_CI_ATAG2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <ary_i/ci_text2.hxx>
+    // PARAMETERS
+
+
+
+namespace ary
+{
+namespace inf
+{
+
+
+class DocumentationDisplay;
+
+class AtTag2
+{
+  public:
+    virtual             ~AtTag2() {}
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const = 0;
+
+    const char *        Title() const           { return sTitle; }
+    const DocuTex2 &    Text() const            { return aText; }
+    DocuTex2 &          Access_Text()           { return aText; }
+
+  protected:
+                        AtTag2(
+                            const char *        i_sTitle)
+                                                :   sTitle(i_sTitle) {}
+    String              sTitle;
+    DocuTex2            aText;
+};
+
+
+
+// IMPLEMENTATION
+
+}   // namespace inf
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary_i/ci_text2.hxx b/autodoc/inc/ary_i/ci_text2.hxx
new file mode 100644
index 000000000000..8e1c202a5636
--- /dev/null
+++ b/autodoc/inc/ary_i/ci_text2.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 ARY_CINFO_CI_TEXT2_HXX
+#define ARY_CINFO_CI_TEXT2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace inf
+{
+
+
+class DocumentationDisplay;
+
+
+class DocuToken
+{
+  public:
+    virtual             ~DocuToken() {}
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const = 0;
+    virtual bool        IsWhiteOnly() const = 0;
+};
+
+
+class DocuTex2
+{
+  public:
+    typedef std::vector< DocuToken * >  TokenList;
+
+                        DocuTex2();
+    virtual             ~DocuTex2();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+    void                AddToken(
+                            DYN DocuToken &     let_drToken );
+
+    const TokenList &   Tokens() const          { return aTokens; }
+    bool                IsEmpty() const;
+    const String &      TextOfFirstToken() const;
+
+    String &            Access_TextOfFirstToken();
+
+  private:
+    TokenList           aTokens;
+};
+
+
+
+// IMPLEMENTATION
+
+}   // namespace inf
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary_i/d_token.hxx b/autodoc/inc/ary_i/d_token.hxx
new file mode 100644
index 000000000000..7fed7d16104f
--- /dev/null
+++ b/autodoc/inc/ary_i/d_token.hxx
@@ -0,0 +1,284 @@
+/* -*- 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 CSI_DSAPI_D_TOKEN_HXX
+#define CSI_DSAPI_D_TOKEN_HXX
+
+// BASE CLASSES
+#include <ary_i/ci_text2.hxx>
+#include <ary_i/ci_atag2.hxx>
+
+
+namespace ary
+{
+namespace inf
+{
+    class DocumentationDisplay;
+}
+}
+
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+using ary::inf::DocumentationDisplay;
+
+
+class DT_Dsapi : public ary::inf::DocuToken
+{
+  public:
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const  = 0;
+    virtual bool        IsWhiteOnly() const;
+};
+
+
+
+class DT_TextToken : public DT_Dsapi
+{
+  public:
+    explicit            DT_TextToken(
+                            const char *        i_sText )
+                                                :   sText(i_sText) {}
+    explicit            DT_TextToken(
+                            const String &      i_sText )
+                                                :   sText(i_sText) {}
+    virtual             ~DT_TextToken();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+    const char *        GetText() const         { return sText; }
+    const String &      GetTextStr() const      { return sText; }
+
+    String &            Access_Text()           { return sText; }
+
+    virtual bool        IsWhiteOnly() const;
+
+  private:
+    String              sText;
+};
+
+class DT_White : public DT_Dsapi
+{
+  public:
+                        DT_White() {}
+    virtual             ~DT_White();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+    virtual bool        IsWhiteOnly() const;
+};
+
+
+class DT_MLTag : public DT_Dsapi
+{
+  public:
+    enum E_Kind
+    {
+        k_unknown = 0,
+        k_begin,
+        k_end,
+        k_single
+    };
+};
+
+class DT_MupType : public DT_MLTag
+{
+  public:
+    explicit            DT_MupType(             /// Constructor for End-Tag
+                            bool                )   /// Must be there, but is not evaluated.
+                                                :   bIsBegin(false) {}
+    explicit            DT_MupType(             /// Constructor for Begin-Tag
+                            const String &      i_sScope )
+                                                :   sScope(i_sScope), bIsBegin(true) {}
+    virtual             ~DT_MupType();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+    const String  &     Scope() const           { return sScope; }
+    bool                IsBegin() const         { return bIsBegin; }
+
+  private:
+    String              sScope;
+    bool                bIsBegin;
+};
+
+class DT_MupMember : public DT_MLTag
+{
+  public:
+    explicit            DT_MupMember(           /// Constructor for End-Tag
+                            bool                )   /// Must be there, but is not evaluated.
+                                                :   bIsBegin(false) {}
+                        DT_MupMember(           /// Constructor for Begin-Tag
+                            const String &      i_sScope )
+                                                :   sScope(i_sScope), bIsBegin(true) {}
+    virtual             ~DT_MupMember();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+    const String  &     Scope() const           { return sScope; }
+    bool                IsBegin() const         { return bIsBegin; }
+
+  private:
+    String              sScope;
+    bool                bIsBegin;
+};
+
+class DT_MupConst : public DT_Dsapi
+{
+  public:
+                        DT_MupConst(
+                            const char *        i_sConstText )
+                                                :   sConstText(i_sConstText) {}
+    virtual             ~DT_MupConst();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+    const char *        GetText() const         { return sConstText; }
+
+  private:
+    String              sConstText;             /// Without HTML.
+};
+
+
+class DT_Style : public DT_MLTag
+{
+  public:
+                        DT_Style(
+                            const char *        i_sPlainHtmlTag,
+                            bool                i_bNewLine )
+                                                : sText(i_sPlainHtmlTag), bNewLine(i_bNewLine) {}
+    virtual             ~DT_Style();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+    const char *        GetText() const         { return sText; }
+    bool                IsStartOfNewLine() const
+                                                { return bNewLine; }
+  private:
+    String              sText;                  /// With HTML.
+    E_Kind              eKind;
+    bool                bNewLine;
+};
+
+class DT_EOL : public DT_Dsapi
+{
+  public:
+                        DT_EOL() {}
+    virtual             ~DT_EOL();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+    virtual bool        IsWhiteOnly() const;
+};
+
+
+class DT_AtTag : public ary::inf::AtTag2
+{
+  public:
+    void                AddToken(
+                            DYN ary::inf::DocuToken &
+                                                let_drToken )
+                                                {   aText.AddToken(let_drToken); }
+    void                SetName(
+                            const char *        i_sName )
+                                                { sTitle = i_sName; }
+
+  protected:
+                        DT_AtTag(
+                            const char *        i_sTitle )
+                                                :   ary::inf::AtTag2(i_sTitle) {}
+};
+
+class DT_StdAtTag : public DT_AtTag
+{
+  public:
+    explicit            DT_StdAtTag(
+                            const char *        i_sTitle )
+                                                :   DT_AtTag(i_sTitle) {}
+    virtual             ~DT_StdAtTag();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+};
+
+class DT_SeeAlsoAtTag : public DT_AtTag
+{
+  public:
+                        DT_SeeAlsoAtTag()       :   DT_AtTag("") {}
+    virtual             ~DT_SeeAlsoAtTag();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+    const String  &     LinkText() const        { return sTitle; }  // Missbrauch von sTitle
+};
+
+class DT_ParameterAtTag : public DT_AtTag
+{
+  public:
+                        DT_ParameterAtTag()     :   DT_AtTag("") {}
+    virtual             ~DT_ParameterAtTag();
+
+    void                SetTitle(
+                            const char *        i_sTitle );
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+};
+
+class DT_SinceAtTag : public DT_AtTag
+{
+  public:
+                        DT_SinceAtTag()     :   DT_AtTag("Since version") {}
+    virtual             ~DT_SinceAtTag();
+
+    virtual void        DisplayAt(
+                            DocumentationDisplay &
+                                                o_rDisplay ) const;
+};
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/ary_i/disdocum.hxx b/autodoc/inc/ary_i/disdocum.hxx
new file mode 100644
index 000000000000..fac8d1aa8cb0
--- /dev/null
+++ b/autodoc/inc/ary_i/disdocum.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 ARY_DISDOCUM_HXX
+#define ARY_DISDOCUM_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace dsapi
+{
+class DT_TextToken;
+class DT_MupType;
+class DT_MupMember;
+class DT_MupConst;
+class DT_Style;
+class DT_EOL;
+class DT_StdAtTag;
+class DT_SeeAlsoAtTag;
+class DT_ParameterAtTag;
+class DT_SinceAtTag;
+}   // namespace dsapi
+}   // namespace csi
+
+
+namespace ary
+{
+namespace inf
+{
+
+
+
+class DocumentationDisplay
+{
+  public:
+
+    virtual             ~DocumentationDisplay() { }
+
+    virtual void        Display_TextToken(
+                            const csi::dsapi::DT_TextToken &
+                                                i_rToken ) = 0;
+    virtual void        Display_White() = 0;
+    virtual void        Display_MupType(
+                            const csi::dsapi::DT_MupType &  i_rToken ) = 0;
+    virtual void        Display_MupMember(
+                            const csi::dsapi::DT_MupMember &
+                                                i_rToken ) = 0;
+    virtual void        Display_MupConst(
+                            const csi::dsapi::DT_MupConst &
+                                                i_rToken ) = 0;
+    virtual void        Display_Style(
+                            const csi::dsapi::DT_Style &    i_rToken ) = 0;
+    virtual void        Display_EOL() = 0;
+    virtual void        Display_StdAtTag(
+                            const csi::dsapi::DT_StdAtTag &
+                                                i_rToken ) = 0;
+    virtual void        Display_SeeAlsoAtTag(
+                            const csi::dsapi::DT_SeeAlsoAtTag &
+                                                i_rToken ) = 0;
+    virtual void        Display_ParameterAtTag(
+                            const csi::dsapi::DT_ParameterAtTag &
+                                                i_rToken ) = 0;
+    virtual void        Display_SinceAtTag(
+                            const csi::dsapi::DT_SinceAtTag &
+                                                i_rToken ) = 0;
+};
+
+
+class DocuTag_Display : public DocumentationDisplay
+{
+  public:
+    // Dummies, implemented in source\ary_i\kernel\ci_atag2.cxx
+    virtual void        Display_TextToken(
+                            const csi::dsapi::DT_TextToken &
+                                                i_rToken );
+    virtual void        Display_White();
+    virtual void        Display_MupType(
+                            const csi::dsapi::DT_MupType &  i_rToken );
+    virtual void        Display_MupMember(
+                            const csi::dsapi::DT_MupMember &
+                                                i_rToken );
+    virtual void        Display_MupConst(
+                            const csi::dsapi::DT_MupConst &
+                                                i_rToken );
+    virtual void        Display_Style(
+                            const csi::dsapi::DT_Style &    i_rToken );
+    virtual void        Display_EOL();
+};
+
+class DocuText_Display : public DocumentationDisplay
+{
+  public:
+    // Dummies, implemented in source\ary_i\kernel\ci_text2.cxx
+    virtual void        Display_StdAtTag(
+                            const csi::dsapi::DT_StdAtTag &
+                                                i_rToken );
+    virtual void        Display_SeeAlsoAtTag(
+                            const csi::dsapi::DT_SeeAlsoAtTag &
+                                                i_rToken );
+    virtual void        Display_ParameterAtTag(
+                            const csi::dsapi::DT_ParameterAtTag &
+                                                i_rToken );
+    virtual void        Display_SinceAtTag(
+                            const csi::dsapi::DT_SinceAtTag &
+                                                i_rToken );
+};
+
+
+
+}   // namespace inf
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/autodoc/displaying.hxx b/autodoc/inc/autodoc/displaying.hxx
new file mode 100644
index 000000000000..96bd66c0ad71
--- /dev/null
+++ b/autodoc/inc/autodoc/displaying.hxx
@@ -0,0 +1,78 @@
+/* -*- 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 AUTODOC_DISPLAYING_HXX
+#define AUTODOC_DISPLAYING_HXX
+
+
+namespace display
+{
+    class CorporateFrame;
+}
+
+
+
+namespace autodoc
+{
+
+class HtmlDisplay_UdkStd;
+class HtmlDisplay_Idl_Ifc;
+
+// class TextDisplay_FunctionList_Ifc;
+
+
+/** Interface for parsing code of a programming language and
+    delivering the information into an Autodoc Repository.
+**/
+class DisplayToolsFactory_Ifc
+{
+  public:
+    virtual             ~DisplayToolsFactory_Ifc() {}
+    static DisplayToolsFactory_Ifc &
+                        GetIt_();
+
+//    virtual DYN autodoc::TextDisplay_FunctionList_Ifc *
+//                        Create_TextDisplay_FunctionList() const = 0;
+
+    virtual DYN autodoc::HtmlDisplay_UdkStd *
+                        Create_HtmlDisplay_UdkStd() const = 0;
+    virtual DYN autodoc::HtmlDisplay_Idl_Ifc *
+                        Create_HtmlDisplay_Idl() const = 0;
+
+    virtual const display::CorporateFrame &
+                        Create_StdFrame() const = 0;
+};
+
+
+} // namespace autodoc
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/autodoc/dsp_html_std.hxx b/autodoc/inc/autodoc/dsp_html_std.hxx
new file mode 100644
index 000000000000..78d75efe7e23
--- /dev/null
+++ b/autodoc/inc/autodoc/dsp_html_std.hxx
@@ -0,0 +1,216 @@
+/* -*- 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 AUTODOC_DSP_HTML_STD_HXX
+#define AUTODOC_DSP_HTML_STD_HXX
+
+
+
+namespace ary
+{
+    namespace cpp
+    {
+        class Gate;
+    }
+    namespace idl
+    {
+        class Gate;
+    }
+}
+
+namespace display
+{
+    class CorporateFrame;
+}
+
+
+namespace autodoc
+{
+
+
+class HtmlDisplay_UdkStd
+{
+  public:
+    virtual             ~HtmlDisplay_UdkStd() {}
+
+    /** Displays the names of several C++ code entities within the
+        given namespace (or the global namespace as default). All
+        subnamespaces are included.
+
+        Output has following format:
+
+        =========================================================================
+        OutputDirectory
+            index.html
+            def-all.html
+            prj\
+                sal\
+                    index.html                      // Overview about project
+
+                    f-FileName[1,2,...]             // Overview about file
+                    f-OtherFileName[1,2,...]
+                    ...
+                    def-FileName[1,2,...]           // #defines and macros in file
+                    def-OtherFileName[1,2,...]
+                    ...
+                rtl\
+                    ...
+                cppu\
+                    ...
+                cppuhelper\
+                    ...
+                ...
+            ix\
+                ix-a.html
+                ix-b.html
+                ...
+                ix-z.html
+                ix-_.html
+                ix-other.html
+
+            cpp\
+                index.html                          // Overview about global namespace
+
+                Namespace_A\
+                    Namespace_C\
+                        index.html                  // Overview about namespace C
+                        ...
+                    ...
+
+                    index.html                      // Overview about namespace A
+
+                    c-ClassName_X.html              // Description of class
+                    ...
+                    e-EnumName.html                 // Description of enum
+                    ...
+                    t-TypedefName.html              // Description of typedef
+                    ...
+                    o-Filename.html                 // Descriptions of operations in this file in this namespace
+                    ...
+                    d-Filename.html                 // Descriptions of data in this file in this namespace
+                    ...
+
+                    ClassName_X\
+                        c-ClassName_Y.html
+                        e-EnumName.html
+                        t-TypedefName.html
+                        o.html                      // Descriptions of operations in class X
+                        d.html                      // Descriptions of data in class X
+
+                        ClassName_Y\
+                            ...
+                ...
+
+            idl\
+                ...
+            java\
+                ...
+        =========================================================================
+
+
+        @param i_sOutputDirectory
+            Directory for output. Path must be given in correct
+            syntax for the actual operating system without final
+            path delimiter. If this is 0 or "", the current
+            working directory is chosen.
+        @param i_rAryGate
+            The access to the Autodoc Repository.
+        @param i_rLayout
+            Gives parameters for the appearance of the HTML output.
+        @param i_pProjectList
+            If this is != 0, then only code entities which are declared
+            in this projects are displayed.
+    */
+    void                Run(
+                            const char *        i_sOutputDirectory,
+                            const ary::cpp::Gate &
+                                                i_rAryGate,
+                            const display::CorporateFrame &
+                                                i_rLayout );
+  private:
+    virtual void        do_Run(
+                            const char *        i_sOutputDirectory,
+                            const ary::cpp::Gate &
+                                                i_rAryGate,
+                            const display::CorporateFrame &
+                                                i_rLayout ) = 0;
+};
+
+// IMPLEMENTATION
+
+inline void
+HtmlDisplay_UdkStd::Run( const char *                    i_sOutputDirectory,
+                         const ary::cpp::Gate &          i_rAryGate,
+                         const display::CorporateFrame & i_rLayout )
+{
+    do_Run( i_sOutputDirectory, i_rAryGate, i_rLayout );
+}
+
+
+
+// class HtmlDisplay_Idl_Ifc
+
+class HtmlDisplay_Idl_Ifc
+{
+  public:
+    virtual             ~HtmlDisplay_Idl_Ifc() {}
+
+    void                Run(
+                            const char *        i_sOutputDirectory,
+                            const ary::idl::Gate &
+                                                i_rAryGate,
+                            const display::CorporateFrame &
+                                                i_rLayout );
+  private:
+    virtual void        do_Run(
+                            const char *        i_sOutputDirectory,
+                            const ary::idl::Gate &
+                                                i_rAryGate,
+                            const display::CorporateFrame &
+                                                i_rLayout ) = 0;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+HtmlDisplay_Idl_Ifc::Run( const char *                    i_sOutputDirectory,
+                          const ary::idl::Gate &          i_rAryGate,
+                          const display::CorporateFrame & i_rLayout )
+{
+    do_Run( i_sOutputDirectory, i_rAryGate, i_rLayout );
+}
+
+
+
+
+} // namespace autodoc
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/autodoc/dsp_txt_flist.hxx b/autodoc/inc/autodoc/dsp_txt_flist.hxx
new file mode 100644
index 000000000000..1b655bd939aa
--- /dev/null
+++ b/autodoc/inc/autodoc/dsp_txt_flist.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 AUTODOC_DSP_TXT_FLIST_HXX
+#define AUTODOC_DSP_TXT_FLIST_HXX
+
+#include <iostream>
+
+
+namespace ary
+{
+    namespace cpp
+    {
+        class DisplayGate;
+    }
+}
+
+
+namespace autodoc
+{
+
+class TextDisplay_FunctionList_Ifc
+{
+  public:
+    virtual             ~TextDisplay_FunctionList_Ifc() {}
+
+    /** Displays the names of all C++ functions and methods within the
+        given namespace (or the global namespace as default). All
+        subnamespaces are included.
+    */
+    virtual void        Run(
+                            ostream &           o_rStream,
+                            const ary::cpp::DisplayGate &
+                                                i_rAryGate ) = 0; /// If i_pNamespace == 0, the global namespace is displayed.
+};
+
+
+}   // namespace autodoc
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/autodoc/filecoli.hxx b/autodoc/inc/autodoc/filecoli.hxx
new file mode 100644
index 000000000000..f23d8fc060e2
--- /dev/null
+++ b/autodoc/inc/autodoc/filecoli.hxx
@@ -0,0 +1,74 @@
+/* -*- 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 ADC_PARSER_FILECOLI_HXX
+#define ADC_PARSER_FILECOLI_HXX
+
+
+namespace autodoc
+{
+
+class FileCollector_Ifc
+{
+  public:
+    // TYPES
+    typedef StringVector::const_iterator const_iterator;
+
+    enum E_SearchMode
+    {
+        flat,
+        recursive
+    };
+
+    // LIFECYCLE
+    virtual             ~FileCollector_Ifc() {}
+
+    // OPERATIONS
+    virtual uintt       AddFilesFrom(
+                            const char *        i_sRootDir,
+                            const char *        i_sFilter,
+                            E_SearchMode        i_eSearchMode ) = 0;
+    virtual uintt       AddFile(
+                            const char *        i_sFilePath ) = 0;
+    virtual void        EraseAll() = 0;
+
+    // INQUIRY
+    virtual const_iterator
+                        Begin() const = 0;
+    virtual const_iterator
+                        End() const = 0;
+    virtual uintt       Size() const = 0;
+};
+
+
+} // namespace autodoc
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/autodoc/parsing.hxx b/autodoc/inc/autodoc/parsing.hxx
new file mode 100644
index 000000000000..d0073af86731
--- /dev/null
+++ b/autodoc/inc/autodoc/parsing.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 AUTODOC_PARSING_HXX
+#define AUTODOC_PARSING_HXX
+
+
+
+namespace autodoc
+{
+
+class CodeParser_Ifc;
+class DocumentationParser_Ifc;
+class FileCollector_Ifc;
+
+
+/** Interface for parsing code of a programming language and
+    delivering the information into an Autodoc Repository.
+**/
+class ParseToolsFactory_Ifc
+{
+  public:
+    virtual             ~ParseToolsFactory_Ifc() {}
+    static ParseToolsFactory_Ifc &
+                        GetIt_();
+
+    virtual DYN autodoc::CodeParser_Ifc *
+                        Create_Parser_Cplusplus() const = 0;
+
+//  virtual DYN autodoc::CodeParser_Ifc *
+//                      CreateParser_UnoIDL() const = 0;
+//  virtual DYN autodoc::CodeParser_Ifc *
+//                      CreateParser_Java() const = 0;
+//  virtual DYN autodoc::CodeParser_Ifc *
+//                      CreateParser_StoredProcedures() const = 0;
+
+    virtual DYN autodoc::DocumentationParser_Ifc *
+                        Create_DocuParser_AutodocStyle() const = 0;
+
+//  virtual DYN autodoc::DocumentationParser_Ifc *
+//                      CreateDocuParser_StarOfficeAPIStyle() const = 0;
+
+    virtual DYN autodoc::FileCollector_Ifc *
+                        Create_FileCollector(
+                            uintt               i_nEstimatedNrOfFiles ) const = 0;  /// Should be somewhat larger than the maximal estimated number of files.
+};
+
+
+} // namespace autodoc
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/autodoc/prs_code.hxx b/autodoc/inc/autodoc/prs_code.hxx
new file mode 100644
index 000000000000..982fa91c6f79
--- /dev/null
+++ b/autodoc/inc/autodoc/prs_code.hxx
@@ -0,0 +1,79 @@
+/* -*- 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 AUTODOC_PRS_CODE_HXX
+#define AUTODOC_PRS_CODE_HXX
+
+
+
+namespace csv
+{
+    namespace ploc
+    {
+        class Path;
+    }
+}
+
+namespace ary
+{
+    class Repository;
+}
+
+namespace autodoc
+{
+    class FileCollector_Ifc;
+    class DocumentationParser_Ifc;
+
+
+
+
+/** Interface for parsing code of a programming language and
+    delivering the information into an Autodoc Repository.
+**/
+class CodeParser_Ifc
+{
+  public:
+    virtual             ~CodeParser_Ifc() {}
+
+    virtual void        Setup(
+                            ary::Repository &   o_rRepository,
+                            const autodoc::DocumentationParser_Ifc &
+                                                i_rDocumentationInterpreter ) = 0;
+
+    virtual void        Run(
+                            const autodoc::FileCollector_Ifc &
+                                                i_rFiles ) = 0;
+};
+
+
+
+
+} // namespace autodoc
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/autodoc/prs_docu.hxx b/autodoc/inc/autodoc/prs_docu.hxx
new file mode 100644
index 000000000000..93608b51b541
--- /dev/null
+++ b/autodoc/inc/autodoc/prs_docu.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 ADC_PARSER_PRS_DOCU_HXX
+#define ADC_PARSER_PRS_DOCU_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+
+namespace autodoc
+{
+
+class TkpDocuContext;
+
+class DocumentationParser_Ifc
+{
+  public:
+    virtual             ~DocumentationParser_Ifc() {}
+
+    virtual DYN TkpDocuContext *
+                        Create_DocuContext() const = 0;
+};
+
+
+} // namespace autodoc
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/autodoc/x_parsing.hxx b/autodoc/inc/autodoc/x_parsing.hxx
new file mode 100644
index 000000000000..f33615576821
--- /dev/null
+++ b/autodoc/inc/autodoc/x_parsing.hxx
@@ -0,0 +1,76 @@
+/* -*- 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 AUTODOC_X_PARSING_HXX
+#define AUTODOC_X_PARSING_HXX
+
+// USED SERVICES
+#include <iostream>
+
+
+
+
+namespace autodoc
+{
+
+class X_Parser_Ifc
+{
+  public:
+    // TYPES
+    enum E_Event
+    {
+        x_Any                       = 0,
+        x_InvalidChar,
+        x_UnexpectedToken,
+        x_UnexpectedEOF,
+        x_UnspecifiedSyntaxError
+    };
+
+    // LIFECYCLE
+    virtual             ~X_Parser_Ifc() {}
+
+    // INQUIRY
+    virtual E_Event     GetEvent() const = 0;
+    virtual void        GetInfo(
+                            std::ostream &      o_rOutputMedium ) const = 0;
+};
+
+
+}   // namespace autodoc
+
+std::ostream &      operator<<(
+                        std::ostream &      o_rOut,
+                        const autodoc::X_Parser_Ifc &
+                                            i_rException );
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/display/corframe.hxx b/autodoc/inc/display/corframe.hxx
new file mode 100644
index 000000000000..cacc41caa249
--- /dev/null
+++ b/autodoc/inc/display/corframe.hxx
@@ -0,0 +1,84 @@
+/* -*- 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 ADC_CORFRAME_HXX
+#define ADC_CORFRAME_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+class Html_Image;
+
+
+namespace display
+{
+
+
+class CorporateFrame
+{
+  public:
+    // LIFECYCLE
+    virtual             ~CorporateFrame() {}
+
+    // INQUIRY
+    virtual DYN Html_Image *
+                        LogoSrc() const = 0;
+    virtual const char *
+                        LogoLink() const = 0;
+    virtual const char *
+                        CopyrightText() const = 0;
+
+    virtual const char *
+                        CssStyle() const = 0;
+    virtual const char *
+                        CssStylesExplanation() const = 0;
+    virtual const char *
+                        DevelopersGuideHtmlRoot() const = 0;
+    virtual bool        SimpleLinks() const = 0;
+
+    // ACCESS
+    virtual void        Set_DevelopersGuideHtmlRoot(
+                            const String &      i_directory ) = 0;
+    virtual void        Set_SimpleLinks() = 0;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace display
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/parser/parser.hxx b/autodoc/inc/parser/parser.hxx
new file mode 100644
index 000000000000..e06898211b90
--- /dev/null
+++ b/autodoc/inc/parser/parser.hxx
@@ -0,0 +1,59 @@
+/* -*- 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 ADC_PARSER_HXX
+#define ADC_PARSER_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+namespace autodoc
+{
+    class FileCollector_Ifc;
+}
+
+
+class CodeParser
+{
+  public:
+    virtual             ~CodeParser() {}
+
+    virtual void        Run(
+                            const autodoc::FileCollector_Ifc &
+                                                i_rFiles ) = 0;
+};
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/parser/parserinfo.hxx b/autodoc/inc/parser/parserinfo.hxx
new file mode 100644
index 000000000000..db524145c8cd
--- /dev/null
+++ b/autodoc/inc/parser/parserinfo.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 ADC_PARSERINFO_HXX
+#define ADC_PARSERINFO_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+/** Interface about current state of parsing.
+*/
+class ParserInfo
+{
+  public:
+    // OPERATIONS
+    void                Set_CurFile(
+                            const String &      i_file,
+                            bool                i_bUseLines = false)
+                                                { sCurFile = i_file;
+                                                  nCurLine = i_bUseLines ? 1 : 0; }
+    void                Increment_CurLine()
+                                                { ++nCurLine; }
+
+    // INQUIRY
+    const String &      CurFile() const         { return sCurFile; }
+    uintt               CurLine() const         { return nCurLine; }
+
+  protected:
+    // LIFECYCLE
+                        ParserInfo()            : sCurFile(), nCurLine(0) {}
+                        ~ParserInfo()           {}
+  private:
+    String              sCurFile;
+    uintt               nCurLine;
+
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/inc/parser/unoidl.hxx b/autodoc/inc/parser/unoidl.hxx
new file mode 100644
index 000000000000..f83809054f64
--- /dev/null
+++ b/autodoc/inc/parser/unoidl.hxx
@@ -0,0 +1,81 @@
+/* -*- 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 ADC_UNOIDL_HXX
+#define ADC_UNOIDL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <parser/parser.hxx>
+#include <parser/parserinfo.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+    class Repository;
+}
+namespace autodoc
+{
+    class FileCollector_Ifc;
+}
+
+namespace autodoc
+{
+
+
+class IdlParser : public ::CodeParser,
+                  public ::ParserInfo
+{
+  public:
+                        IdlParser(
+                            ary::Repository &       io_rRepository );
+
+    virtual void        Run(
+                            const autodoc::FileCollector_Ifc &
+                                                i_rFiles );
+
+  private:
+    // DATA
+    ary::Repository *   pRepository;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace autodoc
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/prj/build.lst b/autodoc/prj/build.lst
new file mode 100644
index 000000000000..fd4d3f7c7963
--- /dev/null
+++ b/autodoc/prj/build.lst
@@ -0,0 +1,67 @@
+ar	autodoc	:  cosv udm sal NULL
+ar	autodoc								usr1	-	all	ar_mkout NULL
+ar	autodoc\inc							get	    -	all	ar_i NULL
+ar	autodoc\inc\ary			  			get		-	all	ar_ir NULL
+ar	autodoc\inc\ary\cpp		  			get		-	all	ar_ir_cpp NULL
+ar	autodoc\inc\ary\idl		  			get		-	all	ar_ir_idl NULL
+ar	autodoc\inc\ary\info	  			get		-	all	ar_ir_info NULL
+ar	autodoc\inc\ary\loc	  			    get		-	all	ar_ir_loc NULL
+ar	autodoc\inc\ary\task	  			get		-	all	ar_ir_task NULL
+ar	autodoc\inc\ary_i		  			get		-	all	ar_ir_cinfo NULL
+ar	autodoc\inc\autodoc		  			get		-	all	ar_iau NULL
+ar	autodoc\inc\display 	  			get		-	all	ar_idispl2 NULL
+ar	autodoc\inc\parser 		  			get		-	all	ar_iparse2 NULL
+ar	autodoc\prj							get		-	all	ar_prj NULL
+ar	autodoc\util						get		-	all	ar_util NULL
+ar	autodoc\source						get		-	all	ar_s NULL
+ar	autodoc\source\inc					get		-	all	ar_si NULL
+ar	autodoc\source\inc\display  		get		-	all	ar_si_display NULL
+ar	autodoc\source\inc\oodb       		get		-	all	ar_si_oodb2 NULL
+ar	autodoc\source\inc\tools     		get		-	all	ar_si_tools NULL
+ar	autodoc\source\inc\utility     		get		-	all	ar_si_util2 NULL
+ar	autodoc\source\ary					get		-	all	ar_sr NULL
+ar	autodoc\source\ary\inc				get		-	all	ar_sri NULL
+ar	autodoc\source\ary\inc\cpp			get		-	all	ar_sri_cpp NULL
+ar	autodoc\source\ary\inc\idl			get		-	all	ar_sri_idl NULL
+ar	autodoc\source\ary\inc\loc			get		-	all	ar_sri_loc NULL
+ar	autodoc\source\ary\inc\store		get		-	all	ar_sri_store NULL
+ar	autodoc\source\ary\cpp	 			nmake	-	all	ar_sr_cpp NULL
+ar	autodoc\source\ary\doc 			    nmake	-	all	ar_sr_doc NULL
+ar	autodoc\source\ary\idl	 			nmake	-	all	ar_sr_idl NULL
+ar	autodoc\source\ary\info	 			nmake	-	all	ar_sr_info NULL
+ar	autodoc\source\ary\kernel			nmake	-	all	ar_sr_kernel NULL
+ar	autodoc\source\ary\loc	 			nmake 	-	all	ar_sr_loc NULL
+ar	autodoc\source\ary_i			    get		-	all	ar_sr_i NULL
+ar	autodoc\source\ary_i\kernel			nmake	-	all	ar_sr_cinfo NULL
+ar	autodoc\source\display				get		-	all	ar_sd NULL
+ar	autodoc\source\display\inc			get		-	all	ar_sdi NULL
+ar	autodoc\source\display\inc\funclist	get		-	all	ar_sdi_flist NULL
+ar	autodoc\source\display\inc\html 	get		-	all	ar_sdi_html NULL
+ar	autodoc\source\display\html	        nmake	-	all	ar_sd_html NULL
+ar	autodoc\source\display\kernel	    nmake	-	all	ar_sd_kernel NULL
+ar	autodoc\source\display\idl          nmake	-	all	ar_sd_idl NULL
+ar	autodoc\source\display\toolkit      nmake	-	all	ar_sd_tkit NULL
+ar	autodoc\source\parser				get		-	all	ar_sp NULL
+ar	autodoc\source\parser\inc			get		-	all	ar_spi NULL
+ar	autodoc\source\parser\inc\adoc		get		-	all	ar_spi_adoc NULL
+ar	autodoc\source\parser\inc\cpp 		get		-	all	ar_spi_cpp NULL
+ar	autodoc\source\parser\inc\semantic	get		-	all	ar_spi_sem NULL
+ar	autodoc\source\parser\inc\tokens	get		-	all	ar_spi_tok NULL
+ar	autodoc\source\parser\adoc			nmake	-	all	ar_sp_adoc NULL
+ar	autodoc\source\parser\cpp			nmake	-	all	ar_sp_cpp NULL
+ar	autodoc\source\parser\kernel		nmake	-	all	ar_sp_krnl NULL
+ar	autodoc\source\parser\semantic		nmake	-	all	ar_sp_sem NULL
+ar	autodoc\source\parser\tokens		nmake	-	all	ar_sp_tok NULL
+ar	autodoc\source\parser_i				get		-	all	ar_sp2 NULL
+ar	autodoc\source\parser_i\inc			    get		-	all	ar_sp2i NULL
+ar	autodoc\source\parser_i\inc\s2_dsapi	get		-	all	ar_sp2i_idoc NULL
+ar	autodoc\source\parser_i\inc\s2_luidl	get		-	all	ar_sp2i_cpp NULL
+ar	autodoc\source\parser_i\inc\semantic	get		-	all	ar_sp2i_sem NULL
+ar	autodoc\source\parser_i\inc\tokens	    get		-	all	ar_sp2i_tok NULL
+ar	autodoc\source\parser_i\idl	  		nmake	-	all	ar_sp2_idl NULL
+ar	autodoc\source\parser_i\idoc  		nmake	-	all	ar_sp2_idoc NULL
+ar	autodoc\source\parser_i\tokens		nmake	-	all	ar_sp2_tok NULL
+ar	autodoc\source\tools				nmake	-	all	ar_st NULL
+ar	autodoc\source\mkinc				get		-	all	ar_smk NULL
+ar	autodoc\source\exes					get		-	all	ar_se NULL
+ar	autodoc\source\exes\adc_uni			nmake	-	all	ar_se_uni ar_sr_cpp ar_sr_doc ar_sr_idl ar_sr_info ar_sr_kernel ar_sr_loc ar_sr_cinfo ar_sd_html ar_sd_kernel ar_sd_idl ar_sp_adoc ar_sp_cpp ar_sp_krnl ar_sp_sem ar_sp_tok ar_sp2_idl ar_sd_tkit ar_sp2_idoc ar_sp2_tok ar_st NULL
diff --git a/autodoc/prj/d.lst b/autodoc/prj/d.lst
new file mode 100644
index 000000000000..99ad21da987c
--- /dev/null
+++ b/autodoc/prj/d.lst
@@ -0,0 +1,3 @@
+..\%__SRC%\bin\autodoc.exe %_DEST%\bin\autodoc.exe
+..\%__SRC%\bin\autodoc %_DEST%\bin\autodoc
+
diff --git a/autodoc/source/ary/cpp/c_builtintype.cxx b/autodoc/source/ary/cpp/c_builtintype.cxx
new file mode 100644
index 000000000000..f6168f197856
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_builtintype.cxx
@@ -0,0 +1,130 @@
+/* -*- 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 <precomp.h>
+#include <ary/cpp/c_builtintype.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_type.hxx>
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+
+//**********************        Type        **************************//
+Rid
+Type::inq_RelatedCe() const
+{
+     return 0;
+}
+
+
+//**********************        BuiltInType        **************************//
+
+BuiltInType::BuiltInType( const String  &       i_sName,
+                          E_TypeSpecialisation  i_eSpecialisation )
+    :   sName( i_sName ),
+        eSpecialisation( i_eSpecialisation )
+{
+}
+
+String
+BuiltInType::SpecializedName_( const char *         i_sName,
+                               E_TypeSpecialisation i_eTypeSpecialisation )
+{
+    StreamLock
+        aStrLock(60);
+    StreamStr &
+        ret = aStrLock();
+
+    switch ( i_eTypeSpecialisation )
+    {
+        case TYSP_unsigned:
+                    ret << "u_";
+                    break;
+        case TYSP_signed:
+                    if (strcmp(i_sName,"char") == 0)
+                        ret << "s_";
+                    break;
+        default:
+                    ;
+
+    }   // end switch
+
+    ret << i_sName;
+    return String(ret.c_str());
+}
+
+void
+BuiltInType::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ary::ClassId
+BuiltInType::get_AryClass() const
+{
+    return class_id;
+}
+
+bool
+BuiltInType::inq_IsConst() const
+{
+    return false;
+}
+
+void
+BuiltInType::inq_Get_Text( StreamStr &      ,               // o_rPreName
+                           StreamStr &      o_rName,
+                           StreamStr &      ,               // o_rPostName
+                           const Gate &     ) const         // i_rGate
+{
+    switch (eSpecialisation)
+    {
+        case TYSP_unsigned: o_rName << "unsigned "; break;
+        case TYSP_signed:   o_rName << "signed ";   break;
+
+        default:            // Does nothing.
+                            ;
+    }
+    o_rName << sName;
+}
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/c_class.cxx b/autodoc/source/ary/cpp/c_class.cxx
new file mode 100644
index 000000000000..33aa04a8c5ac
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_class.cxx
@@ -0,0 +1,287 @@
+/* -*- 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 <precomp.h>
+#include <ary/cpp/c_class.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <slots.hxx>
+#include "c_slots.hxx"
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+Class::Class( const String  &     i_sLocalName,
+              Ce_id               i_nOwner,
+              E_Protection        i_eProtection,
+              loc::Le_id          i_nFile,
+              E_ClassKey          i_eClassKey )
+    :   aEssentials( i_sLocalName,
+                     i_nOwner,
+                     i_nFile ),
+        aAssignedNode(),
+           aBaseClasses(),
+           aTemplateParameterTypes(),
+        aClasses(),
+        aEnums(),
+        aTypedefs(),
+        aOperations(),
+        aStaticOperations(),
+        aData(),
+        aStaticData(),
+        aFriendClasses(),
+        aFriendOperations(),
+        aKnownDerivatives(),
+        eClassKey(i_eClassKey),
+        eProtection(i_eProtection),
+        eVirtuality(VIRTUAL_none)
+{
+    aAssignedNode.Assign_Entity(*this);
+}
+
+Class::~Class()
+{
+}
+
+void
+Class::Add_BaseClass( const S_Classes_Base & i_rBaseClass )
+{
+    aBaseClasses.push_back(i_rBaseClass);
+}
+
+void
+Class::Add_TemplateParameterType( const String  &     i_sLocalName,
+                                  Type_id             i_nIdAsType )
+{
+    aTemplateParameterTypes.push_back(
+            List_TplParam::value_type(i_sLocalName,i_nIdAsType) );
+}
+
+void
+Class::Add_LocalClass( const String  &     i_sLocalName,
+                       Cid                 i_nId )
+{
+    aClasses.push_back( S_LocalCe(i_sLocalName, i_nId) );
+}
+
+void
+Class::Add_LocalEnum( const String  &     i_sLocalName,
+                      Cid                 i_nId )
+{
+    aEnums.push_back( S_LocalCe(i_sLocalName, i_nId) );
+}
+
+void
+Class::Add_LocalTypedef( const String  &     i_sLocalName,
+                         Cid                 i_nId )
+{
+    aTypedefs.push_back( S_LocalCe(i_sLocalName, i_nId) );
+}
+
+void
+Class::Add_LocalOperation( const String  &          i_sLocalName,
+                           Cid                      i_nId )
+{
+    aOperations.push_back( S_LocalCe(i_sLocalName, i_nId) );
+}
+
+void
+Class::Add_LocalStaticOperation( const String  &     i_sLocalName,
+                                 Cid                 i_nId )
+{
+    aStaticOperations.push_back( S_LocalCe(i_sLocalName, i_nId) );
+}
+
+void
+Class::Add_LocalData( const String  &     i_sLocalName,
+                      Cid                 i_nId )
+{
+    aData.push_back( S_LocalCe(i_sLocalName, i_nId) );
+}
+
+void
+Class::Add_LocalStaticData( const String  &     i_sLocalName,
+                            Cid                 i_nId )
+{
+    aStaticData.push_back( S_LocalCe(i_sLocalName, i_nId) );
+}
+
+
+struct find_name
+{
+                        find_name(
+                            const String &      i_name )
+                            :   sName(i_name) {}
+
+    bool                operator()(
+                            const S_LocalCe &   i_lce ) const
+                            { return i_lce.sLocalName == sName; }
+  private:
+    String              sName;
+};
+
+Ce_id
+Class::Search_Child(const String & i_key) const
+{
+    Ce_id
+        ret = Ce_id(Search_LocalClass(i_key));
+    if (ret.IsValid())
+        return ret;
+
+    CIterator_Locals
+        itret = std::find_if(aEnums.begin(), aEnums.end(), find_name(i_key));
+    if (itret != aEnums.end())
+        return (*itret).nId;
+    itret = std::find_if(aTypedefs.begin(), aTypedefs.end(), find_name(i_key));
+    if (itret != aTypedefs.end())
+        return (*itret).nId;
+    itret = std::find_if(aData.begin(), aData.end(), find_name(i_key));
+    if (itret != aData.end())
+        return (*itret).nId;
+    itret = std::find_if(aStaticData.begin(), aStaticData.end(), find_name(i_key));
+    if (itret != aStaticData.end())
+        return (*itret).nId;
+    return Ce_id(0);
+}
+
+Rid
+Class::Search_LocalClass( const String  & i_sName ) const
+{
+     CIterator_Locals itFound = PosOfName(aClasses, i_sName);
+    if (itFound != aClasses.end())
+        return (*itFound).nId.Value();
+    return 0;
+}
+
+const String  &
+Class::inq_LocalName() const
+{
+    return aEssentials.LocalName();
+}
+
+Cid
+Class::inq_Owner() const
+{
+    return aEssentials.Owner();
+}
+
+loc::Le_id
+Class::inq_Location() const
+{
+    return aEssentials.Location();
+}
+
+void
+Class::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Class::get_AryClass() const
+{
+    return class_id;
+}
+
+Gid
+Class::inq_Id_Group() const
+{
+     return static_cast<Gid>(Id());
+}
+
+const ary::cpp::CppEntity &
+Class::inq_RE_Group() const
+{
+     return *this;
+}
+
+const group::SlotList &
+Class::inq_Slots() const
+{
+    static const SlotAccessId aProjectSlotData[]
+            = { SLOT_Bases,
+                SLOT_NestedClasses,
+                SLOT_Enums,
+                SLOT_Typedefs,
+                SLOT_Operations,
+                SLOT_StaticOperations,
+                SLOT_Data,
+                SLOT_StaticData,
+                SLOT_FriendClasses,
+                SLOT_FriendOperations };
+    static const std::vector< SlotAccessId >
+            aSlots( &aProjectSlotData[0],
+                      &aProjectSlotData[0]
+                        + sizeof aProjectSlotData / sizeof (SlotAccessId) );
+    return aSlots;
+}
+
+
+DYN Slot *
+Class::inq_Create_Slot( SlotAccessId i_nSlot ) const
+{
+    switch ( i_nSlot )
+    {
+        case SLOT_Bases:                return new Slot_BaseClass(aBaseClasses);
+        case SLOT_NestedClasses:        return new Slot_ListLocalCe(aClasses);
+        case SLOT_Enums:                return new Slot_ListLocalCe(aEnums);
+        case SLOT_Typedefs:             return new Slot_ListLocalCe(aTypedefs);
+        case SLOT_Operations:           return new Slot_ListLocalCe(aOperations);
+        case SLOT_StaticOperations:     return new Slot_ListLocalCe(aStaticOperations);
+        case SLOT_Data:                 return new Slot_ListLocalCe(aData);
+        case SLOT_StaticData:           return new Slot_ListLocalCe(aStaticData);
+        case SLOT_FriendClasses:        return new Slot_SequentialIds<Ce_id>(aFriendClasses);
+        case SLOT_FriendOperations:     return new Slot_SequentialIds<Ce_id>(aFriendOperations);
+        default:
+                                        return new Slot_Null;
+    }   // end switch
+}
+
+Class::CIterator_Locals
+Class::PosOfName( const List_LocalCe &  i_rList,
+                  const String  &       i_sName ) const
+{
+    for ( CIterator_Locals ret = i_rList.begin();
+          ret != i_rList.end();
+          ++ret )
+    {
+         if ( (*ret).sLocalName == i_sName )
+            return ret;
+    }
+    return i_rList.end();
+}
+
+}   //  namespace   cpp
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/c_de.cxx b/autodoc/source/ary/cpp/c_de.cxx
new file mode 100644
index 000000000000..704bc697e239
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_de.cxx
@@ -0,0 +1,54 @@
+/* -*- 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 <precomp.h>
+#include <ary/cpp/c_de.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+DefineEntity::DefineEntity( const String  &     i_name,
+                            loc::Le_id          i_declaringFile )
+    :   sName(i_name),
+        nLocation(i_declaringFile)
+{
+}
+
+
+
+
+}   // end namespace cpp
+}   // end namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/c_define.cxx b/autodoc/source/ary/cpp/c_define.cxx
new file mode 100644
index 000000000000..6ea6b8f6a04f
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_define.cxx
@@ -0,0 +1,79 @@
+/* -*- 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 <precomp.h>
+#include <ary/cpp/c_define.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <prprpr.hxx>
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+Define::Define( const String  &         i_name,
+                const StringVector &    i_definition,
+                loc::Le_id              i_declaringFile)
+    :   DefineEntity(i_name, i_declaringFile),
+        aDefinition(i_definition)
+{
+}
+
+Define::~Define()
+{
+}
+
+void
+Define::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Define::get_AryClass() const
+{
+    return class_id;
+}
+
+const StringVector &
+Define::inq_DefinitionText() const
+{
+     return aDefinition;
+}
+
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/c_enum.cxx b/autodoc/source/ary/cpp/c_enum.cxx
new file mode 100644
index 000000000000..e4f8ad15983c
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_enum.cxx
@@ -0,0 +1,137 @@
+/* -*- 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 <precomp.h>
+#include <ary/cpp/c_enum.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <slots.hxx>
+#include "c_slots.hxx"
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+Enum::Enum( const String  &     i_sLocalName,
+            Ce_id               i_nOwner,
+            E_Protection        i_eProtection,
+            Lid                 i_nFile )
+    :   aEssentials( i_sLocalName,
+                     i_nOwner,
+                     i_nFile ),
+        aValues(),
+        eProtection(i_eProtection)
+{
+}
+
+Enum::~Enum()
+{
+}
+
+void
+Enum::Add_Value( Ce_id i_nId )
+{
+    aValues.Add( i_nId );
+}
+
+const String  &
+Enum::inq_LocalName() const
+{
+    return aEssentials.LocalName();
+}
+
+Cid
+Enum::inq_Owner() const
+{
+    return aEssentials.Owner();
+}
+
+Lid
+Enum::inq_Location() const
+{
+    return aEssentials.Location();
+}
+
+void
+Enum::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Enum::get_AryClass() const
+{
+    return class_id;
+}
+
+Gid
+Enum::inq_Id_Group() const
+{
+    return static_cast<Gid>(Id());
+}
+
+const ary::cpp::CppEntity &
+Enum::inq_RE_Group() const
+{
+    return *this;
+}
+
+const group::SlotList &
+Enum::inq_Slots() const
+{
+    static const SlotAccessId aProjectSlotData[]
+            = { SLOT_Values };
+    static const std::vector< SlotAccessId >
+            aSlots( &aProjectSlotData[0],
+                      &aProjectSlotData[0]
+                        + sizeof aProjectSlotData / sizeof (SlotAccessId) );
+    return aSlots;
+}
+
+DYN Slot *
+Enum::inq_Create_Slot( SlotAccessId  i_nSlot ) const
+{
+    switch ( i_nSlot )
+    {
+        case SLOT_Values:               return new Slot_SequentialIds<Ce_id>(aValues);
+        default:
+                                        return new Slot_Null;
+    }   // end switch
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/c_enuval.cxx b/autodoc/source/ary/cpp/c_enuval.cxx
new file mode 100644
index 000000000000..1641689895d4
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_enuval.cxx
@@ -0,0 +1,90 @@
+/* -*- 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 <precomp.h>
+#include <ary/cpp/c_enuval.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+EnumValue::EnumValue( const String  &     i_sLocalName,
+                      Ce_id               i_nOwner,
+                      String              i_sInitialisation )
+    :   aEssentials( i_sLocalName,
+                     i_nOwner,
+                     Lid(0) ),
+           sInitialisation(i_sInitialisation)
+{
+}
+
+EnumValue::~EnumValue()
+{
+}
+
+const String  &
+EnumValue::inq_LocalName() const
+{
+    return aEssentials.LocalName();
+}
+
+Cid
+EnumValue::inq_Owner() const
+{
+    return aEssentials.Owner();
+}
+
+Lid
+EnumValue::inq_Location() const
+{
+    return aEssentials.Location();
+}
+
+void
+EnumValue::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+EnumValue::get_AryClass() const
+{
+    return class_id;
+}
+
+
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/c_funct.cxx b/autodoc/source/ary/cpp/c_funct.cxx
new file mode 100644
index 000000000000..514e294f2bef
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_funct.cxx
@@ -0,0 +1,250 @@
+/* -*- 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 <precomp.h>
+#include <ary/cpp/c_funct.hxx>
+
+
+
+// NOT FULLY DECLARED SERVICES
+#include <algorithm>
+#include <ary/cpp/c_funct.hxx>
+
+
+
+
+
+namespace
+{
+using namespace ::ary::cpp;
+
+
+class Parameter_2_NonTypeParamInfo
+{
+  public:
+    String              operator()(
+                            const S_Parameter & i_rParam ) const;
+};
+
+class Parameter_2_Type
+{
+  public:
+    Type_id             operator()(
+                            const S_Parameter & i_rParam ) const
+                                                { return i_rParam.nType; }
+};
+
+/** @return
+    A vector with Strings like this:
+        "ParamName" or "ParamName[ArraySize]" or "ParamName = InitValue".
+*/
+StringVector        Create_NonTypeParameterInfos(
+                        const std::vector<S_Parameter> &
+                                            i_rParameters );
+/** @return
+    A vector of the parameters' type ids.
+*/
+std::vector<Type_id>
+                    Create_ParameterTypeList(
+                        const std::vector<S_Parameter> &
+                                            i_rParameters );
+
+}   // namspace anonymous
+
+
+namespace ary
+{
+namespace cpp
+{
+
+Function::Function( const String  &             i_sLocalName,
+                    Ce_id                       i_nOwner,
+                    E_Protection                i_eProtection,
+                    Lid                         i_nFile,
+                    Type_id                     i_nReturnType,
+                    const std::vector<S_Parameter> &
+                                                i_parameters,
+                    E_ConVol                    i_conVol,
+                    E_Virtuality                i_eVirtuality,
+                    FunctionFlags               i_aFlags,
+                    bool                        i_bThrowExists,
+                    const std::vector<Type_id> &
+                                                i_rExceptions )
+    :   aEssentials( i_sLocalName,
+                     i_nOwner,
+                     i_nFile ),
+        aTemplateParameterTypes(),
+        aSignature( Create_ParameterTypeList(i_parameters),
+                    i_conVol ),
+        nReturnType(i_nReturnType),
+        eProtection(i_eProtection),
+        eVirtuality(i_eVirtuality),
+        aFlags(i_aFlags),
+        aParameterInfos( Create_NonTypeParameterInfos(i_parameters) ),
+        pExceptions( i_bThrowExists ? new ExceptionTypeList(i_rExceptions) : 0 )
+{
+}
+
+Function::~Function()
+{
+}
+
+bool
+Function::IsIdentical( const Function & i_f ) const
+{
+    return
+        LocalName() == i_f.LocalName()
+        AND
+        Owner() == i_f.Owner()
+        AND
+        aSignature == i_f.aSignature
+        AND
+        nReturnType == i_f.nReturnType
+        AND
+        eProtection == i_f.eProtection
+        AND
+        eVirtuality == i_f.eVirtuality
+        AND
+        aFlags == i_f.aFlags
+        AND
+        ( ( NOT pExceptions AND NOT i_f.pExceptions )
+          OR
+          ( pExceptions AND i_f.pExceptions
+                ?   *pExceptions == *i_f.pExceptions
+                :   false )
+        )
+        AND
+        aTemplateParameterTypes.size() == i_f.aTemplateParameterTypes.size();
+}
+
+void
+Function::Add_TemplateParameterType( const String  &    i_sLocalName,
+                                     Type_id            i_nIdAsType )
+{
+    aTemplateParameterTypes.push_back(
+        List_TplParam::value_type(i_sLocalName, i_nIdAsType) );
+}
+
+
+const String  &
+Function::inq_LocalName() const
+{
+    return aEssentials.LocalName();
+}
+
+Cid
+Function::inq_Owner() const
+{
+    return aEssentials.Owner();
+}
+
+Lid
+Function::inq_Location() const
+{
+    return aEssentials.Location();
+}
+
+void
+Function::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Function::get_AryClass() const
+{
+    return class_id;
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
+
+
+
+namespace
+{
+
+String
+Parameter_2_NonTypeParamInfo::operator()( const ary::cpp::S_Parameter & i_rParam ) const
+{
+    static StreamStr aParamName_(1020);
+    aParamName_.seekp(0);
+
+    aParamName_ << i_rParam.sName;
+    if ( i_rParam.sSizeExpression.length() > 0 )
+    {
+        aParamName_ << '['
+                    << i_rParam.sSizeExpression
+                    << ']';
+    }
+    if ( i_rParam.sInitExpression.length() > 0 )
+    {
+        aParamName_ << " = "
+                    << i_rParam.sInitExpression;
+    }
+
+    return aParamName_.c_str();
+}
+
+
+StringVector
+Create_NonTypeParameterInfos( const std::vector<S_Parameter> & i_rParameters )
+{
+    static Parameter_2_NonTypeParamInfo
+        aTransformFunction_;
+
+    StringVector
+        ret(i_rParameters.size(), String::Null_());
+    std::transform( i_rParameters.begin(), i_rParameters.end(),
+                    ret.begin(),
+                    aTransformFunction_ );
+    return ret;
+}
+
+std::vector<Type_id>
+Create_ParameterTypeList( const std::vector<S_Parameter> & i_rParameters )
+{
+    static Parameter_2_Type
+        aTransformFunction_;
+
+    std::vector<Type_id>
+        ret(i_rParameters.size(), Type_id(0));
+    std::transform( i_rParameters.begin(), i_rParameters.end(),
+                    ret.begin(),
+                    aTransformFunction_ );
+    return ret;
+}
+
+
+
+
+}   // namespace anonymous
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/c_macro.cxx b/autodoc/source/ary/cpp/c_macro.cxx
new file mode 100644
index 000000000000..2fad2c0fe5aa
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_macro.cxx
@@ -0,0 +1,81 @@
+/* -*- 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 <precomp.h>
+#include <ary/cpp/c_macro.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <prprpr.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+Macro::Macro( const String  &       i_name,
+              const StringVector &  i_params,
+              const StringVector &  i_definition,
+              loc::Le_id            i_declaringFile )
+    :   DefineEntity(i_name, i_declaringFile),
+        aParams(i_params),
+        aDefinition(i_definition)
+{
+}
+
+Macro::~Macro()
+{
+}
+
+void
+Macro::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Macro::get_AryClass() const
+{
+    return class_id;
+
+    // return RCID_MACRO;
+}
+
+const StringVector &
+Macro::inq_DefinitionText() const
+{
+     return aDefinition;
+}
+
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/c_namesp.cxx b/autodoc/source/ary/cpp/c_namesp.cxx
new file mode 100644
index 000000000000..133f8e96c812
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_namesp.cxx
@@ -0,0 +1,295 @@
+/* -*- 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 <precomp.h>
+#include <ary/cpp/c_namesp.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <algorithm>
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/getncast.hxx>
+#include <slots.hxx>
+#include "c_slots.hxx"
+
+
+namespace ary
+{
+namespace cpp
+{
+
+typedef std::multimap<String, Ce_id>::const_iterator      operations_citer;
+
+Namespace::Namespace()
+    :   aEssentials(),
+        aAssignedNode(),
+        // aLocalNamespaces,
+        // aLocalClasses,
+        // aLocalEnums,
+        // aLocalTypedefs,
+        // aLocalOperations,
+        // aLocalVariables,
+        // aLocalConstants,
+        pParent(0),
+        nDepth(0)
+{
+    aAssignedNode.Assign_Entity(*this);
+}
+
+Namespace::Namespace( const String  &     i_sLocalName,
+                      Namespace &         i_rParent )
+    :   aEssentials( i_sLocalName,
+                     i_rParent.CeId(),
+                     Lid(0) ),
+        aAssignedNode(),
+        // aLocalNamespaces,
+        // aLocalClasses,
+        // aLocalEnums,
+        // aLocalTypedefs,
+        // aLocalOperations,
+        // aLocalVariables,
+        // aLocalConstants,
+        pParent(&i_rParent),
+        nDepth(i_rParent.Depth()+1)
+{
+    aAssignedNode.Assign_Entity(*this);
+}
+
+Namespace::~Namespace()
+{
+}
+
+void
+Namespace::Add_LocalNamespace( DYN Namespace & io_rLocalNamespace )
+{
+    aLocalNamespaces[io_rLocalNamespace.LocalName()] = &io_rLocalNamespace;
+}
+
+void
+Namespace::Add_LocalClass( const String  &     i_sLocalName,
+                           Cid                 i_nId )
+{
+    aLocalClasses[i_sLocalName] = i_nId;
+}
+
+void
+Namespace::Add_LocalEnum( const String  &     i_sLocalName,
+                          Cid                 i_nId )
+{
+    aLocalEnums[i_sLocalName] = i_nId;
+}
+
+void
+Namespace::Add_LocalTypedef( const String  &     i_sLocalName,
+                             Cid                 i_nId )
+{
+    aLocalTypedefs[i_sLocalName] = i_nId;
+}
+
+void
+Namespace::Add_LocalOperation( const String  &     i_sLocalName,
+                               Cid                 i_nId )
+{
+    aLocalOperations.insert( Map_Operations::value_type(i_sLocalName, i_nId) );
+}
+
+
+void
+Namespace::Add_LocalVariable( const String  &     i_sLocalName,
+                              Cid                 i_nId )
+{
+    aLocalVariables[i_sLocalName] = i_nId;
+}
+
+void
+Namespace::Add_LocalConstant( const String  &     i_sLocalName,
+                              Cid                 i_nId )
+{
+    aLocalConstants[i_sLocalName] = i_nId;
+}
+
+uintt
+Namespace::Depth() const
+{
+    return nDepth;
+}
+
+Namespace *
+Namespace::Parent() const
+{
+    return pParent;
+}
+
+Ce_id
+Namespace::Search_Child(const String & i_key) const
+{
+    Namespace *
+        ret_nsp = Search_LocalNamespace(i_key);
+    if (ret_nsp != 0)
+        return ret_nsp->CeId();
+
+    Ce_id
+        ret = Search_LocalClass(i_key);
+    if (ret.IsValid())
+        return ret;
+
+    ret = csv::value_from_map(aLocalEnums, i_key, Ce_id(0));
+    if (ret.IsValid())
+        return ret;
+    ret = csv::value_from_map(aLocalTypedefs, i_key, Ce_id(0));
+    if (ret.IsValid())
+        return ret;
+    ret = csv::value_from_map(aLocalVariables, i_key, Ce_id(0));
+    if (ret.IsValid())
+        return ret;
+    return csv::value_from_map(aLocalConstants, i_key, Ce_id(0));
+}
+
+Namespace *
+Namespace::Search_LocalNamespace( const String  & i_sLocalName ) const
+{
+    return csv::value_from_map(aLocalNamespaces, i_sLocalName, (Namespace*)(0));
+}
+
+uintt
+Namespace::Get_SubNamespaces( std::vector< const Namespace* > & o_rResultList ) const
+{
+    for ( Map_NamespacePtr::const_iterator it = aLocalNamespaces.begin();
+          it != aLocalNamespaces.end();
+          ++it )
+    {
+        o_rResultList.push_back( (*it).second );
+    }
+    return o_rResultList.size();
+}
+
+Ce_id
+Namespace::Search_LocalClass( const String  & i_sName ) const
+{
+    return csv::value_from_map(aLocalClasses, i_sName, Ce_id(0));
+}
+
+void
+Namespace::Search_LocalOperations( std::vector<Ce_id> & o_result,
+                                   const String &       i_sName ) const
+{
+    operations_citer
+        itLower = aLocalOperations.lower_bound(i_sName);
+    if (itLower == aLocalOperations.end())
+        return;
+    if ( (*itLower).first != i_sName )
+        return;
+
+    for ( operations_citer it = itLower;
+          it != aLocalOperations.end() ? (*itLower).first == i_sName : false;
+          ++it )
+    {
+        o_result.push_back((*it).second);
+    }
+}
+
+
+const String  &
+Namespace::inq_LocalName() const
+{
+    return aEssentials.LocalName();
+}
+
+Cid
+Namespace::inq_Owner() const
+{
+    return aEssentials.Owner();
+}
+
+Lid
+Namespace::inq_Location() const
+{
+    return Lid(0);
+}
+
+void
+Namespace::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Namespace::get_AryClass() const
+{
+    return class_id;
+}
+
+Gid
+Namespace::inq_Id_Group() const
+{
+    return static_cast<Gid>(Id());
+}
+
+const ary::cpp::CppEntity &
+Namespace::inq_RE_Group() const
+{
+    return *this;
+}
+
+const ary::group::SlotList &
+Namespace::inq_Slots() const
+{
+    static const SlotAccessId aProjectSlotData[]
+            = { SLOT_SubNamespaces, SLOT_Classes, SLOT_Enums, SLOT_Typedefs, SLOT_Operations,
+                SLOT_Variables, SLOT_Constants };
+    static const std::vector< SlotAccessId >
+            aSlots( &aProjectSlotData[0],
+                      &aProjectSlotData[0]
+                        + sizeof aProjectSlotData / sizeof (SlotAccessId) );
+    return aSlots;
+}
+
+DYN Slot *
+Namespace::inq_Create_Slot( SlotAccessId i_nSlot ) const
+{
+    switch ( i_nSlot )
+    {
+        case SLOT_SubNamespaces:    return new Slot_SubNamespaces(aLocalNamespaces);
+        case SLOT_Classes:          return new Slot_MapLocalCe(aLocalClasses);
+        case SLOT_Enums:            return new Slot_MapLocalCe(aLocalEnums);
+        case SLOT_Typedefs:         return new Slot_MapLocalCe(aLocalTypedefs);
+        case SLOT_Operations:       return new Slot_MapOperations(aLocalOperations);
+        case SLOT_Variables:        return new Slot_MapLocalCe(aLocalVariables);
+        case SLOT_Constants:        return new Slot_MapLocalCe(aLocalConstants);
+        default:
+                                    return new Slot_Null;
+    }   // end switch
+}
+
+
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/c_osigna.cxx b/autodoc/source/ary/cpp/c_osigna.cxx
new file mode 100644
index 000000000000..463c84b1f5f7
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_osigna.cxx
@@ -0,0 +1,79 @@
+/* -*- 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 <precomp.h>
+#include <ary/cpp/c_osigna.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+OperationSignature::OperationSignature( std::vector<Type_id>    i_parameterTypes,
+                                        E_ConVol                i_conVol )
+    :   aParameterTypes(i_parameterTypes),
+        eConVol(i_conVol)
+{
+}
+
+int
+OperationSignature::Compare( const OperationSignature & i_rSig ) const
+{
+    if ( aParameterTypes.size() < i_rSig.aParameterTypes.size() )
+        return -1;
+    else if ( i_rSig.aParameterTypes.size() < aParameterTypes.size() )
+        return 1;
+
+    ParameterTypeList::const_iterator iMe = aParameterTypes.begin();
+    ParameterTypeList::const_iterator iOther = i_rSig.aParameterTypes.begin();
+    for ( ; iMe != aParameterTypes.end(); ++iMe, ++iOther )
+    {
+        if ( *iMe < *iOther )
+            return -1;
+        else if ( *iOther < *iMe )
+            return 1;
+    }
+
+    if ( eConVol < i_rSig.eConVol )
+        return -1;
+    else if ( eConVol != i_rSig.eConVol )
+        return 1;
+
+    return 0;
+}
+
+
+} // namespace cpp
+} // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/c_reposypart.cxx b/autodoc/source/ary/cpp/c_reposypart.cxx
new file mode 100644
index 000000000000..05fb5947e259
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_reposypart.cxx
@@ -0,0 +1,526 @@
+/* -*- 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 <precomp.h>
+#include "c_reposypart.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/getncast.hxx>
+#include <ary/namesort.hxx>
+#include <ary/cpp/c_builtintype.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_cppentity.hxx>
+#include <ary/cpp/c_define.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_enuval.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_macro.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/c_type.hxx>
+#include <ary/cpp/usedtype.hxx>
+#include <ary/cpp/c_vari.hxx>
+#include <ary/loc/locp_le.hxx>
+#include <ary/getncast.hxx>
+#include <loc_internalgate.hxx>
+#include <reposy.hxx>
+#include "ca_ce.hxx"
+#include "ca_def.hxx"
+#include "ca_type.hxx"
+#include "cs_ce.hxx"
+#include "cs_def.hxx"
+#include "cs_type.hxx"
+
+
+
+namespace
+{
+
+using ::ary::GlobalId;
+using ::ary::Rid;
+using namespace ::ary::cpp;
+
+
+inline bool
+IsDefine( const GlobalId & i_id )
+{
+    return i_id.Class() == Define::class_id
+           OR
+           i_id.Class() == Macro::class_id;
+}
+
+
+/// Find Ces
+class TypeConnector
+{
+  public:
+                        TypeConnector(
+                            Gate &              i_gate )
+                            :   pGate(&i_gate) {}
+                        ~TypeConnector() {}
+
+    void                operator()(
+                            Type &              io_rType ) const;
+  private:
+    // DATA
+    Gate *              pGate;
+};
+
+/// Find Ces only known from base class name scope.
+class TypeConnector2ndTry
+{
+  public:
+                        TypeConnector2ndTry(
+                            Gate &              i_gate )
+                            :   pGate(&i_gate) {}
+                        ~TypeConnector2ndTry() {}
+
+    void                operator()(
+                            Type &              io_rType ) const;
+  private:
+    // DATA
+    Gate *              pGate;
+};
+
+/// Reconnect (in both directions) base-derived relations of classes.
+class HierarchyLinker
+{
+  public:
+                        HierarchyLinker(
+                            Gate &              i_gate )
+                            :   pGate(&i_gate) {}
+
+                        ~HierarchyLinker() {}
+
+    void                operator()(
+                            Class &             io_rCe ) const;
+  private:
+    // DATA
+    Gate *              pGate;
+};
+
+
+
+/// Helper functor for ->RepositoryPartition::Get_AlphabeticalList().
+template <class TRAITS>
+struct MakeGlobalId
+{
+    GlobalId            operator()(
+                            typename TRAITS::id_type
+                                                i_id ) const
+                        {
+                            return GlobalId( TRAITS::EntityOf_(i_id).AryClass(),
+                                             i_id.Value() );
+                        }
+};
+
+
+
+
+/** Compare two {->GlobalId}s.
+
+
+    @todo   Move this up to the definition of GlobalId<>.
+*/
+struct LesserGlobal
+{
+                        LesserGlobal(
+                            const Ce_Storage &  i_ces,
+                            const Def_Storage & i_des )
+                            :   rCes(i_ces), rDes(i_des) {}
+
+    bool                operator()(
+                            GlobalId            i_1,
+                            GlobalId            i_2 ) const;
+
+  private:
+    const String &      NameOf(
+                            GlobalId            i_id ) const;
+    // DATA
+    const Ce_Storage &  rCes;
+    const Def_Storage & rDes;
+    ::ary::LesserName   aLess;
+};
+
+
+bool
+LesserGlobal::operator()(   GlobalId            i_1,
+                            GlobalId            i_2 ) const
+                        {
+                            String  s1 = NameOf(i_1);
+                            String  s2 = NameOf(i_2);
+
+                            if (s1 != s2)
+                                return aLess(s1, s2);
+
+                            if ( IsDefine(i_1) != IsDefine(i_2) )
+                            {
+                                return NOT IsDefine(i_2);
+                            }
+                            else if (IsDefine(i_1))
+                            {
+                                return i_1.Class() < i_2.Class();
+                            }
+
+                            return Ce_GlobalCompare::Lesser_(
+                                        rCes[i_1.Id()],
+                                        rCes[i_2.Id()] );
+                        }
+
+
+}   // namespace anonymous
+
+
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+DYN InternalGate &
+InternalGate::Create_Partition_(RepositoryCenter & i_center)
+{
+    return *new RepositoryPartition(i_center);
+}
+
+
+RepositoryPartition::RepositoryPartition(RepositoryCenter & i_center)
+    :   pRepositoryCenter(&i_center),
+        pCes(0),
+        pTypes(0),
+        pDefs(0),
+        pLocations(& loc::InternalGate::Create_Locations_())
+{
+    pCes        = new CeAdmin(*this);
+    pTypes      = new TypeAdmin(*this);
+    pDefs       = new DefAdmin(*this);
+    pCes->Set_Related(*pTypes);
+}
+
+RepositoryPartition::~RepositoryPartition()
+{
+}
+
+void
+RepositoryPartition::Calculate_AllSecondaryInformation()
+//                                        const ::autodoc::Options & )
+{
+    // KORR_FUTURE
+    //  Forward the options from here.
+
+    Connect_AllTypes_2_TheirRelated_CodeEntites();
+}
+
+const String &
+RepositoryPartition::RepositoryTitle() const
+{
+    return static_cast< ary::Repository* >(pRepositoryCenter)->Title();
+}
+
+const CodeEntity *
+RepositoryPartition::Search_RelatedCe(Type_id i_type) const
+{
+    if (NOT i_type.IsValid())
+        return 0;
+
+    Ce_id
+        ce_id = pTypes->Find_Type(i_type).RelatedCe();
+    return ce_id.IsValid()
+                ?   & pCes->Find_Ce(ce_id)
+                :   (CodeEntity*)(0);
+}
+
+const ::ary::cpp::CppEntity *
+RepositoryPartition::Search_Entity(GlobalId i_id) const
+{
+    if (i_id.Id() == 0)
+        return 0;
+
+    if ( NOT IsDefine(i_id) )
+    {
+        // Shall make sure this is a C++ CodeEntity:
+        csv_assert( i_id.Class() >= Namespace::class_id
+                    AND
+                    i_id.Class() < BuiltInType::class_id
+                    && "Unexpected entity type in cpp::RepositoryPartition"
+                       "::Search_Entity()." );
+        return & Ces().Find_Ce( Ce_id(i_id.Id()) );
+    }
+    else
+    {
+        return & Defs().Find_Def( De_id(i_id.Id()) );
+    }
+}
+
+
+const CePilot &
+RepositoryPartition::Ces() const
+{
+    csv_assert(pCes != 0);
+    return *pCes;
+}
+
+const DefPilot &
+RepositoryPartition::Defs() const
+{
+    csv_assert(pDefs != 0);
+    return *pDefs;
+}
+
+const TypePilot &
+RepositoryPartition::Types() const
+{
+    csv_assert(pTypes != 0);
+    return *pTypes;
+}
+
+const loc::LocationPilot &
+RepositoryPartition::Locations() const
+{
+    csv_assert(pLocations != 0);
+    return *pLocations;
+}
+
+CePilot &
+RepositoryPartition::Ces()
+{
+    csv_assert(pCes != 0);
+    return *pCes;
+}
+
+DefPilot &
+RepositoryPartition::Defs()
+{
+    csv_assert(pDefs != 0);
+    return *pDefs;
+}
+
+TypePilot &
+RepositoryPartition::Types()
+{
+    csv_assert(pTypes != 0);
+    return *pTypes;
+}
+
+loc::LocationPilot &
+RepositoryPartition::Locations()
+{
+    csv_assert(pLocations != 0);
+    return *pLocations;
+}
+
+
+void
+RepositoryPartition::Connect_AllTypes_2_TheirRelated_CodeEntites()
+{
+    TypeConnector
+        aConnector(*this);
+    std::for_each( pTypes->Storage().BeginUnreserved(),
+                   pTypes->Storage().End(),
+                   aConnector );
+
+    typedef ::ary::stg::filter_iterator<CodeEntity,Class>
+        filter_class_iter;
+
+    HierarchyLinker
+        aHierarchyLinker(*this);
+    filter_class_iter itEnd( pCes->Storage().End() );
+    for ( filter_class_iter it( pCes->Storage().BeginUnreserved() );
+          it != itEnd;
+          ++it )
+    {
+        if (NOT it.IsValid())
+            continue;
+
+        if (is_type<Class>(*it))
+            aHierarchyLinker(ary_cast<Class>(*it));
+    }
+
+    TypeConnector2ndTry
+        aConnector2ndTry(*this);
+    std::for_each( pTypes->Storage().BeginUnreserved(),
+                   pTypes->Storage().End(),
+                   aConnector2ndTry );
+}
+
+template <class COMPARE>
+void                    Add2Result(
+                            List_GlobalIds &    o_result,
+                            const SortedIds<COMPARE> &
+                                                i_data,
+                            const char *        i_begin,
+                            const char *        i_end );
+template <class COMPARE>
+void
+Add2Result( List_GlobalIds &            o_result,
+            const SortedIds<COMPARE> &  i_data,
+            const char *                i_begin,
+            const char *                i_end )
+{
+    const size_t
+        previous_size   = o_result.size();
+    typename std::vector<typename COMPARE::id_type>::const_iterator
+        it_beg          = i_data.LowerBound(i_begin);
+    typename std::vector<typename COMPARE::id_type>::const_iterator
+        it_end          = i_data.LowerBound(i_end);
+    size_t
+        count_added = static_cast<size_t>( std::distance(it_beg,it_end) );
+    o_result.insert(    o_result.end(),
+                        count_added,
+                        GlobalId() );
+    List_GlobalIds::iterator
+        it_out          = o_result.begin() + previous_size;
+    std::transform(     it_beg, it_end,
+                        it_out,
+                        MakeGlobalId<COMPARE>() );
+}
+
+
+uintt
+RepositoryPartition::Get_AlphabeticalList( List_GlobalIds &    o_result,
+                                           const char *        i_begin,
+                                           const char *        i_end ) const
+{
+    size_t
+        ret = o_result.size();
+
+    const Ce_Storage &
+        ce_storage = pCes->Storage();
+    const Def_Storage &
+        def_storage = pDefs->Storage();
+
+    Add2Result( o_result,
+                ce_storage.TypeIndex(),
+                i_begin, i_end );
+    Add2Result( o_result,
+                ce_storage.OperationIndex(),
+                i_begin, i_end );
+    Add2Result( o_result,
+                ce_storage.DataIndex(),
+                i_begin, i_end );
+    Add2Result( o_result,
+                def_storage.DefineIndex(),
+                i_begin, i_end );
+    Add2Result( o_result,
+                def_storage.MacroIndex(),
+                i_begin, i_end );
+
+    LesserGlobal
+        aLess(ce_storage, def_storage);
+
+    std::sort(o_result.begin(), o_result.end(), aLess);
+
+    return o_result.size() - ret;
+}
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+
+
+
+
+
+namespace
+{
+
+
+void
+TypeConnector::operator()( Type & io_rType ) const
+{
+    csv_assert(pGate != 0);
+    UsedType *
+        pt = ::ary::ary_cast<UsedType>(&io_rType);
+    if (pt != 0)
+        pt->Connect2Ce(pGate->Ces());
+}
+
+void
+TypeConnector2ndTry::operator()( Type & io_rType ) const
+{
+    csv_assert(pGate != 0);
+    UsedType *
+        pt = ::ary::ary_cast<UsedType>(&io_rType);
+    if (pt != 0)
+        pt->Connect2CeOnlyKnownViaBaseClass(*pGate);
+}
+
+void
+HierarchyLinker::operator()( Class & io_rCe ) const
+{
+    csv_assert( ::ary::is_type<Class>(io_rCe) );
+    Class &
+        rClass = io_rCe;
+
+    for ( List_Bases::const_iterator it = rClass.BaseClasses().begin();
+          it != rClass.BaseClasses().end();
+          ++it )
+    {
+        const CodeEntity *
+            pCe = 0;
+        Type_id
+            nTid = (*it).nId;
+        for ( pCe = pGate->Search_RelatedCe(nTid);
+              ary::ary_cast<Typedef>(pCe) != 0;
+              pCe = pGate->Search_RelatedCe(nTid) )
+        {
+            nTid = static_cast< const Typedef* >(pCe)->DescribingType();
+        }
+        const Class *
+            pClass = ary::ary_cast<Class>(pCe);
+        if (pClass == 0)
+            return;
+        // KORR_FUTURE:  we need a non const Find_Class()
+        const_cast< Class* >(pClass)->Add_KnownDerivative( io_rCe.CeId() );
+    }
+}
+
+const String &
+LesserGlobal::NameOf(GlobalId  i_id) const
+{
+    if ( NOT IsDefine(i_id) )
+    {
+        return rCes[i_id.Id()].LocalName();
+    }
+    else
+    {
+        return rDes[i_id.Id()].LocalName();
+    }
+}
+
+
+
+}   // namespace anonymous
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/c_reposypart.hxx b/autodoc/source/ary/cpp/c_reposypart.hxx
new file mode 100644
index 000000000000..c3b200f1f71b
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_reposypart.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 ARY_CPP_C_REPOSYPART_HXX
+#define ARY_CPP_C_REPOSYPART_HXX
+
+
+
+// BASE CLASSES
+#include <cpp_internalgate.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class CeAdmin;
+    class DefAdmin;
+    class TypeAdmin;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** The C++ partition of the repository.
+*/
+class RepositoryPartition : public InternalGate
+{
+  public:
+                        RepositoryPartition(
+                            RepositoryCenter &  i_reposyImpl );
+    virtual             ~RepositoryPartition();
+
+    // INHERITED
+        // Interface Gate:
+    virtual void        Calculate_AllSecondaryInformation();
+//                            const ::autodoc::Options &
+//                                                i_options );
+    virtual const String &
+                        RepositoryTitle() const;
+    virtual const CodeEntity *
+                        Search_RelatedCe(
+                            Type_id             i_type ) const;
+    virtual const ::ary::cpp::CppEntity *
+                        Search_Entity(
+                            GlobalId            i_id ) const;
+    virtual uintt       Get_AlphabeticalList(
+                            List_GlobalIds &    o_result,
+                            const char *        i_begin,
+                            const char *        i_end ) const;
+    virtual const CePilot &
+                        Ces() const;
+    virtual const DefPilot &
+                        Defs() const;
+    virtual const TypePilot &
+                        Types() const;
+    virtual const loc::LocationPilot &
+                        Locations() const;
+    virtual CePilot &   Ces();
+    virtual DefPilot &  Defs();
+    virtual TypePilot & Types();
+    virtual loc::LocationPilot &
+                        Locations();
+  private:
+    // Locals
+    void                Connect_AllTypes_2_TheirRelated_CodeEntites();
+
+    // DATA
+    RepositoryCenter *  pRepositoryCenter;
+
+    Dyn<CeAdmin>        pCes;
+    Dyn<TypeAdmin>      pTypes;
+    Dyn<DefAdmin>       pDefs;
+    Dyn<loc::LocationPilot>
+                        pLocations;
+};
+
+
+
+
+}   //  namespace cpp
+}   //  namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/c_slots.cxx b/autodoc/source/ary/cpp/c_slots.cxx
new file mode 100644
index 000000000000..e93b25c60d5c
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_slots.cxx
@@ -0,0 +1,109 @@
+/* -*- 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 <precomp.h>
+#include <c_slots.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/ary_disp.hxx>
+#include <ary/cpp/c_namesp.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+//***********************       Slot_SubNamespaces     ********************//
+
+
+Slot_SubNamespaces::Slot_SubNamespaces( const Map_NamespacePtr & i_rData )
+    :   pData( &i_rData )
+{
+}
+
+Slot_SubNamespaces::~Slot_SubNamespaces()
+{
+}
+
+uintt
+Slot_SubNamespaces::Size() const
+{
+     return pData->size();
+}
+
+void
+Slot_SubNamespaces::StoreEntries( ary::Display &  o_rDestination ) const
+{
+    for ( Map_NamespacePtr::const_iterator it = pData->begin();
+          it != pData->end();
+          ++it )
+    {
+        (*(*it).second).Accept(o_rDestination);
+    }
+}
+
+
+//***********************       Slot_BaseClass     ********************//
+
+Slot_BaseClass::Slot_BaseClass( const List_Bases & i_rData )
+    :   pData( &i_rData )
+{
+}
+
+Slot_BaseClass::~Slot_BaseClass()
+{
+}
+
+uintt
+Slot_BaseClass::Size() const
+{
+     return pData->size();
+}
+
+void
+Slot_BaseClass::StoreEntries( ary::Display &  o_rDestination ) const
+{
+    for ( List_Bases::const_iterator it = pData->begin();
+          it != pData->end();
+          ++it )
+    {
+        csv::CheckedCall(o_rDestination, *it);
+    }
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/c_slots.hxx b/autodoc/source/ary/cpp/c_slots.hxx
new file mode 100644
index 000000000000..dab4f5d4552f
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_slots.hxx
@@ -0,0 +1,87 @@
+/* -*- 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 ARY_CPP_C_SLOTS_HXX
+#define ARY_CPP_C_SLOTS_HXX
+
+// BASE CLASSES
+#include <ary/ceslot.hxx>
+// USED SERVICES
+#include <ary/cpp/c_slntry.hxx>
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+class Slot_SubNamespaces : public ary::Slot
+{
+  public:
+                        Slot_SubNamespaces(
+                            const Map_NamespacePtr &
+                                                i_rData );
+    virtual             ~Slot_SubNamespaces();
+
+    virtual uintt       Size() const;
+
+  private:
+    virtual void        StoreEntries(
+                            ary::Display &      o_rDestination ) const;
+    // DATA
+    const Map_NamespacePtr *
+                        pData;
+};
+
+class Slot_BaseClass : public ary::Slot
+{
+  public:
+                        Slot_BaseClass(
+                            const List_Bases &  i_rData );
+    virtual             ~Slot_BaseClass();
+
+    virtual uintt       Size() const;
+
+  private:
+    virtual void        StoreEntries(
+                            ary::Display &      o_rDestination ) const;
+    // DATA
+    const List_Bases *  pData;
+};
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/c_traits.cxx b/autodoc/source/ary/cpp/c_traits.cxx
new file mode 100644
index 000000000000..e0bd26a06685
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_traits.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cpp/c_traits.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/namesort.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_enuval.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/usedtype.hxx>
+#include <ary/getncast.hxx>
+#include "cs_ce.hxx"
+#include "cs_def.hxx"
+#include "cs_type.hxx"
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+//********************      Ce_Traits      ********************//
+Ce_Traits::entity_base_type &
+Ce_Traits::EntityOf_(id_type i_id)
+{
+    csv_assert(i_id.IsValid());
+    return Ce_Storage::Instance_()[i_id];
+}
+
+//********************      CeNode_Traits      ********************//
+const symtree::Node<CeNode_Traits> *
+CeNode_Traits::NodeOf_(const entity_base_type & i_entity)
+{
+    if (is_type<Namespace>(i_entity))
+        return & ary_cast<Namespace>(i_entity).AsNode();
+    else if (is_type<Class>(i_entity))
+        return & ary_cast<Class>(i_entity).AsNode();
+    return 0;
+}
+
+symtree::Node<CeNode_Traits> *
+CeNode_Traits::NodeOf_(entity_base_type & io_entity)
+{
+    if (is_type<Namespace>(io_entity))
+        return & ary_cast<Namespace>(io_entity).AsNode();
+    else if (is_type<Class>(io_entity))
+        return & ary_cast<Class>(io_entity).AsNode();
+    return 0;
+}
+
+Ce_Traits::entity_base_type *
+CeNode_Traits::ParentOf_(const entity_base_type & i_entity)
+{
+    Ce_Traits::id_type
+        ret = i_entity.Owner();
+    if (ret.IsValid())
+    {
+        if (is_type<EnumValue>(i_entity))
+        {   // Return not the Enum, but the owner of the Enum:
+            ret = EntityOf_(ret).Owner();
+            csv_assert(ret.IsValid());
+        }
+        return &EntityOf_(ret);
+    }
+    return 0;
+}
+
+Ce_id
+CeNode_Search( const CodeEntity &  i_entity,
+               const String &      i_localKey )
+{
+    if (is_type<Namespace>(i_entity))
+        return ary_cast<Namespace>(i_entity).Search_Child(i_localKey);
+    else if (is_type<Class>(i_entity))
+        return ary_cast<Class>(i_entity).Search_Child(i_localKey);
+    return Ce_id(0);
+}
+
+
+
+
+//********************      Ce_Compare      ********************//
+const Ce_Compare::key_type &
+Ce_Compare::KeyOf_(const entity_base_type & i_entity)
+{
+    return i_entity.LocalName();
+}
+
+bool
+Ce_Compare::Lesser_( const key_type &    i_1,
+                     const key_type &    i_2 )
+{
+    static ::ary::LesserName    less_;
+    return less_(i_1,i_2);
+}
+
+
+//********************      Ce_GlobalCompare      ********************//
+void
+Get_Qualified( StreamStr &          o_out,
+               const CodeEntity &   i_ce )
+{
+    if (i_ce.LocalName().empty())
+        return;
+    if (i_ce.Owner().IsValid())
+        Get_Qualified(o_out, Ce_Traits::EntityOf_(i_ce.Owner()));
+
+    o_out << i_ce.LocalName() << "::";
+}
+
+
+bool
+Ce_GlobalCompare::Lesser_( const key_type &    i_1,
+                           const key_type &    i_2 )
+{
+    static ::ary::LesserName    less_;
+
+    if (i_1.LocalName() != i_2.LocalName())
+        return less_(i_1.LocalName(), i_2.LocalName());
+
+    csv_assert(i_1.Owner().IsValid() AND i_2.Owner().IsValid());
+
+    static StreamStr
+        aBuffer1_(300);
+    static StreamStr
+        aBuffer2_(300);
+    aBuffer1_.reset();
+    aBuffer2_.reset();
+
+    Get_Qualified(aBuffer1_, Ce_Traits::EntityOf_(i_1.Owner()));
+    Get_Qualified(aBuffer2_, Ce_Traits::EntityOf_(i_2.Owner()));
+    if (aBuffer1_.size() >= 2)
+        aBuffer1_.pop_back(2);
+    if (aBuffer2_.size() >= 2)
+        aBuffer2_.pop_back(2);
+    return less_(aBuffer1_.c_str(), aBuffer2_.c_str());
+}
+
+
+
+//********************      Def_Traits      ********************//
+Def_Traits::entity_base_type &
+Def_Traits::EntityOf_(id_type i_id)
+{
+    csv_assert(i_id.IsValid());
+    return Def_Storage::Instance_()[i_id];
+}
+
+//********************      Def_Compare      ********************//
+const Def_Compare::key_type &
+Def_Compare::KeyOf_(const entity_base_type & i_entity)
+{
+    return i_entity.LocalName();
+}
+
+bool
+Def_Compare::Lesser_( const key_type &    i_1,
+                      const key_type &    i_2 )
+{
+    static ::ary::LesserName    less_;
+    return less_(i_1,i_2);
+}
+
+
+
+//********************      Type_Traits      ********************//
+Type_Traits::entity_base_type &
+Type_Traits::EntityOf_(id_type i_id)
+{
+    csv_assert(i_id.IsValid());
+    return Type_Storage::Instance_()[i_id];
+}
+
+//********************      Type_Compare      ********************//
+const UsedType_Compare::key_type &
+UsedType_Compare::KeyOf_(const entity_base_type & i_entity)
+{
+    csv_assert( is_type<UsedType>(i_entity) );
+    return ary_cast<UsedType>(i_entity);
+}
+
+bool
+UsedType_Compare::Lesser_( const key_type &    i_1,
+                           const key_type &    i_2 )
+{
+    return i_1 < i_2;
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/c_tydef.cxx b/autodoc/source/ary/cpp/c_tydef.cxx
new file mode 100644
index 000000000000..60f67e7e6c30
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_tydef.cxx
@@ -0,0 +1,97 @@
+/* -*- 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 <precomp.h>
+#include <ary/cpp/c_tydef.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <slots.hxx>
+#include "c_slots.hxx"
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+Typedef::Typedef( const String  &     i_sLocalName,
+                  Cid                 i_nOwner,
+                  E_Protection        i_eProtection,
+                  Lid                 i_nFile,
+                  Tid                 i_nDescribingType )
+    :   aEssentials( i_sLocalName,
+                     i_nOwner,
+                     i_nFile ),
+        nDescribingType(i_nDescribingType),
+        eProtection(i_eProtection)
+{
+}
+
+Typedef::~Typedef()
+{
+
+}
+
+const String  &
+Typedef::inq_LocalName() const
+{
+    return aEssentials.LocalName();
+}
+
+Cid
+Typedef::inq_Owner() const
+{
+    return aEssentials.Owner();
+}
+
+Lid
+Typedef::inq_Location() const
+{
+    return aEssentials.Location();
+}
+
+void
+Typedef::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Typedef::get_AryClass() const
+{
+    return class_id;
+}
+
+
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/c_vari.cxx b/autodoc/source/ary/cpp/c_vari.cxx
new file mode 100644
index 000000000000..5006748f65c9
--- /dev/null
+++ b/autodoc/source/ary/cpp/c_vari.cxx
@@ -0,0 +1,99 @@
+/* -*- 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 <precomp.h>
+#include <ary/cpp/c_vari.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+Variable::Variable( const String  &     i_sLocalName,
+                    Cid                 i_nOwner,
+                    E_Protection        i_eProtection,
+                    Lid                 i_nFile,
+                    Tid                 i_nType,
+                    VariableFlags       i_aFlags,
+                    const String  &     i_sArraySize,
+                    const String  &     i_sInitValue )
+    :   aEssentials( i_sLocalName,
+                     i_nOwner,
+                     i_nFile ),
+           nType(i_nType),
+        eProtection(i_eProtection),
+        aFlags(i_aFlags),
+        sArraySize(i_sArraySize),
+        sInitialisation(i_sInitValue)
+{
+}
+
+Variable::~Variable()
+{
+}
+
+const String  &
+Variable::inq_LocalName() const
+{
+    return aEssentials.LocalName();
+}
+
+Cid
+Variable::inq_Owner() const
+{
+    return aEssentials.Owner();
+}
+
+Lid
+Variable::inq_Location() const
+{
+    return aEssentials.Location();
+}
+
+void
+Variable::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Variable::get_AryClass() const
+{
+    return class_id;
+}
+
+
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/ca_ce.cxx b/autodoc/source/ary/cpp/ca_ce.cxx
new file mode 100644
index 000000000000..ea49b1446c49
--- /dev/null
+++ b/autodoc/source/ary/cpp/ca_ce.cxx
@@ -0,0 +1,625 @@
+/* -*- 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 <precomp.h>
+#include "ca_ce.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/qualiname.hxx>
+#include <ary/cpp/inpcontx.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_enuval.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/c_type.hxx>
+#include <ary/cpp/c_vari.hxx>
+#include <ary/cpp/cp_type.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <ary/getncast.hxx>
+
+
+
+
+
+
+namespace
+{
+
+String              Get_NewAnonymousNamespaceName();
+String              Get_NewAnonymousName(
+                        char                i_start );
+
+
+}   // anonymous namespace
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+// KORR_FUTURE
+// What about namespace visibility ?
+// Perhaps handle all/some visibility transfer only after parse is complete.
+void
+transfer_visibility( const Class *  i_owner,
+                     CodeEntity &   o_child )
+{
+    if ( i_owner != 0 ? NOT i_owner->IsVisible() : false )
+        o_child.Set_InVisible();
+}
+
+inline const TypePilot &
+CeAdmin::Types() const
+{
+    csv_assert(pTypes != 0);
+    return *pTypes;
+}
+
+
+
+
+
+
+CeAdmin::CeAdmin(RepositoryPartition & io_myReposyPartition)
+    :   aStorage(),
+        pTypes(0),
+        pCppRepositoryPartition(&io_myReposyPartition)
+{
+}
+
+void
+CeAdmin::Set_Related(const TypePilot & i_types)
+{
+    pTypes = &i_types;
+}
+
+CeAdmin::~CeAdmin()
+{
+}
+
+Namespace &
+CeAdmin::CheckIn_Namespace( const InputContext & i_context,
+                            const String  &      i_localName )
+{
+    const String
+        local_name = NOT i_localName.empty()
+                                ?   i_localName
+                                :   Get_NewAnonymousNamespaceName();
+    Namespace &
+        rParent = i_context.CurNamespace();
+    Namespace *
+        ret = rParent.Search_LocalNamespace(local_name);
+    if ( ret == 0 )
+    {
+        ret = &Create_Namespace(rParent, local_name);
+    }
+    return *ret;
+}
+
+Class &
+CeAdmin::Store_Class( const InputContext & i_context,
+                      const String  &      i_localName,
+                      E_ClassKey           i_eClassKey )
+{
+    const String
+        local_name = i_localName.empty()
+                        ?   Get_NewAnonymousName( i_eClassKey == CK_class
+                                                    ?   'c'
+                                                    :   i_eClassKey == CK_struct
+                                                            ?   's'
+                                                            :   'u' )
+                        :   i_localName;
+
+    Class &
+        ret = * new Class( local_name,
+                           i_context.CurOwner().CeId(),
+                           i_context.CurProtection(),
+                           i_context.CurFile().LeId(),
+                           i_eClassKey );
+    aStorage.Store_Type(ret);
+    i_context.CurOwner().Add_Class(local_name, ret.CeId());
+    transfer_visibility(i_context.CurClass(), ret);
+
+    return ret;
+}
+
+Enum &
+CeAdmin::Store_Enum( const InputContext & i_context,
+                     const String  &      i_localName )
+{
+    const String
+        local_name = i_localName.empty()
+                        ?   Get_NewAnonymousName('e')
+                        :   i_localName;
+    Enum &
+        ret  = * new Enum( local_name,
+                           i_context.CurOwner().CeId(),
+                           i_context.CurProtection(),
+                           i_context.CurFile().LeId() );
+    aStorage.Store_Type(ret);
+    i_context.CurOwner().Add_Enum(local_name, ret.CeId());
+    transfer_visibility(i_context.CurClass(), ret);
+
+    return ret;
+}
+
+Typedef &
+CeAdmin::Store_Typedef( const InputContext& i_context,
+                        const String  &     i_localName,
+                        Type_id             i_referredType )
+{
+    Typedef &
+        ret  = * new Typedef( i_localName,
+                              i_context.CurOwner().CeId(),
+                              i_context.CurProtection(),
+                              i_context.CurFile().LeId(),
+                              i_referredType );
+    aStorage.Store_Type(ret);
+    i_context.CurOwner().Add_Typedef(i_localName, ret.CeId());
+    transfer_visibility(i_context.CurClass(), ret);
+
+    return ret;
+}
+
+Function *
+CeAdmin::Store_Operation(   const InputContext &                i_context,
+                            const String  &                     i_localName,
+                            Type_id                             i_returnType,
+                            const std::vector<S_Parameter> &    i_parameters,
+                            E_Virtuality                        i_virtuality,
+                            E_ConVol                            i_conVol,
+                            FunctionFlags                       i_flags,
+                            bool                                i_throwExists,
+                            const std::vector<Type_id> &        i_exceptions )
+{
+    Function &
+        ret     = * new Function(   i_localName,
+                                    i_context.CurOwner().CeId(),
+                                    i_context.CurProtection(),
+                                    i_context.CurFile().LeId(),
+                                    i_returnType,
+                                    i_parameters,
+                                    i_conVol,
+                                    i_virtuality,
+                                    i_flags,
+                                    i_throwExists,
+                                    i_exceptions );
+
+    // Check for double declaration:
+    Ce_id
+        nAlreadyExistingFunction(0);
+    switch ( lhf_CheckAndHandle_DuplicateOperation(
+                                        nAlreadyExistingFunction,
+                                        i_context,
+                                        ret) )
+    {
+        case df_discard_new:
+                delete &ret;
+                return 0;
+        case df_replace:
+                csv_assert(nAlreadyExistingFunction.IsValid());
+                aStorage.Replace_Entity(
+                                nAlreadyExistingFunction,
+                                ret );
+                break;
+        case df_no:
+                aStorage.Store_Operation(ret);   // Now it has a valid id.
+                i_context.CurOwner().Add_Operation( i_localName, ret.CeId(), i_flags.IsStaticMember() );
+                break;
+        default:
+                csv_assert(false);
+    }
+
+    transfer_visibility(i_context.CurClass(), ret);
+    if ( i_context.CurProtection() != PROTECT_global )
+    {
+        Class *
+            pClass = i_context.CurClass();
+        if ( pClass != 0  AND i_virtuality != VIRTUAL_none)
+        {
+            pClass->UpdateVirtuality(i_virtuality);
+        }
+    }
+
+    return &ret;
+}
+
+Variable &
+CeAdmin::Store_Variable( const InputContext& i_context,
+                         const String  &     i_localName,
+                         Type_id             i_type,
+                         VariableFlags       i_flags,
+                         const String  &     i_arraySize,
+                         const String  &     i_initValue )
+{
+    Variable &
+        ret = * new Variable( i_localName,
+                              i_context.CurOwner().CeId(),
+                              i_context.CurProtection(),
+                              i_context.CurFile().LeId(),
+                              i_type,
+                              i_flags,
+                              i_arraySize,
+                              i_initValue );
+
+    bool
+        is_const = Types().Find_Type(i_type).IsConst();
+    aStorage.Store_Datum(ret);
+    i_context.CurOwner().Add_Variable(
+                                i_localName,
+                                ret.CeId(),
+                                is_const,
+                                i_flags.IsStaticMember() );
+    transfer_visibility(i_context.CurClass(), ret);
+
+    return ret;
+}
+
+EnumValue &
+CeAdmin::Store_EnumValue( const InputContext & i_context,
+                          const String  &      i_localName,
+                          const String  &      i_initValue )
+{
+    Enum *
+        parent  = i_context.CurEnum();
+    csv_assert( parent != 0 );
+
+    EnumValue &
+        ret = * new EnumValue( i_localName,
+                               parent->CeId(),
+                               i_initValue );
+    aStorage.Store_Datum(ret);
+    parent->Add_Value(ret.CeId());
+
+    // KORR also for current enum:
+    transfer_visibility(i_context.CurClass(), ret);
+
+    return ret;
+}
+
+const Namespace &
+CeAdmin::GlobalNamespace() const
+{
+    return ary_cast<Namespace>( aStorage[predefined::ce_GlobalNamespace] );
+}
+
+const CodeEntity &
+CeAdmin::Find_Ce(Ce_id i_id) const
+{
+    return aStorage[i_id];
+}
+
+const CodeEntity *
+CeAdmin::Search_Ce(Ce_id i_id) const
+{
+    return aStorage.Exists(i_id)
+                ?   & aStorage[i_id]
+                :   (const CodeEntity*)(0);
+}
+
+const CodeEntity *
+CeAdmin::Search_CeAbsolute( const CodeEntity &      i_curScope,
+                            const QualifiedName &   i_rSearchedName ) const
+{
+    const symtree::Node<CeNode_Traits> *
+        cur_node = CeNode_Traits::NodeOf_(i_curScope);
+    csv_assert(cur_node != 0);
+
+    Ce_id
+        ret(0);
+    cur_node->SearchUp( ret,
+                        i_rSearchedName.first_namespace(),
+                        i_rSearchedName.end_namespace(),
+                        i_rSearchedName.LocalName()  );
+    return Search_Ce(ret);
+}
+
+const CodeEntity *
+CeAdmin::Search_CeLocal( const String  &     i_localName,
+                         bool                i_bIsFunction,
+                         const Namespace &   i_rCurNamespace,
+                         const Class *       i_pCurClass ) const
+{
+    // KORR_FUTURE
+    // See if this is correct.
+
+    Ce_id
+        ret(0);
+
+    if ( NOT i_bIsFunction )
+    {
+        CesResultList
+            type_instances = aStorage.TypeIndex().SearchAll(i_localName);
+        CesResultList
+            data_instances = aStorage.DataIndex().SearchAll(i_localName);
+        Ce_id
+            ret1 = Search_MatchingInstance(
+                        type_instances,
+                        (i_pCurClass
+                                ?   i_pCurClass->CeId()
+                                :   i_rCurNamespace.CeId())
+                                     );
+        Ce_id
+            ret2 = Search_MatchingInstance(
+                        data_instances,
+                        (i_pCurClass
+                                ?   i_pCurClass->CeId()
+                                :   i_rCurNamespace.CeId())
+                                     );
+        if (NOT ret2.IsValid())
+            ret = ret1;
+        else if (NOT ret1.IsValid())
+            ret = ret2;
+    }
+    else
+    {
+        CesResultList
+            function_instances = aStorage.OperationIndex().SearchAll(i_localName);
+        if ( function_instances.size() == 1 )
+            ret = *function_instances.begin();
+        else
+        {
+            ret = Search_MatchingInstance(
+                        function_instances,
+                        (i_pCurClass
+                                ?   i_pCurClass->CeId()
+                                :   i_rCurNamespace.CeId())
+                                     );
+        }
+    }
+
+    if ( ret.IsValid() )
+        return & Find_Ce(ret);
+
+    return 0;
+}
+
+void
+CeAdmin::Get_QualifiedName( StreamStr &         o_rOut,
+                            const String  &     i_localName,
+                            Ce_id               i_nOwner,
+                            const char *        i_sDelimiter ) const
+{
+    if ( i_localName.empty() OR NOT i_nOwner.IsValid() )
+        return;
+
+    const CodeEntity *
+        pOwner = & Find_Ce( i_nOwner );
+    if ( is_type<Enum>(*pOwner) )
+        pOwner = &Find_Ce( Ce_id(pOwner->Owner()) );
+
+    Get_QualifiedName( o_rOut,
+                       pOwner->LocalName(),
+                       Ce_id(pOwner->Owner()),
+                       i_sDelimiter );
+    o_rOut
+        << i_sDelimiter
+        << i_localName;
+}
+
+void
+CeAdmin::Get_SignatureText( StreamStr &                 o_rOut,
+                            const OperationSignature &  i_signature,
+                            const StringVector *        i_sParameterNames ) const
+{
+    OperationSignature::ParameterTypeList::const_iterator
+            it = i_signature.Parameters().begin();
+    OperationSignature::ParameterTypeList::const_iterator
+            it_end = i_signature.Parameters().end();
+
+    const StringVector aDummy;
+    StringVector::const_iterator
+            itName = i_sParameterNames != 0
+                            ?   i_sParameterNames->begin()
+                            :   aDummy.begin();
+    StringVector::const_iterator
+            itName_end = i_sParameterNames != 0
+                            ?   i_sParameterNames->end()
+                            :   aDummy.end();
+
+    bool
+        bEmpty = (it == it_end);
+    if (NOT bEmpty)
+    {
+        o_rOut << "( ";
+        Types().Get_TypeText(o_rOut, *it);
+        if (itName != itName_end)
+            o_rOut << " " << (*itName);
+
+        for ( ++it; it != it_end; ++it )
+        {
+            o_rOut << ", ";
+            Types().Get_TypeText(o_rOut, *it);
+            if (itName != itName_end)
+            {
+                ++itName;
+                if (itName != itName_end)
+                   o_rOut << " " << (*itName);
+            }
+        }
+        o_rOut << " )";
+    }
+    else
+    {
+        o_rOut << "( )";
+    }
+
+    if ( intt(i_signature.ConVol()) & intt(ary::cpp::CONVOL_const) )
+        o_rOut << " const";
+    if ( intt(i_signature.ConVol()) & intt(ary::cpp::CONVOL_volatile) )
+        o_rOut << " volatile";
+}
+
+CesResultList
+CeAdmin::Search_TypeName(const String & i_sName) const
+{
+    return aStorage.TypeIndex().SearchAll(i_sName);
+}
+
+Namespace &
+CeAdmin::GlobalNamespace()
+{
+    return ary_cast<Namespace>( aStorage[predefined::ce_GlobalNamespace] );
+}
+
+CeAdmin::E_DuplicateFunction
+CeAdmin::lhf_CheckAndHandle_DuplicateOperation(
+                                Ce_id &                 o_existentFunction,
+                                const InputContext &    i_context,
+                                const Function &        i_newFunction )
+{
+    if (i_context.CurProtection() != PROTECT_global)
+    {
+        // Assume, there will be no duplicates within the same class.
+
+        // KORR_FUTURE
+        // Assumption may be wrong in case of #defines providing different
+        // versions for different compilers.
+        return df_no;
+    }
+
+    std::vector<Ce_id>
+        aOperationsWithSameName;
+    i_context.CurNamespace().Search_LocalOperations(
+                                        aOperationsWithSameName,
+                                        i_newFunction.LocalName() );
+
+    for ( std::vector<Ce_id>::const_iterator
+             it = aOperationsWithSameName.begin();
+          it != aOperationsWithSameName.end();
+          ++it )
+    {
+        const Function &
+            rFunction = ary_cast<Function>(aStorage[*it]);
+        if (     rFunction.LocalName() == i_newFunction.LocalName()
+             AND rFunction.Signature() == i_newFunction.Signature() )
+        {
+            if (NOT rFunction.IsIdentical(i_newFunction))
+            {
+                // KORR_FUTURE Make this more detailed.
+                Cerr() << "Non identical function with same signature "
+                       << "found: "
+                       <<  i_context.CurNamespace().LocalName()
+                       << "::"
+                       << i_newFunction.LocalName()
+                       << "(..)"
+                       << Endl();
+            }
+            o_existentFunction = rFunction.CeId();
+            if (rFunction.Docu().Data() == 0)
+                return df_replace;
+            else
+                return df_discard_new;
+        }
+    }   // end for
+
+    return df_no;
+}
+
+Namespace &
+CeAdmin::Create_Namespace( Namespace &      o_parent,
+                           const String  &  i_localName )
+{
+    DYN Namespace &
+        ret = *new Namespace(i_localName, o_parent);
+    aStorage.Store_Entity(ret);
+    o_parent.Add_LocalNamespace(ret);
+    return ret;
+}
+
+Ce_id
+CeAdmin::Search_MatchingInstance( CesResultList         i_list,
+                                  Ce_id                 i_owner ) const
+{
+    // KORR
+    // Multiple results?
+
+    for ( CesList::const_iterator it = i_list.begin();
+          it != i_list.end();
+          ++it )
+    {
+        const CodeEntity &
+            ce = aStorage[*it];
+        if ( ce.Owner() == i_owner)
+        {
+            return *it;
+        }
+    }
+    return Ce_id(0);
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
+
+
+
+namespace
+{
+
+uintt G_nLastFreeAnonymousNamespaceNr = 0;
+uintt G_nLastFreeAnonymousEntityNr = 0;
+
+String
+Get_NewAnonymousNamespaceName()
+{
+    StreamLock
+        sl(100);
+    return String( sl()
+                    << "namespace_anonymous_"
+                    << ++G_nLastFreeAnonymousNamespaceNr
+                    << csv::c_str );
+
+}
+
+String
+Get_NewAnonymousName(char i_cStart)
+{
+    StreamLock
+        sl(100);
+    return String( sl()
+                    << i_cStart
+                    << "_Anonymous__"
+                    << ++G_nLastFreeAnonymousEntityNr
+                    << c_str );
+}
+
+
+
+}   // namespace anonymous
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/ca_ce.hxx b/autodoc/source/ary/cpp/ca_ce.hxx
new file mode 100644
index 000000000000..00e722b170c4
--- /dev/null
+++ b/autodoc/source/ary/cpp/ca_ce.hxx
@@ -0,0 +1,216 @@
+/* -*- 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 ARY_CPP_CA_CE_HXX
+#define ARY_CPP_CA_CE_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/cp_ce.hxx>
+    // OTHER
+#include "cs_ce.hxx"
+
+
+namespace ary
+{
+namespace cpp
+{
+    class Ce_Storage;
+    class RepositoryPartition;
+}
+}
+
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** Administrates all C++ code entities (types, operations, variables).
+*/
+class CeAdmin : public CePilot
+{
+  public:
+    // LIFECYCLE
+                        CeAdmin(
+                            RepositoryPartition &
+                                                io_myReposyPartition );
+    void                Set_Related(
+                            const TypePilot &   i_types );
+    virtual             ~CeAdmin();
+
+    // INQUIRY
+    const Ce_Storage &  Storage() const;
+
+    // ACCESS
+    Ce_Storage &        Storage();
+
+    // INHERITED
+    // Interface CePilot:
+    virtual Namespace & CheckIn_Namespace(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName );
+    virtual Class &     Store_Class(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            E_ClassKey          i_classKey );
+    virtual Enum &      Store_Enum(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName );
+    virtual Typedef &   Store_Typedef(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            Type_id             i_referredType );
+    virtual Function *  Store_Operation(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            Type_id             i_returnType,
+                            const std::vector<S_Parameter> &
+                                                i_parameters,
+                            E_Virtuality        i_virtuality,
+                            E_ConVol            i_conVol,
+                            FunctionFlags       i_flags,
+                            bool                i_throwExists,
+                            const std::vector<Type_id> &
+                                                i_exceptions );
+    virtual Variable &  Store_Variable(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            Type_id             i_type,
+                            VariableFlags       i_flags,
+                            const String  &     i_arraySize,
+                            const String  &     i_initValue );
+    virtual EnumValue & Store_EnumValue(
+                            const InputContext &
+                                                i_context,
+                            const String  &     i_localName,
+                            const String  &     i_initValue );
+    virtual const Namespace &
+                        GlobalNamespace() const;
+    virtual const CodeEntity &
+                        Find_Ce(
+                            Ce_id               i_id ) const;
+    virtual const CodeEntity *
+                        Search_Ce(
+                            Ce_id               i_id ) const;
+    virtual const CodeEntity *
+                        Search_CeAbsolute(
+                            const CodeEntity &  i_curScope,
+                            const QualifiedName &
+                                                i_absoluteName ) const;
+    virtual const CodeEntity *
+                        Search_CeLocal(
+                            const String  &     i_relativeName,
+                            bool                i_isFunction,
+                            const Namespace &   i_curNamespace,
+                            const Class *       i_curClass ) const;
+    virtual void        Get_QualifiedName(
+                            StreamStr &         o_result,
+                            const String  &     i_localName,
+                            Ce_id               i_owner,
+                            const char *        i_delimiter = "::" ) const;
+    virtual void        Get_SignatureText(
+                            StreamStr &         o_rOut,
+                            const OperationSignature &
+                                                i_signature,
+                            const StringVector *
+                                                i_sParameterNames = 0 ) const;
+    virtual CesResultList
+                        Search_TypeName(
+                            const String  &     i_sName ) const;
+       virtual Namespace & GlobalNamespace();
+
+  private:
+    // Locals
+    /// @return true, if function is duplicate.
+    enum E_DuplicateFunction
+    {
+        df_no,
+        df_replace,
+        df_discard_new
+    };
+
+    /** @param o_existentFunction
+            The id of the already existing function, else unset.
+    */
+    E_DuplicateFunction lhf_CheckAndHandle_DuplicateOperation(
+                            Ce_id &             o_existentFunction,
+                            const InputContext &
+                                                i_context,
+                            const Function &    i_newFunction );
+    Namespace &         Create_Namespace(
+                            Namespace &         o_parent,
+                            const String  &     i_localName );
+    Ce_id               Search_MatchingInstance(
+                            CesResultList       i_list,
+                            Ce_id               i_owner ) const;
+    const TypePilot  &  Types() const;
+
+    // DATA
+    Ce_Storage          aStorage;
+    const TypePilot *   pTypes;
+    RepositoryPartition *
+                        pCppRepositoryPartition;
+};
+
+
+
+
+// IMPLEMENTATION
+inline const Ce_Storage &
+CeAdmin::Storage() const
+{
+    return aStorage;
+}
+
+inline Ce_Storage &
+CeAdmin::Storage()
+{
+    return aStorage;
+}
+
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/ca_def.cxx b/autodoc/source/ary/cpp/ca_def.cxx
new file mode 100644
index 000000000000..8a2daa8dd9ea
--- /dev/null
+++ b/autodoc/source/ary/cpp/ca_def.cxx
@@ -0,0 +1,114 @@
+/* -*- 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 <precomp.h>
+#include "ca_def.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_define.hxx>
+#include <ary/cpp/c_macro.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <ary/cpp/inpcontx.hxx>
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+DefAdmin::DefAdmin(RepositoryPartition & io_myReposyPartition)
+    :   aStorage(),
+        pCppRepositoryPartition(&io_myReposyPartition)
+{
+}
+
+DefAdmin::~DefAdmin()
+{
+}
+
+Define &
+DefAdmin::Store_Define( const InputContext&     i_rContext,
+                        const String  &         i_sName,
+                        const StringVector &    i_rDefinition )
+{
+    Define &
+        ret = *new Define( i_sName,
+                           i_rDefinition,
+                           i_rContext.CurFile().LeId() );
+    aStorage.Store_Define(ret);
+    return ret;
+
+}
+
+Macro &
+DefAdmin::Store_Macro(  const InputContext&     i_rContext,
+                        const String  &         i_sName,
+                        const StringVector &    i_rParams,
+                        const StringVector &    i_rDefinition )
+{
+    Macro &
+        ret = *new Macro( i_sName,
+                          i_rParams,
+                          i_rDefinition,
+                          i_rContext.CurFile().LeId() );
+    aStorage.Store_Macro(ret);
+    return ret;
+}
+
+const DefineEntity &
+DefAdmin::Find_Def(De_id i_id) const
+{
+    return aStorage[i_id];
+}
+
+DefsResultList
+DefAdmin::AllDefines() const
+{
+    return csv::make_range( aStorage.DefineIndex().Begin(),
+                            aStorage.DefineIndex().End() );
+}
+
+DefsResultList
+DefAdmin::AllMacros() const
+{
+    return csv::make_range( aStorage.MacroIndex().Begin(),
+                            aStorage.MacroIndex().End() );
+}
+
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/ca_def.hxx b/autodoc/source/ary/cpp/ca_def.hxx
new file mode 100644
index 000000000000..254ad1797b1b
--- /dev/null
+++ b/autodoc/source/ary/cpp/ca_def.hxx
@@ -0,0 +1,118 @@
+/* -*- 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 ARY_CPP_CA_DEF_HXX
+#define ARY_CPP_CA_DEF_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/cp_def.hxx>
+    // OTHER
+#include "cs_def.hxx"
+
+
+
+namespace ary
+{
+namespace cpp
+{
+    class Def_Storage;
+    class RepositoryPartition;
+}
+}
+
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+
+class DefAdmin : public DefPilot
+{
+  public:
+    // LIFECYCLE
+                        DefAdmin(
+                            RepositoryPartition &
+                                                io_myReposyPartition );
+                        ~DefAdmin();
+
+    // INQUIRY
+    const Def_Storage & Storage() const;
+
+    // INHERITED
+    // Interface DefPilot:
+    virtual Define &    Store_Define(
+                            const InputContext& i_rContext,
+                            const String  &     i_sName,
+                            const StringVector &
+                                                i_rDefinition );
+    virtual Macro &     Store_Macro(
+                            const InputContext& i_rContext,
+                            const String  &     i_sName,
+                            const StringVector &
+                                                i_rParams,
+                            const StringVector &
+                                                i_rDefinition );
+    virtual const DefineEntity &
+                        Find_Def(
+                            De_id               i_id ) const;
+    virtual DefsResultList
+                        AllDefines() const;
+    virtual DefsResultList
+                        AllMacros() const;
+
+  private:
+    // DATA
+    Def_Storage     aStorage;
+    RepositoryPartition *
+                    pCppRepositoryPartition;
+};
+
+
+
+
+// IMPLEMENTATION
+inline const Def_Storage &
+DefAdmin::Storage() const
+{
+    return aStorage;
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/ca_type.cxx b/autodoc/source/ary/cpp/ca_type.cxx
new file mode 100644
index 000000000000..29117aea7cd0
--- /dev/null
+++ b/autodoc/source/ary/cpp/ca_type.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "ca_type.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_builtintype.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/cpp/inpcontx.hxx>
+#include <ary/cpp/usedtype.hxx>
+#include <ary/getncast.hxx>
+#include "c_reposypart.hxx"
+#include "cs_type.hxx"
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+TypeAdmin::TypeAdmin(RepositoryPartition & io_myReposyPartition)
+    :   aStorage(),
+        pCppRepositoryPartition(&io_myReposyPartition)
+{
+}
+
+TypeAdmin::~TypeAdmin()
+{
+}
+
+
+// KORR_FUTURE
+//  Remove unused parameter.
+
+const Type &
+TypeAdmin::CheckIn_UsedType( const InputContext &   ,
+                             DYN UsedType &         pass_type )
+{
+    Dyn<UsedType>
+        pNewType(&pass_type);  // Ensure clean up of heap object.
+
+    Type_id
+        tid(0);
+    if (pass_type.IsBuiltInType())
+    {
+        tid = aStorage.Search_BuiltInType(
+                        BuiltInType::SpecializedName_( pass_type.LocalName().c_str(),
+                                                       pass_type.TypeSpecialisation() ));
+        csv_assert(tid.IsValid());
+        return aStorage[tid];
+    }
+
+    tid = aStorage.UsedTypeIndex().Search(pass_type);
+    if (tid.IsValid())
+    {
+        return aStorage[tid];
+    }
+
+    // Type does not yet exist:
+        // Transfer ownership from pNewTypeand assign id:
+    aStorage.Store_Entity(*pNewType.Release());
+
+    aStorage.UsedTypeIndex().Add(pass_type.TypeId());
+    return pass_type;
+}
+
+const Type &
+TypeAdmin::Find_Type(Type_id i_type) const
+{
+    return aStorage[i_type];
+}
+
+bool
+TypeAdmin::Get_TypeText( StreamStr &         o_result,
+                         Type_id             i_type ) const
+{
+    if (NOT i_type.IsValid())
+        return false;
+    aStorage[i_type].Get_Text(o_result, *pCppRepositoryPartition);
+    return true;
+}
+
+bool
+TypeAdmin::Get_TypeText( StreamStr &         o_preName,
+                         StreamStr &         o_name,
+                         StreamStr &         o_postName,
+                         Type_id             i_type ) const
+{
+    if (NOT i_type.IsValid())
+        return false;
+    aStorage[i_type].Get_Text(o_preName, o_name, o_postName, *pCppRepositoryPartition);
+    return true;
+}
+
+Type_id
+TypeAdmin::Tid_Ellipse() const
+{
+    return Type_id(predefined::t_ellipse);
+}
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/ca_type.hxx b/autodoc/source/ary/cpp/ca_type.hxx
new file mode 100644
index 000000000000..123912d7c389
--- /dev/null
+++ b/autodoc/source/ary/cpp/ca_type.hxx
@@ -0,0 +1,130 @@
+/* -*- 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 ARY_CPP_CA_TYPE_HXX
+#define ARY_CPP_CA_TYPE_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/cp_type.hxx>
+    // OTHER
+#include "cs_type.hxx"
+
+
+
+namespace ary
+{
+namespace cpp
+{
+    class RepositoryPartition;
+}
+}
+
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** Administrates all C++ types as uses in user declarations
+    as return-, parameter- or variable-types.
+*/
+class TypeAdmin : public TypePilot
+{
+  public:
+    // LIFECYCLE
+                        TypeAdmin(
+                            RepositoryPartition &
+                                                io_myReposyPartition );
+    virtual             ~TypeAdmin();
+
+    // INQUIRY
+    /// @return A list of all stored types that are not C++ or STL builtin types.
+    const Type_Storage &
+                        Storage() const;
+
+    // ACCESS
+    Type_Storage &      Storage();
+
+    // INHERITED
+    // Interface TypePilot:
+    virtual const Type &
+                        CheckIn_UsedType(
+                            const InputContext &
+                                                i_context,
+                            DYN UsedType &      pass_type );
+    virtual const Type &
+                        Find_Type(
+                            Type_id             i_type ) const;
+    virtual bool        Get_TypeText(
+                            StreamStr &         o_result,
+                            Type_id             i_type ) const;
+    virtual bool        Get_TypeText(
+                            StreamStr &         o_preName,              ///  ::ary::cpp::
+                            StreamStr &         o_name,                 ///  MyClass
+                            StreamStr &         o_postName,             ///  <TplArgument> * const &
+                            Type_id             i_type ) const;
+    virtual Type_id     Tid_Ellipse() const;
+
+  private:
+    // DATA
+    Type_Storage        aStorage;
+    RepositoryPartition *
+                        pCppRepositoryPartition;
+};
+
+
+
+
+// IMPLEMENTATION
+inline const Type_Storage &
+TypeAdmin::Storage() const
+{
+    return aStorage;
+}
+
+inline Type_Storage &
+TypeAdmin::Storage()
+{
+    return aStorage;
+}
+
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/cs_ce.cxx b/autodoc/source/ary/cpp/cs_ce.cxx
new file mode 100644
index 000000000000..3b4828b67230
--- /dev/null
+++ b/autodoc/source/ary/cpp/cs_ce.cxx
@@ -0,0 +1,107 @@
+/* -*- 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 <precomp.h>
+#include "cs_ce.hxx"
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_namesp.hxx>
+
+
+
+namespace
+{
+const uintt
+    C_nReservedElements = ::ary::cpp::predefined::ce_MAX;    // Skipping "0" and the GlobalNamespace
+}
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+Ce_Storage *    Ce_Storage::pInstance_ = 0;
+
+
+
+Ce_Storage::Ce_Storage()
+    :   stg::Storage<CodeEntity>(C_nReservedElements),
+        aTypes(),
+        aOperations(),
+        aData()
+
+{
+    Set_Reserved( predefined::ce_GlobalNamespace,
+                  *new Namespace );
+
+    csv_assert(pInstance_ == 0);
+    pInstance_ = this;
+}
+
+Ce_Storage::~Ce_Storage()
+{
+    csv_assert(pInstance_ != 0);
+    pInstance_ = 0;
+}
+
+Ce_id
+Ce_Storage::Store_Type(DYN CodeEntity & pass_ce)
+{
+    Ce_id
+        ret = Store_Entity(pass_ce);
+    aTypes.Add(ret);
+    return ret;
+}
+
+Ce_id
+Ce_Storage::Store_Operation(DYN CodeEntity & pass_ce)
+{
+    Ce_id
+        ret = Store_Entity(pass_ce);
+    aOperations.Add(ret);
+    return ret;
+}
+
+Ce_id
+Ce_Storage::Store_Datum(DYN CodeEntity & pass_ce)
+{
+    Ce_id
+        ret = Store_Entity(pass_ce);
+    aData.Add(ret);
+    return ret;
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/cs_ce.hxx b/autodoc/source/ary/cpp/cs_ce.hxx
new file mode 100644
index 000000000000..a741f0d86c09
--- /dev/null
+++ b/autodoc/source/ary/cpp/cs_ce.hxx
@@ -0,0 +1,108 @@
+/* -*- 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 ARY_CPP_CS_CE_HXX
+#define ARY_CPP_CS_CE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <store/s_storage.hxx>
+    // OTHER
+#include <ary/cpp/c_ce.hxx>
+#include <ary/cpp/c_traits.hxx>
+#include <sortedids.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** The data base for all ->ary::cpp::CodeEntity objects.
+*/
+class Ce_Storage : public ::ary::stg::Storage<CodeEntity>
+{
+  public:
+    typedef SortedIds<Ce_Compare>       Index;
+
+                        Ce_Storage();
+    virtual             ~Ce_Storage();
+
+    Ce_id               Store_Type(
+                            DYN CodeEntity &    pass_ce );
+    Ce_id               Store_Operation(
+                            DYN CodeEntity &    pass_ce );
+    Ce_id               Store_Datum(
+                            DYN CodeEntity &    pass_ce );
+
+    const Index &       TypeIndex() const           { return aTypes; }
+    const Index &       OperationIndex() const      { return aOperations; }
+    const Index &       DataIndex() const           { return aData; }
+
+    Index &             TypeIndex()                 { return aTypes; }
+    Index &             OperationIndex()            { return aOperations; }
+    Index &             DataIndex()                 { return aData; }
+
+    static Ce_Storage & Instance_()                 { csv_assert(pInstance_ != 0);
+                                                      return *pInstance_; }
+  private:
+    // DATA
+    Index               aTypes;
+    Index               aOperations;
+    Index               aData;
+
+    static Ce_Storage * pInstance_;
+};
+
+
+
+
+namespace predefined
+{
+
+enum E_CodeEntity
+{
+    ce_GlobalNamespace = 1,
+    ce_MAX
+};
+
+}   // namespace predefined
+
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/cs_def.cxx b/autodoc/source/ary/cpp/cs_def.cxx
new file mode 100644
index 000000000000..713c2aaa63d8
--- /dev/null
+++ b/autodoc/source/ary/cpp/cs_def.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "cs_def.hxx"
+
+// NOT FULLY DEFINED SERVICES
+
+
+namespace
+{
+const uintt
+    C_nReservedElements = ::ary::cpp::predefined::de_MAX;    // Skipping "0"
+}
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+Def_Storage *    Def_Storage::pInstance_ = 0;
+
+
+
+
+Def_Storage::Def_Storage()
+    :   stg::Storage<DefineEntity>(C_nReservedElements)
+{
+    csv_assert(pInstance_ == 0);
+    pInstance_ = this;
+}
+
+Def_Storage::~Def_Storage()
+{
+    csv_assert(pInstance_ != 0);
+    pInstance_ = 0;
+}
+
+De_id
+Def_Storage::Store_Define(DYN DefineEntity &  pass_de)
+{
+    De_id
+        ret = Store_Entity(pass_de);
+    aDefines.Add(ret);
+    return ret;
+}
+
+De_id
+Def_Storage::Store_Macro(DYN DefineEntity &  pass_de)
+{
+    De_id
+        ret = Store_Entity(pass_de);
+    aMacros.Add(ret);
+    return ret;
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/cs_def.hxx b/autodoc/source/ary/cpp/cs_def.hxx
new file mode 100644
index 000000000000..cfd6b5c61b53
--- /dev/null
+++ b/autodoc/source/ary/cpp/cs_def.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 ARY_CPP_CS_DE_HXX
+#define ARY_CPP_CS_DE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <store/s_storage.hxx>
+    // OTHER
+#include <ary/cpp/c_de.hxx>
+#include <ary/cpp/c_traits.hxx>
+#include <sortedids.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+
+/** The data base for all ->ary::cpp::Type objects.
+*/
+class Def_Storage : public ::ary::stg::Storage<DefineEntity>
+{
+  public:
+    typedef SortedIds<Def_Compare>      Index;
+
+    // LIFECYCLE
+                        Def_Storage();
+    virtual             ~Def_Storage();
+
+    De_id               Store_Define(
+                            DYN DefineEntity &  pass_de );
+    De_id               Store_Macro(
+                            DYN DefineEntity &  pass_de );
+
+    const Index &       DefineIndex() const     { return aDefines; }
+    const Index &       MacroIndex() const      { return aMacros; }
+
+    Index &             DefineIndex()           { return aDefines; }
+    Index &             MacroIndex()            { return aMacros; }
+
+    static Def_Storage &
+                        Instance_()             { csv_assert(pInstance_ != 0);
+                                                  return *pInstance_; }
+  private:
+    // DATA
+    Index               aDefines;
+    Index               aMacros;
+
+
+    static Def_Storage *
+                        pInstance_;
+};
+
+
+
+
+namespace predefined
+{
+
+enum E_DefineEntity
+{
+    // 0 is always unused with repository storages.
+    de_MAX = 1
+};
+
+}   // namespace predefined
+
+
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/cs_type.cxx b/autodoc/source/ary/cpp/cs_type.cxx
new file mode 100644
index 000000000000..a5c6791a7ec2
--- /dev/null
+++ b/autodoc/source/ary/cpp/cs_type.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "cs_type.hxx"
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_builtintype.hxx>
+
+
+namespace
+{
+    const uintt
+        C_nReservedElements = ary::cpp::predefined::t_MAX;    // Skipping "0" and the builtin types
+}
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+Type_Storage *    Type_Storage::pInstance_ = 0;
+
+
+
+
+Type_Storage::Type_Storage()
+    :   stg::Storage<Type>(C_nReservedElements),
+        aBuiltInTypes()
+{
+    Setup_BuiltInTypes();
+
+    csv_assert(pInstance_ == 0);
+    pInstance_ = this;
+}
+
+Type_Storage::~Type_Storage()
+{
+    csv_assert(pInstance_ != 0);
+    pInstance_ = 0;
+}
+
+Type_id
+Type_Storage::Search_BuiltInType( const String & i_specializedName ) const
+{
+    return csv::value_from_map(aBuiltInTypes, i_specializedName, Tid(0));
+}
+
+void
+Type_Storage::Setup_BuiltInTypes()
+{
+    Set_BuiltInType( predefined::t_void, "void" );
+    Set_BuiltInType( predefined::t_bool, "bool" );
+    Set_BuiltInType( predefined::t_char, "char" );
+    Set_BuiltInType( predefined::t_signed_char, "char", TYSP_signed );
+    Set_BuiltInType( predefined::t_unsigned_char, "char", TYSP_unsigned );
+    Set_BuiltInType( predefined::t_short, "short" );
+    Set_BuiltInType( predefined::t_unsigned_short, "short", TYSP_unsigned );
+    Set_BuiltInType( predefined::t_int, "int" );
+    Set_BuiltInType( predefined::t_unsigned_int, "int", TYSP_unsigned );
+    Set_BuiltInType( predefined::t_long, "long" );
+    Set_BuiltInType( predefined::t_unsigned_long, "long", TYSP_unsigned );
+    Set_BuiltInType( predefined::t_float, "float" );
+    Set_BuiltInType( predefined::t_double, "double" );
+    Set_BuiltInType( predefined::t_size_t, "size_t" );
+    Set_BuiltInType( predefined::t_wchar_t, "wchar_t" );
+    Set_BuiltInType( predefined::t_ptrdiff_t, "ptrdiff_t" );
+    Set_BuiltInType( predefined::t_ellipse, "..." );
+}
+
+void
+Type_Storage::Set_BuiltInType( Rid                              i_id,
+                               const char *                     i_sName,
+                               ary::cpp::E_TypeSpecialisation   i_eSpecialisation )
+{
+    DYN BuiltInType &
+        rNew = *new BuiltInType(i_sName, i_eSpecialisation);
+    Set_Reserved( i_id, rNew);  // Here goes the ownership for rNew.
+    aBuiltInTypes[rNew.SpecializedName()] = rNew.TypeId();
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/cs_type.hxx b/autodoc/source/ary/cpp/cs_type.hxx
new file mode 100644
index 000000000000..c1f1568cb097
--- /dev/null
+++ b/autodoc/source/ary/cpp/cs_type.hxx
@@ -0,0 +1,141 @@
+/* -*- 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 ARY_CPP_CS_TYPE_HXX
+#define ARY_CPP_CS_TYPE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <store/s_storage.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/cpp/c_type.hxx>
+#include <ary/cpp/c_traits.hxx>
+#include <ary/cpp/usedtype.hxx>
+#include <sortedids.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+
+/** The data base for all ->ary::cpp::Type objects.
+*/
+class Type_Storage : public ::ary::stg::Storage<Type>
+{
+  public:
+    typedef SortedIds<UsedType_Compare>     UT_Index;
+
+                        Type_Storage();
+    virtual             ~Type_Storage();
+
+    const UT_Index &    UsedTypeIndex() const;
+
+    UT_Index &          UsedTypeIndex();
+    Type_id             Search_BuiltInType(
+                            const String &      i_specializedName ) const;
+
+    static Type_Storage &
+                        Instance_()             { csv_assert(pInstance_ != 0);
+                                                  return *pInstance_; }
+  private:
+    // Locals
+    void                Setup_BuiltInTypes();
+    void                Set_BuiltInType(
+                            Rid                 i_nId,
+                            const char *        i_sName,
+                            ary::cpp::E_TypeSpecialisation
+                                                i_eSpecialisation = TYSP_none );
+    // DATA
+    UT_Index            aUsedTypes;
+    std::map<String,Type_id>
+                        aBuiltInTypes;
+
+
+    static Type_Storage *
+                        pInstance_;
+};
+
+
+
+
+namespace predefined
+{
+
+enum E_Type
+{
+    // 0 is always unused with repository storages.
+    t_void = 1,
+    t_bool,
+    t_char,
+    t_signed_char,
+    t_unsigned_char,
+    t_short,
+    t_unsigned_short,
+    t_int,
+    t_unsigned_int,
+    t_long,
+    t_unsigned_long,
+    t_float,
+    t_double,
+    t_size_t,
+    t_wchar_t,
+    t_ptrdiff_t,
+    t_ellipse,
+    t_MAX
+};
+
+}   // namespace predefined
+
+
+
+// IMPLEMENTATION
+inline const Type_Storage::UT_Index &
+Type_Storage::UsedTypeIndex() const
+{
+    return aUsedTypes;
+}
+
+inline Type_Storage::UT_Index &
+Type_Storage::UsedTypeIndex()
+{
+    return aUsedTypes;
+}
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/makefile.mk b/autodoc/source/ary/cpp/makefile.mk
new file mode 100644
index 000000000000..5c20a59bd82e
--- /dev/null
+++ b/autodoc/source/ary/cpp/makefile.mk
@@ -0,0 +1,80 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=ary_cpp
+
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/c_builtintype.obj   \
+    $(OBJ)$/c_class.obj		    \
+    $(OBJ)$/c_de.obj	        \
+    $(OBJ)$/c_define.obj	    \
+    $(OBJ)$/c_enum.obj		    \
+    $(OBJ)$/c_enuval.obj	    \
+    $(OBJ)$/c_funct.obj		    \
+    $(OBJ)$/c_macro.obj	        \
+    $(OBJ)$/c_namesp.obj	    \
+    $(OBJ)$/c_osigna.obj	    \
+    $(OBJ)$/c_reposypart.obj	\
+    $(OBJ)$/c_slots.obj		    \
+    $(OBJ)$/c_traits.obj        \
+    $(OBJ)$/c_tydef.obj		    \
+    $(OBJ)$/c_vari.obj		    \
+    $(OBJ)$/ca_ce.obj           \
+    $(OBJ)$/ca_def.obj          \
+    $(OBJ)$/ca_type.obj         \
+    $(OBJ)$/cs_ce.obj           \
+    $(OBJ)$/cs_def.obj          \
+    $(OBJ)$/cs_type.obj         \
+    $(OBJ)$/namechain.obj	    \
+    $(OBJ)$/tplparam.obj	    \
+    $(OBJ)$/usedtype.obj
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/ary/cpp/namechain.cxx b/autodoc/source/ary/cpp/namechain.cxx
new file mode 100644
index 000000000000..4df64afe3deb
--- /dev/null
+++ b/autodoc/source/ary/cpp/namechain.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cpp/namechain.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/usedtype.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include "tplparam.hxx"
+
+
+
+namespace ary
+{
+namespace cpp
+{
+namespace ut
+{
+
+
+//*********************     NameSegment     ******************//
+
+NameSegment::NameSegment( const char * i_sName )
+    :   sName( i_sName )
+        // pTemplate
+{
+}
+
+NameSegment::NameSegment( const NameSegment & i_rSeg )
+    :   sName(i_rSeg.sName)
+        // pTemplate
+{
+    // KORR_FUTURE :   Handling of copying of templates.
+//  csv_assert( NOT i_rSeg.pTemplate );
+}
+
+NameSegment& NameSegment::operator=(const NameSegment & i_rSeg)
+{
+    sName = i_rSeg.sName;
+    return *this;
+}
+
+NameSegment::~NameSegment()
+{
+}
+
+List_TplParameter &
+NameSegment::AddTemplate()
+{
+    return * (pTemplate = new List_TplParameter);
+}
+
+intt
+NameSegment::Compare( const NameSegment & i_rOther ) const
+{
+    intt nResult = strcmp( sName.c_str(), i_rOther.sName.c_str() );
+    if (nResult != 0)
+        return nResult;
+    if ( bool(pTemplate) != bool(i_rOther.pTemplate) )
+    {
+        if ( NOT pTemplate )
+            return -1;
+        else
+            return +1;
+    }
+    else if ( NOT pTemplate )
+        return 0;
+    else
+        return pTemplate->Compare( *i_rOther.pTemplate );
+}
+
+void
+NameSegment::Get_Text_AsScope( StreamStr &   o_rOut,
+                               const Gate &  i_rGate ) const
+{
+    o_rOut << sName;
+    if ( pTemplate )
+        pTemplate->Get_Text( o_rOut, i_rGate );
+}
+
+void
+NameSegment::Get_Text_AsMainType( StreamStr &   o_rName,
+                                  StreamStr &   o_rPostName,
+                                  const Gate &  i_rGate ) const
+{
+    o_rName << sName;
+    if ( pTemplate )
+        pTemplate->Get_Text( o_rPostName, i_rGate );
+}
+
+
+//*********************     NameChain     ******************//
+
+NameChain::NameChain()
+//  :   aSegments
+{
+}
+
+NameChain::~NameChain()
+{
+}
+
+void
+NameChain::Add_Segment( const char * i_sSeg )
+{
+    aSegments.push_back( NameSegment(i_sSeg) );
+}
+
+List_TplParameter &
+NameChain::Templatize_LastSegment()
+{
+    csv_assert( aSegments.size() > 0 );
+
+    return aSegments.back().AddTemplate();
+}
+
+intt
+NameChain::Compare( const NameChain & i_rChain ) const
+{
+    intt nResult = intt(aSegments.size()) - intt(i_rChain.aSegments.size());
+    if (nResult != 0)
+        return nResult;
+
+    std::vector< NameSegment >::const_iterator it1 = aSegments.begin();
+    std::vector< NameSegment >::const_iterator it1End = aSegments.end();
+    std::vector< NameSegment >::const_iterator it2 = i_rChain.aSegments.begin();
+
+    for ( ; it1 != it1End; ++it1, ++it2 )
+    {
+        nResult = (*it1).Compare(*it2);
+        if (nResult != 0)
+            return nResult;
+    }
+
+    return 0;
+}
+
+const String  &
+NameChain::LastSegment() const
+{
+    if ( aSegments.size() > 0 )
+        return aSegments.back().Name();
+    return String::Null_();
+}
+
+void
+NameChain::Get_Text( StreamStr &    o_rPreName,
+                     StreamStr &    o_rName,
+                     StreamStr &    o_rPostName,
+                     const Gate &   i_rGate ) const
+{
+    std::vector< NameSegment >::const_iterator it = aSegments.begin();
+    std::vector< NameSegment >::const_iterator itEnd = aSegments.end();
+
+    if ( it == itEnd )
+        return;
+
+    for ( --itEnd; it != itEnd; ++it )
+    {
+        (*it).Get_Text_AsScope( o_rPreName, i_rGate );
+        o_rPreName << "::";
+    }
+    (*it).Get_Text_AsMainType( o_rName, o_rPostName, i_rGate );
+}
+
+
+
+}   // namespace ut
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/tplparam.cxx b/autodoc/source/ary/cpp/tplparam.cxx
new file mode 100644
index 000000000000..c22fb78e4787
--- /dev/null
+++ b/autodoc/source/ary/cpp/tplparam.cxx
@@ -0,0 +1,77 @@
+/* -*- 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 <precomp.h>
+#include "tplparam.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/cp_type.hxx>
+
+
+namespace ary
+{
+namespace cpp
+{
+namespace ut
+{
+
+TplParameter_Type::TplParameter_Type( Tid i_nType )
+    :   nType(i_nType)
+{
+}
+
+TplParameter_Type::~TplParameter_Type()
+{
+}
+
+intt
+TplParameter_Type::Compare( const TemplateParameter & i_rOther ) const
+{
+    const TplParameter_Type * pOther
+            = dynamic_cast< const TplParameter_Type* >( &i_rOther );
+    if (pOther == 0)
+        return -1;
+
+    return static_cast<long>(nType.Value())
+           - static_cast<long>(pOther->nType.Value());
+}
+
+void
+TplParameter_Type::Get_Text( StreamStr &                    o_rOut,
+                             const ary::cpp::Gate & i_rGate ) const
+{
+    i_rGate.Types().Get_TypeText( o_rOut, nType );
+}
+
+}   // namespace ut
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/tplparam.hxx b/autodoc/source/ary/cpp/tplparam.hxx
new file mode 100644
index 000000000000..a720eff22776
--- /dev/null
+++ b/autodoc/source/ary/cpp/tplparam.hxx
@@ -0,0 +1,87 @@
+/* -*- 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 ARY_CPP_TPLPARAM_HXX
+#define ARY_CPP_TPLPARAM_HXX
+
+// USED SERVICES
+#include <ary/cpp/c_types4cpp.hxx>
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+    class UsedType;
+    class Gate;
+
+namespace ut
+{
+
+
+class TemplateParameter
+{
+  public:
+    virtual             ~TemplateParameter() {}
+
+    virtual intt        Compare(
+                            const TemplateParameter &
+                                                i_rOther ) const = 0;
+    virtual void        Get_Text(
+                            StreamStr &         o_rOut,
+                            const ary::cpp::Gate &
+                                                i_rGate ) const = 0;
+};
+
+
+class TplParameter_Type : public TemplateParameter
+{
+  public:
+                        TplParameter_Type(
+                            Tid                 i_nType );
+                        ~TplParameter_Type();
+
+    virtual intt        Compare(
+                            const TemplateParameter &
+                                                i_rOther ) const;
+    virtual void        Get_Text(
+                            StreamStr &         o_rOut,
+                            const ary::cpp::Gate &
+                                                i_rGate ) const;
+  private:
+    Tid                 nType;
+};
+
+}   // namespace ut
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/cpp/usedtype.cxx b/autodoc/source/ary/cpp/usedtype.cxx
new file mode 100644
index 000000000000..bde91e5b644b
--- /dev/null
+++ b/autodoc/source/ary/cpp/usedtype.cxx
@@ -0,0 +1,578 @@
+/* -*- 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 <precomp.h>
+#include <ary/cpp/usedtype.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/symtreenode.hxx>
+#include <ary/cpp/c_ce.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_slntry.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/c_traits.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/cpp/cp_type.hxx>
+#include <ary/doc/d_oldcppdocu.hxx>
+#include <ary/getncast.hxx>
+#include "tplparam.hxx"
+
+
+
+namespace
+{
+
+using namespace ::ary::cpp;
+typedef std::vector< ary::cpp::E_ConVol >   PtrLevelVector;
+
+
+inline bool
+result2bool( intt i_nResult )
+    { return i_nResult < 0; }
+
+
+intt                compare_PtrLevelVector(
+                        const PtrLevelVector &
+                                            i_r1,
+                        const PtrLevelVector &
+                                            i_r2 );
+inline intt
+compare_ConVol( E_ConVol i_e1,
+                E_ConVol i_e2 )
+    { return intt(i_e1) - intt(i_e2); }
+
+inline intt
+compare_bool(   bool i_b1,
+                bool i_b2 )
+    { return i_b1 == i_b2
+                    ?   0
+                    :   i_b1
+                            ?   -1
+                            :   +1; }
+inline intt
+compare_Specialisation( E_TypeSpecialisation i_e1,
+                        E_TypeSpecialisation i_e2 )
+    { return intt(i_e1) - intt(i_e2); }
+
+inline bool
+is_const( E_ConVol i_eCV )
+    { return ( intt(i_eCV) & intt(CONVOL_const) ) != 0; }
+
+inline bool
+is_volatile( E_ConVol i_eCV )
+    { return ( intt(i_eCV) & intt(CONVOL_volatile) ) != 0; }
+
+
+intt
+compare_PtrLevelVector( const PtrLevelVector & i_r1,
+                        const PtrLevelVector & i_r2 )
+{
+    intt nResult = i_r1.size() - i_r2.size();
+    if ( nResult != 0 )
+        return nResult;
+
+    PtrLevelVector::const_iterator it1 = i_r1.begin();
+    PtrLevelVector::const_iterator it1End = i_r1.end();
+    PtrLevelVector::const_iterator it2 = i_r2.begin();
+
+    for ( ; it1 != it1End; ++it1, ++it2 )
+    {
+        nResult = compare_ConVol(*it1, *it2);
+        if ( nResult != 0 )
+            return nResult;
+    }
+
+    return 0;
+}
+
+
+}   // anonymous namespace
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+typedef symtree::Node<CeNode_Traits>    CeNode;
+typedef ut::NameChain::const_iterator   nc_iter;
+
+Ce_id               CheckForRelatedCe_inNode(
+                        const CeNode &      i_node,
+                        const StringVector& i_qualification,
+                        const String &      i_name );
+
+
+UsedType::UsedType(Ce_id i_scope )
+    :   aPath(),
+        aPtrLevels(),
+        eConVol_Type(CONVOL_none),
+        bIsReference(false),
+        bIsAbsolute(false),
+        bRefers2BuiltInType(false),
+        eTypeSpecialisation(TYSP_none),
+        nRelatedCe(0),
+        nScope(i_scope)
+{
+}
+
+UsedType::~UsedType()
+{
+}
+
+
+bool
+UsedType::operator<( const UsedType & i_rType ) const
+{
+    intt nResult = compare_bool( bIsAbsolute, i_rType.bIsAbsolute );
+    if ( nResult != 0 )
+        return result2bool(nResult);
+
+    nResult = static_cast<intt>(nScope.Value())
+                -
+              static_cast<intt>(i_rType.nScope.Value());
+    if ( nResult != 0 )
+        return result2bool(nResult);
+
+    nResult = aPath.Compare( i_rType.aPath );
+    if ( nResult != 0 )
+        return result2bool(nResult);
+
+    nResult = compare_ConVol( eConVol_Type, i_rType.eConVol_Type );
+    if ( nResult != 0 )
+        return result2bool(nResult);
+
+    nResult = compare_PtrLevelVector( aPtrLevels, i_rType.aPtrLevels );
+    if ( nResult != 0 )
+        return result2bool(nResult);
+
+    nResult = compare_bool( bIsReference, i_rType.bIsReference );
+    if ( nResult != 0 )
+        return result2bool(nResult);
+
+    nResult = compare_Specialisation( eTypeSpecialisation, i_rType.eTypeSpecialisation );
+    if ( nResult != 0 )
+        return result2bool(nResult);
+
+    return false;
+}
+
+void
+UsedType::Set_Absolute()
+{
+    bIsAbsolute = true;
+}
+
+void
+UsedType::Add_NameSegment( const char * i_sSeg )
+{
+    aPath.Add_Segment(i_sSeg);
+}
+
+ut::List_TplParameter &
+UsedType::Enter_Template()
+{
+    return aPath.Templatize_LastSegment();
+}
+
+void
+UsedType::Set_Unsigned()
+{
+    eTypeSpecialisation = TYSP_unsigned;
+}
+
+void
+UsedType::Set_Signed()
+{
+    eTypeSpecialisation = TYSP_signed;
+}
+
+void
+UsedType::Set_BuiltIn( const char * i_sType )
+{
+    aPath.Add_Segment(i_sType);
+    bRefers2BuiltInType = true;
+}
+
+void
+UsedType::Set_Const()
+{
+    if (PtrLevel() == 0)
+        eConVol_Type = E_ConVol(eConVol_Type | CONVOL_const);
+    else
+        aPtrLevels.back() = E_ConVol(aPtrLevels.back() | CONVOL_const);
+}
+
+void
+UsedType::Set_Volatile()
+{
+    if (PtrLevel() == 0)
+        eConVol_Type = E_ConVol(eConVol_Type | CONVOL_volatile);
+    else
+        aPtrLevels.back() = E_ConVol(aPtrLevels.back() | CONVOL_volatile);
+}
+
+void
+UsedType::Add_PtrLevel()
+{
+    aPtrLevels.push_back(CONVOL_none);
+}
+
+void
+UsedType::Set_Reference()
+{
+    bIsReference = true;
+}
+
+inline bool
+IsInternal(const ary::cpp::CodeEntity & i_ce)
+{
+    const ary::doc::OldCppDocu *
+        docu = dynamic_cast< const ary::doc::OldCppDocu* >(i_ce.Docu().Data());
+    if (docu != 0)
+        return docu->IsInternal();
+    return false;
+}
+
+
+void
+UsedType::Connect2Ce( const CePilot & i_ces)
+{
+    StringVector
+        qualification;
+    String
+        name;
+    Get_NameParts(qualification, name);
+
+    for ( const CeNode * scope_node = CeNode_Traits::NodeOf_(
+                                            i_ces.Find_Ce(nScope));
+          scope_node != 0;
+          scope_node = scope_node->Parent() )
+    {
+        nRelatedCe = CheckForRelatedCe_inNode(*scope_node, qualification, name);
+        if ( nRelatedCe.IsValid() )
+        {
+            if (  IsInternal(i_ces.Find_Ce(nRelatedCe)) )
+                nRelatedCe = Ce_id(0);
+            return;
+        }
+    }   // end for
+}
+
+void
+UsedType::Connect2CeOnlyKnownViaBaseClass(const Gate & i_gate)
+{
+    csv_assert(nScope.IsValid());
+    CesResultList
+        instances = i_gate.Ces().Search_TypeName( LocalName() );
+
+    // If there are no matches, or only one match that was already
+    //   accepted, all work is done.
+    if (     (nRelatedCe.IsValid() AND instances.size() == 1)
+         OR  instances.size() == 0 )
+        return;
+
+    StringVector
+        qualification;
+    String
+        name;
+    Get_NameParts(qualification, name);
+
+    const CodeEntity &
+        scopece = i_gate.Ces().Find_Ce(nScope);
+
+    // Else search for declaration in own class and then in base classes.
+    //   These would be of higher priority than those in parent namespaces.
+    Ce_id
+        foundce = RecursiveSearchCe_InBaseClassesOf(
+                                    scopece, qualification, name, i_gate);
+    if (foundce.IsValid())
+        nRelatedCe = foundce;
+
+    if ( nRelatedCe.IsValid() AND IsInternal(i_gate.Ces().Find_Ce(nRelatedCe)) )
+    {
+        nRelatedCe = Ce_id(0);
+    }
+}
+
+bool
+UsedType::IsBuiltInType() const
+{
+    return bRefers2BuiltInType
+           AND aPtrLevels.size() == 0
+           AND NOT bIsReference
+           AND eConVol_Type == ary::cpp::CONVOL_none;
+}
+
+const String  &
+UsedType::LocalName() const
+{
+    return aPath.LastSegment();
+}
+
+E_TypeSpecialisation
+UsedType::TypeSpecialisation() const
+{
+    return eTypeSpecialisation;
+}
+
+void
+UsedType::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ary::ClassId
+UsedType::get_AryClass() const
+{
+    return class_id;
+}
+
+Rid
+UsedType::inq_RelatedCe() const
+{
+     return nRelatedCe.Value();
+}
+
+bool
+UsedType::inq_IsConst() const
+{
+    if ( is_const(eConVol_Type) )
+        return true;
+    for ( PtrLevelVector::const_iterator it = aPtrLevels.begin();
+          it != aPtrLevels.end();
+          ++it )
+    {
+        if ( is_const(*it) )
+            return true;
+    }
+
+    return false;
+}
+
+void
+UsedType::inq_Get_Text( StreamStr &         o_rPreName,
+                        StreamStr &         o_rName,
+                        StreamStr &         o_rPostName,
+                        const Gate &        i_rGate ) const
+{
+    if ( is_const(eConVol_Type) )
+        o_rPreName << "const ";
+    if ( is_volatile(eConVol_Type) )
+        o_rPreName << "volatile ";
+    if ( bIsAbsolute )
+        o_rPreName << "::";
+
+    aPath.Get_Text( o_rPreName, o_rName, o_rPostName, i_rGate );
+
+    for ( PtrLevelVector::const_iterator it = aPtrLevels.begin();
+          it != aPtrLevels.end();
+          ++it )
+    {
+        o_rPostName << " *";
+        if ( is_const(*it) )
+            o_rPostName << " const";
+        if ( is_volatile(*it) )
+            o_rPostName << " volatile";
+    }
+    if ( bIsReference )
+        o_rPostName << " &";
+}
+
+Ce_id
+UsedType::RecursiveSearchCe_InBaseClassesOf( const CodeEntity &   i_mayBeClass,
+                                             const StringVector & i_myQualification,
+                                             const String &       i_myName,
+                                             const Gate &         i_gate  ) const
+{
+    // Find in this class?
+    const CeNode *
+        basenode = CeNode_Traits::NodeOf_(i_mayBeClass);
+    if (basenode == 0)
+        return Ce_id(0);
+    Ce_id
+        found = CheckForRelatedCe_inNode(*basenode, i_myQualification, i_myName);
+    if (found.IsValid())
+        return found;
+
+
+    const Class *
+        cl = ary_cast<Class>(&i_mayBeClass);
+    if (cl == 0)
+        return Ce_id(0);
+
+    for ( List_Bases::const_iterator it = cl->BaseClasses().begin();
+          it != cl->BaseClasses().end();
+          ++it )
+    {
+        csv_assert((*it).nId.IsValid());
+        Ce_id
+            base = i_gate.Types().Find_Type((*it).nId).RelatedCe();
+        while (base.IsValid() AND is_type<Typedef>(i_gate.Ces().Find_Ce(base)) )
+        {
+            base = i_gate.Types().Find_Type(
+                            ary_cast<Typedef>(i_gate.Ces().Find_Ce(base))
+                            .DescribingType() )
+                            .RelatedCe();
+        }
+
+        if (base.IsValid())
+        {
+            const CodeEntity &
+                basece = i_gate.Ces().Find_Ce(base);
+            found = RecursiveSearchCe_InBaseClassesOf(
+                        basece, i_myQualification, i_myName, i_gate);
+            if (found.IsValid())
+                return found;
+        }
+    }   // end for
+
+    return Ce_id(0);
+}
+
+
+void
+UsedType::Get_NameParts(    StringVector &      o_qualification,
+                            String &            o_name )
+{
+    nc_iter nit     = aPath.begin();
+    nc_iter nit_end = aPath.end();
+    csv_assert(nit != nit_end); // Each UsedType has to have a local name.
+
+    --nit_end;
+    o_name = (*nit_end).Name();
+    for ( ;
+          nit != nit_end;
+          ++nit )
+    {
+        o_qualification.push_back( (*nit).Name() );
+    }
+}
+
+Ce_id
+CheckForRelatedCe_inNode( const CeNode &        i_node,
+                          const StringVector &  i_qualification,
+                          const String &        i_name )
+{
+    if (i_qualification.size() > 0)
+    {
+        Ce_id
+            ret(0);
+        i_node.SearchBelow( ret,
+                            i_qualification.begin(),
+                            i_qualification.end(),
+                            i_name );
+        return ret;
+    }
+    else
+    {
+        return i_node.Search(i_name);
+    }
+}
+
+
+namespace ut
+{
+
+List_TplParameter::List_TplParameter()
+  :   aTplParameters()
+{
+}
+
+List_TplParameter::~List_TplParameter()
+{
+    csv::erase_container_of_heap_ptrs(aTplParameters);
+}
+
+void
+List_TplParameter::AddParam_Type( Type_id i_nType )
+{
+    aTplParameters.push_back( new TplParameter_Type(i_nType) );
+}
+
+void
+List_TplParameter::Get_Text( StreamStr &                    o_rOut,
+                             const ary::cpp::Gate &  i_rGate ) const
+{
+    Vector_TplArgument::const_iterator it    = aTplParameters.begin();
+    Vector_TplArgument::const_iterator itEnd = aTplParameters.end();
+
+    if ( it == itEnd )
+    {
+        o_rOut << "<>";
+        return;
+    }
+
+    o_rOut << "< ";
+
+    (*it)->Get_Text( o_rOut, i_rGate );
+
+    for ( ++it; it != itEnd; ++it )
+    {
+        o_rOut << ", ";
+        (*it)->Get_Text( o_rOut, i_rGate );
+    }
+
+    o_rOut << " >";
+}
+
+intt
+List_TplParameter::Compare( const List_TplParameter & i_rOther ) const
+{
+    intt nResult = intt(aTplParameters.size()) - intt(i_rOther.aTplParameters.size());
+
+    if (nResult != 0)
+        return nResult;
+
+    Vector_TplArgument::const_iterator it1      = aTplParameters.begin();
+    Vector_TplArgument::const_iterator it1End   = aTplParameters.end();
+    Vector_TplArgument::const_iterator it2      = i_rOther.aTplParameters.begin();
+
+    for ( ; it1 != it1End; ++it1, ++it2 )
+    {
+        nResult = (*it1)->Compare( *(*it2) );
+        if (nResult != 0)
+            return nResult;
+    }
+
+    return 0;
+}
+
+
+}   // namespace ut
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/doc/d_boolean.cxx b/autodoc/source/ary/doc/d_boolean.cxx
new file mode 100644
index 000000000000..163f5ef0c8e6
--- /dev/null
+++ b/autodoc/source/ary/doc/d_boolean.cxx
@@ -0,0 +1,58 @@
+/* -*- 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 <precomp.h>
+#include <ary/doc/d_boolean.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+
+namespace ary
+{
+namespace doc
+{
+
+Boolean::~Boolean()
+{
+}
+
+void
+Boolean::do_Accept(csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+
+
+
+}   // namespace doc
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/doc/d_docu.cxx b/autodoc/source/ary/doc/d_docu.cxx
new file mode 100644
index 000000000000..bcb601e339eb
--- /dev/null
+++ b/autodoc/source/ary/doc/d_docu.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/doc/d_docu.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/doc/d_node.hxx>
+
+namespace ary
+{
+namespace doc
+{
+
+Documentation::Documentation()
+    :   pData(0)
+{
+}
+
+Documentation::~Documentation()
+{
+}
+
+void
+Documentation::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+
+
+
+}   // namespace doc
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/doc/d_node.cxx b/autodoc/source/ary/doc/d_node.cxx
new file mode 100644
index 000000000000..7c2cc3d84c8b
--- /dev/null
+++ b/autodoc/source/ary/doc/d_node.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/doc/d_node.hxx>
+
+
+namespace ary
+{
+namespace doc
+{
+
+
+
+Node::~Node()
+{
+}
+
+Node::Node(nodetype::id  i_type)
+    :   nType(i_type),
+        pNext(0)
+{
+}
+
+void
+Node::Add_toChain( DYN Node & pass_nextNode )
+{
+    if (NOT pNext)
+        pNext = &pass_nextNode;
+    else
+        pNext->Add_toChain(pass_nextNode);
+}
+
+uintt
+Node::ListSize() const
+{
+    return pNext
+            ?   pNext->ListSize() + 1
+            :   1;
+}
+
+
+
+}   // namespace doc
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/doc/d_oldcppdocu.cxx b/autodoc/source/ary/doc/d_oldcppdocu.cxx
new file mode 100644
index 000000000000..17d2edcb298a
--- /dev/null
+++ b/autodoc/source/ary/doc/d_oldcppdocu.cxx
@@ -0,0 +1,339 @@
+/* -*- 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 <precomp.h>
+#include <ary/doc/d_oldcppdocu.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/info/all_tags.hxx>
+#include <ary/info/docstore.hxx>
+#include <ary/info/infodisp.hxx>
+#include <docu_node_ids.hxx>
+
+
+
+
+namespace ary
+{
+namespace doc
+{
+
+using namespace info;
+
+
+
+
+unsigned char  C_ucNO_INDEX = 255;
+typedef DYN StdTag * (F_CREATE)();
+
+
+OldCppDocu::OldCppDocu()
+    :   Node(docnt::nt_OldCppDocu),
+        bIsObsolete(false),
+        bIsInternal(false),
+        bIsInterface(false)
+{
+    memset( nTags, C_ucNO_INDEX, size_t(C_eAtTag_NrOfClasses) );
+}
+
+OldCppDocu::~OldCppDocu()
+{
+}
+
+void
+OldCppDocu::Store2( info::DocuStore & o_rDocuStore )
+{
+    o_rDocuStore.Store2ConnectedDeclaration(*this);
+}
+
+AtTag *
+OldCppDocu::Create_StdTag( E_AtTagId i_eId )
+{
+    UINT8 nIndex = static_cast<UINT8>(i_eId);
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new StdTag(i_eId);
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::CheckIn_BaseTag()
+{
+    UINT8 nIndex = atc_base;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new BaseTag();
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::CheckIn_ExceptionTag()
+{
+    UINT8 nIndex = atc_exception;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new ExceptionTag();
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::Create_ImplementsTag()
+{
+    UINT8 nIndex = atc_implements;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new ImplementsTag();
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::Create_KeywordTag()
+{
+    UINT8 nIndex = atc_keyword;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new KeywordTag();
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::CheckIn_ParameterTag()
+{
+    UINT8 nIndex = atc_parameter;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new ParameterTag();
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::CheckIn_SeeTag()
+{
+    UINT8 nIndex = atc_see;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new SeeTag();
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::CheckIn_TemplateTag()
+{
+    UINT8 nIndex = atc_template;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new TemplateTag();
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::Create_LabelTag()
+{
+    UINT8 nIndex = atc_label;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new LabelTag();
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::Create_DefaultTag()
+{
+    UINT8 nIndex = atid_descr;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new StdTag(atid_descr);
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+AtTag *
+OldCppDocu::Create_SinceTag()
+{
+    UINT8 nIndex = atc_since;
+    if ( nTags[nIndex] == C_ucNO_INDEX )
+    {
+        AtTag * ret = new SinceTag();
+        NewTag(nIndex) = ret;
+        return ret;
+    }
+    else
+    {
+        return GetTag(nIndex).GetFollower();
+    }
+}
+
+
+void
+OldCppDocu::Replace_AtShort_By_AtDescr()
+{
+    unsigned char nPosInTags = nTags[atid_short];
+    if ( nPosInTags == C_ucNO_INDEX )
+        return;
+
+    AtTag * pTag = aTags[ nPosInTags ];
+    if ( pTag == 0 )    // Should be csv_assert().
+        return;
+
+    csv_assert( dynamic_cast< StdTag* >(pTag) != 0 );
+    StdTag * pStdTag = static_cast< StdTag* >(pTag);
+
+    pStdTag->ChangeId2(atid_descr);
+    nTags[atid_short] = C_ucNO_INDEX;
+    nTags[atid_descr] = nPosInTags;
+}
+
+void
+OldCppDocu::Set_Obsolete()
+{
+    bIsObsolete = true;
+}
+
+void
+OldCppDocu::Set_Internal()
+{
+    bIsInternal = true;
+}
+
+const AtTag &
+OldCppDocu::Short() const
+{
+    static const StdTag aNull_(atid_short);
+
+    unsigned char nPosInTags = nTags[atid_short];
+    if ( nPosInTags != C_ucNO_INDEX )
+    {
+        AtTag * pTag = aTags[ nPosInTags ];
+        if ( pTag != 0 )    // Should be csv_assert().
+        {
+            return *pTag;
+        }
+    }
+
+    return aNull_;
+}
+
+AtTag * &
+OldCppDocu::NewTag(UINT8 i_nIndex)
+{
+    nTags[i_nIndex] = static_cast<UINT8>(aTags.size());
+    aTags.push_back(0);
+    return aTags.back();
+}
+
+AtTag &
+OldCppDocu::GetTag( UINT8   i_nIndex )
+{
+    csv_assert( i_nIndex < C_eAtTag_NrOfClasses );
+    csv_assert( nTags[i_nIndex] != C_ucNO_INDEX );
+    csv_assert( aTags[nTags[i_nIndex]] != 0 );
+    return * aTags[nTags[i_nIndex]];
+}
+
+bool
+OldCppDocu::IsInternal() const
+{
+    return bIsInternal;
+}
+
+bool
+OldCppDocu::IsInterface() const
+{
+    return bIsInterface;
+}
+
+void
+OldCppDocu::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+}   // namespace doc
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/doc/d_oldidldocu.cxx b/autodoc/source/ary/doc/d_oldidldocu.cxx
new file mode 100644
index 000000000000..e1190d9fd364
--- /dev/null
+++ b/autodoc/source/ary/doc/d_oldidldocu.cxx
@@ -0,0 +1,79 @@
+/* -*- 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 <precomp.h>
+#include <ary/doc/d_oldidldocu.hxx>
+
+// NOT FULLY DEFINED SERVICES
+#include <docu_node_ids.hxx>
+
+
+
+namespace ary
+{
+namespace doc
+{
+
+using namespace ::ary::inf;
+
+
+OldIdlDocu::OldIdlDocu()
+    :   Node(docnt::nt_OldIdlDocu),
+        aShort(),
+        aDescription(),
+        aDeprecatedText(),
+        aTags(),
+        pExternShort(0),
+        bIsPublished(false),
+        bIsDeprecated(false),
+        bIsOptional(false)
+{
+}
+
+OldIdlDocu::~OldIdlDocu()
+{
+}
+
+void
+OldIdlDocu::AddToken2DeprecatedText( DYN DocuToken & let_drToken )
+{
+    aDeprecatedText.AddToken(let_drToken);
+}
+
+void
+OldIdlDocu::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+
+
+}   // namespace info
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/doc/makefile.mk b/autodoc/source/ary/doc/makefile.mk
new file mode 100644
index 000000000000..21989dcc5827
--- /dev/null
+++ b/autodoc/source/ary/doc/makefile.mk
@@ -0,0 +1,58 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=ary_doc
+
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/d_boolean.obj           \
+    $(OBJ)$/d_docu.obj              \
+    $(OBJ)$/d_node.obj              \
+    $(OBJ)$/d_oldcppdocu.obj        \
+    $(OBJ)$/d_oldidldocu.obj
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
diff --git a/autodoc/source/ary/idl/i2s_calculator.cxx b/autodoc/source/ary/idl/i2s_calculator.cxx
new file mode 100644
index 000000000000..5c3254755841
--- /dev/null
+++ b/autodoc/source/ary/idl/i2s_calculator.cxx
@@ -0,0 +1,974 @@
+/* -*- 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 <precomp.h>
+#include "i2s_calculator.hxx"
+
+// NOT FULLY DEFINED SERVICES
+#include <algorithm>
+#include <string.h>
+#include <cosv/file.hxx>
+#include <ary/qualiname.hxx>
+#include <ary/idl/i_enum.hxx>
+#include <ary/idl/i_exception.hxx>
+#include <ary/idl/i_function.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_interface.hxx>
+#include <ary/idl/ik_interface.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/i_property.hxx>
+#include <ary/idl/i_service.hxx>
+#include <ary/idl/i_singleton.hxx>
+#include <ary/idl/i_siservice.hxx>
+#include <ary/idl/i_sisingleton.hxx>
+#include <ary/idl/i_struct.hxx>
+#include <ary/idl/i_structelem.hxx>
+#include <ary/idl/i_typedef.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/idl/ip_type.hxx>
+#include <ary/namesort.hxx>
+#include <nametreenode.hxx>
+#include "i_nnfinder.hxx"
+#include "ia_ce.hxx"
+#include "ia_type.hxx"
+#include "is_ce.hxx"
+#include "is_type.hxx"
+#include "it_ce.hxx"
+#include "it_explicit.hxx"
+#include "it_sequence.hxx"
+#include "it_xnameroom.hxx"
+
+
+namespace ary
+{
+namespace idl
+{
+
+template <class DEST>
+DEST *
+SecondariesCalculator::SearchCe4Type(Type_id i_type)
+{
+    Ce_id
+        ce = lhf_Search_CeFromTypeId(i_type);
+    if (ce.IsValid())
+        return ary_cast<DEST>(& my_CeStorage()[ce]);
+    return 0;
+}
+
+
+typedef stg::const_iterator<CodeEntity> stg_citerator;
+typedef stg::iterator<CodeEntity>       stg_iterator;
+
+typedef stg::filter_iterator<CodeEntity,Interface>
+                                        interface_iterator;
+
+typedef stg::filter_iterator<Type,ExplicitType>
+                                        explicittype_iterator;
+
+typedef ary::stg::const_filter_iterator<CodeEntity,Typedef>
+                                        typedef_citerator;
+
+
+inline Service *
+SecondariesCalculator::lhf_SearchService( Type_id i_nType )
+{
+    return SearchCe4Type<Service>(i_nType);
+}
+
+inline Interface *
+SecondariesCalculator::lhf_SearchInterface( Type_id i_nType )
+{
+    return SearchCe4Type<Interface>(i_nType);
+}
+
+inline Struct *
+SecondariesCalculator::lhf_SearchStruct( Type_id i_nType )
+{
+    return SearchCe4Type<Struct>(i_nType);
+}
+
+inline Exception *
+SecondariesCalculator::lhf_SearchException( Type_id i_nType )
+{
+    return SearchCe4Type<Exception>(i_nType);
+}
+
+inline const Ce_Storage &
+SecondariesCalculator::my_CeStorage() const
+{
+    csv_assert(pCes != 0);
+    return pCes->Storage();
+}
+
+inline const Type_Storage &
+SecondariesCalculator::my_TypeStorage() const
+{
+    csv_assert(pTypes != 0);
+    return pTypes->Storage();
+}
+
+inline Ce_Storage &
+SecondariesCalculator::my_CeStorage()
+{
+    csv_assert(pCes != 0);
+    return pCes->Storage();
+}
+
+inline Type_Storage &
+SecondariesCalculator::my_TypeStorage()
+{
+    csv_assert(pTypes != 0);
+    return pTypes->Storage();
+}
+
+inline void
+SecondariesCalculator::insert_into2sList( CodeEntity &        o_out,
+                                          int                 i_listIndex,
+                                          Ce_id               i_nCe )
+    { o_out.Secondaries().Access_List(i_listIndex).push_back(i_nCe); }
+
+
+SecondariesCalculator::SecondariesCalculator( CeAdmin &      i_ces,
+                                              TypeAdmin &    i_types )
+    :   pCes(&i_ces),
+        pTypes(&i_types)
+{
+}
+
+SecondariesCalculator::~SecondariesCalculator()
+{
+}
+
+
+void
+SecondariesCalculator::CheckAllInterfaceBases()
+{
+    Module &
+        rGlobalNamespace = pCes->GlobalNamespace();
+    QualifiedName
+        aXInterface("::com::sun::star::uno::XInterface","::");
+
+    const Type &
+        rType = pTypes->CheckIn_Type(   aXInterface,
+                                        0,
+                                        rGlobalNamespace.CeId(),
+                                        0 );
+    Type_id
+        nTypeXInterface = rType.TypeId();
+    const ExplicitType &
+        rExplType = ary_cast<ExplicitType>(rType);
+    Ce_id
+        nCeXInterface = lhf_Search_CeForType(rExplType);
+
+    interface_iterator itEnd( my_CeStorage().End() );
+    for ( interface_iterator it( my_CeStorage().BeginUnreserved() );
+          it != itEnd;
+          ++it )
+    {
+        if (NOT it.IsValid())
+            continue;
+
+        Interface &
+            rInterface = *it;
+        if (     NOT rInterface.HasBase()               // According to UNO IDL syntax, an interface without base has com::sun::star::uno::XInterface as base.
+             AND rInterface.CeId() != nCeXInterface )   // XInterface must not be base of itself.
+        {
+            rInterface.Add_Base(nTypeXInterface, 0);
+        }
+    }   // end for
+}
+
+void
+SecondariesCalculator::Connect_Types2Ces()
+{
+    explicittype_iterator itEnd( my_TypeStorage().End() );
+    for ( explicittype_iterator it( my_TypeStorage().BeginUnreserved() );
+          it != itEnd;
+          ++it )
+    {
+        if (NOT it.IsValid())
+            continue;
+
+        ExplicitType &
+            rType = ary_cast<ExplicitType>(*it);
+        Ce_id
+            nRelatedCe = lhf_Search_CeForType(rType);
+        if (nRelatedCe.IsValid())
+        {
+            Ce_Type *
+                pNew = new Ce_Type(nRelatedCe, rType.TemplateParameters());
+            my_TypeStorage().Replace_Entity( rType.TypeId(),
+                                             *pNew );
+        }
+    }   // end for
+}
+
+void
+SecondariesCalculator::Gather_CrossReferences()
+{
+    gather_Synonyms();
+
+    for ( stg_iterator it = my_CeStorage().Begin();
+          it != my_CeStorage().End();
+          ++it )
+    {
+        (*it).Accept( static_cast< SPInst_asHost& >(*this) );
+
+    }   // end for
+
+    sort_All2s();
+}
+
+void
+SecondariesCalculator::Make_Links2DeveloperManual(
+                                const String &      i_devman_reffilepath )
+{
+    csv::File
+        aFile(i_devman_reffilepath, csv::CFM_READ);
+    csv::OpenCloseGuard
+        aFileOpener(aFile);
+    if (aFileOpener)
+    {
+        Read_Links2DevManual(aFile);
+    }
+}
+
+namespace
+{
+
+enum E_LinkMode
+{
+    link2descr,
+    link2ref
+};
+
+struct OrderCeIdsByName
+{
+                        OrderCeIdsByName(
+                            const Ce_Storage &      i_storage )
+                                :   rStorage(i_storage),
+                                    aNameComparison() {}
+    bool                operator()(
+                            Ce_id                   i_ce1,
+                            Ce_id                   i_ce2 ) const
+    {
+        return aNameComparison( rStorage[i_ce1].LocalName(),
+                                rStorage[i_ce2].LocalName() );
+    }
+
+  private:
+    const Ce_Storage &  rStorage;
+    LesserName          aNameComparison;
+};
+
+
+}
+
+
+
+void
+SecondariesCalculator::do_Process( const Service & i_rData )
+{
+    const Service &
+        rService = ary_cast<Service>(i_rData);
+
+    // Interfaces:
+    assignImplementation_toAServicesInterfaces( rService.CeId(),
+                                                rService.CeId(),
+                                                interface_2s_ExportingServices );
+    // Services and their interfaces:
+    recursive_AssignIncludingService(rService.CeId(), rService);
+}
+
+void
+SecondariesCalculator::do_Process( const Interface & i_rData )
+{
+    assign_AsDerivedInterface( ary_cast<Interface>(i_rData) );
+}
+
+void
+SecondariesCalculator::do_Process( const Struct &  i_rData )
+{
+    assign_AsDerivedStruct( ary_cast<Struct>(i_rData) );
+}
+
+void
+SecondariesCalculator::do_Process( const Exception &  i_rData )
+{
+    assign_AsDerivedException( ary_cast<Exception>(i_rData) );
+}
+
+void
+SecondariesCalculator::do_Process( const Typedef &  )
+{
+    // KORR_FUTURE
+    // Find out what was meant here ???
+
+//    const Typedef &
+//        rTypedef = ary_cast<Typedef>(i_rData);
+}
+
+void
+SecondariesCalculator::do_Process( const Singleton &  i_rData )
+{
+    const Singleton &
+        rSingleton = ary_cast<Singleton>(i_rData);
+
+    Service *
+        pServ = lhf_SearchService(rSingleton.AssociatedService());
+    if (pServ != 0)
+    {
+        insert_into2sUnique( *pServ,
+                             service_2s_InstantiatingSingletons,
+                             rSingleton.CeId() );
+    }
+
+    // Interfaces:
+    assignImplementation_toAServicesInterfaces( rSingleton.CeId(),
+                                                lhf_Search_CeFromTypeId(rSingleton.AssociatedService()),
+                                                interface_2s_ExportingSingletons );
+}
+
+void
+SecondariesCalculator::do_Process( const SglIfcService &  i_rData )
+{
+    const SglIfcService &
+        rSglIfcService = ary_cast<SglIfcService>(i_rData);
+
+    assignImplementation_toAServicesInterfaces( rSglIfcService.CeId(),
+                                                rSglIfcService.CeId(),
+                                                interface_2s_ExportingServices );
+}
+
+void
+SecondariesCalculator::do_Process( const SglIfcSingleton &  i_rData )
+{
+    const SglIfcSingleton &
+        rSglIfcSingleton = ary_cast<SglIfcSingleton>(i_rData);
+
+    Type_id nBase = rSglIfcSingleton.BaseInterface();
+    recursive_AssignImplementation_toExportedInterface( rSglIfcSingleton.CeId(),
+                                                        nBase,
+                                                        interface_2s_ExportingSingletons );
+}
+
+void
+SecondariesCalculator::do_Process( const Function & i_rData )
+{
+    const Function &
+        rFunction = ary_cast<Function>(i_rData);
+
+    recursive_AssignFunction_toCeAsReturn(rFunction.CeId(), rFunction.ReturnType());
+
+    for ( Function::ParamList::const_iterator itp = rFunction.Parameters().begin();
+          itp != rFunction.Parameters().end();
+          ++itp )
+    {
+        recursive_AssignFunction_toCeAsParameter(rFunction.CeId(), (*itp).Type());
+    }   // end for (itp)
+
+    for ( Function::ExceptionList::const_iterator itx = rFunction.Exceptions().begin();
+          itx != rFunction.Exceptions().end();
+          ++itx )
+    {
+        Exception *
+            pX = lhf_SearchException(*itx);
+        if (pX != 0)
+        {
+            insert_into2sUnique(*pX, exception_2s_RaisingFunctions, rFunction.CeId());
+        }
+    }   // end for (itx)
+}
+
+void
+SecondariesCalculator::do_Process( const StructElement & i_rData )
+{
+    const StructElement &
+        rStructElement = ary_cast<StructElement>(i_rData);
+
+    recursive_AssignStructElement_toCeAsDataType(rStructElement.CeId(), rStructElement.Type());
+}
+
+void
+SecondariesCalculator::do_Process( const Property & i_rData )
+{
+    const Property &
+        rProperty = ary_cast<Property>(i_rData);
+
+    recursive_AssignStructElement_toCeAsDataType(rProperty.CeId(), rProperty.Type());
+}
+
+Ce_id
+SecondariesCalculator::lhf_Search_CeForType( const ExplicitType & i_rType ) const
+{
+    const ExplicitNameRoom &
+        rExplicitNameRoom = ary_cast<ExplicitNameRoom>(
+                                my_TypeStorage()[i_rType.NameRoom()] );
+    Find_ModuleNode
+        rNodeFinder( my_CeStorage(),
+                     rExplicitNameRoom.NameChain_Begin(),
+                     rExplicitNameRoom.NameChain_End(),
+                     i_rType.Name() );
+
+    if ( rExplicitNameRoom.IsAbsolute() )
+    {
+        const Module &
+            rGlobalNamespace = ary_cast<Module>(
+                                my_CeStorage()[predefined::ce_GlobalNamespace]);
+        return Search_SubTree(  rGlobalNamespace,
+                                rNodeFinder );
+    }
+    else
+    {
+        const Module &
+            rStartModule = ary_cast<Module>(
+                                my_CeStorage()[i_rType.ModuleOfOccurrence()]);
+        Ce_id ret = Search_SubTree_UpTillRoot( rStartModule,
+                                               rNodeFinder );
+        return ret;
+    }   // endif (rExplicitNameRoom.IsAbsolute()) else
+}
+
+Ce_id
+SecondariesCalculator::lhf_Search_CeFromTypeId( Type_id i_nType ) const
+{
+    if (NOT i_nType.IsValid())
+        return Ce_id(0);
+    const Ce_Type *
+        pType = ary_cast<Ce_Type>( & my_TypeStorage()[i_nType] );
+    return pType != 0
+                ?   pType->RelatedCe()
+                :   Ce_id_Null();
+}
+
+void
+SecondariesCalculator::assign_CurLink( char *              i_text,
+                                       const String &      i_link,
+                                       const String &      i_linkUI,
+                                       bool                i_isDescr,
+                                       int                 i_lineCount )
+{
+    csv_assert(i_text != 0);
+
+    const ary::idl::Module *
+        pModule = & ary_cast<Module>(
+                        my_CeStorage()[predefined::ce_GlobalNamespace]);
+
+    char * pPastNext = 0;
+    char * pNext = i_text;
+    for ( ;
+          (pPastNext = strstr(pNext,".")) != 0;
+          pNext = pPastNext + 1 )
+    {
+        String sNext(pNext, pPastNext-pNext);
+        Ce_id nModule = pModule->Search_Name(sNext);
+        if (nModule.IsValid())
+        {
+            pModule = ary_cast<Module>( & my_CeStorage()[nModule] );
+        }
+        else
+        {
+            pModule = 0;
+        }
+
+        if (pModule == 0)
+        {
+            Cerr() << "Warning: Invalid line nr. "
+                   << i_lineCount
+                   << " in DevelopersGuide reference file:\n"
+                   << reinterpret_cast< const char* >(i_text)
+                   << "\n"
+                   << Endl();
+            return;
+        }
+    }   // end for
+
+    pPastNext = strchr(pNext,':');
+    bool bMember = pPastNext != 0;
+    String sCe( pNext, (bMember ? csv::str::size(pPastNext-pNext) : csv::str::maxsize) );
+
+//  KORR_FUTURE
+//  String sMember(bMember ? pPastNext+1, "");
+
+    Ce_id nCe = pModule->Search_Name(sCe);
+    if (NOT nCe.IsValid())
+    {
+        Cerr() << "Warning: Invalid line nr. "
+               << i_lineCount
+               << " in DevelopersGuide reference file:\n"
+               << reinterpret_cast< const char* >(i_text)
+               << "\n"
+               << Endl();
+        return;
+    }
+
+    CodeEntity &
+        rCe = my_CeStorage()[nCe];
+    if (NOT bMember)
+    {
+        if (i_isDescr)
+            rCe.Secondaries().Add_Link2DescriptionInManual(i_link, i_linkUI);
+        else
+            rCe.Secondaries().Add_Link2RefInManual(i_link, i_linkUI);
+        return;
+    }
+    else
+    {
+    // KORR_FUTURE
+    //   Provisorial just doing nothing (or may be
+    //   adding a link at main Ces lists).
+//    if (i_isDescr)
+//        rCe.Secondaries().Add_Link2DescriptionInManual(i_link);
+//    else
+//        rCe.Secondaries().Add_Link2RefInManual(i_link);
+    }
+}
+
+void
+SecondariesCalculator::gather_Synonyms()
+{
+    const Ce_Storage &
+        cstrg = my_CeStorage();
+    typedef_citerator itEnd(cstrg.End());
+    for ( typedef_citerator it(cstrg.Begin());
+          it != itEnd;
+          ++it )
+    {
+        if (NOT it.IsValid())
+            continue;
+
+        const Typedef &
+            rTypedef = *it;
+        recursive_AssignAsSynonym(rTypedef.CeId(), rTypedef);
+    }   // end for (itTd)
+}
+
+void
+SecondariesCalculator::recursive_AssignAsSynonym( Ce_id               i_synonymousTypedefsId,
+                                                  const Typedef &     i_TypedefToCheck )
+{
+    Ce_id
+        nCe = lhf_Search_CeFromTypeId(i_TypedefToCheck.DefiningType());
+    if (NOT nCe.IsValid())
+        return;
+    CodeEntity &
+        rCe = my_CeStorage()[nCe];
+
+    switch (rCe.AryClass())  // KORR_FUTURE: make this faster, remove switch.
+    {
+        case Interface::class_id:
+                    insert_into2sList( rCe,
+                                       interface_2s_SynonymTypedefs,
+                                       i_synonymousTypedefsId );
+                    break;
+        case Struct::class_id:
+                    insert_into2sList( rCe,
+                                       struct_2s_SynonymTypedefs,
+                                       i_synonymousTypedefsId );
+                    break;
+        case Enum::class_id:
+                    insert_into2sList( rCe,
+                                       enum_2s_SynonymTypedefs,
+                                       i_synonymousTypedefsId );
+                    break;
+        case Typedef::class_id:
+                    insert_into2sList( rCe,
+                                       typedef_2s_SynonymTypedefs,
+                                       i_synonymousTypedefsId );
+                    recursive_AssignAsSynonym( i_synonymousTypedefsId,
+                                               static_cast< Typedef& >(rCe) );
+                    break;
+                // default: do nothing.
+    }
+}
+
+void
+SecondariesCalculator::recursive_AssignIncludingService( Ce_id               i_includingServicesId,
+                                                         const Service &     i_ServiceToCheckItsIncludes )
+{
+    Dyn_StdConstIterator<CommentedRelation>
+        pIncludedServices;
+    i_ServiceToCheckItsIncludes.Get_IncludedServices(pIncludedServices);
+
+    for ( StdConstIterator<CommentedRelation> &
+                itServ = *pIncludedServices;
+          itServ;
+          ++itServ )
+    {
+        Service *
+            pServ = lhf_SearchService((*itServ).Type());
+        if (pServ != 0)
+        {
+            insert_into2sUnique( *pServ,
+                                 service_2s_IncludingServices,
+                                 i_includingServicesId
+                               );
+            recursive_AssignIncludingService(i_includingServicesId, *pServ);
+
+        }   // end if
+
+        assignImplementation_toAServicesInterfaces( i_includingServicesId,
+                                                    lhf_Search_CeFromTypeId( (*itServ).Type() ),
+                                                    interface_2s_ExportingServices );
+    }   // end for
+}
+
+void
+SecondariesCalculator::assign_AsDerivedInterface( const Interface & i_rDerived )
+{
+    ary::Dyn_StdConstIterator<ary::idl::CommentedRelation>
+        pHelp;
+    ary::idl::ifc_interface::attr::Get_Bases(pHelp, i_rDerived);
+
+    for ( ary::StdConstIterator<ary::idl::CommentedRelation> & it = *pHelp;
+          it.operator bool();
+          ++it )
+    {
+        Interface *
+            pIfc = lhf_SearchInterface( (*it).Type() );
+        if (pIfc == 0)
+            continue;
+
+        insert_into2sList( *pIfc,
+                           interface_2s_Derivations,
+                           i_rDerived.CeId() );
+    }   // end for
+}
+
+void
+SecondariesCalculator::assign_AsDerivedStruct( const Struct &   i_rDerived )
+{
+    Type_id
+        nBase = i_rDerived.Base();
+    if (nBase.IsValid())
+    {
+        Struct *
+            pParent = lhf_SearchStruct(nBase);
+        if (pParent != 0)
+        {
+            insert_into2sList( *pParent,
+                               struct_2s_Derivations,
+                               i_rDerived.CeId() );
+        }
+    }
+}
+
+void
+SecondariesCalculator::assign_AsDerivedException( const Exception &   i_rDerived )
+{
+    Type_id
+        nBase = i_rDerived.Base();
+    if (nBase.IsValid())
+    {
+        Exception *
+            pParent = lhf_SearchException(nBase);
+        if (pParent != 0)
+        {
+            insert_into2sList( *pParent,
+                               exception_2s_Derivations,
+                               i_rDerived.CeId() );
+        }   // end if
+    }   // end if
+}
+
+void
+SecondariesCalculator::assignImplementation_toAServicesInterfaces(
+                                                    Ce_id               i_nImpl,
+                                                    Ce_id               i_nService,
+                                                    E_2s_of_Interface   i_eList )
+{
+    if (NOT i_nService.IsValid())
+        return;
+    Service *
+        pService = ary_cast<Service>( & my_CeStorage()[i_nService] );
+    SglIfcService *
+        pSglIfcService = ary_cast<SglIfcService>( & my_CeStorage()[i_nService] );
+
+    if (pService != 0)
+    {
+        Dyn_StdConstIterator<CommentedRelation>
+            pSupportedInterfaces;
+        pService->Get_SupportedInterfaces(pSupportedInterfaces);
+
+        for ( StdConstIterator<CommentedRelation> &
+                    itInfc = *pSupportedInterfaces;
+              itInfc.operator bool();
+              ++itInfc )
+        {
+            recursive_AssignImplementation_toExportedInterface( i_nImpl,
+                                                                (*itInfc).Type(),
+                                                                i_eList );
+        }   // end for
+    }
+    else if (pSglIfcService != 0)
+    {
+        Type_id nBase = pSglIfcService->BaseInterface();
+        recursive_AssignImplementation_toExportedInterface( i_nImpl,
+                                                            nBase,
+                                                            i_eList );
+    }   // end if
+}
+
+void
+SecondariesCalculator::recursive_AssignImplementation_toExportedInterface(
+                                                    Ce_id               i_nService,
+                                                    Type_id             i_nExportedInterface,
+                                                    E_2s_of_Interface   i_eList )
+{
+    Interface *
+        pIfc = lhf_SearchInterface(i_nExportedInterface);
+    if (pIfc == 0)
+        return;
+
+    insert_into2sUnique( *pIfc,
+                         i_eList,
+                         i_nService );
+    Dyn_StdConstIterator<CommentedRelation>
+        pBases;
+    ary::idl::ifc_interface::attr::Get_Bases(pBases, *pIfc);
+    for ( StdConstIterator<CommentedRelation> & it = *pBases;
+          it.operator bool();
+          ++it )
+    {
+        recursive_AssignImplementation_toExportedInterface(i_nService, (*it).Type(), i_eList);
+    }
+}
+
+void
+SecondariesCalculator::recursive_AssignFunction_toCeAsReturn( Ce_id         i_nFunction,
+                                                              Type_id       i_nReturnType )
+{
+    Ce_id
+        nCe = lhf_Search_CeFromTypeId(i_nReturnType);
+    if (NOT nCe.IsValid())
+        return;
+
+    CodeEntity &
+        rCe = my_CeStorage()[nCe];
+    switch (rCe.AryClass())  // KORR_FUTURE: make this faster, remove switch.
+    {
+        case Interface::class_id:
+                    insert_into2sList( rCe,
+                                       interface_2s_AsReturns,
+                                       i_nFunction );
+                    break;
+        case Struct::class_id:
+                    insert_into2sList( rCe,
+                                       struct_2s_AsReturns,
+                                       i_nFunction );
+                    break;
+        case Enum::class_id:
+                    insert_into2sList( rCe,
+                                       enum_2s_AsReturns,
+                                       i_nFunction );
+                    break;
+        case Typedef::class_id:
+                    insert_into2sList( rCe,
+                                       typedef_2s_AsReturns,
+                                       i_nFunction );
+                    recursive_AssignFunction_toCeAsReturn( i_nFunction,
+                                                           static_cast< Typedef& >(rCe).DefiningType() );
+                    break;
+        // default: do nothing.
+    }
+}
+
+void
+SecondariesCalculator::recursive_AssignFunction_toCeAsParameter( Ce_id      i_nFunction,
+                                                                 Type_id    i_nParameterType )
+{
+    Ce_id
+        nCe = lhf_Search_CeFromTypeId(i_nParameterType);
+    if (NOT nCe.IsValid())
+        return;
+
+    CodeEntity &
+        rCe = my_CeStorage()[nCe];
+    switch (rCe.AryClass())  // KORR_FUTURE: make this faster, remove switch.
+    {
+        case Interface::class_id:
+                    insert_into2sList( rCe,
+                                       interface_2s_AsParameters,
+                                       i_nFunction );
+                    break;
+        case Struct::class_id:
+                    insert_into2sList( rCe,
+                                       struct_2s_AsParameters,
+                                       i_nFunction );
+                    break;
+        case Enum::class_id:
+                    insert_into2sList( rCe,
+                                       enum_2s_AsParameters,
+                                       i_nFunction );
+                    break;
+        case Typedef::class_id:
+                    insert_into2sList( rCe,
+                                       typedef_2s_AsParameters,
+                                       i_nFunction );
+                    recursive_AssignFunction_toCeAsParameter( i_nFunction,
+                                                              static_cast< Typedef& >(rCe).DefiningType() );
+                    break;
+        // default: do nothing.
+    }
+}
+
+void
+SecondariesCalculator::recursive_AssignStructElement_toCeAsDataType( Ce_id   i_nDataElement,
+                                                                     Type_id i_nDataType )
+{
+    Ce_id
+        nCe = lhf_Search_CeFromTypeId(i_nDataType);
+    if (NOT nCe.IsValid())
+        return;
+
+    CodeEntity &
+        rCe = my_CeStorage()[nCe];
+    switch (rCe.AryClass())  // KORR_FUTURE: make this faster, remove switch.
+    {
+        case Interface::class_id:
+                    insert_into2sList( rCe,
+                                       interface_2s_AsDataTypes,
+                                       i_nDataElement );
+                    break;
+        case Struct::class_id:
+                    insert_into2sList( rCe,
+                                       struct_2s_AsDataTypes,
+                                       i_nDataElement );
+                    break;
+        case Enum::class_id:
+                    insert_into2sList( rCe,
+                                       enum_2s_AsDataTypes,
+                                       i_nDataElement );
+                    break;
+        case Typedef::class_id:
+                    insert_into2sList( rCe,
+                                       typedef_2s_AsDataTypes,
+                                       i_nDataElement );
+                    recursive_AssignFunction_toCeAsParameter( i_nDataElement,
+                                                              static_cast< Typedef& >(rCe).DefiningType() );
+                    break;
+        // default: do nothing.
+    }   // end switch
+}
+
+void
+SecondariesCalculator::insert_into2sUnique( CodeEntity &        o_out,
+                                            int                 i_listIndex,
+                                            Ce_id               i_nCe )
+{
+    std::vector<Ce_id> &
+        rOut = o_out.Secondaries().Access_List(i_listIndex);
+    if (std::find(rOut.begin(),rOut.end(),i_nCe) != rOut.end())
+        return;
+    rOut.push_back(i_nCe);
+}
+
+void
+SecondariesCalculator::sort_All2s()
+{
+    OrderCeIdsByName
+        aIdOrdering(my_CeStorage());
+
+    for ( stg_iterator it = my_CeStorage().Begin();
+          it != my_CeStorage().End();
+          ++it )
+    {
+        Ce_2s &
+            r2s = (*it).Secondaries();
+        int iCount = r2s.CountXrefLists();
+        for (int i = 0; i < iCount; ++i)
+        {
+            std::sort( r2s.Access_List(i).begin(),
+                       r2s.Access_List(i).end(),
+                       aIdOrdering );
+        }   // end for (i)
+    }   // end for (it)
+}
+
+void
+SecondariesCalculator::Read_Links2DevManual( csv::bstream & i_file )
+{
+    StreamLock  aLine(300);
+    StreamStr & rLine = aLine();
+
+
+    String      sCurLink;
+    String      sCurLinkUI;
+    E_LinkMode  eCurMode = link2ref;
+
+    int lineCount = 0;
+    const char * sLink = "LINK:";
+    const char * sDescr = "DESCR:";
+    const char * sTopic = "TOPIC:";
+    const char * sRef = "REF:";
+    const UINT8  cMaxASCIINumWhiteSpace = 32;
+
+    while (NOT i_file.eod())
+    {
+        ++lineCount;
+
+        rLine.reset();
+        rLine.operator_read_line(i_file);
+
+        if ( *rLine.c_str() >= 'a' )
+        {
+            assign_CurLink(rLine.begin(), sCurLink, sCurLinkUI, eCurMode == link2descr, lineCount);
+        }
+        else if ( strncmp(rLine.c_str(), sLink, strlen(sLink)) == 0 )
+        {
+            sCurLink = rLine.c_str()+5;
+            sCurLinkUI.clear();
+        }
+        else if ( strncmp(rLine.c_str(), sDescr, strlen(sDescr)) == 0 )
+        {
+            sCurLinkUI = rLine.c_str()+6;
+        }
+        else if ( strncmp(rLine.c_str(), sTopic, strlen(sTopic)) == 0 )
+        {
+            eCurMode = link2descr;
+        }
+        else if ( strncmp(rLine.c_str(), sRef, strlen(sRef)) == 0 )
+        {
+            eCurMode = link2ref;
+        }
+        else if (static_cast<UINT8>(*rLine.c_str()) > cMaxASCIINumWhiteSpace)
+        {
+            assign_CurLink(rLine.begin(), sCurLink, sCurLinkUI, eCurMode == link2descr, lineCount);
+        }
+     // else
+        //  Ignore empty line.
+
+    }   // end while
+}
+
+
+
+}   // namespace idl
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i2s_calculator.hxx b/autodoc/source/ary/idl/i2s_calculator.hxx
new file mode 100644
index 000000000000..dd85d0a05e21
--- /dev/null
+++ b/autodoc/source/ary/idl/i2s_calculator.hxx
@@ -0,0 +1,298 @@
+/* -*- 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 ARY_IDL_I2S_CALCULATOR_HXX
+#define ARY_IDL_I2S_CALCULATOR_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cosv/tpl/processor.hxx>
+    // PARAMETERS
+#include <ary/idl/i_types4idl.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+    class CeAdmin;
+    class Ce_Storage;
+    class TypeAdmin;
+    class Type_Storage;
+    class Module;
+    class ExplicitType;
+    class Function;
+    class Interface;
+    class Property;
+    class Typedef;
+    class Service;
+    class Singleton;
+    class SglIfcService;
+    class SglIfcSingleton;
+    class Struct;
+    class StructElement;
+    class Exception;
+    class Ce_2s;
+}
+}
+
+
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+enum E_2s_of_Service
+{
+    service_2s_IncludingServices,
+    service_2s_InstantiatingSingletons
+};
+
+enum E_2s_of_Interface
+{
+    interface_2s_Derivations,
+    interface_2s_ExportingServices,
+    interface_2s_ExportingSingletons,
+    interface_2s_SynonymTypedefs,
+//    interface_2s_UsingTypedefs,
+    interface_2s_AsReturns,
+//    interface_2s_AsIndirectReturns,
+    interface_2s_AsParameters,
+//    interface_2s_AsIndirectParameters,
+    interface_2s_AsDataTypes
+};
+
+enum E_2s_of_Struct
+{
+    struct_2s_Derivations,
+    struct_2s_SynonymTypedefs,
+//    struct_2s_UsingTypedefs,
+    struct_2s_AsReturns,
+//    struct_2s_AsIndirectReturns,
+    struct_2s_AsParameters,
+//    struct_2s_AsIndirectParameters,
+    struct_2s_AsDataTypes
+};
+
+enum E_2s_of_Enum
+{
+    enum_2s_SynonymTypedefs,
+//    enum_2s_UsingTypedefs,
+    enum_2s_AsReturns,
+//    enum_2s_AsIndirectReturns,
+    enum_2s_AsParameters,
+//    enum_2s_AsIndirectParameters,
+    enum_2s_AsDataTypes
+};
+
+enum E_2s_of_Typedef
+{
+    typedef_2s_SynonymTypedefs,
+//    typedef_2s_UsingTypedefs,
+    typedef_2s_AsReturns,
+//    typedef_2s_AsIndirectReturns,
+    typedef_2s_AsParameters,
+//    typedef_2s_AsIndirectParameters,
+    typedef_2s_AsDataTypes
+};
+
+enum E_2s_of_Exceptions
+{
+    exception_2s_Derivations,
+    exception_2s_RaisingFunctions
+};
+
+
+
+class SPInst_asHost :   public csv::ProcessorIfc,
+                        public csv::ConstProcessor<Service>,
+                        public csv::ConstProcessor<Interface>,
+                        public csv::ConstProcessor<Struct>,
+                        public csv::ConstProcessor<Exception>,
+                        public csv::ConstProcessor<Typedef>,
+                        public csv::ConstProcessor<Singleton>,
+                        public csv::ConstProcessor<Function>,
+                        public csv::ConstProcessor<StructElement>,
+                        public csv::ConstProcessor<Property>,
+                        public csv::ConstProcessor<SglIfcService>,
+                        public csv::ConstProcessor<SglIfcSingleton>
+{
+};
+
+
+
+
+/** This class scans the parsed data and produces several
+    secondary data like cross references and alphabetical indices.
+
+    In this declaration "Secondaries" or "2s" mean those secondary data.
+
+    @see Ce_2s
+*/
+class SecondariesCalculator : public SPInst_asHost
+{
+  public:
+    // LIFECYCLE
+                        SecondariesCalculator(
+                            CeAdmin &           i_ces,
+                            TypeAdmin &         i_types );
+    virtual             ~SecondariesCalculator();
+
+    // OPERATIONS
+    void                CheckAllInterfaceBases();
+    void                Connect_Types2Ces();
+    void                Gather_CrossReferences();
+    void                Make_Links2DeveloperManual(
+                            const String &      i_devman_reffilepath );
+
+  private:
+    // Interface CeHost These are the points to gather cross
+    //   references:
+    virtual void        do_Process(
+                            const Service &     i_rData );
+    virtual void        do_Process(
+                            const Interface &   i_rData );
+    virtual void        do_Process(
+                            const Struct &      i_rData );
+    virtual void        do_Process(
+                            const Exception &   i_rData );
+    virtual void        do_Process(
+                            const Typedef &     i_rData );
+    virtual void        do_Process(
+                            const Singleton &   i_rData );
+    virtual void        do_Process(
+                            const Function &    i_rData );
+    virtual void        do_Process(
+                            const StructElement &
+                                                i_rData );
+    virtual void        do_Process(
+                            const Property &    i_rData );
+    virtual void        do_Process(
+                            const SglIfcService &
+                                                i_rData );
+    virtual void        do_Process(
+                            const SglIfcSingleton &
+                                                i_rData );
+
+    // Locals
+    const Ce_Storage &  my_CeStorage() const;
+    const Type_Storage &
+                        my_TypeStorage() const;
+    Ce_Storage &        my_CeStorage();
+    Type_Storage &      my_TypeStorage();
+
+    template <class DEST>
+    DEST *              SearchCe4Type(
+                            Type_id             i_type );
+    Ce_id               lhf_Search_CeForType(
+                            const ExplicitType &
+                                                i_rType ) const;
+    Ce_id               lhf_Search_CeFromTypeId(
+                            Type_id             i_nType ) const;
+    Service *           lhf_SearchService(
+                            Type_id             i_nServ );
+    Interface *         lhf_SearchInterface(
+                            Type_id             i_nIfc );
+    Struct *            lhf_SearchStruct(
+                            Type_id             i_nIfc );
+    Exception *         lhf_SearchException(
+                            Type_id             i_nIfc );
+    void                assign_CurLink(
+                            char *              i_text,
+                            const String &      i_link,
+                            const String &      i_linkUI,
+                            bool                i_isDescr,      /// @descr true: description, false: reference.
+                            int                 i_lineCount  );
+    void                gather_Synonyms();
+    void                recursive_AssignAsSynonym(
+                            Ce_id               i_synonymousTypedefsId,
+                            const Typedef &     i_TypedefToCheck );
+    void                recursive_AssignIncludingService(
+                            Ce_id               i_includingServicesId,
+                            const Service &     i_ServiceToCheckItsIncludes );
+    void                assign_AsDerivedInterface(
+                            const Interface &   i_rDerived );
+    void                assign_AsDerivedStruct(
+                            const Struct &      i_rDerived );
+    void                assign_AsDerivedException(
+                            const Exception &   i_rDerived );
+    void                assignImplementation_toAServicesInterfaces(
+                            Ce_id               i_nImpl,
+                            Ce_id               i_nService,
+                            E_2s_of_Interface   i_eList );
+    void                recursive_AssignImplementation_toExportedInterface(
+                            Ce_id               i_nService,
+                            Type_id             i_nExportedInterface,
+                            E_2s_of_Interface   i_eList );
+    void                recursive_AssignFunction_toCeAsReturn(
+                            Ce_id               i_nFunction,
+                            Type_id             i_nReturnType );
+    void                recursive_AssignFunction_toCeAsParameter(
+                            Ce_id               i_nFunction,
+                            Type_id             i_nParameterType );
+
+    /** @param i_nDataElement
+        May be the ID of an struct element as well as an exception element
+        or a property.
+    */
+    void                recursive_AssignStructElement_toCeAsDataType(
+                            Ce_id               i_nDataElement,
+                            Type_id             i_nDataType );
+    void                insert_into2sList(
+                            CodeEntity &        o_out,
+                            int                 i_listIndex,
+                            Ce_id               i_nCe );
+    void                insert_into2sUnique(
+                            CodeEntity &        o_out,
+                            int                 i_listIndex,
+                            Ce_id               i_nCe );
+    /// Sorts secondary production lists alphabetical.
+    void                sort_All2s();
+
+    void                Read_Links2DevManual(
+                            csv::bstream &      i_file );
+
+    // DATA
+    CeAdmin *           pCes;
+    TypeAdmin *         pTypes;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_attribute.cxx b/autodoc/source/ary/idl/i_attribute.cxx
new file mode 100644
index 000000000000..8dc1d62f8f9f
--- /dev/null
+++ b/autodoc/source/ary/idl/i_attribute.cxx
@@ -0,0 +1,162 @@
+/* -*- 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 <precomp.h>
+#include <ary/idl/i_attribute.hxx>
+#include <ary/idl/ik_attribute.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/getncast.hxx>
+#include <sci_impl.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+Attribute::Attribute( const String &      i_sName,
+                      Ce_id               i_nService,
+                      Ce_id               i_nModule,
+                      Type_id             i_nType,
+                      bool                i_bReadonly,
+                      bool                i_bBound )
+    :   sName(i_sName),
+        nOwner(i_nService),
+        nNameRoom(i_nModule),
+        nType(i_nType),
+        aGetExceptions(),
+        aSetExceptions(),
+        bReadonly(i_bReadonly),
+        bBound(i_bBound)
+{
+}
+
+Attribute::~Attribute()
+{
+}
+
+
+void
+Attribute::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Attribute::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Attribute::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Attribute::inq_NameRoom() const
+{
+    return nNameRoom;
+}
+
+Ce_id
+Attribute::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Attribute::inq_SightLevel() const
+{
+    return sl_Member;
+}
+
+namespace ifc_attribute
+{
+
+inline const Attribute &
+attribute_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( is_type<Attribute>(i_ce) );
+    return static_cast< const Attribute& >(i_ce);
+}
+
+bool
+attr::HasAnyStereotype( const CodeEntity & i_ce )
+{
+    const Attribute & rAttr = attribute_cast(i_ce);
+    return rAttr.bReadonly OR rAttr.bBound;
+}
+
+bool
+attr::IsReadOnly( const CodeEntity & i_ce )
+{
+    return attribute_cast(i_ce).bReadonly;
+}
+
+bool
+attr::IsBound( const CodeEntity & i_ce )
+{
+    return attribute_cast(i_ce).bBound;
+}
+
+Type_id
+attr::Type( const CodeEntity & i_ce )
+{
+    return attribute_cast(i_ce).nType;
+}
+
+void
+attr::Get_GetExceptions( Dyn_TypeIterator &  o_result,
+                         const CodeEntity &  i_ce )
+{
+    o_result
+        = new SCI_Vector<Type_id>( attribute_cast(i_ce).aGetExceptions );
+}
+
+void
+attr::Get_SetExceptions( Dyn_TypeIterator &  o_result,
+                         const CodeEntity &  i_ce )
+{
+    o_result
+        = new SCI_Vector<Type_id>( attribute_cast(i_ce).aSetExceptions );
+}
+
+
+} // namespace ifc_attribute
+
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_ce.cxx b/autodoc/source/ary/idl/i_ce.cxx
new file mode 100644
index 000000000000..8a0de924b47c
--- /dev/null
+++ b/autodoc/source/ary/idl/i_ce.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_ce.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/doc/d_oldidldocu.hxx>
+#include <ary/getncast.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+CodeEntity::CodeEntity()
+    :   aDocu(),
+        p2s(0)
+{
+}
+
+CodeEntity::~CodeEntity()
+{
+}
+
+const Ce_2s &
+CodeEntity::Secondaries() const
+{
+    return const_cast<CodeEntity*>(this)->Secondaries();
+}
+
+Ce_2s &
+CodeEntity::Secondaries()
+{
+    if (p2s)
+        return *p2s;
+    p2s = Ce_2s::Create_(AryClass());
+    return *p2s;
+}
+
+}   // namespace idl
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_ce2s.cxx b/autodoc/source/ary/idl/i_ce2s.cxx
new file mode 100644
index 000000000000..9a126fd312e2
--- /dev/null
+++ b/autodoc/source/ary/idl/i_ce2s.cxx
@@ -0,0 +1,87 @@
+/* -*- 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 <precomp.h>
+#include <ary/idl/i_ce.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <ary/getncast.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+namespace
+{
+const std::vector<Ce_id> C_sNullVector_Ce_ids;
+}
+
+
+Ce_2s::~Ce_2s()
+{
+    csv::erase_container_of_heap_ptrs(aXrefLists);
+}
+
+DYN Ce_2s *
+Ce_2s::Create_( ClassId )
+{
+    return new Ce_2s;
+}
+
+
+std::vector<Ce_id> &
+Ce_2s::Access_List( int i_indexOfList )
+{
+    csv_assert(i_indexOfList >= 0 AND i_indexOfList < 1000);
+
+    while (i_indexOfList >= (int) aXrefLists.size())
+    {
+        aXrefLists.push_back(new std::vector<Ce_id>);
+    }
+    return *aXrefLists[i_indexOfList];
+}
+
+const std::vector<Ce_id> &
+Ce_2s::List( int i_indexOfList ) const
+{
+    if (uintt(i_indexOfList) < aXrefLists.size())
+        return *aXrefLists[i_indexOfList];
+    else
+        return C_sNullVector_Ce_ids;
+}
+
+
+}   // namespace idl
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_comrela.cxx b/autodoc/source/ary/idl/i_comrela.cxx
new file mode 100644
index 000000000000..f76076aa3847
--- /dev/null
+++ b/autodoc/source/ary/idl/i_comrela.cxx
@@ -0,0 +1,50 @@
+/* -*- 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 <precomp.h>
+#include <ary/idl/i_comrela.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/ary.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/idl/ip_type.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+// KORR_FUTURE Currently unneeded file. May become useful later.
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_constant.cxx b/autodoc/source/ary/idl/i_constant.cxx
new file mode 100644
index 000000000000..3a6eb4fbf8cc
--- /dev/null
+++ b/autodoc/source/ary/idl/i_constant.cxx
@@ -0,0 +1,126 @@
+/* -*- 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 <precomp.h>
+#include <ary/idl/i_constant.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/ik_constant.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+Constant::Constant( const String &      i_sName,
+                    Ce_id               i_nOwner,
+                    Ce_id               i_nNameRoom,
+                    Type_id             i_nType,
+                    const String &      i_sInitValue )
+    :   sName(i_sName),
+        nNameRoom(i_nNameRoom),
+        nOwner(i_nOwner),
+        nType(i_nType),
+        sInitValue(i_sInitValue)
+{
+}
+
+Constant::~Constant()
+{
+}
+
+void
+Constant::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+
+ClassId
+Constant::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Constant::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Constant::inq_NameRoom() const
+{
+    return nNameRoom;
+}
+
+Ce_id
+Constant::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Constant::inq_SightLevel() const
+{
+    return sl_Member;
+}
+
+
+namespace ifc_constant
+{
+
+inline const Constant &
+constant_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == Constant::class_id );
+    return static_cast< const Constant& >(i_ce);
+}
+
+Type_id
+attr::Type( const CodeEntity & i_ce )
+{
+    return constant_cast(i_ce).nType;
+}
+
+const String &
+attr::Value( const CodeEntity & i_ce )
+{
+    return constant_cast(i_ce).sInitValue;
+}
+
+} // namespace ifc_constant
+
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_constgroup.cxx b/autodoc/source/ary/idl/i_constgroup.cxx
new file mode 100644
index 000000000000..b1955d55e186
--- /dev/null
+++ b/autodoc/source/ary/idl/i_constgroup.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_constgroup.hxx>
+#include <ary/idl/ik_constgroup.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <sci_impl.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+ConstantsGroup::ConstantsGroup( const String &      i_sName,
+                                Ce_id               i_nModule )
+    :   sName(i_sName),
+        nModule(i_nModule),
+        aConstants()
+{
+}
+
+ConstantsGroup::~ConstantsGroup()
+{
+}
+
+void
+ConstantsGroup::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+ConstantsGroup::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+ConstantsGroup::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+ConstantsGroup::inq_NameRoom() const
+{
+    return nModule;
+}
+
+Ce_id
+ConstantsGroup::inq_Owner() const
+{
+    return nModule;
+}
+
+E_SightLevel
+ConstantsGroup::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+
+namespace ifc_constgroup
+{
+
+inline const ConstantsGroup &
+constgroup_cast( const CodeEntity & i_ce )
+{
+    csv_assert( i_ce.AryClass() == ConstantsGroup::class_id );
+    return static_cast< const ConstantsGroup& >(i_ce);
+}
+
+void
+attr::Get_Constants( Dyn_CeIterator &    o_result,
+                     const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(constgroup_cast(i_ce).aConstants);
+}
+
+} // namespace ifc_constgroup
+
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_enum.cxx b/autodoc/source/ary/idl/i_enum.cxx
new file mode 100644
index 000000000000..9d01c2b19ce5
--- /dev/null
+++ b/autodoc/source/ary/idl/i_enum.cxx
@@ -0,0 +1,146 @@
+/* -*- 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 <precomp.h>
+#include <ary/idl/i_enum.hxx>
+#include <ary/idl/ik_enum.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <sci_impl.hxx>
+#include "i2s_calculator.hxx"
+
+
+namespace ary
+{
+namespace idl
+{
+
+Enum::Enum( const String &      i_sName,
+            Ce_id               i_nOwner )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        aValues()
+{
+}
+
+Enum::~Enum()
+{
+}
+
+void
+Enum::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Enum::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Enum::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Enum::inq_NameRoom() const
+{
+    return nOwner;
+}
+
+Ce_id
+Enum::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Enum::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+
+namespace ifc_enum
+{
+
+inline const Enum &
+enum_cast( const CodeEntity & i_ce )
+{
+    csv_assert( i_ce.AryClass() == Enum::class_id );
+    return static_cast< const Enum& >(i_ce);
+}
+
+void
+attr::Get_Values( Dyn_CeIterator &    o_result,
+                  const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(enum_cast(i_ce).aValues);
+}
+
+
+void
+xref::Get_SynonymTypedefs( Dyn_CeIterator &    o_result,
+                           const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(enum_2s_SynonymTypedefs));
+}
+
+void
+xref::Get_AsReturns( Dyn_CeIterator &    o_result,
+                     const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(enum_2s_AsReturns));
+}
+
+void
+xref::Get_AsParameters( Dyn_CeIterator &    o_result,
+                        const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(enum_2s_AsParameters));
+}
+
+void
+xref::Get_AsDataTypes( Dyn_CeIterator &    o_result,
+                       const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(enum_2s_AsDataTypes));
+}
+
+} // namespace ifc_enum
+
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_enumvalue.cxx b/autodoc/source/ary/idl/i_enumvalue.cxx
new file mode 100644
index 000000000000..fadfe1ce6fdb
--- /dev/null
+++ b/autodoc/source/ary/idl/i_enumvalue.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_enumvalue.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/ik_enumvalue.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+EnumValue::EnumValue( const String &      i_sName,
+                      Ce_id               i_nOwner,
+                      Ce_id               i_nNameRoom,
+                      const String &      i_sInitValue )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nNameRoom(i_nNameRoom),
+        sValue(i_sInitValue)
+{
+}
+
+EnumValue::~EnumValue()
+{
+}
+
+void
+EnumValue::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+EnumValue::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+EnumValue::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+EnumValue::inq_NameRoom() const
+{
+    return nNameRoom;
+}
+
+Ce_id
+EnumValue::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+EnumValue::inq_SightLevel() const
+{
+    return sl_Member;
+}
+
+
+
+namespace ifc_enumvalue
+{
+
+inline const EnumValue &
+enumvalue_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == EnumValue::class_id );
+    return static_cast< const EnumValue& >(i_ce);
+}
+
+const String &
+attr::Value( const CodeEntity & i_ce )
+{
+    return enumvalue_cast(i_ce).sValue;
+}
+
+
+} // namespace ifc_enumvalue
+
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_exception.cxx b/autodoc/source/ary/idl/i_exception.cxx
new file mode 100644
index 000000000000..f25ae55ce66a
--- /dev/null
+++ b/autodoc/source/ary/idl/i_exception.cxx
@@ -0,0 +1,142 @@
+/* -*- 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 <precomp.h>
+#include <ary/idl/i_exception.hxx>
+#include <ary/idl/ik_exception.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <sci_impl.hxx>
+#include "i2s_calculator.hxx"
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+Exception::Exception( const String &      i_sName,
+                      Ce_id               i_nOwner,
+                      Type_id             i_nBase )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nBase(i_nBase),
+        aElements()
+{
+}
+
+Exception::~Exception()
+{
+}
+
+void
+Exception::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Exception::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Exception::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Exception::inq_NameRoom() const
+{
+    return nOwner;
+}
+
+Ce_id
+Exception::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Exception::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+
+namespace ifc_exception
+{
+
+inline const Exception &
+exception_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == Exception::class_id );
+    return static_cast< const Exception& >(i_ce);
+}
+
+Type_id
+attr::Base( const CodeEntity & i_ce )
+{
+    return exception_cast(i_ce).nBase;
+}
+
+void
+attr::Get_Elements( Dyn_CeIterator &    o_result,
+                    const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>( exception_cast(i_ce).aElements );
+}
+
+
+void
+xref::Get_Derivations( Dyn_CeIterator &    o_result,
+                       const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(exception_2s_Derivations));
+}
+
+void
+xref::Get_RaisingFunctions( Dyn_CeIterator &    o_result,
+                            const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(exception_2s_RaisingFunctions));
+}
+
+
+} // namespace ifc_exception
+
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_function.cxx b/autodoc/source/ary/idl/i_function.cxx
new file mode 100644
index 000000000000..4d9375d3451e
--- /dev/null
+++ b/autodoc/source/ary/idl/i_function.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_function.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <sci_impl.hxx>
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+Function::Function( const String &      i_sName,
+                    Ce_id               i_nOwner,
+                    Ce_id               i_nNameRoom,
+                    Type_id             i_nReturnType,
+                    bool                i_bOneWay )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nNameRoom(i_nNameRoom),
+        nReturnType(i_nReturnType),
+        aParameters(),
+        aExceptions(),
+        bOneWay(i_bOneWay),
+        bEllipse(false)
+{
+}
+
+Function::Function( const String &      i_sName,
+                    Ce_id               i_nOwner,
+                    Ce_id               i_nNameRoom )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nNameRoom(i_nNameRoom),
+        nReturnType(0),
+        aParameters(),
+        aExceptions(),
+        bOneWay(false),
+        bEllipse(false)
+{
+}
+
+Function::~Function()
+{
+}
+
+void
+Function::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Function::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Function::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Function::inq_NameRoom() const
+{
+    return nNameRoom;
+}
+
+Ce_id
+Function::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Function::inq_SightLevel() const
+{
+    return sl_Member;
+}
+
+
+namespace ifc_function
+{
+
+inline const Function &
+function_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == Function::class_id );
+    return static_cast< const Function& >(i_ce);
+}
+
+Type_id
+attr::ReturnType( const CodeEntity & i_ce )
+{
+    return function_cast(i_ce).nReturnType;
+}
+
+bool
+attr::IsOneway( const CodeEntity & i_ce )
+{
+    return function_cast(i_ce).bOneWay;
+}
+
+bool
+attr::HasEllipse( const CodeEntity & i_ce )
+{
+    return function_cast(i_ce).bEllipse;
+}
+
+void
+attr::Get_Parameters( Dyn_StdConstIterator<ary::idl::Parameter> & o_result,
+                      const CodeEntity &                          i_ce )
+{
+    o_result
+        = new SCI_Vector<Parameter>( function_cast(i_ce).aParameters );
+}
+
+void
+attr::Get_Exceptions( Dyn_TypeIterator &  o_result,
+                      const CodeEntity &  i_ce )
+{
+    o_result
+        = new SCI_Vector<Type_id>( function_cast(i_ce).aExceptions );
+}
+
+
+
+
+
+}   // namespace ifc_function
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_interface.cxx b/autodoc/source/ary/idl/i_interface.cxx
new file mode 100644
index 000000000000..455261e3e5ad
--- /dev/null
+++ b/autodoc/source/ary/idl/i_interface.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_interface.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/ik_interface.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <sci_impl.hxx>
+#include "i2s_calculator.hxx"
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+class Interface_2s
+{
+};
+
+
+Interface::Interface( const String &      i_sName,
+                      Ce_id               i_nOwner )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        aBases(),
+        aFunctions(),
+        aAttributes(),
+        p2s()
+{
+}
+
+Interface::~Interface()
+{
+    for ( RelationList::iterator it = aBases.begin();
+          it != aBases.end();
+          ++it )
+    {
+        delete (*it).Info();
+    }
+}
+
+void
+Interface::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Interface::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Interface::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Interface::inq_NameRoom() const
+{
+    return nOwner;
+}
+
+Ce_id
+Interface::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Interface::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+
+namespace ifc_interface
+{
+
+inline const Interface &
+interface_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == Interface::class_id );
+    return static_cast< const Interface& >(i_ce);
+}
+
+void
+attr::Get_Bases( Dyn_StdConstIterator<CommentedRelation> &     o_result,
+                 const CodeEntity &                             i_ce )
+{
+    o_result = new SCI_Vector<CommentedRelation>(interface_cast(i_ce).aBases);
+}
+
+void
+attr::Get_Functions( Dyn_CeIterator &    o_result,
+                     const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(interface_cast(i_ce).aFunctions);
+}
+
+void
+attr::Get_Attributes( Dyn_CeIterator &    o_result,
+                      const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(interface_cast(i_ce).aAttributes);
+}
+
+void
+xref::Get_Derivations( Dyn_CeIterator &    o_result,
+                        const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(interface_2s_Derivations));
+}
+
+void
+xref::Get_SynonymTypedefs( Dyn_CeIterator &    o_result,
+                           const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(interface_2s_SynonymTypedefs));
+}
+
+void
+xref::Get_ExportingServices( Dyn_CeIterator &    o_result,
+                             const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(interface_2s_ExportingServices));
+}
+
+void
+xref::Get_ExportingSingletons( Dyn_CeIterator &    o_result,
+                               const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(interface_2s_ExportingSingletons));
+}
+
+void
+xref::Get_AsReturns( Dyn_CeIterator &    o_result,
+                     const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(interface_2s_AsReturns));
+}
+
+void
+xref::Get_AsParameters( Dyn_CeIterator &    o_result,
+                        const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(interface_2s_AsParameters));
+}
+
+void
+xref::Get_AsDataTypes( Dyn_CeIterator &    o_result,
+                       const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(interface_2s_AsDataTypes));
+}
+
+
+
+
+}   // namespace ifc_interface
+
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_module.cxx b/autodoc/source/ary/idl/i_module.cxx
new file mode 100644
index 000000000000..a8459b3ebfdd
--- /dev/null
+++ b/autodoc/source/ary/idl/i_module.cxx
@@ -0,0 +1,207 @@
+/* -*- 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 <precomp.h>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/ik_module.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/i_service.hxx>
+#include <ary/idl/i_interface.hxx>
+#include <ary/idl/i_struct.hxx>
+#include <ary/idl/i_exception.hxx>
+#include <ary/idl/i_enum.hxx>
+#include <ary/idl/i_typedef.hxx>
+#include <ary/idl/i_constgroup.hxx>
+#include <ary/idl/i_singleton.hxx>
+#include <ary/idl/i_siservice.hxx>
+#include <ary/idl/i_sisingleton.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <nametreenode.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+Module::Module()
+    :   pImpl( new NameTreeNode<Ce_id> )
+{
+}
+
+Module::Module( const String &      i_sName,
+                const Module &      i_rParent )
+    :   pImpl( new NameTreeNode<Ce_id>( i_sName,
+                                        *i_rParent.pImpl,
+                                        i_rParent.CeId() ) )
+{
+}
+
+Module::~Module()
+{
+}
+
+void
+Module::Add_Name( const String &    i_sName,
+                  Ce_id             i_nCodeEntity )
+{
+    pImpl->Add_Name(i_sName, i_nCodeEntity);
+}
+
+Ce_id
+Module::Search_Name( const String & i_sName ) const
+{
+    return pImpl->Search_Name(i_sName);
+}
+
+void
+Module::Get_Names( Dyn_StdConstIterator<Ce_id> & o_rResult ) const
+{
+    pImpl->Get_Names( o_rResult );
+}
+
+void
+Module::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Module::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Module::inq_LocalName() const
+{
+    return pImpl->Name();
+}
+
+Ce_id
+Module::inq_NameRoom() const
+{
+    return pImpl->Parent();
+}
+
+Ce_id
+Module::inq_Owner() const
+{
+    return pImpl->Parent();
+}
+
+E_SightLevel
+Module::inq_SightLevel() const
+{
+    return sl_Module;
+}
+
+
+namespace ifc_module
+{
+
+inline const Module &
+module_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == Module::class_id );
+    return static_cast< const Module& >(i_ce);
+}
+
+typedef NameTreeNode<Ce_id>::Map_LocalNames NameMap;
+
+void
+attr::Get_AllChildrenSeparated( std::vector< const CodeEntity* > & o_nestedModules,
+                                std::vector< const CodeEntity* > & o_services,
+                                std::vector< const CodeEntity* > & o_interfaces,
+                                std::vector< const CodeEntity* > & o_structs,
+                                std::vector< const CodeEntity* > & o_exceptions,
+                                std::vector< const CodeEntity* > & o_enums,
+                                std::vector< const CodeEntity* > & o_typedefs,
+                                std::vector< const CodeEntity* > & o_constantGroups,
+                                std::vector< const CodeEntity* > & o_singletons,
+                                const CePilot &                    i_pilot,
+                                const CodeEntity &                 i_ce )
+{
+    const CodeEntity *
+        pCe = 0;
+    NameMap::const_iterator
+        itEnd = module_cast(i_ce).pImpl->LocalNames().end();
+    for ( NameMap::const_iterator
+            it = module_cast(i_ce).pImpl->LocalNames().begin();
+          it != itEnd;
+          ++it )
+    {
+        pCe = &i_pilot.Find_Ce( (*it).second );
+        switch (pCe->AryClass())
+        {
+            case Module::class_id:
+                        o_nestedModules.push_back(pCe);
+                        break;
+            case SglIfcService::class_id:
+            case Service::class_id:
+                        o_services.push_back(pCe);
+                        break;
+            case Interface::class_id:
+                        o_interfaces.push_back(pCe);
+                        break;
+            case Struct::class_id:
+                        o_structs.push_back(pCe);
+                        break;
+            case Exception::class_id:
+                        o_exceptions.push_back(pCe);
+                        break;
+            case Enum::class_id:
+                        o_enums.push_back(pCe);
+                        break;
+            case Typedef::class_id:
+                        o_typedefs.push_back(pCe);
+                        break;
+            case ConstantsGroup::class_id:
+                        o_constantGroups.push_back(pCe);
+                        break;
+            case SglIfcSingleton::class_id:
+            case Singleton::class_id:
+                        o_singletons.push_back(pCe);
+                        break;
+        }
+    }   // end for
+}
+
+
+} // namespace ifc_module
+
+
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_namelookup.cxx b/autodoc/source/ary/idl/i_namelookup.cxx
new file mode 100644
index 000000000000..d9fe29b4e2f0
--- /dev/null
+++ b/autodoc/source/ary/idl/i_namelookup.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_namelookup.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <sci_impl.hxx>
+
+namespace ary
+{
+namespace idl
+{
+
+NameLookup::NameLookup()
+    :   aNames()
+{
+}
+
+NameLookup::~NameLookup()
+{
+}
+
+void
+NameLookup::Add_Name( const String &      i_name,
+                      Ce_id               i_id,
+                      ClassId             i_class,
+                      Ce_id               i_owner )
+{
+    aNames.insert( std::pair< const String, NameProperties>(
+                                   i_name,
+                                   NameProperties( i_id,
+                                                   i_class,
+                                                   i_owner )));
+}
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_nnfinder.hxx b/autodoc/source/ary/idl/i_nnfinder.hxx
new file mode 100644
index 000000000000..242372a0bf70
--- /dev/null
+++ b/autodoc/source/ary/idl/i_nnfinder.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 ARY_IDL_NNFINDER_HXX
+#define ARY_IDL_NNFINDER_HXX
+
+// USED SERVICES
+#include "is_ce.hxx"
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** Gives context info for tree search functions.
+
+    @collab ->ary::Search_SubTree<>()
+    @collab ->ary::Search_SubTree_UpTillRoot<>()
+*/
+class Find_ModuleNode
+{
+  public:
+    typedef Ce_id                           id_type;
+    typedef StringVector::const_iterator    name_iterator;
+
+    // LIFECYCLE
+                        Find_ModuleNode(
+                            const Ce_Storage &  i_rStorage,
+                            name_iterator       it_begin,
+                            name_iterator       it_end,
+                            const String &      i_sName )
+                            :   rStorage(i_rStorage),
+                                itBegin(it_begin),
+                                itEnd(it_end),
+                                sName2Search(i_sName) { if (itBegin != itEnd ? (*itBegin).empty() : false) ++itBegin; }
+    // OPERATIONS
+    const Module *      operator()(
+                            id_type             i_id ) const
+                            { return i_id.IsValid()
+                                        ?   & ary_cast<Module>(rStorage[i_id])
+                                        :   0; }
+
+    name_iterator       Begin() const           { return itBegin; }
+    name_iterator       End() const             { return itEnd; }
+    const String &      Name2Search() const     { return sName2Search; }
+
+  private:
+    // DATA
+    const Ce_Storage &  rStorage;
+    name_iterator       itBegin;
+    name_iterator       itEnd;
+    String              sName2Search;
+};
+
+
+
+
+class Types_forSetCe_Id
+{
+  public:
+    typedef Ce_id                           element_type;
+    typedef Ce_Storage                      find_type;
+
+    //  KORR_FUTURE: Check, if this sorting is right or the ary standard
+    //  sorting should be used.
+    struct sort_type
+    {
+                        sort_type(
+                            const find_type &   i_rFinder )
+                                                : rFinder(i_rFinder) {}
+        bool            operator()(
+                            const element_type   &
+                                                i_r1,
+                            const element_type   &
+                                                i_r2 ) const
+        {
+            return rFinder[i_r1].LocalName()
+                   < rFinder[i_r2].LocalName();
+        }
+
+      private:
+        const find_type &     rFinder;
+
+    };
+};
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_param.cxx b/autodoc/source/ary/idl/i_param.cxx
new file mode 100644
index 000000000000..106a5427db7b
--- /dev/null
+++ b/autodoc/source/ary/idl/i_param.cxx
@@ -0,0 +1,60 @@
+/* -*- 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 <precomp.h>
+#include <ary/idl/i_param.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+Parameter::Parameter( const String &        i_sName,
+                      Type_id               i_nType,
+                      E_ParameterDirection  i_eDirection )
+    :   sName(i_sName),
+        nType(i_nType),
+        eDirection(i_eDirection)
+{
+}
+
+Parameter::~Parameter()
+{
+}
+
+
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_property.cxx b/autodoc/source/ary/idl/i_property.cxx
new file mode 100644
index 000000000000..9b13870e98f3
--- /dev/null
+++ b/autodoc/source/ary/idl/i_property.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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_property.hxx>
+#include <ary/idl/ik_property.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+Property::Property( const String &      i_sName,
+                    Ce_id               i_nService,
+                    Ce_id               i_nModule,
+                    Type_id             i_nType,
+                    Stereotypes         i_stereotypes )
+    :   sName(i_sName),
+        nOwner(i_nService),
+        nNameRoom(i_nModule),
+        nType(i_nType),
+        aStereotypes(i_stereotypes)
+{
+}
+
+Property::~Property()
+{
+}
+
+
+void
+Property::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Property::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Property::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Property::inq_NameRoom() const
+{
+    return nNameRoom;
+}
+
+Ce_id
+Property::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Property::inq_SightLevel() const
+{
+    return sl_Member;
+}
+
+namespace ifc_property
+{
+
+inline const Property &
+property_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == Property::class_id );
+    return static_cast< const Property& >(i_ce);
+}
+
+bool
+attr::HasAnyStereotype( const CodeEntity &  i_ce )
+{
+    return property_cast(i_ce).aStereotypes.HasAny();
+}
+
+bool
+attr::IsReadOnly( const CodeEntity & i_ce )
+{
+    return property_cast(i_ce).aStereotypes.IsReadOnly();
+}
+
+bool
+attr::IsBound( const CodeEntity & i_ce )
+{
+    return property_cast(i_ce).aStereotypes.IsBound();
+}
+
+bool
+attr::IsConstrained( const CodeEntity & i_ce )
+{
+    return property_cast(i_ce).aStereotypes.IsConstrained();
+}
+
+bool
+attr::IsMayBeAmbiguous( const CodeEntity & i_ce )
+{
+    return property_cast(i_ce).aStereotypes.IsMayBeAmbiguous();
+}
+
+bool
+attr::IsMayBeDefault( const CodeEntity & i_ce )
+{
+    return property_cast(i_ce).aStereotypes.IsMayBeDefault();
+}
+
+bool
+attr::IsMayBeVoid( const CodeEntity & i_ce )
+{
+    return property_cast(i_ce).aStereotypes.IsMayBeVoid();
+}
+
+bool
+attr::IsRemovable( const CodeEntity & i_ce )
+{
+    return property_cast(i_ce).aStereotypes.IsRemovable();
+}
+
+bool
+attr::IsTransient( const CodeEntity & i_ce )
+{
+    return property_cast(i_ce).aStereotypes.IsTransient();
+}
+
+Type_id
+attr::Type( const CodeEntity & i_ce )
+{
+    return property_cast(i_ce).nType;
+}
+
+} // namespace ifc_property
+
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_reposypart.cxx b/autodoc/source/ary/idl/i_reposypart.cxx
new file mode 100644
index 000000000000..62bb4fee6cf7
--- /dev/null
+++ b/autodoc/source/ary/idl/i_reposypart.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "i_reposypart.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_namelookup.hxx>
+#include <idl_internalgate.hxx>
+#include "ia_ce.hxx"
+#include "ia_type.hxx"
+#include "i2s_calculator.hxx"
+#include "is_ce.hxx"
+#include "is_type.hxx"
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+DYN InternalGate &
+InternalGate::Create_Partition_(RepositoryCenter & i_center)
+{
+    return *new RepositoryPartition(i_center);
+}
+
+
+
+RepositoryPartition::RepositoryPartition( RepositoryCenter & i_repository )
+    :   pCenter(&i_repository),
+        pCes(0),
+        pTypes(0),
+        pNamesDictionary(new NameLookup)
+{
+    pTypes = new TypeAdmin;
+    pCes = new CeAdmin(*pNamesDictionary, *pTypes);
+}
+
+RepositoryPartition::~RepositoryPartition()
+{
+}
+
+void
+RepositoryPartition::Calculate_AllSecondaryInformation(
+                            const String &      i_devman_reffilepath )
+{
+    // KORR_FUTURE
+    //  Forward the options from here.
+
+    SecondariesCalculator
+        secalc(*pCes,*pTypes);
+
+    secalc.CheckAllInterfaceBases();
+    secalc.Connect_Types2Ces();
+    secalc.Gather_CrossReferences();
+
+    if ( NOT i_devman_reffilepath.empty() )
+    {
+        secalc.Make_Links2DeveloperManual(i_devman_reffilepath);
+    }
+}
+
+const CePilot &
+RepositoryPartition::Ces() const
+{
+    return *pCes;
+}
+
+const TypePilot &
+RepositoryPartition::Types() const
+{
+    return *pTypes;
+}
+
+CePilot &
+RepositoryPartition::Ces()
+{
+    return *pCes;
+}
+
+TypePilot &
+RepositoryPartition::Types()
+{
+    return *pTypes;
+}
+
+
+
+}   //  namespace idl
+}   //  namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_reposypart.hxx b/autodoc/source/ary/idl/i_reposypart.hxx
new file mode 100644
index 000000000000..417d970814bf
--- /dev/null
+++ b/autodoc/source/ary/idl/i_reposypart.hxx
@@ -0,0 +1,99 @@
+/* -*- 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 ARY_IDL_I_REPOSYPART_HXX
+#define ARY_IDL_I_REPOSYPART_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <idl_internalgate.hxx>
+    // OTHER
+
+
+namespace ary
+{
+namespace idl
+{
+    class CeAdmin;
+    class TypeAdmin;
+    class NameLookup;
+}
+}
+
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+
+/** The idl part of the Autodoc repository.
+*/
+class RepositoryPartition : public InternalGate
+{
+  public:
+    // LIFECYCLE
+                        RepositoryPartition(
+                            RepositoryCenter &  i_repository );
+                        ~RepositoryPartition();
+    // INHERITED
+        // Interface Gate:
+    virtual void        Calculate_AllSecondaryInformation(
+                            const String &      i_devman_reffilepath );
+//                            const ::autodoc::Options &
+//                                                i_options );
+    virtual const CePilot &
+                        Ces() const;
+    virtual const TypePilot &
+                        Types() const;
+    virtual CePilot &   Ces();
+    virtual TypePilot & Types();
+
+  private:
+    // DATA
+    RepositoryCenter *  pCenter;
+
+    Dyn<CeAdmin>        pCes;
+    Dyn<TypeAdmin>      pTypes;
+    Dyn<NameLookup>     pNamesDictionary;
+};
+
+
+
+
+}   //  namespace idl
+}   //  namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_service.cxx b/autodoc/source/ary/idl/i_service.cxx
new file mode 100644
index 000000000000..0aa16b9e3280
--- /dev/null
+++ b/autodoc/source/ary/idl/i_service.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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_service.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/ik_service.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <sci_impl.hxx>
+#include "i2s_calculator.hxx"
+
+
+namespace ary
+{
+namespace idl
+{
+
+Service::Service( const String &      i_sName,
+                  Ce_id               i_nOwner )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        aIncludedServices(),
+        aSupportedInterfaces(),
+        aProperties()
+{
+}
+
+Service::~Service()
+{
+    for ( RelationList::iterator it = aIncludedServices.begin();
+          it != aIncludedServices.end();
+          ++it )
+    {
+        delete (*it).Info();
+    }
+
+    for ( RelationList::iterator it = aSupportedInterfaces.begin();
+          it != aSupportedInterfaces.end();
+          ++it )
+    {
+        delete (*it).Info();
+    }
+}
+
+void
+Service::Get_SupportedInterfaces( Dyn_StdConstIterator<CommentedRelation> & o_rResult ) const
+{
+    o_rResult = new SCI_Vector<CommentedRelation>(aSupportedInterfaces);
+}
+
+void
+Service::Get_IncludedServices( Dyn_StdConstIterator<CommentedRelation> & o_rResult ) const
+{
+    o_rResult = new SCI_Vector<CommentedRelation>(aIncludedServices);
+}
+
+void
+Service::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Service::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Service::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Service::inq_NameRoom() const
+{
+    return nOwner;
+}
+
+Ce_id
+Service::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Service::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+
+namespace ifc_service
+{
+
+inline const Service &
+service_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == Service::class_id );
+    return static_cast< const Service& >(i_ce);
+}
+
+void
+attr::Get_IncludedServices( Dyn_StdConstIterator<CommentedRelation> & o_result,
+                            const CodeEntity &                        i_ce )
+{
+    o_result = new SCI_Vector<CommentedRelation>( service_cast(i_ce).aIncludedServices );
+}
+
+void
+attr::Get_ExportedInterfaces( Dyn_StdConstIterator<CommentedRelation> & o_result,
+                              const CodeEntity &                            i_ce )
+{
+    o_result = new SCI_Vector<CommentedRelation>( service_cast(i_ce).aSupportedInterfaces );
+}
+
+void
+attr::Get_Properties( Dyn_CeIterator &    o_result,
+                      const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>( service_cast(i_ce).aProperties );
+}
+
+void
+xref::Get_IncludingServices( Dyn_CeIterator &    o_result,
+                             const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(service_2s_IncludingServices));
+}
+
+void
+xref::Get_InstantiatingSingletons( Dyn_CeIterator &    o_result,
+                                   const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(service_2s_InstantiatingSingletons));
+}
+
+
+} // namespace ifc_service
+
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_singleton.cxx b/autodoc/source/ary/idl/i_singleton.cxx
new file mode 100644
index 000000000000..508572bb2713
--- /dev/null
+++ b/autodoc/source/ary/idl/i_singleton.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_singleton.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/ik_singleton.hxx>
+#include <sci_impl.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+Singleton::Singleton( const String &      i_sName,
+                  Ce_id               i_nOwner )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nService()
+{
+}
+
+Singleton::~Singleton()
+{
+}
+
+void
+Singleton::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Singleton::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Singleton::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Singleton::inq_NameRoom() const
+{
+    return nOwner;
+}
+
+Ce_id
+Singleton::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Singleton::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+
+namespace ifc_singleton
+{
+
+inline const Singleton &
+singleton_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == Singleton::class_id );
+    return static_cast< const Singleton& >(i_ce);
+}
+
+Type_id
+attr::AssociatedService( const CodeEntity & i_ce )
+{
+    return singleton_cast(i_ce).nService;
+}
+
+} // namespace ifc_singleton
+
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_siservice.cxx b/autodoc/source/ary/idl/i_siservice.cxx
new file mode 100644
index 000000000000..238e605ce680
--- /dev/null
+++ b/autodoc/source/ary/idl/i_siservice.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_siservice.hxx>
+#include <ary/idl/ik_siservice.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <sci_impl.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+SglIfcService::SglIfcService( const String &      i_sName,
+                              Ce_id               i_nOwner,
+                              Type_id             i_nBaseInterface )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nBaseInterface(i_nBaseInterface),
+        aConstructors()
+{
+}
+
+SglIfcService::~SglIfcService()
+{
+}
+
+void
+SglIfcService::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+SglIfcService::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+SglIfcService::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+SglIfcService::inq_NameRoom() const
+{
+    return nOwner;
+}
+
+Ce_id
+SglIfcService::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+SglIfcService::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+
+namespace ifc_sglifcservice
+{
+
+inline const SglIfcService &
+sglifcservice_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == SglIfcService::class_id );
+    return static_cast< const SglIfcService& >(i_ce);
+}
+
+Type_id
+attr::BaseInterface( const CodeEntity & i_ce )
+{
+    return sglifcservice_cast(i_ce).nBaseInterface;
+}
+
+void
+attr::Get_Constructors( Dyn_CeIterator &    o_result,
+                        const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>( sglifcservice_cast(i_ce).aConstructors );
+}
+
+} // namespace ifc_sglifcservice
+
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_sisingleton.cxx b/autodoc/source/ary/idl/i_sisingleton.cxx
new file mode 100644
index 000000000000..1cc2b97cd75f
--- /dev/null
+++ b/autodoc/source/ary/idl/i_sisingleton.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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_sisingleton.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/ik_sisingleton.hxx>
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+SglIfcSingleton::SglIfcSingleton( const String &      i_sName,
+                                  Ce_id               i_nOwner,
+                                  Type_id             i_nBaseInterface )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nBaseInterface(i_nBaseInterface)
+{
+}
+
+SglIfcSingleton::~SglIfcSingleton()
+{
+}
+
+void
+SglIfcSingleton::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+SglIfcSingleton::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+SglIfcSingleton::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+SglIfcSingleton::inq_NameRoom() const
+{
+    return nOwner;
+}
+
+Ce_id
+SglIfcSingleton::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+SglIfcSingleton::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+namespace ifc_sglifcsingleton
+{
+
+inline const SglIfcSingleton &
+sglifcsingleton_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == SglIfcSingleton::class_id );
+    return static_cast< const SglIfcSingleton& >(i_ce);
+}
+
+Type_id
+attr::BaseInterface( const CodeEntity & i_ce )
+{
+    return sglifcsingleton_cast(i_ce).nBaseInterface;
+}
+
+
+} // namespace ifc_sglifcsingleton
+
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_struct.cxx b/autodoc/source/ary/idl/i_struct.cxx
new file mode 100644
index 000000000000..ff691c211a89
--- /dev/null
+++ b/autodoc/source/ary/idl/i_struct.cxx
@@ -0,0 +1,166 @@
+/* -*- 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 <precomp.h>
+#include <ary/idl/i_struct.hxx>
+#include <ary/idl/ik_struct.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <sci_impl.hxx>
+#include "i2s_calculator.hxx"
+
+
+namespace ary
+{
+namespace idl
+{
+
+Struct::Struct( const String &      i_sName,
+                Ce_id               i_nOwner,
+                Type_id             i_nBase,
+                const String &      i_sTemplateParameter,
+                Type_id             i_nTemplateParameterType )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nBase(i_nBase),
+        sTemplateParameter(i_sTemplateParameter),
+        nTemplateParameterType(i_nTemplateParameterType),
+        aElements()
+{
+}
+
+Struct::~Struct()
+{
+}
+
+void
+Struct::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Struct::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Struct::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Struct::inq_NameRoom() const
+{
+    return nOwner;
+}
+
+Ce_id
+Struct::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Struct::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+
+namespace ifc_struct
+{
+
+inline const Struct &
+struct_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == Struct::class_id );
+    return static_cast< const Struct& >(i_ce);
+}
+
+Type_id
+attr::Base( const CodeEntity & i_ce )
+{
+    return struct_cast(i_ce).nBase;
+}
+
+void
+attr::Get_Elements( Dyn_CeIterator &    o_result,
+                    const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>( struct_cast(i_ce).aElements );
+}
+
+
+void
+xref::Get_Derivations( Dyn_CeIterator &    o_result,
+                       const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(struct_2s_Derivations));
+}
+
+void
+xref::Get_SynonymTypedefs( Dyn_CeIterator &    o_result,
+                           const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(struct_2s_SynonymTypedefs));
+}
+
+void
+xref::Get_AsReturns( Dyn_CeIterator &    o_result,
+                     const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(struct_2s_AsReturns));
+}
+
+void
+xref::Get_AsParameters( Dyn_CeIterator &    o_result,
+                        const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(struct_2s_AsParameters));
+}
+
+void
+xref::Get_AsDataTypes( Dyn_CeIterator &    o_result,
+                       const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(struct_2s_AsDataTypes));
+}
+
+} // namespace ifc_struct
+
+
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_structelem.cxx b/autodoc/source/ary/idl/i_structelem.cxx
new file mode 100644
index 000000000000..79ffe4189ac0
--- /dev/null
+++ b/autodoc/source/ary/idl/i_structelem.cxx
@@ -0,0 +1,120 @@
+/* -*- 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 <precomp.h>
+#include <ary/idl/i_structelem.hxx>
+#include <ary/idl/ik_structelem.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <sci_impl.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+StructElement::StructElement( const String &      i_sName,
+                              Ce_id               i_nOwner,
+                              Ce_id               i_nNameRoom,
+                              Type_id             i_nType )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nNameRoom(i_nNameRoom),
+        nType(i_nType)
+{
+}
+
+StructElement::~StructElement()
+{
+}
+
+void
+StructElement::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+StructElement::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+StructElement::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+StructElement::inq_NameRoom() const
+{
+    return nNameRoom;
+}
+
+Ce_id
+StructElement::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+StructElement::inq_SightLevel() const
+{
+    return sl_Member;
+}
+
+
+namespace ifc_structelement
+{
+
+inline const StructElement &
+selem_cast( const CodeEntity &  i_ce )
+{
+    csv_assert( i_ce.AryClass() == StructElement::class_id );
+    return static_cast< const StructElement& >(i_ce);
+}
+
+Type_id
+attr::Type( const CodeEntity & i_ce )
+{
+    return selem_cast(i_ce).nType;
+}
+
+} // namespace ifc_structelement
+
+
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_traits.cxx b/autodoc/source/ary/idl/i_traits.cxx
new file mode 100644
index 000000000000..4dc9c2b2c750
--- /dev/null
+++ b/autodoc/source/ary/idl/i_traits.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_traits.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/namesort.hxx>
+#include "is_ce.hxx"
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+
+//********************      Ce_Traits      ********************//
+Ce_Traits::entity_base_type &
+Ce_Traits::EntityOf_(id_type i_id)
+{
+    csv_assert(i_id.IsValid());
+    return Ce_Storage::Instance_()[i_id];
+}
+
+//********************      Ce_Compare      ********************//
+const Ce_Compare::key_type &
+Ce_Compare::KeyOf_(const entity_base_type & i_entity)
+{
+    return i_entity.LocalName();
+}
+
+bool
+Ce_Compare::Lesser_( const key_type &    i_1,
+                     const key_type &    i_2 )
+{
+    static ::ary::LesserName    less_;
+    return less_(i_1,i_2);
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/i_typedef.cxx b/autodoc/source/ary/idl/i_typedef.cxx
new file mode 100644
index 000000000000..ded4ada0bede
--- /dev/null
+++ b/autodoc/source/ary/idl/i_typedef.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/idl/i_typedef.hxx>
+#include <ary/idl/ik_typedef.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <sci_impl.hxx>
+#include "i2s_calculator.hxx"
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+Typedef::Typedef( const String &      i_sName,
+                  Ce_id               i_nOwner,
+                  Type_id             i_nDefiningType )
+    :   sName(i_sName),
+        nOwner(i_nOwner),
+        nDefiningType(i_nDefiningType)
+{
+}
+
+Typedef::~Typedef()
+{
+}
+
+void
+Typedef::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+Typedef::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Typedef::inq_LocalName() const
+{
+    return sName;
+}
+
+Ce_id
+Typedef::inq_NameRoom() const
+{
+    return nOwner;
+}
+
+Ce_id
+Typedef::inq_Owner() const
+{
+    return nOwner;
+}
+
+E_SightLevel
+Typedef::inq_SightLevel() const
+{
+    return sl_File;
+}
+
+
+namespace ifc_typedef
+{
+
+inline const Typedef &
+typedef_cast( const CodeEntity & i_ce )
+{
+    csv_assert( i_ce.AryClass() == Typedef::class_id );
+    return static_cast< const Typedef& >(i_ce);
+}
+
+Type_id
+attr::DefiningType( const CodeEntity & i_ce )
+{
+    return typedef_cast(i_ce).nDefiningType;
+}
+
+
+void
+xref::Get_SynonymTypedefs( Dyn_CeIterator &    o_result,
+                           const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(typedef_2s_SynonymTypedefs));
+}
+
+void
+xref::Get_AsReturns( Dyn_CeIterator &    o_result,
+                     const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(typedef_2s_AsReturns));
+}
+
+void
+xref::Get_AsParameters( Dyn_CeIterator &    o_result,
+                        const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(typedef_2s_AsParameters));
+}
+
+void
+xref::Get_AsDataTypes( Dyn_CeIterator &    o_result,
+                       const CodeEntity &  i_ce )
+{
+    o_result = new SCI_Vector<Ce_id>(i_ce.Secondaries().List(typedef_2s_AsDataTypes));
+}
+
+} // namespace ifc_typedef
+
+
+
+}   //  namespace   idl
+}   //  namespace   ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/ia_ce.cxx b/autodoc/source/ary/idl/ia_ce.cxx
new file mode 100644
index 000000000000..5e66838f1ba5
--- /dev/null
+++ b/autodoc/source/ary/idl/ia_ce.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "ia_ce.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <algorithm>
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/idl/i_attribute.hxx>
+#include <ary/idl/i_constant.hxx>
+#include <ary/idl/i_constgroup.hxx>
+#include <ary/idl/i_enum.hxx>
+#include <ary/idl/i_enumvalue.hxx>
+#include <ary/idl/i_exception.hxx>
+#include <ary/idl/i_function.hxx>
+#include <ary/idl/i_interface.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/i_namelookup.hxx>
+#include <ary/idl/i_property.hxx>
+#include <ary/idl/i_service.hxx>
+#include <ary/idl/i_singleton.hxx>
+#include <ary/idl/i_siservice.hxx>
+#include <ary/idl/i_sisingleton.hxx>
+#include <ary/idl/i_struct.hxx>
+#include <ary/idl/i_structelem.hxx>
+#include <ary/idl/i_traits.hxx>
+#include <ary/idl/i_typedef.hxx>
+#include <idsort.hxx>
+#include "ia_type.hxx"
+#include "is_ce.hxx"
+#include "it_tplparam.hxx"
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+inline Module &
+CeAdmin::lhf_Access_Module( Ce_id i_nId )
+    { return ary_cast<Module>(Storage()[i_nId]); }
+
+inline void
+CeAdmin::lhf_Put2Storage_and_AssignId( CodeEntity & pass_io_rCe )
+    { // This also assigns an ID to pass_io_rCe:
+      Storage().Store_Entity(pass_io_rCe);
+      my_NameDictionary().Add_Name( pass_io_rCe.LocalName(),
+                                    pass_io_rCe.CeId(),
+                                    pass_io_rCe.AryClass(),
+                                    pass_io_rCe.Owner() );
+    }
+
+inline void
+CeAdmin::lhf_Store_NewEntity( DYN CodeEntity &  pass_io_rCe,
+                                   Module &          i_rOwner )
+{
+    lhf_Put2Storage_and_AssignId(pass_io_rCe);
+    i_rOwner.Add_Name(pass_io_rCe.LocalName(), pass_io_rCe.CeId());
+}
+
+inline void
+CeAdmin::lhf_Store_NewEntity( DYN CodeEntity &  pass_io_rCe,
+                                   Ce_id             i_nOwnerModule )
+{
+    lhf_Store_NewEntity(pass_io_rCe, lhf_Access_Module(i_nOwnerModule));
+}
+
+
+
+CeAdmin::CeAdmin( NameLookup &        io_rNameDictionary,
+                  TypeAdmin &         io_rTypePilot )
+    :   pStorage(new Ce_Storage),
+        pGlobalNamespace(0),
+        pNameDictionary(&io_rNameDictionary),
+        pTypePilot(&io_rTypePilot)
+{
+    Storage().Set_Reserved(
+                    predefined::ce_GlobalNamespace,
+                    *new Module );
+    pGlobalNamespace = &lhf_Access_Module(Ce_id(predefined::ce_GlobalNamespace));
+}
+
+CeAdmin::~CeAdmin()
+{
+}
+
+
+
+Module &
+CeAdmin::CheckIn_Module( Ce_id               i_nParentId,
+                            const String &      i_sName )
+{
+    Module & rOwner  = lhf_Access_Module(i_nParentId);
+    Ce_id    nId     = rOwner.Search_Name(i_sName);
+    if (nId.IsValid())
+    {
+        return lhf_Access_Module(nId);
+    }
+
+    Module & ret = *new Module( i_sName,
+                                rOwner );
+    lhf_Store_NewEntity(ret, rOwner);
+    return ret;
+}
+
+Service &
+CeAdmin::Store_Service( Ce_id           i_nOwner,
+                        const String &  i_sName )
+{
+    Service & ret = *new Service( i_sName,
+                                  i_nOwner );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    return ret;
+}
+
+SglIfcService &
+CeAdmin::Store_SglIfcService( Ce_id               i_nOwner,
+                                   const String &      i_sName,
+                                   Type_id             i_nBaseInterface )
+{
+    SglIfcService &
+        ret = *new SglIfcService( i_sName,
+                                  i_nOwner,
+                                  i_nBaseInterface );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    return ret;
+}
+
+Interface &
+CeAdmin::Store_Interface( Ce_id               i_nOwner,
+                                  const String &      i_sName,
+                                  Type_id             i_nBase )
+{
+    Interface & ret = *new Interface( i_sName,
+                                      i_nOwner );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    if (i_nBase.IsValid())
+        ret.Add_Base(i_nBase, 0);
+    return ret;
+}
+
+Struct &
+CeAdmin::Store_Struct( Ce_id               i_nOwner,
+                               const String &      i_sName,
+                               Type_id             i_nBase,
+                               const String &      i_sTemplateParam )
+{
+    if (NOT i_sTemplateParam.empty())
+    {
+        return lhf_Store_TplStruct( i_nOwner,
+                                    i_sName,
+                                    i_nBase,
+                                    i_sTemplateParam );
+    }
+
+    Struct & ret = *new Struct( i_sName,
+                                i_nOwner,
+                                i_nBase,
+                                String::Null_(),
+                                Type_id::Null_() );
+    lhf_Store_NewEntity(ret, i_nOwner);
+
+    return ret;
+}
+
+Exception &
+CeAdmin::Store_Exception( Ce_id               i_nOwner,
+                                  const String &      i_sName,
+                                  Type_id             i_nBase )
+{
+    Exception & ret = *new Exception( i_sName,
+                                      i_nOwner,
+                                      i_nBase );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    return ret;
+}
+
+Enum &
+CeAdmin::Store_Enum( Ce_id               i_nOwner,
+                             const String &      i_sName )
+{
+    Enum & ret = *new Enum( i_sName,
+                            i_nOwner );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    return ret;
+}
+
+Typedef &
+CeAdmin::Store_Typedef( Ce_id               i_nOwner,
+                                const String &      i_sName,
+                                Type_id             i_nDefiningType )
+{
+    Typedef & ret = *new Typedef( i_sName,
+                                  i_nOwner,
+                                  i_nDefiningType );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    return ret;
+}
+
+
+ConstantsGroup &
+CeAdmin::Store_ConstantsGroup( Ce_id               i_nOwner,
+                                       const String &      i_sName )
+{
+    ConstantsGroup & ret = *new ConstantsGroup( i_sName,
+                                                i_nOwner );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    return ret;
+}
+
+Singleton &
+CeAdmin::Store_Singleton( Ce_id               i_nOwner,
+                                  const String &      i_sName )
+{
+    Singleton & ret = *new Singleton( i_sName,
+                                      i_nOwner );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    return ret;
+}
+
+SglIfcSingleton &
+CeAdmin::Store_SglIfcSingleton( Ce_id               i_nOwner,
+                                     const String &      i_sName,
+                                     Type_id             i_nBaseInterface )
+{
+    SglIfcSingleton &
+        ret = *new SglIfcSingleton( i_sName,
+                                    i_nOwner,
+                                    i_nBaseInterface );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    return ret;
+}
+
+Constant &
+CeAdmin::Store_Constant( Ce_id               i_nOwner,
+                                 const String &      i_sName,
+                                 Type_id             i_nType,
+                                 const String &      i_sValue )
+{
+    ConstantsGroup &
+        rOwner  = ary_cast<ConstantsGroup>(Storage()[i_nOwner]);
+    Constant & ret = *new Constant( i_sName,
+                                    i_nOwner,
+                                    rOwner.NameRoom(),
+                                    i_nType,
+                                    i_sValue );
+    lhf_Put2Storage_and_AssignId(ret);
+    rOwner.Add_Constant(ret.CeId());
+    return ret;
+}
+
+Property &
+CeAdmin::Store_Property( Ce_id                  i_nOwner,
+                                 const String &         i_sName,
+                                 Type_id                i_nType,
+                                 Property::Stereotypes  i_stereotypes )
+{
+    Service &
+        rOwner = ary_cast<Service>(Storage()[i_nOwner]);
+    Property & ret = *new Property( i_sName,
+                                    i_nOwner,
+                                    rOwner.NameRoom(),
+                                    i_nType,
+                                    i_stereotypes );
+    lhf_Put2Storage_and_AssignId(ret);
+    rOwner.Add_Property(ret.CeId());
+    return ret;
+}
+
+Function &
+CeAdmin::Store_Function( Ce_id               i_nOwner,
+                                 const String &      i_sName,
+                                 Type_id             i_nReturnType,
+                                 bool                i_bOneWay )
+{
+    Interface &
+        rOwner = ary_cast<Interface>(Storage()[i_nOwner]);
+    Function & ret = *new Function( i_sName,
+                                    i_nOwner,
+                                    rOwner.NameRoom(),
+                                    i_nReturnType,
+                                      i_bOneWay);
+    lhf_Put2Storage_and_AssignId(ret);
+    rOwner.Add_Function(ret.CeId());
+    return ret;
+}
+
+Function &
+CeAdmin::Store_ServiceConstructor( Ce_id               i_nOwner,
+                                        const String &      i_sName )
+{
+    SglIfcService &
+                rOwner = ary_cast<SglIfcService>(Storage()[i_nOwner]);
+    Function &  ret = *new Function( i_sName,
+                                     i_nOwner,
+                                     rOwner.NameRoom() );
+    lhf_Put2Storage_and_AssignId(ret);
+    rOwner.Add_Constructor(ret.CeId());
+    return ret;
+}
+
+StructElement &
+CeAdmin::Store_StructMember( Ce_id               i_nOwner,
+                                     const String &      i_sName,
+                                     Type_id             i_nType )
+{
+    Struct &
+        rOwner = ary_cast<Struct>(Storage()[i_nOwner]);
+    StructElement & ret = *new StructElement( i_sName,
+                                              i_nOwner,
+                                              rOwner.NameRoom(),
+                                              i_nType );
+    lhf_Put2Storage_and_AssignId(ret);
+    rOwner.Add_Member(ret.CeId());
+    return ret;
+}
+
+StructElement &
+CeAdmin::Store_ExceptionMember( Ce_id               i_nOwner,
+                                        const String &      i_sName,
+                                        Type_id             i_nType )
+{
+    Exception &
+        rOwner = ary_cast<Exception>(Storage()[i_nOwner]);
+    StructElement & ret = *new StructElement( i_sName,
+                                              i_nOwner,
+                                              rOwner.NameRoom(),
+                                              i_nType );
+    lhf_Put2Storage_and_AssignId(ret);
+    rOwner.Add_Member(ret.CeId());
+    return ret;
+}
+
+EnumValue &
+CeAdmin::Store_EnumValue( Ce_id               i_nOwner,
+                                  const String &      i_sName,
+                                  const String &      i_sValue )
+{
+    Enum &
+        rOwner = ary_cast<Enum>(Storage()[i_nOwner]);
+    EnumValue & ret = *new EnumValue( i_sName,
+                                      i_nOwner,
+                                      rOwner.NameRoom(),
+                                      i_sValue );
+    lhf_Put2Storage_and_AssignId(ret);
+    rOwner.Add_Value(ret.CeId());
+    return ret;
+}
+
+Attribute &
+CeAdmin::Store_Attribute( Ce_id               i_nOwner,
+                                  const String &      i_sName,
+                                  Type_id             i_nType,
+                                  bool                i_bReadOnly,
+                                  bool                i_bBound )
+{
+    Interface &
+        rOwner = ary_cast<Interface>(Storage()[i_nOwner]);
+
+    Attribute & ret = *new Attribute ( i_sName,
+                                       i_nOwner,
+                                       rOwner.NameRoom(),
+                                       i_nType,
+                                       i_bReadOnly,
+                                       i_bBound );
+    lhf_Put2Storage_and_AssignId(ret);
+    rOwner.Add_Attribute(ret.CeId());
+    return ret;
+}
+
+const Module &
+CeAdmin::GlobalNamespace() const
+{
+    csv_assert(pGlobalNamespace);
+    return *pGlobalNamespace;
+}
+
+const CodeEntity &
+CeAdmin::Find_Ce( Ce_id i_nId ) const
+{
+    return Storage()[i_nId];
+
+}
+
+const Module &
+CeAdmin::Find_Module( Ce_id i_nId ) const
+{
+    return ary_cast<Module>(Storage()[i_nId]);
+}
+
+const Module *
+CeAdmin::Search_Module( Ce_id i_nId ) const
+{
+    if (NOT i_nId.IsValid())
+        return 0;
+    return ary_cast<Module>( & Storage()[i_nId] );
+}
+
+const Function &
+CeAdmin::Find_Function( Ce_id i_nId ) const
+{
+    return ary_cast<Function>(Storage()[i_nId]);
+}
+
+const Property &
+CeAdmin::Find_Property( Ce_id i_nId ) const
+{
+    return ary_cast<Property>(Storage()[i_nId]);
+}
+
+const EnumValue &
+CeAdmin::Find_EnumValue( Ce_id i_nId ) const
+{
+    return ary_cast<EnumValue>(Storage()[i_nId]);
+}
+
+const Constant &
+CeAdmin::Find_Constant( Ce_id i_nId ) const
+{
+    return ary_cast<Constant>(Storage()[i_nId]);
+}
+
+const StructElement &
+CeAdmin::Find_StructElement( Ce_id i_nId ) const
+{
+    return ary_cast<StructElement>(Storage()[i_nId]);
+}
+
+void
+CeAdmin::Get_Text( StringVector &      o_module,
+                            String &            o_ce,
+                            String &            o_member,
+                            const CodeEntity &  i_ce ) const
+{
+    const CodeEntity * pCe = &i_ce;
+    csv::erase_container(o_module);
+    o_ce.clear();
+    o_member.clear();
+
+    switch ( pCe->SightLevel() )
+    {
+        // Here are intentionally no breaks!
+        case sl_Member:
+                        if ( is_type<Function>(*pCe) )
+                            o_member = StreamLock(200)()
+                                            << pCe->LocalName()
+                                            << "()"
+                                            << c_str;
+                        else
+                            o_member = pCe->LocalName();
+                        pCe = & Storage()[pCe->Owner()];
+        case sl_File:
+                        o_ce = pCe->LocalName();
+                        pCe = & Storage()[pCe->NameRoom()];
+        case sl_Module:
+                        get_ModuleText(o_module,*pCe);
+                        break;
+        default:
+                        csv_assert(false);
+    }   // end switch
+}
+
+const NameLookup &
+CeAdmin::NameDictionary() const
+{
+    return *pNameDictionary;
+}
+
+
+void
+CeAdmin::Get_AlphabeticalIndex( std::vector<Ce_id> &            o_rResult,
+                                alphabetical_index::E_Letter    i_cLetter ) const
+{
+    const int C_nLowerUpperDiff = 'a'-'A';
+
+    // Establishing filter:
+    UINT8 filter[256];
+
+    UINT8 nLetter = static_cast<UINT8>(i_cLetter);
+    memset(filter, 0, 256);
+    filter[nLetter] = 1;
+    if ( i_cLetter != alphabetical_index::non_alpha )
+        filter[nLetter - C_nLowerUpperDiff] = 1;
+
+    // Gather entities which start with i_cLetter:
+    o_rResult.reserve(1000);
+    idl::Ce_Storage::c_iter
+        itEnd = Storage().End();
+    for ( idl::Ce_Storage::c_iter it = Storage().BeginUnreserved();
+          it != itEnd;
+          ++it )
+    {
+        if ( filter[ static_cast<UINT8>(*(*it).LocalName().c_str()) ] == 1 )
+            o_rResult.push_back( (*it).CeId() );
+    }
+
+    std::sort( o_rResult.begin(),
+               o_rResult.end(),
+               IdSorter<Ce_Compare>() );
+}
+
+
+Module &
+CeAdmin::GlobalNamespace()
+{
+    csv_assert(pGlobalNamespace);
+    return *pGlobalNamespace;
+}
+
+CodeEntity &
+CeAdmin::Find_Ce( Ce_id i_nId )
+{
+    return Storage()[i_nId];
+}
+
+void
+CeAdmin::get_ModuleText( StringVector &      o_module,
+                              const CodeEntity &  i_ce ) const
+{
+    if (i_ce.NameRoom().IsValid())
+    {
+        const CodeEntity &
+            rParent = Storage()[i_ce.NameRoom()];
+        get_ModuleText(o_module, rParent);
+        o_module.push_back(i_ce.LocalName());
+    }
+}
+
+Struct &
+CeAdmin::lhf_Store_TplStruct( Ce_id               i_nOwner,
+                                   const String &      i_sName,
+                                   Type_id             i_nBase,
+                                   const String &      i_sTemplateParam )
+{
+    csv_assert(NOT i_sTemplateParam.empty());
+
+    TemplateParamType &
+        rTpt = pTypePilot->Store_TemplateParamType(i_sTemplateParam);
+
+    Struct & ret = *new Struct( i_sName,
+                                i_nOwner,
+                                i_nBase,
+                                i_sTemplateParam,
+                                rTpt.TypeId() );
+    lhf_Store_NewEntity(ret, i_nOwner);
+    rTpt.Set_StructId(ret.CeId());
+
+    return ret;
+}
+
+
+}   // namespace idl
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/ia_ce.hxx b/autodoc/source/ary/idl/ia_ce.hxx
new file mode 100644
index 000000000000..aad50cfe05f2
--- /dev/null
+++ b/autodoc/source/ary/idl/ia_ce.hxx
@@ -0,0 +1,256 @@
+/* -*- 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 ARY_IDL_IA_CE_HXX
+#define ARY_IDL_IA_CE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ip_ce.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+class Ce_Storage;
+class TypeAdmin;
+
+
+/** @resp
+    Implements ::ary::idl::CePilot. Provides the access logic for all
+    IDL code entities.
+
+    @collab Ce_Storage
+    @collab TypeAdmin
+
+    @see CodeEntity
+*/
+class CeAdmin : public CePilot
+{
+  public:
+    // LIFECYCLE
+                        CeAdmin(
+                            NameLookup &        io_rNameDictionary,
+                            TypeAdmin &         io_rTypePilot );
+    virtual             ~CeAdmin();
+
+    // OPERATIONS
+
+    // INQUIRY
+    const Ce_Storage &  Storage() const;
+
+    // ACCESS
+    Ce_Storage &        Storage();
+
+    // INHERITED
+        // Interface ::ary::idl::CePilot:
+    virtual Module &    CheckIn_Module(
+                            Ce_id               i_nParentId,
+                            const String &      i_sName );
+    virtual Service &   Store_Service(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName );
+    virtual SglIfcService &
+                        Store_SglIfcService(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBaseInterface );
+    virtual Interface & Store_Interface(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBase );
+    virtual Struct &    Store_Struct(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBase,
+                            const String &      i_sTemplateParam );
+    virtual Exception & Store_Exception(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBase );
+    virtual Enum &      Store_Enum(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName );
+    virtual Typedef &   Store_Typedef(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nDefiningType );
+    virtual ConstantsGroup &
+                        Store_ConstantsGroup(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName );
+    virtual Singleton & Store_Singleton(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName );
+    virtual SglIfcSingleton &
+                        Store_SglIfcSingleton(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBaseInterface );
+
+    virtual Constant &  Store_Constant(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType,
+                            const String &      i_sValue );
+    virtual Property &  Store_Property(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType,
+                            Property::Stereotypes
+                                                i_stereotypes );
+    virtual Function &  Store_Function(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nReturnType,
+                            bool                i_bOneWay );
+    virtual Function &  Store_ServiceConstructor(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName );
+    virtual StructElement &
+                        Store_StructMember(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType );
+    virtual StructElement &
+                        Store_ExceptionMember(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType );
+    virtual EnumValue & Store_EnumValue(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            const String &      i_sValue );
+    virtual Attribute & Store_Attribute(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nType,
+                            bool                i_bReadOnly,
+                            bool                i_bBound );
+
+    virtual const Module &
+                        GlobalNamespace() const;
+    virtual const CodeEntity &
+                        Find_Ce(
+                            Ce_id               i_nId ) const;
+    virtual const Module &
+                        Find_Module(
+                            Ce_id               i_nId ) const;
+    virtual const Module *
+                        Search_Module(
+                            Ce_id               i_nId ) const;
+    virtual const Function &
+                        Find_Function(
+                            Ce_id               i_nId ) const;
+    virtual const Property &
+                        Find_Property(
+                            Ce_id               i_nId ) const;
+    virtual const EnumValue &
+                        Find_EnumValue(
+                            Ce_id               i_nId ) const;
+    virtual const Constant &
+                        Find_Constant(
+                            Ce_id               i_nId ) const;
+    virtual const StructElement &
+                        Find_StructElement(
+                            Ce_id               i_nId ) const;
+    virtual void        Get_Text(
+                            StringVector &      o_module,
+                            String &            o_ce,
+                            String &            o_member,
+                            const CodeEntity &  i_ce ) const;
+    virtual const NameLookup &
+                        NameDictionary() const;
+    virtual void        Get_AlphabeticalIndex(
+                            std::vector<Ce_id> &
+                                                o_rResult,
+                            alphabetical_index::E_Letter
+                                                i_cLetter) const;
+    // ACCESS
+    virtual Module &    GlobalNamespace();
+    virtual CodeEntity &
+                        Find_Ce(
+                            Ce_id               i_nId );
+  private:
+    // Locals
+    Module &            lhf_Access_Module(
+                            Ce_id               i_nId );
+    void                lhf_Put2Storage_and_AssignId(
+                            CodeEntity &        pass_io_rCe );
+    void                lhf_Store_NewEntity(
+                            DYN CodeEntity &    pass_io_rCe,
+                            Module &            i_rOwner );
+    void                lhf_Store_NewEntity(
+                            DYN CodeEntity &    pass_io_rCe,
+                            Ce_id               i_nOwnerModule );
+    void                get_ModuleText(
+                            StringVector &      o_module,
+                            const CodeEntity &  i_ce ) const;
+    Struct &            lhf_Store_TplStruct(
+                            Ce_id               i_nOwner,
+                            const String &      i_sName,
+                            Type_id             i_nBase,
+                            const String &      i_sTemplateParam );
+
+    const Ce_Storage &  my_Storage() const;
+    Ce_Storage &        my_Storage();
+    NameLookup &        my_NameDictionary()     { return *pNameDictionary; }
+
+    // DATA
+    Dyn<Ce_Storage>     pStorage;           /// @inv pStorage != 0;
+    Module *            pGlobalNamespace;
+    NameLookup *        pNameDictionary;
+    TypeAdmin *         pTypePilot;
+};
+
+
+// IMPLEMENTATION
+inline const Ce_Storage &
+CeAdmin::Storage() const
+{
+    return *pStorage;
+}
+
+inline Ce_Storage &
+CeAdmin::Storage()
+{
+    return *pStorage;
+}
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/ia_type.cxx b/autodoc/source/ary/idl/ia_type.cxx
new file mode 100644
index 000000000000..c029c8e1e877
--- /dev/null
+++ b/autodoc/source/ary/idl/ia_type.cxx
@@ -0,0 +1,367 @@
+/* -*- 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 <precomp.h>
+#include "ia_type.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/qualiname.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/i_type.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include "ia_ce.hxx"
+#include "is_type.hxx"
+#include "it_builtin.hxx"
+#include "it_ce.hxx"
+#include "it_explicit.hxx"
+#include "it_sequence.hxx"
+#include "it_tplparam.hxx"
+#include "it_xnameroom.hxx"
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+String              MakeTemplateName(
+                        const String &      i_localName,
+                        const std::vector<Type_id> &
+                                            i_templateParameters );
+
+
+
+inline CeAdmin &
+TypeAdmin::my_Ces() const
+    { return *pCes; }
+
+inline void
+TypeAdmin::lhf_Put2Storage_and_AssignId( DYN Type & pass_io_rType )
+    { // This also assigns an ID to pass_io_rType:
+      Storage().Store_Entity(pass_io_rType); }
+
+inline Type_id
+TypeAdmin::lhf_findBuiltInType( const String & i_sName )
+    { return ary_cast<ExplicitNameRoom>(Storage()[nXNameRoom_Root])
+                        .Search_Name(i_sName); }
+
+inline const ExplicitNameRoom &
+TypeAdmin::find_ExplicitNameRoom( Type_id i_nType ) const
+{
+    return ary_cast<ExplicitNameRoom>(Storage()[i_nType]);
+}
+
+inline ExplicitNameRoom &
+TypeAdmin::find_ExplicitNameRoom( Type_id i_nType )
+{
+    return ary_cast<ExplicitNameRoom>(Storage()[i_nType]);
+}
+
+ExplicitNameRoom &
+TypeAdmin::lhf_CheckIn_XNameRoom( const QualifiedName & i_rName,
+                                       Ce_id                 i_nModuleOfOccurrence )
+{
+    Type_id nRoot = i_rName.IsAbsolute()
+                        ?   Type_id( predefined::type_GlobalXNameRoom )
+                        :   lhf_Get_NameRoomRoot_forModuleofOccurrence( i_nModuleOfOccurrence ).TypeId();
+
+    if ( i_rName.NamespaceDepth() == 0 )
+        return find_ExplicitNameRoom(nRoot);
+
+    QualifiedName::namespace_iterator it = i_rName.first_namespace();
+    ExplicitNameRoom *
+        ret = & find_ExplicitNameRoom(nRoot);
+    for ( ; it != i_rName.end_namespace(); ++it )
+    {
+        Type_id
+            found = ret->Search_Name(*it);
+        if (found.IsValid())
+        {
+            ret = & find_ExplicitNameRoom(found);
+        }
+        else
+        {
+            ExplicitNameRoom &
+                rNew = *new ExplicitNameRoom(*it, *ret);
+            lhf_Put2Storage_and_AssignId(rNew);
+            ret->Add_Name( rNew.Name(), rNew.TypeId() );
+            ret = &rNew;
+        }
+
+    }   // end for
+    return *ret;
+}
+
+Type_id
+TypeAdmin::lhf_CheckIn_TypeName( const String &        i_sLocalName,
+                                      ExplicitNameRoom &    io_rXNameRoom,
+                                      Ce_id                 i_nModuleOfOccurrence,
+                                 const std::vector<Type_id> *   i_templateParameters )
+{
+    String sSearchLocalName( i_sLocalName );
+    if ( i_templateParameters != 0
+         ?  (!i_templateParameters->empty())
+         :  false )
+    {
+        sSearchLocalName = MakeTemplateName(
+                                i_sLocalName,
+                                *i_templateParameters);
+    }
+
+    Type_id
+        ret = io_rXNameRoom.Search_Name(sSearchLocalName);
+    if (NOT ret.IsValid())
+    {
+        DYN Type &
+            rNewType = *new ExplicitType(  i_sLocalName,
+                                           io_rXNameRoom.TypeId(),
+                                           i_nModuleOfOccurrence,
+                                           i_templateParameters );
+        lhf_Put2Storage_and_AssignId(rNewType);
+        ret = rNewType.TypeId();
+        io_rXNameRoom.Add_Name( sSearchLocalName, ret );
+    }
+    return ret;
+}
+
+Type_id
+TypeAdmin::lhf_CheckIn_Sequence(Type_id i_nType)
+{
+    Type_id
+        ret = Storage().Search_SequenceOf(i_nType);
+
+    if (NOT ret.IsValid())
+    {
+        DYN Type &
+            rNewSeq = *new Sequence(i_nType);
+        lhf_Put2Storage_and_AssignId(rNewSeq);
+        ret = rNewSeq.Id();
+        Storage().Add_Sequence(i_nType, ret);
+    }
+    return ret;
+}
+
+void
+TypeAdmin::lhf_CheckIn_BuiltInType( const char *       i_sName,
+                                    Rid                i_nId )
+{
+    DYN BuiltInType &
+        rNewType = *new BuiltInType(i_sName);
+    Storage().Set_Reserved(i_nId, rNewType);
+
+    // Put them into both roots, to catch the syntactically correct
+    //   (though unlikely) ::Any, ::long etc.
+    Type_id
+        nId(i_nId);
+    find_ExplicitNameRoom(nXNameRoom_Root).Add_Name(i_sName, nId);
+    find_ExplicitNameRoom(nXNameRoom_Global).Add_Name(i_sName, nId);
+}
+
+ExplicitNameRoom &
+TypeAdmin::lhf_Get_NameRoomRoot_forModuleofOccurrence( Ce_id i_nModuleOfOccurrence )
+{
+    const Type_id *
+        pFound = csv::find_in_map( aMap_ModuleOfOccurrence2NameRoomRoot,
+                                   i_nModuleOfOccurrence );
+    if (pFound != 0)
+        return find_ExplicitNameRoom(*pFound);
+
+    ExplicitNameRoom &
+        ret = *new ExplicitNameRoom;
+    lhf_Put2Storage_and_AssignId(ret);
+    aMap_ModuleOfOccurrence2NameRoomRoot.insert(std::pair< const Ce_id, Type_id>(i_nModuleOfOccurrence,ret.TypeId()));
+    return ret;
+}
+
+TypeAdmin::TypeAdmin()
+    :   pStorage(new Type_Storage),
+        pCes(0),    // Needs to be set directly after creation.
+        nXNameRoom_Root( static_cast<ary::Rid>(predefined::type_Root_ofXNameRooms) ),
+        nXNameRoom_Global( static_cast<ary::Rid>(predefined::type_GlobalXNameRoom) ),
+        aMap_ModuleOfOccurrence2NameRoomRoot()
+{
+    DYN ExplicitNameRoom &
+        drRoot = *new ExplicitNameRoom;
+    Storage().Set_Reserved( nXNameRoom_Root.Value(), drRoot );
+
+    DYN ExplicitNameRoom &
+        drGlobal = *new ExplicitNameRoom(String::Null_(), drRoot);
+    Storage().Set_Reserved( nXNameRoom_Global.Value(), drGlobal );
+    drRoot.Add_Name( drGlobal.Name(), nXNameRoom_Global );
+
+    lhf_Setup_BuildInTypes();
+}
+
+TypeAdmin::~TypeAdmin()
+{
+}
+
+void
+TypeAdmin::lhf_Setup_BuildInTypes()
+{
+    lhf_CheckIn_BuiltInType("any", predefined::type_any);
+    lhf_CheckIn_BuiltInType("boolean", predefined::type_boolean);
+    lhf_CheckIn_BuiltInType("byte", predefined::type_byte);
+    lhf_CheckIn_BuiltInType("char", predefined::type_char);
+    lhf_CheckIn_BuiltInType("double", predefined::type_double);
+    lhf_CheckIn_BuiltInType("float", predefined::type_float);
+    lhf_CheckIn_BuiltInType("hyper", predefined::type_hyper);
+    lhf_CheckIn_BuiltInType("long", predefined::type_long);
+    lhf_CheckIn_BuiltInType("short", predefined::type_short);
+    lhf_CheckIn_BuiltInType("string", predefined::type_string);
+    lhf_CheckIn_BuiltInType("type", predefined::type_type);
+    lhf_CheckIn_BuiltInType("void", predefined::type_void);
+    lhf_CheckIn_BuiltInType("unsigned hyper", predefined::type_u_hyper);
+    lhf_CheckIn_BuiltInType("unsigned long", predefined::type_u_long);
+    lhf_CheckIn_BuiltInType("unsigned short", predefined::type_u_short);
+}
+
+const Type &
+TypeAdmin::CheckIn_Type( QualifiedName &     i_rFullName,
+                                 uintt               i_nSequenceCount,
+                                 Ce_id               i_nModuleOfOccurrence,
+                         const std::vector<Type_id> *   i_templateParameters )
+{
+    // Look in built-in types:
+    Type_id
+        nType = lhf_findBuiltInType(i_rFullName.LocalName());
+    if (NOT nType.IsValid())
+    {   // No built-in type:
+        ExplicitNameRoom &
+            rNameRoom = lhf_CheckIn_XNameRoom(i_rFullName,i_nModuleOfOccurrence);
+        nType = lhf_CheckIn_TypeName( i_rFullName.LocalName(),
+                                      rNameRoom,
+                                      i_nModuleOfOccurrence,
+                                      i_templateParameters );
+    }   // endif
+
+    for ( uintt s = 0; s < i_nSequenceCount; ++s )
+    {
+        nType = lhf_CheckIn_Sequence(nType);
+    }
+
+    return Storage()[nType];
+}
+
+TemplateParamType &
+TypeAdmin::Store_TemplateParamType( String i_sName )
+{
+    DYN TemplateParamType &
+        ret = *new TemplateParamType( i_sName );
+    lhf_Put2Storage_and_AssignId(ret);
+    return ret;
+}
+
+const Type &
+TypeAdmin::Find_Type( Type_id i_nType ) const
+{
+    return Storage()[i_nType];
+}
+
+String
+TypeAdmin::Search_LocalNameOf( Type_id i_nType ) const
+{
+    const Type *
+        pType = Storage().Exists(i_nType)
+                    ? 0
+                    : & Storage()[i_nType];
+    if (pType != 0)
+    {
+        switch (pType->AryClass())
+        {
+            case Ce_Type::class_id:
+            case ExplicitType::class_id:
+            case BuiltInType::class_id:
+                    return static_cast< const Named_Type& >(*pType).Name();
+        }
+    }
+    return String::Null_();
+}
+
+Ce_id
+TypeAdmin::Search_CeRelatedTo( Type_id i_nType ) const
+{
+    const Ce_Type *
+        ret = ary_cast<Ce_Type>( & Storage()[i_nType] );
+    return ret != 0
+            ?   ret->RelatedCe()
+            :   Ce_id_Null();
+}
+
+const ExplicitNameRoom &
+TypeAdmin::Find_XNameRoom( Type_id i_nType ) const
+{
+    return find_ExplicitNameRoom(i_nType);
+}
+
+bool
+TypeAdmin::IsBuiltInOrRelated( const Type & i_rType ) const
+{
+    if ( is_type<BuiltInType>(i_rType) )
+        return true;
+    else
+    {
+        const Type *
+            pType = &i_rType;
+        while (is_type<Sequence>(*pType))
+        {
+            Type_id
+                nt = ary_cast<Sequence>(pType)->RelatedType();
+            if (NOT nt.IsValid())
+                return false;
+            pType = & Storage()[nt];
+        }
+        return is_type<BuiltInType>(*pType);
+    }
+}
+
+
+String
+MakeTemplateName( const String &                i_localName,
+                  const std::vector<Type_id> &  )
+{
+    StreamLock
+        sl(200);
+
+    // This is the simple solution, assuming that there is only
+    // one version of templatisation allowed with a given name.
+    return
+        sl()
+            << i_localName
+            << C_cTemplateDelimiter
+            << c_str;
+}
+
+
+
+}   // namespace idl
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/ia_type.hxx b/autodoc/source/ary/idl/ia_type.hxx
new file mode 100644
index 000000000000..ace6a9903815
--- /dev/null
+++ b/autodoc/source/ary/idl/ia_type.hxx
@@ -0,0 +1,173 @@
+/* -*- 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 ARY_IDL_IA_TYPE_HXX
+#define ARY_IDL_IA_TYPE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/ip_type.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include "is_type.hxx"
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+class Type_Storage;
+class CeAdmin;
+class TemplateParamType;
+
+
+class TypeAdmin : public TypePilot
+{
+  public:
+    // LIFECYCLE
+                        TypeAdmin();
+
+    void                Assign_CePilot(
+                            CeAdmin &           io_rCes );
+    virtual             ~TypeAdmin();
+
+    // OPERATIONS
+    TemplateParamType & Store_TemplateParamType(
+                            String              i_sName );
+    // INQUIRY
+    const Type_Storage &
+                        Storage() const;
+    // ACCESS
+    Type_Storage &      Storage();
+
+    // INHERITED
+        // Interface TypePilot:
+    virtual const Type &
+                        CheckIn_Type(
+                            QualifiedName &     i_rFullName,
+                            uintt               i_nSequenceCount,
+                            Ce_id               i_nModuleOfOccurrence,
+                            const std::vector<Type_id> *
+                                                i_templateParameters );
+    virtual const Type &
+                        Find_Type(
+                            Type_id             i_nType ) const;
+    virtual String      Search_LocalNameOf(
+                            Type_id             i_nType ) const;
+    virtual Ce_id       Search_CeRelatedTo(
+                            Type_id             i_nType ) const;
+    virtual const ExplicitNameRoom &
+                        Find_XNameRoom(
+                            Type_id             i_nType ) const;
+    virtual bool        IsBuiltInOrRelated(
+                            const Type &        i_rType ) const;
+  private:
+    // Locals
+    CeAdmin &           my_Ces() const;
+
+    void                lhf_Put2Storage_and_AssignId(
+                            DYN Type &          pass_io_rType );
+
+    ExplicitNameRoom &  lhf_CheckIn_XNameRoom(
+                            const QualifiedName &
+                                                i_rName,
+                            Ce_id               i_nModuleOfOccurrence );
+    Type_id             lhf_CheckIn_TypeName(
+                            const String &      i_sLocalName,
+                            ExplicitNameRoom &  io_rExplicitNameRoom,
+                            Ce_id               i_nModuleOfOccurrence,
+                            const std::vector<Type_id> *
+                                                i_templateParameters );
+    Type_id             lhf_CheckIn_Sequence(
+                            Type_id             i_nType );
+    void                lhf_CheckIn_BuiltInType(
+                            const char *        i_sName,
+                            Rid                 i_nId );
+    const ExplicitNameRoom &
+                        find_ExplicitNameRoom(
+                            Type_id             i_nType ) const;
+    ExplicitNameRoom &  find_ExplicitNameRoom(
+                            Type_id             i_nType );
+    ExplicitNameRoom &  lhf_Get_NameRoomRoot_forModuleofOccurrence(
+                            Ce_id               i_nModuleOfOccurrence );
+
+    /// @return Type_id::Null_(), if not found.
+    Type_id             lhf_findBuiltInType(
+                            const String &      i_sName );
+    /// @precond nGlobalNamespace must be valid.
+    void                lhf_Setup_BuildInTypes();
+
+    // DATA
+    Type_Storage *      pStorage;           /// @inv pStorage != 0
+    CeAdmin *           pCes;               /// @inv pCes != 0
+
+    // Data for saving time:
+    Type_id             nXNameRoom_Root;    /** @descr  This is different from nXNameRoom_Global, because
+                                                the root of explicit name rooms in code without leading "::" is unknown.
+                                            */
+    Type_id             nXNameRoom_Global;
+
+    // HACK, because this needs to be saved somehow and is not in storage:
+    std::map<Ce_id, Type_id>
+                        aMap_ModuleOfOccurrence2NameRoomRoot;
+};
+
+
+
+
+
+// IMPLEMENTATION
+inline const Type_Storage &
+TypeAdmin::Storage() const
+{
+    return *pStorage;
+}
+
+inline Type_Storage &
+TypeAdmin::Storage()
+{
+    return *pStorage;
+}
+
+inline void
+TypeAdmin::Assign_CePilot( CeAdmin & io_rCes )
+{
+    pCes = &io_rCes;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/is_ce.cxx b/autodoc/source/ary/idl/is_ce.cxx
new file mode 100644
index 000000000000..b50b0058fba4
--- /dev/null
+++ b/autodoc/source/ary/idl/is_ce.cxx
@@ -0,0 +1,68 @@
+/* -*- 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 <precomp.h>
+#include "is_ce.hxx"
+
+// NOT FULLY DEFINED SERVICES
+
+namespace
+{
+    const uintt
+    C_nReservedElements = ary::idl::predefined::ce_MAX;    // Skipping "0" and the GlobalNamespace
+}
+
+
+namespace ary
+{
+namespace idl
+{
+
+Ce_Storage *        Ce_Storage::pInstance_ = 0;
+
+
+
+
+Ce_Storage::Ce_Storage()
+    :   stg::Storage<CodeEntity>(C_nReservedElements)
+{
+    csv_assert(pInstance_ == 0);
+    pInstance_ = this;
+}
+
+Ce_Storage::~Ce_Storage()
+{
+    csv_assert(pInstance_ != 0);
+    pInstance_ = 0;
+}
+
+
+}   // namespace idl
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/is_ce.hxx b/autodoc/source/ary/idl/is_ce.hxx
new file mode 100644
index 000000000000..43266086b197
--- /dev/null
+++ b/autodoc/source/ary/idl/is_ce.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 ARY_IDL_IS_CE_HXX
+#define ARY_IDL_IS_CE_HXX
+
+// BASE CLASSES
+#include <store/s_storage.hxx>
+// USED SERVICES
+#include <ary/idl/i_ce.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** The data base for all ->ary::idl::CodeEntity objects.
+*/
+class Ce_Storage : public ::ary::stg::Storage< ::ary::idl::CodeEntity >
+{
+  public:
+                        Ce_Storage();
+    virtual             ~Ce_Storage();
+
+    static Ce_Storage & Instance_()               { csv_assert(pInstance_ != 0);
+                                                    return *pInstance_; }
+  private:
+    // DATA
+    static Ce_Storage * pInstance_;
+};
+
+
+
+
+namespace predefined
+{
+
+enum E_CodeEntity
+{
+    ce_GlobalNamespace = 1,
+    ce_MAX
+};
+
+}   // namespace predefined
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/is_type.cxx b/autodoc/source/ary/idl/is_type.cxx
new file mode 100644
index 000000000000..6082397140de
--- /dev/null
+++ b/autodoc/source/ary/idl/is_type.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "is_type.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+
+namespace
+{
+
+const uintt
+    C_nReservedElements = ary::idl::predefined::type_MAX;    // Skipping "0" and the built in types.
+}
+
+
+namespace ary
+{
+namespace idl
+{
+
+Type_Storage *          Type_Storage::pInstance_ = 0;
+
+
+
+Type_Storage::Type_Storage()
+    :   stg::Storage<Type>(C_nReservedElements),
+        aSequenceIndex()
+{
+    csv_assert(pInstance_ == 0);
+    pInstance_ = this;
+}
+
+Type_Storage::~Type_Storage()
+{
+    csv_assert(pInstance_ != 0);
+    pInstance_ = 0;
+}
+
+void
+Type_Storage::Add_Sequence( Type_id             i_nRelatedType,
+                            Type_id             i_nSequence )
+{
+    aSequenceIndex[i_nRelatedType] = i_nSequence;
+}
+
+Type_id
+Type_Storage::Search_SequenceOf( Type_id i_nRelatedType )
+{
+    return csv::value_from_map(aSequenceIndex, i_nRelatedType);
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/is_type.hxx b/autodoc/source/ary/idl/is_type.hxx
new file mode 100644
index 000000000000..14a4da1127c0
--- /dev/null
+++ b/autodoc/source/ary/idl/is_type.hxx
@@ -0,0 +1,125 @@
+/* -*- 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 ARY_IDL_IS_TYPE_HXX
+#define ARY_IDL_IS_TYPE_HXX
+
+// BASE CLASSES
+#include <store/s_storage.hxx>
+// USED SERVICES
+#include <ary/idl/i_type.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** The data base for all ->ary::idl::CodeEntity objects.
+*/
+class Type_Storage : public ::ary::stg::Storage< ::ary::idl::Type >
+{
+  public:
+                        Type_Storage();
+                        ~Type_Storage();
+
+
+    void                Add_Sequence(
+                            Type_id             i_nRelatedType,
+                            Type_id             i_nSequence );
+
+    Type_id             Search_SequenceOf(
+                            Type_id             i_nRelatedType );
+
+    static Type_Storage &
+                        Instance_();
+  private:
+    /**  value_type.first   := id of the base type
+         value_type.second  := id of the sequence<base type>
+    */
+    typedef std::map<Type_id,Type_id>           Map_Sequences;
+
+    // DATA
+    Map_Sequences       aSequenceIndex;
+
+    static Type_Storage *
+                        pInstance_;
+};
+
+
+
+namespace predefined
+{
+
+enum E_Type
+{
+    type_Root_ofXNameRooms = 1,
+    type_GlobalXNameRoom,
+    type_any,
+    type_boolean,
+    type_byte,
+    type_char,
+    type_double,
+    type_float,
+    type_hyper,
+    type_long,
+    type_short,
+    type_string,
+    type_type,
+    type_void,
+    type_u_hyper,
+    type_u_long,
+    type_u_short,
+    type_ellipse,    // ...
+    type_MAX
+};
+
+}   // namespace predefined
+
+
+
+
+// IMPLEMENTATION
+inline Type_Storage &
+Type_Storage::Instance_()
+{
+    csv_assert(pInstance_ != 0);
+    return *pInstance_;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/it_builtin.cxx b/autodoc/source/ary/idl/it_builtin.cxx
new file mode 100644
index 000000000000..cc287b43b389
--- /dev/null
+++ b/autodoc/source/ary/idl/it_builtin.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "it_builtin.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/processor.hxx>
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+
+BuiltInType::BuiltInType( const char * i_sName )
+    :   Named_Type(i_sName)
+{
+}
+
+BuiltInType::~BuiltInType()
+{
+}
+
+ClassId
+BuiltInType::get_AryClass() const
+{
+    return class_id;
+}
+
+void
+BuiltInType::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+void
+BuiltInType::inq_Get_Text( StringVector &      ,            // o_module
+                           String &            o_name,
+                           Ce_id &             ,            // o_nRelatedCe
+                           int &               ,            // o_nSequenceCount
+                           const Gate &        ) const      // i_rGate
+{
+    o_name = Name();
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/it_builtin.hxx b/autodoc/source/ary/idl/it_builtin.hxx
new file mode 100644
index 000000000000..7a68f0a4f1f1
--- /dev/null
+++ b/autodoc/source/ary/idl/it_builtin.hxx
@@ -0,0 +1,79 @@
+/* -*- 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 ARY_IDL_IT_BUILTIN_HXX
+#define ARY_IDL_IT_BUILTIN_HXX
+
+// BASE CLASSES
+#include "it_named.hxx"
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** A type defined by the IDL language.
+*/
+class BuiltInType : public Named_Type
+{
+  public:
+    enum E_ClassId { class_id = 2200 };
+
+    // LIFECYCLE
+                        BuiltInType(
+                            const char *        i_sName );
+    virtual             ~BuiltInType();
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface Type:
+    virtual void        inq_Get_Text(
+                            StringVector &      o_module,
+                            String &            o_name,
+                            Ce_id &             o_nRelatedCe,
+                            int &               o_nSequenceCount,
+                            const Gate &        i_rGate ) const;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/it_ce.cxx b/autodoc/source/ary/idl/it_ce.cxx
new file mode 100644
index 000000000000..6aef98066b49
--- /dev/null
+++ b/autodoc/source/ary/idl/it_ce.cxx
@@ -0,0 +1,103 @@
+/* -*- 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 <precomp.h>
+#include "it_ce.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/ip_ce.hxx>
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+Ce_Type::Ce_Type( Ce_id                        i_relatedCe,
+                  const std::vector<Type_id> * i_templateParameters )
+    :   nRelatedCe(i_relatedCe),
+        pTemplateParameters(0)
+{
+    if (i_templateParameters != 0)
+        pTemplateParameters = new std::vector<Type_id>(*i_templateParameters);
+}
+
+Ce_Type::~Ce_Type()
+{
+}
+
+ClassId
+Ce_Type::get_AryClass() const
+{
+    return class_id;
+}
+
+void
+Ce_Type::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+void
+Ce_Type::inq_Get_Text( StringVector &      o_module,
+                       String &            o_name,
+                       Ce_id &             o_nRelatedCe,
+                       int &               ,                // o_nSequenceCount
+                       const Gate &        i_rGate ) const
+{
+    String sDummyMember;
+
+    const CodeEntity &
+        rCe = i_rGate.Ces().Find_Ce(nRelatedCe);
+    i_rGate.Ces().Get_Text( o_module,
+                            o_name,
+                            sDummyMember,
+                            rCe );
+    o_nRelatedCe = nRelatedCe;
+}
+
+const std::vector<Type_id> *
+Ce_Type::inq_TemplateParameters() const
+{
+    return pTemplateParameters.Ptr();
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/it_ce.hxx b/autodoc/source/ary/idl/it_ce.hxx
new file mode 100644
index 000000000000..8693c9df9750
--- /dev/null
+++ b/autodoc/source/ary/idl/it_ce.hxx
@@ -0,0 +1,91 @@
+/* -*- 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 ARY_IDL_IT_CE_HXX
+#define ARY_IDL_IT_CE_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_type.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** A named ->Type related to its corresponding
+     ->CodeEntity.
+*/
+class Ce_Type : public Type
+{
+  public:
+    enum E_ClassId { class_id = 2201 };
+
+    // LIFECYCLE
+                        Ce_Type(
+                            Ce_id               i_relatedCe,
+                            const std::vector<Type_id> *
+                                                i_templateParameters );
+    virtual             ~Ce_Type();
+
+    // INQUIRY
+    Ce_id               RelatedCe() const       { return nRelatedCe; }
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface Type:
+    virtual void        inq_Get_Text(
+                            StringVector &      o_module,
+                            String &            o_name,
+                            Ce_id &             o_nRelatedCe,
+                            int &               o_nSequemceCount,
+                            const Gate &        i_rGate ) const;
+    virtual const std::vector<Type_id> *
+                        inq_TemplateParameters() const;
+    // DATA
+    Ce_id               nRelatedCe;
+    Dyn< std::vector<Type_id> >
+                        pTemplateParameters;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/it_explicit.cxx b/autodoc/source/ary/idl/it_explicit.cxx
new file mode 100644
index 000000000000..900556106ae9
--- /dev/null
+++ b/autodoc/source/ary/idl/it_explicit.cxx
@@ -0,0 +1,103 @@
+/* -*- 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 <precomp.h>
+#include "it_explicit.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/idl/ip_type.hxx>
+#include "it_xnameroom.hxx"
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+ExplicitType::ExplicitType( const String &      i_sName,
+                            Type_id             i_nXNameRoom,
+                            Ce_id               i_nModuleOfOccurrence,
+                            const std::vector<Type_id> *
+                                                i_templateParameters )
+    :   Named_Type(i_sName),
+        nXNameRoom(i_nXNameRoom),
+        nModuleOfOccurrence(i_nModuleOfOccurrence),
+        pTemplateParameters(0)
+{
+    if (i_templateParameters != 0)
+        pTemplateParameters = new std::vector<Type_id>(*i_templateParameters);
+}
+
+ExplicitType::~ExplicitType()
+{
+}
+
+ClassId
+ExplicitType::get_AryClass() const
+{
+    return class_id;
+}
+
+void
+ExplicitType::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+void
+ExplicitType::inq_Get_Text( StringVector &      o_module,
+                            String &            o_name,
+                            Ce_id &             o_nRelatedCe,
+                            int &               o_nSequenceCount,
+                            const Gate &        i_rGate ) const
+{
+    const ExplicitNameRoom &
+        rNameRoom = i_rGate.Types().Find_XNameRoom(nXNameRoom);
+    rNameRoom.Get_Text(o_module,o_name,o_nRelatedCe,o_nSequenceCount,i_rGate);
+
+    o_name = Name();
+}
+
+const std::vector<Type_id> *
+ExplicitType::inq_TemplateParameters() const
+{
+    return pTemplateParameters.Ptr();
+}
+
+
+}   // namespace idl
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/it_explicit.hxx b/autodoc/source/ary/idl/it_explicit.hxx
new file mode 100644
index 000000000000..ddda35458173
--- /dev/null
+++ b/autodoc/source/ary/idl/it_explicit.hxx
@@ -0,0 +1,96 @@
+/* -*- 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 ARY_IDL_IT_EXPLICIT_HXX
+#define ARY_IDL_IT_EXPLICIT_HXX
+
+// BASE CLASSES
+#include "it_named.hxx"
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** A named @->Type, not yet related to its corresponding
+    @->CodeEntity.
+*/
+class ExplicitType : public Named_Type
+{
+  public:
+    enum E_ClassId { class_id = 2203 };
+
+    // LIFECYCLE
+                        ExplicitType(
+                            const String &      i_sName,
+                            Type_id             i_nXNameRoom,
+                            Ce_id               i_nModuleOfOccurrence,
+                            const std::vector<Type_id> *
+                                                i_templateParameters );
+    virtual             ~ExplicitType();
+
+    // INQUIRY
+    Ce_id               ModuleOfOccurrence() const
+                                                { return nModuleOfOccurrence; }
+    Type_id             NameRoom() const        { return nXNameRoom; }
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface CppEntity:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface Type:
+    virtual void        inq_Get_Text(
+                            StringVector &      o_module,
+                            String &            o_name,
+                            Ce_id &             o_nRelatedCe,
+                            int &               o_nSequemceCount,
+                            const Gate &        i_rGate ) const;
+    virtual const std::vector<Type_id> *
+                        inq_TemplateParameters() const;
+    // DATA
+    Type_id             nXNameRoom;             // As written in code.
+    Ce_id               nModuleOfOccurrence;
+    Dyn< const std::vector<Type_id> >
+                        pTemplateParameters;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/it_named.hxx b/autodoc/source/ary/idl/it_named.hxx
new file mode 100644
index 000000000000..473d27d1139d
--- /dev/null
+++ b/autodoc/source/ary/idl/it_named.hxx
@@ -0,0 +1,78 @@
+/* -*- 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 ARY_IDL_IT_NAMED_HXX
+#define ARY_IDL_IT_NAMED_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/idl/i_type.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+
+
+/** Represents types with a name - in opposite to e.g. sequences,
+    which do not have one.
+*/
+class Named_Type : public Type
+{
+  public:
+    // LIFECYCLE
+    virtual             ~Named_Type()           {}
+
+    // INQUIRY
+    const String &      Name() const            { return sName; }
+
+  protected:
+                        Named_Type(
+                            const String &      i_sName )
+                                                : sName(i_sName) { }
+  private:
+    // DATA
+    String              sName;
+};
+
+
+
+}   // namespace idl
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/it_sequence.cxx b/autodoc/source/ary/idl/it_sequence.cxx
new file mode 100644
index 000000000000..daa9c043cfd3
--- /dev/null
+++ b/autodoc/source/ary/idl/it_sequence.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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "it_sequence.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_type.hxx>
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+Sequence::Sequence( Type_id i_nRelatedType )
+    :   nRelatedType(i_nRelatedType)
+{
+}
+
+Sequence::~Sequence()
+{
+}
+
+ClassId
+Sequence::get_AryClass() const
+{
+    return class_id;
+}
+
+void
+Sequence::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+void
+Sequence::inq_Get_Text( StringVector &      o_module,
+                        String &            o_name,
+                        Ce_id &             o_nRelatedCe,
+                        int &               o_nSequenceCount,
+                        const Gate &        i_rGate ) const
+{
+    ++o_nSequenceCount;
+
+    i_rGate.Types().Find_Type(nRelatedType)
+            .Get_Text(  o_module,
+                        o_name,
+                        o_nRelatedCe,
+                        o_nSequenceCount,
+                        i_rGate );
+}
+
+const Type &
+Sequence::inq_FirstEnclosedNonSequenceType(const Gate & i_rGate) const
+{
+    return i_rGate.Types().Find_Type(nRelatedType).FirstEnclosedNonSequenceType(i_rGate);
+}
+
+
+}   // namespace idl
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/it_sequence.hxx b/autodoc/source/ary/idl/it_sequence.hxx
new file mode 100644
index 000000000000..3971861356c1
--- /dev/null
+++ b/autodoc/source/ary/idl/it_sequence.hxx
@@ -0,0 +1,87 @@
+/* -*- 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 ARY_IDL_IT_SEQUENCE_HXX
+#define ARY_IDL_IT_SEQUENCE_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_type.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** A sequence (an array of a type).
+*/
+class Sequence : public Type
+{
+  public:
+    enum E_ClassId { class_id = 2202 };
+
+    // LIFECYCLE
+                        Sequence(
+                            Type_id             i_nRelatedType );
+    virtual             ~Sequence();
+
+    // INQUIRY
+    Type_id             RelatedType() const     { return nRelatedType; }
+
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface Type:
+    virtual void        inq_Get_Text(
+                            StringVector &      o_module,
+                            String &            o_name,
+                            Ce_id &             o_nRelatedCe,
+                            int &               o_nSequemceCount,
+                            const Gate &        i_rGate ) const;
+    virtual const Type &
+                        inq_FirstEnclosedNonSequenceType(
+                            const Gate &        i_rGate ) const;
+    // DATA
+    Type_id             nRelatedType;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/it_tplparam.cxx b/autodoc/source/ary/idl/it_tplparam.cxx
new file mode 100644
index 000000000000..f8a3097e44a0
--- /dev/null
+++ b/autodoc/source/ary/idl/it_tplparam.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "it_tplparam.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/processor.hxx>
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+
+TemplateParamType::TemplateParamType( const char * i_sName )
+    :   Named_Type(i_sName)
+{
+}
+
+TemplateParamType::~TemplateParamType()
+{
+}
+
+ClassId
+TemplateParamType::get_AryClass() const
+{
+    return class_id;
+}
+
+void
+TemplateParamType::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+void
+TemplateParamType::inq_Get_Text( StringVector &      ,          // o_module
+                                 String &            o_name,
+                                 Ce_id &             ,          // o_nRelatedCe
+                                 int &               ,          // o_nSequenceCount
+                                 const Gate &        ) const    // i_rGate
+{
+    o_name = Name();
+}
+
+
+//*************    Implemented default function for idl::Type ********//
+
+const std::vector<Type_id> *
+Type::inq_TemplateParameters() const
+{
+    return 0;
+}
+
+const Type &
+Type::inq_FirstEnclosedNonSequenceType(const Gate & ) const
+{
+    return *this;
+}
+
+
+}   // namespace idl
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/it_tplparam.hxx b/autodoc/source/ary/idl/it_tplparam.hxx
new file mode 100644
index 000000000000..294712f32741
--- /dev/null
+++ b/autodoc/source/ary/idl/it_tplparam.hxx
@@ -0,0 +1,101 @@
+/* -*- 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 ARY_IDL_IT_TPLPARAM_HXX
+#define ARY_IDL_IT_TPLPARAM_HXX
+
+// BASE CLASSES
+#include "it_named.hxx"
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** @resp Represents a template type when it is used within the
+    declaring struct.
+*/
+class TemplateParamType : public Named_Type
+{
+  public:
+    enum E_ClassId { class_id = 2205 };
+
+    // LIFECYCLE
+                        TemplateParamType(
+                            const char *        i_sName );
+    virtual             ~TemplateParamType();
+
+    Ce_id               StructId() const;       /// The struct which declares this type.
+    void                Set_StructId(
+                            Ce_id               i_nStruct );
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface Type:
+    virtual void        inq_Get_Text(
+                            StringVector &      o_module,
+                            String &            o_name,
+                            Ce_id &             o_nRelatedCe,
+                            int &               o_nSequenceCount,
+                            const Gate &        i_rGate ) const;
+    // DATA
+    Ce_id               nStruct;                /// The struct which declares this type.
+};
+
+
+
+
+// IMPLEMENTATION
+inline Ce_id
+TemplateParamType::StructId() const
+{
+    return nStruct;
+}
+
+inline void
+TemplateParamType::Set_StructId( Ce_id i_nStruct )
+{
+    nStruct = i_nStruct;
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/it_xnameroom.cxx b/autodoc/source/ary/idl/it_xnameroom.cxx
new file mode 100644
index 000000000000..23fbe617ba7f
--- /dev/null
+++ b/autodoc/source/ary/idl/it_xnameroom.cxx
@@ -0,0 +1,103 @@
+/* -*- 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 <precomp.h>
+#include "it_xnameroom.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/processor.hxx>
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_type.hxx>
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+ExplicitNameRoom::ExplicitNameRoom()
+    :   aImpl()
+{
+}
+
+ExplicitNameRoom::ExplicitNameRoom( const String &           i_sName,
+                                    const ExplicitNameRoom & i_rParent )
+    :   aImpl( i_sName, i_rParent.aImpl, i_rParent.TypeId() )
+{
+}
+
+ExplicitNameRoom::~ExplicitNameRoom()
+{
+}
+
+ClassId
+ExplicitNameRoom::get_AryClass() const
+{
+    return class_id;
+}
+
+void
+ExplicitNameRoom::do_Accept( csv::ProcessorIfc & io_processor ) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+void
+ExplicitNameRoom::inq_Get_Text( StringVector &      o_module,
+                                String &            ,           // o_name
+                                Ce_id &             ,           // o_nRelatedCe
+                                int &               ,           // o_nSequemceCount
+                                const Gate &        ) const     // i_rGate
+{
+    StringVector::const_iterator it = NameChain_Begin();
+    if ( it != NameChain_End()
+            ? (*it).empty()
+            : false )
+    {   // Don't put out the root global namespace
+        ++it;
+    }
+
+    for ( ;
+          it != NameChain_End();
+          ++it )
+    {
+        o_module.push_back(*it);
+    }
+}
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/it_xnameroom.hxx b/autodoc/source/ary/idl/it_xnameroom.hxx
new file mode 100644
index 000000000000..cb70e17102ca
--- /dev/null
+++ b/autodoc/source/ary/idl/it_xnameroom.hxx
@@ -0,0 +1,126 @@
+/* -*- 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 ARY_IDL_IT_XNAMEROOM_HXX
+#define ARY_IDL_IT_XNAMEROOM_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_type.hxx>
+#include <nametreenode.hxx>
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** A namespace for ->Type s, as they are explicitely written in code.
+
+    The search/identification string is usually the local name of
+    the Type. But for templated structs, the search string has this
+    pattern:
+                <LocalName> '<' <StringOfTemplateTypeId>
+*/
+class ExplicitNameRoom : public Type
+{
+  public:
+    enum E_ClassId { class_id = 2204 };
+
+    // LIFECYCLE
+                        ExplicitNameRoom();
+                        ExplicitNameRoom(
+                            const String &      i_sName,
+                            const ExplicitNameRoom &
+                                                i_rParent );
+    virtual             ~ExplicitNameRoom();
+
+    // OPERATIONS
+    /** @param i_sSearchString
+                A local type name  usually.
+                For templated types see class docu.
+        @see ExplicitNameRoom
+    */
+    void                Add_Name(
+                            const String &      i_sSearchString,
+                            Type_id             i_nId )
+                            { aImpl.Add_Name(i_sSearchString,i_nId); }
+    // INQUIRY
+    const String &      Name() const            { return aImpl.Name(); }
+    intt                Depth() const           { return aImpl.Depth(); }
+    void                Get_FullName(
+                            StringVector &      o_rText,
+                            Ce_idList *         o_pRelatedCes,
+                            const Gate &        i_rGate ) const;
+    bool                IsAbsolute() const      { return Depth() > 0
+                                                    ?   (*NameChain_Begin()).empty()
+                                                    :   false; }
+    /** @param i_sSearchString
+                A local type name  usually.
+                For templated types see class docu.
+        @see ExplicitNameRoom
+    */
+    Type_id             Search_Name(
+                            const String &      i_sSearchString ) const
+                            { return aImpl.Search_Name(i_sSearchString); }
+
+    StringVector::const_iterator
+                        NameChain_Begin() const
+                            { return aImpl.NameChain_Begin(); }
+    StringVector::const_iterator
+                        NameChain_End() const
+                            { return aImpl.NameChain_End(); }
+  private:
+    // Interface csv::ConstProcessorClient:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    // Interface Object:
+    virtual ClassId     get_AryClass() const;
+
+    // Interface Type:
+    virtual void        inq_Get_Text(
+                            StringVector &      o_module,
+                            String &            o_name,
+                            Ce_id &             o_nRelatedCe,
+                            int &               o_nSequemceCount,
+                            const Gate &        i_rGate ) const;
+    // DATA
+    NameTreeNode<Type_id>
+                        aImpl;
+};
+
+
+
+
+}   // namespace idl
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/idl/makefile.mk b/autodoc/source/ary/idl/makefile.mk
new file mode 100644
index 000000000000..bf260e2c521e
--- /dev/null
+++ b/autodoc/source/ary/idl/makefile.mk
@@ -0,0 +1,87 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=ary_idl
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/i_attribute.obj     \
+    $(OBJ)$/i_ce.obj            \
+    $(OBJ)$/i_ce2s.obj          \
+    $(OBJ)$/i_comrela.obj       \
+    $(OBJ)$/i_constant.obj      \
+    $(OBJ)$/i_constgroup.obj    \
+    $(OBJ)$/i_enum.obj          \
+    $(OBJ)$/i_enumvalue.obj     \
+    $(OBJ)$/i_exception.obj     \
+    $(OBJ)$/i_function.obj      \
+    $(OBJ)$/i_interface.obj     \
+    $(OBJ)$/i_module.obj        \
+    $(OBJ)$/i_namelookup.obj    \
+    $(OBJ)$/i_param.obj         \
+    $(OBJ)$/i_property.obj      \
+    $(OBJ)$/i_reposypart.obj    \
+    $(OBJ)$/i_service.obj       \
+    $(OBJ)$/i_singleton.obj     \
+    $(OBJ)$/i_siservice.obj     \
+    $(OBJ)$/i_sisingleton.obj   \
+    $(OBJ)$/i_struct.obj        \
+    $(OBJ)$/i_structelem.obj    \
+    $(OBJ)$/i_traits.obj        \
+    $(OBJ)$/i_typedef.obj       \
+    $(OBJ)$/i2s_calculator.obj  \
+    $(OBJ)$/ia_ce.obj           \
+    $(OBJ)$/ia_type.obj         \
+    $(OBJ)$/is_ce.obj           \
+    $(OBJ)$/is_type.obj         \
+    $(OBJ)$/it_builtin.obj      \
+    $(OBJ)$/it_ce.obj           \
+    $(OBJ)$/it_explicit.obj     \
+    $(OBJ)$/it_sequence.obj     \
+    $(OBJ)$/it_tplparam.obj     \
+    $(OBJ)$/it_xnameroom.obj
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
diff --git a/autodoc/source/ary/inc/cpp_internalgate.hxx b/autodoc/source/ary/inc/cpp_internalgate.hxx
new file mode 100644
index 000000000000..a2d4532c71ed
--- /dev/null
+++ b/autodoc/source/ary/inc/cpp_internalgate.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 ARY_CPP_INTERNALGATE_HXX
+#define ARY_CPP_INTERNALGATE_HXX
+
+// BASE CLASSES
+#include <ary/cpp/c_gate.hxx>
+
+namespace ary
+{
+    class RepositoryCenter;
+}
+
+
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+/** Provides access to the ->cpp::RepositoryPartition as far as is needed
+    by the ->RepositoryCenter.
+*/
+class InternalGate : public ::ary::cpp::Gate
+{
+  public:
+    virtual             ~InternalGate() {}
+
+    static DYN InternalGate &
+                        Create_Partition_(
+                            RepositoryCenter &  i_center );
+};
+
+
+
+
+}   //  namespace cpp
+}   //  namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/inc/cross_refs.hxx b/autodoc/source/ary/inc/cross_refs.hxx
new file mode 100644
index 000000000000..d07a629a4797
--- /dev/null
+++ b/autodoc/source/ary/inc/cross_refs.hxx
@@ -0,0 +1,101 @@
+/* -*- 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 ARY_CROSS_REFS_HXX
+#define ARY_CROSS_REFS_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include "sorted_idset.hxx"
+
+
+template <class VALUE_LIST, class TYPES>
+class CrossReferences
+{
+  public:
+    typedef TYPES::element_type         element;
+
+    /// Checks for double occurrences
+    void                Add(
+                            VALUE_LIST::index_type
+                                                i_nPosition
+                            const element &     i_rElem );
+    void                Get_List(
+                            Dyn_StdConstIterator<element> &
+                                                o_rResult ) const;
+  private:
+    SortedIdSet<TYPES>  aData[VALUE_LIST::max];
+};
+
+
+
+namespace ary
+{
+
+template <class TYPES>
+class SortedIdSet
+{
+  public:
+    typedef typename TYPES::element_type   element;
+    typedef typename TYPES::sort_type      sorter;
+    typedef typename TYPES::find_type      finder;
+
+                        SortedIdSet(
+                            const finder &      i_rFinder )
+                                                : aSorter(i_rFinder),
+                                                  aData(aSorter) {}
+                        ~SortedIdSet()          {}
+
+    void                Get_Begin(
+                            Dyn_StdConstIterator<element> &
+                                                o_rResult )
+                                                { o_rResult = new SCI_Set<FINDER>(aData); }
+    void                Add(
+                            const element &     i_rElement )
+                                                { aData.insert(i_rElement); }
+
+  private:
+    typedef std::set<element, sorter>       Set;
+
+    // DATA
+    sorter              aSorter;
+    Set                 aData;
+};
+
+
+}   // namespace ary
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/inc/idl_internalgate.hxx b/autodoc/source/ary/inc/idl_internalgate.hxx
new file mode 100644
index 000000000000..3f6daff5fa21
--- /dev/null
+++ b/autodoc/source/ary/inc/idl_internalgate.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 ARY_IDL_INTERNALGATE_HXX
+#define ARY_IDL_INTERNALGATE_HXX
+
+// BASE CLASSES
+#include <ary/idl/i_gate.hxx>
+
+namespace ary
+{
+    class RepositoryCenter;
+}
+
+
+
+
+namespace ary
+{
+namespace idl
+{
+
+
+/** Provides access to the ->idl::RepositoryPartition as far as is needed
+    by the ->RepositoryCenter.
+*/
+class InternalGate : public ::ary::idl::Gate
+{
+  public:
+    virtual             ~InternalGate() {}
+
+    static DYN InternalGate &
+                        Create_Partition_(
+                            RepositoryCenter &  i_center );
+};
+
+
+
+
+}   //  namespace idl
+}   //  namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/inc/idsort.hxx b/autodoc/source/ary/inc/idsort.hxx
new file mode 100644
index 000000000000..72dbbf0c6292
--- /dev/null
+++ b/autodoc/source/ary/inc/idsort.hxx
@@ -0,0 +1,55 @@
+/* -*- 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 ARY_IDSORT_HXX
+#define ARY_IDSORT_HXX
+
+
+/** A compare function that sorts ids of repository entities in the same
+    storage.
+
+    @see ::ary::SortedIds
+*/
+template<class COMPARE>
+struct IdSorter
+{
+    bool                operator()(
+                            typename COMPARE::id_type
+                                                i_1,
+                            typename COMPARE::id_type
+                                                i_2 ) const
+                            { return COMPARE::Lesser_(
+                                        COMPARE::KeyOf_(COMPARE::EntityOf_(i_1)),
+                                        COMPARE::KeyOf_(COMPARE::EntityOf_(i_2)) );
+                            }
+};
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/inc/loc_internalgate.hxx b/autodoc/source/ary/inc/loc_internalgate.hxx
new file mode 100644
index 000000000000..8e31de688344
--- /dev/null
+++ b/autodoc/source/ary/inc/loc_internalgate.hxx
@@ -0,0 +1,66 @@
+/* -*- 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 ARY_LOC_INTERNALGATE_HXX
+#define ARY_LOC_INTERNALGATE_HXX
+
+// USED SERVICES
+
+namespace ary
+{
+namespace loc
+{
+    class LocationPilot;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+/** Additional access to locations for the repository implementation.
+*/
+class InternalGate
+{
+  public:
+
+    static DYN LocationPilot &
+                        Create_Locations_();
+};
+
+
+}   // namespace loc
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/inc/nametreenode.hxx b/autodoc/source/ary/inc/nametreenode.hxx
new file mode 100644
index 000000000000..1865e886e3f7
--- /dev/null
+++ b/autodoc/source/ary/inc/nametreenode.hxx
@@ -0,0 +1,213 @@
+/* -*- 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 ARY_NAMETREENODE_HXX
+#define ARY_NAMETREENODE_HXX
+//  KORR_DEPRECATED_3.0
+//      Replace by ::ary::symtree::Node.
+
+// USED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <sci_impl.hxx>
+// HACK because of SunPro 5.2 compiler bug with templates:
+#include <ary/idl/i_module.hxx>
+
+
+
+
+namespace ary
+{
+
+
+/** Implementation of a node in a namespace-tree.
+*/
+template<class ITEM_ID>
+class NameTreeNode
+{
+  public:
+    typedef NameTreeNode                    self;
+    typedef ITEM_ID                         item_id;
+    typedef StringVector::const_iterator    name_iterator;
+    typedef std::map<String, item_id>       Map_LocalNames;
+
+    // LIFECYCLE
+                        NameTreeNode();
+                        NameTreeNode(
+                            const String &      i_sName,
+                            const self &        i_rParent,
+                            ITEM_ID             i_nParentId );
+    virtual             ~NameTreeNode();
+
+    // OPERATIONS
+    void                Add_Name(
+                            const String &      i_sName,
+                            item_id             i_nId );
+    // INQUIRY
+    const String &      Name() const            { return Depth() > 0 ? aCompleteNameChain.back() : String::Null_(); }
+    item_id             Parent() const          { return nParent; }
+    intt                Depth() const           { return aCompleteNameChain.size(); }
+
+    bool                IsEquivalent(
+                            const NameTreeNode &
+                                                i_rNode ) const;
+    name_iterator       NameChain_Begin() const { return aCompleteNameChain.begin(); }
+    name_iterator       NameChain_End() const   { return aCompleteNameChain.end(); }
+
+    item_id             Search_Name(
+                            const String &      i_sName ) const;
+    void                Get_Names(
+                            Dyn_StdConstIterator<ITEM_ID> &
+                                                o_rResult ) const;
+    const Map_LocalNames &
+                        LocalNames() const      { return aLocalNames; }
+  private:
+    // Locals
+    Map_LocalNames &    LocalNames()            { return aLocalNames; }
+
+    // DATA
+    Map_LocalNames      aLocalNames;
+    StringVector        aCompleteNameChain;
+    item_id             nParent;
+};
+
+
+
+
+// IMPLEMENTATION
+template<class ITEM_ID>
+NameTreeNode<ITEM_ID>::NameTreeNode()
+    :   aLocalNames(),
+        aCompleteNameChain(),
+        nParent(0)
+{
+}
+
+template<class ITEM_ID>
+NameTreeNode<ITEM_ID>::NameTreeNode( const String &      i_sName,
+                                     const self &        i_rParent,
+                                     ITEM_ID             i_nParentId )
+    :   aLocalNames(),
+        aCompleteNameChain(),
+        nParent(i_nParentId)
+{
+    aCompleteNameChain.reserve(i_rParent.Depth()+1);
+    for ( name_iterator it = i_rParent.NameChain_Begin();
+          it != i_rParent.NameChain_End();
+          ++it )
+    {
+        aCompleteNameChain.push_back(*it);
+    }
+    aCompleteNameChain.push_back(i_sName);
+}
+
+template<class ITEM_ID>
+NameTreeNode<ITEM_ID>::~NameTreeNode()
+{
+}
+
+
+template<class ITEM_ID>
+inline void
+NameTreeNode<ITEM_ID>::Add_Name( const String &      i_sName,
+                                 item_id             i_nId )
+{
+    LocalNames().insert( typename Map_LocalNames::value_type(i_sName, i_nId) );
+}
+
+
+template<class ITEM_ID>
+inline bool
+NameTreeNode<ITEM_ID>::IsEquivalent( const NameTreeNode & i_rNode ) const
+{
+    return aCompleteNameChain == i_rNode.aCompleteNameChain;
+}
+
+template<class ITEM_ID>
+inline ITEM_ID
+NameTreeNode<ITEM_ID>::Search_Name( const String & i_sName ) const
+{
+    return csv::value_from_map(LocalNames(),i_sName, ITEM_ID(0));
+}
+
+template<class ITEM_ID>
+inline void
+NameTreeNode<ITEM_ID>::Get_Names( Dyn_StdConstIterator<ITEM_ID> & o_rResult ) const
+{
+    o_rResult = new SCI_DataInMap<String,item_id>(LocalNames());
+}
+
+
+// HACK because of SunPro 5.2 compiler bug with templates:
+//   ary::idl::Module has to be "FIND_NODE::node_type"
+//   must be solved later somehow.
+template <class FIND_NODE>
+typename FIND_NODE::id_type
+Search_SubTree( const ary::idl::Module &    i_rStart,
+                const FIND_NODE &           i_rNodeFinder )
+{
+    const ary::idl::Module *
+        ret = &i_rStart;
+
+    for ( StringVector::const_iterator  it = i_rNodeFinder.Begin();
+          it != i_rNodeFinder.End() AND ret != 0;
+          ++it )
+    {
+        ret = i_rNodeFinder(ret->Search_Name(*it));
+    }
+
+    typename FIND_NODE::id_type nret(0);
+    return ret != 0
+            ?   ret->Search_Name(i_rNodeFinder.Name2Search())
+            :   nret;
+}
+
+template <class  FIND_NODE>
+typename FIND_NODE::id_type
+Search_SubTree_UpTillRoot( const ary::idl::Module &    i_rStart,
+                           const FIND_NODE &           i_rNodeFinder )
+{
+    typename FIND_NODE::id_type
+        ret(0);
+    for ( const ary::idl::Module * start = &i_rStart;
+          start != 0 AND NOT ret.IsValid();
+          start = i_rNodeFinder(start->Owner()) )
+    {
+        ret = Search_SubTree( *start,
+                              i_rNodeFinder );
+    }
+    return ret;
+}
+// END Hack for SunPro 5.2 compiler bug.
+
+
+
+
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/inc/reposy.hxx b/autodoc/source/ary/inc/reposy.hxx
new file mode 100644
index 000000000000..8668d2e47ef3
--- /dev/null
+++ b/autodoc/source/ary/inc/reposy.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 ARY_REPOSY_HXX
+#define ARY_REPOSY_HXX
+
+// BASE CLASSES
+#include <ary/ary.hxx>
+// USED SERVICES
+#include <cosv/ploc_dir.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class InternalGate;
+}
+namespace idl
+{
+    class InternalGate;
+}
+}   // namespace ary
+
+
+
+
+namespace ary
+{
+
+
+/** Implements ::ary::Repository.
+
+    @see Repository
+*/
+
+class RepositoryCenter : public ::ary::Repository
+{
+  public:
+    //  LIFECYCLE
+                        RepositoryCenter();
+    virtual             ~RepositoryCenter();
+
+    // INHERITED
+        // Interface Repository:
+    virtual const cpp::Gate &   Gate_Cpp() const;
+    virtual const idl::Gate &   Gate_Idl() const;
+    virtual const String &      Title() const;
+    virtual cpp::Gate &         Gate_Cpp();
+    virtual idl::Gate &         Gate_Idl();
+    virtual void                Set_Title(const String & i_sName );
+
+  private:
+    // DATA
+    String              sDisplayedName;     /// Name to be displayed for human users.
+    csv::ploc::Directory
+                        aLocation;
+    Dyn<cpp::InternalGate>
+                        pCppPartition;
+    Dyn<idl::InternalGate>
+                        pIdlPartition;
+};
+
+
+
+
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/inc/sci_impl.hxx b/autodoc/source/ary/inc/sci_impl.hxx
new file mode 100644
index 000000000000..491e356c58f9
--- /dev/null
+++ b/autodoc/source/ary/inc/sci_impl.hxx
@@ -0,0 +1,416 @@
+/* -*- 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 ARY_SCI_IMPL_HXX
+#define ARY_SCI_IMPL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/stdconstiter.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+
+
+//*************************     SCI_Vector      **********************************//
+
+template <class ELEM>
+class SCI_Vector : public StdConstIterator<ELEM>
+{
+  public:
+    typedef std::vector<ELEM>       source;
+    typedef typename source::const_iterator source_iterator;
+
+                        SCI_Vector(
+                            const source &      i_rSource  );
+    virtual             ~SCI_Vector();
+
+  private:
+    // Interface StdConstIterator<>:
+    virtual void        do_Advance();
+    virtual const ELEM *
+                        inq_CurElement() const;
+    virtual bool        inq_IsSorted() const;
+
+    // DATA
+    source_iterator     itRun;
+    source_iterator     itEnd;
+};
+
+
+
+//*************************     SCI_Map      **********************************//
+
+template <class KEY, class VALUE>
+class SCI_Map : public StdConstIterator< typename std::map<KEY,VALUE>::value_type >
+{
+  public:
+    typedef std::map<KEY,VALUE>     source;
+    typedef typename source::const_iterator source_iterator;
+
+                        SCI_Map(
+                            const source &      i_rSource  );
+    virtual             ~SCI_Map();
+
+  private:
+    // Interface StdConstIterator<>:
+    virtual void        do_Advance();
+    virtual const typename std::map<KEY,VALUE>::value_type *
+                        inq_CurElement() const;
+    virtual bool        inq_IsSorted() const;
+
+    // DATA
+    source_iterator     itRun;
+    source_iterator     itEnd;
+};
+
+
+//*************************     SCI_MultiMap      **********************************//
+
+template <class KEY, class VALUE>
+class SCI_MultiMap : public StdConstIterator< typename std::multimap<KEY,VALUE>::value_type >
+{
+  public:
+    typedef std::multimap<KEY,VALUE>    source;
+    typedef typename source::const_iterator      source_iterator;
+
+                        SCI_MultiMap(
+                            const source &      i_rSource  );
+                        SCI_MultiMap(
+                            source_iterator     i_begin,
+                            source_iterator     i_end );
+    virtual             ~SCI_MultiMap();
+
+  private:
+    // Interface StdConstIterator<>:
+    virtual void        do_Advance();
+    virtual const typename std::multimap<KEY,VALUE>::value_type *
+                        inq_CurElement() const;
+    virtual bool        inq_IsSorted() const;
+
+    // DATA
+    source_iterator     itRun;
+    source_iterator     itEnd;
+};
+
+
+
+//*************************     SCI_Set     **********************************//
+
+
+template <class TYPES>
+class SCI_Set : public StdConstIterator<typename TYPES::element_type>
+{
+  public:
+    typedef typename TYPES::element_type    element;
+    typedef typename TYPES::sort_type       sorter;
+    typedef std::set<element, sorter>       source;
+    typedef typename source::const_iterator source_iterator;
+
+                        SCI_Set(
+                            const source &      i_rSource  );
+    virtual             ~SCI_Set();
+
+  private:
+    // Interface StdConstIterator<>:
+    virtual void        do_Advance();
+    virtual const element *
+                        inq_CurElement() const;
+    virtual bool        inq_IsSorted() const;
+
+    // DATA
+    source_iterator     itRun;
+    source_iterator     itEnd;
+};
+
+//*************************     SCI_DataInMap    **********************************//
+
+template <class KEY, class VALUE>
+class SCI_DataInMap : public StdConstIterator<VALUE>
+{
+  public:
+    typedef std::map<KEY,VALUE>     source;
+    typedef typename source::const_iterator  source_iterator;
+
+                        SCI_DataInMap(
+                            const source &      i_rSource  );
+    virtual             ~SCI_DataInMap();
+
+  private:
+    // Interface StdConstIterator<>:
+    virtual void        do_Advance();
+    virtual const VALUE *
+                        inq_CurElement() const;
+    virtual bool        inq_IsSorted() const;
+
+    // DATA
+    source_iterator     itRun;
+    source_iterator     itEnd;
+};
+
+
+
+
+
+//********************************************************************//
+
+
+// IMPLEMENTATION
+
+template <class ELEM>
+SCI_Vector<ELEM>::SCI_Vector( const source & i_rSource  )
+    :   itRun(i_rSource.begin()),
+        itEnd(i_rSource.end())
+{
+}
+
+template <class ELEM>
+SCI_Vector<ELEM>::~SCI_Vector()
+{
+}
+
+
+template <class ELEM>
+void
+SCI_Vector<ELEM>::do_Advance()
+{
+    if (itRun != itEnd)
+        ++itRun;
+}
+
+template <class ELEM>
+const ELEM *
+SCI_Vector<ELEM>::inq_CurElement() const
+{
+    if (itRun != itEnd)
+        return &(*itRun);
+    return 0;
+}
+
+template <class ELEM>
+bool
+SCI_Vector<ELEM>::inq_IsSorted() const
+{
+    return false;
+}
+
+
+
+
+template <class KEY, class VALUE>
+SCI_Map<KEY,VALUE>::SCI_Map( const source & i_rSource  )
+    :   itRun(i_rSource.begin()),
+        itEnd(i_rSource.end())
+{
+}
+
+template <class KEY, class VALUE>
+SCI_Map<KEY,VALUE>::~SCI_Map()
+{
+}
+
+template <class KEY, class VALUE>
+void
+SCI_Map<KEY,VALUE>::do_Advance()
+{
+    if (itRun != itEnd)
+        ++itRun;
+}
+
+template <class KEY, class VALUE>
+const typename std::map<KEY,VALUE>::value_type *
+SCI_Map<KEY,VALUE>::inq_CurElement() const
+{
+    if (itRun != itEnd)
+        return &(*itRun);
+    return 0;
+}
+
+
+template <class KEY, class VALUE>
+bool
+SCI_Map<KEY,VALUE>::inq_IsSorted() const
+{
+    return true;
+}
+
+
+
+
+
+
+
+template <class KEY, class VALUE>
+SCI_MultiMap<KEY,VALUE>::SCI_MultiMap( const source & i_rSource  )
+    :   itRun(i_rSource.begin()),
+        itEnd(i_rSource.end())
+{
+}
+
+template <class KEY, class VALUE>
+SCI_MultiMap<KEY,VALUE>::SCI_MultiMap( source_iterator i_begin,
+                                       source_iterator i_end )
+    :   itRun(i_begin),
+        itEnd(i_end)
+{
+}
+
+template <class KEY, class VALUE>
+SCI_MultiMap<KEY,VALUE>::~SCI_MultiMap()
+{
+}
+
+template <class KEY, class VALUE>
+void
+SCI_MultiMap<KEY,VALUE>::do_Advance()
+{
+    if (itRun != itEnd)
+        ++itRun;
+}
+
+template <class KEY, class VALUE>
+const typename std::multimap<KEY,VALUE>::value_type *
+SCI_MultiMap<KEY,VALUE>::inq_CurElement() const
+{
+    if (itRun != itEnd)
+        return &(*itRun);
+    return 0;
+}
+
+
+template <class KEY, class VALUE>
+bool
+SCI_MultiMap<KEY,VALUE>::inq_IsSorted() const
+{
+    return true;
+}
+
+
+
+
+
+
+
+
+template <class ELEM>
+SCI_Set<ELEM>::SCI_Set( const source & i_rSource  )
+    :   itRun(i_rSource.begin()),
+        itEnd(i_rSource.end())
+{
+}
+
+template <class ELEM>
+SCI_Set<ELEM>::~SCI_Set()
+{
+}
+
+
+template <class ELEM>
+void
+SCI_Set<ELEM>::do_Advance()
+{
+    if (itRun != itEnd)
+        ++itRun;
+}
+
+template <class ELEM>
+const typename SCI_Set<ELEM>::element *
+SCI_Set<ELEM>::inq_CurElement() const
+{
+    if (itRun != itEnd)
+        return &(*itRun);
+    return 0;
+}
+
+template <class ELEM>
+bool
+SCI_Set<ELEM>::inq_IsSorted() const
+{
+    return true;
+}
+
+
+
+
+
+
+
+template <class KEY, class VALUE>
+SCI_DataInMap<KEY,VALUE>::SCI_DataInMap( const source & i_rSource  )
+    :   itRun(i_rSource.begin()),
+        itEnd(i_rSource.end())
+{
+}
+
+template <class KEY, class VALUE>
+SCI_DataInMap<KEY,VALUE>::~SCI_DataInMap()
+{
+}
+
+template <class KEY, class VALUE>
+void
+SCI_DataInMap<KEY,VALUE>::do_Advance()
+{
+    if (itRun != itEnd)
+        ++itRun;
+}
+
+template <class KEY, class VALUE>
+const VALUE *
+SCI_DataInMap<KEY,VALUE>::inq_CurElement() const
+{
+    if (itRun != itEnd)
+        return &(*itRun).second;
+    return 0;
+}
+
+
+template <class KEY, class VALUE>
+bool
+SCI_DataInMap<KEY,VALUE>::inq_IsSorted() const
+{
+    return true;
+}
+
+
+
+
+
+
+
+}   // namespace ary
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/inc/slots.hxx b/autodoc/source/ary/inc/slots.hxx
new file mode 100644
index 000000000000..bcba75defda9
--- /dev/null
+++ b/autodoc/source/ary/inc/slots.hxx
@@ -0,0 +1,166 @@
+/* -*- 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 ARY_SLOTS_HXX
+#define ARY_SLOTS_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/ceslot.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/ary_disp.hxx>
+#include <ary/types.hxx>
+#include <ary/sequentialids.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_slntry.hxx>
+
+
+
+namespace ary
+{
+
+
+class Slot_Null : public Slot
+{
+  public:
+    virtual             ~Slot_Null();
+
+    virtual void        StoreAt(
+                            Display &           o_rDestination ) const;
+    virtual uintt       Size() const;
+
+  private:
+    virtual void        StoreEntries(
+                            Display &           o_rDestination ) const;
+};
+
+class Slot_MapLocalCe : public Slot
+{
+  public:
+                        Slot_MapLocalCe(
+                            const cpp::Map_LocalCe & i_rData );
+    virtual             ~Slot_MapLocalCe();
+    virtual uintt       Size() const;
+
+  private:
+    virtual void        StoreEntries(
+                            Display &           o_rDestination ) const;
+    // DATA
+    const cpp::Map_LocalCe *
+                        pData;
+};
+
+class Slot_MapOperations : public Slot
+{
+  public:
+                        Slot_MapOperations(
+                            const std::multimap<String, cpp::Ce_id> &
+                                                i_rData );
+    virtual             ~Slot_MapOperations();
+    virtual uintt       Size() const;
+
+  private:
+    virtual void        StoreEntries(
+                            Display &           o_rDestination ) const;
+    // DATA
+    const std::multimap<String, cpp::Ce_id> *
+                        pData;
+};
+
+class Slot_ListLocalCe : public Slot
+{
+  public:
+                        Slot_ListLocalCe(
+                            const cpp::List_LocalCe &
+                                                i_rData );
+    virtual             ~Slot_ListLocalCe();
+
+    virtual uintt       Size() const;
+
+  private:
+    virtual void        StoreEntries(
+                            Display &           o_rDestination ) const;
+    // DATA
+    const cpp::List_LocalCe *
+                        pData;
+};
+
+template <class ID>
+class Slot_SequentialIds : public Slot
+{
+  public:
+                        Slot_SequentialIds(
+                            const SequentialIds<ID> &
+                                                i_rData )
+                            :   pData(&i_rData) {}
+    virtual             ~Slot_SequentialIds();
+
+    virtual uintt       Size() const;
+
+  private:
+    virtual void        StoreEntries(
+                            Display &           o_rDestination ) const;
+    // DATA
+    const SequentialIds<ID> *
+                        pData;
+};
+
+
+template <class ID>
+Slot_SequentialIds<ID>::~Slot_SequentialIds()
+{
+}
+
+template <class ID>
+uintt
+Slot_SequentialIds<ID>::Size() const
+{
+     return pData->Size();
+}
+
+template <class ID>
+void
+Slot_SequentialIds<ID>::StoreEntries( Display     & o_rDestination ) const
+{
+    for ( typename SequentialIds<ID>::const_iterator it = pData->Begin();
+          it != pData->End();
+          ++it )
+    {
+        o_rDestination.DisplaySlot_Rid( (*it).Value() );
+    }
+}
+
+
+
+
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/inc/sorted_idset.hxx b/autodoc/source/ary/inc/sorted_idset.hxx
new file mode 100644
index 000000000000..4113bfb3f47d
--- /dev/null
+++ b/autodoc/source/ary/inc/sorted_idset.hxx
@@ -0,0 +1,99 @@
+/* -*- 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 ARY_SORTED_IDSET_HXX
+#define ARY_SORTED_IDSET_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <set>
+    // PARAMETERS
+#include "csi_impl.hxx"
+
+
+template <class XY> class SortedIdSet;
+
+class Interface_2s
+{
+  public:
+    /// Checks for double occurrences
+    void                Add_ExportingService(
+                            Ce_id               i_nId );
+    void                Get_ExportingServices(
+                            Dyn_StdConstIterator<Ce_id> &
+                                                o_rResult ) const;
+  private:
+    Dyn<SortedIdSet>    pExportingServices;
+};
+
+
+
+namespace ary
+{
+
+template <class TYPES>
+class SortedIdSet
+{
+  public:
+    typedef typename TYPES::element_type   element;
+    typedef typename TYPES::sort_type      sorter;
+    typedef typename TYPES::find_type      finder;
+
+                        SortedIdSet(
+                            const finder &      i_rFinder )
+                                                : aSorter(i_rFinder),
+                                                  aData(aSorter) {}
+                        ~SortedIdSet()          {}
+
+    void                Get_Begin(
+                            Dyn_StdConstIterator<element> &
+                                                o_rResult )
+                                                { o_rResult = new SCI_Set<FINDER>(aData); }
+    void                Add(
+                            const element &     i_rElement )
+                                                { aData.insert(i_rElement); }
+
+  private:
+    typedef std::set<element, sorter>       Set;
+
+    // DATA
+    sorter              aSorter;
+    Set                 aData;
+};
+
+
+}   // namespace ary
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/inc/sortedids.hxx b/autodoc/source/ary/inc/sortedids.hxx
new file mode 100644
index 000000000000..508f3bc2e0cc
--- /dev/null
+++ b/autodoc/source/ary/inc/sortedids.hxx
@@ -0,0 +1,240 @@
+/* -*- 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 ARY_SORTEDIDS_HXX
+#define ARY_SORTEDIDS_HXX
+
+
+// USED SERVICES
+#include <algorithm>
+#include <cosv/tpl/range.hxx>
+
+
+
+
+namespace ary
+{
+
+
+/** Implementation of a set of children to an entity in the Autodoc
+    repository. The children are sorted.
+
+    @tpl COMPARE
+    Needs to provide types:
+        entity_base_type
+        id_type
+        key_type
+
+    and functions:
+        static entity_base_type &
+                        EntityOf_(
+                            id_type             i_id );
+        static const key_type &
+                        KeyOf_(
+                            const entity_type & i_entity );
+        static bool     Lesser_(
+                            const key_type &    i_1,
+                            const key_type &    i_2 );
+*/
+template<class COMPARE>
+class SortedIds
+{
+  public:
+    typedef typename COMPARE::id_type                   element_t;
+    typedef typename COMPARE::key_type                  key_t;
+    typedef std::vector<element_t>                      data_t;
+    typedef typename data_t::const_iterator             const_iterator;
+    typedef typename data_t::iterator                   iterator;
+    typedef csv::range<const_iterator>                  search_result_t;
+
+    // LIFECYCLE
+    explicit            SortedIds(
+                            std::size_t         i_reserve = 0 );
+                        ~SortedIds();
+
+    // OPERATIONS
+    void                Add(
+                            element_t           i_elem );
+    // INQUIRY
+    const_iterator      Begin() const;
+    const_iterator      End() const;
+
+    element_t           Search(
+                            const key_t &       i_key ) const;
+    search_result_t     SearchAll(
+                            const key_t &       i_key ) const;
+    const_iterator      LowerBound(
+                            const key_t &       i_key ) const;
+
+  private:
+    typedef typename COMPARE::entity_base_type      entity_t;
+
+    // Locals
+    iterator            LowerBound(
+                            const key_t &       i_key );
+
+    static const key_t  &
+                        KeyOf_(
+                            element_t           i_child );
+    template <class ITER>
+    static ITER         impl_LowerBound_(
+                            ITER                i_begin,
+                            ITER                i_end,
+                            const key_t &       i_key );
+
+    // DATA
+    data_t              aData;
+};
+
+
+
+
+// IMPLEMENTATION
+template<class COMPARE>
+inline const typename SortedIds<COMPARE>::key_t &
+SortedIds<COMPARE>::KeyOf_(element_t i_child)
+{
+    return COMPARE::KeyOf_(COMPARE::EntityOf_(i_child));
+}
+
+template<class COMPARE>
+SortedIds<COMPARE>::SortedIds(std::size_t i_reserve)
+    :   aData()
+{
+    if (i_reserve > 0)
+        aData.reserve(i_reserve);
+}
+
+template<class COMPARE>
+SortedIds<COMPARE>::~SortedIds()
+{
+}
+
+template<class COMPARE>
+void
+SortedIds<COMPARE>::Add(element_t i_elem)
+{
+    aData.insert(   LowerBound( KeyOf_(i_elem) ),
+                    i_elem );
+}
+
+template<class COMPARE>
+inline typename SortedIds<COMPARE>::const_iterator
+SortedIds<COMPARE>::Begin() const
+{
+    return aData.begin();
+}
+
+template<class COMPARE>
+inline typename SortedIds<COMPARE>::const_iterator
+SortedIds<COMPARE>::End() const
+{
+    return aData.end();
+}
+
+template<class COMPARE>
+typename SortedIds<COMPARE>::element_t
+SortedIds<COMPARE>::Search(const key_t & i_key) const
+{
+    const_iterator
+        ret = LowerBound(i_key);
+    return ret != aData.end() AND NOT COMPARE::Lesser_(i_key, KeyOf_(*ret))
+            ?   *ret
+            :   element_t(0);
+}
+
+template<class COMPARE>
+typename SortedIds<COMPARE>::search_result_t
+SortedIds<COMPARE>::SearchAll(const key_t & i_key) const
+{
+    const_iterator
+        r1 = LowerBound(i_key);
+    const_iterator
+        r2 = r1;
+    while (     r2 != aData.end()
+            AND NOT COMPARE::Lesser_(i_key, KeyOf_(*r2)) )
+    {
+        ++r2;
+    }
+
+    return csv::make_range(r1,r2);
+}
+
+template<class COMPARE>
+inline typename SortedIds<COMPARE>::const_iterator
+SortedIds<COMPARE>::LowerBound(const key_t & i_key) const
+{
+    return impl_LowerBound_( aData.begin(),
+                             aData.end(),
+                             i_key );
+}
+
+template<class COMPARE>
+inline typename SortedIds<COMPARE>::iterator
+SortedIds<COMPARE>::LowerBound(const key_t & i_key)
+{
+    return impl_LowerBound_( aData.begin(),
+                             aData.end(),
+                             i_key );
+}
+
+template<class COMPARE>
+template <class ITER>
+ITER
+SortedIds<COMPARE>::impl_LowerBound_( ITER            i_begin,
+                                      ITER            i_end,
+                                      const key_t &   i_key )
+{
+    ITER i1 = i_begin;
+    ITER i2 = i_end;
+
+    for ( ITER it = i1 + (i2-i1)/2;
+          i1 != i2;
+          it = i1 + (i2-i1)/2 )
+    {
+        if ( COMPARE::Lesser_(KeyOf_(*it), i_key) )
+        {
+            i1 = it;
+            ++i1;
+        }
+        else
+        {
+            i2 = it;
+        }
+    }   // end for
+
+    return i1;
+}
+
+
+
+
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/inc/store/s_base.hxx b/autodoc/source/ary/inc/store/s_base.hxx
new file mode 100644
index 000000000000..ebc2f8bafa5c
--- /dev/null
+++ b/autodoc/source/ary/inc/store/s_base.hxx
@@ -0,0 +1,183 @@
+/* -*- 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 ARY_STORE_S_BASE_HXX
+#define ARY_STORE_S_BASE_HXX
+
+// USED SERVICES
+#include <deque>
+#include <cosv/tpl/tpltools.hxx>
+
+
+
+
+namespace ary
+{
+namespace stg
+{
+
+
+/** The basic storage container of the repository.
+
+    @collab Storage
+    Implements Storage. Not used elsewhere.
+
+    @tpl ENTITY
+    The type of *it, where it is of type c_iter, has to be ENTITY * const.
+*/
+template <class ENTITY>
+class Base
+{
+  public:
+    // LIFECYCLE
+    typedef std::deque< ENTITY* >               impl_type;
+    typedef typename impl_type::const_iterator  c_iter;
+
+
+    /** @param i_nrOfReservedItems
+        The number of actual items to reserve, including the item
+        at index [0] that is always empty and unused.
+    */
+                        Base(
+                            uintt               i_nrOfReservedItems );
+                        ~Base();
+
+    // OPERATORS
+    ENTITY *            operator[](
+                            uintt               i_index ) const;
+    // OPERATIONS
+    uintt               Add_Entity(             /// @return the index of the new element.
+                            DYN ENTITY &        pass_newEntity );
+    DYN ENTITY *        Set_Entity(             /// @return the previous value.
+                            uintt               i_index,
+                            DYN ENTITY &        pass_newEntity );
+    // INQUIRY
+    uintt               Size() const;           /// Incl. reserved size.
+    uintt               ReservedSize() const;   /// Incl. zero for element at [0].
+
+    c_iter              Begin() const;          /// @return location of index 1, because 0 is always empty.
+    c_iter              BeginUnreserved() const;
+    c_iter              End() const;
+
+  private:
+    // DATA
+    impl_type               aData;
+    uintt                   nReservedSize;
+};
+
+
+
+// IMPLEMENTATION
+
+template <class ENTITY>
+Base<ENTITY>::Base(uintt i_nrOfReservedItems)
+    :   aData(i_nrOfReservedItems, 0),
+        nReservedSize(i_nrOfReservedItems)
+{
+}
+
+template <class ENTITY>
+Base<ENTITY>::~Base()
+{
+    csv::erase_container_of_heap_ptrs(aData);
+}
+
+
+template <class ENTITY>
+ENTITY *
+Base<ENTITY>::operator[](uintt i_index) const
+{
+    if (i_index < aData.size())
+        return aData[i_index];
+    return 0;
+}
+
+template <class ENTITY>
+uintt
+Base<ENTITY>::Add_Entity(DYN ENTITY & pass_newEntity)
+{
+    aData.push_back(&pass_newEntity);
+    return aData.size() - 1;
+}
+
+template <class ENTITY>
+DYN ENTITY *
+Base<ENTITY>::Set_Entity( uintt         i_index,
+                          DYN ENTITY &  pass_newEntity )
+{
+    csv_assert(i_index != 0 AND i_index < aData.size());
+
+    Dyn<ENTITY>
+        ret(aData[i_index]);
+    aData[i_index] = &pass_newEntity;
+    return ret.Release();
+}
+
+template <class ENTITY>
+uintt
+Base<ENTITY>::Size() const
+{
+    return aData.size();
+}
+
+template <class ENTITY>
+uintt
+Base<ENTITY>::ReservedSize() const
+{
+    return nReservedSize;
+}
+
+template <class ENTITY>
+typename Base<ENTITY>::c_iter
+Base<ENTITY>::Begin() const
+{
+    return aData.begin() + 1;
+}
+
+template <class ENTITY>
+typename Base<ENTITY>::c_iter
+Base<ENTITY>::BeginUnreserved() const
+{
+    return aData.begin() + nReservedSize;
+}
+
+template <class ENTITY>
+typename Base<ENTITY>::c_iter
+Base<ENTITY>::End() const
+{
+    return aData.end();
+}
+
+
+
+
+}   // namespace stg
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/inc/store/s_iterator.hxx b/autodoc/source/ary/inc/store/s_iterator.hxx
new file mode 100644
index 000000000000..fb5f0d9e0f76
--- /dev/null
+++ b/autodoc/source/ary/inc/store/s_iterator.hxx
@@ -0,0 +1,240 @@
+/* -*- 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 ARY_STORE_S_ITERATOR_HXX
+#define ARY_STORE_S_ITERATOR_HXX
+
+// USED SERVICES
+#include <ary/getncast.hxx>
+#include "s_base.hxx"
+
+
+
+
+namespace ary
+{
+namespace stg
+{
+
+
+template <class>        class const_iterator;
+template <class, class> class const_filter_iterator;
+
+
+/** A non-const iterator that runs on a ->Storage<>.
+
+    @collab Storage<>
+*/
+template <class ENTITY>
+class iterator : public std::iterator<std::forward_iterator_tag, ENTITY>
+{
+  public:
+    typedef iterator<ENTITY>                            self;
+    typedef typename Base<ENTITY>::impl_type            impl_container;
+    typedef typename impl_container::const_iterator     impl_type;
+
+    // OPERATORS
+                        iterator()
+                            :   itImpl()        {}
+    explicit            iterator(
+                            impl_type           i_impl)
+                            :   itImpl(i_impl)  {}
+                        ~iterator()             {}
+
+    bool                operator==(
+                            self                i_other ) const
+                                                { return itImpl == i_other.itImpl; }
+    bool                operator!=(
+                            self                i_other ) const
+                                                { return itImpl != i_other.itImpl; }
+    ENTITY &            operator*() const       { csv_assert(*itImpl != 0);
+                                                  return *(*itImpl); }
+    self &              operator++()            { ++itImpl; return *this; }
+    self                operator++(int)         { return self(itImpl++); }
+
+  private:
+    friend class const_iterator<ENTITY>;        // For const_iterator(iterator);
+    impl_type           ImplIterator() const    { return itImpl; }
+
+    // DATA
+    impl_type           itImpl;
+};
+
+
+/** A const iterator that runs on a ->Storage<>.
+
+    @collab Storage<>
+*/
+template <class ENTITY>
+class const_iterator :
+    public std::iterator<std::forward_iterator_tag, const ENTITY>
+{
+  public:
+    typedef const_iterator<ENTITY>                      self;
+    typedef typename Base<ENTITY>::impl_type            impl_container;
+    typedef typename impl_container::const_iterator     impl_type;
+
+    // OPERATORS
+                        const_iterator()
+                            :   itImpl()        {}
+    explicit            const_iterator(
+                            impl_type           i_impl)
+                            :   itImpl(i_impl)  {}
+                        const_iterator(         // implicit conversions allowed
+                            ::ary::stg::iterator<ENTITY>    i_it )
+                            :   itImpl(i_it.ImplIterator()) {}
+                        ~const_iterator()       {}
+
+    bool                operator==(
+                            self                i_other ) const
+                                                { return itImpl == i_other.itImpl; }
+    bool                operator!=(
+                            self                i_other ) const
+                                                { return itImpl != i_other.itImpl; }
+    const ENTITY &      operator*() const       { csv_assert(*itImpl != 0);
+                                                  return *(*itImpl); }
+    self &              operator++()            { ++itImpl; return *this; }
+    self                operator++(int)         { return self(itImpl++); }
+
+  private:
+    // DATA
+    impl_type           itImpl;
+};
+
+
+
+
+
+/** A non const iterator that runs on a ->Storage<> and returns only
+    the elements of a specific type.
+
+    @tpl ENTITY
+    The element type of the ->Storage<>
+
+    @tpl FILTER
+    The actual type of the returned items. FILTER needs to be derived from
+    ENTITY.
+
+    @collab Storage<>
+*/
+template <class ENTITY, class FILTER>
+class filter_iterator :
+    public std::iterator<std::forward_iterator_tag, FILTER>
+{
+  public:
+    typedef filter_iterator<ENTITY,FILTER>              self;
+    typedef ::ary::stg::iterator<ENTITY>                impl_type;
+
+    // OPERATORS
+                        filter_iterator()
+                            :   itCur()         {}
+    explicit            filter_iterator(
+                            impl_type           i_cur )
+                            :   itCur(i_cur)    {}
+                        ~filter_iterator()      {}
+
+    bool                operator==(
+                            self                i_other ) const
+                                                { return itCur == i_other.itCur; }
+    bool                operator!=(
+                            self                i_other ) const
+                                                { return itCur != i_other.itCur; }
+    FILTER &            operator*() const       { csv_assert(IsValid());
+                                                  return static_cast< FILTER& >(*itCur); }
+    self &              operator++()            { ++itCur;
+                                                  return *this; }
+    self                operator++(int)         { return self(itCur++); }
+    bool                IsValid() const         { return ary::is_type<FILTER>(*itCur); }
+
+  private:
+    friend class const_filter_iterator<ENTITY,FILTER>;  // For const_filter_iterator(filter_iterator);
+    impl_type           ImplCur() const         { return itCur; }
+
+    // DATA
+    impl_type           itCur;
+};
+
+
+/** A const iterator that runs on a ->Storage<> and returns only
+    the elements of a specific type.
+
+    @tpl ENTITY
+    The element type of the ->Storage<>
+
+    @tpl FILTER
+    The actual type of the returned items. FILTER needs to be derived from
+    ENTITY.
+
+    @collab Storage<>
+*/
+template <class ENTITY, class FILTER>
+class const_filter_iterator :
+    public std::iterator<std::forward_iterator_tag, const FILTER>
+{
+  public:
+    typedef const_filter_iterator<ENTITY,FILTER>        self;
+    typedef ::ary::stg::const_iterator<ENTITY>          impl_type;
+
+    // OPERATORS
+                        const_filter_iterator()
+                            :   itCur()         {}
+    explicit            const_filter_iterator(
+                            impl_type           i_cur )
+                            :   itCur(i_cur)    {}
+    explicit            const_filter_iterator(  // implicit conversions allowed
+                            filter_iterator<ENTITY,FILTER>
+                                                i_it )
+                            :   itCur(i_it.ImplCur())   {}
+                        ~const_filter_iterator()
+                                                {}
+    bool                operator==(
+                            self                i_other ) const
+                                                { return itCur == i_other.itCur; }
+    bool                operator!=(
+                            self                i_other ) const
+                                                { return itCur != i_other.itCur; }
+    const FILTER &      operator*() const       { csv_assert(IsValid());
+                                                  return static_cast< const FILTER& >(*itCur); }
+    self &              operator++()            { ++itCur;
+                                                  return *this; }
+    self                operator++(int)         { return self(itCur++); }
+    bool                IsValid() const         { return ary::is_type<FILTER>(*itCur); }
+
+  private:
+    // DATA
+    impl_type           itCur;
+};
+
+
+
+
+}   // namespace stg
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/inc/store/s_storage.hxx b/autodoc/source/ary/inc/store/s_storage.hxx
new file mode 100644
index 000000000000..0b02e1a2cd53
--- /dev/null
+++ b/autodoc/source/ary/inc/store/s_storage.hxx
@@ -0,0 +1,297 @@
+/* -*- 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 ARY_STORE_S_STORAGE_HXX
+#define ARY_STORE_S_STORAGE_HXX
+
+// USED SERVICES
+#include <ary/types.hxx>
+#include "s_iterator.hxx"
+
+
+
+
+namespace ary
+{
+namespace stg
+{
+
+
+/** The storage unit of one class of commomly stored repository
+    entities.
+*/
+template <class ENTITY>
+class Storage
+{
+  public:
+    typedef Base<ENTITY>                        container_type;
+    typedef ary::TypedId<ENTITY>                key_type;
+    typedef stg::const_iterator<ENTITY>         c_iter;
+    typedef stg::iterator<ENTITY>               iter;
+
+    // LIFECYCLE
+    virtual             ~Storage() {}
+
+    // OPERATORS
+    const ENTITY &      operator[](
+                            key_type            i_id ) const;
+    ENTITY &            operator[](
+                            key_type            i_id );
+    const ENTITY &      operator[](
+                            Rid                 i_index ) const;
+    ENTITY &            operator[](
+                            Rid                 i_index );
+    // OPERATIONS
+    /// Sets the id of the new entity.
+    key_type            Store_Entity(
+                            DYN ENTITY &        pass_newEntity );
+    /// Sets the id of the new entity.
+    void                Set_Reserved(
+                            uintt               i_index,
+                            DYN ENTITY &        pass_newEntity );
+    /// Sets the id of the new entity.
+    void                Replace_Entity(
+                            key_type            i_index,
+                            DYN ENTITY &        pass_newEntity );
+    // INQUIRY
+    bool                Exists(
+                            key_type            i_id ) const;
+    bool                Exists(
+                            Rid                 i_index ) const;
+
+    c_iter              Begin() const;
+    c_iter              BeginUnreserved() const;
+    c_iter              End() const;
+
+    // ACCESS
+    iter                Begin();
+    iter                BeginUnreserved();
+    iter                End();
+
+  protected:
+                        Storage(
+                            uintt               i_nrOfReservedItems );
+  private:
+    // DATA
+    container_type      aData;
+};
+
+
+
+
+
+
+// IMPLEMENTATION
+
+// Used later, so implemented first.
+template <class ENTITY>
+inline bool
+Storage<ENTITY>::Exists(Rid i_index) const
+{
+    return 0 < i_index AND i_index < aData.Size();
+}
+
+template <class ENTITY>
+inline bool
+Storage<ENTITY>::Exists(key_type i_id) const
+{
+    return Exists(i_id.Value());
+}
+
+template <class ENTITY>
+inline const ENTITY &
+Storage<ENTITY>::operator[](Rid i_index) const
+{
+    csv_assert(Exists(i_index));
+    return * aData[i_index];
+}
+
+template <class ENTITY>
+inline ENTITY &
+Storage<ENTITY>::operator[](Rid i_index)
+{
+    csv_assert(Exists(i_index));
+    return * aData[i_index];
+}
+
+template <class ENTITY>
+inline const ENTITY &
+Storage<ENTITY>::operator[](key_type i_id) const
+{
+    return operator[](i_id.Value());
+}
+
+template <class ENTITY>
+inline ENTITY &
+Storage<ENTITY>::operator[](key_type i_id)
+{
+    return operator[](i_id.Value());
+}
+
+template <class ENTITY>
+typename Storage<ENTITY>::key_type
+Storage<ENTITY>::Store_Entity(DYN ENTITY & pass_newEntity)
+{
+    csv_assert( aData.Size() >= aData.ReservedSize() );
+    Rid
+        ret( aData.Add_Entity(pass_newEntity) );
+    pass_newEntity.Set_Id(ret);
+    return key_type(ret);
+}
+
+template <class ENTITY>
+void
+Storage<ENTITY>::Set_Reserved(uintt           i_index,
+                              DYN ENTITY &    pass_newEntity)
+{
+    // 0 must not be used.
+    csv_assert( i_index != 0 );
+    // Make sure, i_index actually is the id of a reserved item.
+    csv_assert( i_index < aData.ReservedSize() );
+
+    // If there was a previous entity, it will be deleted by
+    // the destructor of pOldEntity.
+    Dyn<ENTITY>
+        pOldEntity(aData.Set_Entity(i_index, pass_newEntity));
+    pass_newEntity.Set_Id(i_index);
+}
+
+template <class ENTITY>
+void
+Storage<ENTITY>::Replace_Entity( key_type       i_index,
+                                 DYN ENTITY &   pass_newEntity )
+{
+    uintt
+        nIndex = i_index.Value();
+    // Make sure, i_index actually is the id of an existing,
+    // non reserved entity.
+    csv_assert( csv::in_range(aData.ReservedSize(), nIndex, aData.Size()) );
+
+    // If there was a previous entity, it will be deleted by
+    // the destructor of pOldEntity.
+    Dyn<ENTITY>
+        pOldEntity(aData.Set_Entity(nIndex, pass_newEntity));
+    pass_newEntity.Set_Id(nIndex);
+}
+
+template <class ENTITY>
+inline
+typename Storage<ENTITY>::c_iter
+Storage<ENTITY>::Begin() const
+{
+    return c_iter(aData.Begin());
+}
+
+template <class ENTITY>
+inline
+typename Storage<ENTITY>::c_iter
+Storage<ENTITY>::BeginUnreserved() const
+{
+    return c_iter(aData.BeginUnreserved());
+}
+
+template <class ENTITY>
+inline
+typename Storage<ENTITY>::c_iter
+Storage<ENTITY>::End() const
+{
+    return c_iter(aData.End());
+}
+
+template <class ENTITY>
+inline
+typename Storage<ENTITY>::iter
+Storage<ENTITY>::Begin()
+{
+    return iter(aData.Begin());
+}
+
+template <class ENTITY>
+inline
+typename Storage<ENTITY>::iter
+Storage<ENTITY>::BeginUnreserved()
+{
+    return iter(aData.BeginUnreserved());
+}
+
+template <class ENTITY>
+inline
+typename Storage<ENTITY>::iter
+Storage<ENTITY>::End()
+{
+    return iter(aData.End());
+}
+
+template <class ENTITY>
+inline
+Storage<ENTITY>::Storage(uintt i_nrOfReservedItems)
+    :   aData(i_nrOfReservedItems)
+{
+    // Make sure Rid and uintt are the same type, because
+    // the interface of this uses Rid, but the interface of
+    // container_type uses uintt.
+    csv_assert( sizeof(uintt) == sizeof(Rid) );
+}
+
+
+
+
+// HELPER FUNCTIONS
+
+/** @return 0, if data are not there.
+*/
+template <class ENTITY>
+inline const ENTITY *
+Search( const Storage<ENTITY> &     i_storage,
+        Rid                         i_id )
+{
+    if (NOT i_storage.Exists(i_id))
+        return 0;
+    return &i_storage[i_id];
+}
+
+/** @return 0, if data are not there.
+*/
+template <class ENTITY>
+inline ENTITY *
+SearchAccess( const Storage<ENTITY> &   i_storage,
+              Rid                       i_id )
+{
+    if (NOT i_storage.Exists(i_id))
+        return 0;
+    return &i_storage[i_id];
+}
+
+
+
+
+}   // namespace stg
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/inc/traits_impl.hxx b/autodoc/source/ary/inc/traits_impl.hxx
new file mode 100644
index 000000000000..b7ac789e486b
--- /dev/null
+++ b/autodoc/source/ary/inc/traits_impl.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 ARY_TRAITS_IMPL_HXX
+#define ARY_TRAITS_IMPL_HXX
+
+
+// USED SERVICES
+#include <ary/getncast.hxx>
+
+
+namespace ary
+{
+namespace traits
+{
+
+
+/** Finds the node assigned to an entity, if that entity has a specific
+    actual type.
+
+    @tpl NODE
+    The assumed actual type of io_node.
+*/
+template<class NODE>
+const typename NODE::node_t *
+                    NodeOf(
+                        const typename NODE::traits_t::entity_base_type &
+                                                io_node );
+
+/** Finds the node assigned to an entity, if that entity has a specific
+    actual type.
+
+    @tpl NODE
+    The assumed actual type of io_node.
+*/
+template<class NODE>
+typename NODE::node_t *
+                    NodeOf(
+                        typename NODE::traits_t::entity_base_type &
+                                                io_node );
+
+/** Finds a child to a node.
+*/
+template<class NODE, class KEY>
+typename NODE::traits_t::id_type
+                    Search_Child(
+                        const typename NODE::traits_t::entity_base_type &
+                                                i_node,
+                        const KEY &             i_localKey );
+
+
+
+
+// IMPLEMENTATION
+
+template<class NODE>
+const typename NODE::node_t *
+NodeOf(const typename NODE::traits_t::entity_base_type & io_node)
+{
+    const NODE *
+        pn = ary_cast<NODE>(&io_node);
+    if (pn != 0)
+        return & pn->AsNode();
+    return 0;
+}
+
+template<class NODE>
+typename NODE::node_t *
+NodeOf(typename NODE::traits_t::entity_base_type & io_node)
+{
+    NODE *
+        pn = ary_cast<NODE>(&io_node);
+    if (pn != 0)
+        return & pn->AsNode();
+    return 0;
+}
+
+template<class NODE, class KEY>
+typename NODE::traits_t::id_type
+Search_Child( const typename NODE::traits_t::entity_base_type & i_node,
+              const KEY &                                       i_localKey )
+{
+    const NODE *
+        pn = ary_cast<NODE>(&i_node);
+    if (pn != 0)
+        return pn->Search_Child(i_localKey);
+    return typename NODE::traits_t::id_type(0);
+}
+
+
+
+
+}   // namespace traits
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/info/all_dts.cxx b/autodoc/source/ary/info/all_dts.cxx
new file mode 100644
index 000000000000..a21eddc53dff
--- /dev/null
+++ b/autodoc/source/ary/info/all_dts.cxx
@@ -0,0 +1,107 @@
+/* -*- 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 <precomp.h>
+#include <ary/info/all_dts.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/info/infodisp.hxx>
+
+
+namespace ary
+{
+namespace info
+{
+
+
+void
+DT_Text::do_StoreAt( DocuDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_DT_Text(*this);
+}
+
+bool
+DT_Text::inq_IsWhite() const
+{
+     return false;
+}
+
+void
+DT_MaybeLink::do_StoreAt( DocuDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_DT_MaybeLink(*this);
+}
+
+bool
+DT_MaybeLink::inq_IsWhite() const
+{
+     return false;
+}
+
+void
+DT_Whitespace::do_StoreAt( DocuDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_DT_Whitespace(*this);
+}
+
+bool
+DT_Whitespace::inq_IsWhite() const
+{
+     return true;
+}
+
+void
+DT_Eol::do_StoreAt( DocuDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_DT_Eol(*this);
+}
+
+bool
+DT_Eol::inq_IsWhite() const
+{
+     return true;
+}
+
+void
+DT_Xml::do_StoreAt( DocuDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_DT_Xml(*this);
+}
+
+bool
+DT_Xml::inq_IsWhite() const
+{
+     return false;
+}
+
+
+}   // namespace info
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/info/all_tags.cxx b/autodoc/source/ary/info/all_tags.cxx
new file mode 100644
index 000000000000..5699efc5bd0f
--- /dev/null
+++ b/autodoc/source/ary/info/all_tags.cxx
@@ -0,0 +1,571 @@
+/* -*- 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 <precomp.h>
+#include <ary/info/all_tags.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <limits>
+#include <ary/info/infodisp.hxx>
+#include <adc_cl.hxx>
+
+
+namespace ary
+{
+namespace info
+{
+
+
+
+//*****************************     StdTag      ***********************//
+
+
+StdTag::StdTag( E_AtTagId i_eId )
+    :   eId(i_eId),
+        // aText,
+        pNext(0)
+{
+}
+
+bool
+StdTag::Add_SpecialMeaningToken( const char *   ,
+                                 intt           )
+{
+    // Does nothing
+
+    // KORR_FUTURE
+    //   Should be a logical exception:
+    // csv_assert(false);
+    return false;
+}
+
+UINT8
+StdTag::NrOfSpecialMeaningTokens() const
+{
+    return 0;
+}
+
+AtTag *
+StdTag::GetFollower()
+{
+    if (pNext != 0)
+        return pNext->GetFollower();
+    pNext = new StdTag(eId);
+    return pNext;
+}
+
+void
+StdTag::do_StoreAt( DocuDisplay &  o_rDisplay ) const
+{
+    o_rDisplay.Display_StdTag( *this );
+}
+
+DocuText *
+StdTag::Text()
+{
+    return &aText;
+}
+
+
+
+//*****************************     BaseTag     ***********************//
+
+BaseTag::BaseTag()
+    :   // sBase
+        // aText
+        pNext(0)
+{
+}
+
+bool
+BaseTag::Add_SpecialMeaningToken( const char *      i_sText,
+                                  intt              i_nNr )
+{
+    if ( i_nNr == 1 )
+    {
+        sBase.AssignText(i_sText,"::");
+        return true;
+    }
+    return false;
+}
+
+const char *
+BaseTag::Title() const
+{
+    return "Base Classes";
+}
+
+UINT8
+BaseTag::NrOfSpecialMeaningTokens() const
+{
+    return 1;
+}
+
+AtTag *
+BaseTag::GetFollower()
+{
+    if (pNext != 0)
+        return pNext->GetFollower();
+    pNext = new BaseTag;
+    return pNext;
+}
+
+DocuText *
+BaseTag::Text()
+{
+    return &aText;
+}
+
+
+
+//*****************************     ExceptionTag    ***********************//
+
+ExceptionTag::ExceptionTag()
+    :   // sException,
+        // aText
+        pNext(0)
+{
+}
+
+bool
+ExceptionTag::Add_SpecialMeaningToken( const char *     i_sText,
+                                       intt             i_nNr )
+{
+    if ( i_nNr == 1 )
+    {
+        sException.AssignText(i_sText,"::");
+        return true;
+    }
+    return false;
+}
+
+const char *
+ExceptionTag::Title() const
+{
+    return "Thrown Exceptions";
+}
+
+UINT8
+ExceptionTag::NrOfSpecialMeaningTokens() const
+{
+    return 1;
+}
+
+AtTag *
+ExceptionTag::GetFollower()
+{
+    if (pNext != 0)
+        return pNext->GetFollower();
+    pNext = new ExceptionTag;
+    return pNext;
+}
+
+DocuText *
+ExceptionTag::Text()
+{
+    return &aText;
+}
+
+
+//*****************************     ImplementsTag   ***********************//
+
+ImplementsTag::ImplementsTag()
+    :   // sBase
+        // aText
+        pNext(0)
+{
+}
+
+bool
+ImplementsTag::Add_SpecialMeaningToken( const char *        i_sText,
+                                        intt                i_nNr )
+{
+    if ( i_nNr == 1 )
+    {
+        sName.AssignText(i_sText,"::");
+    }
+    else
+    {
+        GetFollower()->Add_SpecialMeaningToken(i_sText,1);
+    }
+    return true;
+}
+
+const char *
+ImplementsTag::Title() const
+{
+    return "Implements";
+}
+
+UINT8
+ImplementsTag::NrOfSpecialMeaningTokens() const
+{
+    return std::numeric_limits<UINT8>::max();
+}
+
+AtTag *
+ImplementsTag::GetFollower()
+{
+    if (pNext != 0)
+        return pNext->GetFollower();
+    pNext = new ImplementsTag;
+    return pNext;
+}
+
+DocuText *
+ImplementsTag::Text()
+{
+    return 0;
+}
+
+
+//*****************************     KeywordTag      ***********************//
+
+
+KeywordTag::KeywordTag()
+//  :   sKeys
+{
+}
+
+bool
+KeywordTag::Add_SpecialMeaningToken( const char *       i_sText,
+                                     intt               )
+{
+    sKeys.push_back(i_sText);
+    return true;
+}
+
+const char *
+KeywordTag::Title() const
+{
+    return "Keywords";
+}
+
+UINT8
+KeywordTag::NrOfSpecialMeaningTokens() const
+{
+    return std::numeric_limits<UINT8>::max();
+}
+
+AtTag *
+KeywordTag::GetFollower()
+{
+    return this;
+}
+
+DocuText *
+KeywordTag::Text()
+{
+    return 0;
+}
+
+
+
+//*****************************     ParameterTag    ***********************//
+
+
+ParameterTag::ParameterTag()
+    :   // sName
+        // aText
+        pNext(0)
+{
+}
+
+bool
+ParameterTag::Add_SpecialMeaningToken( const char *     i_sText,
+                                       intt             i_nNr )
+{
+    if ( i_nNr == 1 )
+    {
+        sName = i_sText;
+        return true;
+    }
+    else if (i_nNr == 2)
+    {
+        uintt nLen = strlen(i_sText);
+        if (*i_sText == '[' AND i_sText[nLen-1] == ']')
+        {
+            sValidRange = String(i_sText+1, nLen-2);
+            return true;
+        }
+    }
+    return false;
+}
+
+UINT8
+ParameterTag::NrOfSpecialMeaningTokens() const
+{
+    return 2;
+}
+
+AtTag *
+ParameterTag::GetFollower()
+{
+    if (pNext != 0)
+        return pNext->GetFollower();
+    return  pNext = new ParameterTag;
+}
+
+DocuText *
+ParameterTag::Text()
+{
+    return &aText;
+}
+
+void
+ParameterTag::do_StoreAt( DocuDisplay &  o_rDisplay ) const
+{
+    o_rDisplay.Display_ParameterTag( *this );
+}
+
+
+
+//*****************************     SeeTag          ***********************//
+
+
+
+SeeTag::SeeTag()
+//  :   sReferences
+{
+}
+
+bool
+SeeTag::Add_SpecialMeaningToken( const char *       i_sText,
+                                 intt               )
+{
+    static QualifiedName aNull_;
+    sReferences.push_back(aNull_);
+    sReferences.back().AssignText(i_sText,"::");
+
+    return true;
+}
+
+const char *
+SeeTag::Title() const
+{
+    return "See Also";
+}
+
+UINT8
+SeeTag::NrOfSpecialMeaningTokens() const
+{
+    return std::numeric_limits<UINT8>::max();
+}
+
+AtTag *
+SeeTag::GetFollower()
+{
+    return this;
+}
+
+void
+SeeTag::do_StoreAt( DocuDisplay &  o_rDisplay ) const
+{
+    o_rDisplay.Display_SeeTag( *this );
+}
+
+DocuText *
+SeeTag::Text()
+{
+    return 0;
+}
+
+
+
+//*****************************     TemplateTag     ***********************//
+
+
+TemplateTag::TemplateTag()
+    :   // sName
+        // aText
+        pNext(0)
+{
+}
+
+bool
+TemplateTag::Add_SpecialMeaningToken( const char *      i_sText,
+                                       intt             i_nNr )
+{
+    if ( i_nNr == 1 )
+    {
+        sName = i_sText;
+        return true;
+    }
+    return false;
+}
+
+const char *
+TemplateTag::Title() const
+{
+    return "Template Parameters";
+}
+
+UINT8
+TemplateTag::NrOfSpecialMeaningTokens() const
+{
+    return 1;
+}
+
+AtTag *
+TemplateTag::GetFollower()
+{
+    if (pNext != 0)
+        return pNext->GetFollower();
+    return  pNext = new TemplateTag;
+}
+
+void
+TemplateTag::do_StoreAt( DocuDisplay &  o_rDisplay ) const
+{
+    o_rDisplay.Display_TemplateTag( *this );
+}
+
+
+DocuText *
+TemplateTag::Text()
+{
+    return &aText;
+}
+
+
+//*****************************     LabelTag        ***********************//
+
+
+
+LabelTag::LabelTag()
+    :   sLabel()
+{
+}
+
+bool
+LabelTag::Add_SpecialMeaningToken( const char *     i_sText,
+                                   intt             i_nNr )
+{
+    if ( i_nNr == 1 AND sLabel.length() == 0 )
+    {
+        sLabel = i_sText;
+        return true;
+    }
+    // KORR_FUTURE
+//  else    // Throw exception because of double label.
+    return false;
+}
+
+const char *
+LabelTag::Title() const
+{
+    return "Label";
+}
+
+UINT8
+LabelTag::NrOfSpecialMeaningTokens() const
+{
+    return 1;
+}
+
+AtTag *
+LabelTag::GetFollower()
+{
+    return this;
+}
+
+DocuText *
+LabelTag::Text()
+{
+    return 0;
+}
+
+
+//*****************************     SinceTag        ***********************//
+
+SinceTag::SinceTag()
+    :   sVersion()
+{
+}
+
+bool
+SinceTag::Add_SpecialMeaningToken( const char *     i_sText,
+                                   intt             )
+{
+    const char cCiphersend = '9' + 1;
+    if ( sVersion.empty()
+         AND NOT csv::in_range('0', *i_sText, cCiphersend)
+         AND autodoc::CommandLine::Get_().DoesTransform_SinceTag() )
+    {
+        return true;
+    }
+
+    if (sVersion.empty())
+    {
+        sVersion = i_sText;
+    }
+    else
+    {
+        StreamLock sHelp(100);
+        sVersion = sHelp() << sVersion << " " << i_sText << c_str;
+    }
+
+    return true;
+}
+
+const char *
+SinceTag::Title() const
+{
+    return "Label";
+}
+
+UINT8
+SinceTag::NrOfSpecialMeaningTokens() const
+{
+    return UINT8(-1);
+}
+
+AtTag *
+SinceTag::GetFollower()
+{
+    return this;
+}
+
+void
+SinceTag::do_StoreAt( DocuDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_SinceTag( *this );
+}
+
+DocuText *
+SinceTag::Text()
+{
+    return 0;
+}
+
+
+}   // namespace info
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/info/ci_attag.cxx b/autodoc/source/ary/info/ci_attag.cxx
new file mode 100644
index 000000000000..73da1bebe9df
--- /dev/null
+++ b/autodoc/source/ary/info/ci_attag.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/info/ci_attag.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/info/all_dts.hxx>
+#include <ary/info/ci_text.hxx>
+
+
+namespace ary
+{
+namespace info
+{
+
+void
+AtTag::Set_HtmlUseInDocuText( bool i_bUseIt )
+{
+    DocuText * pText = Text();
+    if ( pText != 0 )
+        pText->Set_HtmlUse(i_bUseIt);
+}
+
+void
+AtTag::Add_Token( const char * i_sText )
+{
+    DocuText * pText = Text();
+    if (pText != 0)
+        pText->Add_Token( *new DT_Text(i_sText) );
+}
+
+void
+AtTag::Add_PotentialLink( const char *  i_sText,
+                          bool          i_bIsGlobal,
+                          bool          i_bIsFunction )
+{
+    DocuText * pText = Text();
+    if (pText != 0)
+        pText->Add_Token( *new DT_MaybeLink(i_sText, i_bIsGlobal, i_bIsFunction) );
+}
+
+void
+AtTag::Add_Whitespace( UINT8 i_nLength )
+{
+    DocuText * pText = Text();
+    if (pText != 0)
+        pText->Add_Token( *new DT_Whitespace(i_nLength) );
+}
+
+void
+AtTag::Add_Eol()
+{
+    DocuText * pText = Text();
+    if (pText != 0)
+        pText->Add_Token( *new DT_Eol );
+}
+
+void
+AtTag::do_StoreAt( DocuDisplay &  ) const
+{
+    // Dummy
+}
+
+}   // namespace info
+}   // namespace ary
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/info/ci_text.cxx b/autodoc/source/ary/info/ci_text.cxx
new file mode 100644
index 000000000000..bf4aa5e7a362
--- /dev/null
+++ b/autodoc/source/ary/info/ci_text.cxx
@@ -0,0 +1,73 @@
+/* -*- 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 <precomp.h>
+#include <ary/info/ci_text.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/info/all_dts.hxx>
+
+
+namespace ary
+{
+namespace info
+{
+
+DocuText::DocuText()
+    :   bUsesHtml(false)
+{
+}
+
+DocuText::~DocuText()
+{
+    for ( TokenList::iterator iter = aTokens.begin();
+          iter != aTokens.end();
+          ++iter )
+    {
+        delete (*iter);
+    }
+}
+
+void
+DocuText::StoreAt( DocuDisplay & o_rDisplay ) const
+{
+    ary::info::DocuText::TokenList::const_iterator itEnd = aTokens.end();
+    for ( ary::info::DocuText::TokenList::const_iterator it = aTokens.begin();
+          it != itEnd;
+          ++it )
+    {
+        (*it)->StoreAt(o_rDisplay);
+    }
+}
+
+}   // namespace info
+}   // namespace ary
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/info/makefile.mk b/autodoc/source/ary/info/makefile.mk
new file mode 100644
index 000000000000..0c507ba3f4fe
--- /dev/null
+++ b/autodoc/source/ary/info/makefile.mk
@@ -0,0 +1,60 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=ary_info
+
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/all_dts.obj		\
+    $(OBJ)$/all_tags.obj	\
+    $(OBJ)$/ci_attag.obj	\
+    $(OBJ)$/ci_text.obj
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/ary/kernel/ary_disp.cxx b/autodoc/source/ary/kernel/ary_disp.cxx
new file mode 100644
index 000000000000..b9608f2f547a
--- /dev/null
+++ b/autodoc/source/ary/kernel/ary_disp.cxx
@@ -0,0 +1,111 @@
+/* -*- 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 <precomp.h>
+#include <ary/ary_disp.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/cpp/c_ce.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/cp_ce.hxx>
+
+
+
+namespace ary
+{
+
+void
+Display::DisplaySlot_Rid( ary::Rid i_nId )
+{
+    const cpp::Gate *
+        pGate = Get_ReFinder();
+    if (pGate != 0)
+    {
+         const  ary::cpp::CodeEntity *
+             pRE = pGate->Ces().Search_Ce( cpp::Ce_id(i_nId) );
+        if (pRE != 0)
+        {
+             pRE->Accept( *this );
+            return;
+        }
+    }
+
+    do_DisplaySlot_Rid( i_nId );
+}
+
+
+void
+Display::DisplaySlot_LocalCe( ary::cpp::Ce_id   i_nId,
+                              const String  &   i_sName )
+{
+    const cpp::Gate *
+        pGate = Get_ReFinder();
+    if (pGate != 0)
+    {
+         const ary::cpp::CodeEntity *
+             pRE = pGate->Ces().Search_Ce(i_nId);
+        if (pRE != 0)
+        {
+             pRE->Accept( *this );
+            return;
+        }
+    }
+
+    do_DisplaySlot_LocalCe( i_nId, i_sName );
+}
+
+
+
+// Dummy implementations for class Display
+
+void
+Display::do_StartSlot()
+{
+}
+
+void
+Display::do_FinishSlot()
+{
+}
+
+void
+Display::do_DisplaySlot_Rid( ary::Rid )
+{
+}
+
+void
+Display::do_DisplaySlot_LocalCe( ary::cpp::Ce_id    ,
+                                 const String  &    )
+{
+}
+
+
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/kernel/cessentl.cxx b/autodoc/source/ary/kernel/cessentl.cxx
new file mode 100644
index 000000000000..0fcf37542a6a
--- /dev/null
+++ b/autodoc/source/ary/kernel/cessentl.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/cessentl.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_ce.hxx>
+#include <ary/doc/d_oldcppdocu.hxx>
+
+
+namespace ary
+{
+namespace cpp
+{
+
+
+CeEssentials::CeEssentials()
+    :   sLocalName(),
+        nOwner(0),
+        nLocation(0)
+{
+}
+
+CeEssentials::CeEssentials( const String  &     i_sLocalName,
+                            Cid                 i_nOwner,
+                            loc::Le_id          i_nLocation )
+    :   sLocalName(i_sLocalName),
+        nOwner(i_nOwner),
+        nLocation(i_nLocation)
+{
+}
+
+CeEssentials::~CeEssentials()
+{
+}
+
+
+
+inline bool
+IsInternal(const doc::Documentation & i_doc)
+{
+    const ary::doc::OldCppDocu *
+        docu = dynamic_cast< const ary::doc::OldCppDocu* >(i_doc.Data());
+    if (docu != 0)
+        return docu->IsInternal();
+    return false;
+}
+
+
+bool
+CodeEntity::IsVisible() const
+{
+    // KORR_FUTURE:   Improve the whole handling of internal and visibility.
+    return bIsVisible && NOT IsInternal(Docu());
+}
+
+
+
+}   // namespace cpp
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/kernel/makefile.mk b/autodoc/source/ary/kernel/makefile.mk
new file mode 100644
index 000000000000..6c90252bc3b8
--- /dev/null
+++ b/autodoc/source/ary/kernel/makefile.mk
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=ary_kernel
+
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/ary_disp.obj        \
+    $(OBJ)$/cessentl.obj        \
+    $(OBJ)$/namesort.obj        \
+    $(OBJ)$/qualiname.obj       \
+    $(OBJ)$/reposy.obj          \
+    $(OBJ)$/slots.obj
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/ary/kernel/namesort.cxx b/autodoc/source/ary/kernel/namesort.cxx
new file mode 100644
index 000000000000..3854ece73e7b
--- /dev/null
+++ b/autodoc/source/ary/kernel/namesort.cxx
@@ -0,0 +1,103 @@
+/* -*- 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 <precomp.h>
+#include <ary/namesort.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+
+namespace
+{
+
+
+int C_cAutodocNameOrdering1[256] =
+    {   0,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255, //  0 ..
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255, // 32 ..
+       70, 71, 72, 73,  74, 75, 76, 77,      78, 79,255,255, 255,255,255,255,
+
+      255, 11, 13, 15,  17, 19, 21, 23,      25, 27, 29, 31,  33, 35, 37, 39, // 64 ..
+       41, 43, 45, 47,  49, 51, 53, 55,      57, 59, 61,255, 255,255,255, 63,
+      255, 11, 13, 15,  17, 19, 21, 23,      25, 27, 29, 31,  33, 35, 37, 39, // 96 ..
+       41, 43, 45, 47,  49, 51, 53, 55,      57, 59, 61,255, 255,255,255,255,
+
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255, //128 ..
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255, //160 ..
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255
+    };
+
+int C_cAutodocNameOrdering2[256] =
+    {   0,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255, //  0 ..
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255, // 32 ..
+       70, 71, 72, 73,  74, 75, 76, 77,      78, 79,255,255, 255,255,255,255,
+
+      255, 11, 13, 15,  17, 19, 21, 23,      25, 27, 29, 31,  33, 35, 37, 39, // 64 ..
+       41, 43, 45, 47,  49, 51, 53, 55,      57, 59, 61,255, 255,255,255, 63,
+      255, 12, 14, 16,  18, 20, 22, 24,      26, 28, 30, 32,  34, 36, 38, 40, // 96 ..
+       42, 44, 46, 48,  50, 52, 54, 56,      58, 60, 62,255, 255,255,255,255,
+
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255, //128 ..
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255, //160 ..
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255,
+      255,255,255,255, 255,255,255,255,     255,255,255,255, 255,255,255,255
+    };
+
+
+}   // namespace anonymous
+
+
+namespace ary
+{
+
+
+const csv::CharOrder_Table
+LesserName::aOrdering1_(C_cAutodocNameOrdering1);
+
+const csv::CharOrder_Table
+LesserName::aOrdering2_(C_cAutodocNameOrdering2);
+
+
+
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/kernel/qualiname.cxx b/autodoc/source/ary/kernel/qualiname.cxx
new file mode 100644
index 000000000000..8db4ea07919b
--- /dev/null
+++ b/autodoc/source/ary/kernel/qualiname.cxx
@@ -0,0 +1,108 @@
+/* -*- 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 <precomp.h>
+#include <ary/qualiname.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+
+
+namespace ary
+{
+
+
+QualifiedName::QualifiedName( uintt i_nSize )
+    :   aNamespace(),
+        sLocalName(),
+        bIsAbsolute(false),
+        bIsFunction()
+{
+    if (i_nSize > 0)
+        aNamespace.reserve(i_nSize);
+}
+
+QualifiedName::QualifiedName( const char *        i_sText,
+                              const char *        i_sSeparator )
+    :   aNamespace(),
+        sLocalName(),
+        bIsAbsolute(false),
+        bIsFunction()
+{
+    AssignText(i_sText,i_sSeparator);
+}
+
+QualifiedName::~QualifiedName()
+{
+}
+
+void
+QualifiedName::AssignText(  const char *        i_sText,
+                            const char *        i_sSeparator )
+{
+    csv_assert(NOT csv::no_str(i_sText) AND NOT csv::no_str(i_sSeparator));
+    bIsAbsolute = false;
+    bIsFunction = false;
+    csv::erase_container( aNamespace );
+
+    uintt nSepLen = strlen(i_sSeparator);
+    const char * sNext = i_sText;
+
+    const char * ps = strstr( i_sText, i_sSeparator );
+    if (ps == i_sText)
+    {
+        bIsAbsolute = true;
+        sNext = ps + nSepLen;
+    }
+
+    for ( ps = strstr(sNext, i_sSeparator);
+          ps != 0;
+          ps = strstr(sNext, i_sSeparator) )
+    {
+        String sPart(sNext, ps - sNext);
+        aNamespace.push_back(sPart);
+        sNext = ps + nSepLen;
+    }
+
+    uintt sNameLen = strlen(sNext);
+    if ( sNameLen > 2 )
+    {
+        ps = sNext + sNameLen - 2;
+        if (*ps == '(' AND *(ps+1) == ')')
+        {
+            sNameLen -= 2;
+            bIsFunction = true;
+        }
+    }
+    sLocalName = String(sNext,sNameLen);
+}
+
+
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/kernel/reposy.cxx b/autodoc/source/ary/kernel/reposy.cxx
new file mode 100644
index 000000000000..5d28d46bb1be
--- /dev/null
+++ b/autodoc/source/ary/kernel/reposy.cxx
@@ -0,0 +1,221 @@
+/* -*- 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 <precomp.h>
+#include <reposy.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cpp_internalgate.hxx>
+#include <idl_internalgate.hxx>
+
+
+namespace ary
+{
+
+
+//*****************     Repository          ************//
+
+DYN Repository &
+Repository::Create_()
+{
+    return *new RepositoryCenter;
+}
+
+
+
+
+RepositoryCenter::RepositoryCenter()
+    :   sDisplayedName(),
+        aLocation(),
+        pCppPartition(0),
+        pIdlPartition(0)
+{
+    pCppPartition = & cpp::InternalGate::Create_Partition_(*this);
+    pIdlPartition = & idl::InternalGate::Create_Partition_(*this);
+}
+
+RepositoryCenter::~RepositoryCenter()
+{
+}
+
+const ::ary::cpp::Gate &
+RepositoryCenter::Gate_Cpp() const
+{
+    csv_assert(pCppPartition);
+    return *pCppPartition;
+}
+
+const ::ary::idl::Gate &
+RepositoryCenter::Gate_Idl() const
+{
+    csv_assert(pIdlPartition);
+    return *pIdlPartition;
+}
+
+const String &
+RepositoryCenter::Title() const
+{
+    return sDisplayedName;
+}
+
+
+::ary::cpp::Gate &
+RepositoryCenter::Gate_Cpp()
+{
+    csv_assert(pCppPartition);
+    return *pCppPartition;
+}
+
+::ary::idl::Gate &
+RepositoryCenter::Gate_Idl()
+{
+    csv_assert(pIdlPartition);
+    return *pIdlPartition;
+}
+
+void
+RepositoryCenter::Set_Title(const String & i_sName)
+{
+    sDisplayedName = i_sName;
+}
+
+
+
+
+//*********************     Repository Type Info Data       ****************//
+
+// !!! IMPORTANT - NEVER DELETE OR CHANGE - ADDING ALLOWED
+
+
+
+/*  ClassType-Ids
+    -------------
+
+    cpp                 1000
+    idl                 2000
+    corba               3000
+    java                4000
+    information         5000
+    logic location      6000
+    phys location       7000
+    sec. prod.          8000
+
+
+    cpp
+    ---
+    Namespace           1000
+    Class               1001
+    Enum                1002
+    Typedef             1003
+    Function            1004
+    Variable            1005
+    EnumValue           1006
+    NamespaceAlias      1007
+
+    BuiltInType         1200
+    CeType_Final        1201
+    CeType_Extern       1202
+    UsedType            1203
+    PtrType             1211
+    RefType             1212
+    ConstType           1221
+    VolatileType        1222
+    ArrayType           1230
+    TemplateInstance    1235
+    FunctionPtr         1240
+    DataMemberPtr       1250
+    OperationMemberPtr  1260
+
+    TplParam_Type       1301
+    TplParam_Value      1302
+
+    OpSignature         1400
+
+    Define              1601
+    Macro               1602
+
+    ProjectGroup        1901
+    FileGroup           1902
+
+    TopProject          1921
+
+
+
+    idl
+    ---
+
+    Module              2000
+    Interface           2001
+    Function            2002
+    Service             2003
+    Property            2004
+    Enum                2005
+    EnumValue           2006
+    Typedef             2007
+    Struct              2008
+    StructElement       2009
+    Exception           2010
+    ConstantGroup       2011
+    Constant            2012
+    Singleton           2013
+    Attribute           2014
+    SglIfcService       2015
+    SglIfcSingleton     2016
+
+    BuiltInType         2200
+    CeType              2201
+    Sequence            2202
+    ExplicitType        2203
+    ExplicitNameRoom    2204
+    TemplateParamType   2205
+
+
+    java
+    ----
+    Package             4000
+    Interface           4001
+    Class               4002
+
+    physical location
+    -----------------
+    Root                7000
+    Directory           7030
+    File                7100
+
+
+    info
+    ----
+    CodeInformation
+        (IDL)          11002
+*/
+
+
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/kernel/slots.cxx b/autodoc/source/ary/kernel/slots.cxx
new file mode 100644
index 000000000000..5689432cd8e8
--- /dev/null
+++ b/autodoc/source/ary/kernel/slots.cxx
@@ -0,0 +1,167 @@
+/* -*- 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 <precomp.h>
+#include <slots.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/ary_disp.hxx>
+
+
+
+namespace ary
+{
+
+
+//***********************       Slot     ********************//
+
+
+void
+Slot::StoreAt( Display & o_rDestination ) const
+{
+    o_rDestination.StartSlot();
+    StoreEntries(o_rDestination);
+    o_rDestination.FinishSlot();
+}
+
+
+//***********************       Slot_Null     ********************//
+
+Slot_Null::~Slot_Null()
+{
+}
+
+void
+Slot_Null::StoreAt( Display     & ) const
+{
+    // Does nothing
+}
+
+uintt
+Slot_Null::Size() const
+{
+     return 0;
+}
+
+void
+Slot_Null::StoreEntries( Display     & ) const
+{
+    // Does nothing
+}
+
+//***********************       Slot_MapLocalCe     ********************//
+
+Slot_MapLocalCe::Slot_MapLocalCe( const cpp::Map_LocalCe & i_rData )
+    :   pData(&i_rData)
+{
+}
+
+Slot_MapLocalCe::~Slot_MapLocalCe()
+{
+}
+
+uintt
+Slot_MapLocalCe::Size() const
+{
+     return pData->size();;
+}
+
+void
+Slot_MapLocalCe::StoreEntries( Display & o_rDestination ) const
+{
+    for ( cpp::Map_LocalCe::const_iterator it = pData->begin();
+          it != pData->end();
+          ++it )
+    {
+        o_rDestination.DisplaySlot_LocalCe( (*it).second, (*it).first );
+    }
+}
+
+
+
+//***********************       Slot_MapOperations     ********************//
+
+Slot_MapOperations::Slot_MapOperations( const std::multimap<String, cpp::Ce_id> & i_rData )
+    :   pData(&i_rData)
+{
+}
+
+Slot_MapOperations::~Slot_MapOperations()
+{
+}
+
+uintt
+Slot_MapOperations::Size() const
+{
+     return pData->size();;
+}
+
+void
+Slot_MapOperations::StoreEntries( Display & o_rDestination ) const
+{
+    for ( std::multimap<String, cpp::Ce_id>::const_iterator it = pData->begin();
+          it != pData->end();
+          ++it )
+    {
+        o_rDestination.DisplaySlot_LocalCe( (*it).second, (*it).first );
+    }
+}
+
+//***********************       Slot_ListLocalCe      ********************//
+
+Slot_ListLocalCe::Slot_ListLocalCe( const cpp::List_LocalCe & i_rData )
+    :   pData(&i_rData)
+{
+}
+
+Slot_ListLocalCe::~Slot_ListLocalCe()
+{
+}
+
+uintt
+Slot_ListLocalCe::Size() const
+{
+     return pData->size();;
+}
+
+void
+Slot_ListLocalCe::StoreEntries( Display     & o_rDestination ) const
+{
+    for ( cpp::List_LocalCe::const_iterator it = pData->begin();
+          it != pData->end();
+          ++it )
+    {
+        o_rDestination.DisplaySlot_LocalCe( (*it).nId, (*it).sLocalName );
+    }
+}
+
+
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/loc/loc_dir.cxx b/autodoc/source/ary/loc/loc_dir.cxx
new file mode 100644
index 000000000000..220f47486332
--- /dev/null
+++ b/autodoc/source/ary/loc/loc_dir.cxx
@@ -0,0 +1,137 @@
+/* -*- 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 <precomp.h>
+#include <ary/loc/loc_dir.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/loc/loc_file.hxx>
+#include <sortedids.hxx>
+#include "locs_le.hxx"
+
+
+namespace ary
+{
+namespace loc
+{
+
+struct Directory::Container
+{
+    typedef SortedIds<Le_Compare>           SortedChildList;
+
+    SortedChildList     aSubDirectories;
+    SortedChildList     aFiles;
+
+                        Container()
+                            :   aSubDirectories(),
+                                aFiles()
+                            {}
+};
+
+
+
+
+Directory::Directory(Le_id i_assignedRoot)
+    :   sLocalName(),
+        nParentDirectory(0),
+        nAssignedRoot(i_assignedRoot),
+        aAssignedNode(),
+        pChildren(new Container)
+{
+    aAssignedNode.Assign_Entity(*this);
+}
+
+Directory::Directory( const String  &   i_localName,
+                      Le_id             i_parentDirectory )
+    :   sLocalName(i_localName),
+        nParentDirectory(i_parentDirectory),
+        nAssignedRoot(0),
+        aAssignedNode(),
+        pChildren(new Container)
+{
+    aAssignedNode.Assign_Entity(*this);
+}
+
+Directory::~Directory()
+{
+}
+
+void
+Directory::Add_Dir(const Directory  &  i_dir)
+{
+    pChildren->aSubDirectories.Add(i_dir.LeId());
+}
+
+void
+Directory::Add_File(const File & i_file)
+{
+    pChildren->aFiles.Add(i_file.LeId());
+}
+
+Le_id
+Directory::Search_Dir(const String & i_name) const
+{
+    return pChildren->aSubDirectories.Search(i_name);
+}
+
+Le_id
+Directory::Search_File(const String & i_name) const
+{
+    return pChildren->aFiles.Search(i_name);
+}
+
+void
+Directory::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Directory::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Directory::inq_LocalName() const
+{
+    return sLocalName;
+}
+
+Le_id
+Directory::inq_ParentDirectory() const
+{
+    return nParentDirectory;
+}
+
+
+} // namespace loc
+} // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/loc/loc_file.cxx b/autodoc/source/ary/loc/loc_file.cxx
new file mode 100644
index 000000000000..5de548219842
--- /dev/null
+++ b/autodoc/source/ary/loc/loc_file.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/loc/loc_file.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+File::File( const String  &     i_sLocalName,
+            Le_id               i_nParentDirectory )
+    :   FileBase(i_sLocalName, i_nParentDirectory)
+{
+}
+
+File::~File()
+{
+}
+
+void
+File::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor, *this);
+}
+
+ClassId
+File::get_AryClass() const
+{
+    return class_id;
+}
+
+
+
+} // namespace loc
+} // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/loc/loc_filebase.cxx b/autodoc/source/ary/loc/loc_filebase.cxx
new file mode 100644
index 000000000000..f9297084c552
--- /dev/null
+++ b/autodoc/source/ary/loc/loc_filebase.cxx
@@ -0,0 +1,66 @@
+/* -*- 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 <precomp.h>
+#include <ary/loc/loc_filebase.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+FileBase::FileBase( const String  &     i_localName,
+                    Le_id               i_parentDirectory )
+    :   sLocalName(i_localName),
+        nParentDirectory(i_parentDirectory)
+{
+}
+
+const String &
+FileBase::inq_LocalName() const
+{
+    return sLocalName;
+}
+
+Le_id
+FileBase::inq_ParentDirectory() const
+{
+    return nParentDirectory;
+}
+
+
+
+} // namespace loc
+} // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/loc/loc_root.cxx b/autodoc/source/ary/loc/loc_root.cxx
new file mode 100644
index 000000000000..198b6ee7f784
--- /dev/null
+++ b/autodoc/source/ary/loc/loc_root.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/loc/loc_root.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+Root::Root(const csv::ploc::Path & i_path)
+    :   aPath(i_path),
+        sPathAsString(),
+        aMyDirectory(0)
+{
+    StreamLock
+        path_string(700);
+    path_string() << i_path;
+    sPathAsString = path_string().c_str();
+}
+
+Root::~Root()
+{
+}
+
+void
+Root::do_Accept(csv::ProcessorIfc & io_processor) const
+{
+    csv::CheckedCall(io_processor,*this);
+}
+
+ClassId
+Root::get_AryClass() const
+{
+    return class_id;
+}
+
+const String &
+Root::inq_LocalName() const
+{
+    return sPathAsString;
+}
+
+Le_id
+Root::inq_ParentDirectory() const
+{
+    return Le_id::Null_();
+}
+
+
+
+} // namespace loc
+} // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/loc/loc_traits.cxx b/autodoc/source/ary/loc/loc_traits.cxx
new file mode 100644
index 000000000000..8e010beef263
--- /dev/null
+++ b/autodoc/source/ary/loc/loc_traits.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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <ary/loc/loc_traits.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/namesort.hxx>
+#include <ary/getncast.hxx>
+#include "locs_le.hxx"
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+//********************      Le_Traits       ************************//
+Le_Traits::entity_base_type &
+Le_Traits::EntityOf_(id_type i_id)
+{
+    csv_assert(i_id.IsValid());
+    return Le_Storage::Instance_()[i_id];
+}
+
+//********************      LeNode_Traits       ************************//
+symtree::Node<LeNode_Traits> *
+LeNode_Traits::NodeOf_(entity_base_type & io_entity)
+{
+    if (is_type<Directory>(io_entity))
+        return & ary_cast<Directory>(io_entity).AsNode();
+    return 0;
+}
+
+Le_Traits::entity_base_type *
+LeNode_Traits::ParentOf_(const entity_base_type & i_entity)
+{
+    Le_Traits::id_type
+        ret = i_entity.ParentDirectory();
+    if (ret.IsValid())
+        return &EntityOf_(ret);
+    return 0;
+}
+
+//********************      Le_Compare       ************************//
+const Le_Compare::key_type &
+Le_Compare::KeyOf_(const entity_base_type & i_entity)
+{
+    return i_entity.LocalName();
+}
+
+bool
+Le_Compare::Lesser_( const key_type &    i_1,
+                     const key_type &    i_2 )
+{
+    static ::ary::LesserName    less_;
+    return less_(i_1,i_2);
+}
+
+
+
+
+}   // namespace loc
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/loc/loca_le.cxx b/autodoc/source/ary/loc/loca_le.cxx
new file mode 100644
index 000000000000..428ca5849ccb
--- /dev/null
+++ b/autodoc/source/ary/loc/loca_le.cxx
@@ -0,0 +1,184 @@
+/* -*- 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 <precomp.h>
+#include "loca_le.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/loc/loc_dir.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <ary/loc/loc_root.hxx>
+#include <loc_internalgate.hxx>
+#include "locs_le.hxx"
+
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+DYN LocationPilot &
+InternalGate::Create_Locations_()
+{
+    return *new LocationAdmin;
+}
+
+
+
+
+inline Le_Storage &
+LocationAdmin::Storage() const
+{
+    csv_assert(pStorage);
+    return *pStorage.MutablePtr();
+}
+
+
+LocationAdmin::LocationAdmin()
+    :   pStorage(new Le_Storage)
+{
+}
+
+LocationAdmin::~LocationAdmin()
+{
+}
+
+Root &
+LocationAdmin::CheckIn_Root(const csv::ploc::Path & i_path)
+{
+    Dyn<Root>
+        p_new( new Root(i_path) );
+
+    Le_id
+        id = Storage().RootIndex().Search(p_new->LocalName());
+    if ( id.IsValid() )
+    {
+        return ary_cast<Root>(Storage()[id]);
+    }
+
+    Root *
+        ret = p_new.Ptr();
+    Storage().Store_Entity(*p_new.Release());
+    Storage().RootIndex().Add(ret->LeId());
+
+    Directory *
+        p_rootdir = new Directory(ret->LeId());
+    Storage().Store_Entity(*p_rootdir);
+    ret->Assign_Directory(p_rootdir->LeId());
+
+    return *ret;
+}
+
+File &
+LocationAdmin::CheckIn_File( const String  &                   i_name,
+                                  const csv::ploc::DirectoryChain & i_subPath,
+                                  Le_id                             i_root )
+{
+    Root &
+        root = Find_Root(i_root);
+    Directory &
+        parent_dir = CheckIn_Directories(
+                        Find_Directory(root.MyDir()),
+                        i_subPath.Begin(),
+                        i_subPath.End() );
+    Le_id
+        fid = parent_dir.Search_File(i_name);
+    if (NOT fid.IsValid())
+    {
+        File *
+            ret = new File(i_name, parent_dir.LeId());
+        Storage().Store_Entity(*ret);
+        parent_dir.Add_File(*ret);
+        return *ret;
+    }
+    else
+    {
+        return Find_File(fid);
+    }
+}
+
+Root &
+LocationAdmin::Find_Root(Le_id  i_id) const
+{
+    return ary_cast<Root>(Storage()[i_id]);
+}
+
+Directory &
+LocationAdmin::Find_Directory(Le_id i_id) const
+{
+    return ary_cast<Directory>(Storage()[i_id]);
+}
+
+File &
+LocationAdmin::Find_File(Le_id i_id) const
+{
+    return ary_cast<File>(Storage()[i_id]);
+}
+
+Directory &
+LocationAdmin::CheckIn_Directory( Directory &         io_parent,
+                                       const String &      i_name )
+{
+    Le_id
+        did = io_parent.Search_Dir(i_name);
+    if (NOT did.IsValid())
+    {
+        Directory *
+            ret = new Directory(i_name, io_parent.LeId());
+        Storage().Store_Entity(*ret);
+        io_parent.Add_Dir(*ret);
+        return *ret;
+    }
+    else
+    {
+        return Find_Directory(did);
+    }
+}
+
+Directory &
+LocationAdmin::CheckIn_Directories(
+                            Directory &                     io_root,
+                            StringVector::const_iterator    i_beginSubPath,
+                            StringVector::const_iterator    i_endSubPath )
+{
+    if (i_beginSubPath == i_endSubPath)
+        return io_root;
+
+    Directory &
+        next = CheckIn_Directory(io_root, *i_beginSubPath);
+    return CheckIn_Directories(next, i_beginSubPath+1, i_endSubPath);
+}
+
+
+}   // namespace loc
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/loc/loca_le.hxx b/autodoc/source/ary/loc/loca_le.hxx
new file mode 100644
index 000000000000..8f206f7c1c98
--- /dev/null
+++ b/autodoc/source/ary/loc/loca_le.hxx
@@ -0,0 +1,101 @@
+/* -*- 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 ARY_LOC_LOCA_LE_HXX
+#define ARY_LOC_LOCA_LE_HXX
+
+// BASE CLASSES
+#include <ary/loc/locp_le.hxx>
+
+namespace ary
+{
+namespace loc
+{
+    class Le_Storage;
+}
+}
+
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+/** Provides access to files and directories stored in the
+    repository.
+*/
+class LocationAdmin : public LocationPilot
+{
+  public:
+                        LocationAdmin();
+    virtual              ~LocationAdmin();
+
+    // INHERITED
+        // Interface LocationPilot:
+    virtual Root &      CheckIn_Root(
+                            const csv::ploc::Path &
+                                                i_rPath );
+    virtual File &      CheckIn_File(
+                            const String  &     i_name,
+                            const csv::ploc::DirectoryChain &
+                                                i_subPath,
+                            Le_id               i_root );
+
+    virtual Root &      Find_Root(
+                            Le_id               i_id ) const;
+    virtual Directory & Find_Directory(
+                            Le_id               i_id ) const;
+    virtual File &      Find_File(
+                            Le_id               i_id ) const;
+  private:
+    // Locals
+    Le_Storage &        Storage() const;
+    Directory &         CheckIn_Directory(
+                            Directory &         io_parent,
+                            const String &      i_name );
+    Directory &         CheckIn_Directories(
+                            Directory &         io_root,
+                            StringVector::const_iterator
+                                                i_beginSubPath,
+                            StringVector::const_iterator
+                                                i_endSubPath );
+    // DATA
+    Dyn<Le_Storage>     pStorage;
+};
+
+
+
+
+}   // namespace loc
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/loc/locs_le.cxx b/autodoc/source/ary/loc/locs_le.cxx
new file mode 100644
index 000000000000..1f2df4430173
--- /dev/null
+++ b/autodoc/source/ary/loc/locs_le.cxx
@@ -0,0 +1,70 @@
+/* -*- 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 <precomp.h>
+#include "locs_le.hxx"
+
+// NOT FULLY DEFINED SERVICES
+
+
+namespace
+{
+    const uintt
+    C_nReservedElements = ary::loc::predefined::le_MAX;    // Skipping "0"
+}
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+Le_Storage *        Le_Storage::pInstance_ = 0;
+
+
+
+
+Le_Storage::Le_Storage()
+    :   stg::Storage<LocationEntity>(C_nReservedElements)
+{
+    csv_assert(pInstance_ == 0);
+    pInstance_ = this;
+}
+
+Le_Storage::~Le_Storage()
+{
+    csv_assert(pInstance_ != 0);
+    pInstance_ = 0;
+}
+
+
+}   // namespace loc
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/loc/locs_le.hxx b/autodoc/source/ary/loc/locs_le.hxx
new file mode 100644
index 000000000000..1d1494ccbc5f
--- /dev/null
+++ b/autodoc/source/ary/loc/locs_le.hxx
@@ -0,0 +1,91 @@
+/* -*- 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 ARY_LOC_LOCS_LE_HXX
+#define ARY_LOC_LOCS_LE_HXX
+
+// BASE CLASSES
+#include <store/s_storage.hxx>
+// USED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/loc/loc_le.hxx>
+#include <ary/loc/loc_root.hxx>
+#include <sortedids.hxx>
+
+
+
+
+namespace ary
+{
+namespace loc
+{
+
+
+/** The data base for all ->ary::cpp::CodeEntity objects.
+*/
+class Le_Storage : public ::ary::stg::Storage<LocationEntity>
+{
+  public:
+    typedef SortedIds<Le_Compare>           Index;
+
+                        Le_Storage();
+    virtual             ~Le_Storage();
+
+    const Index &       RootIndex() const         { return aRoots; }
+    Index &             RootIndex()               { return aRoots; }
+
+    static Le_Storage & Instance_()               { csv_assert(pInstance_ != 0);
+                                                    return *pInstance_; }
+  private:
+    // DATA
+    Index               aRoots;
+
+    static Le_Storage * pInstance_;
+};
+
+
+
+
+namespace predefined
+{
+
+enum E_LocationEntity
+{
+    le_MAX = 1
+};
+
+}   // namespace predefined
+
+
+
+
+}   // namespace cpp
+}   // namespace ary
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary/loc/makefile.mk b/autodoc/source/ary/loc/makefile.mk
new file mode 100644
index 000000000000..e4aa0e9b43f5
--- /dev/null
+++ b/autodoc/source/ary/loc/makefile.mk
@@ -0,0 +1,61 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=ary_loc
+
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/loc_dir.obj         \
+    $(OBJ)$/loc_file.obj        \
+    $(OBJ)$/loc_filebase.obj    \
+    $(OBJ)$/loc_root.obj        \
+    $(OBJ)$/loc_traits.obj      \
+    $(OBJ)$/loca_le.obj         \
+    $(OBJ)$/locs_le.obj
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
diff --git a/autodoc/source/ary_i/kernel/ci_atag2.cxx b/autodoc/source/ary_i/kernel/ci_atag2.cxx
new file mode 100644
index 000000000000..6eabded958ed
--- /dev/null
+++ b/autodoc/source/ary_i/kernel/ci_atag2.cxx
@@ -0,0 +1,59 @@
+/* -*- 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 <precomp.h>
+#include <ary_i/ci_atag2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary_i/disdocum.hxx>
+
+
+namespace ary
+{
+namespace inf
+{
+
+void    DocuTag_Display::Display_TextToken(
+                            const csi::dsapi::DT_TextToken & ) {}
+void    DocuTag_Display::Display_White() {}
+void    DocuTag_Display::Display_MupType(
+                            const csi::dsapi::DT_MupType & ) {}
+void    DocuTag_Display::Display_MupMember(
+                            const csi::dsapi::DT_MupMember & ) {}
+void    DocuTag_Display::Display_MupConst(
+                            const csi::dsapi::DT_MupConst & ) {}
+void    DocuTag_Display::Display_Style(
+                            const csi::dsapi::DT_Style & ) {}
+void    DocuTag_Display::Display_EOL() {}
+
+
+}   // namespace inf
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary_i/kernel/ci_text2.cxx b/autodoc/source/ary_i/kernel/ci_text2.cxx
new file mode 100644
index 000000000000..d5d60c7b2399
--- /dev/null
+++ b/autodoc/source/ary_i/kernel/ci_text2.cxx
@@ -0,0 +1,141 @@
+/* -*- 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 <precomp.h>
+#include <ary_i/ci_text2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary_i/disdocum.hxx>
+#include <ary_i/d_token.hxx>
+
+
+namespace ary
+{
+namespace inf
+{
+
+DocuTex2::DocuTex2()
+{
+}
+
+DocuTex2::~DocuTex2()
+{
+    for ( TokenList::iterator iter = aTokens.begin();
+          iter != aTokens.end();
+          ++iter )
+    {
+        delete (*iter);
+    }
+}
+
+void
+DocuTex2::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    for ( ary::inf::DocuTex2::TokenList::const_iterator
+                iter = aTokens.begin();
+          iter != aTokens.end();
+          ++iter )
+    {
+        (*iter)->DisplayAt(o_rDisplay);
+    }
+}
+
+void
+DocuTex2::AddToken( DYN DocuToken & let_drToken )
+{
+    if (aTokens.empty())
+    {
+        if (let_drToken.IsWhiteOnly())
+            return;
+    }
+    aTokens.push_back(&let_drToken);
+}
+
+bool
+DocuTex2::IsEmpty() const
+{
+    for ( ary::inf::DocuTex2::TokenList::const_iterator
+                iter = aTokens.begin();
+          iter != aTokens.end();
+          ++iter )
+    {
+        return false;
+    }
+    return true;
+}
+
+using csi::dsapi::DT_TextToken;
+
+const String &
+DocuTex2::TextOfFirstToken() const
+{
+    if (NOT aTokens.empty())
+    {
+        const DT_TextToken *
+            pTok = dynamic_cast< const DT_TextToken* >(*aTokens.begin());
+
+        if (pTok != 0)
+            return pTok->GetTextStr();
+    }
+    return String::Null_();
+}
+
+String &
+DocuTex2::Access_TextOfFirstToken()
+{
+    if (NOT aTokens.empty())
+    {
+        DT_TextToken *
+            pTok = dynamic_cast< DT_TextToken* >(*aTokens.begin());
+
+        if (pTok != 0)
+            return pTok->Access_Text();
+    }
+
+    static String sDummy_;
+    return sDummy_;
+}
+
+
+
+void    DocuText_Display::Display_StdAtTag(
+                            const csi::dsapi::DT_StdAtTag & ) {}
+void    DocuText_Display::Display_SeeAlsoAtTag(
+                            const csi::dsapi::DT_SeeAlsoAtTag & ) {}
+void    DocuText_Display::Display_ParameterAtTag(
+                            const csi::dsapi::DT_ParameterAtTag & ) {}
+void    DocuText_Display::Display_SinceAtTag(
+                            const csi::dsapi::DT_SinceAtTag & ) {}
+
+
+
+}   // namespace inf
+}   // namespace ary
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary_i/kernel/d_token.cxx b/autodoc/source/ary_i/kernel/d_token.cxx
new file mode 100644
index 000000000000..f9810d0979a2
--- /dev/null
+++ b/autodoc/source/ary_i/kernel/d_token.cxx
@@ -0,0 +1,189 @@
+/* -*- 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 <precomp.h>
+#include <ary_i/d_token.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary_i/disdocum.hxx>
+
+
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+bool
+DT_Dsapi::IsWhiteOnly() const
+{
+    return false;
+}
+
+DT_TextToken::~DT_TextToken()
+{
+}
+
+void
+DT_TextToken::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_TextToken( *this );
+}
+
+bool
+DT_TextToken::IsWhiteOnly() const
+{
+    const char *it = sText.c_str();
+    while (static_cast<UINT8>(*it++) > 32)
+    {
+        return false;
+    }
+    return true;
+}
+
+DT_White::~DT_White()
+{
+}
+
+void
+DT_White::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_White();
+}
+
+bool
+DT_White::IsWhiteOnly() const
+{
+    return true;
+}
+
+DT_MupType::~DT_MupType()
+{
+}
+
+void
+DT_MupType::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_MupType( *this );
+}
+
+DT_MupMember::~DT_MupMember()
+{
+}
+
+void
+DT_MupMember::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_MupMember( *this );
+}
+
+DT_MupConst::~DT_MupConst()
+{
+}
+
+void
+DT_MupConst::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_MupConst( *this );
+}
+
+DT_Style::~DT_Style()
+{
+}
+
+void
+DT_Style::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_Style( *this );
+}
+
+DT_EOL::~DT_EOL()
+{
+}
+
+void
+DT_EOL::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_EOL();
+}
+
+bool
+DT_EOL::IsWhiteOnly() const
+{
+    return true;
+}
+
+DT_StdAtTag::~DT_StdAtTag()
+{
+}
+
+void
+DT_StdAtTag::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_StdAtTag( *this );
+}
+
+DT_SeeAlsoAtTag::~DT_SeeAlsoAtTag()
+{
+}
+
+void
+DT_SeeAlsoAtTag::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_SeeAlsoAtTag( *this );
+}
+
+DT_ParameterAtTag::~DT_ParameterAtTag()
+{
+}
+
+void
+DT_ParameterAtTag::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_ParameterAtTag( *this );
+}
+
+DT_SinceAtTag::~DT_SinceAtTag()
+{
+}
+
+void
+DT_SinceAtTag::DisplayAt( DocumentationDisplay & o_rDisplay ) const
+{
+    o_rDisplay.Display_SinceAtTag( *this );
+}
+
+
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/ary_i/kernel/makefile.mk b/autodoc/source/ary_i/kernel/makefile.mk
new file mode 100644
index 000000000000..79675bc03c81
--- /dev/null
+++ b/autodoc/source/ary_i/kernel/makefile.mk
@@ -0,0 +1,60 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=ary2_cinfo
+
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/ci_atag2.obj	\
+    $(OBJ)$/ci_text2.obj	\
+    $(OBJ)$/d_token.obj
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/display/html/aryattrs.cxx b/autodoc/source/display/html/aryattrs.cxx
new file mode 100644
index 000000000000..2eef10ded2e9
--- /dev/null
+++ b/autodoc/source/display/html/aryattrs.cxx
@@ -0,0 +1,251 @@
+/* -*- 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 <precomp.h>
+#include "aryattrs.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/getncast.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/cpp/cp_type.hxx>
+#include "strconst.hxx"
+
+
+
+
+//********************       HtmlDisplay_Impl        *********************//
+
+const char *
+Get_ClassTypeKey( const ary::cpp::Class & i_rClass )
+{
+    return i_rClass.ClassKey() == ary::cpp::CK_class
+                            ?   C_sHFTypeTitle_Class
+                            :   i_rClass.ClassKey() == ary::cpp::CK_struct
+                                    ?   C_sHFTypeTitle_Struct
+                                    :   C_sHFTypeTitle_Union;
+
+}
+
+const char *
+Get_TypeKey( const ary::cpp::CodeEntity & i_rCe )
+{
+    if ( ary::is_type<ary::cpp::Class>(i_rCe) )
+    {
+        return Get_ClassTypeKey(
+                    ary::ary_cast<ary::cpp::Class>(i_rCe) );
+    }
+    if ( ary::is_type<ary::cpp::Enum>(i_rCe) )
+    {
+         return "enum";
+    }
+    return "";
+}
+
+bool
+Ce_IsInternal( const ary::cpp::CodeEntity & i_rCe )
+{
+    return NOT i_rCe.IsVisible();
+}
+
+const char *
+SyntaxText_PreName( const ary::cpp::Function &      i_rFunction,
+                    const ary::cpp::Gate &   i_rAryGate )
+{
+    static StreamStr  sResult( 150 );
+    sResult.seekp(0);
+
+    // write pre-name:
+    const ary::cpp::FunctionFlags & rFlags = i_rFunction.Flags();
+    if ( rFlags.IsStaticLocal() OR rFlags.IsStaticMember() )
+        sResult << "static ";
+    if ( rFlags.IsExplicit() )
+        sResult << "explicit ";
+    if ( rFlags.IsMutable() )
+        sResult << "mutable ";
+    if ( i_rFunction.Virtuality() != ary::cpp::VIRTUAL_none )
+        sResult << "virtual ";
+    i_rAryGate.Types().Get_TypeText( sResult, i_rFunction.ReturnType() );
+    sResult << " ";
+
+    return sResult.c_str();
+}
+
+const char *
+SyntaxText_PostName( const ary::cpp::Function &     i_rFunction,
+                     const ary::cpp::Gate &  i_rAryGate )
+{
+    static StreamStr  sResult( 850 );
+    sResult.seekp(0);
+
+    // parameters and con_vol
+    i_rAryGate.Ces().Get_SignatureText( sResult, i_rFunction.Signature(), &i_rFunction.ParamInfos() );
+
+    // write Exceptions:
+    const std::vector< ary::cpp::Type_id > *
+            pThrow = i_rFunction.Exceptions();
+    if ( pThrow)
+    {
+
+        std::vector< ary::cpp::Type_id >::const_iterator
+                it = pThrow->begin();
+        std::vector< ary::cpp::Type_id >::const_iterator
+                it_end = pThrow->end();
+
+        if (it != it_end)
+        {
+            sResult << " throw( ";
+            i_rAryGate.Types().Get_TypeText(sResult, *it);
+
+            for ( ++it; it != it_end; ++it )
+            {
+                sResult << ", ";
+                i_rAryGate.Types().Get_TypeText(sResult, *it);
+            }
+            sResult << " )";
+        }
+        else
+        {
+            sResult << " throw( )";
+        }
+    }   // endif // pThrow
+
+    // abstractness:
+    if ( i_rFunction.Virtuality() == ary::cpp::VIRTUAL_abstract )
+        sResult << " = 0";
+
+    // finish:
+    sResult << ";";
+
+    return sResult.c_str();
+}
+
+bool
+Get_TypeText( const char * &                o_rPreName,
+              const char * &                o_rName,
+              const char * &                o_rPostName,
+              ary::cpp::Type_id             i_nTypeid,
+              const ary::cpp::Gate & i_rAryGate )
+{
+    static StreamStr       sResult_PreName(250);
+    static StreamStr       sResult_Name(250);
+    static StreamStr       sResult_PostName(250);
+
+    sResult_PreName.seekp(0);
+    sResult_Name.seekp(0);
+    sResult_PostName.seekp(0);
+
+    bool    ret = i_rAryGate.Types().Get_TypeText(
+                                sResult_PreName,
+                                sResult_Name,
+                                sResult_PostName,
+                                i_nTypeid );
+    if ( sResult_PreName.tellp() > 0 )
+    {
+        char cLast = *( sResult_PreName.c_str() + (sResult_PreName.tellp() - 1) );
+        if (cLast != ':' AND cLast != ' ')
+            sResult_PreName << " ";
+    }
+
+
+    if (ret)
+    {
+        o_rPreName  = sResult_PreName.c_str();
+        o_rName     = sResult_Name.c_str();
+        o_rPostName = sResult_PostName.c_str();
+    }
+    else
+    {
+        o_rPreName  =  o_rName =  o_rPostName = "";
+    }
+    return ret;
+}
+
+
+
+
+//*********************         FunctionParam_Iterator      *****************//
+
+
+FunctionParam_Iterator::FunctionParam_Iterator()
+    :   // itTypes
+        // itTypes_end
+        // itNames_andMore
+        // itNames_andMore_end
+        eConVol(ary::cpp::CONVOL_none)
+{
+    static std::vector<ary::cpp::Type_id>   aTypesNull_;
+    static StringVector                     aNamesNull_;
+
+    itTypes = itTypes_end = aTypesNull_.end();
+    itNames_andMore = itNames_andMore_end = aNamesNull_.end();
+}
+
+FunctionParam_Iterator::~FunctionParam_Iterator()
+{
+}
+
+FunctionParam_Iterator &
+FunctionParam_Iterator::operator++()
+{
+    if ( IsValid() )
+    {
+        ++itTypes;
+        ++itNames_andMore;
+    }
+    return *this;
+}
+
+void
+FunctionParam_Iterator::Assign( const ary::cpp::Function &  i_rFunction )
+{
+    const ary::cpp::OperationSignature &
+        rSigna = i_rFunction.Signature();
+
+    const std::vector<ary::cpp::Type_id> &
+        rTypes = rSigna.Parameters();
+    const StringVector &
+        rNames = i_rFunction.ParamInfos();
+
+    if ( rTypes.size() != rNames.size() OR rTypes.size() == 0 )
+        return;
+
+    itTypes     = rTypes.begin();
+    itTypes_end = rTypes.end();
+    itNames_andMore     = rNames.begin();
+    itNames_andMore_end = rNames.end();
+
+    eConVol = rSigna.ConVol();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/aryattrs.hxx b/autodoc/source/display/html/aryattrs.hxx
new file mode 100644
index 000000000000..16d762f750a2
--- /dev/null
+++ b/autodoc/source/display/html/aryattrs.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 ADC_DISPLAY_ARYATTRS_HXX
+#define ADC_DISPLAY_ARYATTRS_HXX
+
+// USED SERVICES
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/doc/d_docu.hxx>
+#include <ary/doc/d_oldcppdocu.hxx>
+
+namespace ary
+{
+     namespace cpp
+    {
+        class CodeEntity;
+        class Class;
+        class DisplayGate;
+        class Function;
+        class Namespace;
+    }
+}
+
+
+
+
+const char *        Get_ClassTypeKey(
+                        const ary::cpp::Class & i_rClass );
+const char *        Get_TypeKey(
+                        const ary::cpp::CodeEntity &
+                                                i_rCe );
+bool                Ce_IsInternal(
+                        const ary::cpp::CodeEntity &
+                                                i_rCe );
+const char *        SyntaxText_PreName(
+                        const ary::cpp::Function &
+                                                i_rFunction,
+                        const ary::cpp::Gate &  i_rAryGate );
+const char *        SyntaxText_PostName(
+                        const ary::cpp::Function &
+                                                i_rFunction,
+                        const ary::cpp::Gate &  i_rAryGate );
+
+bool                Get_TypeText(
+                        const char * &          o_rPreName,
+                        const char * &          o_rName,
+                        const char * &          o_rPostName,
+                        ary::cpp::Type_id       i_nTypeid,
+                        const ary::cpp::Gate &  i_rAryGate );
+
+
+inline const ary::doc::OldCppDocu *
+Get_CppDocu(const ary::doc::Documentation & i_doc)
+{
+    return dynamic_cast< const ary::doc::OldCppDocu* >(i_doc.Data());
+}
+
+
+class FunctionParam_Iterator
+{
+  public:
+                    FunctionParam_Iterator();
+                    ~FunctionParam_Iterator();
+
+                    operator bool() const;
+    FunctionParam_Iterator &
+                    operator++();
+
+    void            Assign(
+                        const ary::cpp::Function &
+                                                i_rFunction );
+
+    ary::cpp::Type_id
+                    CurType() const;
+    const String  & CurName() const;
+
+    bool            IsFunctionConst() const;
+    bool            IsFunctionVolatile() const;
+
+  private:
+    typedef std::vector<ary::cpp::Type_id>::const_iterator  Type_Iterator;
+    typedef StringVector::const_iterator                    Name_Iterator;
+
+    bool                IsValid() const;
+
+    // Forbidden
+    FunctionParam_Iterator &
+                    operator++(int);
+    // DATA
+    Type_Iterator       itTypes;
+    Type_Iterator       itTypes_end;
+    Name_Iterator       itNames_andMore;        /// Name, init-value.
+    Name_Iterator       itNames_andMore_end;
+
+    ary::cpp::E_ConVol  eConVol;
+};
+
+
+
+
+// IMPLEMENTATION
+inline
+FunctionParam_Iterator::operator bool() const
+    { return IsValid(); }
+
+inline bool
+FunctionParam_Iterator::IsValid() const
+{
+    // By C'tor and Assign(), it is assured, that
+    //   both iterators are valid, if one is valid.
+    return itTypes != itTypes_end;
+}
+
+inline ary::cpp::Type_id
+FunctionParam_Iterator::CurType() const
+    { return IsValid() ? *itTypes : ary::cpp::Type_id(0); }
+inline const String  &
+FunctionParam_Iterator::CurName() const
+    { return IsValid() ? *itNames_andMore : String::Null_(); }
+inline bool
+FunctionParam_Iterator::IsFunctionConst() const
+    { return (eConVol & ary::cpp::CONVOL_const) != 0; }
+inline bool
+FunctionParam_Iterator::IsFunctionVolatile() const
+    { return (eConVol & ary::cpp::CONVOL_volatile) != 0; }
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/cfrstd.cxx b/autodoc/source/display/html/cfrstd.cxx
new file mode 100644
index 000000000000..8a4a9f6bc91f
--- /dev/null
+++ b/autodoc/source/display/html/cfrstd.cxx
@@ -0,0 +1,347 @@
+/* -*- 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 <precomp.h>
+#include <cfrstd.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <time.h>
+
+
+/*                      CSS Styles
+                        ----------
+
+Colors:
+-   light background color              #eeeeff
+-   dark background color               #ccccff
+-   self in navibar background color    #2222ad
+
+
+Fonts:
+-   page title              20, bold, Arial
+-   navibar main            12, bold, Arial
+-   navibar sub              8, Arial, kapit�lchen
+-   attrtable title line     8, bold, Arial, kapit�lchen
+-   attrtable value line     8, Arial kapit�lchen
+
+-   namespace chain         13, bold
+-   table title             13, bold
+-   template line           13
+
+-   member paragraph title  12, bold
+
+-   docu paragraph title    11, bold
+-   standard text           11
+
+-   hierarchy               11, monospace
+
+
+classes:
+
+    td.title                page title
+    h3                      table title
+    h4                      member paragraph title
+
+    td.nmain                navigation main bar
+    td.nsub                 navigation sub bar
+    a.nmain                 links in navigation main bar
+    a.nsub                  links in navigation sub bar
+
+    td.attr1                attribute table head line
+    td.attr2                attribute table value line
+
+    p.namechain             namespace chain in head of pages
+    p.tpl                   template line in head of pages
+
+    pre.doc                 preformatted docu
+    pre.hierarchy           class bases hierarchy graphic
+
+    dl.syntax               function- or variable-declaration field
+    a.syntax                link in function- or variable-declaration field
+
+    p.dt                    docu paragraph title
+    dl.dt                   docu paragraph title
+
+    p                       standard text
+    dl                      standard text
+    dd                      standard text
+*/
+
+
+#define CRLF "\n"
+
+namespace
+{
+
+bool            bUse_OOoFrameDiv = true;
+
+
+//***************   These are used for IDL currently only!   ********************
+
+const char * const C_sStdStyle =
+    "/*See bottom of file for explanations.*/"CRLF
+    CRLF
+    "body { background-color:#ffffff; }"CRLF
+    CRLF
+    "h3             { font-size:13pt; font-weight:bold;"CRLF
+    "                 margin-top:3pt; margin-bottom:1pt; }"CRLF
+    "p, dt, dd, pre { font-size:11pt;"CRLF
+    "                 margin-top:3pt; margin-bottom:1pt; }"CRLF
+    "pre            { font-family:monospace; }"CRLF
+    CRLF
+    "table.navimain { background-color:#eeeeff; }"CRLF
+    "table.subtitle { margin-top:6pt; margin-bottom:6pt; }"CRLF
+    CRLF
+    "td             {                     font-size:11pt; }"CRLF
+    "td.title       { font-family: Arial; font-size:19pt; font-weight:bold;"CRLF
+    "                 line-height:30pt;   background-color:#ccccff; text-align:center; }"CRLF
+    "td.subtitle    { font-family: Arial; font-size:13pt;"CRLF
+    "                 line-height:20pt;   background-color:#ccccff; }"CRLF
+    "td.crosstitle  {                     font-size:12pt; font-weight:bold;"CRLF
+    "                 line-height:15pt;   background-color:#eeeeff; }"CRLF
+    "td.imdetail    { width:100%;         background-color:#eeeeff; }"CRLF
+    CRLF
+    "td.imsum_left  { width:30%;  }"CRLF
+    "td.imsum_right { width:70%;  }"CRLF
+    CRLF
+    "td.navimain, a.navimain"CRLF
+    "                   { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }"CRLF
+    "td.navimainself    { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;"CRLF
+    "                     color:#ffffff; background-color:#2222ad; }"CRLF
+    "td.navimainnone    { text-align:center; font-family: Arial; font-size:12pt; }"CRLF
+    "td.navisub, a.navisub"CRLF
+    "                   { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }"CRLF
+    "td.navimain, td.navisub"CRLF
+    "                   { padding-left:7pt; padding-right:7pt; }"CRLF
+    CRLF
+    "a.membertitle  { font-size:12pt; font-weight:bold; line-height:18pt; }"CRLF
+    "a.navimain, a.navisub  { color:#000000; }"CRLF
+    ".dt            { font-weight:bold; }"CRLF
+    ".namechain     { font-size:13pt; font-weight:bold;"CRLF
+    "                 margin-top:3pt; margin-bottom:6pt; }"CRLF
+    ".title2        { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }"CRLF
+    ;
+
+
+const char * const C_sCssExplanations =
+    "/* Explanation of CSS classes:"CRLF
+    CRLF
+    ".navimain          Text in main navigation bar."CRLF
+    ".navisub           Text in lower navigation bar."CRLF
+    "td.navimainself    Cell in main navigation bar with \"selected\" shadow: You are here."CRLF
+    "td.navimainnone    Cell in main navigation bar with no link."CRLF
+    CRLF
+    ".namechain         Line with current module path."CRLF
+    CRLF
+    "td.crosstitle      Comment box for bases (base interfaces etc.)"CRLF
+    "td.imsum_left      Left part of such boxes."CRLF
+    "td.imsum_right     Right part of such boxes."CRLF
+    CRLF
+    "td.title           Main title of the page like \"interface XYz\""CRLF
+    ".subtitle          Tables, and head cells of those, which list members"CRLF
+    "                   like \"method summary\" and \"method details\"."CRLF
+    CRLF
+    "td.imdetail        Background table of method's detail description."CRLF
+    "a.membertitle      Method name (as jump label) in method's detail"CRLF
+    "                   description."CRLF
+    ".title2            smaller font prefixes to page titles"CRLF
+    "*/"CRLF
+    ;
+
+const char * const C_sStdStyle_withDivFrame =
+    "/*See bottom of file for explanations.*/"CRLF
+    CRLF
+    "body { background-color:#ffffff; }"CRLF
+    CRLF
+    "#adc-idlref h3 { font-size:13pt; font-weight:bold;"CRLF
+    "                 margin-top:3pt; margin-bottom:1pt; }"CRLF
+    "#adc-idlref p, #adc-idlref dt, #adc-idlref dd, #adc-idlref pre"CRLF
+    "               { font-size:11pt;"CRLF
+    "                 margin-top:3pt; margin-bottom:1pt; }"CRLF
+    "#adc-idlref pre    { font-family:monospace; }"CRLF
+    CRLF
+    "#adc-idlref table.navimain { background-color:#eeeeff; }"CRLF
+    "#adc-idlref table.subtitle { margin-top:6pt; margin-bottom:6pt; }"CRLF
+    CRLF
+    "#adc-idlref td             { font-size:11pt; }"CRLF
+    "#adc-idlref td.title       { font-family: Arial; font-size:19pt; font-weight:bold;"CRLF
+    "                             line-height:30pt;   background-color:#ccccff; text-align:center; }"CRLF
+    "#adc-idlref td.subtitle    { font-family: Arial; font-size:13pt;"CRLF
+    "                             line-height:20pt;   background-color:#ccccff; }"CRLF
+    "#adc-idlref td.crosstitle  { font-size:12pt; font-weight:bold;"CRLF
+    "                             line-height:15pt;   background-color:#eeeeff; }"CRLF
+    "#adc-idlref td.imdetail    { width:100%;         background-color:#eeeeff; }"CRLF
+    CRLF
+    "#adc-idlref td.imsum_left  { width:30%;  }"CRLF
+    "#adc-idlref td.imsum_right { width:70%;  }"CRLF
+    CRLF
+    "#adc-idlref td.navimain, #adc-idlref a.navimain"CRLF
+    "                   { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }"CRLF
+    "#adc-idlref td.navimainself    { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;"CRLF
+    "                                 color:#ffffff; background-color:#2222ad; }"CRLF
+    "#adc-idlref td.navimainnone    { text-align:center; font-family: Arial; font-size:12pt; }"CRLF
+    "#adc-idlref td.navisub, #adc-idlref a.navisub"CRLF
+    "                   { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }"CRLF
+    "#adc-idlref td.navimain, #adc-idlref td.navisub"CRLF
+    "                   { padding-left:7pt; padding-right:7pt; }"CRLF
+    CRLF
+    "#adc-idlref a.membertitle  { font-size:12pt; font-weight:bold; line-height:18pt; }"CRLF
+    "#adc-idlref a.navimain, #adc-idlref a.navisub  { color:#000000; }"CRLF
+    "#adc-idlref .dt            { font-weight:bold; }"CRLF
+    "#adc-idlref .namechain     { font-size:13pt; font-weight:bold;"CRLF
+    "                             margin-top:3pt; margin-bottom:6pt; }"CRLF
+    "#adc-idlref .title2        { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }"CRLF
+    ""CRLF
+    "#adc-idlref table { empty-cells:show; }"CRLF
+    ""CRLF
+    "#adc-idlref .childlist td, "CRLF
+    "#adc-idlref .commentedlinks td, "CRLF
+    "#adc-idlref .memberlist td, "CRLF
+    "#adc-idlref .subtitle td, "CRLF
+    "#adc-idlref .crosstitle td  { border: .1pt solid #000000; }"CRLF
+    ""CRLF
+    "#adc-idlref .flag-table td { border: .1pt solid #cccccc; } "CRLF
+    ""CRLF
+    "#adc-idlref .title-table td, "CRLF
+    "#adc-idlref .table-in-method td, "CRLF
+    "#adc-idlref .table-in-data td, "CRLF
+    "#adc-idlref .navimain td, "CRLF
+    "#adc-idlref .navisub td, "CRLF
+    "#adc-idlref .expl-table td, "CRLF
+    "#adc-idlref .param-table td  { border: none; }"CRLF
+    ;
+
+
+}   // anonymous namespace
+
+
+StdFrame::StdFrame()
+    :   sDevelopersGuideHtmlRoot(),
+        bSimpleLinks(false)
+{
+}
+
+DYN Html_Image *
+StdFrame::LogoSrc() const
+{
+    return 0;
+
+//    return  new Html_Image( "logodot-blu.gif",
+//                            "109",
+//                            "54",
+//                            "RIGHT",
+//                            "0",
+//                            "OpenOffice" );
+
+}
+
+const char *
+StdFrame::LogoLink() const
+{
+    return "";
+//  return "http://www.sun.com";
+//  return "http://www.openoffice.org";
+}
+
+
+String              MakeCopyRight();
+
+const char *
+StdFrame::CopyrightText() const
+{
+    static String sCopyRight_( MakeCopyRight() );
+    return sCopyRight_.c_str();
+}
+
+const char *
+StdFrame::CssStyle() const
+{
+    if (bUse_OOoFrameDiv)
+        return C_sStdStyle_withDivFrame;
+    else
+        return C_sStdStyle;
+}
+
+const char *
+StdFrame::CssStylesExplanation() const
+{
+    return C_sCssExplanations;
+}
+
+const char *
+StdFrame::DevelopersGuideHtmlRoot() const
+{
+    return sDevelopersGuideHtmlRoot;
+}
+
+bool
+StdFrame::SimpleLinks() const
+{
+    return bSimpleLinks;
+}
+
+void
+StdFrame::Set_DevelopersGuideHtmlRoot( const String & i_directory )
+{
+    if (NOT i_directory.empty())
+    {
+        if (i_directory.char_at(i_directory.length()-1) == '/')
+        {
+            sDevelopersGuideHtmlRoot.assign(i_directory,i_directory.length()-1);
+            return;
+        }
+    }
+    sDevelopersGuideHtmlRoot = i_directory;
+}
+
+void
+StdFrame::Set_SimpleLinks()
+{
+    bSimpleLinks = true;
+}
+
+String
+MakeCopyRight()
+{
+    StreamStr cr(700);
+    time_t
+        gt;
+    time(&gt);
+    tm *
+        plt = localtime(&gt);
+    int year = 1900 + plt->tm_year;
+
+    cr  << "Copyright &copy; 1995, "
+        << year
+        << ", Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.";
+    return String(cr.c_str());
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/chd_udk2.cxx b/autodoc/source/display/html/chd_udk2.cxx
new file mode 100644
index 000000000000..76380aecc6fa
--- /dev/null
+++ b/autodoc/source/display/html/chd_udk2.cxx
@@ -0,0 +1,204 @@
+/* -*- 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 <precomp.h>
+#include <html/chd_udk2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/ary_disp.hxx>
+#include <ary/ceslot.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/cp_ce.hxx>
+
+#include "dsply_cl.hxx"
+#include "dsply_da.hxx"
+#include "dsply_op.hxx"
+#include "opageenv.hxx"
+#include "outfile.hxx"
+#include "pagemake.hxx"
+
+
+
+//********************      CppHtmlDisplay_Udk2     ********************//
+
+
+CppHtmlDisplay_Udk2::CppHtmlDisplay_Udk2()
+    :   pCurPageEnv(0)
+{
+}
+
+CppHtmlDisplay_Udk2::~CppHtmlDisplay_Udk2()
+{
+}
+
+void
+CppHtmlDisplay_Udk2::do_Run( const char *                      i_sOutputDirectory,
+                             const ary::cpp::Gate &            i_rAryGate,
+                             const display::CorporateFrame &   i_rLayout )
+{
+    SetRunData( i_sOutputDirectory, i_rAryGate, i_rLayout );
+
+    Create_Css_File();
+    Create_Overview_File();
+    Create_Help_File();
+    Create_AllDefs_File();
+
+    CreateFiles_InSubTree_Namespaces();
+    CreateFiles_InSubTree_Index();
+}
+
+void
+CppHtmlDisplay_Udk2::SetRunData( const char *                       i_sOutputDirectory,
+                                 const ary::cpp::Gate &             i_rAryGate,
+                                 const display::CorporateFrame &    i_rLayout )
+{
+    csv::ploc::Path aOutputDir( i_sOutputDirectory, true );
+    pCurPageEnv = new OuputPage_Environment( aOutputDir, i_rAryGate, i_rLayout );
+}
+
+void
+CppHtmlDisplay_Udk2::Create_Css_File()
+{
+    pCurPageEnv->MoveDir_2Root();
+    pCurPageEnv->SetFile_Css();
+    HtmlDocuFile::WriteCssFile(pCurPageEnv->CurPath());
+}
+
+void
+CppHtmlDisplay_Udk2::Create_Overview_File()
+{
+    pCurPageEnv->MoveDir_2Root();
+    PageDisplay aPageMaker( *pCurPageEnv );
+    aPageMaker.Create_OverviewFile();
+}
+
+void
+CppHtmlDisplay_Udk2::Create_Help_File()
+{
+    PageDisplay aPageMaker( *pCurPageEnv );
+    aPageMaker.Create_HelpFile();
+}
+
+void
+CppHtmlDisplay_Udk2::Create_AllDefs_File()
+{
+    PageDisplay aPageMaker( *pCurPageEnv );
+    aPageMaker.Create_AllDefsFile();
+}
+
+void
+CppHtmlDisplay_Udk2::CreateFiles_InSubTree_Namespaces()
+{
+    Cout() << "\nCreate files in subtree namespaces" << Endl();
+
+    const ary::cpp::Namespace &
+        rGlobalNsp = Gate().Ces().GlobalNamespace();
+
+    RecursiveDisplay_Namespace(rGlobalNsp);
+    Cout() << Endl();
+}
+
+void
+CppHtmlDisplay_Udk2::CreateFiles_InSubTree_Index()
+{
+    Cout() << "\nCreate files in subtree index" << Endl();
+    Cout() << Endl();
+
+    PageDisplay aPageMaker( *pCurPageEnv );
+    aPageMaker.Create_IndexFiles();
+}
+
+void
+CppHtmlDisplay_Udk2::RecursiveDisplay_Namespace( const ary::cpp::Namespace & i_rNsp )
+{
+    if (i_rNsp.Owner().IsValid())
+        pCurPageEnv->MoveDir_Down2( i_rNsp );
+    else
+        pCurPageEnv->MoveDir_2Names();
+    DisplayFiles_InNamespace( i_rNsp );
+
+    typedef std::vector< const ary::cpp::Namespace* > NspList;
+    NspList     aSubNspList;
+    i_rNsp.Get_SubNamespaces( aSubNspList );
+    for ( NspList::const_iterator it = aSubNspList.begin();
+          it != aSubNspList.end();
+          ++it )
+    {
+        RecursiveDisplay_Namespace( *(*it) );
+    }   // end for
+
+    pCurPageEnv->MoveDir_Up();
+}
+
+void
+CppHtmlDisplay_Udk2::DisplayFiles_InNamespace( const ary::cpp::Namespace & i_rNsp )
+{
+    PageDisplay aPageMaker( *pCurPageEnv );
+
+    ary::Slot_AutoPtr pSlot;
+
+    // Namespace
+    aPageMaker.Create_NamespaceFile();
+
+    // Classes
+    ClassDisplayer aClassDisplayer( *pCurPageEnv );
+    DisplaySlot( aClassDisplayer, i_rNsp, ary::cpp::Namespace::SLOT_Classes );
+
+    // Enums
+    DisplaySlot( aPageMaker, i_rNsp, ary::cpp::Namespace::SLOT_Enums );
+
+    // Typedefs
+    DisplaySlot( aPageMaker, i_rNsp, ary::cpp::Namespace::SLOT_Typedefs );
+
+    // Operations
+    OperationsDisplay aOperationsDisplayer( *pCurPageEnv );
+    DisplaySlot( aOperationsDisplayer, i_rNsp, ary::cpp::Namespace::SLOT_Operations );
+    aOperationsDisplayer.Create_Files();
+
+    // Data
+    DataDisplay aDataDisplayer( *pCurPageEnv );
+
+    aDataDisplayer.PrepareForConstants();
+    DisplaySlot( aDataDisplayer, i_rNsp, ary::cpp::Namespace::SLOT_Constants );
+
+    aDataDisplayer.PrepareForVariables();
+    DisplaySlot( aDataDisplayer, i_rNsp, ary::cpp::Namespace::SLOT_Variables );
+
+    aDataDisplayer.Create_Files();
+}
+
+const ary::cpp::Gate &
+CppHtmlDisplay_Udk2::Gate() const
+{
+    return pCurPageEnv->Gate();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/cre_link.cxx b/autodoc/source/display/html/cre_link.cxx
new file mode 100644
index 000000000000..74561b027e73
--- /dev/null
+++ b/autodoc/source/display/html/cre_link.cxx
@@ -0,0 +1,272 @@
+/* -*- 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 <precomp.h>
+#include "cre_link.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_define.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_enuval.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_macro.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/c_vari.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <ary/loc/locp_le.hxx>
+#include "hdimpl.hxx"
+#include "opageenv.hxx"
+#include "strconst.hxx"
+
+
+
+
+
+LinkCreator::LinkCreator( char *              o_rOutput,
+                          uintt               i_nOutputSize )
+    :   pOut(o_rOutput),
+        nOutMaxSize(i_nOutputSize),
+        pEnv(0)
+{
+}
+
+LinkCreator::~LinkCreator()
+{
+}
+
+void
+LinkCreator::do_Process( const ary::cpp::Namespace & i_rData )
+{
+    Create_PrePath( i_rData );
+    strcat( pOut, "index.html" );   // KORR_FUTURE   // SAFE STRCAT (#100211# - checked)
+}
+
+void
+LinkCreator::do_Process( const ary::cpp::Class & i_rData )
+{
+    Create_PrePath( i_rData );
+    strcat( pOut, ClassFileName(i_rData.LocalName().c_str()) ); // SAFE STRCAT (#100211# - checked)
+}
+
+void
+LinkCreator::do_Process( const ary::cpp::Enum & i_rData )
+{
+    Create_PrePath( i_rData );
+    strcat( pOut, EnumFileName(i_rData.LocalName().c_str()) ); // SAFE STRCAT (#100211# - checked)
+}
+
+void
+LinkCreator::do_Process( const ary::cpp::Typedef & i_rData )
+{
+    Create_PrePath( i_rData );
+    strcat( pOut, TypedefFileName(i_rData.LocalName().c_str()) ); // SAFE STRCAT (#100211# - checked)
+}
+
+void
+LinkCreator::do_Process( const ary::cpp::Function & i_rData )
+{
+    Create_PrePath( i_rData );
+
+    if ( i_rData.Protection() != ary::cpp::PROTECT_global )
+    {
+        strcat( pOut, "o.html" );   // SAFE STRCAT (#100211# - checked)
+    }
+    else
+    {
+        csv_assert(i_rData.Location().IsValid());
+        const ary::loc::File &
+            rFile = pEnv->Gate().Locations().Find_File(i_rData.Location());
+        strcat( pOut, HtmlFileName("o-", rFile.LocalName().c_str()) ); // SAFE STRCAT (#100211# - checked)
+    }
+
+    csv_assert(pEnv != 0);
+    strcat( pOut, OperationLink(pEnv->Gate(), i_rData.LocalName(), i_rData.CeId()) ); // SAFE STRCAT (#100211# - checked)
+}
+
+void
+LinkCreator::do_Process( const ary::cpp::Variable & i_rData )
+{
+    Create_PrePath( i_rData );
+
+    if ( i_rData.Protection() != ary::cpp::PROTECT_global )
+    {
+        strcat( pOut, "d.html" );       // SAFE STRCAT (#100211# - checked)
+    }
+    else
+    {
+        csv_assert(i_rData.Location().IsValid());
+        const ary::loc::File &
+            rFile = pEnv->Gate().Locations().Find_File(i_rData.Location());
+        strcat( pOut, HtmlFileName("d-", rFile.LocalName().c_str()) );  // SAFE STRCAT (#100211# - checked)
+    }
+
+    strcat( pOut, DataLink(i_rData.LocalName()) );  // SAFE STRCAT (#100211# - checked)
+}
+
+void
+LinkCreator::do_Process( const ary::cpp::EnumValue & i_rData )
+{
+    const ary::cpp::CodeEntity *
+        pEnum = pEnv->Gate().Ces().Search_Ce(i_rData.Owner());
+    if (pEnum == 0)
+        return;
+
+    pEnum->Accept(*this);
+    strcat(pOut, "#");      // SAFE STRCAT (#100211# - checked)
+    strcat(pOut, i_rData.LocalName().c_str());  // SAFE STRCAT (#100211# - checked)
+}
+
+void
+LinkCreator::do_Process( const ary::cpp::Define & i_rData )
+{
+    // KORR_FUTURE
+    // Only valid from Index:
+
+    *pOut = '\0';
+    strcat(pOut, "../def-all.html#");               // SAFE STRCAT (#100211# - checked)
+    strcat(pOut, i_rData.LocalName().c_str());      // SAFE STRCAT (#100211# - checked)
+}
+
+void
+LinkCreator::do_Process( const ary::cpp::Macro & i_rData )
+{
+    // KORR_FUTURE
+    // Only valid from Index:
+
+    *pOut = '\0';
+    strcat(pOut, "../def-all.html#");               // SAFE STRCAT (#100211# - checked)
+    strcat(pOut, i_rData.LocalName().c_str());    // SAFE STRCAT (#100211# - checked)
+}
+
+
+namespace
+{
+
+class NameScope_const_iterator
+{
+  public:
+                        NameScope_const_iterator(
+                            ary::cpp::Ce_id     i_nId,
+                            const ary::cpp::Gate &
+                                                i_rGate );
+
+                        operator bool() const   { return pCe != 0; }
+    const String  &     operator*() const;
+
+    void                go_up();
+
+  private:
+    const ary::cpp::CodeEntity *
+                        pCe;
+    const ary::cpp::Gate *
+                        pGate;
+};
+
+
+NameScope_const_iterator::NameScope_const_iterator(
+                                        ary::cpp::Ce_id         i_nId,
+                                        const ary::cpp::Gate &  i_rGate )
+    :   pCe(i_rGate.Ces().Search_Ce(i_nId)),
+        pGate(&i_rGate)
+{
+}
+
+const String  &
+NameScope_const_iterator::operator*() const
+{
+     return pCe ? pCe->LocalName()
+               : String::Null_();
+}
+
+void
+NameScope_const_iterator::go_up()
+{
+     if (pCe == 0)
+        return;
+    pCe = pGate->Ces().Search_Ce(pCe->Owner());
+}
+
+
+void                Recursive_CreatePath(
+                        char *              o_pOut,
+                        const NameScope_const_iterator &
+                                            i_it        );
+
+void
+Recursive_CreatePath( char *                            o_pOut,
+                      const NameScope_const_iterator &  i_it        )
+{
+    if (NOT i_it)
+        return;
+
+    NameScope_const_iterator it( i_it );
+    it.go_up();
+    if (NOT it)
+        return;     // Global Namespace
+    Recursive_CreatePath( o_pOut, it );
+
+    strcat( o_pOut, (*i_it).c_str() );          // SAFE STRCAT (#100211# - checked)
+    strcat( o_pOut, "/" );                      // SAFE STRCAT (#100211# - checked)
+}
+
+
+}   // anonymous namespace
+
+
+
+
+
+void
+LinkCreator::Create_PrePath( const ary::cpp::CodeEntity & i_rData )
+{
+    *pOut = NULCH;
+
+    if ( pEnv->CurNamespace() != 0 )
+    {
+        if ( pEnv->CurClass()
+                ?   pEnv->CurClass()->CeId() == i_rData.Owner()
+                :   pEnv->CurNamespace()->CeId() == i_rData.Owner() )
+            return;
+
+        strcat( pOut, PathUp(pEnv->Depth() - 1) );      // SAFE STRCAT (#100211# - checked)
+    }
+    else
+    {   // Within Index
+        strcat( pOut, "../names/" );                    // SAFE STRCAT (#100211# - checked)
+    }
+
+    NameScope_const_iterator it( i_rData.Owner(), pEnv->Gate() );
+    Recursive_CreatePath( pOut, it );
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/cre_link.hxx b/autodoc/source/display/html/cre_link.hxx
new file mode 100644
index 000000000000..c79523ff655f
--- /dev/null
+++ b/autodoc/source/display/html/cre_link.hxx
@@ -0,0 +1,136 @@
+/* -*- 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 ADC_DISPLAY_CRE_LINK_HXX
+#define ADC_DISPLAY_CRE_LINK_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cosv/tpl/processor.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+namespace cpp
+{
+     class CodeEntity;
+    class Namespace;
+    class Class;
+    class Enum;
+    class Typedef;
+    class Function;
+    class Variable;
+    class EnumValue;
+    class Define;
+    class Macro;
+}
+}
+
+
+class OuputPage_Environment;
+
+
+
+/** Displays links to ->{ary::cpp::CodeEntity CodeEntites}.
+*/
+class LinkCreator : public csv::ProcessorIfc,
+                    public csv::ConstProcessor<ary::cpp::Namespace>,
+                    public csv::ConstProcessor<ary::cpp::Class>,
+                    public csv::ConstProcessor<ary::cpp::Enum>,
+                    public csv::ConstProcessor<ary::cpp::Typedef>,
+                    public csv::ConstProcessor<ary::cpp::Function>,
+                    public csv::ConstProcessor<ary::cpp::Variable>,
+                    public csv::ConstProcessor<ary::cpp::EnumValue>,
+                    public csv::ConstProcessor<ary::cpp::Define>,
+                    public csv::ConstProcessor<ary::cpp::Macro>
+{
+  public:
+                        LinkCreator(
+                            char *              o_rOutput,
+                            uintt               i_nOutputSize );
+                        ~LinkCreator();
+
+
+    void                SetEnv(
+                            const OuputPage_Environment &
+                                                i_rEnv );
+  private:
+    void                Create_PrePath(
+                            const ary::cpp::CodeEntity &
+                                                i_rData );
+    // Interface csv::ConstProcessor<>
+    virtual void        do_Process(
+                            const ary::cpp::Namespace &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Class &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Enum &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Typedef &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Function &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Variable &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::EnumValue &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Define &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Macro &
+                                                i_rData );
+    // DATA
+    char *              pOut;
+    uintt               nOutMaxSize;
+    const OuputPage_Environment *
+                        pEnv;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+LinkCreator::SetEnv( const OuputPage_Environment & i_rEnv )
+    { pEnv = &i_rEnv; }
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/dsply_cl.cxx b/autodoc/source/display/html/dsply_cl.cxx
new file mode 100644
index 000000000000..f590889683c4
--- /dev/null
+++ b/autodoc/source/display/html/dsply_cl.cxx
@@ -0,0 +1,111 @@
+/* -*- 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 <precomp.h>
+#include "dsply_cl.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include "dsply_da.hxx"
+#include "dsply_op.hxx"
+#include "hdimpl.hxx"
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+
+
+
+
+ClassDisplayer::ClassDisplayer( OuputPage_Environment & io_rEnv )
+    :   pEnv(&io_rEnv)
+{
+}
+
+ClassDisplayer::~ClassDisplayer()
+{
+}
+
+void
+ClassDisplayer::DisplayFiles_InClass( const ary::cpp::Class & i_rData,
+                                      PageDisplay &           io_rPageMaker )
+{
+    // Classes
+    ClassDisplayer aClassDisplayer( Env() );
+    DisplaySlot( aClassDisplayer, i_rData, ary::cpp::Class::SLOT_NestedClasses );
+
+    // Enums
+    DisplaySlot( io_rPageMaker, i_rData, ary::cpp::Class::SLOT_Enums );
+
+    // Typedefs
+    DisplaySlot( io_rPageMaker, i_rData, ary::cpp::Class::SLOT_Typedefs );
+
+    // Operations
+    OperationsDisplay aOperationsDisplayer( Env() );
+
+    aOperationsDisplayer.PrepareForStdMembers();
+    DisplaySlot( aOperationsDisplayer, i_rData, ary::cpp::Class::SLOT_Operations );
+
+    aOperationsDisplayer.PrepareForStaticMembers();
+    DisplaySlot( aOperationsDisplayer, i_rData, ary::cpp::Class::SLOT_StaticOperations );
+
+    aOperationsDisplayer.Create_Files();
+
+    // Data
+    DataDisplay aDataDisplayer( Env() );
+
+    aDataDisplayer.PrepareForStdMembers();
+    DisplaySlot( aDataDisplayer, i_rData, ary::cpp::Class::SLOT_Data );
+
+    aDataDisplayer.PrepareForStaticMembers();
+    DisplaySlot( aDataDisplayer, i_rData, ary::cpp::Class::SLOT_StaticData );
+
+    aDataDisplayer.Create_Files();
+}
+
+void
+ClassDisplayer::do_Process( const ary::cpp::Class & i_rData )
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    PageDisplay aPageMaker( Env() );
+    aPageMaker.Process(i_rData);
+
+    Env().MoveDir_Down2( i_rData );
+    DisplayFiles_InClass( i_rData, aPageMaker );
+    Env().MoveDir_Up();
+}
+
+const ary::cpp::Gate *
+ClassDisplayer::inq_Get_ReFinder() const
+{
+    return & pEnv->Gate();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/dsply_cl.hxx b/autodoc/source/display/html/dsply_cl.hxx
new file mode 100644
index 000000000000..f2be896d2564
--- /dev/null
+++ b/autodoc/source/display/html/dsply_cl.hxx
@@ -0,0 +1,90 @@
+/* -*- 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 ADC_DISPLAY_HTML_HD_PAGE_HXX
+#define ADC_DISPLAY_HTML_HD_PAGE_HXX
+
+// BASE CLASSES
+#include <ary/ary_disp.hxx>
+#include <cosv/tpl/processor.hxx>
+// USED SERVICES
+#include <ary/types.hxx>
+
+class OuputPage_Environment;
+
+namespace ary
+{
+namespace cpp
+{
+    class Class;
+}
+}
+
+class PageDisplay;
+
+
+
+
+class ClassDisplayer : public ary::Display,
+                       public csv::ConstProcessor<ary::cpp::Class>
+{
+  public:
+                        ClassDisplayer(            // TODO
+                            OuputPage_Environment &
+                                                io_rEnv );
+    virtual             ~ClassDisplayer();
+
+ private:
+    // Interface csv::ConstProcessor<>:
+    virtual void        do_Process(
+                            const ary::cpp::Class &
+                                                i_data );
+    // Interface ary::Display:
+    virtual const ary::cpp::Gate *
+                        inq_Get_ReFinder() const;
+
+    // Locals
+    void                DisplayFiles_InClass(
+                            const ary::cpp::Class &
+                                                i_rData,
+                            PageDisplay &       io_rPageMaker );
+
+    OuputPage_Environment &
+                        Env()                   { return *pEnv; }
+
+    // DATA
+    OuputPage_Environment *
+                        pEnv;
+};
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/dsply_da.cxx b/autodoc/source/display/html/dsply_da.cxx
new file mode 100644
index 000000000000..4989e774f946
--- /dev/null
+++ b/autodoc/source/display/html/dsply_da.cxx
@@ -0,0 +1,202 @@
+/* -*- 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 <precomp.h>
+#include "dsply_da.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_vari.hxx>
+#include <ary/doc/d_docu.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <ary/loc/locp_le.hxx>
+#include <udm/html/htmlitem.hxx>
+#include "hd_docu.hxx"
+#include "hdimpl.hxx"
+#include "html_kit.hxx"
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+
+
+using namespace csi;
+
+
+
+DataDisplay::DataDisplay( OuputPage_Environment & io_rEnv )
+    :   aMap_GlobalDataDisplay(),
+        pClassMembersDisplay(0),
+        pEnv( &io_rEnv ),
+        pDocuShow( new Docu_Display(io_rEnv) )
+{
+}
+
+DataDisplay::~DataDisplay()
+{
+    csv::erase_map_of_heap_ptrs( aMap_GlobalDataDisplay );
+}
+
+void
+DataDisplay::PrepareForConstants()
+{
+    if (pClassMembersDisplay)
+        pClassMembersDisplay = 0;
+
+    csv::erase_map_of_heap_ptrs( aMap_GlobalDataDisplay );
+}
+
+void
+DataDisplay::PrepareForVariables()
+{
+    // Doesn't need to do anything yet.
+}
+
+void
+DataDisplay::PrepareForStdMembers()
+{
+    csv::erase_map_of_heap_ptrs( aMap_GlobalDataDisplay );
+
+    pClassMembersDisplay = new PageDisplay(*pEnv);
+    const ary::cpp::Class * pClass = pEnv->CurClass();
+    csv_assert( pClass != 0 );
+    pClassMembersDisplay->Setup_DataFile_for(*pClass);
+}
+
+void
+DataDisplay::PrepareForStaticMembers()
+{
+    // Doesn't need to do anything yet.
+}
+
+void
+DataDisplay::Create_Files()
+{
+    if (pClassMembersDisplay)
+    {
+        pClassMembersDisplay->Create_File();
+        pClassMembersDisplay = 0;
+    }
+    else
+    {
+         for ( Map_FileId2PagePtr::const_iterator it = aMap_GlobalDataDisplay.begin();
+              it != aMap_GlobalDataDisplay.end();
+              ++it )
+        {
+             (*it).second->Create_File();
+        }
+        csv::erase_map_of_heap_ptrs( aMap_GlobalDataDisplay );
+    }
+}
+
+void
+DataDisplay::do_Process( const ary::cpp::Variable & i_rData )
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    PageDisplay & rPage = FindPage_for( i_rData );
+
+    csi::xml::Element & rOut = rPage.CurOut();
+    Display_SglDatum( rOut, i_rData );
+}
+
+const ary::cpp::Gate *
+DataDisplay::inq_Get_ReFinder() const
+{
+    return & pEnv->Gate();
+}
+
+PageDisplay &
+DataDisplay::FindPage_for( const ary::cpp::Variable & i_rData )
+{
+    if ( pClassMembersDisplay )
+        return *pClassMembersDisplay;
+
+    SourceFileId
+            nSourceFile = i_rData.Location();
+    PageDisplay *
+            pFound = csv::value_from_map( aMap_GlobalDataDisplay, nSourceFile, (PageDisplay*)0 );
+    if ( pFound == 0 )
+    {
+         pFound = new PageDisplay( *pEnv );
+        const ary::loc::File &
+                rFile = pEnv->Gate().Locations().Find_File( nSourceFile );
+        pFound->Setup_DataFile_for(rFile);
+        aMap_GlobalDataDisplay[nSourceFile] = pFound;
+    }
+
+    return *pFound;
+}
+
+void
+DataDisplay::Display_SglDatum( csi::xml::Element &        rOut,
+                               const ary::cpp::Variable & i_rData )
+{
+    adcdisp::ExplanationList aDocu(rOut, true);
+    aDocu.AddEntry( 0 );
+
+    aDocu.Term()
+        >> *new html::Label( DataLabel(i_rData.LocalName()) )
+            << " ";
+    aDocu.Term()
+        << i_rData.LocalName();
+
+    dshelp::Get_LinkedTypeText( aDocu.Def(), *pEnv, i_rData.Type() );
+    aDocu.Def()
+        << " "
+        >> *new html::Strong
+            << i_rData.LocalName();
+    if ( i_rData.ArraySize().length() > 0 )
+    {
+        aDocu.Def()
+            << "["
+            << i_rData.ArraySize()
+            << "]";
+    }
+    if ( i_rData.Initialisation().length() > 0 )
+    {
+        aDocu.Def()
+            << " = "
+            << i_rData.Initialisation();
+    }
+    aDocu.Def()
+        << ";"
+        << new html::LineBreak
+        << new html::LineBreak;
+
+    aDocu.AddEntry_NoTerm();
+
+    pDocuShow->Assign_Out(aDocu.Def());
+    pDocuShow->Process(i_rData.Docu());
+    pDocuShow->Unassign_Out();
+
+    rOut << new html::HorizontalLine;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/dsply_da.hxx b/autodoc/source/display/html/dsply_da.hxx
new file mode 100644
index 000000000000..45f0b15f9503
--- /dev/null
+++ b/autodoc/source/display/html/dsply_da.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 ADC_DISPLAY_HTML_DSPLY_DA_HXX
+#define ADC_DISPLAY_HTML_DSPLY_DA_HXX
+
+// BASE CLASSES
+#include <ary/ary_disp.hxx>
+#include <cosv/tpl/processor.hxx>
+// USED SERVICES
+#include <ary/cpp/c_ce.hxx>
+
+namespace ary
+{
+    namespace cpp
+    {
+        class Variable;
+    }
+}
+namespace csi
+{
+    namespace xml
+    {
+        class Element;
+    }
+}
+
+
+
+
+class OuputPage_Environment;
+class PageDisplay;
+class Docu_Display;
+
+class DataDisplay : public ary::Display,
+                    public csv::ConstProcessor<ary::cpp::Variable>
+{
+  public:
+                        DataDisplay(
+                            OuputPage_Environment &
+                                                io_rInfo );
+    virtual             ~DataDisplay();
+
+    void                PrepareForConstants();
+    void                PrepareForVariables();
+    void                PrepareForStdMembers();
+    void                PrepareForStaticMembers();
+
+    void                Create_Files();
+
+ private:
+    // Interface csv::ConstProcessor<>:
+    virtual void        do_Process(
+                            const ary::cpp::Variable &
+                                                i_rData );
+    // Interface ary::cpp::Display:
+    virtual const ary::cpp::Gate *
+                        inq_Get_ReFinder() const;
+
+    // Locals
+    typedef ary::cpp::Lid                               SourceFileId;
+    typedef std::map< SourceFileId, DYN PageDisplay* >  Map_FileId2PagePtr;
+
+    PageDisplay &       FindPage_for(
+                            const ary::cpp::Variable &
+                                                i_rData );
+    void                Display_SglDatum(
+                            csi::xml::Element & rOut,
+                            const ary::cpp::Variable &
+                                                i_rData );
+    // DATA
+    Map_FileId2PagePtr  aMap_GlobalDataDisplay;
+    Dyn<PageDisplay>    pClassMembersDisplay;
+
+    OuputPage_Environment *
+                        pEnv;
+    Dyn<Docu_Display>   pDocuShow;
+};
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/dsply_op.cxx b/autodoc/source/display/html/dsply_op.cxx
new file mode 100644
index 000000000000..e34db602ff6a
--- /dev/null
+++ b/autodoc/source/display/html/dsply_op.cxx
@@ -0,0 +1,210 @@
+/* -*- 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 <precomp.h>
+#include "dsply_op.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/loc/locp_le.hxx>
+#include <udm/html/htmlitem.hxx>
+#include "hd_docu.hxx"
+#include "hdimpl.hxx"
+#include "html_kit.hxx"
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+
+using namespace csi;
+using namespace adcdisp;
+
+
+
+
+OperationsDisplay::OperationsDisplay( OuputPage_Environment & io_rEnv )
+    :   // aMap_GlobalFunctionsDisplay,
+        // pClassMembersDisplay,
+        pEnv( &io_rEnv ),
+        pDocuShow( new Docu_Display(io_rEnv) )
+{
+}
+
+OperationsDisplay::~OperationsDisplay()
+{
+    csv::erase_map_of_heap_ptrs( aMap_GlobalFunctionsDisplay );
+}
+
+void
+OperationsDisplay::PrepareForStdMembers()
+{
+    csv::erase_map_of_heap_ptrs( aMap_GlobalFunctionsDisplay );
+
+    pClassMembersDisplay = new PageDisplay(*pEnv);
+    const ary::cpp::Class * pClass = pEnv->CurClass();
+    csv_assert( pClass != 0 );
+    pClassMembersDisplay->Setup_OperationsFile_for(*pClass);
+}
+
+void
+OperationsDisplay::PrepareForStaticMembers()
+{
+    // Doesn't need to do anything yet.
+}
+
+void
+OperationsDisplay::Create_Files()
+{
+    if (pClassMembersDisplay)
+        pClassMembersDisplay->Create_File();
+    else
+    {
+         for ( Map_FileId2PagePtr::const_iterator it = aMap_GlobalFunctionsDisplay.begin();
+              it != aMap_GlobalFunctionsDisplay.end();
+              ++it )
+        {
+             (*it).second->Create_File();
+        }
+    }
+}
+
+void
+OperationsDisplay::do_Process( const ary::cpp::Function & i_rData )
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    PageDisplay & rPage = FindPage_for( i_rData );
+
+    csi::xml::Element & rOut = rPage.CurOut();
+    Display_SglOperation( rOut, i_rData );
+}
+
+const ary::cpp::Gate *
+OperationsDisplay::inq_Get_ReFinder() const
+{
+    return & pEnv->Gate();
+}
+
+PageDisplay &
+OperationsDisplay::FindPage_for( const ary::cpp::Function & i_rData )
+{
+    if ( pClassMembersDisplay )
+        return *pClassMembersDisplay;
+
+    SourceFileId
+            nSourceFile = i_rData.Location();
+    PageDisplay *
+            pFound = csv::value_from_map( aMap_GlobalFunctionsDisplay, nSourceFile, (PageDisplay*)0 );
+    if ( pFound == 0 )
+    {
+         pFound = new PageDisplay( *pEnv );
+        const ary::loc::File &
+                rFile = pEnv->Gate().Locations().Find_File( nSourceFile );
+        pFound->Setup_OperationsFile_for(rFile);
+        aMap_GlobalFunctionsDisplay[nSourceFile] = pFound;
+    }
+
+    return *pFound;
+}
+
+void
+OperationsDisplay::Display_SglOperation( csi::xml::Element &        rOut,
+                                         const ary::cpp::Function & i_rData )
+{
+    adcdisp::ExplanationList aDocu(rOut, true);
+    aDocu.AddEntry( 0 );
+
+
+    adcdisp::OperationTitle fTitle;
+    fTitle( aDocu.Term(),
+            i_rData.LocalName(),
+            i_rData.CeId(),
+            pEnv->Gate() );
+
+    // Syntax
+    adcdisp::ExplanationList aSyntaxHeader(aDocu.Def());
+    aSyntaxHeader.AddEntry( 0, "simple" );
+    csi::xml::Element & rHeader = aSyntaxHeader.Term();
+
+    adcdisp::ParameterTable
+        aParams( aSyntaxHeader.Def() );
+
+    if (i_rData.TemplateParameters().size() > 0)
+    {
+        TemplateClause fTemplateClause;
+        fTemplateClause( rHeader, i_rData.TemplateParameters() );
+        rHeader << new html::LineBreak;
+    }
+    if ( i_rData.Flags().IsExternC() )
+    {
+         rHeader
+                << "extern \"C\""
+                << new html::LineBreak;
+    }
+
+    bool bConst = false;
+    bool bVolatile = false;
+    WriteOut_LinkedFunctionText( rHeader, aParams, i_rData, *pEnv,
+                                 &bConst, &bVolatile );
+    aDocu.Def() << new html::LineBreak;
+
+    // Flags
+    aDocu.AddEntry_NoTerm();
+    adcdisp::FlagTable
+        aFlags( aDocu.Def(), 8 );
+
+    const ary::cpp::FunctionFlags &
+        rFFlags = i_rData.Flags();
+    aFlags.SetColumn( 0, "virtual",
+                      i_rData.Virtuality() != ary::cpp::VIRTUAL_none );
+    aFlags.SetColumn( 1, "abstract",
+                      i_rData.Virtuality() == ary::cpp::VIRTUAL_abstract );
+    aFlags.SetColumn( 2, "const", bConst );
+    aFlags.SetColumn( 3, "volatile", bVolatile );
+    aFlags.SetColumn( 4, "template",
+                      i_rData.TemplateParameters().size() > 0 );
+    aFlags.SetColumn( 5, "static",
+                      rFFlags.IsStaticLocal() OR rFFlags.IsStaticMember() );
+    aFlags.SetColumn( 6, "inline",
+                      rFFlags.IsInline() );
+    aFlags.SetColumn( 7, "C-linkage",
+                      rFFlags.IsExternC() );
+    aDocu.Def() << new html::LineBreak;
+
+    // Docu
+    aDocu.AddEntry_NoTerm();
+    pDocuShow->Assign_Out(aDocu.Def());
+    pDocuShow->Process(i_rData.Docu());
+    pDocuShow->Unassign_Out();
+
+    rOut << new html::HorizontalLine;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/dsply_op.hxx b/autodoc/source/display/html/dsply_op.hxx
new file mode 100644
index 000000000000..27f2657a0f57
--- /dev/null
+++ b/autodoc/source/display/html/dsply_op.hxx
@@ -0,0 +1,107 @@
+/* -*- 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 ADC_DISPLAY_HTML_DSPLY_OP_HXX
+#define ADC_DISPLAY_HTML_DSPLY_OP_HXX
+
+// BASE CLASSES
+#include <ary/ary_disp.hxx>
+#include <cosv/tpl/processor.hxx>
+// USED SERVICES
+#include <ary/cpp/c_ce.hxx>
+
+namespace ary
+{
+    namespace cpp
+    {
+        class Function;
+    }
+}
+namespace csi
+{
+    namespace xml
+    {
+        class Element;
+    }
+}
+
+class OuputPage_Environment;
+class PageDisplay;
+class Docu_Display;
+
+
+
+
+class OperationsDisplay : public ary::Display,
+                          public csv::ConstProcessor<ary::cpp::Function>
+{
+  public:
+                        OperationsDisplay(
+                            OuputPage_Environment &
+                                                io_rInfo );
+    virtual             ~OperationsDisplay();
+
+    void                PrepareForStdMembers();
+    void                PrepareForStaticMembers();
+    void                Create_Files();
+
+ private:
+    // Interface csv::ConstProcessor<>:
+    virtual void        do_Process(
+                            const ary::cpp::Function &
+                                                i_rData );
+    // Interface ary::Display:
+    virtual const ary::cpp::Gate *
+                        inq_Get_ReFinder() const;
+
+    // Locals
+    typedef ary::cpp::Lid                               SourceFileId;
+    typedef std::map< SourceFileId, DYN PageDisplay* >  Map_FileId2PagePtr;
+
+    PageDisplay &       FindPage_for(
+                            const ary::cpp::Function &
+                                                i_rData );
+    void                Display_SglOperation(
+                            csi::xml::Element & rOut,
+                            const ary::cpp::Function &
+                                                i_rData );
+    // DATA
+    Map_FileId2PagePtr  aMap_GlobalFunctionsDisplay;
+    Dyn<PageDisplay>    pClassMembersDisplay;
+
+    OuputPage_Environment *
+                        pEnv;
+    Dyn<Docu_Display>   pDocuShow;
+};
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/easywri.cxx b/autodoc/source/display/html/easywri.cxx
new file mode 100644
index 000000000000..b68b36d011d4
--- /dev/null
+++ b/autodoc/source/display/html/easywri.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "easywri.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+using namespace csi::html;
+
+
+EasyWriter::EasyWriter()
+{
+}
+
+EasyWriter::~EasyWriter()
+{
+}
+
+void
+EasyWriter::Open_OutputNode( csi::xml::Element & io_rDestination )
+{
+    aCurDestination.push(&io_rDestination);
+}
+
+void
+EasyWriter::Finish_OutputNode()
+{
+    csv_assert( NOT aCurDestination.empty() );
+    aCurDestination.pop();
+}
+
+csi::xml::Element &
+EasyWriter::Out()
+{
+    csv_assert( aCurDestination.size() > 0);
+    return *aCurDestination.top();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/easywri.hxx b/autodoc/source/display/html/easywri.hxx
new file mode 100644
index 000000000000..9a70a3c5b91c
--- /dev/null
+++ b/autodoc/source/display/html/easywri.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 ADC_DISPLAY_HTML_EASYWRI_HXX
+#define ADC_DISPLAY_HTML_EASYWRI_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <estack.hxx>
+    // PARAMETERS
+#include <udm/html/htmlitem.hxx>
+
+
+class EasyWriter
+{
+  public:
+    // LIFECYCLE
+                        EasyWriter();
+                        ~EasyWriter();
+
+    // OPERATIONS
+    /// Pushes csi::xml::Element on stack.
+    void                Open_OutputNode(
+                            csi::xml::Element & io_rDestination );
+    /// Pops front csi::xml::Element from stack.
+    void                Finish_OutputNode();
+
+    void                Enter(
+                            csi::xml::Element & io_rDestination )
+                                                { Open_OutputNode(io_rDestination); }
+    void                Leave()                 { Finish_OutputNode(); }
+
+    // ACCESS
+    csi::xml::Element & Out();                  // CurOutputNode
+
+  private:
+    EStack< csi::xml::Element * >
+                        aCurDestination;        // The front element is the currently used.
+                                                //   The later ones are the parents.
+};
+
+/*
+inline csi::xml::Element &
+EasyWriter::Out()
+    { csv_assert( aCurDestination.size() > 0 );
+      return *aCurDestination.top(); }
+*/
+
+// IMPLEMENTATION
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/hd_chlst.cxx b/autodoc/source/display/html/hd_chlst.cxx
new file mode 100644
index 000000000000..8e3c3c95ced1
--- /dev/null
+++ b/autodoc/source/display/html/hd_chlst.cxx
@@ -0,0 +1,592 @@
+/* -*- 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 <precomp.h>
+#include "hd_chlst.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/ceslot.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_vari.hxx>
+#include <ary/cpp/c_enuval.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <ary/loc/locp_le.hxx>
+#include <ary/doc/d_oldcppdocu.hxx>
+#include <ary/info/ci_attag.hxx>
+#include <ary/info/ci_text.hxx>
+#include <ary/info/all_dts.hxx>
+#include "hd_docu.hxx"
+#include "opageenv.hxx"
+#include "protarea.hxx"
+#include "strconst.hxx"
+
+
+using namespace csi;
+using html::Table;
+using html::TableRow;
+using html::TableCell;
+using html::Font;
+using html::SizeAttr;
+using html::BgColorAttr;
+using html::WidthAttr;
+
+
+const int   ixPublic = 0;
+const int   ixProtected = 1;
+const int   ixPrivate = 2;
+
+struct ChildList_Display::S_AreaCo
+{
+  public:
+    ProtectionArea      aArea;
+    Area_Result *       pResult;
+
+                        S_AreaCo(
+                            Area_Result &       o_rResult,
+                            const char *        i_sLabel,
+                            const char *        i_sTitle );
+                        ~S_AreaCo();
+
+    void                PerformResult();
+
+  private:
+    csi::xml::Element & Out()                   { return pResult->rOut; }
+};
+
+
+const ary::info::DocuText &
+ShortDocu( const ary::cpp::CodeEntity & i_rCe )
+{
+    static const ary::info::DocuText
+        aNull_;
+
+    const ary::doc::OldCppDocu *
+            pInfo = dynamic_cast< const ary::doc::OldCppDocu* >( i_rCe.Docu().Data() );
+    if (pInfo == 0)
+        return aNull_;
+
+    return pInfo->Short().CText();
+}
+
+
+ChildList_Display::ChildList_Display( OuputPage_Environment & io_rEnv )
+    :   HtmlDisplay_Impl( io_rEnv ),
+        pShortDocu_Display( new Docu_Display(io_rEnv) ),
+        pActiveParentClass(0),
+        pActiveParentEnum(0),
+        // pSglArea,
+        // aMemberAreas,
+        peClassesFilter(0)
+{
+}
+
+ChildList_Display::ChildList_Display( OuputPage_Environment & io_rEnv,
+                                      const ary::cpp::Class & i_rClass )
+    :   HtmlDisplay_Impl( io_rEnv ),
+        pShortDocu_Display( new Docu_Display(io_rEnv) ),
+        pActiveParentClass(&i_rClass),
+        pActiveParentEnum(0),
+        // pSglArea,
+        // aMemberAreas,
+        peClassesFilter(0)
+{
+}
+
+ChildList_Display::ChildList_Display( OuputPage_Environment & io_rEnv,
+                                      const ary::cpp::Enum &  i_rEnum )
+    :   HtmlDisplay_Impl( io_rEnv ),
+        pShortDocu_Display( new Docu_Display(io_rEnv) ),
+        pActiveParentClass(0),
+        pActiveParentEnum(&i_rEnum),
+        // pSglArea,
+        // aMemberAreas,
+        peClassesFilter(0)
+{
+}
+
+ChildList_Display::~ChildList_Display()
+{
+}
+
+void
+ChildList_Display::Run_Simple( Area_Result &       o_rResult,
+                               ary::SlotAccessId   i_nSlot,
+                               const char *        i_sListLabel,
+                               const char *        i_sListTitle )
+{
+    ary::Slot_AutoPtr
+            pSlot( ActiveParent().Create_Slot( i_nSlot ) );
+    if ( pSlot->Size() == 0 )
+        return;
+
+    pSglArea = new S_AreaCo( o_rResult,
+                             i_sListLabel,
+                             i_sListTitle );
+
+    pSlot->StoreAt(*this);
+
+    pSglArea->PerformResult();
+    pSglArea = 0;
+}
+
+void
+ChildList_Display::Run_GlobalClasses( Area_Result &        o_rResult,
+                                      ary::SlotAccessId    i_nSlot,
+                                      const char *         i_sListLabel,
+                                      const char *         i_sListTitle,
+                                      ary::cpp::E_ClassKey i_eFilter )
+{
+    ary::Slot_AutoPtr
+            pSlot( ActiveParent().Create_Slot( i_nSlot ) );
+    if ( pSlot->Size() == 0 )
+        return;
+
+    pSglArea = new S_AreaCo( o_rResult,
+                             i_sListLabel,
+                             i_sListTitle );
+
+    SetClassesFilter(i_eFilter);
+    pSlot->StoreAt(*this);
+    UnsetClassesFilter();
+
+    pSglArea->PerformResult();
+    pSglArea = 0;
+}
+
+void
+ChildList_Display::Run_Members( Area_Result &           o_rResult_public,
+                                Area_Result &           o_rResult_protected,
+                                Area_Result &           o_rResult_private,
+                                ary::SlotAccessId       i_nSlot,
+                                const char *            i_sListLabel_public,
+                                const char *            i_sListLabel_protected,
+                                const char *            i_sListLabel_private,
+                                const char *            i_sListTitle )
+{
+    ary::Slot_AutoPtr
+            pSlot( ActiveParent().Create_Slot(i_nSlot) );
+    if ( pSlot->Size() == 0 )
+        return;
+
+    aMemberAreas[ixPublic] = new S_AreaCo( o_rResult_public,
+                                         i_sListLabel_public,
+                                         i_sListTitle );
+    aMemberAreas[ixProtected] = new S_AreaCo( o_rResult_protected,
+                                            i_sListLabel_protected,
+                                            i_sListTitle );
+    aMemberAreas[ixPrivate] = new S_AreaCo( o_rResult_private,
+                                          i_sListLabel_private,
+                                          i_sListTitle );
+
+    pSlot->StoreAt(*this);
+
+    aMemberAreas[ixPublic]->PerformResult();
+    aMemberAreas[ixProtected]->PerformResult();
+    aMemberAreas[ixPrivate]->PerformResult();
+
+    aMemberAreas[ixPublic] = 0;
+    aMemberAreas[ixProtected] = 0;
+    aMemberAreas[ixPrivate] = 0;
+}
+
+void
+ChildList_Display::Run_MemberClasses( Area_Result &         o_rResult_public,
+                                      Area_Result &         o_rResult_protected,
+                                      Area_Result &         o_rResult_private,
+                                      ary::SlotAccessId     i_nSlot,
+                                      const char *          i_sListLabel_public,
+                                      const char *          i_sListLabel_protected,
+                                      const char *          i_sListLabel_private,
+                                      const char *          i_sListTitle,
+                                      ary::cpp::E_ClassKey  i_eFilter )
+{
+    ary::Slot_AutoPtr
+            pSlot( ActiveParent().Create_Slot(i_nSlot) );
+    if ( pSlot->Size() == 0 )
+        return;
+
+    aMemberAreas[ixPublic] = new S_AreaCo( o_rResult_public,
+                                           i_sListLabel_public,
+                                           i_sListTitle );
+    aMemberAreas[ixProtected] = new S_AreaCo( o_rResult_protected,
+                                              i_sListLabel_protected,
+                                              i_sListTitle );
+    aMemberAreas[ixPrivate] = new S_AreaCo( o_rResult_private,
+                                            i_sListLabel_private,
+                                            i_sListTitle );
+
+    SetClassesFilter(i_eFilter);
+    pSlot->StoreAt(*this);
+    UnsetClassesFilter();
+
+    aMemberAreas[ixPublic]->PerformResult();
+    aMemberAreas[ixProtected]->PerformResult();
+    aMemberAreas[ixPrivate]->PerformResult();
+
+    aMemberAreas[ixPublic] = 0;
+    aMemberAreas[ixProtected] = 0;
+    aMemberAreas[ixPrivate] = 0;
+}
+
+void
+ChildList_Display::do_Process( const ary::cpp::Namespace & i_rData )
+{
+    Write_ListItem( i_rData.LocalName(),
+                    Path2ChildNamespace(i_rData.LocalName()),
+                    ShortDocu( i_rData ),
+                    GetArea().GetTable() );
+}
+
+void
+ChildList_Display::do_Process( const ary::cpp::Class & i_rData )
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    if (peClassesFilter)
+    {
+         if (*peClassesFilter != i_rData.ClassKey() )
+            return;
+    }
+
+    String  sLink;
+    if ( i_rData.Protection() == ary::cpp::PROTECT_global )
+    {
+        sLink = ClassFileName(i_rData.LocalName());
+
+    }
+    else
+    {
+        csv_assert( pActiveParentClass != 0 );
+        sLink = Path2Child( ClassFileName(i_rData.LocalName()), pActiveParentClass->LocalName() );
+    }
+
+    if (peClassesFilter)
+    {
+        Write_ListItem( i_rData.LocalName(),
+                        sLink,
+                        ShortDocu( i_rData ),
+                        GetArea(i_rData.Protection())
+                            .GetTable() );
+    }
+    else
+    {
+        Write_ListItem( i_rData.LocalName(),
+                        sLink,
+                        ShortDocu( i_rData ),
+                        GetArea(i_rData.Protection())
+                            .GetTable(i_rData.ClassKey()) );
+    }
+}
+
+void
+ChildList_Display::do_Process( const ary::cpp::Enum & i_rData )
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    String  sLink;
+    if ( i_rData.Protection() == ary::cpp::PROTECT_global )
+    {
+        sLink = EnumFileName(i_rData.LocalName());
+    }
+    else
+    {
+        csv_assert( pActiveParentClass != 0 );
+        sLink = Path2Child( EnumFileName(i_rData.LocalName()),
+                            pActiveParentClass->LocalName() );
+    }
+
+    Write_ListItem( i_rData.LocalName(),
+                    sLink,
+                    ShortDocu( i_rData ),
+                    GetArea(i_rData.Protection()).GetTable() );
+}
+
+void
+ChildList_Display::do_Process( const ary::cpp::Typedef & i_rData )
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    String  sLink;
+    if ( i_rData.Protection() == ary::cpp::PROTECT_global )
+    {
+        sLink = TypedefFileName(i_rData.LocalName());
+    }
+    else
+    {
+        csv_assert( pActiveParentClass != 0 );
+        sLink = Path2Child( TypedefFileName(i_rData.LocalName()),
+                            pActiveParentClass->LocalName() );
+    }
+
+    Write_ListItem( i_rData.LocalName(),
+                    sLink,
+                    ShortDocu( i_rData ),
+                    GetArea(i_rData.Protection()).GetTable() );
+}
+
+void
+ChildList_Display::do_Process( const ary::cpp::Function & i_rData )
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    String  sLinkPrePath;
+    if ( i_rData.Protection() == ary::cpp::PROTECT_global )
+    {
+        const ary::loc::File &
+                rFile = Env().Gate().Locations().Find_File( i_rData.Location() );
+        sLinkPrePath = HtmlFileName( "o-", rFile.LocalName() );
+    }
+    else
+    {
+        csv_assert( pActiveParentClass != 0 );
+        sLinkPrePath = Path2Child( HtmlFileName( "o", "" ),
+                                   pActiveParentClass->LocalName() );
+    }
+
+    // Out
+    Table & rOut = GetArea(i_rData.Protection()).GetTable();
+    TableRow * dpRow = new TableRow;
+    rOut << dpRow;
+    TableCell & rCell1 = dpRow->AddCell();
+
+    rCell1
+        << SyntaxText_PreName( i_rData, Env().Gate() )
+        << new html::LineBreak;
+    rCell1
+        >> *new html::Link( OperationLink(
+                                Env().Gate(),
+                                i_rData.LocalName(),
+                                i_rData.CeId(),
+                                sLinkPrePath) )
+            << i_rData.LocalName();
+    rCell1
+        << SyntaxText_PostName( i_rData, Env().Gate() );
+    TableCell &
+        rCell2 = dpRow->AddCell();
+    rCell2
+        << new WidthAttr("50%")
+        << " ";
+
+    pShortDocu_Display->Assign_Out( rCell2 );
+    ShortDocu( i_rData ).StoreAt( *pShortDocu_Display );
+    pShortDocu_Display->Unassign_Out();
+}
+
+void
+ChildList_Display::do_Process( const ary::cpp::Variable & i_rData )
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    String  sLinkPrePath;
+    if ( i_rData.Protection() == ary::cpp::PROTECT_global )
+    {
+        const ary::loc::File &
+            rFile = Env().Gate().Locations().Find_File( i_rData.Location() );
+        sLinkPrePath = HtmlFileName( "d-", rFile.LocalName() );
+    }
+    else
+    {
+        csv_assert( pActiveParentClass != 0 );
+        sLinkPrePath = Path2Child( HtmlFileName( "d", "" ),
+                                   pActiveParentClass->LocalName() );
+    }
+
+    TableRow * dpRow = new TableRow;
+    GetArea(i_rData.Protection()).GetTable() << dpRow;
+
+    *dpRow << new html::BgColorAttr("white");
+    csi::xml::Element &
+        rCell1 = dpRow->AddCell();
+
+    dshelp::Get_LinkedTypeText( rCell1, Env(), i_rData.Type() );
+    rCell1
+        << " "
+        >> *new html::Link( DataLink(i_rData.LocalName(), sLinkPrePath.c_str()) )
+            >> *new html::Strong
+                << i_rData.LocalName()
+                << ";";
+
+    TableCell & rShortDocu = dpRow->AddCell();
+    pShortDocu_Display->Assign_Out( rShortDocu );
+    ShortDocu( i_rData ).StoreAt( *pShortDocu_Display );
+    pShortDocu_Display->Unassign_Out();
+}
+
+void
+ChildList_Display::do_Process( const ary::cpp::EnumValue & i_rData )
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    Table & rOut = GetArea().GetTable();
+
+    TableRow * dpRow = new TableRow;
+    rOut << dpRow;
+
+    *dpRow << new html::BgColorAttr("white");
+    dpRow->AddCell()
+        << new WidthAttr("20%")
+        << new xml::AnAttribute("valign", "top")
+        >> *new html::Label(i_rData.LocalName())
+            >> *new html::Bold
+                << i_rData.LocalName();
+
+    TableCell & rValueDocu = dpRow->AddCell();
+    pShortDocu_Display->Assign_Out( rValueDocu );
+    i_rData.Docu().Accept( *pShortDocu_Display );
+    pShortDocu_Display->Unassign_Out();
+}
+
+void
+ChildList_Display::do_StartSlot()
+{
+}
+
+void
+ChildList_Display::do_FinishSlot()
+{
+}
+
+const ary::cpp::Gate *
+ChildList_Display::inq_Get_ReFinder() const
+{
+    return & Env().Gate();
+}
+
+void
+ChildList_Display::Write_ListItem( const String &               i_sLeftText,
+                                   const char *                 i_sLink,
+                                   const ary::info::DocuText &  i_rRightText,
+                                   csi::xml::Element &          o_rOut )
+{
+    TableRow * dpRow = new TableRow;
+    o_rOut << dpRow;
+
+    *dpRow << new html::BgColorAttr("white");
+    dpRow->AddCell()
+        << new WidthAttr("20%")
+        >> *new html::Link( i_sLink )
+                >> *new html::Bold
+                        << i_sLeftText;
+
+    TableCell & rShortDocu = dpRow->AddCell();
+    pShortDocu_Display->Assign_Out( rShortDocu );
+    i_rRightText.StoreAt( *pShortDocu_Display );
+    pShortDocu_Display->Unassign_Out();
+}
+
+const ary::AryGroup &
+ChildList_Display::ActiveParent()
+{
+    return pActiveParentClass != 0
+                ?   static_cast< const ary::AryGroup& >(*pActiveParentClass)
+                :   pActiveParentEnum != 0
+                        ?   static_cast< const ary::AryGroup& >(*pActiveParentEnum)
+                        :   static_cast< const ary::AryGroup& >(*Env().CurNamespace());
+}
+
+ProtectionArea &
+ChildList_Display::GetArea()
+{
+    return pSglArea->aArea;
+}
+
+ProtectionArea &
+ChildList_Display::GetArea( ary::cpp::E_Protection i_eProtection )
+{
+    switch ( i_eProtection )
+    {
+         case ary::cpp::PROTECT_public:
+                        return aMemberAreas[ixPublic]->aArea;
+         case ary::cpp::PROTECT_protected:
+                        return aMemberAreas[ixProtected]->aArea;
+         case ary::cpp::PROTECT_private:
+                        return aMemberAreas[ixPrivate]->aArea;
+        default:
+                        return pSglArea->aArea;
+    }
+}
+
+
+//*******************               ********************//
+
+ChildList_Display::
+S_AreaCo::S_AreaCo( Area_Result &       o_rResult,
+                    const char *        i_sLabel,
+                    const char *        i_sTitle )
+    :   aArea(i_sLabel, i_sTitle),
+        pResult(&o_rResult)
+{
+}
+
+ChildList_Display::
+S_AreaCo::~S_AreaCo()
+{
+}
+
+void
+ChildList_Display::
+S_AreaCo::PerformResult()
+{
+    bool bUsed = aArea.WasUsed_Area();
+    pResult->rChildrenExist = bUsed;
+    if ( bUsed )
+    {
+        Create_ChildListLabel( Out(), aArea.Label() );
+
+        if ( aArea.Size() == 1 )
+        {
+            Out() << aArea.ReleaseTable();
+        }
+        else
+        {
+             Table * pTable = aArea.ReleaseTable( ary::cpp::CK_class );
+            if (pTable != 0)
+                Out() << pTable;
+             pTable = aArea.ReleaseTable( ary::cpp::CK_struct );
+            if (pTable != 0)
+                Out() << pTable;
+             pTable = aArea.ReleaseTable( ary::cpp::CK_union );
+            if (pTable != 0)
+                Out() << pTable;
+        }
+    }
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/hd_chlst.hxx b/autodoc/source/display/html/hd_chlst.hxx
new file mode 100644
index 000000000000..cbd784d4ed2c
--- /dev/null
+++ b/autodoc/source/display/html/hd_chlst.hxx
@@ -0,0 +1,209 @@
+/* -*- 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 ADC_DISPLAY_HTML_HD_CHLST_HXX
+#define ADC_DISPLAY_HTML_HD_CHLST_HXX
+
+// BASE CLASSES
+#include <ary/ary_disp.hxx>
+#include <cosv/tpl/processor.hxx>
+
+// USED SERVICES
+#include <ary/cpp/c_types4cpp.hxx>
+#include "hdimpl.hxx"
+
+
+
+namespace ary
+{
+    namespace cpp
+    {
+        class Namespace;
+        class Class;
+        class Enum;
+        class Typedef;
+        class Function;
+        class Variable;
+        class EnumValue;
+    }
+    namespace info
+    {
+        class DocuText;
+    }
+}
+
+class Docu_Display;
+class ProtectionArea;
+
+class ChildList_Display : public ary::Display,
+                          public csv::ConstProcessor<ary::cpp::Namespace>,
+                          public csv::ConstProcessor<ary::cpp::Class>,
+                          public csv::ConstProcessor<ary::cpp::Enum>,
+                          public csv::ConstProcessor<ary::cpp::Typedef>,
+                          public csv::ConstProcessor<ary::cpp::Function>,
+                          public csv::ConstProcessor<ary::cpp::Variable>,
+                          public csv::ConstProcessor<ary::cpp::EnumValue>,
+                          private HtmlDisplay_Impl
+{
+  public:
+    struct Area_Result
+    {
+        bool &              rChildrenExist;
+        csi::xml::Element & rOut;
+
+                            Area_Result(
+                                bool &                  o_rChildrenExist,
+                                csi::xml::Element &     o_rOut )
+                                :   rChildrenExist(o_rChildrenExist),
+                                    rOut(o_rOut) {}
+    };
+
+
+                        ChildList_Display(
+                            OuputPage_Environment &
+                                                io_rEnv );
+                        ChildList_Display(
+                            OuputPage_Environment &
+                                                io_rEnv,
+                            const ary::cpp::Class &
+                                                i_rClass );
+                        ChildList_Display(
+                            OuputPage_Environment &
+                                                io_rEnv,
+                            const ary::cpp::Enum &
+                                                i_rEnum );
+
+    virtual             ~ChildList_Display();
+
+    void                Run_Simple(
+                            Area_Result &       o_rResult,
+                            ary::SlotAccessId   i_nSlot,
+                            const char *        i_sListLabel,
+                            const char *        i_sListTitle );
+    void                Run_GlobalClasses(
+                            Area_Result &       o_rResult,
+                            ary::SlotAccessId   i_nSlot,
+                            const char *        i_sListLabel,
+                            const char *        i_sListTitle,
+                            ary::cpp::E_ClassKey
+                                                i_eFilter );
+    void                Run_Members(
+                            Area_Result &       o_rResult_public,
+                            Area_Result &       o_rResult_protected,
+                            Area_Result &       o_rResult_private,
+                            ary::SlotAccessId   i_nSlot,
+                            const char *        i_sListLabel_public,
+                            const char *        i_sListLabel_protected,
+                            const char *        i_sListLabel_private,
+                            const char *        i_sListTitle );
+    void                Run_MemberClasses(
+                            Area_Result &       o_rResult_public,
+                            Area_Result &       o_rResult_protected,
+                            Area_Result &       o_rResult_private,
+                            ary::SlotAccessId   i_nSlot,
+                            const char *        i_sListLabel_public,
+                            const char *        i_sListLabel_protected,
+                            const char *        i_sListLabel_private,
+                            const char *        i_sListTitle,
+                            ary::cpp::E_ClassKey
+                                                i_eFilter );
+  private:
+    // Interface csv::ConstProcessor<>:
+    virtual void        do_Process(
+                            const ary::cpp::Namespace &
+                                                i_rData );
+    /** i_rData is shown only, if it passes two filters:
+        it must have the right protection, checked with pFilter,
+        and the right class key (class,struct,union), checked with
+        pClassFilter. A not exsting filter allows i_rData to be
+        displayed.
+    */
+    virtual void        do_Process(
+                            const ary::cpp::Class &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Enum &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Typedef &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Function &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Variable &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::EnumValue &
+                                                i_rData );
+  private:
+    // Interface ary::Display:
+    virtual void        do_StartSlot();
+    virtual void        do_FinishSlot();
+    virtual const ary::cpp::Gate *
+                        inq_Get_ReFinder() const;
+    // Locals
+    struct S_AreaCo;
+    void                Write_ListItem(
+                            const String &      i_sLeftText,
+                            const char *        i_sLink,
+                            const ary::info::DocuText &
+                                                i_rRightText,
+                            csi::xml::Element & rOut );
+    const ary::AryGroup &
+                        ActiveParent();
+    ProtectionArea &    GetArea();
+    ProtectionArea &    GetArea(
+                            ary::cpp::E_Protection
+                                                i_eProtection );
+    void                SetClassesFilter(
+                            ary::cpp::E_ClassKey
+                                                i_eFilter )
+                                                { peClassesFilter = new ary::cpp::E_ClassKey(i_eFilter); }
+    void                UnsetClassesFilter()    { peClassesFilter = 0; }
+
+    // DATA
+    Dyn<Docu_Display>   pShortDocu_Display;
+    const ary::cpp::Class *
+                        pActiveParentClass;
+    const ary::cpp::Enum *
+                        pActiveParentEnum;
+
+    Dyn<S_AreaCo>       pSglArea;
+    Dyn<S_AreaCo>       aMemberAreas[3];
+
+    Dyn<ary::cpp::E_ClassKey>
+                        peClassesFilter;
+};
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/hd_docu.cxx b/autodoc/source/display/html/hd_docu.cxx
new file mode 100644
index 000000000000..c328255d7d6a
--- /dev/null
+++ b/autodoc/source/display/html/hd_docu.cxx
@@ -0,0 +1,486 @@
+/* -*- 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 <precomp.h>
+#include "hd_docu.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_vari.hxx>
+#include <ary/cpp/c_enuval.hxx>
+#include <ary/doc/d_oldcppdocu.hxx>
+#include <ary/info/all_tags.hxx>
+#include <ary/info/all_dts.hxx>
+#include <adc_cl.hxx>
+#include "html_kit.hxx"
+#include "opageenv.hxx"
+
+
+
+using namespace ary::info;
+using namespace csi;
+
+using html::DefList;
+using html::DefListTerm;
+using html::DefListDefinition;
+using html::Headline;
+using html::Link;
+
+
+const char *
+C_sTagHeadlines[ ary::info::C_eAtTag_NrOfClasses ] =
+    {
+        "ATTENTION!",   "Author",       "Changes",      "Collaborators",
+                                                                        "Contact",  // Contact may be unused
+        "Copyright",    "Deprecated",   "Description",  "Date of Documentation",
+                                                                        "How to Derive from this Class",
+        "Heap object - owner is responsible for deletion.",
+                        "Important Instances",
+                                        "Interface Only",
+                                                        "Invariant",    "Lifecycle",
+        "Multiplicity", "On Error",     "Persistency",  "Postcondition",
+                                                                        "Precondition",
+        "Responsibilities",
+                        "Return",       "Summary",      "Todos",        "Version",
+        "Base Classes", "Exceptions",   "Implements",   "Keywords",     "Parameters",
+        "See Also",     "Template Parameters",
+                                        "",             "Since "
+    };
+
+
+
+Docu_Display::Docu_Display( OuputPage_Environment & io_rEnv )
+    :   HtmlDisplay_Impl(io_rEnv),
+        bUseHtmlInDocuTokens(false),
+        pCurClassOverwrite(0)
+{
+}
+
+Docu_Display::~Docu_Display()
+{
+}
+
+void
+Docu_Display::Assign_Out( csi::xml::Element & o_rOut )
+{
+    Easy().Enter(o_rOut);
+}
+
+void
+Docu_Display::Unassign_Out()
+{
+    Easy().Leave();
+}
+
+void
+Docu_Display::do_Process( const ary::cpp::Namespace & i_rData )
+{
+    Process(i_rData.Docu());
+}
+
+void
+Docu_Display::do_Process( const ary::cpp::Class & i_rData )
+{
+    pCurClassOverwrite = &i_rData;
+    Process(i_rData.Docu());
+    pCurClassOverwrite = 0;
+}
+
+void
+Docu_Display::do_Process( const ary::cpp::Enum & i_rData )
+{
+    Process(i_rData.Docu());
+}
+
+void
+Docu_Display::do_Process( const ary::cpp::Typedef & i_rData )
+{
+    Process(i_rData.Docu());
+}
+
+void
+Docu_Display::do_Process( const ary::cpp::Function & i_rData )
+{
+    Process(i_rData.Docu());
+}
+
+void
+Docu_Display::do_Process( const ary::cpp::Variable & i_rData )
+{
+    Process(i_rData.Docu());
+}
+
+
+
+// --------------       Interface ary::info::DocuDisplay  ------------------ //
+
+
+void
+Docu_Display::do_Process(const ary::doc::Documentation & i_rData)
+{
+    if (i_rData.Data() == 0)
+        return;
+
+    const ary::doc::OldCppDocu *
+        docdata = dynamic_cast< const ary::doc::OldCppDocu* >(i_rData.Data());
+    csv_assert(docdata != 0);
+
+    Start_DocuBlock();
+
+    if ( docdata->IsObsolete() )
+    {
+        CurOut()
+            >> *new html::DefListTerm
+                >> *new html::Strong
+                    << "D E P R E C A T E D";
+
+    }
+
+    ary::doc::OldCppDocu::TagList::const_iterator
+        itEnd = docdata->Tags().end();
+    for ( ary::doc::OldCppDocu::TagList::const_iterator it = docdata->Tags().begin();
+          it != itEnd;
+          ++it )
+    {
+         (*it)->StoreAt( *this );
+    }
+
+    Finish_DocuBlock();
+}
+
+void
+Docu_Display::Display_StdTag( const StdTag & i_rData )
+{
+    const ary::info::DocuText::TokenList &
+        rText = i_rData.CText().Tokens();
+    typedef ary::info::DocuText::TokenList::const_iterator TokenIterator;
+
+    if ( rText.empty() )
+        return;
+    else if ( rText.size() < 3 )
+    {
+        bool bIsWhite = true;
+        for ( TokenIterator it = rText.begin();
+              it != rText.end();
+              ++it )
+        {
+            if (bIsWhite)
+                bIsWhite = (*it)->IsWhite();
+        }
+        if (bIsWhite)
+            return;
+    }
+
+    Write_TagTitle( C_sTagHeadlines[i_rData.Std_Id()] );
+    Write_TagContents( i_rData.CText() );
+}
+
+void
+Docu_Display::Display_BaseTag( const BaseTag & )
+{
+}
+
+void
+Docu_Display::Display_ExceptionTag( const ExceptionTag & )
+{
+}
+
+void
+Docu_Display::Display_ImplementsTag( const ImplementsTag & )
+{
+}
+
+void
+Docu_Display::Display_KeywordTag( const KeywordTag & )
+{
+}
+
+void
+Docu_Display::Display_ParameterTag( const ParameterTag & i_rData )
+{
+    Write_TagTitle( "Parameters" );
+
+    adcdisp::ExplanationTable
+        aParams( CurOut() >> *new DefListDefinition );
+
+    for ( const ParameterTag * pParam = &i_rData;
+          pParam != 0;
+          pParam = pParam->GetNext() )   // KORR_FUTURE
+    {
+        aParams.AddEntry( pParam->ParamName().c_str() );
+
+        Easy().Enter( aParams.Def() );
+        Write_Text( pParam->CText() );
+        Easy().Leave();
+    }   // end for
+}
+
+void
+Docu_Display::Display_SeeTag( const SeeTag & i_rData )
+{
+    Write_TagTitle( "See Also" );
+
+    DefListDefinition * dpDef = new DefListDefinition;
+    CurOut() << dpDef;
+    Easy().Enter(*dpDef);
+
+    for ( std::vector< ary::QualifiedName >::const_iterator
+            it = i_rData.References().begin();
+          it != i_rData.References().end();
+          ++it )
+    {
+        Write_LinkableText( (*it) );
+        CurOut() << new html::LineBreak;
+    }
+
+    Easy().Leave();
+}
+
+void
+Docu_Display::Display_TemplateTag( const TemplateTag & i_rData )
+{
+    Write_TagTitle( "Template Parameters" );
+
+    adcdisp::ExplanationTable
+        aTplParams( CurOut() >> *new DefListDefinition );
+
+    for ( const TemplateTag * pTplParam = &i_rData;
+          pTplParam != 0;
+          pTplParam = pTplParam->GetNext() )
+    {
+        aTplParams.AddEntry( pTplParam->TplParamName().c_str() );
+
+        Easy().Enter( aTplParams.Def() );
+        Write_Text( pTplParam->CText() );
+        Easy().Leave();
+    }   // end for
+}
+
+void
+Docu_Display::Display_LabelTag( const LabelTag & )
+{
+}
+
+void
+Docu_Display::Display_SinceTag( const ary::info::SinceTag & i_rData )
+{
+    if ( i_rData.Version().empty() )
+    {
+         return;
+    }
+
+    // Transform the value of the @since tag into the text to be displayed.
+    String sDisplay;
+    if ( autodoc::CommandLine::Get_().DoesTransform_SinceTag() )
+    {
+        sDisplay = autodoc::CommandLine::Get_()
+                        .DisplayOf_SinceTagValue( i_rData.Version() );
+    }
+    else
+    {
+        sDisplay = i_rData.Version();
+    }
+
+    if (sDisplay.empty())
+        return;
+
+    Write_TagTitle( "Since " );
+
+    DefListDefinition * dpDef = new DefListDefinition;
+    CurOut() << dpDef;
+
+    Easy().Enter(*dpDef);
+    CurOut() << sDisplay;
+    Easy().Leave();
+}
+
+void
+Docu_Display::Display_DT_Text( const DT_Text & i_rData )
+{
+    Write_TextToken(  i_rData.Text() );
+}
+
+void
+Docu_Display::Display_DT_MaybeLink( const DT_MaybeLink & i_rData )
+{
+    // KORR_FUTURE
+    Write_TextToken(  i_rData.Text() );
+}
+
+void
+Docu_Display::Display_DT_Whitespace( const DT_Whitespace & i_rData )
+{
+    static char sSpace[300] =
+        "                                         "
+        "                                         "
+        "                                         "
+        "                                         "
+        "                                         "
+        "                                        ";
+    UINT8 nLength = i_rData.Length();
+    sSpace[nLength] = NULCH;
+    CurOut() << sSpace;
+    sSpace[nLength] = ' ';
+}
+
+void
+Docu_Display::Display_DT_Eol( const DT_Eol & )
+{
+    CurOut() << new html::Sbr;
+}
+
+void
+Docu_Display::Display_DT_Xml( const ary::info::DT_Xml & i_rData )
+{
+    CurOut() << new xml::XmlCode( i_rData.Text() );
+}
+
+const ary::cpp::Gate *
+Docu_Display::inq_Get_ReFinder() const
+{
+    return &Env().Gate();
+}
+
+void
+Docu_Display::Start_DocuBlock()
+{
+    DYN DefList * dpDefList = new DefList;
+    CurOut() << dpDefList;
+    Easy().Enter( *dpDefList );
+}
+
+void
+Docu_Display::Finish_DocuBlock()
+{
+    Easy().Leave();
+}
+
+void
+Docu_Display::Write_TagTitle( const char *        i_sText,
+                              const char *        )
+{
+    if ( strcmp(i_sText,"ATTENTION!") == 0 )
+    {
+        CurOut()
+            >> *new html::DefListTerm
+                << new html::ClassAttr("attention")
+                << i_sText;
+    }
+    else
+    {
+        CurOut()
+            >> *new html::DefListTerm
+                << i_sText;
+    }
+}
+
+void
+Docu_Display::Write_TagContents( const DocuText & i_rDocuText )
+{
+    DefListDefinition * dpDef = new DefListDefinition;
+    CurOut() << dpDef;
+
+    Easy().Enter(*dpDef);
+    Write_Text(i_rDocuText);
+    Easy().Leave();
+}
+
+void
+Docu_Display::Write_Text( const ary::info::DocuText & i_rDocuText )
+{
+    if ( i_rDocuText.IsNoHtml() )
+    {
+        CurOut()
+            << new xml::XmlCode("<pre>");
+        bUseHtmlInDocuTokens = false;
+    }
+    else
+    {
+         bUseHtmlInDocuTokens = true;
+    }
+    i_rDocuText.StoreAt( *this );
+    if ( i_rDocuText.IsNoHtml() )
+    {
+        CurOut()
+            << new xml::XmlCode("</pre>");
+    }
+}
+
+void
+Docu_Display::Write_TextToken( const String & i_sText )
+{
+     if ( bUseHtmlInDocuTokens )
+        CurOut() << new xml::XmlCode(i_sText);
+    else
+        CurOut() << i_sText;
+}
+
+void
+Docu_Display::Write_LinkableText( const ary::QualifiedName & i_sQuName )
+{
+    const ary::cpp::CodeEntity *
+        pCe = FindUnambiguousCe( Env(), i_sQuName, pCurClassOverwrite );
+    if ( pCe != 0 )
+    {
+        csi::xml::Element *
+            pLink = new csi::html::Link( Link2Ce(Env(), *pCe) );
+        CurOut() << pLink;
+        Easy().Enter(*pLink);
+        Write_QualifiedName(i_sQuName);
+        Easy().Leave();
+    }
+    else
+    {
+        Write_QualifiedName(i_sQuName);
+    }
+    CurOut() << " ";
+}
+
+void
+Docu_Display::Write_QualifiedName( const ary::QualifiedName & i_sQuName )
+{
+    if ( i_sQuName.IsAbsolute() )
+        CurOut() << "::";
+    for ( ary::QualifiedName::namespace_iterator it = i_sQuName.first_namespace();
+          it != i_sQuName.end_namespace();
+          ++it )
+    {
+        CurOut() <<  (*it) << "::";
+    }
+    CurOut() << i_sQuName.LocalName();
+    if ( i_sQuName.IsFunction() )
+        CurOut() << "()";
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/hd_docu.hxx b/autodoc/source/display/html/hd_docu.hxx
new file mode 100644
index 000000000000..1eb00ae1c449
--- /dev/null
+++ b/autodoc/source/display/html/hd_docu.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 ADC_DISPLAY_HTML_HD_DOCU_HXX
+#define ADC_DISPLAY_HTML_HD_DOCU_HXX
+
+// BASE CLASSES
+#include <ary/ary_disp.hxx>
+#include <ary/info/infodisp.hxx>
+#include <cosv/tpl/processor.hxx>
+#include "hdimpl.hxx"
+
+namespace ary
+{
+    namespace cpp
+    {
+        class Namespace;
+        class Class;
+        class Enum;
+        class Typedef;
+        class Function;
+        class Variable;
+    }
+
+    namespace doc
+    {
+         class Documentation;
+    }
+    namespace info
+    {
+        class DocuText;
+    }
+
+    class QualifiedName;
+}
+
+class OuputPage_Environment;
+
+
+class Docu_Display : public ary::Display,
+                     public csv::ConstProcessor<ary::cpp::Namespace>,
+                     public csv::ConstProcessor<ary::cpp::Class>,
+                     public csv::ConstProcessor<ary::cpp::Enum>,
+                     public csv::ConstProcessor<ary::cpp::Typedef>,
+                     public csv::ConstProcessor<ary::cpp::Function>,
+                     public csv::ConstProcessor<ary::cpp::Variable>,
+                     public csv::ConstProcessor<ary::doc::Documentation>,
+                     public ary::info::DocuDisplay,
+                     private HtmlDisplay_Impl
+{
+  public:
+                        Docu_Display(
+                            OuputPage_Environment &
+                                                io_rEnv );
+    virtual             ~Docu_Display();
+
+    void                Assign_Out(
+                            csi::xml::Element & o_rOut );
+    void                Unassign_Out();
+
+    virtual void        Display_StdTag(
+                            const ary::info::StdTag &
+                                                i_rData );
+    virtual void        Display_BaseTag(
+                            const ary::info::BaseTag &
+                                                i_rData );
+    virtual void        Display_ExceptionTag(
+                            const ary::info::ExceptionTag &
+                                                i_rData );
+    virtual void        Display_ImplementsTag(
+                            const ary::info::ImplementsTag &
+                                                i_rData );
+    virtual void        Display_KeywordTag(
+                            const ary::info::KeywordTag &
+                                                i_rData );
+    virtual void        Display_ParameterTag(
+                            const ary::info::ParameterTag &
+                                                i_rData );
+    virtual void        Display_SeeTag(
+                            const ary::info::SeeTag &
+                                                i_rData );
+    virtual void        Display_TemplateTag(
+                            const ary::info::TemplateTag &
+                                                i_rData );
+    virtual void        Display_LabelTag(
+                            const ary::info::LabelTag &
+                                                i_rData );
+    virtual void        Display_SinceTag(
+                            const ary::info::SinceTag &
+                                                i_rData );
+
+    virtual void        Display_DT_Text(
+                            const ary::info::DT_Text &
+                                                i_rData );
+    virtual void        Display_DT_MaybeLink(
+                            const ary::info::DT_MaybeLink &
+                                                i_rData );
+    virtual void        Display_DT_Whitespace(
+                            const ary::info::DT_Whitespace &
+                                                i_rData );
+    virtual void        Display_DT_Eol(
+                            const ary::info::DT_Eol &
+                                                i_rData );
+    virtual void        Display_DT_Xml(
+                            const ary::info::DT_Xml &
+                                                i_rData );
+
+    using csv::ConstProcessor<ary::doc::Documentation>::Process;
+
+  private:
+    // Interface csv::ConstProcessor<>:
+    virtual void        do_Process(
+                            const ary::cpp::Namespace &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Class &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Enum &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Typedef &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Function &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Variable &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::doc::Documentation &
+                                                i_rData );
+    // Interface ary::Display:
+    virtual const ary::cpp::Gate *
+                        inq_Get_ReFinder() const;
+    // Locals
+    void                Start_DocuBlock();
+    void                Finish_DocuBlock();
+
+    void                Write_TagTitle(
+                            const char *        i_sText,
+                            const char *        i_nFontSize = "+0" );
+    void                Write_TagContents(
+                            const ary::info::DocuText &
+                                                i_rDocuText );
+    void                Write_Text(
+                            const ary::info::DocuText &
+                                                i_rDocuText );
+    void                Write_TextToken(
+                            const String  &     i_sText );
+    void                Write_LinkableText(
+                            const ary::QualifiedName &
+                                                i_sQuName );
+    void                Write_QualifiedName(
+                            const ary::QualifiedName &
+                                                i_sQuName );
+
+    // DATA
+    bool                bUseHtmlInDocuTokens;
+
+    /** This is used, if a class documentation is displayed,
+        because for links to members then the "current class"
+        is not the parent, but this class itself.
+    */
+    const ary::cpp::Class *
+                        pCurClassOverwrite;
+};
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/hdimpl.cxx b/autodoc/source/display/html/hdimpl.cxx
new file mode 100644
index 000000000000..f9d2b0f1636a
--- /dev/null
+++ b/autodoc/source/display/html/hdimpl.cxx
@@ -0,0 +1,549 @@
+/* -*- 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 <precomp.h>
+#include "hdimpl.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <stdlib.h>
+#include <stdio.h>
+#include <ary/ceslot.hxx>
+#include <ary/qualiname.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_de.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <udm/html/htmlitem.hxx>
+#include "cre_link.hxx"
+#include "hd_docu.hxx"
+#include "html_kit.hxx"
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+#include "strconst.hxx"
+
+
+using namespace csi;
+
+
+//********************       HtmlDisplay_Impl        *********************//
+
+HtmlDisplay_Impl::~HtmlDisplay_Impl()
+{
+}
+
+HtmlDisplay_Impl::HtmlDisplay_Impl( OuputPage_Environment & io_rEnv )
+    :   pEnv(&io_rEnv)
+        // aWriteHelper
+{
+}
+
+
+//********************       Free Functions        *********************//
+
+
+
+namespace dshelp
+{
+
+void
+DisplaySlot( ary::Display &          o_rDisplay,
+             const ary::AryGroup &   i_rGroup,
+             ary::SlotAccessId       i_nSlot )
+{
+     ary::Slot_AutoPtr pSlot( i_rGroup.Create_Slot(i_nSlot) );
+    pSlot->StoreAt( o_rDisplay );
+}
+
+
+const char *
+PathUp( uintt i_nLevels )
+{
+    static char sResult[300];
+
+    sResult[0] = NULCH;
+    for ( uintt lev = 0; lev < i_nLevels; ++lev )
+    {
+        strcat( sResult, "../");        // SAFE STRCAT (#100211# - checked)
+    }
+    return sResult;
+}
+
+const char *
+PathPerLevelsUp( uintt                   i_nLevels,
+                 const char *            i_nPathBelowDestinationLevel )
+{
+    static char sResult[500];
+    strcpy( sResult, PathUp(i_nLevels) );               // SAFE STRCPY (#100211# - checked)
+    // KORR_FUTURE: Make it still safer here:
+    strcat( sResult, i_nPathBelowDestinationLevel );    // SAFE STRCAT (#100211# - checked)
+    return sResult;
+}
+
+
+const char *
+PathPerRoot( const OuputPage_Environment & i_rEnv,
+             const char *                  i_sPathFromRootDir )
+{
+    return PathPerLevelsUp( i_rEnv.Depth(), i_sPathFromRootDir );
+}
+
+const char *
+PathPerNamespace( const OuputPage_Environment & i_rEnv,
+                  const char *                  i_sPathFromNamespaceDir )
+{
+    const ary::cpp::Namespace * pNsp = i_rEnv.CurNamespace();
+    if ( pNsp == 0 )
+        return "";
+
+    uintt nCount = i_rEnv.Depth() - (pNsp->Depth() + 1) ;
+    csv_assert( nCount < 100 );
+    return PathPerLevelsUp( nCount, i_sPathFromNamespaceDir );
+}
+
+const char *
+HtmlFileName( const char *            i_sPrefix,
+              const char *            i_sEntityName )
+{
+    // KORR_FUTURE: Make it still safer here:
+    static char sResult[300];
+    strcpy( sResult, i_sPrefix );       // SAFE STRCPY (#100211# - checked)
+    strcat( sResult, i_sEntityName );   // SAFE STRCAT (#100211# - checked)
+    strcat( sResult, ".html" );         // SAFE STRCAT (#100211# - checked)
+    return sResult;
+}
+
+const char *
+Path2Class( uintt                   i_nLevelsUp,
+            const char *            i_sClassLocalName )
+{
+    return PathPerLevelsUp( i_nLevelsUp, ClassFileName(i_sClassLocalName) );
+}
+
+const char *
+Path2Child( const char *            i_sFileName,
+            const char *            i_sSubDir )
+{
+    static char sResult[400];
+    if ( i_sSubDir != 0 )
+    {
+        // KORR_FUTURE: Make it still safer here:
+        strcpy( sResult, i_sSubDir );       // SAFE STRCPY (#100211# - checked)
+        strcat( sResult, "/" );             // SAFE STRCAT (#100211# - checked)
+    }
+    else
+    {
+        sResult[0] = NULCH;
+    }
+
+    strcat( sResult, i_sFileName );         // SAFE STRCAT (#100211# - checked)
+    return sResult;
+}
+
+const char *
+Path2ChildNamespace( const char * i_sLocalName )
+{
+    return Path2Child( C_sHFN_Namespace, i_sLocalName );
+}
+
+String
+OperationLink( const ary::cpp::Gate &               ,
+               const String  &                      i_sOpName,
+               ary::cpp::Ce_id                      i_nOpId,
+               const char *                         i_sPrePath )
+{
+    StreamLock
+        slResult(3000);
+    StreamStr &
+        sResult = slResult();
+
+    sResult
+        << i_sPrePath
+        << "#"
+        << i_sOpName
+        << "-"
+        << i_nOpId.Value();
+
+
+
+    return sResult.c_str();
+}
+
+const char *
+DataLink( const String  &         i_sLocalName,
+          const char *            i_sPrePath )
+{
+    StreamLock
+        slResult(3000);
+    StreamStr &
+        sResult = slResult();
+
+    sResult
+        << i_sPrePath
+        << "#"
+        << i_sLocalName;
+
+    return sResult.c_str();
+}
+
+void
+Get_LinkedTypeText( csi::xml::Element &             o_rOut,
+                    const OuputPage_Environment &   i_rEnv,
+                    ary::cpp::Type_id               i_nId,
+                    bool                            i_bWithAbsolutifier )
+{
+    if (NOT i_nId.IsValid())
+        return;
+
+     const char * sPreName = "";
+     const char * sName = "";
+     const char * sPostName = "";
+
+    bool bTypeExists = Get_TypeText( sPreName,
+                                     sName,
+                                     sPostName,
+                                     i_nId,
+                                     i_rEnv.Gate() );
+    if ( NOT bTypeExists )
+        return;
+
+    if ( NOT i_bWithAbsolutifier AND strncmp(sPreName,"::",2) == 0 )
+        sPreName+=2;
+
+    const ary::cpp::CodeEntity *
+        pCe = i_rEnv.Gate().Search_RelatedCe(i_nId);
+
+    String  sLink;
+    if ( pCe != 0 )
+    {
+        sLink = Link2Ce(i_rEnv,*pCe);
+    }
+    else
+    {
+        if ( strstr(sPreName,"com::sun::star") != 0 )
+        {
+            static StreamStr aLink(400);
+            aLink.seekp(0);
+            aLink << PathPerRoot(i_rEnv, "../../common/ref");
+            if ( *sPreName != ':' )
+                aLink << '/';
+            for ( const char * s = sPreName;
+                  *s != 0;
+                  ++s )
+            {
+                if ( *s == ':' )
+                {
+                     aLink << '/';
+                    ++s;
+                }
+                else
+                {
+                     aLink << *s;
+                }
+            }   // end for
+            aLink << sName
+                  << ".html";
+            sLink = aLink.c_str();
+        }
+    }   // endif( pCe != 0 )
+
+    o_rOut
+        << sPreName;
+    csi::xml::Element &
+        o_Goon = sLink.length() > 0
+                     ?   o_rOut >> * new html::Link( sLink.c_str() )
+                     :   o_rOut;
+    o_Goon
+        <<  sName;
+    o_rOut
+        << sPostName;
+}
+
+void
+Create_ChildListLabel( csi::xml::Element &     o_rParentElement,
+                       const char *            i_sLabel )
+{
+    if ( NOT csv::no_str(i_sLabel) )
+    {
+        o_rParentElement
+            >> *new html::Label(i_sLabel)
+                    << " ";
+    }
+}
+
+DYN csi::html::Table &
+Create_ChildListTable( const char * i_sTitle )
+{
+    html::Table *
+            dpTable = new html::Table;
+    *dpTable
+        << new html::ClassAttr( "childlist")
+        << new xml::AnAttribute( "border", "1" )
+        << new xml::AnAttribute( "cellpadding", "5" )
+        << new xml::AnAttribute( "cellspacing", "0" )
+        << new html::WidthAttr( "100%" );
+
+    html::TableRow &
+            rRow = dpTable->AddRow();
+    rRow
+        << new html::ClassAttr("subtitle")
+        >> *new html::TableCell
+                << new xml::AnAttribute( "colspan","2" )
+                >> *new html::Headline(4)
+                        << i_sTitle;
+    return *dpTable;
+}
+
+const char *
+Link2Ce( const OuputPage_Environment & i_rEnv,
+         const ary::cpp::CodeEntity &  i_rCe )
+{
+    const uintt         nMaxSize
+                            = 3000;
+    static char         sLink[nMaxSize];
+    static LinkCreator  aLinkCreator( &sLink[0], nMaxSize );
+    sLink[0] = NULCH;
+
+    aLinkCreator.SetEnv(i_rEnv);
+    i_rCe.Accept(aLinkCreator);
+
+    return sLink;
+}
+
+const char *
+Link2CppDefinition( const OuputPage_Environment & i_rEnv,
+                    const ary::cpp::DefineEntity &    i_rDef )
+{
+    const uintt         nMaxSize
+                            = 1000;
+    static char         sLink[nMaxSize];
+    static LinkCreator  aLinkCreator( &sLink[0], nMaxSize );
+    sLink[0] = NULCH;
+
+    aLinkCreator.SetEnv(i_rEnv);
+    i_rDef.Accept(aLinkCreator);
+
+    return sLink;
+}
+
+const ary::cpp::CodeEntity *
+FindUnambiguousCe( const OuputPage_Environment & i_rEnv,
+                   const ary::QualifiedName &    i_rQuName,
+                   const ary::cpp::Class *       i_pJustDocumentedClass )
+{
+     if ( i_rEnv.CurNamespace() == 0 )
+        return 0;
+
+    const ary::cpp::CodeEntity * ret = 0;
+
+    if ( NOT i_rQuName.IsQualified() )
+    {
+        if ( i_pJustDocumentedClass != 0 )
+            ret = i_rEnv.Gate().Ces().Search_CeLocal( i_rQuName.LocalName(),
+                                                      i_rQuName.IsFunction(),
+                                                      *i_rEnv.CurNamespace(),
+                                                      i_pJustDocumentedClass );
+        if (ret != 0)
+            return ret;
+
+        ret = i_rEnv.Gate().Ces().Search_CeLocal( i_rQuName.LocalName(),
+                                                  i_rQuName.IsFunction(),
+                                                  *i_rEnv.CurNamespace(),
+                                                  i_rEnv.CurClass() );
+    }
+    if (ret != 0)
+        return ret;
+
+    return i_rEnv.Gate().Ces().Search_CeAbsolute( *i_rEnv.CurNamespace(),
+                                                  i_rQuName );
+}
+
+void
+ShowDocu_On( csi::xml::Element &            o_rOut,
+             Docu_Display &                 io_rDisplay,
+             const ary::cpp::CppEntity &    i_rRE )
+{
+    if (i_rRE.Docu().Data() != 0)
+    {
+        io_rDisplay.Assign_Out( o_rOut );
+        io_rDisplay.Process(i_rRE.Docu());
+        io_rDisplay.Unassign_Out();
+    }
+}
+
+void
+WriteOut_TokenList( csi::xml::Element &     o_rOut,
+                    const StringVector &    i_rTokens,
+                    const char *            i_sSeparator )
+{
+    if ( i_rTokens.size() > 0 )
+    {
+        StringVector::const_iterator
+            it      = i_rTokens.begin();
+        StringVector::const_iterator
+            itEnd   = i_rTokens.end();
+
+        o_rOut << *it;
+        for ( ++it; it != itEnd; ++it )
+        {
+            o_rOut << i_sSeparator << *it;
+        }
+    };
+
+}
+
+void
+EraseLeadingSpace( String  & io_rStr )
+{
+    if ( *io_rStr.c_str() < 33 AND io_rStr.length() > 0 )
+    {
+        const unsigned char * pNew;
+        for ( pNew = (const unsigned char * ) io_rStr.c_str();
+              *pNew < 33 AND *pNew != 0;
+              ++pNew ) {}
+        String  sNew( (const char*)pNew );
+        io_rStr = sNew;
+    }
+}
+
+void
+WriteOut_LinkedFunctionText( csi::xml::Element &            o_rTitleOut,
+                             adcdisp::ParameterTable &      o_rParameters,
+                             const ary::cpp::Function &     i_rFunction,
+                             const OuputPage_Environment &  i_rEnv,
+                             bool *                         o_bIsConst,
+                             bool *                         o_bIsVirtual )
+{
+    // write pre-name:
+    const ary::cpp::FunctionFlags & rFlags = i_rFunction.Flags();
+    if ( rFlags.IsStaticLocal() OR rFlags.IsStaticMember() )
+        o_rTitleOut << "static ";
+    if ( rFlags.IsExplicit() )
+        o_rTitleOut << "explicit ";
+    if ( rFlags.IsMutable() )
+        o_rTitleOut << "mutable ";
+    if ( i_rFunction.Virtuality() != ary::cpp::VIRTUAL_none )
+        o_rTitleOut << "virtual ";
+//    o_rTitleOut << new html::LineBreak;
+
+    Get_LinkedTypeText( o_rTitleOut, i_rEnv, i_rFunction.ReturnType() );
+
+    // write name:
+    o_rTitleOut
+        << " "
+        >> *new html::Strong
+            << i_rFunction.LocalName();
+    o_rTitleOut
+            << "(";
+
+
+    csi::xml::Element * pOutLast = &o_rTitleOut;
+
+    // write post-name:
+    FunctionParam_Iterator fit;
+    fit.Assign(i_rFunction);
+
+    if (fit)
+    {
+        o_rParameters.AddEntry();
+        Get_LinkedTypeText( o_rParameters.Type(), i_rEnv, fit.CurType() );
+        o_rParameters.Type() << " ";
+        o_rParameters.Name() << " " << fit.CurName();
+
+        for ( ++fit; fit; ++fit )
+        {
+            o_rParameters.Name() << ",";
+            o_rParameters.AddEntry();
+            Get_LinkedTypeText( o_rParameters.Type(), i_rEnv, fit.CurType() );
+            o_rParameters.Name() << fit.CurName();
+        }
+
+        pOutLast = &o_rParameters.Name();
+        o_rParameters.Name() << " ";
+    }
+
+    *pOutLast  << ")";
+    if ( fit.IsFunctionConst() )
+    {
+        *pOutLast << " const";
+        if ( o_bIsConst != 0 )
+            *o_bIsConst = true;
+    }
+    if ( fit.IsFunctionVolatile() )
+    {
+        *pOutLast << " volatile";
+        if ( o_bIsVirtual != 0 )
+            *o_bIsVirtual = true;
+    }
+
+    // write Exceptions:
+    const std::vector< ary::cpp::Type_id > *
+            pThrow = i_rFunction.Exceptions();
+    if ( pThrow)
+    {
+        std::vector< ary::cpp::Type_id >::const_iterator
+                it = pThrow->begin();
+        std::vector< ary::cpp::Type_id >::const_iterator
+                it_end = pThrow->end();
+
+        if (it != it_end)
+        {
+            o_rParameters.AddEntry();
+            pOutLast = &o_rParameters.Name();
+
+            o_rParameters.Name() << " throw( ";
+            Get_LinkedTypeText(o_rParameters.Name(), i_rEnv, *it);
+
+            for ( ++it; it != it_end; ++it )
+            {
+                o_rParameters.Name() << ", ";
+                Get_LinkedTypeText(o_rParameters.Name(), i_rEnv, *it);
+            }
+            o_rParameters.Name() << " )";
+        }
+        else
+        {
+            *pOutLast << " throw()";
+        }
+    }   // endif // pThrow
+
+    // abstractness:
+    if ( i_rFunction.Virtuality() == ary::cpp::VIRTUAL_abstract )
+        *pOutLast << " = 0";
+
+    // finish:
+    *pOutLast << ";";
+}
+
+
+
+}   // namespace dshelp
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/hdimpl.hxx b/autodoc/source/display/html/hdimpl.hxx
new file mode 100644
index 000000000000..6caf652d499f
--- /dev/null
+++ b/autodoc/source/display/html/hdimpl.hxx
@@ -0,0 +1,250 @@
+/* -*- 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 ADC_DISPLAY_HDIMPL_HXX
+#define ADC_DISPLAY_HDIMPL_HXX
+
+// BASE CLASSES
+#include <udm/html/htmlitem.hxx>
+// USED SERVICES
+#include "easywri.hxx"
+#include <cosv/bstream.hxx>
+#include <ary/ary_disp.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_ce.hxx>
+#include "aryattrs.hxx"     // For compatibility with earlier times, when those funtions were in this header.
+
+
+namespace ary
+{
+     namespace cpp
+    {
+        class CodeEntity;
+        class Class;
+         class DisplayGate;
+        class Function;
+        class DefineEntity;
+        class OperationSignature;
+    }
+
+    class QualifiedName;
+}
+namespace csi
+{
+     namespace xml
+    {
+        class Element;
+    }
+     namespace html
+    {
+        class Table;
+    }
+}
+
+namespace adcdisp
+{
+     class ParameterTable;
+}
+
+class OuputPage_Environment;
+class Docu_Display;
+
+class HtmlDisplay_Impl
+{
+  public:
+                        ~HtmlDisplay_Impl();
+
+    const OuputPage_Environment &
+                        Env() const             { return *pEnv; }
+
+    // ACCESS
+    OuputPage_Environment &
+                        Env()                   { return *pEnv; }
+    EasyWriter &        Easy()                  { return aWriteHelper; }
+    csi::xml::Element & CurOut()                { return aWriteHelper.Out(); }
+
+  protected:
+                        HtmlDisplay_Impl(
+                            OuputPage_Environment &
+                                                io_rEnv );
+  private:
+    // DATA
+    OuputPage_Environment *
+                        pEnv;
+    EasyWriter          aWriteHelper;
+};
+
+
+namespace dshelp
+{
+
+void                DisplaySlot(
+                        ary::Display &      o_rDisplay,
+                        const ary::AryGroup &
+                                            i_rGroup,
+                        ary::SlotAccessId   i_nSlot );
+
+
+const char *        PathUp(
+                        uintt                   i_nLevels );
+const char *        PathPerLevelsUp(
+                        uintt                   i_nLevels,
+                        const char *            i_nPathBelowDestinationLevel );
+
+const char *        PathPerRoot(
+                        const OuputPage_Environment &
+                                                i_rEnv,
+                        const char *            i_sPathFromRootDir );
+const char *        PathPerNamespace(
+                        const OuputPage_Environment &
+                                                i_rEnv,
+                        const char *            i_sPathFromNamespaceDir );
+
+void                Create_ChildListLabel(
+                        csi::xml::Element &     o_rParentElement,
+                        const char *            i_sLabel );
+DYN csi::html::Table &
+                    Create_ChildListTable(
+                        const char *            i_sTitle );
+
+const char *        HtmlFileName(
+                        const char *            i_sPrefix,
+                        const char *            i_sEntityName );
+
+inline const char *
+ClassFileName( const char * i_sClassLocalName )
+    { return HtmlFileName( "c-", i_sClassLocalName); }
+inline const char *
+EnumFileName( const char * i_sEnumLocalName )
+    { return HtmlFileName( "e-", i_sEnumLocalName); }
+inline const char *
+TypedefFileName( const char * i_sTypedefLocalName )
+    { return HtmlFileName( "t-", i_sTypedefLocalName); }
+inline const char *
+FileFileName( const char * i_sFileLocalName )
+    { return HtmlFileName( "f-", i_sFileLocalName); }
+
+const char *        Path2Class(
+                        uintt                   i_nLevelsUp,
+                        const char *            i_sClassLocalName );
+
+const char *        Path2Child(
+                        const char *            i_sFileName,
+                        const char *            i_sSubDir = 0 );
+
+const char *        Path2ChildNamespace(
+                        const char *            i_sLocalName );
+
+String              OperationLink(
+                        const ary::cpp::Gate &  i_gate,
+                        const String  &         i_sOpName,
+                        ary::cpp::Ce_id         i_nOpId,
+                        const char *            i_sPrePath = "" );
+const char *        DataLink(
+                        const String  &         i_sLocalName,
+                        const char *            i_sPrePath = ""  );
+
+inline String
+OperationLabel( const String  &                      i_sOpName,
+                ary::cpp::Ce_id                      i_nOpId,
+                const ary::cpp::Gate &               i_gate )
+    { return String(OperationLink(i_gate, i_sOpName, i_nOpId) + 1); }     // Skip '#' in front.
+inline const char *
+DataLabel( const String  &         i_sLocalName )
+    { return DataLink(i_sLocalName) + 1; }     // Skip '#' in front.
+
+
+void                Get_LinkedTypeText(
+                        csi::xml::Element &     o_rOut,
+                        const OuputPage_Environment &
+                                                i_rEnv,
+                        ary::cpp::Type_id       i_nId,
+                        bool                    i_bWithAbsolutifier = true );
+
+
+const char *        Link2Ce(
+                        const OuputPage_Environment &
+                                                i_rEnv,
+                        const ary::cpp::CodeEntity &
+                                                i_rCe );
+
+const char *        Link2CppDefinition(
+                        const OuputPage_Environment &
+                                                i_rEnv,
+                        const ary::cpp::DefineEntity &
+                                                i_rDef );
+
+const ary::cpp::CodeEntity *
+                    FindUnambiguousCe(
+                        const OuputPage_Environment &
+                                                i_rEnv,
+                        const ary::QualifiedName &
+                                                i_rQuName,
+                        const ary::cpp::Class * i_pJustDocumentedClass );
+
+void                ShowDocu_On(
+                        csi::xml::Element &     o_rOut,
+                        Docu_Display &          io_rDisplay,
+                        const ary::cpp::CppEntity &
+                                                i_rRE );
+
+void                WriteOut_TokenList(
+                        csi::xml::Element &     o_rOut,
+                        const StringVector &    i_rTokens,
+                        const char *            i_sSeparator );
+
+void                EraseLeadingSpace(
+                        String  &               io_rStr );
+
+/** @param o_bIsConst
+    *o_bIsConst will be set to true, if o_bIsConst != 0 and function is const.
+    If the function is not const, *o_bIsConst remains unchanged!
+
+    @param o_bIsVirtual
+    The same as o_bIsConst.
+*/
+void                WriteOut_LinkedFunctionText(
+                        csi::xml::Element &     o_rTitleOut,
+                        adcdisp::ParameterTable &
+                                                o_rParameters,
+                        const ary::cpp::Function &
+                                                i_rFunction,
+                        const OuputPage_Environment &
+                                                i_rEnv,
+                        bool *                  o_bIsConst = 0,
+                        bool *                  o_bIsVirtual = 0 );
+
+
+
+}   // namespace dshelp
+
+using namespace dshelp;
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/html_kit.cxx b/autodoc/source/display/html/html_kit.cxx
new file mode 100644
index 000000000000..32ab5252a00c
--- /dev/null
+++ b/autodoc/source/display/html/html_kit.cxx
@@ -0,0 +1,307 @@
+/* -*- 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 <precomp.h>
+#include "html_kit.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <stdio.h>
+#include <ary/cpp/c_slntry.hxx>
+#include "hdimpl.hxx"
+
+
+namespace adcdisp
+{
+
+
+using namespace csi::xml;
+using namespace csi::html;
+
+
+void
+PageTitle_Left::operator()( XmlElement &        o_rOwner,
+                            const char *        i_sTypeTitle,
+                            const String &      i_sLocalName )
+{
+    o_rOwner
+        >> *new Headline(2)
+            << i_sTypeTitle
+            << " "
+            << i_sLocalName;
+}
+
+void
+PageTitle_Std::operator()( XmlElement &         o_rOwner,
+                           const char *         i_sTypeTitle,
+                           const String &       i_sLocalName )
+{
+    o_rOwner
+        >> *new AnElement("div")
+            << new ClassAttr("title")
+            >> *new Headline(2)
+                << i_sTypeTitle
+                << " "
+                << i_sLocalName;
+}
+
+XmlElement &
+PageTitle_Std::operator()( XmlElement & o_rOwner )
+{
+    XmlElement & ret =
+        o_rOwner
+            >> *new AnElement("div")
+                << new ClassAttr("title")
+                >> *new Headline(2);
+    return ret;
+}
+
+void
+OperationTitle::operator()( XmlElement &                o_owner,
+                            const char *                i_itemName,
+                            ary::cpp::Ce_id             i_id,
+                            const ::ary::cpp::Gate &    i_gate )
+{
+    o_owner
+        >> *new Label( OperationLabel(i_itemName, i_id, i_gate) )
+            << " ";
+    o_owner
+        << i_itemName;
+}
+
+
+void
+TemplateClause::operator()( XmlElement &           o_rOwner,
+                            const List_TplParams & i_rTplParams )
+{
+    if ( i_rTplParams.size() == 0 )
+        return;
+
+    Element & rOut =
+        o_rOwner
+            << new LineBreak
+            >> *new Paragraph
+                >> *new Strong
+                    << "template< ";
+
+    List_TplParams::const_iterator
+        it      = i_rTplParams.begin();
+    List_TplParams::const_iterator
+        itEnd   = i_rTplParams.end();
+
+    rOut
+        << (*it).Name();
+    for ( ++it; it != itEnd; ++it )
+    {
+        rOut
+            << ", "
+            << (*it).Name();
+    }  // end for
+      rOut << " >";
+}
+
+ExplanationList::ExplanationList( XmlElement & o_rOwner,
+                                  bool         i_bMemberStyle )
+    :   pList( new DefList),
+        pTerm(0),
+        pDefinition(0),
+        bMemberStyle(i_bMemberStyle)
+{
+    if (bMemberStyle)
+        *pList << new ClassAttr("member");
+
+    o_rOwner << pList;
+}
+
+void
+ExplanationList::AddEntry( const char *        i_sTerm,
+                           const char *        i_sDifferentClass )
+{
+    DefListTerm & rNewTerm = pList->AddTerm();
+    if ( i_sDifferentClass != 0 )
+    {
+        rNewTerm << new ClassAttr(i_sDifferentClass);
+    }
+    else if (bMemberStyle)
+    {
+        rNewTerm << new ClassAttr("member");
+    }
+    if ( i_sTerm != 0 )
+        rNewTerm << i_sTerm;
+
+    pTerm = &rNewTerm;
+    pDefinition = &pList->AddDefinition();
+    if (bMemberStyle)
+        *pDefinition << new ClassAttr("member");
+}
+
+void
+ExplanationList::AddEntry_NoTerm()
+{
+    pTerm = 0;
+    pDefinition = &pList->AddDefinition();
+    if (bMemberStyle)
+        *pDefinition << new ClassAttr("member");
+}
+
+ExplanationTable::ExplanationTable( XmlElement &    o_rOwner )
+    :   pTable(0),
+        pTerm(0),
+        pDefinition(0)
+{
+    pTable = new Table("0", "100%", "3", "0");
+    *pTable << new AnAttribute("class", "expl-table");
+    o_rOwner << pTable;
+}
+
+void
+ExplanationTable::AddEntry( const char *        i_sTerm,
+                            const char *        i_sDifferentStyle )
+{
+    TableRow &
+        rNewRow = pTable->AddRow();
+    TableCell &
+        rNewTerm = rNewRow.AddCell();
+    TableCell &
+        rNewDefinition = rNewRow.AddCell();
+
+    if ( i_sDifferentStyle == 0 )
+    {
+        rNewTerm << new WidthAttr("15%")
+                 << new StyleAttr("vertical-align:top; font-weight:bold");
+    }
+    else
+    {
+        rNewTerm << new StyleAttr(i_sDifferentStyle);
+    }
+    if ( i_sTerm != 0 )
+        rNewTerm << i_sTerm;
+
+    pTerm = &rNewTerm;
+    pDefinition = & (rNewDefinition >> *new APureElement("pre"));
+}
+
+ParameterTable::ParameterTable( XmlElement &    o_rOwner )
+    :   pTable(0),
+        pTerm(0),
+        pDefinition(0)
+{
+    pTable = new Table;
+    *pTable << new AnAttribute("class", "param-table");
+    o_rOwner << pTable;
+}
+
+void
+ParameterTable::AddEntry()
+{
+    TableRow &
+        rNewRow = pTable->AddRow();
+    TableCell &
+        rNewTerm = rNewRow.AddCell();
+    TableCell &
+        rNewDefinition = rNewRow.AddCell();
+
+    pTerm = &rNewTerm;
+    pDefinition = &rNewDefinition;
+}
+
+FlagTable::FlagTable( XmlElement &        o_rOwner,
+                      uintt               i_nNrOfColumns )
+{
+    pTable = new Table;
+    *pTable << new AnAttribute("class", "flag-table");
+    *pTable << new AnAttribute("border", "1");
+    *pTable << new AnAttribute("cellspacing", "0");
+    o_rOwner << pTable;
+
+    TableRow & rRow1 = pTable->AddRow();
+    TableRow & rRow2 = pTable->AddRow();
+
+    for ( uintt c = 0; c < i_nNrOfColumns; ++c )
+    {
+        TableCell & rCell1 = rRow1.AddCell();
+        int nWidth = 100 / i_nNrOfColumns;
+        static char sWidth[20];
+        sprintf( sWidth, "%d%%", nWidth );      // SAFE SPRINTF (#100211# - checked)
+
+        rCell1
+            << new WidthAttr( sWidth )
+            << new ClassAttr( "flagname" );
+        TableCell & rCell2 = rRow2.AddCell();
+        aCells.push_back( CellPair(&rCell1, &rCell2) );
+    }   // end for
+}
+
+void
+FlagTable::SetColumn( uintt               i_nColumnPosition,
+                      const char *        i_sColumnName,
+                      bool                i_bValue )
+{
+    csv_assert( i_nColumnPosition < aCells.size() );
+
+    TableCell &
+        rCell1 = *aCells[i_nColumnPosition].first;
+    TableCell &
+        rCell2 = *aCells[i_nColumnPosition].second;
+    rCell1
+        << i_sColumnName;
+    if (i_bValue)
+    {
+        rCell2
+            << new ClassAttr("flagyes")
+            << "YES";
+    }
+    else //
+    {
+        rCell2
+            << new ClassAttr("flagno")
+            << "NO";
+    }  // endif
+}
+
+IndexList::IndexList( XmlElement & o_rOwner )
+    :   pList( new DefList ),
+        pTerm(0),
+        pDefinition(0)
+{
+    o_rOwner << pList;
+}
+
+void
+IndexList::AddEntry()
+{
+    pTerm = &pList->AddTerm();
+    pDefinition = &pList->AddDefinition();
+}
+
+
+}   // namespace adcdisp
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/html_kit.hxx b/autodoc/source/display/html/html_kit.hxx
new file mode 100644
index 000000000000..35aba2887cdb
--- /dev/null
+++ b/autodoc/source/display/html/html_kit.hxx
@@ -0,0 +1,201 @@
+/* -*- 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 ADC_DISPLAY_HTML_KIT_HXX
+#define ADC_DISPLAY_HTML_KIT_HXX
+
+// BASE CLASSES
+#include <udm/xml/xmlitem.hxx>
+#include <udm/html/htmlitem.hxx>
+// USED SERVICES
+#include <ary/cpp/c_types4cpp.hxx>
+
+namespace ary
+{
+    namespace cpp
+    {
+        struct S_TplParam;
+        class OperationSignature;
+        class Gate;
+    }
+}
+
+
+
+
+namespace adcdisp
+{
+
+typedef csi::xml::Element XmlElement;
+
+class PageTitle_Left
+{
+  public:
+    void                operator()(
+                            XmlElement &        o_rOwner,
+                            const char *        i_sTypeTitle,
+                            const String  &     i_sLocalName );
+};
+
+class PageTitle_Std
+{
+  public:
+    void                operator()(
+                            XmlElement &        o_rOwner,
+                            const char *        i_sTypeTitle,
+                            const String  &     i_sLocalName );
+    XmlElement &        operator()(
+                            XmlElement &        o_rOwner );
+};
+
+class OperationTitle
+{
+  public:
+    void                operator()(
+                            XmlElement &        o_rOwner,
+                            const char *        i_sItemName,
+                            ary::cpp::Ce_id     i_nId,
+                            const ::ary::cpp::Gate &
+                                                i_gate );
+};
+
+
+class TemplateClause
+{
+  public:
+    typedef std::vector< ary::cpp::S_TplParam> List_TplParams;
+
+    void                operator()(
+                            XmlElement &        o_rOwner,
+                            const List_TplParams &
+                                                i_rTplParams );
+};
+
+
+class ExplanationList
+{
+  public:
+                        ExplanationList(
+                            XmlElement &        o_rOwner,
+                            bool                i_bMemberStyle = false );
+
+    void                AddEntry(
+                            const char *        i_sTerm = 0,
+                            const char *        i_sDifferentClass = 0 );
+    void                AddEntry_NoTerm();
+
+    XmlElement &        Term()                  { return *pTerm; }
+    XmlElement &        Def()                   { return *pDefinition; }
+
+  private:
+    csi::html::DefList* pList;
+    XmlElement *        pTerm;
+    XmlElement *        pDefinition;
+    bool                bMemberStyle;
+};
+
+class ExplanationTable
+{
+  public:
+                        ExplanationTable(
+                            XmlElement &        o_rOwner );
+
+    void                AddEntry(
+                            const char *        i_sTerm = 0,
+                            const char *        i_sDifferentStyle = 0 );
+
+    XmlElement &        Term()                  { return *pTerm; }
+    XmlElement &        Def()                   { return *pDefinition; }
+
+  private:
+    csi::html::Table*   pTable;
+    XmlElement *        pTerm;
+    XmlElement *        pDefinition;
+};
+
+class ParameterTable
+{
+  public:
+                        ParameterTable(
+                            XmlElement &        o_rOwner );
+
+    void                AddEntry();
+
+    XmlElement &        Type()                  { return *pTerm; }
+    XmlElement &        Name()                  { return *pDefinition; }
+
+  private:
+    csi::html::Table*   pTable;
+    XmlElement *        pTerm;
+    XmlElement *        pDefinition;
+};
+
+class FlagTable
+{
+  public:
+                        FlagTable(
+                            XmlElement &        o_rOwner,
+                            uintt               i_nNrOfColumns );
+
+    void                SetColumn(
+                            uintt               i_nColumnPosition,  /// Starting with 0.
+                            const char *        i_sColumnName,
+                            bool                i_bValue );         /// "YES" or "NO"
+  private:
+    typedef std::pair< csi::html::TableCell*, csi::html::TableCell* > CellPair;
+
+    // DATA
+    csi::html::Table*   pTable;
+    std::vector<CellPair>
+                        aCells;
+};
+
+class IndexList
+{
+  public:
+                        IndexList(
+                            XmlElement &        o_rOwner );
+
+    void                AddEntry();
+
+    XmlElement &        Term()                  { return *pTerm; }
+    XmlElement &        Def()                   { return *pDefinition; }
+
+  private:
+    csi::html::DefList* pList;
+    XmlElement *        pTerm;
+    XmlElement *        pDefinition;
+};
+
+
+
+
+}   // namespace adcdisp
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/makefile.mk b/autodoc/source/display/html/makefile.mk
new file mode 100644
index 000000000000..58046760ebd7
--- /dev/null
+++ b/autodoc/source/display/html/makefile.mk
@@ -0,0 +1,78 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=display_html
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/aryattrs.obj    \
+    $(OBJ)$/cfrstd.obj	    \
+    $(OBJ)$/chd_udk2.obj	\
+    $(OBJ)$/cre_link.obj	\
+    $(OBJ)$/dsply_cl.obj	\
+    $(OBJ)$/dsply_da.obj    \
+    $(OBJ)$/dsply_op.obj	\
+    $(OBJ)$/easywri.obj	    \
+    $(OBJ)$/hd_chlst.obj  	\
+    $(OBJ)$/hd_docu.obj  	\
+    $(OBJ)$/hdimpl.obj  	\
+    $(OBJ)$/html_kit.obj  	\
+    $(OBJ)$/nav_main.obj  	\
+    $(OBJ)$/navibar.obj  	\
+    $(OBJ)$/outfile.obj     \
+    $(OBJ)$/opageenv.obj    \
+    $(OBJ)$/pagemake.obj    \
+    $(OBJ)$/pm_aldef.obj    \
+    $(OBJ)$/pm_base.obj     \
+    $(OBJ)$/pm_class.obj    \
+    $(OBJ)$/pm_help.obj     \
+    $(OBJ)$/pm_index.obj    \
+    $(OBJ)$/pm_namsp.obj    \
+    $(OBJ)$/pm_start.obj    \
+    $(OBJ)$/protarea.obj
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/display/html/nav_main.cxx b/autodoc/source/display/html/nav_main.cxx
new file mode 100644
index 000000000000..781636fc9844
--- /dev/null
+++ b/autodoc/source/display/html/nav_main.cxx
@@ -0,0 +1,379 @@
+/* -*- 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 <precomp.h>
+#include "nav_main.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_ce.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <udm/html/htmlitem.hxx>
+#include "hdimpl.hxx"
+#include "opageenv.hxx"
+#include "strconst.hxx"
+
+
+using namespace ::csi::html;
+using namespace ::csi::xml;
+
+
+const String  sOverview("Overview");
+const String  sNamespace("Namespace");
+const String  sClass("Class");
+const String  sTree("Tree");
+const String  sProject("Project");
+const String  sFile("File");
+const String  sIndex("Index");
+const String  sHelp("Help");
+
+
+
+//********************    MainItem and derived ones      ***************//
+class MainItem
+{
+  public:
+    virtual             ~MainItem() {}
+    void                Write2(
+                            TableRow &          o_rOut );
+  private:
+    virtual void        do_Write2(
+                            TableRow &          o_rOut ) = 0;
+};
+
+inline void
+MainItem::Write2( TableRow & o_rOut )
+    { do_Write2(o_rOut); }
+
+
+namespace
+{
+
+class MainRowItem : public MainItem
+{
+  public:
+                        MainRowItem(
+                            const String  &     i_sText,
+                            const char *        i_sLink,
+                            const char *        i_sTip );
+                        ~MainRowItem();
+  private:
+    enum E_Style { eSelf, eNo, eStd };
+
+    virtual void        do_Write2(
+                            TableRow &          o_rOut );
+    String              sText;
+    String              sLink;
+    String              sTip;
+};
+
+MainRowItem::MainRowItem( const String  &     i_sText,
+                          const char *        i_sLink,
+                          const char *        i_sTip )
+    :   sText(i_sText),
+        sLink(i_sLink),
+        sTip(i_sTip)
+{
+}
+
+MainRowItem::~MainRowItem()
+{
+}
+
+void
+MainRowItem::do_Write2( TableRow & o_rOut )
+{
+    TableCell & rCell = o_rOut.AddCell();
+
+    rCell
+        << new ClassAttr( "navimain" )
+        << new XmlCode("&nbsp;")
+        >> *new Link(sLink.c_str())
+            << sText.c_str();
+    rCell
+        << new XmlCode("&nbsp;");
+}
+
+
+class SelectedItem : public MainItem
+{
+  public:
+                        SelectedItem(
+                            const String  &     i_sText )
+                                                :   sText(i_sText) {}
+  private:
+    virtual void        do_Write2(
+                            TableRow &          o_rOut );
+    String              sText;
+};
+
+void
+SelectedItem::do_Write2( TableRow & o_rOut )
+{
+    TableCell & rCell = o_rOut.AddCell();
+
+    rCell
+        << new ClassAttr( "navimainself" )
+        << new XmlCode("&nbsp;")
+        << sText.c_str()
+        << new XmlCode("&nbsp;");
+}
+
+class UnavailableItem : public MainItem
+{
+  public:
+                        UnavailableItem(
+                            const String  &     i_sText )
+                                                :   sText(i_sText) {}
+  private:
+    virtual void        do_Write2(
+                            TableRow &          o_rOut );
+    String              sText;
+};
+
+void
+UnavailableItem::do_Write2( TableRow & o_rOut )
+{
+    TableCell & rCell = o_rOut.AddCell();
+
+    rCell
+        << new ClassAttr( "navimainnone" )
+        << new XmlCode("&nbsp;")
+        << sText.c_str()
+        << new XmlCode("&nbsp;");
+}
+
+}   // anonymous namespace
+
+//************************      MainRow      ***************************//
+
+MainRow::MainRow( const OuputPage_Environment & i_rEnv )
+    :   // aItems,
+        pEnv(&i_rEnv)
+{
+}
+
+MainRow::~MainRow()
+{
+    csv::erase_container_of_heap_ptrs(aItems);
+}
+
+void
+MainRow::SetupItems_Overview()
+{
+    Create_ItemList_Global( eSelf, eStd, eStd );
+}
+
+void
+MainRow::SetupItems_AllDefs()
+{
+    Create_ItemList_Global( eStd, eStd, eStd );
+}
+
+void
+MainRow::SetupItems_Index()
+{
+    Create_ItemList_Global( eStd, eSelf, eStd );
+}
+
+void
+MainRow::SetupItems_Help()
+{
+    Create_ItemList_Global( eStd, eStd, eSelf );
+}
+
+void
+MainRow::SetupItems_Ce( const ary::cpp::CodeEntity & i_rCe )
+{
+    csv_assert( pEnv->CurNamespace() != 0 );
+    bool bIsNamespace = i_rCe.Id() == pEnv->CurNamespace()->Id();
+    bool bHasClass = pEnv->CurClass() != 0;
+    bool bIsClass = dynamic_cast< const ary::cpp::Class * >(&i_rCe) != 0;
+
+    Create_ItemList_InDirTree_Cpp(
+                ( bIsNamespace ? eSelf : eStd ),
+                ( bIsClass ? eSelf : bHasClass ? eStd : eNo ),
+                eNo, 0 );
+}
+
+void
+MainRow::SetupItems_FunctionGroup()
+{
+    Create_ItemList_InDirTree_Cpp(
+                eStd,
+                (pEnv->CurClass() != 0 ? eStd : eNo),
+                eNo, 0 );
+}
+
+void
+MainRow::SetupItems_DataGroup()
+{
+    SetupItems_FunctionGroup();
+}
+
+void
+MainRow::Write2( csi::xml::Element & o_rOut ) const
+{
+    Table * pTable = new Table;
+    o_rOut
+        >> *pTable
+                << new AnAttribute( "class", "navimain" )
+                << new AnAttribute( "border", "0" )
+                << new AnAttribute( "cellpadding", "1" )
+                << new AnAttribute( "cellspacing", "0" );
+    TableRow & rRow = pTable->AddRow();
+    rRow
+        << new AnAttribute( "align", "center" )
+        << new AnAttribute( "valign", "top" );
+    for ( ItemList::const_iterator it = aItems.begin();
+          it != aItems.end();
+          ++it )
+    {
+        (*it)->Write2( rRow );
+    }
+}
+
+void
+MainRow::Create_ItemList_Global( E_Style             i_eOverview,
+                                 E_Style             i_eIndex,
+                                 E_Style             i_eHelp )
+{
+    if ( i_eOverview == eStd )
+    {
+        String  sLinkOverview = ( i_eIndex == eSelf
+                                        ?   dshelp::PathPerLevelsUp(
+                                                1,
+                                                C_sHFN_Overview )
+                                        :   C_sHFN_Overview );
+        Add_Item( i_eOverview, sOverview, sLinkOverview.c_str(), "" );
+    }
+    else
+    {
+        Add_Item( i_eOverview, sOverview, "", "" );
+    }
+
+    if ( i_eIndex == eSelf )
+        Add_Item( eStd, sNamespace, "../names/index.html", "" );
+    else
+        Add_Item( eStd, sNamespace, "names/index.html", "" );
+
+    Add_Item( eNo, sClass, "", "" );
+
+    if ( i_eIndex == eStd )
+    {
+        Add_Item( i_eIndex, sIndex, C_sPath_Index, "" );
+    }
+    else
+    {
+        Add_Item( i_eIndex, sIndex, "", "" );
+    }
+
+    if ( i_eHelp == eStd )
+    {
+        String  sLinkHelp = ( i_eIndex == eSelf
+                                    ?   PathPerLevelsUp(1,C_sHFN_Help)
+                                    :   C_sHFN_Help );
+        Add_Item( i_eHelp, sHelp, sLinkHelp.c_str(), "" );
+    }
+    else
+    {
+        Add_Item( i_eHelp, sHelp, "", "" );
+    }
+}
+
+void
+MainRow::Create_ItemList_InDirTree_Cpp( E_Style i_eNsp,
+                                        E_Style i_eClass,
+                                        E_Style ,
+                                        const char *  )
+{
+    String
+        sLinkOverview = PathPerRoot(*pEnv, C_sHFN_Overview);
+    Add_Item( eStd, sOverview, sLinkOverview.c_str(), "" );
+
+    if (i_eNsp == eStd)
+    {
+        String  sLinkNamespace = PathPerNamespace(*pEnv, "index.html");
+        Add_Item( i_eNsp, sNamespace, sLinkNamespace.c_str(), "" );
+    }
+    else
+    {
+        Add_Item( i_eNsp, sNamespace, "", "" );
+    }
+
+    if (i_eClass == eStd)
+    {
+        csv_assert( pEnv->CurClass() != 0 );
+
+        StreamLock sLinkClass(300);
+        sLinkClass() << PathPerNamespace(*pEnv, "c-")
+                     << pEnv->CurClass()->LocalName()
+                     << ".html";
+        StreamLock sTipClass(300);
+        sTipClass() << "Class "
+                    << pEnv->CurClass()->LocalName();
+        Add_Item( i_eClass, sClass, sLinkClass().c_str(), sTipClass().c_str() );
+    }
+    else
+    {
+        Add_Item( i_eClass, sClass, "", "" );
+    }
+
+
+    Add_Item( eStd, sIndex, PathPerRoot(*pEnv, C_sPath_Index), "" );
+    String
+        sLinkHelp = PathPerRoot(*pEnv, "help.html");
+    Add_Item( eStd, sHelp, sLinkHelp.c_str(), "" );
+}
+
+void
+MainRow::Add_Item( E_Style             i_eStyle,
+                   const String  &     i_sText,
+                   const char *        i_sLink,
+                   const char *        i_sTip )
+{
+    switch (i_eStyle)
+    {
+         case eStd:      aItems.push_back( new MainRowItem(i_sText, i_sLink, i_sTip) );
+                        break;
+        case eNo:       aItems.push_back( new UnavailableItem(i_sText) );
+                        break;
+        case eSelf:     aItems.push_back( new SelectedItem(i_sText) );
+                        break;
+        default:
+                        csv_assert(false);
+    }
+}
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/nav_main.hxx b/autodoc/source/display/html/nav_main.hxx
new file mode 100644
index 000000000000..fe3e79c822e4
--- /dev/null
+++ b/autodoc/source/display/html/nav_main.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 ADC_DISPLAY_HTML_NAV_MAIN_HXX
+#define ADC_DISPLAY_HTML_NAV_MAIN_HXX
+
+// USED SERVICES
+
+namespace ary
+{
+namespace cpp
+{
+    class CodeEntity;
+}
+namespace loc
+{
+    class File;
+}
+}
+namespace csi
+{
+namespace xml
+{
+    class Element;
+}
+}
+
+class OuputPage_Environment;
+class MainItem;
+
+
+
+
+class MainRow
+{
+  public:
+                        MainRow(
+                            const OuputPage_Environment &
+                                                i_rEnv );
+                        ~MainRow();
+
+    void                SetupItems_Overview();
+    void                SetupItems_AllDefs();
+    void                SetupItems_Index();
+    void                SetupItems_Help();
+
+    void                SetupItems_Ce(
+                            const ary::cpp::CodeEntity &
+                                                i_rCe );
+    void                SetupItems_FunctionGroup(); /// For class member methods.
+    void                SetupItems_DataGroup();     /// For class member data.
+
+    void                Write2(
+                            csi::xml::Element & o_rOut ) const;
+  private:
+    // Local
+    enum E_Style
+    {
+        eSelf,
+        eNo,
+        eStd
+    };
+
+    /** @precond
+        Only combinations of 1 eSelf and 2 eStd are allowed
+        as arguments, here.
+    */
+    void                Create_ItemList_Global(
+                            E_Style             i_eOverview,
+                            E_Style             i_eIndex,
+                            E_Style             i_eHelp );
+    void                Create_ItemList_InDirTree_Cpp(
+                            E_Style             i_eNsp,
+                            E_Style             i_eClass,
+                            E_Style             i_eTree,
+                            const char *        i_sTreeLink );
+    void                Add_Item(
+                            E_Style             i_eStyle,
+                            const String  &     i_sText,
+                            const char *        i_sLink,
+                            const char *        i_sTip );
+    // DATA
+    typedef std::vector< DYN MainItem* > ItemList;
+
+
+    ItemList            aItems;
+    const OuputPage_Environment *
+                        pEnv;
+};
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/navibar.cxx b/autodoc/source/display/html/navibar.cxx
new file mode 100644
index 000000000000..8490e834b6d8
--- /dev/null
+++ b/autodoc/source/display/html/navibar.cxx
@@ -0,0 +1,318 @@
+/* -*- 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 <precomp.h>
+#include "navibar.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include "nav_main.hxx"
+#include "opageenv.hxx"
+
+
+using namespace csi::xml;
+using namespace csi::html;
+
+
+namespace
+{
+
+//************************      SubRowItem      ***************************//
+
+class SubRowItem
+{
+  public:
+                        SubRowItem(
+                            const char *        i_sText,
+                            const char *        i_sLink,
+                            bool                i_bActive,
+                            bool                i_bFirstOfRow = false );
+                        ~SubRowItem();
+
+    void                Write2(
+                            Element &           o_rOut ) const;
+  private:
+    String              sText;
+    String              sLink;
+    bool                bIsActive;
+    bool                bFirstOfRow;
+};
+
+SubRowItem::SubRowItem( const char *        i_sText,
+                        const char *        i_sLink,
+                        bool                i_bActive,
+                        bool                i_bFirstOfRow )
+    :   sText(i_sText),
+        sLink(i_sLink),
+        bIsActive(i_bActive),
+        bFirstOfRow(i_bFirstOfRow)
+{
+    csv_assert( NOT csv::no_str(i_sLink) );
+}
+
+SubRowItem::~SubRowItem()
+{
+}
+
+void
+SubRowItem::Write2( Element & o_rOut ) const
+{
+    o_rOut << new Sbr;
+    if ( NOT bFirstOfRow )
+        o_rOut << new XmlCode( "|&nbsp;" );
+    else
+        o_rOut << new XmlCode( "&nbsp;" );
+
+    if ( bIsActive )
+    {
+        o_rOut
+            >> *new Link( sLink.c_str() )
+                >> *new AnElement( "font" )
+                    << new AnAttribute("size","-2")
+                    >> *new Bold
+                        << sText.c_str();
+    }
+    else
+    {
+        o_rOut
+            >> *new AnElement( "font" )
+                << new AnAttribute("size","-2")
+                << sText.c_str();
+    }
+}
+
+
+
+//************************      SubRow      ***************************//
+
+class SubRow
+{
+  public:
+                        SubRow(
+                            const char *        i_sTitle );
+                        ~SubRow();
+
+    void                AddItem(
+                            const char *        i_sText,
+                            const char *        i_sLink,
+                            bool                i_bActive );
+    void                Write2(
+                            Table &             o_rOut ) const;
+  private:
+    typedef std::vector< DYN SubRowItem * >   List_Items;
+
+    List_Items          aItemList;
+    String              sTitle;
+};
+
+SubRow::SubRow( const char * i_sTitle )
+//  :   // aItemList,
+        // sTitle
+{
+    StreamStr sUp(i_sTitle,0);
+    sUp.to_upper();
+    sTitle = sUp.c_str();
+}
+
+SubRow::~SubRow()
+{
+    for ( List_Items::iterator it = aItemList.begin();
+          it != aItemList.end();
+          ++it )
+    {
+         delete (*it);
+    }
+}
+
+inline void
+SubRow::AddItem( const char *        i_sText,
+                 const char *        i_sLink,
+                 bool                i_bActive )
+{
+    aItemList.push_back( new SubRowItem(i_sText, i_sLink, i_bActive, aItemList.empty()) );
+}
+
+void
+SubRow::Write2( Table & o_rOut ) const
+{
+    TableRow * pRow = new TableRow;
+    o_rOut << pRow;
+
+    if (sTitle.length() > 0)
+    {
+        Element & rCell1 = pRow->AddCell();
+        rCell1
+            << new WidthAttr("20%")
+            >> *new AnElement( "font" )
+                    << new AnAttribute("size","-2")
+                       << sTitle
+                       << ":";
+    }
+
+    Element & rCell2 = pRow->AddCell();
+    for ( List_Items::const_iterator it = aItemList.begin();
+          it != aItemList.end();
+          ++it )
+    {
+         (*it)->Write2( rCell2 );
+    }
+}
+
+
+}   // anonymous namespace
+
+
+
+//*************************      CheshireCat     ***********************//
+
+
+typedef std::vector< DYN SubRow * >   List_SubRows;
+
+struct NavigationBar::CheshireCat
+{
+    MainRow             aMainRow;
+    List_SubRows        aSubRows;
+    const OuputPage_Environment *
+                        pEnv;
+
+
+                        CheshireCat(
+                            const OuputPage_Environment &
+                                                i_rEnv );
+                        ~CheshireCat();
+};
+
+NavigationBar::
+CheshireCat::CheshireCat( const OuputPage_Environment & i_rEnv )
+    :   aMainRow( i_rEnv ),
+        pEnv( & i_rEnv )
+{
+}
+
+NavigationBar::
+CheshireCat::~CheshireCat()
+{
+    csv::erase_container_of_heap_ptrs( aSubRows );
+}
+
+
+//************************       NavigationBar       *******************//
+
+NavigationBar::NavigationBar( const OuputPage_Environment & i_rEnv,
+                              E_GlobalLocation              i_eLocation )
+    :   pi( new CheshireCat(i_rEnv) )
+{
+    switch (i_eLocation)
+    {
+         case LOC_Overview:  pi->aMainRow.SetupItems_Overview();  break;
+         case LOC_AllDefs:   pi->aMainRow.SetupItems_AllDefs();   break;
+        case LOC_Index:     pi->aMainRow.SetupItems_Index();     break;
+        case LOC_Help:      pi->aMainRow.SetupItems_Help();      break;
+        default:
+                            csv_assert(false);
+    }
+}
+
+NavigationBar::NavigationBar( const OuputPage_Environment & i_rEnv,
+                              const ary::cpp::CodeEntity &  i_rCe  )
+    :   pi( new CheshireCat(i_rEnv) )
+{
+    pi->aMainRow.SetupItems_Ce( i_rCe );
+}
+
+NavigationBar::NavigationBar( const OuputPage_Environment & i_rEnv,
+                              E_CeGatheringType             i_eCeGatheringType )
+    :   pi( new CheshireCat(i_rEnv) )
+{
+    switch (i_eCeGatheringType)
+    {
+         case CEGT_operations:   pi->aMainRow.SetupItems_FunctionGroup();  break;
+        case CEGT_data:         pi->aMainRow.SetupItems_DataGroup();      break;
+        default:
+                                csv_assert(false);
+    }
+}
+
+NavigationBar::~NavigationBar()
+{
+    csv::erase_container_of_heap_ptrs( pi->aSubRows );
+}
+
+void
+NavigationBar::MakeSubRow( const char * i_sTitle )
+{
+    pi->aSubRows.push_back( new SubRow(i_sTitle) );
+}
+
+void
+NavigationBar::AddItem( const char *        i_sName,
+                        const char *        i_sLink,
+                        bool                i_bValid )
+{
+    csv_assert( pi->aSubRows.size() > 0 );
+    StreamStr sName(i_sName, 0);
+    sName.to_upper();
+
+    StreamLock aSum(100);
+    pi->aSubRows.back()->AddItem( sName.c_str(),
+                                  aSum() << "#" << i_sLink << c_str,
+                                  i_bValid );
+}
+
+void
+NavigationBar::Write( Element &  o_rOut,
+                      bool       i_bWithSubRows ) const
+{
+    pi->aMainRow.Write2( o_rOut );
+
+    const_cast< NavigationBar* >(this)->pSubRowsTable = new Table;
+    o_rOut << pSubRowsTable;
+    *pSubRowsTable
+        << new AnAttribute( "class", "navisub" )
+        << new AnAttribute( "cellpadding", "0" )
+        << new AnAttribute( "cellspacing", "3" );
+
+    if (i_bWithSubRows)
+    {
+        Write_SubRows();
+    }
+}
+
+void
+NavigationBar::Write_SubRows() const
+{
+    for ( List_SubRows::const_iterator it = pi->aSubRows.begin();
+          it != pi->aSubRows.end();
+          ++it )
+    {
+         (*it)->Write2( *pSubRowsTable );
+    }
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/navibar.hxx b/autodoc/source/display/html/navibar.hxx
new file mode 100644
index 000000000000..ec81e6e94e5c
--- /dev/null
+++ b/autodoc/source/display/html/navibar.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 ADC_DISPLAY_HTML_NAVIBAR_HXX
+#define ADC_DISPLAY_HTML_NAVIBAR_HXX
+
+// BASE CLASSES
+#include "hdimpl.hxx"
+
+namespace ary
+{
+namespace cpp
+{
+    class CodeEntity;
+}
+namespace loc
+{
+    class File;
+}
+}
+
+
+
+
+/** Creates a HTML navigation bar wth the following parts:
+
+    A main bar with fixed items.
+    Zero to several subbars with user defined items, depending of
+    the contents of the page.
+
+    The main bar contains those items:
+
+    Overview | Namespace | Class | Tree | Project | File | Index | Help
+*/
+class NavigationBar
+{
+  public:
+    enum E_GlobalLocation
+    {
+        LOC_Overview,
+        LOC_AllDefs,
+        LOC_Index,
+        LOC_Help
+    };
+    enum E_CeGatheringType
+    {
+        CEGT_operations,
+        CEGT_data
+    };
+
+    /// Used for Overview, Index and Help.
+                        NavigationBar(
+                            const OuputPage_Environment &
+                                                i_rEnv,
+                            E_GlobalLocation    i_eLocation );
+    /// Used for all Ces except operations and data.
+                        NavigationBar(
+                            const OuputPage_Environment &
+                                                i_rEnv,
+                            const ary::cpp::CodeEntity &
+                                                i_rCe );
+    /** Used for operations and data.
+    */
+                        NavigationBar(
+                            const OuputPage_Environment &
+                                                i_rEnv,
+                            E_CeGatheringType   i_eCeGatheringType );
+                        ~NavigationBar();
+
+    void                MakeSubRow(
+                            const char *        i_sTitle );
+    void                AddItem(                /// Items are added to last made sub-row.
+                            const char *        i_sName,
+                            const char *        i_sLink,
+                            bool                i_bValid );
+    /** This writes the main bar and the pSubRowTable to o_rOut.
+        The pSubRowsTable stays in memory and can be filled later,
+        when all SubRow items are known.
+    */
+    void                Write(
+                            csi::xml::Element & o_rOut,
+                            bool                i_bWithSubRows = false ) const;
+    void                Write_SubRows() const;
+
+  private:
+    struct CheshireCat;
+    Dyn<CheshireCat>    pi;
+    csi::html::Table *  pSubRowsTable;
+};
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/opageenv.cxx b/autodoc/source/display/html/opageenv.cxx
new file mode 100644
index 000000000000..4f48ca138217
--- /dev/null
+++ b/autodoc/source/display/html/opageenv.cxx
@@ -0,0 +1,492 @@
+/* -*- 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 <precomp.h>
+#include "opageenv.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/ploc_dir.hxx>
+#include <ary/cpp/c_ce.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <udm/html/htmlitem.hxx>
+#include <estack.hxx>
+#include "hdimpl.hxx"
+#include "strconst.hxx"
+
+
+const String  C_sCppDir( "names" );
+const String  C_sIndexDir( "ix" );
+
+
+//************************         Implementation          ********************//
+
+namespace
+{
+
+void    CreateDirectory( const csv::ploc::Path &    i_rPath );
+
+void
+CreateDirectory( const csv::ploc::Path & i_rPath )
+{
+    csv::ploc::Directory aDirectory(i_rPath);
+    if (NOT aDirectory.Exists())
+        aDirectory.PhysicalCreate();
+}
+
+//************************         CheshireCat          ********************//
+
+struct InNamespaceTree
+{
+    enum E_Type
+    {
+        t_unknown,
+        t_namespace,
+        t_type,
+        t_operations,
+        t_data
+    };
+
+    EStack< const ary::cpp::Namespace * >
+                        aNamespaces; /// never empty.
+    EStack< const ary::cpp::Class * >
+                        aClasses;      /// maybe empty.
+    const ary::cpp::CodeEntity *
+                        pCe;        /// CurFileCe, maybe 0
+    E_Type              eType;
+
+                        InNamespaceTree(
+                            const ary::cpp::Namespace &
+                                                i_rNsp );
+                        ~InNamespaceTree();
+    void                GoDown(
+                            const ary::cpp::Namespace &
+                                                i_rNsp );
+    void                GoDown(
+                            const ary::cpp::Class &
+                                                i_rClass );
+    void                GoUp();
+};
+
+InNamespaceTree::InNamespaceTree( const ary::cpp::Namespace & i_rNsp )
+    :   // aNamespaces,
+        // aClasses,
+        pCe(0),
+        eType(t_unknown)
+{
+    aNamespaces.push( &i_rNsp );
+}
+
+InNamespaceTree::~InNamespaceTree()
+{
+}
+
+void
+InNamespaceTree::GoDown( const ary::cpp::Namespace & i_rNsp )
+{
+    aNamespaces.push(&i_rNsp);
+    aClasses.erase_all();
+    pCe = 0;
+    eType = t_unknown;
+}
+
+void
+InNamespaceTree::GoDown( const ary::cpp::Class & i_rClass )
+{
+    aClasses.push(&i_rClass);
+    pCe = 0;
+    eType = t_unknown;
+}
+
+void
+InNamespaceTree::GoUp()
+{
+    if ( NOT aClasses.empty() )
+        aClasses.pop();
+    else
+        aNamespaces.pop();
+    pCe = 0;
+    eType = t_unknown;
+}
+
+struct InIndex
+{
+    char                cLetter;
+
+                        InIndex() : cLetter('A') {}
+};
+
+
+}   // anonymous namespace
+
+
+
+
+
+struct OuputPage_Environment::CheshireCat
+{
+    csv::ploc::Path     aOutputRoot;
+    csv::ploc::Path     aMyPath;
+    csv::StreamStr      aFileName;
+
+    const ary::cpp::Gate *
+                        pGate;
+    const display::CorporateFrame *
+                        pLayout;
+    intt                nDepth;
+
+    Dyn<InNamespaceTree>
+                        pInNamespace;
+    Dyn<InIndex>        pInIndex;
+
+                        CheshireCat(
+                            const csv::ploc::Path &
+                                                io_rOutputDir,
+                            const ary::cpp::Gate &
+                                                i_rGate,
+                            const display::CorporateFrame &
+                                                i_rLayout );
+                        ~CheshireCat();
+    void                AddQualifiedName2Path(
+                            const ary::cpp::CodeEntity &
+                                                i_rCe,
+                            bool                i_bIncludeLocalName );
+
+    const Dyn<InNamespaceTree> &
+                        NspEnv() const          { return pInNamespace; }
+    Dyn<InNamespaceTree> &
+                        NspEnv()                { return pInNamespace; }
+    const ary::cpp::Namespace *
+                        Namespace() const       { return pInNamespace ? pInNamespace->aNamespaces.top() : 0; }
+    const ary::cpp::Class *
+                        Class() const           { return pInNamespace ? (pInNamespace->aClasses.empty() ? 0 : pInNamespace->aClasses.top()) : 0; }
+};
+
+OuputPage_Environment::
+CheshireCat::CheshireCat( const csv::ploc::Path &         io_rOutputDir,
+                          const ary::cpp::Gate &   i_rGate,
+                          const display::CorporateFrame & i_rLayout )
+    :   aOutputRoot(io_rOutputDir),
+        aMyPath(io_rOutputDir),
+        aFileName(500),
+        pGate(&i_rGate),
+        pLayout(&i_rLayout),
+        nDepth(0),
+        pInNamespace(),
+        pInIndex()
+{
+}
+
+OuputPage_Environment::
+CheshireCat::~CheshireCat()
+{
+}
+
+void
+OuputPage_Environment::
+CheshireCat::AddQualifiedName2Path( const ary::cpp::CodeEntity & i_rCe,
+                                    bool                    i_bIncludeLocalName )
+{
+    if (NOT i_rCe.Owner().IsValid())
+    {
+        aMyPath.DirChain().PushBack( C_sCppDir );
+        return;
+    }
+
+    const ary::cpp::CodeEntity &
+        rParent = pGate->Ces().Find_Ce( i_rCe.Owner() );
+    AddQualifiedName2Path( rParent, true );
+
+    if ( i_bIncludeLocalName )
+        aMyPath.DirChain().PushBack( i_rCe.LocalName() );
+}
+
+
+
+//************************         OuputPage_Environment          ********************//
+
+OuputPage_Environment::OuputPage_Environment( const csv::ploc::Path &           io_rOutputDir,
+                                              const ary::cpp::Gate &            i_rGate,
+                                              const display::CorporateFrame &   i_rLayout )
+    :   pi( new CheshireCat(io_rOutputDir, i_rGate, i_rLayout) )
+{
+}
+
+OuputPage_Environment::~OuputPage_Environment()
+{
+}
+
+void
+OuputPage_Environment::MoveDir_2Root()
+{
+    pi->NspEnv() = 0;
+    pi->pInIndex = 0;
+    pi->nDepth = 0;
+    while ( pi->aMyPath.DirChain().Size() > pi->aOutputRoot.DirChain().Size() )
+        pi->aMyPath.DirChain().PopBack();
+    pi->aMyPath.SetFile(String ::Null_());
+}
+
+void
+OuputPage_Environment::MoveDir_2Names()
+{
+    pi->NspEnv() = new InNamespaceTree( Gate().Ces().GlobalNamespace() );
+    pi->aMyPath.DirChain().PushBack( C_sCppDir );
+    pi->aMyPath.SetFile(String ::Null_());
+    ++pi->nDepth;
+
+       CreateDirectory( pi->aMyPath );
+}
+
+void
+OuputPage_Environment::MoveDir_Down2( const ary::cpp::Namespace & i_rNsp )
+{
+    csv_assert(i_rNsp.Depth() > 0);
+    csv_assert( pi->NspEnv() );
+    csv_assert( pi->Namespace()->CeId() == i_rNsp.Owner() );
+
+    pi->NspEnv()->GoDown( i_rNsp );
+    pi->aMyPath.DirChain().PushBack(i_rNsp.LocalName());
+    ++pi->nDepth;
+    pi->aMyPath.SetFile(String ::Null_());
+
+       CreateDirectory( pi->aMyPath );
+}
+
+void
+OuputPage_Environment::MoveDir_Down2( const ary::cpp::Class & i_rClass )
+{
+    csv_assert( pi->NspEnv() );
+    if ( i_rClass.Protection() == ary::cpp::PROTECT_global )
+    {
+        csv_assert( pi->Namespace()->CeId() == i_rClass.Owner() );
+    }
+    else
+    {
+        csv_assert( pi->Class() != 0 );
+        csv_assert( pi->Class()->CeId() == i_rClass.Owner() );
+    }
+
+    pi->NspEnv()->GoDown(i_rClass);
+    pi->aMyPath.DirChain().PushBack(i_rClass.LocalName());
+    pi->aMyPath.SetFile(String ::Null_());
+    ++pi->nDepth;
+
+       CreateDirectory( pi->aMyPath );
+}
+
+void
+OuputPage_Environment::MoveDir_2Index()
+{
+    MoveDir_2Root();
+    pi->pInIndex = new InIndex;
+    pi->aMyPath.DirChain().PushBack( String (C_sDIR_Index) );
+    pi->aMyPath.SetFile(String ::Null_());
+    pi->nDepth = 1;
+
+       CreateDirectory( pi->aMyPath );
+}
+
+void
+OuputPage_Environment::MoveDir_Up()
+{
+     if ( pi->nDepth == 1 )
+    {
+         MoveDir_2Root();
+        return;
+    }
+    else if ( pi->NspEnv() )
+    {
+        pi->NspEnv()->GoUp();
+        pi->aMyPath.DirChain().PopBack();
+        pi->aMyPath.SetFile(String ::Null_());
+        --pi->nDepth;
+    }
+}
+
+void
+OuputPage_Environment::SetFile_Css()
+{
+    pi->aMyPath.SetFile( C_sHFN_Css );
+}
+
+void
+OuputPage_Environment::SetFile_Overview()
+{
+    pi->aMyPath.SetFile( C_sHFN_Overview );
+}
+
+void
+OuputPage_Environment::SetFile_AllDefs()
+{
+    // Provisorium
+    pi->aMyPath.SetFile("def-all.html");
+}
+
+void
+OuputPage_Environment::SetFile_Index( char i_cLetter )
+{
+    csv_assert( ( 'A' <= i_cLetter AND i_cLetter <= 'Z' ) OR i_cLetter == '_' );
+
+    static StreamStr sIndexFileName(40);
+    sIndexFileName.seekp(0);
+    sIndexFileName << "index-";
+    if ( i_cLetter == '_' )
+    {
+        sIndexFileName << "27";
+    }
+    else
+    {
+        sIndexFileName << int(i_cLetter -'A' + 1);
+    }
+    sIndexFileName << ".html";
+
+    pi->aMyPath.SetFile( sIndexFileName.c_str() );
+}
+
+void
+OuputPage_Environment::SetFile_Help()
+{
+    pi->aMyPath.SetFile( C_sHFN_Help );
+}
+
+void
+OuputPage_Environment::SetFile_CurNamespace()
+{
+    csv_assert( pi->NspEnv() );
+    pi->aMyPath.SetFile("index.html");
+    pi->NspEnv()->pCe = pi->Namespace();
+    pi->NspEnv()->eType = InNamespaceTree::t_namespace;
+}
+
+void
+OuputPage_Environment::SetFile_Class( const ary::cpp::Class & i_rClass )
+{
+    csv_assert( pi->NspEnv() );
+    pi->aMyPath.SetFile( ClassFileName(i_rClass.LocalName()) );
+    pi->NspEnv()->pCe = &i_rClass;
+    pi->NspEnv()->eType = InNamespaceTree::t_type;
+}
+
+void
+OuputPage_Environment::SetFile_Enum( const ary::cpp::Enum & i_rEnum )
+{
+    csv_assert( pi->NspEnv() );
+    pi->aMyPath.SetFile( EnumFileName(i_rEnum.LocalName()) );
+    pi->NspEnv()->pCe = &i_rEnum;
+    pi->NspEnv()->eType = InNamespaceTree::t_type;
+}
+
+void
+OuputPage_Environment::SetFile_Typedef( const ary::cpp::Typedef & i_rTypedef )
+{
+    csv_assert( pi->NspEnv() );
+    pi->aMyPath.SetFile( TypedefFileName(i_rTypedef.LocalName()) );
+    pi->NspEnv()->pCe = &i_rTypedef;
+    pi->NspEnv()->eType = InNamespaceTree::t_type;
+}
+
+void
+OuputPage_Environment::SetFile_Operations( const ary::loc::File * i_pFile )
+{
+    csv_assert( pi->NspEnv() );
+    if ( CurClass() != 0 )
+        pi->aMyPath.SetFile( "o.html" );
+    else
+    {
+        csv_assert( i_pFile != 0 );
+        pi->aMyPath.SetFile( HtmlFileName("o-", i_pFile->LocalName()) );
+    }
+    pi->NspEnv()->pCe = 0;
+    pi->NspEnv()->eType = InNamespaceTree::t_operations;
+}
+
+void
+OuputPage_Environment::SetFile_Data( const ary::loc::File * i_pFile )
+{
+    csv_assert( pi->NspEnv() );
+    if ( CurClass() != 0 )
+        pi->aMyPath.SetFile( "d.html" );
+    else
+    {
+        csv_assert( i_pFile != 0 );
+        pi->aMyPath.SetFile( HtmlFileName("d-", i_pFile->LocalName()) );
+    }
+    pi->NspEnv()->pCe = 0;
+    pi->NspEnv()->eType = InNamespaceTree::t_data;
+}
+
+const ary::cpp::Namespace *
+OuputPage_Environment::CurNamespace() const
+{
+    return pi->Namespace();
+}
+
+const ary::cpp::Class *
+OuputPage_Environment::CurClass() const
+{
+    return pi->Class();
+}
+
+const csv::ploc::Path &
+OuputPage_Environment::CurPath() const
+{
+    return pi->aMyPath;
+}
+
+const ary::cpp::Gate &
+OuputPage_Environment::Gate() const
+{
+    return *pi->pGate;
+}
+
+const display::CorporateFrame &
+OuputPage_Environment::Layout() const
+{
+    return *pi->pLayout;
+}
+
+uintt
+OuputPage_Environment::Depth() const
+{
+    return static_cast<uintt>(pi->nDepth);
+}
+
+const String &
+OuputPage_Environment::RepositoryTitle() const
+{
+    return Gate().RepositoryTitle();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/opageenv.hxx b/autodoc/source/display/html/opageenv.hxx
new file mode 100644
index 000000000000..c0bb48ef5962
--- /dev/null
+++ b/autodoc/source/display/html/opageenv.hxx
@@ -0,0 +1,131 @@
+/* -*- 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 ADC_DISPLAY_HTML_OPAGEENV_HXX
+#define ADC_DISPLAY_HTML_OPAGEENV_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <cosv/ploc.hxx>
+    // PARAMETERS
+
+namespace ary
+{
+    namespace cpp
+    {
+        class Gate;
+
+        class Namespace;
+        class Class;
+        class Enum;
+        class Typedef;
+    }
+    namespace loc
+    {
+        class File;
+    }
+}
+namespace display
+{
+    class CorporateFrame;
+}
+
+class OuputPage_Environment
+{
+  public:
+    // LIFECYCLE
+                        OuputPage_Environment(
+                            const csv::ploc::Path &
+                                                io_rOutputDir,
+                            const ary::cpp::Gate &
+                                                i_rGate,
+                            const display::CorporateFrame &
+                                                i_rLayout );
+                        ~OuputPage_Environment();
+
+    // OPERATIONS
+    void                MoveDir_2Root();
+    void                MoveDir_2Names();
+    void                MoveDir_Down2(             /// Only one level.
+                            const ary::cpp::Namespace &
+                                                i_rNsp );
+    void                MoveDir_Down2(             /// Only one level.
+                            const ary::cpp::Class &
+                                                i_rClass );
+    void                MoveDir_2Index();
+    void                MoveDir_Up();
+
+    void                SetFile_Css();
+    void                SetFile_Overview();
+    void                SetFile_AllDefs();
+    void                SetFile_Index(
+                            char                i_cLetter );
+    void                SetFile_Help();
+    void                SetFile_CurNamespace();
+    void                SetFile_Class(
+                            const ary::cpp::Class &
+                                                i_rClass );
+    void                SetFile_Enum(
+                            const ary::cpp::Enum &
+                                                i_rEnum );
+    void                SetFile_Typedef(
+                            const ary::cpp::Typedef &
+                                                i_typedef );
+    void                SetFile_Operations(
+                            const ary::loc::File *
+                                                i_pFile = 0 );  /// Only needed for global functions.
+    void                SetFile_Data(
+                            const ary::loc::File *
+                                                i_pFile = 0 );  /// Only needed for global variables.
+    // INQUIRY
+    const ary::cpp::Namespace *
+                        CurNamespace() const;
+    const ary::cpp::Class *
+                        CurClass() const;
+    const csv::ploc::Path &
+                        CurPath() const;
+    const ary::cpp::Gate &
+                        Gate() const;
+    const display::CorporateFrame &
+                        Layout() const;
+    uintt               Depth() const;
+    const String &      RepositoryTitle() const;
+
+  private:
+    struct CheshireCat;
+    Dyn<CheshireCat>    pi;
+};
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/outfile.cxx b/autodoc/source/display/html/outfile.cxx
new file mode 100644
index 000000000000..2f31170f11e1
--- /dev/null
+++ b/autodoc/source/display/html/outfile.cxx
@@ -0,0 +1,390 @@
+/* -*- 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 <precomp.h>
+#include "outfile.hxx"
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/file.hxx>
+#include <udm/html/htmlitem.hxx>
+#include <toolkit/out_position.hxx>
+#include "strconst.hxx"
+
+
+namespace
+{
+bool            bUse_OOoFrameDiv = true;
+const String    C_sOOoFrameDiv_CppId("adc-cppref");
+}
+
+
+using namespace csi;
+using csi::xml::AnAttribute;
+
+
+
+#define CRLF "\n"
+
+const char * const
+    C_sStdStyle =
+    "body   { background-color:#ffffff; }"CRLF
+    "h1     { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }"CRLF
+    "h2     { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }"CRLF
+    "h3     { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }"CRLF
+    "h4     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
+    "dl     { margin-top:1pt; margin-bottom:1pt; }"CRLF
+    "dl.member  { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }"CRLF
+    "dt     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
+    "dt.member  { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
+    "dt.simple  { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }"CRLF
+    "dd     { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF
+    "dd.member  { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }"CRLF
+    "p      { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }"CRLF
+    "pre    { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF
+    "tr     { font-size:10pt; }"CRLF
+    "td     { font-size:10pt; }"CRLF
+    CRLF
+    "dt.attention   { color:#dd0000; }"CRLF
+    CRLF
+    "div.title      { text-align:center;  line-height:26pt; background-color:#ccccff; }"CRLF
+    ".subtitle      { background-color:#ccccff; }"CRLF
+    CRLF
+    "td.flagname    { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
+    "td.flagyes     { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
+    "td.flagno      { font-family:Arial; font-size:8pt; }"CRLF
+    "td.flagtext    { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
+    CRLF
+    "td.navimain, td.navimain a"CRLF
+    "               { background-color:#eeeeff; color:#000000;"CRLF
+    "                 font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF
+    "td.navimainself"CRLF
+    "               { background-color:#2222ad; color:#ffffff;"CRLF
+    "                 font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF
+    "td.navimainnone"CRLF
+    "               { background-color:#eeeeff; color:#000000;"CRLF
+    "                 font-family:Arial; font-size:12pt; }"CRLF
+    CRLF
+    "div.define     { font-family:Arial; background-color:#ccccff; }"CRLF
+    CRLF
+    ".nqclass       { color:#008800; }"CRLF
+    CRLF
+    "h3.help        { background-color:#eeeeff; margin-top:12pt; }"CRLF
+    CRLF
+    ".btpubl        { color:#33ff33; }"CRLF
+    ".btprot        { color:#cc9933; }"CRLF
+    ".btpriv        { color:#ff6666; }"CRLF
+    ".btvpubl       { color:#33ff33; font-style:italic; }"CRLF
+    ".btvprot       { color:#cc9933; font-style:italic; }"CRLF
+    ".btvpriv       { color:#ff6666; font-style:italic; }"CRLF
+    ".btself        { font-weight:bold; }"CRLF
+    ;
+
+
+const char * const
+    C_sCssExplanations =
+    "/* Explanation of CSS classes:"CRLF
+    CRLF
+    "dl.member       provides coloured frame for function descriptions."CRLF
+    "dd.member       makes the content of this frame white"CRLF
+    CRLF
+    "dt.attention    special colour for @attention remarks"CRLF
+    CRLF
+    "div.title       HTML page headline"CRLF
+    ".subtitle       headline of lists of members and similar"CRLF
+    CRLF
+    "                These are for the flagtables in classes:"CRLF
+    "td.flagname     Flag name."CRLF
+    "td.flagyes      flag value \"yes\""CRLF
+    "td.flagno       flag value \"no\""CRLF
+    "td.flagtext     other flag value"CRLF
+    CRLF
+    CRLF
+    "                These are for the main navigationbar:"CRLF
+    "td.navimain, td.navimain a"CRLF
+    "                Links in navibar."CRLF
+    "td.navimainself Text in navibar which refers to current page."CRLF
+    "td.navimainnone Text which links to nothing."CRLF
+    CRLF
+    CRLF
+    "div.define      Subtitles on the #define/macro descriptions page"CRLF
+    CRLF
+    ".nqclass        special color for classes in the qualification"CRLF
+    "                on top of type pages like in:"CRLF
+    "                ::nsp1::nsp2::_ClassXY_::"CRLF
+    CRLF
+    "h3.help         Subtitles on the help page"CRLF
+    CRLF
+    "                These are for the base class tree on class pages:"CRLF
+    ".btpubl         public base class"CRLF
+    ".btprot         protected"CRLF
+    ".btpriv         private"CRLF
+    ".btvpubl        virtual public"CRLF
+    ".btvprot        virtual protected"CRLF
+    ".btvpriv        virtual private"CRLF
+    ".btself         placeholder for currently displayed class"CRLF
+    CRLF
+    "*/"CRLF
+    ;
+
+
+const char * const
+    C_sStdStyle_withDivFrame =
+    "body   { background-color:#ffffff; }"CRLF
+    "#adc-cppref h1     { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }"CRLF
+    "#adc-cppref h2     { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }"CRLF
+    "#adc-cppref h3     { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }"CRLF
+    "#adc-cppref h4     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
+    "#adc-cppref dl     { margin-top:1pt; margin-bottom:1pt; }"CRLF
+    "#adc-cppref dl.member  { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }"CRLF
+    "#adc-cppref dt     { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
+    "#adc-cppref dt.member  { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF
+    "#adc-cppref dt.simple  { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }"CRLF
+    "#adc-cppref dd     { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF
+    "#adc-cppref dd.member  { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }"CRLF
+    "#adc-cppref p      { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }"CRLF
+    "#adc-cppref pre    { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF
+    "#adc-cppref tr     { font-size:10pt; }"CRLF
+    "#adc-cppref td     { font-size:10pt; }"CRLF
+    CRLF
+    "#adc-cppref dt.attention   { color:#dd0000; }"CRLF
+    CRLF
+    "#adc-cppref div.title      { text-align:center;  line-height:26pt; background-color:#ccccff; }"CRLF
+    "#adc-cppref .subtitle      { background-color:#ccccff; }"CRLF
+    CRLF
+    "#adc-cppref td.flagname    { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
+    "#adc-cppref td.flagyes     { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
+    "#adc-cppref td.flagno      { font-family:Arial; font-size:8pt; }"CRLF
+    "#adc-cppref td.flagtext    { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF
+    CRLF
+    "#adc-cppref td.navimain, #adc-cppref td.navimain a"CRLF
+    "               { background-color:#eeeeff; color:#000000;"CRLF
+    "                 font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF
+    "#adc-cppref td.navimainself"CRLF
+    "               { background-color:#2222ad; color:#ffffff;"CRLF
+    "                 font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF
+    "#adc-cppref td.navimainnone"CRLF
+    "               { background-color:#eeeeff; color:#000000;"CRLF
+    "                 font-family:Arial; font-size:12pt; }"CRLF
+    CRLF
+    "#adc-cppref div.define     { font-family:Arial; background-color:#ccccff; }"CRLF
+    CRLF
+    "#adc-cppref .nqclass       { color:#008800; }"CRLF
+    CRLF
+    "#adc-cppref h3.help        { background-color:#eeeeff; margin-top:12pt; }"CRLF
+    CRLF
+    "#adc-cppref .btpubl        { color:#33ff33; }"CRLF
+    "#adc-cppref .btprot        { color:#cc9933; }"CRLF
+    "#adc-cppref .btpriv        { color:#ff6666; }"CRLF
+    "#adc-cppref .btvpubl       { color:#33ff33; font-style:italic; }"CRLF
+    "#adc-cppref .btvprot       { color:#cc9933; font-style:italic; }"CRLF
+    "#adc-cppref .btvpriv       { color:#ff6666; font-style:italic; }"CRLF
+    "#adc-cppref .btself        { font-weight:bold; }"CRLF
+    ""CRLF
+    "#adc-cppref table { empty-cells:show; }"CRLF
+    ""CRLF
+    "#adc-cppref .childlist td, "CRLF
+    "#adc-cppref .commentedlinks td, "CRLF
+    "#adc-cppref .memberlist td, "CRLF
+    "#adc-cppref .subtitle td, "CRLF
+    "#adc-cppref .crosstitle td  { border: .1pt solid #000000; }"CRLF
+    ""CRLF
+    "#adc-cppref .flag-table td { border: .1pt solid #cccccc; } "CRLF
+    ""CRLF
+    "#adc-cppref .title-table td, "CRLF
+    "#adc-cppref .table-in-method td, "CRLF
+    "#adc-cppref .table-in-data td, "CRLF
+    "#adc-cppref .navimain td, "CRLF
+    "#adc-cppref .navisub td, "CRLF
+    "#adc-cppref .expl-table td, "CRLF
+    "#adc-cppref .param-table td  { border: none; }"CRLF
+    ;
+
+
+
+HtmlDocuFile::HtmlDocuFile()
+    :   sFilePath(),
+        sTitle(),
+        sLocation(),
+        sCopyright(),
+        nDepthInOutputTree(0),
+        aBodyData(),
+        aBuffer(60000)  // Grows dynamically when necessary.
+{
+}
+
+void
+HtmlDocuFile::SetLocation( const csv::ploc::Path &  i_rFilePath,
+                           uintt                    i_depthInOutputTree )
+{
+    static StreamStr sPath_(1000);
+    sPath_.seekp(0);
+    i_rFilePath.Get( sPath_ );
+
+    sFilePath = sPath_.c_str();
+    nDepthInOutputTree = i_depthInOutputTree;
+}
+
+void
+HtmlDocuFile::SetTitle( const char * i_sTitle )
+{
+    sTitle = i_sTitle;
+}
+
+void
+HtmlDocuFile::SetCopyright( const char * i_sCopyright )
+{
+    sCopyright = i_sCopyright;
+}
+
+void
+HtmlDocuFile::EmptyBody()
+{
+     aBodyData.SetContent(0);
+
+     if (bUse_OOoFrameDiv)
+     {
+        // Insert <div> tag to allow better formatting for OOo.
+        aBodyData
+            << new xml::XmlCode("<div id=\"")
+            << new xml::XmlCode(C_sOOoFrameDiv_CppId)
+            << new xml::XmlCode("\">\n\n");
+     }
+
+    aBodyData
+        >> *new html::Label( "_top_" )
+        << " ";
+}
+
+bool
+HtmlDocuFile::CreateFile()
+{
+    csv::File aFile(sFilePath, csv::CFM_CREATE);
+    if (NOT aFile.open())
+    {
+        Cerr() << "Can't create file " << sFilePath << "." << Endl();
+        return false;
+    }
+
+    WriteHeader(aFile);
+    WriteBody(aFile);
+
+    // Write end
+    static const char sCompletion[] = "\n</html>\n";
+    aFile.write( sCompletion );
+
+    aFile.close();
+    Cout() << '.' << Flush();
+    return true;
+}
+
+void
+HtmlDocuFile::WriteCssFile( const csv::ploc::Path & i_rFilePath )
+{
+    Cout() << "\nCreate css file ..." << Endl();
+
+    csv::File
+        aCssFile(i_rFilePath, csv::CFM_CREATE);
+    csv::OpenCloseGuard
+        aOpenGuard(aCssFile);
+    if (NOT aOpenGuard)
+    {
+        Cerr() << "Can't create file " << "cpp.css" << "." << Endl();
+        return;
+    }
+
+    aCssFile.write("/*      Autodoc css file for C++ documentation      */\n\n\n");
+
+    if (bUse_OOoFrameDiv)
+        aCssFile.write(C_sStdStyle_withDivFrame);
+    else
+        aCssFile.write(C_sStdStyle);
+
+    aCssFile.write("\n\n\n");
+    aCssFile.write(C_sCssExplanations);
+}
+
+void
+HtmlDocuFile::WriteHeader( csv::File & io_aFile )
+{
+    aBuffer.reset();
+
+    static const char s1[] =
+        "<html>\n<head>\n"
+        "<title>";
+    static const char s2[] =
+        "</title>\n"
+        "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
+    static const char s3[] =
+        "\">\n</head>\n";
+
+    aBuffer.write( s1 );
+    aBuffer.write( sTitle );
+    aBuffer.write( s2 );
+    aBuffer.write( output::get_UpLink(nDepthInOutputTree) );
+    aBuffer.write( C_sHFN_Css );
+    aBuffer.write( s3 );
+
+    io_aFile.write(aBuffer.c_str(), aBuffer.size());
+}
+
+void
+HtmlDocuFile::WriteBody( csv::File & io_aFile )
+{
+    aBuffer.reset();
+
+    aBodyData
+        >> *new html::Link( "#_top_" )
+                << new html::ClassAttr( "objchapter" )
+                << "Top of Page";
+
+    if ( sCopyright.length() > 0 )
+    {
+        aBodyData
+            << new xml::XmlCode("<hr size=\"3\">");
+
+        aBodyData
+            >> *new html::Paragraph
+                    << new html::ClassAttr( "copyright" )
+                    << new xml::AnAttribute( "align", "center" )
+                    << new xml::XmlCode(sCopyright);
+    }
+
+     if (bUse_OOoFrameDiv)
+    {
+        // Insert <div> tag to allow better formatting for OOo.
+        aBodyData
+            << new xml::XmlCode("\n</div> <!-- id=\"")
+            << new xml::XmlCode(C_sOOoFrameDiv_CppId)
+            << new xml::XmlCode("\" -->\n");
+    }
+
+    aBodyData.WriteOut(aBuffer);
+    io_aFile.write(aBuffer.c_str(), aBuffer.size());
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/outfile.hxx b/autodoc/source/display/html/outfile.hxx
new file mode 100644
index 000000000000..033e92954a3d
--- /dev/null
+++ b/autodoc/source/display/html/outfile.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 ADC_DISPLAY_HTML_OUTFILE_HXX
+#define ADC_DISPLAY_HTML_OUTFILE_HXX
+
+// USED SERVICES
+#include <udm/html/htmlitem.hxx>
+#include <cosv/ploc.hxx>
+
+
+namespace csv
+{
+    class File;
+}
+
+
+
+
+class HtmlDocuFile
+{
+  public:
+    // LIFECYCLE
+                        HtmlDocuFile();
+
+    void                SetLocation(
+                            const csv::ploc::Path &
+                                                i_rFilePath,
+                            uintt               i_depthInOutputTree );
+    void                SetTitle(
+                            const char *        i_sTitle );
+    void                SetCopyright(
+                            const char *        i_sCopyright );
+    void                EmptyBody();
+
+    Html::Body &        Body()                  { return aBodyData; }
+    bool                CreateFile();
+
+    static void         WriteCssFile(
+                            const csv::ploc::Path &
+                                                i_rFilePath );
+  private:
+    void                WriteHeader(
+                            csv::File &         io_aFile );
+    void                WriteBody(
+                            csv::File &         io_aFile );
+
+    // DATA
+    String              sFilePath;
+    String              sTitle;
+    String              sLocation;
+    String              sCopyright;
+    uintt               nDepthInOutputTree;
+
+    Html::Body          aBodyData;
+    StreamStr           aBuffer;                // Output buffer, should be transfered into csv::File.
+};
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/pagemake.cxx b/autodoc/source/display/html/pagemake.cxx
new file mode 100644
index 000000000000..52d05fb0b19c
--- /dev/null
+++ b/autodoc/source/display/html/pagemake.cxx
@@ -0,0 +1,578 @@
+/* -*- 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 <precomp.h>
+#include "pagemake.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <display/corframe.hxx>
+#include "hd_chlst.hxx"
+#include "hd_docu.hxx"
+#include "hdimpl.hxx"
+#include "html_kit.hxx"
+#include "navibar.hxx"
+#include "opageenv.hxx"
+#include "outfile.hxx"
+#include "pm_aldef.hxx"
+#include "pm_class.hxx"
+#include "pm_help.hxx"
+#include "pm_index.hxx"
+#include "pm_namsp.hxx"
+#include "pm_start.hxx"
+#include "strconst.hxx"
+
+
+using namespace csi;
+using csi::html::Link;
+using csi::html::HorizontalLine;
+
+
+const int C_nNrOfIndexLetters = 27;
+
+
+template <class SPECIAL_MAKER>
+inline void
+Make_SpecialPage( DYN SPECIAL_MAKER * let_dpMaker )
+{
+    Dyn< SPECIAL_MAKER > pMaker( let_dpMaker );
+    pMaker->MakePage();
+    pMaker = 0;
+}
+
+
+PageDisplay::PageDisplay( OuputPage_Environment & io_rEnv )
+    :   HtmlDisplay_Impl( io_rEnv ),
+        pMyFile( new HtmlDocuFile )
+{
+}
+
+PageDisplay::~PageDisplay()
+{
+
+}
+
+void
+PageDisplay::Create_OverviewFile()
+{
+    Env().SetFile_Overview();
+    File().SetLocation( Env().CurPath(), 0 );
+
+    SetupFileOnCurEnv( C_sHFTitle_Overview );
+    Make_SpecialPage( new PageMaker_Overview(*this) );
+    Create_File();
+}
+
+void
+PageDisplay::Create_AllDefsFile()
+{
+    // This method is a provisorium, because later this will
+    //   be spreaded over the files.
+
+    Env().MoveDir_2Root();
+    Env().SetFile_AllDefs();
+    File().SetLocation( Env().CurPath(), 0 );
+
+    SetupFileOnCurEnv( "Defines and Macros" );
+    Make_SpecialPage( new PageMaker_AllDefs(*this) );
+    Create_File();
+}
+
+void
+PageDisplay::Create_IndexFiles()
+{
+    Env().MoveDir_2Index();
+
+    for ( int i = 0; i < C_nNrOfIndexLetters; ++i )
+        Create_IndexFile(i);
+}
+
+void
+PageDisplay::Create_HelpFile()
+{
+    Env().SetFile_Help();
+    File().SetLocation( Env().CurPath(), 0 );
+
+    SetupFileOnCurEnv( C_sHFTitle_Help );
+    Make_SpecialPage( new PageMaker_Help(*this) );
+    Create_File();
+}
+
+void
+PageDisplay::Create_NamespaceFile()
+{
+    csv_assert( Env().CurNamespace() != 0 );
+    Env().SetFile_CurNamespace();
+    File().SetLocation( Env().CurPath(), Env().Depth() );
+    if (Env().CurNamespace()->Owner().IsValid())
+    {
+        StreamLock sNsp(100);
+        SetupFileOnCurEnv( sNsp() << C_sHFTypeTitle_Namespace
+                                  << " "
+                                  << Env().CurNamespace()->LocalName()
+                                  << c_str );
+    }
+    else
+    {
+        SetupFileOnCurEnv( C_sHFTitle_GlobalNamespaceCpp );
+    }
+
+    Make_SpecialPage( new PageMaker_Namespace(*this) );
+
+    Create_File();
+}
+
+void
+PageDisplay::Setup_OperationsFile_for( const ary::loc::File & i_rFile )
+{
+    csv_assert( Env().CurNamespace() != 0 );
+    Env().SetFile_Operations(&i_rFile);
+    File().SetLocation( Env().CurPath(), Env().Depth() );
+
+    StreamLock sOpFile(100);
+    SetupFileOnCurEnv( sOpFile() << "Global Functions in Namespace "
+                                 << Env().CurNamespace()->LocalName()
+                                 << " in Sourcefile "
+                                 << i_rFile.LocalName()
+                                 << c_str );
+    NavigationBar
+            aNavi( Env(),
+                   NavigationBar::CEGT_operations );
+    aNavi.Write( CurOut() );
+    CurOut() << new HorizontalLine;
+
+    adcdisp::PageTitle_Std fTitle;
+    csi::xml::Element & rTitle = fTitle( CurOut() );
+    if (Env().CurNamespace()->Owner().IsValid())
+    {
+         rTitle << "Global Functions in Namespace "
+               << Env().CurNamespace()->LocalName();
+    }
+    else
+    {
+        rTitle << "Global Functions in Global Namespace C++";
+    }
+
+    rTitle << new html::LineBreak
+           << "in Sourcefile "
+           << i_rFile.LocalName();
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Setup_OperationsFile_for( const ary::cpp::Class & i_rClass )
+{
+    csv_assert( Env().CurNamespace() != 0 );
+    Env().SetFile_Operations(0);
+    File().SetLocation( Env().CurPath(), Env().Depth() );
+
+    StreamLock sOpFile(100);
+    SetupFileOnCurEnv( sOpFile() << "Methods of Class "
+                                 << i_rClass.LocalName()
+                                 << c_str );
+    NavigationBar
+            aNavi( Env(),
+                   NavigationBar::CEGT_operations );
+    aNavi.Write( CurOut() );
+    CurOut() << new HorizontalLine;
+
+    adcdisp::PageTitle_Std fTitle;
+    fTitle( CurOut(), "Methods of Class", i_rClass.LocalName() );
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Setup_DataFile_for( const ary::loc::File & i_rFile )
+{
+    csv_assert( Env().CurNamespace() != 0 );
+    Env().SetFile_Data(&i_rFile);
+    File().SetLocation( Env().CurPath(), Env().Depth() );
+
+    StreamLock sDataFile(100);
+    SetupFileOnCurEnv( sDataFile() << "Global Data in Namespace "
+                                   << Env().CurNamespace()->LocalName()
+                                   << " in Sourcefile "
+                                   << i_rFile.LocalName()
+                                   << c_str );
+    NavigationBar
+            aNavi( Env(),
+                   NavigationBar::CEGT_data );
+    aNavi.Write( CurOut() );
+    CurOut() << new HorizontalLine;
+
+    adcdisp::PageTitle_Std fTitle;
+    csi::xml::Element & rTitle = fTitle( CurOut() );
+    if ( Env().CurNamespace()->Owner().IsValid() )
+    {
+         rTitle << "Global Data in Namespace "
+               << Env().CurNamespace()->LocalName();
+    }
+    else
+    {
+        rTitle << "Global Data in Global Namespace C++";
+    }
+
+    rTitle
+        << new html::LineBreak
+        << "in Sourcefile "
+        << i_rFile.LocalName();
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Setup_DataFile_for( const ary::cpp::Class & i_rClass )
+{
+    csv_assert( Env().CurNamespace() != 0 );
+    Env().SetFile_Data(0);
+    File().SetLocation( Env().CurPath(), Env().Depth() );
+
+    StreamLock sDataFile(100);
+    SetupFileOnCurEnv( sDataFile() << "Data of Class "
+                                   << i_rClass.LocalName()
+                                   << c_str );
+
+    NavigationBar
+            aNavi( Env(),
+                   NavigationBar::CEGT_data );
+    aNavi.Write( CurOut() );
+    CurOut() << new HorizontalLine;
+
+    adcdisp::PageTitle_Std fTitle;
+    fTitle( CurOut(), "Data of Class", i_rClass.LocalName() );
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Create_File()
+{
+    Easy().Leave();
+    File().CreateFile();
+}
+
+void
+PageDisplay::do_Process(const ary::cpp::Class & i_rData)
+{
+    Env().SetFile_Class(i_rData);
+    File().SetLocation( Env().CurPath(), Env().Depth() );
+
+    const char *
+            sTypeTitle = i_rData.ClassKey() == ary::cpp::CK_class
+                            ?   C_sHFTypeTitle_Class
+                            :   i_rData.ClassKey() == ary::cpp::CK_struct
+                                    ?   C_sHFTypeTitle_Struct
+                                    :   C_sHFTypeTitle_Union;
+    StreamLock sClassFile(60);
+    SetupFileOnCurEnv( sClassFile() << sTypeTitle
+                                    << " "
+                                    << i_rData.LocalName()
+                                    << c_str );
+
+    Make_SpecialPage( new PageMaker_Class(*this, i_rData) );
+
+    Create_File();
+}
+
+void
+PageDisplay::do_Process(const ary::cpp::Enum & i_rData)
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    Env().SetFile_Enum(i_rData);
+    File().SetLocation( Env().CurPath(), Env().Depth() );
+
+    StreamLock sEnumFile(100);
+    SetupFileOnCurEnv( sEnumFile() << C_sHFTypeTitle_Enum
+                                   << " "
+                                   << i_rData.LocalName()
+                                   << c_str );
+    Write_NavBar_Enum(i_rData);
+    Write_TopArea_Enum(i_rData);
+    Write_DocuArea_Enum(i_rData);
+    Write_ChildList_Enum(i_rData);
+
+    Create_File();
+}
+
+void
+PageDisplay::do_Process(const ary::cpp::Typedef & i_rData)
+{
+    if ( Ce_IsInternal(i_rData) )
+        return;
+
+    Env().SetFile_Typedef(i_rData);
+    File().SetLocation( Env().CurPath(), Env().Depth() );
+
+    StreamLock sTypedefFile(100);
+    SetupFileOnCurEnv( sTypedefFile() << C_sHFTypeTitle_Typedef
+                                      << " "
+                                      << i_rData.LocalName()
+                                      << c_str );
+    Write_NavBar_Typedef(i_rData);
+    Write_TopArea_Typedef(i_rData);
+    Write_DocuArea_Typedef(i_rData);
+
+
+    Create_File();
+}
+
+void
+PageDisplay::Write_NameChainWithLinks( const ary::cpp::CodeEntity & i_rCe )
+{
+    if ( Env().CurNamespace()->Id() != i_rCe.Id() )
+    {
+        RecursiveWrite_NamespaceLink( Env().CurNamespace() );
+        if ( Env().CurClass() != 0 )
+        {
+            CurOut() << new html::Sbr;
+            RecursiveWrite_ClassLink( Env().CurClass(), 1 );
+        }
+    }
+    else
+    {
+        RecursiveWrite_NamespaceLink( Env().CurNamespace()->Parent() );
+    }
+}
+
+const ary::cpp::Gate *
+PageDisplay::inq_Get_ReFinder() const
+{
+     return &Env().Gate();
+}
+
+void
+PageDisplay::RecursiveWrite_NamespaceLink( const ary::cpp::Namespace * i_pNamespace )
+{
+    if ( i_pNamespace == 0 )
+    {
+        return;
+    }
+    else if (NOT i_pNamespace->Owner().IsValid())
+    {   // Global namespace:
+        StreamLock sNspDir(50);
+        CurOut()
+            >> *new Link( PathPerRoot(Env(),
+                                      sNspDir() << C_sDIR_NamespacesCpp
+                                                << "/"
+                                                << C_sHFN_Namespace
+                                                << c_str) )
+                    << new xml::AnAttribute( "alt", C_sHFTitle_GlobalNamespaceCpp )
+                    >> *new html::Font
+                            << new html::SizeAttr("+1")
+                            >> *new html::Bold
+                                    << "::";
+        CurOut()
+            << " ";
+        return;
+    }
+    else
+    {
+        RecursiveWrite_NamespaceLink( i_pNamespace->Parent() );
+    }
+
+    uintt nLevelDistance = Env().Depth() - ( i_pNamespace->Depth() + 1 );
+    csv_assert( nLevelDistance < 100 );
+    CurOut()
+        >> *new Link( PathPerLevelsUp(nLevelDistance, C_sHFN_Namespace) )
+                << new xml::AnAttribute( "alt", C_sHFTypeTitle_Namespace)
+                >> *new html::Font
+                        << new html::SizeAttr("+1")
+                        >> *new html::Bold
+                                << i_pNamespace->LocalName();
+    CurOut()
+        >> *new html::Font
+                << new html::SizeAttr("+1")
+                << " :: ";
+}
+
+void
+PageDisplay::RecursiveWrite_ClassLink( const ary::cpp::Class * i_pClass,
+                                       uintt                   i_nLevelDistance )
+{
+     if ( i_pClass == 0 )
+        return;
+
+    if ( i_pClass->Protection() != ary::cpp::PROTECT_global )
+    {
+         RecursiveWrite_ClassLink(
+            dynamic_cast< const ary::cpp::Class* >(
+                Env().Gate().Ces().Search_Ce(i_pClass->Owner())),
+            i_nLevelDistance + 1 );
+    }
+
+    CurOut()
+        >> *new Link( Path2Class(i_nLevelDistance, i_pClass->LocalName()) )
+            << new html::ClassAttr("nqclass")
+            << i_pClass->LocalName()
+            << " :: ";
+}
+
+void
+PageDisplay::SetupFileOnCurEnv( const char * i_sTitle )
+{
+    File().SetLocation( Env().CurPath(), Env().Depth() );
+    File().SetTitle( i_sTitle );
+    File().SetCopyright( Env().Layout().CopyrightText() );
+    File().EmptyBody();
+
+    // This sets CurOut() to the contents of <body></body>
+    //   in File() :
+    Easy().Enter( File().Body() );
+}
+
+void
+PageDisplay::Write_NavBar_Enum( const ary::cpp::Enum & i_rData )
+{
+    NavigationBar   aNavi( Env(), i_rData );
+    aNavi.MakeSubRow("List of");
+    aNavi.AddItem( C_sTitle_EnumValues, C_sLabel_EnumValues, true );
+    aNavi.Write( CurOut(), true );
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Write_TopArea_Enum( const ary::cpp::Enum & i_rData )
+{
+    Write_NameChainWithLinks( i_rData );
+
+    adcdisp::PageTitle_Std fTitle;
+    fTitle( CurOut(), C_sHFTypeTitle_Enum, i_rData.LocalName() );
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Write_DocuArea_Enum( const ary::cpp::Enum & i_rData )
+{
+    Docu_Display aDocuShow( Env() );
+
+    aDocuShow.Assign_Out(CurOut());
+    aDocuShow.Process(i_rData.Docu());
+    aDocuShow.Unassign_Out();
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Write_ChildList_Enum( const ary::cpp::Enum & i_rData )
+{
+    bool    bChildrenExist = false;
+    ChildList_Display::Area_Result
+            aResult( bChildrenExist, CurOut() );
+
+    ChildList_Display aDisplay(Env(), i_rData);
+    aDisplay.Run_Simple( aResult,
+                         ary::cpp::Enum::SLOT_Values,
+                         C_sLabel_EnumValues,
+                         C_sTitle_EnumValues );
+
+    if (NOT bChildrenExist)
+        CurOut() >> *new html::Headline(4) << "This enum has no values.";
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Write_NavBar_Typedef( const ary::cpp::Typedef & i_rData )
+{
+    NavigationBar   aNavi( Env(), i_rData );
+    aNavi.Write( CurOut(), true );
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Write_TopArea_Typedef( const ary::cpp::Typedef & i_rData )
+{
+    Write_NameChainWithLinks( i_rData );
+
+    adcdisp::PageTitle_Std fTitle;
+    fTitle( CurOut(), C_sHFTypeTitle_Typedef, i_rData.LocalName() );
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Write_DocuArea_Typedef( const ary::cpp::Typedef & i_rData )
+{
+    adcdisp::ExplanationList aDef( CurOut() );
+    aDef.AddEntry("Definition:");
+    xml::Element & rDef = aDef.Def();
+
+    ary::cpp::Type_id
+        nDefiningType = i_rData.DescribingType();
+
+    const ary::cpp::CodeEntity *
+        pRelatedCe = Env().Gate().Search_RelatedCe(nDefiningType);
+    if ( pRelatedCe != 0 )
+    {
+        const char * sTypeKey = Get_TypeKey(*pRelatedCe);
+        if ( NOT csv::no_str(sTypeKey) )
+            rDef << sTypeKey << " ";
+    }
+
+    dshelp::Get_LinkedTypeText( rDef, Env(), nDefiningType );
+
+    Docu_Display aDocuShow( Env() );
+
+    aDocuShow.Assign_Out(CurOut());
+    aDocuShow.Process(i_rData.Docu());
+    aDocuShow.Unassign_Out();
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageDisplay::Create_IndexFile( int i_nLetter )
+{
+    static char aLetters[C_nNrOfIndexLetters+1] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_";
+    csv_assert( 0 <= i_nLetter AND i_nLetter < C_nNrOfIndexLetters );
+
+    char cCurLetter = aLetters[i_nLetter];
+    Env().SetFile_Index( cCurLetter );
+
+    static char sIndexFileTitle[] = "Global Index X";
+    const int nPositionOfLetterInTitle = 13;
+    sIndexFileTitle[nPositionOfLetterInTitle] = cCurLetter;
+    SetupFileOnCurEnv( sIndexFileTitle );
+
+    Make_SpecialPage( new PageMaker_Index(*this, cCurLetter ) );
+
+    Create_File();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/pagemake.hxx b/autodoc/source/display/html/pagemake.hxx
new file mode 100644
index 000000000000..72cdbe56e739
--- /dev/null
+++ b/autodoc/source/display/html/pagemake.hxx
@@ -0,0 +1,167 @@
+/* -*- 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 ADC_DISPLAY_HTML_PAGEMAKE_HXX
+#define ADC_DISPLAY_HTML_PAGEMAKE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/ary_disp.hxx>
+#include <cosv/tpl/processor.hxx>
+#include "hdimpl.hxx"
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/cpp/c_namesp.hxx>
+
+namespace ary
+{
+    namespace cpp
+    {
+        class Namespace;
+        class Class;
+        class Enum;
+        class Typedef;
+    }
+    namespace loc
+    {
+        class File;
+    }
+}
+
+
+class OuputPage_Environment;
+class HtmlDocuFile;
+
+
+
+class PageDisplay : public ary::Display,
+                    public csv::ConstProcessor<ary::cpp::Class>,
+                    public csv::ConstProcessor<ary::cpp::Enum>,
+                    public csv::ConstProcessor<ary::cpp::Typedef>,
+                    public HtmlDisplay_Impl
+{
+  public:
+                        PageDisplay(
+                            OuputPage_Environment &
+                                                io_rEnv );
+    virtual             ~PageDisplay();
+
+    void                Create_OverviewFile();
+    void                Create_AllDefsFile();
+    void                Create_IndexFiles();
+    void                Create_HelpFile();
+
+    void                Create_NamespaceFile();
+
+    void                Setup_OperationsFile_for(
+                            const ary::loc::File &
+                                                i_rFile );
+    void                Setup_OperationsFile_for(
+                            const ary::cpp::Class &
+                                                i_rClass );
+    void                Setup_DataFile_for(
+                            const ary::loc::File &
+                                                i_rFile );
+    void                Setup_DataFile_for(
+                            const ary::cpp::Class &
+                                                i_rClass );
+    /// Used with Setup_OperatonsFile_for().
+    void                Create_File();
+
+
+    // Interface for Children of SpecializedPageMaker:
+    void                Write_NameChainWithLinks(
+                            const ary::cpp::CodeEntity &
+                                                i_rCe );
+
+    // Necessary, to call Process() on this class.
+    using csv::ConstProcessor<ary::cpp::Class>::Process;
+    using csv::ConstProcessor<ary::cpp::Enum>::Process;
+    using csv::ConstProcessor<ary::cpp::Typedef>::Process;
+
+ private:
+    // Interface csv::ConstProcessor<>:
+    virtual void        do_Process(
+                            const ary::cpp::Class &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Enum &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Typedef &
+                                                i_rData );
+    // Interface ary::cpp::Display:
+    virtual const ary::cpp::Gate *
+                        inq_Get_ReFinder() const;
+    // Locals
+    HtmlDocuFile &      File()                  { return *pMyFile; }
+    void                RecursiveWrite_NamespaceLink(
+                            const ary::cpp::Namespace *
+                                                i_pNamespace );
+    void                RecursiveWrite_ClassLink(
+                            const ary::cpp::Class *
+                                                i_pClass,
+                            uintt               i_nLevelDistance );
+    void                SetupFileOnCurEnv(
+                            const char *        i_sTitle );
+    void                Write_NavBar_Enum(
+                            const ary::cpp::Enum &
+                                                i_rData );
+    void                Write_TopArea_Enum(
+                            const ary::cpp::Enum &
+                                                i_rData );
+    void                Write_DocuArea_Enum(
+                            const ary::cpp::Enum &
+                                                i_rData );
+    void                Write_ChildList_Enum(
+                            const ary::cpp::Enum &
+                                                i_rData );
+    void                Write_NavBar_Typedef(
+                            const ary::cpp::Typedef &
+                                                i_rData );
+    void                Write_TopArea_Typedef(
+                            const ary::cpp::Typedef &
+                                                i_rData );
+    void                Write_DocuArea_Typedef(
+                            const ary::cpp::Typedef &
+                                                i_rData );
+    void                Create_IndexFile(
+                            int                 i_nLetter );
+
+    // DATA
+    Dyn<HtmlDocuFile>   pMyFile;
+};
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/pm_aldef.cxx b/autodoc/source/display/html/pm_aldef.cxx
new file mode 100644
index 000000000000..7669ba4ef3a7
--- /dev/null
+++ b/autodoc/source/display/html/pm_aldef.cxx
@@ -0,0 +1,248 @@
+/* -*- 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 <precomp.h>
+#include "pm_aldef.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_define.hxx>
+#include <ary/cpp/c_macro.hxx>
+#include <ary/cpp/cp_def.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <ary/loc/locp_le.hxx>
+#include <ary/getncast.hxx>
+#include "hd_docu.hxx"
+#include "html_kit.hxx"
+#include "navibar.hxx"
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+#include "strconst.hxx"
+
+
+using namespace csi;
+using csi::html::HorizontalLine;
+using csi::html::Link;
+using csi::html::Label;
+using csi::html::AlignAttr;
+
+
+
+PageMaker_AllDefs::PageMaker_AllDefs( PageDisplay & io_rPage )
+    :   SpecializedPageMaker(io_rPage),
+        pDocuDisplay( new Docu_Display(io_rPage.Env()) ),
+        pNavi(0)
+{
+}
+
+PageMaker_AllDefs::~PageMaker_AllDefs()
+{
+}
+
+void
+PageMaker_AllDefs::MakePage()
+{
+    pNavi = new NavigationBar( Env(), NavigationBar::LOC_AllDefs );
+    Write_NavBar();
+
+    Write_TopArea();
+
+    Write_DefinesList();
+    Write_MacrosList();
+
+    pNavi->Write_SubRows();
+}
+
+void
+PageMaker_AllDefs::Write_NavBar()
+{
+    pNavi->MakeSubRow( "" );
+    pNavi->AddItem( "Defines", "defines", true );
+    pNavi->AddItem( "Macros", "macros", true );
+    pNavi->Write( CurOut() );
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_AllDefs::Write_TopArea()
+{
+    adcdisp::PageTitle_Std fTitle;
+    fTitle( CurOut(), "Defines and ", "Macros" );
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_AllDefs::Write_DocuArea()
+{
+    // Not needed.
+}
+
+void
+PageMaker_AllDefs::Write_DefinesList()
+{
+    CurOut()
+        << new html::LineBreak
+        << new html::LineBreak
+        >> *new xml::AnElement("div")
+            << new html::ClassAttr("define")
+            >> *new html::Label("defines")
+                >> *new html::Headline(3)
+                    << "Defines";
+
+    ary::cpp::DefsResultList
+        aAllDefines =  Env().Gate().Defs().AllDefines();
+    ary::cpp::DefsConstIterator
+        itEnd = aAllDefines.end();
+
+    if (aAllDefines.begin() != itEnd)
+    {
+        for ( ary::cpp::DefsConstIterator it = aAllDefines.begin();
+              it != itEnd;
+              ++it )
+        {
+            Write_Define(*it);
+        }
+    }
+    else
+    {
+        CurOut() << "None.";
+    }
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_AllDefs::Write_MacrosList()
+
+{
+    CurOut()
+        << new html::LineBreak
+        << new html::LineBreak
+        >> *new xml::AnElement("div")
+            << new html::ClassAttr("define")
+            >> *new html::Label("macros")
+                >> *new html::Headline(3)
+                    << "Macros";
+
+    ary::cpp::DefsResultList
+        aAllMacros =  Env().Gate().Defs().AllMacros();
+    ary::cpp::DefsConstIterator
+        itEnd = aAllMacros.end();
+
+    if (aAllMacros.begin() != itEnd)
+    {
+        for ( ary::cpp::DefsConstIterator it = aAllMacros.begin();
+              it != itEnd;
+              ++it )
+        {
+            Write_Macro(*it);
+        }
+    }
+    else
+    {
+        CurOut() << "None.";
+    }
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_AllDefs::Write_Define(De_id  i_nId)
+{
+    csv_assert( ary::is_type<ary::cpp::Define>( Env().Gate().Defs().Find_Def(i_nId)) );
+    const ary::cpp::Define &
+        rDef = static_cast< const ary::cpp::Define& >( Env().Gate().Defs().Find_Def(i_nId) );
+
+    CurOut() << new html::HorizontalLine;
+
+    adcdisp::ExplanationList aDocu( CurOut(), true );
+    aDocu.AddEntry();
+
+    aDocu.Term()
+        >> *new html::Label( rDef.LocalName() )
+            << " ";
+    aDocu.Term()
+        << rDef.LocalName();
+
+    Write_DefsDocu( aDocu.Def(), rDef );
+}
+
+void
+PageMaker_AllDefs::Write_Macro(De_id  i_nId)
+{
+    csv_assert( Env().Gate().Defs().Find_Def(i_nId).AryClass() == ary::cpp::Macro::class_id );
+    const ary::cpp::Macro &
+        rDef = static_cast< const ary::cpp::Macro& >( Env().Gate().Defs().Find_Def(i_nId) );
+
+    CurOut() << new html::HorizontalLine;
+
+    adcdisp::ExplanationList aDocu( CurOut(), true );
+    aDocu.AddEntry();
+
+    aDocu.Term()
+        >> *new html::Label( rDef.LocalName() )
+            << " ";
+    aDocu.Term()
+        << rDef.LocalName()
+        << "(";
+    WriteOut_TokenList( aDocu.Term(), rDef.Params(), ", " );
+    aDocu.Term()
+        << ")";
+
+    Write_DefsDocu( aDocu.Def(), rDef );
+}
+
+
+void
+PageMaker_AllDefs::Write_DefsDocu( csi::xml::Element &              o_rOut,
+                                   const ary::cpp::DefineEntity &  i_rTextReplacement )
+{
+    if ( i_rTextReplacement.DefinitionText().size() > 0 )
+    {
+        EraseLeadingSpace( *const_cast< String * >(
+                                &(*i_rTextReplacement.DefinitionText().begin())
+                         ) );
+    }
+
+    adcdisp::ExplanationTable rList( o_rOut );
+
+    rList.AddEntry( "Defined As" );
+    WriteOut_TokenList( rList.Def(), i_rTextReplacement.DefinitionText(), " " );
+
+    const ary::loc::File &
+        rFile = Env().Gate().Locations().Find_File( i_rTextReplacement.Location() );
+    rList.AddEntry( "In File" );
+    rList.Def() << rFile.LocalName();
+
+    ShowDocu_On( o_rOut, *pDocuDisplay, i_rTextReplacement );
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/pm_aldef.hxx b/autodoc/source/display/html/pm_aldef.hxx
new file mode 100644
index 000000000000..8f01cbb7a28a
--- /dev/null
+++ b/autodoc/source/display/html/pm_aldef.hxx
@@ -0,0 +1,91 @@
+/* -*- 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 ADC_DISPLAY_HTML_PM_ALDEF_HXX
+#define ADC_DISPLAY_HTML_PM_ALDEF_HXX
+
+// BASE CLASSES
+#include "pm_base.hxx"
+// USED SERVICES
+#include <ary/cpp/c_types4cpp.hxx>
+using ary::cpp::De_id;
+
+namespace ary
+{
+    namespace cpp
+    {
+        class DefineEntity;
+    }
+}
+
+class Docu_Display;
+class NavigationBar;
+
+
+
+
+
+class PageMaker_AllDefs : public SpecializedPageMaker
+{
+  public:
+                        PageMaker_AllDefs(
+                            PageDisplay &       io_rPage );
+
+    virtual             ~PageMaker_AllDefs();
+
+    virtual void        MakePage();
+
+  private:
+    typedef std::vector<De_id>              List_Ids;
+    typedef List_Ids::const_iterator        ids_iterator;
+
+    virtual void        Write_NavBar();
+    virtual void        Write_TopArea();
+    virtual void        Write_DocuArea();
+    virtual void        Write_DefinesList();
+    virtual void        Write_MacrosList();
+    void                Write_Define(
+                            De_id               i_nId );
+    void                Write_Macro(
+                            De_id               i_nId );
+    void                Write_DefsDocu(
+                            csi::xml::Element & o_rOut,
+                            const ary::cpp::DefineEntity &
+                                                i_rTextReplacement );
+
+    // DATA
+    Dyn<Docu_Display>   pDocuDisplay;
+    Dyn<NavigationBar>  pNavi;
+};
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/pm_base.cxx b/autodoc/source/display/html/pm_base.cxx
new file mode 100644
index 000000000000..ae045bd3b1de
--- /dev/null
+++ b/autodoc/source/display/html/pm_base.cxx
@@ -0,0 +1,79 @@
+/* -*- 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 <precomp.h>
+#include "pm_base.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+
+
+//********************       SpecializedPageMaker        *********************//
+
+SpecializedPageMaker::SpecializedPageMaker( PageDisplay &  io_rPage )
+    :   pEnv( &io_rPage.Env() ),
+        pCurOut( &io_rPage.CurOut() ),
+        pPage( &io_rPage )
+{
+}
+
+void
+SpecializedPageMaker::Write_NavBar()
+{
+     // Dummy
+}
+
+void
+SpecializedPageMaker::Write_TopArea()
+{
+     // Dummy
+}
+
+void
+SpecializedPageMaker::Write_DocuArea()
+{
+     // Dummy
+}
+
+//void
+//SpecializedPageMaker::Write_ChildList( ary::SlotAccessId   ,
+//                                       const char *        ,
+//                                       const char *        )
+//{
+//  // Dummy
+//}
+
+csi::xml::Element &
+SpecializedPageMaker::CurOut()
+{
+    return Page().CurOut();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/pm_base.hxx b/autodoc/source/display/html/pm_base.hxx
new file mode 100644
index 000000000000..2afa8a77cdfc
--- /dev/null
+++ b/autodoc/source/display/html/pm_base.hxx
@@ -0,0 +1,90 @@
+/* -*- 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 ADC_DISPLAY_PM_BASE_HXX
+#define ADC_DISPLAY_PM_BASE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include "hdimpl.hxx"
+
+
+
+class OuputPage_Environment;
+namespace csi
+{
+    namespace xml
+    {
+        class Element;
+    }
+}
+class PageDisplay;
+
+
+/** Interface for making a special kind of HTML-Page
+*/
+class SpecializedPageMaker
+{
+  public:
+    virtual             ~SpecializedPageMaker() {}
+
+    virtual void        MakePage() = 0;
+
+    virtual void        Write_NavBar();
+    virtual void        Write_TopArea();
+    virtual void        Write_DocuArea();
+//    virtual void        Write_ChildList(
+//                            ary::SlotAccessId   i_nSlot,
+//                            const char *        i_nListTitle,
+//                            const char *        i_nLabel );
+
+  protected:
+                        SpecializedPageMaker(
+                            PageDisplay &       io_rPage );
+
+    OuputPage_Environment &
+                        Env() const             { return *pEnv; }
+    csi::xml::Element & CurOut();
+    PageDisplay &       Page()                  { return *pPage; }
+
+  private:
+    OuputPage_Environment *
+                        pEnv;
+    csi::xml::Element * pCurOut;
+    PageDisplay *       pPage;
+};
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/pm_class.cxx b/autodoc/source/display/html/pm_class.cxx
new file mode 100644
index 000000000000..16c4fe9a9aea
--- /dev/null
+++ b/autodoc/source/display/html/pm_class.cxx
@@ -0,0 +1,813 @@
+/* -*- 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 <precomp.h>
+#include "pm_class.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <ary/loc/locp_le.hxx>
+#include <ary/getncast.hxx>
+#include "hd_chlst.hxx"
+#include "hd_docu.hxx"
+#include "hdimpl.hxx"
+#include "html_kit.hxx"
+#include "navibar.hxx"
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+#include "strconst.hxx"
+
+using namespace adcdisp;
+
+using namespace csi;
+using csi::html::HorizontalLine;
+using csi::html::LineBreak;
+using csi::html::Link;
+using csi::html::Table;
+using csi::html::TableRow;
+using csi::html::TableCell;
+
+using ary::cpp::CesConstIterator;
+using ary::doc::OldCppDocu;
+
+const char * const C_sTitle_InnerClasses    = "Classes";
+const char * const C_sTitle_InnerStructs    = "Structs";
+const char * const C_sTitle_InnerUnions     = "Unions";
+const char * const C_sTitle_Methods         = "Methods";
+const char * const C_sTitle_StaticMethods   = "Static Methods";
+const char * const C_sTitle_Data            = "Data";
+const char * const C_sTitle_StaticData      = "Static Data";
+
+const char * const C_sLabel_StaticOperations    = "static_ops";
+const char * const C_sLabel_StaticVariables     = "static_vars";
+
+const char * const   C_sTitlePublic      = "Public Members";
+const char * const   C_sTitleProtected   = "Protected Members";
+const char * const   C_sTitlePrivate     = "Private Members";
+const char * const   C_sMprTitles[3]     = { C_sTitlePublic,
+                                             C_sTitleProtected,
+                                             C_sTitlePrivate
+                                           };
+const char * const   C_sSummaryTitlePublic      = "Public Members";
+const char * const   C_sSummaryTitleProtected   = "Protected Members";
+const char * const   C_sSummaryTitlePrivate     = "Private Members";
+const char *
+        C_sMprSummaryTitles[3] =
+        { C_sSummaryTitlePublic, C_sSummaryTitleProtected, C_sSummaryTitlePrivate };
+const char *
+        C_sMprPrefixes[3] =
+        { "publ_", "prot_", "priv_" };
+const char *
+        C_sSummaryItems_Titles[PageMaker_Class::cl_MAX] =
+        { C_sTitle_InnerClasses, C_sTitle_InnerStructs, C_sTitle_InnerUnions,
+          C_sTitle_Enums, C_sTitle_Typedefs,
+          C_sTitle_Methods, C_sTitle_StaticMethods, C_sTitle_Data, C_sTitle_StaticData };
+const char *
+        C_sSummaryItems_Labels[PageMaker_Class::cl_MAX] =
+        { C_sLabel_Classes, C_sLabel_Structs, C_sLabel_Unions,
+          C_sLabel_Enums, C_sLabel_Typedefs,
+          C_sLabel_Operations, C_sLabel_StaticOperations,
+          C_sLabel_Variables, C_sLabel_StaticVariables };
+
+
+const ary::cpp::E_Protection
+        aProt[3] = { ary::cpp::PROTECT_public,
+                     ary::cpp::PROTECT_protected,
+                     ary::cpp::PROTECT_private };
+
+
+PageMaker_Class::PageMaker_Class( PageDisplay &             io_rPage,
+                                  const ary::cpp::Class &   i_rClass )
+    :   SpecializedPageMaker(io_rPage),
+        pMe( &i_rClass ),
+        pChildDisplay( new ChildList_Display(io_rPage.Env(), i_rClass) ),
+        pNavi(0)
+        // pProtectionArea,
+        // bChildLists_Exist
+{
+    int i_max = 3 * cl_MAX;
+    for (int i = 0; i < i_max; i++)
+    {
+        bChildLists_Exist[i] = false;
+    }  // end for
+}
+
+PageMaker_Class::~PageMaker_Class()
+{
+}
+
+void
+PageMaker_Class::MakePage()
+{
+    pNavi = new NavigationBar( Env(), Me() );
+
+    Write_NavBar();
+    Write_TopArea();
+    Write_DocuArea();
+    Write_ChildLists();
+
+    pNavi->Write_SubRows();
+    pNavi = 0;
+}
+
+void
+PageMaker_Class::Write_NavBar()
+{
+    NavigationBar   aNavi( Env(), Me() );
+    pNavi->Write( CurOut() );
+    CurOut() << new HorizontalLine;
+}
+
+inline bool
+IsInterface(const ary::doc::Documentation & i_doc)
+{
+    const OldCppDocu *
+        doc = Get_CppDocu(i_doc);
+    return doc != 0
+            ?   doc->IsInterface()
+            :   false;
+}
+
+void
+PageMaker_Class::Write_TopArea()
+{
+    TemplateClause fTemplateClause;
+    PageTitle_Std fTitle;
+
+    Page().Write_NameChainWithLinks( Me() );
+
+    fTemplateClause( CurOut(), Me().TemplateParameters() );
+    fTitle( CurOut(), Get_ClassTypeKey(Me()), Me().LocalName() );
+
+    CurOut() << new HorizontalLine;
+
+    Write_BaseHierarchy();
+    Write_DerivedList();
+
+    CurOut() << new LineBreak;
+
+    adcdisp::FlagTable
+        aFlags( CurOut(), 4 );
+    aFlags.SetColumn( 0, "virtual",
+                      Me().Virtuality() != ary::cpp::VIRTUAL_none );
+    aFlags.SetColumn( 1, "abstract",
+                      Me().Virtuality() == ary::cpp::VIRTUAL_abstract );
+    aFlags.SetColumn( 2, "interface",
+                      IsInterface(Me().Docu())
+                      OR  Me().Virtuality() == ary::cpp::VIRTUAL_abstract );
+    aFlags.SetColumn( 3, "template",
+                      Me().TemplateParameters().size() > 0 );
+}
+
+void
+PageMaker_Class::Write_DocuArea()
+{
+    Docu_Display aDocuShow( Env() );
+
+    aDocuShow.Assign_Out(CurOut());
+    Me().Accept( aDocuShow );
+    aDocuShow.Unassign_Out();
+
+    ary::loc::File &
+        rFile = Env().Gate().Locations().Find_File( Me().Location() );
+
+    adcdisp::ExplanationList
+        aFileText( CurOut() );
+    aFileText.AddEntry("File");
+    aFileText.Def()
+        << rFile.LocalName();
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_Class::Write_ChildLists()
+{
+    int i_max = 3 * cl_MAX;
+    for (int i = 0; i < i_max; i++)
+    {
+        bChildLists_Exist[i] = false;
+    }  // end for
+
+    csi::html::DefListDefinition &
+            rPublic = Setup_MemberSegment_Out( mp_public );
+    csi::html::DefListDefinition &
+            rProtected = Setup_MemberSegment_Out( mp_protected );
+    csi::html::DefListDefinition &
+            rPrivate = Setup_MemberSegment_Out( mp_private );
+
+    Write_ChildList_forClasses( rPublic,
+                                rProtected,
+                                rPrivate,
+                                C_sLabel_Classes,
+                                C_sTitle_InnerClasses,
+                                ary::cpp::CK_class );
+    Write_ChildList_forClasses( rPublic,
+                                rProtected,
+                                rPrivate,
+                                C_sLabel_Structs,
+                                C_sTitle_InnerStructs,
+                                ary::cpp::CK_struct );
+    Write_ChildList_forClasses( rPublic,
+                                rProtected,
+                                rPrivate,
+                                C_sLabel_Unions,
+                                C_sTitle_InnerUnions,
+                                ary::cpp::CK_union );
+
+    Write_ChildList( ary::cpp::Class::SLOT_Enums,
+                     cl_Enums,
+                     C_sLabel_Enums,
+                     C_sTitle_Enums,
+                     rPublic,
+                     rProtected,
+                     rPrivate );
+    Write_ChildList( ary::cpp::Class::SLOT_Typedefs,
+                     cl_Typedefs,
+                     C_sLabel_Typedefs,
+                     C_sTitle_Typedefs,
+                     rPublic,
+                     rProtected,
+                     rPrivate );
+
+    Write_ChildList( ary::cpp::Class::SLOT_Operations,
+                     cl_Operations,
+                     C_sLabel_Operations,
+                     C_sTitle_Methods,
+                     rPublic,
+                     rProtected,
+                     rPrivate );
+    Write_ChildList( ary::cpp::Class::SLOT_StaticOperations,
+                     cl_StaticOperations,
+                     C_sLabel_StaticOperations,
+                     C_sTitle_StaticMethods,
+                     rPublic,
+                     rProtected,
+                     rPrivate );
+    Write_ChildList( ary::cpp::Class::SLOT_Data,
+                     cl_Data,
+                     C_sLabel_Variables,
+                     C_sTitle_Data,
+                     rPublic,
+                     rProtected,
+                     rPrivate );
+    Write_ChildList( ary::cpp::Class::SLOT_StaticData,
+                     cl_StaticData,
+                     C_sLabel_StaticVariables,
+                     C_sTitle_StaticData,
+                     rPublic,
+                     rProtected,
+                     rPrivate );
+
+    Create_NaviSubRow(mp_public);       // Also puts out or deletes pPublic.
+    Create_NaviSubRow(mp_protected);    // Also puts out or deletes pProtected.
+    Create_NaviSubRow(mp_private);      // Also puts out or deletes pPrivate.
+}
+
+void
+PageMaker_Class::Write_ChildList( ary::SlotAccessId   i_nSlot,
+                                  E_ChidList          i_eChildListIndex,
+                                  const char *        i_sLabel,
+                                  const char *        i_sListTitle,
+                                  csi::xml::Element & o_rPublic,
+                                  csi::xml::Element & o_rProtected,
+                                  csi::xml::Element & o_rPrivate )
+
+{
+    bool    bPublic_ChildrenExist = false;
+    bool    bProtected_ChildrenExist = false;
+    bool    bPrivate_ChildrenExist = false;
+
+    ChildList_Display::Area_Result
+            aPublic_Result( bPublic_ChildrenExist, o_rPublic );
+    ChildList_Display::Area_Result
+            aProtected_Result( bProtected_ChildrenExist, o_rProtected );
+    ChildList_Display::Area_Result
+            aPrivate_Result( bPrivate_ChildrenExist, o_rPrivate );
+
+    String sLabelPublic = ChildListLabel(i_sLabel, mp_public);
+    String sLabelProtected = ChildListLabel(i_sLabel, mp_protected);
+    String sLabelPrivate = ChildListLabel(i_sLabel, mp_private);
+
+    pChildDisplay->Run_Members( aPublic_Result,
+                                aProtected_Result,
+                                aPrivate_Result,
+                                i_nSlot,
+                                sLabelPublic,
+                                sLabelProtected,
+                                sLabelPrivate,
+                                i_sListTitle );
+
+    bChildLists_Exist[i_eChildListIndex]
+                = bPublic_ChildrenExist;
+    bChildLists_Exist[i_eChildListIndex + cl_MAX]
+                = bProtected_ChildrenExist;
+    bChildLists_Exist[i_eChildListIndex + 2*cl_MAX]
+                = bPrivate_ChildrenExist;
+
+    if (bPublic_ChildrenExist)
+        o_rPublic << new HorizontalLine;
+    if (bProtected_ChildrenExist)
+        o_rProtected << new HorizontalLine;
+    if (bPrivate_ChildrenExist)
+        o_rPrivate << new HorizontalLine;
+}
+
+void
+PageMaker_Class::Write_ChildList_forClasses( csi::xml::Element &    o_rPublic,
+                                             csi::xml::Element &    o_rProtected,
+                                             csi::xml::Element &    o_rPrivate,
+                                             const char *           i_sLabel,
+                                             const char *           i_sListTitle,
+                                             ary::cpp::E_ClassKey   i_eFilter )
+{
+    bool    bPublic_ChildrenExist = false;
+    bool    bProtected_ChildrenExist = false;
+    bool    bPrivate_ChildrenExist = false;
+
+    ChildList_Display::Area_Result
+            aPublic_Result( bPublic_ChildrenExist, o_rPublic );
+    ChildList_Display::Area_Result
+            aProtected_Result( bProtected_ChildrenExist, o_rProtected );
+    ChildList_Display::Area_Result
+            aPrivate_Result( bPrivate_ChildrenExist, o_rPrivate );
+
+    String sLabelPublic = ChildListLabel(i_sLabel, mp_public);
+    String sLabelProtected = ChildListLabel(i_sLabel, mp_protected);
+    String sLabelPrivate = ChildListLabel(i_sLabel, mp_private);
+
+    pChildDisplay->Run_MemberClasses( aPublic_Result,
+                                      aProtected_Result,
+                                      aPrivate_Result,
+                                      ary::cpp::Class::SLOT_NestedClasses,
+                                      sLabelPublic,
+                                      sLabelProtected,
+                                      sLabelPrivate,
+                                      i_sListTitle,
+                                      i_eFilter );
+
+    bChildLists_Exist[int(cl_NestedClasses)+int(i_eFilter)]
+                = bPublic_ChildrenExist;
+    bChildLists_Exist[int(cl_NestedClasses)+int(i_eFilter) + cl_MAX]
+                = bProtected_ChildrenExist;
+    bChildLists_Exist[int(cl_NestedClasses)+int(i_eFilter) + 2*cl_MAX]
+                = bPrivate_ChildrenExist;
+
+    if (bPublic_ChildrenExist)
+        o_rPublic << new HorizontalLine;
+    if (bProtected_ChildrenExist)
+        o_rProtected << new HorizontalLine;
+    if (bPrivate_ChildrenExist)
+        o_rPrivate << new HorizontalLine;
+}
+
+const char *
+PageMaker_Class::ChildListLabel( const char * i_sLabel, E_MemberProtection i_eMpr )
+{
+     static char sResult[100];
+    strcpy( sResult, C_sMprPrefixes[i_eMpr] );  // SAFE STRCPY (#100211# - checked)
+    strcat( sResult, i_sLabel );                // SAFE STRCAT (#100211# - checked)
+    return sResult;
+}
+
+csi::html::DefListDefinition &
+PageMaker_Class::Setup_MemberSegment_Out( E_MemberProtection i_eMpr )
+{
+    html::DefList * pDefList = new html::DefList;
+    pProtectionArea[i_eMpr] = pDefList;
+
+    pDefList->AddTerm()
+        << new html::ClassAttr("subtitle")
+        >> *new html::Label( C_sMprPrefixes[i_eMpr] )
+                >> *new html::Headline(3)
+                        << C_sMprTitles[i_eMpr];
+    return pDefList->AddDefinition();
+}
+
+void
+PageMaker_Class::Create_NaviSubRow( E_MemberProtection i_eMpr )
+{
+    int nIndexAdd = int(cl_MAX) * int(i_eMpr);
+
+    bool bEmpty = true;
+    for (int e = 0; e < cl_MAX; e++)
+    {
+        if ( bChildLists_Exist[e + nIndexAdd] )
+        {
+            bEmpty = false;
+            break;
+        }
+    }  // end for
+    if (bEmpty)
+    {
+        pProtectionArea[i_eMpr] = 0;
+        return;
+    }
+    else //
+    {
+        CurOut() << pProtectionArea[i_eMpr].Release();
+    }  // endif
+
+    pNavi->MakeSubRow( C_sMprSummaryTitles[i_eMpr] );
+    for (int i = 0; i < cl_MAX; i++)
+    {
+        pNavi->AddItem( C_sSummaryItems_Titles[i],
+                        ChildListLabel( C_sSummaryItems_Labels[i], i_eMpr ),
+                        bChildLists_Exist[i+nIndexAdd] );
+    }  // end for
+}
+
+void
+PageMaker_Class::Write_DerivedList()
+{
+    adcdisp::ExplanationList
+        aDeriveds( CurOut() );
+    aDeriveds.AddEntry( "Known Derived Classes" );
+
+    if ( Me().KnownDerivatives().Size() == 0 )
+    {
+        aDeriveds.Def() << "None.";
+        return;
+    }
+
+    typedef ary::List_Rid  RidList;
+
+    CesConstIterator
+        itEnd = Me().KnownDerivatives().End();
+    for ( CesConstIterator it = Me().KnownDerivatives().Begin();
+          it != itEnd;
+          ++it )
+    {
+        const ary::cpp::CodeEntity &
+            rCe = Env().Gate().Ces().Find_Ce(*it);
+
+        aDeriveds.Def()
+            >> *new html::Link( Link2Ce(Env(),rCe) )
+                << rCe.LocalName();
+        aDeriveds.Def()
+            << new html::LineBreak;
+    }   // end for
+}
+
+
+// ==============  Creating a classes base hierarchy  ====================== //
+
+
+namespace
+{
+
+class Node
+{
+  public:
+                        Node(
+                            const ary::cpp::Class &
+                                                i_rClass,
+                            ary::cpp::Type_id   i_nClassType,
+                            const ary::cpp::Gate &
+                                                i_rGate,
+                            intt                i_nPositionOffset,
+                            Node *              io_pDerived = 0,
+                            ary::cpp::E_Protection
+                                                i_eProtection = ary::cpp::PROTECT_global,
+                            bool                i_bVirtual = false );
+                        ~Node();
+
+    void                FillPositionList(
+                            std::vector< const Node* > &
+                                                o_rPositionList ) const;
+    void                Write2(
+                            csi::xml::Element & o_rOut,
+                            const OuputPage_Environment &
+                                                i_rEnv ) const;
+
+    intt                BaseCount() const       { return nCountBases; }
+    intt                Position() const        { return nPosition; }
+    int                 Xpos() const            { return 3*Position(); }
+    int                 Ypos() const            { return 2*Position(); }
+    const Node *        Derived() const         { return pDerived; }
+
+  private:
+    typedef std::vector< DYN Node* > BaseList;
+
+    void                IncrBaseCount();
+
+    // DATA
+    BaseList            aBases;
+    intt                nCountBases;
+    Node *              pDerived;
+
+    String              sName;
+    const ary::cpp::Class *
+                        pClass;
+    ary::cpp::Type_id   nClassType;
+    ary::cpp::E_Protection
+                        eProtection;
+    bool                bVirtual;
+
+    intt                nPosition;
+};
+
+void                WriteNodeHierarchy(
+                        csi::xml::Element & o_rOut,
+                        const OuputPage_Environment &
+                                            i_rEnv,
+                        const Node &        i_rClass );
+
+const ary::cpp::Class *
+                    HereFind_Class(
+                        const ary::cpp::Gate &
+                                            i_rGate,
+                        ary::cpp::Type_id   i_nReferingTypeId );
+
+}   // anonymous namespace
+
+void
+PageMaker_Class::Write_BaseHierarchy()
+{
+    adcdisp::ExplanationList aBases( CurOut() );
+    aBases.AddEntry( "Base Classes" );
+
+    if (   Me().BaseClasses().size() == 0 )
+    {
+        aBases.Def() << "None.";
+    }
+    else
+    {
+        Dyn< Node >
+            pBaseGraph( new Node(Me(), ary::cpp::Type_id(0), Env().Gate(), 0) );
+        WriteNodeHierarchy( aBases.Def(), Env(), *pBaseGraph );
+    }
+}
+
+
+
+namespace
+{
+
+void
+WriteNodeHierarchy( csi::xml::Element &             o_rOut,
+                    const OuputPage_Environment &   i_rEnv,
+                    const Node &                    i_rClass )
+{
+    typedef const Node *            NodePtr;
+    typedef std::vector<NodePtr>    NodeList;
+
+    NodeList aPositionList;
+    intt nSize = i_rClass.Position()+1;
+    aPositionList.reserve(nSize);
+    i_rClass.FillPositionList( aPositionList );
+
+    xml::Element &
+        rPre = o_rOut
+               >> *new xml::AnElement("pre")
+                   << new html::StyleAttr("font-family:monospace;");
+
+    for ( int line = 0; line < nSize; ++line )
+    {
+        char * sLine1 = new char[2 + line*5];
+        char * sLine2 = new char[1 + line*5];
+        *sLine1 = '\0';
+        *sLine2 = '\0';
+
+        bool bBaseForThisLineReached = false;
+         for ( int col = 0; col < line; ++col )
+        {
+            intt nDerivPos = aPositionList[col]->Derived()->Position();
+
+            if ( nDerivPos >= line )
+                strcat(sLine1, "  |  ");
+            else
+                strcat(sLine1, "     ");
+
+            if ( nDerivPos > line )
+            {
+                strcat(sLine2, "  |  ");
+            }
+            else if ( nDerivPos == line )
+            {
+                if (bBaseForThisLineReached)
+                    strcat(sLine2, "--+--");
+                else
+                {
+                    bBaseForThisLineReached = true;
+                    strcat(sLine2, "  +--");
+                }
+            }
+            else // nDerivPos < line
+            {
+                if (bBaseForThisLineReached)
+                    strcat(sLine2, "-----");
+                else
+                    strcat(sLine2, "     ");
+            }
+        }  // end for (col)
+        strcat(sLine1,"\n");
+        rPre
+            << sLine1
+            << sLine2;
+        delete [] sLine1;
+        delete [] sLine2;
+
+        aPositionList[line]->Write2( rPre, i_rEnv );
+        rPre << "\n";
+    }   // end for (line)
+}
+
+const ary::cpp::Class *
+HereFind_Class( const ary::cpp::Gate & i_rGate,
+                ary::cpp::Type_id      i_nReferingTypeId )
+{
+    const ary::cpp::CodeEntity *
+        pCe = i_rGate.Search_RelatedCe( i_nReferingTypeId );
+
+    if ( pCe != 0 )
+    {
+        if  ( ary::is_type<ary::cpp::Class>(*pCe) )
+        {
+            return ary::ary_cast<ary::cpp::Class>(pCe);
+        }
+        else if ( ary::is_type<ary::cpp::Typedef>(*pCe) )
+        {
+            const ary::cpp::Typedef *
+                pTydef = ary::ary_cast<ary::cpp::Typedef>(pCe);
+            return  HereFind_Class( i_rGate, pTydef->DescribingType() );
+        }
+    }
+
+    static const ary::cpp::Class aClassNull_( "Base class not found",
+                                              ary::cpp::Ce_id(0),
+                                              ary::cpp::PROTECT_global,
+                                              ary::loc::Le_id(0),
+                                              ary::cpp::CK_class );
+    return &aClassNull_;
+}
+
+
+
+//*********************        Node        ***********************//
+
+Node::Node( const ary::cpp::Class &         i_rClass,
+            ary::cpp::Type_id               i_nClassType,
+            const ary::cpp::Gate &          i_rGate,
+            intt                            i_nPositionOffset,
+            Node *                          io_pDerived,
+            ary::cpp::E_Protection          i_eProtection,
+            bool                            i_bVirtual )
+    :   aBases(),
+        nCountBases(0),
+        pDerived(io_pDerived),
+        pClass(&i_rClass),
+        nClassType(i_nClassType),
+        eProtection(i_eProtection),
+        bVirtual(i_bVirtual),
+        nPosition(i_nPositionOffset)
+{
+    typedef ary::cpp::List_Bases  BList;
+
+    for ( BList::const_iterator it = i_rClass.BaseClasses().begin();
+          it != i_rClass.BaseClasses().end();
+          ++it )
+    {
+        const ary::cpp::Class *
+                pBaseClass = HereFind_Class( i_rGate, (*it).nId );
+
+        Dyn<Node>
+            pBase( new Node(*pBaseClass,
+                            (*it).nId,
+                            i_rGate,
+                            nPosition,
+                            this,
+                            (*it).eProtection,
+                            (*it).eVirtuality == ary::cpp::VIRTUAL_virtual)
+                 );
+        IncrBaseCount();
+        nPosition += pBase->BaseCount() + 1;
+        aBases.push_back( pBase.Release() );
+    }   // end for
+}
+
+Node::~Node()
+{
+}
+
+void
+Node::FillPositionList( std::vector< const Node* > & o_rPositionList ) const
+{
+    for ( BaseList::const_iterator it = aBases.begin();
+          it != aBases.end();
+          ++it )
+    {
+        (*it)->FillPositionList(o_rPositionList);
+    }  // end for
+
+    if( o_rPositionList.size() != uintt(Position()) )
+    {
+        csv_assert(false);
+    }
+    o_rPositionList.push_back(this);
+}
+
+void
+Node::Write2( csi::xml::Element &           o_rOut,
+              const OuputPage_Environment & i_rEnv ) const
+{
+    if ( Derived() == 0 )
+    {
+        o_rOut
+            >> *new xml::AnElement("span")
+                << new html::ClassAttr("btself")
+                << pClass->LocalName();
+        return;
+    }
+
+    csi::xml::Element *
+        pOut = & ( o_rOut >> *new xml::AnElement("span") );
+    switch ( eProtection )
+    {
+         case ary::cpp::PROTECT_public:
+                     if (bVirtual)
+                        *pOut << new html::ClassAttr("btvpubl");
+                    else
+                        *pOut << new html::ClassAttr("btpubl");
+                    break;
+        case ary::cpp::PROTECT_protected:
+                     if (bVirtual)
+                        *pOut << new html::ClassAttr("btvprot");
+                    else
+                        *pOut << new html::ClassAttr("btprot");
+                    break;
+        case ary::cpp::PROTECT_private:
+                     if (bVirtual)
+                        *pOut << new html::ClassAttr("btvpriv");
+                    else
+                        *pOut << new html::ClassAttr("btpriv");
+                    break;
+        default:    // do nothing.
+                    ;
+    }   // end switch
+
+    csi::xml::Element & rOut = *pOut;
+
+    Get_LinkedTypeText( rOut, i_rEnv, nClassType, false );
+    rOut << " (";
+    if ( bVirtual )
+        rOut << "virtual ";
+    switch ( eProtection )
+    {
+         case ary::cpp::PROTECT_public:
+                    rOut << "public)";
+                    break;
+         case ary::cpp::PROTECT_protected:
+                    rOut << "protected)";
+                    break;
+         case ary::cpp::PROTECT_private:
+                    rOut << "private)";
+                    break;
+        default:    // do nothing.
+                    ;
+    }   // end switch
+}
+
+void
+Node::IncrBaseCount()
+{
+    ++nCountBases;
+    if (pDerived != 0)
+        pDerived->IncrBaseCount();
+}
+
+
+}   // anonymous namespace
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/pm_class.hxx b/autodoc/source/display/html/pm_class.hxx
new file mode 100644
index 000000000000..71d9f604c602
--- /dev/null
+++ b/autodoc/source/display/html/pm_class.hxx
@@ -0,0 +1,133 @@
+/* -*- 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 ADC_DISPLAY_HTML_PM_CLASS_HXX
+#define ADC_DISPLAY_HTML_PM_CLASS_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "pm_base.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+     namespace cpp
+    {
+         class Class;
+    }
+}
+
+class ChildList_Display;
+class NavigationBar;
+
+
+class PageMaker_Class : public SpecializedPageMaker
+{
+  public:
+    enum E_ChidList
+    {
+        cl_NestedClasses = 0,
+        cl_NestedStructs,
+        cl_NestedUnions,
+        cl_Enums,
+        cl_Typedefs,
+        cl_Operations,
+        cl_StaticOperations,
+        cl_Data,
+        cl_StaticData,
+        cl_MAX
+    };
+                        PageMaker_Class(
+                            PageDisplay &       io_rPage,
+                            const ary::cpp::Class &
+                                                i_rClass );
+
+    virtual             ~PageMaker_Class();
+
+    virtual void        MakePage();
+
+  private:
+    enum E_MemberProtection { mp_public = 0, mp_protected, mp_private, mp_MAX };
+
+    virtual void        Write_NavBar();
+    virtual void        Write_TopArea();
+    virtual void        Write_DocuArea();
+    virtual void        Write_ChildList(
+                            ary::SlotAccessId   i_nSlot,
+                            E_ChidList          i_eChildListIndex,
+                            const char *        i_sLabel,
+                            const char *        i_sListTitle,
+                            csi::xml::Element & o_rPublic,
+                            csi::xml::Element & o_rProtected,
+                            csi::xml::Element & o_rPrivate );
+    void                Write_ChildList_forClasses(
+                            csi::xml::Element & o_rPublic,
+                            csi::xml::Element & o_rProtected,
+                            csi::xml::Element & o_rPrivate,
+                            const char *        i_sLabel,
+                            const char *        i_sListTitle,
+                            ary::cpp::E_ClassKey
+                                                i_eFilter  );
+    void                Write_ChildLists();
+    static const char * ChildListLabel(
+                            const char *        i_sLabel,
+                            E_MemberProtection  i_eMpr );
+    csi::html::DefListDefinition &
+                        Setup_MemberSegment_Out(
+                            E_MemberProtection  i_eMpr );
+    void                Create_NaviSubRow(
+                            E_MemberProtection  i_eMpr );
+    void                Write_BaseHierarchy();
+    void                Write_DerivedList();
+
+    const ary::cpp::Class &
+                        Me() const              { return *pMe; }
+    // DATA
+    const ary::cpp::Class *
+                        pMe;
+    Dyn<ChildList_Display>
+                        pChildDisplay;
+    Dyn<NavigationBar>  pNavi;
+
+    Dyn<csi::xml::Element>
+                        pProtectionArea[mp_MAX];
+
+    bool                bChildLists_Exist[3*cl_MAX];
+};
+
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/pm_help.cxx b/autodoc/source/display/html/pm_help.cxx
new file mode 100644
index 000000000000..80a832e05510
--- /dev/null
+++ b/autodoc/source/display/html/pm_help.cxx
@@ -0,0 +1,234 @@
+/* -*- 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 <precomp.h>
+#include "pm_help.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include "navibar.hxx"
+#include "html_kit.hxx"
+
+using namespace csi;
+using csi::html::Paragraph;
+using csi::html::HorizontalLine;
+using csi::html::Headline;
+using csi::html::AlignAttr;
+using csi::html::Bold;
+using csi::html::Link;
+using csi::html::Sbr;
+using csi::html::LineBreak;
+using csi::xml::Element;
+
+
+
+const String  C_sHelpText(
+"<div style=\"font-size:10pt;\">\n"
+"<h3 class=\"help\">The Main Navigationbar</h3>\n"
+"<p> On top of every page, there is a main navigationbar on a lightly coloured\n"
+"background with the following items:<br>\n"
+"</p>\n"
+"<ul>\n"
+"  <li>Overview - the start page for this document,</li>\n"
+"  <li>Namespace - the lowest/deepest namespace of the language objects, described\n"
+"on the current page,</li>\n"
+"  <li>Class - the class, struct or union, which owns the methods or data,\n"
+"described on the current page,</li>\n"
+"  <li>Index - the global alphabetical index,</li>\n"
+"  <li>Help - this page.</li>\n"
+"</ul>\n"
+" Each item in this&nbsp; bar can be in three different states:<br>\n"
+"<ul>\n"
+"  <li>Link - the item is valid and you can get there,</li>\n"
+"  <li>Simple - the item does not apply (if this page described a namespace,\n"
+"there would be no owning class),</li>\n"
+"  <li>Reversed (white text on dark background) - this is the current page.</li>\n"
+"</ul>\n"
+"<h3 class=\"help\">Lower Navigationbars</h3>\n"
+" Just below the main navigation bar, there may be zero to three lower navigationbars\n"
+"on white background.<br>\n"
+"<br>\n"
+"Their items are dependent of the context, but they always link to paragraphs\n"
+"on the same, current page.<br>\n"
+"Available items appear as links. Unavailable items appear as simple text.<br>\n"
+"\n"
+"\n"
+"<h3 class=\"help\">Namespace Descriptions</h3>\n"
+"\n"
+"<dl>\n"
+"<dt class=\"simple\">Parent namespaces</dt>\n"
+"  </dl>\n"
+"  <dl>\n"
+"  <dd>In front of the namespace title, there is a linked list of the parent\n"
+"namespaces. The global namespace is linked with the first \"::\",</dd>\n"
+"    <dd>the namespaces between the global and the current one are linked\n"
+"by their names.<br>\n"
+"      </dd>\n"
+"      <dd> </dd>\n"
+"        </dl>\n"
+"After the title, the documentation of the namespace follows (which is often\n"
+"missing, because the namespace name may be self-explaining).<br>\n"
+"        <br>\n"
+"Below are the lists of nested namspaces and of the classes, functions and\n"
+"other program objects, that belong within this namespace.<br>\n"
+"Each of this lists is accessible by the lower navigationbar on top of the\n"
+"page.<br>\n"
+"\n"
+"<h3 class=\"help\">Class Descriptions</h3>\n"
+"\n"
+"        <dl>\n"
+"        <dt class=\"simple\">Parent namespaces and classes</dt>\n"
+"          </dl>\n"
+"          <dl>\n"
+"          <dd>In front of the class title, there is a linked list of the\n"
+"parent namespaces or classes. The global namespace is linked with the first\n"
+"\"::\",</dd>\n"
+"            <dd>the namespaces between the global and the current one are\n"
+"linked by their names. Enclosing classes are linked as well, but appear in\n"
+"<span class=\"nqclass\">green</font> color.&nbsp;</dd>\n"
+"              <dd>So you see on the first glance, that this is a parent class,\n"
+"no namespace.<br>\n"
+"               </dd>\n"
+"                <dd><br>\n"
+"                  </dd>\n"
+"                  </dl>\n"
+"After the title, the bases and derivations of the class follow. <br>\n"
+"Base classes are displayed as a graph. The text around base classes can appear\n"
+"in different styles and colours:<br>\n"
+"<ul>\n"
+"  <li><span class=\"btpubl\">Green</span> - public inherited,</li>\n"
+"  <li><span class=\"btprot\">Orange</span> - protected inherited,</li>\n"
+"  <li><span class=\"btpriv\">Red</span> - private inherited,</li>\n"
+"  <li><span class=\"btvpubl\">italic</span> - a (public inherited) virtual base class.</li>\n"
+"  <li><span class=\"btself\">Bold and black</span> without a link - the placeholder\n"
+"for the currently described class.<br>\n"
+"  </li>\n"
+"</ul>\n"
+"There may be many derivations of a class, but only the known ones, which\n"
+"are described within this document also, are listed.<br>\n"
+"<br>\n"
+"Below the derivations is a little table with some properties of the class:<br>\n"
+"<ul>\n"
+"  <li>virtual - the class owns at least one virtual method,</li>\n"
+"  <li>abstract - the class owns at least one abstract method,</li>\n"
+"  <li>interface - the class may or may be not abstract,\n"
+"but it is intended by its author to be used only as an interface and never\n"
+"to be instantiated,</li>\n"
+"  <li>template - the class is a template class.<br>\n"
+"  </li>\n"
+"</ul>\n"
+"Next comes further documentation of the class itself.<br>\n"
+"<br>\n"
+"Lastly, there are listed all members of the class. Public members come first,\n"
+"then protected, at last the private ones.<br>\n"
+"All member lists are accessible by the lower navigationbars on top of the\n"
+"page.<br>\n"
+"\n"
+"<h3 class=\"help\">Macros and Defines</h3>\n"
+"In C++ and C, there are also program constructs, which do not fit into the\n"
+"name tree, because they are #define'd: macros and definitions.<br>\n"
+"These may be documented, too. Those comments you find <a href=\"def-all.html\">\n"
+"here</a>\n"
+" or from the \"Overview\" start page.\n"
+"<h3 class=\"help\">Links to IDL-Documentation</h3>\n"
+"Some types, which appear as links, may refer to classes, enums or other\n"
+"entities, which are direct mappings of UNO-IDL entities.<br>\n"
+"In those cases the link doesn't lead to the C++ class, enum or whatever,\n"
+"but to the description of the IDL entity.\n"
+"<h3 class=\"help\">How to Link From Extern Documents</h3>\n"
+"If you wish to write an extern html document, which links to types within\n"
+"this C++ reference, you can do so, if your links have the following format:<br>\n"
+"<br>\n"
+"&lt;RootDirectory-of-this-Document&gt;/names/&lt;Namespace-A&gt;/&lt;Namespace-XY&gt;/EnclosingClass-nn&gt;/&lt;TypePreFix&gt;-&lt;MyTypeName&gt;.html<br>\n"
+"<br>\n"
+"&lt;TypePreFix&gt; can have the following values:<br>\n"
+"<ul>\n"
+"<li>c - class, struct or union</li>\n"
+"<li>e - enum</li>\n"
+"<li>t - typedef</li>\n"
+"</ul>\n"
+"If this document would be located in directory &nbsp;\"/doc/cpp/ref\", examples\n"
+"would look like this:<br>\n"
+"<br>\n"
+"&lt;a href=\"/doc/cpp/ref/names/osl/c-File.html\"&gt;class File&lt;/a&gt;<br>\n"
+"&lt;a href=\"/doc/cpp/ref/names/osl/FileBase/e-RC.html\"&gt;enum FileBase::RC&lt;/a&gt;<br>\n"
+"&lt;a href=\"/doc/cpp/ref/names/t-oslMutex.html\"&gt;typedef oslMutex&lt;/a&gt;<br>\n"
+"<br>\n"
+"Namespaces are described in the index.html file within their directory:<br>\n"
+"<br>\n"
+"&lt;a href=\"/doc/cpp/ref/names/cppu/index.html\"&gt;namespace cppu&lt;/a&gt;<br>\n"
+"</div>" );
+
+
+
+
+PageMaker_Help::PageMaker_Help( PageDisplay & io_rPage )
+    :   SpecializedPageMaker(io_rPage),
+        pNavi(0)
+{
+}
+
+PageMaker_Help::~PageMaker_Help()
+{
+}
+
+void
+PageMaker_Help::MakePage()
+{
+    pNavi = new NavigationBar( Env(), NavigationBar::LOC_Help );
+    Write_NavBar();
+
+    Write_TopArea();
+    Write_DocuArea();
+}
+
+void
+PageMaker_Help::Write_NavBar()
+{
+    pNavi->Write( CurOut() );
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_Help::Write_TopArea()
+{
+    adcdisp::PageTitle_Std fTitle;
+    fTitle( CurOut(), "How to Use", "this Reference Document" );
+
+    CurOut() << new xml::XmlCode(C_sHelpText);
+}
+
+void
+PageMaker_Help::Write_DocuArea()
+{
+    CurOut() << new HorizontalLine;
+}
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/pm_help.hxx b/autodoc/source/display/html/pm_help.hxx
new file mode 100644
index 000000000000..e40f2f3f503b
--- /dev/null
+++ b/autodoc/source/display/html/pm_help.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 ADC_DISPLAY_HTML_PM_HELP_HXX
+#define ADC_DISPLAY_HTML_PM_HELP_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "pm_base.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+class NavigationBar;
+
+class PageMaker_Help : public SpecializedPageMaker
+{
+  public:
+                        PageMaker_Help(
+                            PageDisplay &       io_rPage );
+
+    virtual             ~PageMaker_Help();
+
+    virtual void        MakePage();
+
+  private:
+    virtual void        Write_NavBar();
+    virtual void        Write_TopArea();
+    virtual void        Write_DocuArea();
+
+    // DATA
+    Dyn<NavigationBar>  pNavi;
+};
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/pm_index.cxx b/autodoc/source/display/html/pm_index.cxx
new file mode 100644
index 000000000000..122329e9dcdb
--- /dev/null
+++ b/autodoc/source/display/html/pm_index.cxx
@@ -0,0 +1,320 @@
+/* -*- 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 <precomp.h>
+#include "pm_index.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_define.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_enuval.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_macro.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/c_vari.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include "aryattrs.hxx"
+#include "hd_chlst.hxx"
+#include "hd_docu.hxx"
+#include "html_kit.hxx"
+#include "navibar.hxx"
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+#include "strconst.hxx"
+
+using namespace csi;
+using ary::GlobalId;
+
+
+
+
+namespace
+{
+
+inline const char *
+F_CK_Text( ary::cpp::E_ClassKey i_eCK )
+{
+    switch (i_eCK)
+    {
+         case ary::cpp::CK_class:    return "class";
+         case ary::cpp::CK_struct:   return "struct";
+         case ary::cpp::CK_union:    return "union";
+    }   // end switch
+    return "";
+}
+
+template <class CE>
+inline const char *
+F_OwnerType( const CE & i_rData, const ary::cpp::Gate & i_rGate )
+{
+     if ( i_rData.Protection() == ary::cpp::PROTECT_global )
+        return "namespace ";
+
+    const ary::cpp::Class *
+        pClass = dynamic_cast< const ary::cpp::Class* >(
+                    i_rGate.Ces().Search_Ce(i_rData.Owner()) );
+    if (pClass != 0)
+        return F_CK_Text(pClass->ClassKey());
+    return "";
+}
+
+}   // anonymous namespace
+
+PageMaker_Index::PageMaker_Index( PageDisplay & io_rPage,
+                                  char          i_c )
+    :   SpecializedPageMaker(io_rPage),
+        pNavi(0),
+        c(i_c),
+        pCurIndex(0)
+{
+}
+
+PageMaker_Index::~PageMaker_Index()
+{
+}
+
+void
+PageMaker_Index::MakePage()
+{
+    pNavi = new NavigationBar( Env(), NavigationBar::LOC_Index );
+
+    Write_NavBar();
+    Write_TopArea();
+    Write_CompleteAlphabeticalList();
+}
+
+void
+PageMaker_Index::do_Process( const ary::cpp::Namespace & i_rData )
+{
+    Write_CeIndexEntry( i_rData, "namespace", "namespace" );
+}
+
+void
+PageMaker_Index::do_Process( const ary::cpp::Class & i_rData )
+{
+    // KORR_FUTURE
+    //  Really throw out all anonymous classes from index?
+
+    if ( strncmp(i_rData.LocalName().c_str()+1,"_Anonymous",10) == 0 )
+        return;
+
+    Write_CeIndexEntry( i_rData,
+                        F_CK_Text(i_rData.ClassKey()),
+                        F_OwnerType(i_rData, Env().Gate()) );
+}
+
+void
+PageMaker_Index::do_Process( const ary::cpp::Enum & i_rData )
+{
+    Write_CeIndexEntry( i_rData, "enum", F_OwnerType(i_rData, Env().Gate()) );
+}
+
+void
+PageMaker_Index::do_Process( const ary::cpp::Typedef & i_rData )
+{
+    Write_CeIndexEntry( i_rData, "typedef", F_OwnerType(i_rData, Env().Gate()) );
+}
+
+void
+PageMaker_Index::do_Process( const ary::cpp::Function & i_rData )
+{
+    Write_CeIndexEntry( i_rData, "function", F_OwnerType(i_rData, Env().Gate()) );
+}
+
+void
+PageMaker_Index::do_Process( const ary::cpp::Variable & i_rData )
+{
+    Write_CeIndexEntry( i_rData, "variable", F_OwnerType(i_rData, Env().Gate()) );
+}
+
+void
+PageMaker_Index::do_Process( const ary::cpp::EnumValue & i_rData )
+{
+    Write_CeIndexEntry( i_rData, "enum value", "" );
+}
+
+void
+PageMaker_Index::do_Process( const ary::cpp::Define & i_rData )
+{
+    String  sFileName;
+
+    pCurIndex->AddEntry();
+    pCurIndex->Term()
+        >> *new html::Link( Link2CppDefinition(Env(), i_rData) )
+            >> *new html::Bold
+                <<  i_rData.LocalName();
+    pCurIndex->Term()
+        << " - define";
+    pCurIndex->Def() << " ";
+}
+
+void
+PageMaker_Index::do_Process( const ary::cpp::Macro & i_rData )
+{
+    String  sFileName;
+
+    pCurIndex->AddEntry();
+    pCurIndex->Term()
+        >> *new html::Link( Link2CppDefinition(Env(), i_rData) )
+            >> *new html::Bold
+                <<  i_rData.LocalName();
+    pCurIndex->Term()
+        << " - macro";
+
+    pCurIndex->Def() << " ";
+}
+
+const ary::cpp::Gate *
+PageMaker_Index::inq_Get_ReFinder() const
+{
+     return &Env().Gate();
+}
+
+void
+PageMaker_Index::Write_NavBar()
+{
+    pNavi->Write( CurOut() );
+    CurOut() << new html::HorizontalLine;
+}
+
+
+const String   C_sAlphabet(
+"<a href=\"index-1.html\"><B>A</B></a> <a href=\"index-2.html\"><B>B</B></a> <a href=\"index-3.html\"><B>C</B></a> <a href=\"index-4.html\"><B>D</B></a> <a href=\"index-5.html\"><B>E</B></a> "
+"<a href=\"index-6.html\"><B>F</B></a> <a href=\"index-7.html\"><B>G</B></a> <a href=\"index-8.html\"><B>H</B></a> <a href=\"index-9.html\"><B>I</B></a> <a href=\"index-10.html\"><B>J</B></a> "
+"<a href=\"index-11.html\"><B>K</B></a> <a href=\"index-12.html\"><B>L</B></a> <a href=\"index-13.html\"><B>M</B></a> <a href=\"index-14.html\"><B>N</B></a> <a href=\"index-15.html\"><B>O</B></a> "
+"<a href=\"index-16.html\"><B>P</B></a> <a href=\"index-17.html\"><B>Q</B></a> <a href=\"index-18.html\"><B>R</B></a> <a href=\"index-19.html\"><B>S</B></a> <a href=\"index-20.html\"><B>T</B></a> "
+"<a href=\"index-21.html\"><B>U</B></a> <a href=\"index-22.html\"><B>V</B></a> <a href=\"index-23.html\"><B>W</B></a> <a href=\"index-24.html\"><B>X</B></a> <a href=\"index-25.html\"><B>Y</B></a> "
+"<a href=\"index-26.html\"><B>Z</B></a> <a href=\"index-27.html\"><B>_</B></a>" );
+
+void
+PageMaker_Index::Write_TopArea()
+{
+    String  sLetter(&c, 1);
+
+    adcdisp::PageTitle_Std fTitle;
+    fTitle( CurOut(), "Global Index", sLetter );
+
+    CurOut() >>* new html::Paragraph
+                 << new html::AlignAttr("center")
+                 << new xml::XmlCode(C_sAlphabet);
+
+    CurOut() << new html::HorizontalLine;
+}
+
+void
+PageMaker_Index::Write_CompleteAlphabeticalList()
+{
+    std::vector<GlobalId>
+        aThisPagesItems;
+    const ary::cpp::Gate &
+        rGate = Env().Gate();
+
+    static char sBegin[] = "X";
+    static char sEnd[] = "Y";
+
+    switch ( c )
+    {
+         case 'Z':   sBegin[0] = 'Z';
+                    sEnd[0] = '_';
+                    break;
+        case '_':   sBegin[0] = '_';
+                    sEnd[0] = '0';
+                    break;
+        default:    sBegin[0] = c;
+                    sEnd[0] = char(c + 1);
+                    break;
+    }
+
+    uintt
+        nCount = rGate.Get_AlphabeticalList( aThisPagesItems, sBegin, sEnd );
+    if (nCount > 0 )
+    {
+        adcdisp::IndexList
+            aIndex(CurOut());
+        pCurIndex = &aIndex;
+
+        std::vector<GlobalId>::const_iterator itEnd = aThisPagesItems.end();
+        for ( std::vector<GlobalId>::const_iterator it = aThisPagesItems.begin();
+              it != itEnd;
+              ++it )
+        {
+            const ary::Entity *
+                pRe = rGate.Search_Entity( *it );
+            if ( pRe != 0 )
+                pRe->Accept(*this);
+        }   // end for
+
+        pCurIndex = 0;
+    }   // endif (nCount > 0)
+}
+
+void
+PageMaker_Index::Write_CeIndexEntry( const ary::cpp::CodeEntity &
+                                                            i_rCe,
+                                     const char *           i_sType,
+                                     const char *           i_sOwnerType )
+{
+    if ( Ce_IsInternal(i_rCe) )
+        return;
+
+    static csv::StreamStr aQualification(500);
+
+    const ary::cpp::CodeEntity &
+        rOwner = Env().Gate().Ces().Find_Ce(i_rCe.Owner());
+
+    pCurIndex->AddEntry();
+    pCurIndex->Term()
+        >> *new html::Link( Link2Ce(Env(), i_rCe) )
+            >> *new html::Bold
+                <<  i_rCe.LocalName();
+    pCurIndex->Term()
+        <<  " - "
+        <<  i_sType;
+
+    if ( rOwner.Owner().IsValid() )
+    {
+        aQualification.seekp(0);
+        Env().Gate().Ces().Get_QualifiedName( aQualification,
+                                              rOwner.LocalName(),
+                                              rOwner.Owner() );
+
+        pCurIndex->Term()
+            <<  " in "
+            << i_sOwnerType
+            << " "
+            << aQualification.c_str();
+    }
+
+    pCurIndex->Def() << " ";
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/pm_index.hxx b/autodoc/source/display/html/pm_index.hxx
new file mode 100644
index 000000000000..e558292e3eae
--- /dev/null
+++ b/autodoc/source/display/html/pm_index.hxx
@@ -0,0 +1,138 @@
+/* -*- 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 ADC_DISPLAY_HTML_PM_INDEX_HXX
+#define ADC_DISPLAY_HTML_PM_INDEX_HXX
+
+// BASE CLASSES
+#include "pm_base.hxx"
+#include <ary/ary_disp.hxx>
+#include <cosv/tpl/processor.hxx>
+// USED SERVICES
+namespace adcdisp
+{
+     class IndexList;
+}
+namespace ary
+{
+    namespace cpp
+    {
+        class Namespace;
+        class Class;
+        class Enum;
+        class Typedef;
+        class Function;
+        class Variable;
+        class EnumValue;
+        class Define;
+        class Macro;
+    }
+}
+
+class NavigationBar;
+
+
+
+
+class PageMaker_Index : public SpecializedPageMaker,
+                        public ary::Display,
+                        public csv::ConstProcessor<ary::cpp::Namespace>,
+                        public csv::ConstProcessor<ary::cpp::Class>,
+                        public csv::ConstProcessor<ary::cpp::Enum>,
+                        public csv::ConstProcessor<ary::cpp::Typedef>,
+                        public csv::ConstProcessor<ary::cpp::Function>,
+                        public csv::ConstProcessor<ary::cpp::Variable>,
+                        public csv::ConstProcessor<ary::cpp::EnumValue>,
+                        public csv::ConstProcessor<ary::cpp::Define>,
+                        public csv::ConstProcessor<ary::cpp::Macro>
+{
+  public:
+                        PageMaker_Index(
+                            PageDisplay &       io_rPage,
+                            char                i_c );
+
+    virtual             ~PageMaker_Index();
+
+    virtual void        MakePage();
+
+  private:
+    // Interface csv::ConstProcessor<>
+    virtual void        do_Process(
+                            const ary::cpp::Namespace &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Class &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Enum &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Typedef &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Function &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Variable &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::EnumValue &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Define &
+                                                i_rData );
+    virtual void        do_Process(
+                            const ary::cpp::Macro &
+                                                i_rData );
+    // Interface ary::cpp::Display:
+    virtual const ary::cpp::Gate *
+                        inq_Get_ReFinder() const;
+    // Locals
+    virtual void        Write_NavBar();
+    virtual void        Write_TopArea();
+    virtual void        Write_CompleteAlphabeticalList();
+
+    void                Write_CeIndexEntry(
+                            const ary::cpp::CodeEntity &
+                                                i_rCe,
+                            const char *        i_sType,
+                            const char *        i_sOwnerType );
+
+    // DATA
+    Dyn<NavigationBar>  pNavi;
+    char                c;
+    adcdisp::IndexList *
+                        pCurIndex;
+};
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/pm_namsp.cxx b/autodoc/source/display/html/pm_namsp.cxx
new file mode 100644
index 000000000000..ea07fc77a45c
--- /dev/null
+++ b/autodoc/source/display/html/pm_namsp.cxx
@@ -0,0 +1,176 @@
+/* -*- 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 <precomp.h>
+#include "pm_namsp.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include "hd_chlst.hxx"
+#include "hd_docu.hxx"
+#include "html_kit.hxx"
+#include "navibar.hxx"
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+#include "strconst.hxx"
+
+
+using namespace csi;
+using csi::html::HorizontalLine;
+using csi::html::Link;
+using csi::html::Table;
+using csi::html::TableRow;
+using csi::html::TableCell;
+
+
+
+PageMaker_Namespace::PageMaker_Namespace( PageDisplay & io_rPage )
+    :   SpecializedPageMaker(io_rPage),
+        pMe( io_rPage.Env().CurNamespace() ),
+        pChildDisplay( new ChildList_Display(io_rPage.Env()) ),
+        pNavi(0)
+{
+    csv_assert( pMe != 0 );
+}
+
+PageMaker_Namespace::~PageMaker_Namespace()
+{
+}
+
+void
+PageMaker_Namespace::MakePage()
+{
+    pNavi = new NavigationBar( Env(), Me() );
+
+    Write_NavBar();
+    Write_TopArea();
+    Write_DocuArea();
+
+    pNavi->MakeSubRow("");
+    Write_ChildList( ary::cpp::Namespace::SLOT_SubNamespaces, C_sTitle_SubNamespaces, C_sLabel_SubNamespaces );
+
+    Write_ChildLists_forClasses( C_sTitle_Classes,
+                                 C_sLabel_Classes,
+                                 ary::cpp::CK_class );
+    Write_ChildLists_forClasses( C_sTitle_Structs,
+                                 C_sLabel_Structs,
+                                 ary::cpp::CK_struct );
+    Write_ChildLists_forClasses( C_sTitle_Unions,
+                                 C_sLabel_Unions,
+                                 ary::cpp::CK_union );
+
+    Write_ChildList( ary::cpp::Namespace::SLOT_Enums, C_sTitle_Enums, C_sLabel_Enums  );
+    Write_ChildList( ary::cpp::Namespace::SLOT_Typedefs, C_sTitle_Typedefs, C_sLabel_Typedefs  );
+    Write_ChildList( ary::cpp::Namespace::SLOT_Operations, C_sTitle_Operations, C_sLabel_Operations  );
+    Write_ChildList( ary::cpp::Namespace::SLOT_Constants, C_sTitle_Constants, C_sLabel_Constants  );
+    Write_ChildList( ary::cpp::Namespace::SLOT_Variables, C_sTitle_Variables, C_sLabel_Variables  );
+
+    pNavi->Write_SubRows();
+}
+
+void
+PageMaker_Namespace::Write_NavBar()
+{
+    pNavi->Write( CurOut() );
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_Namespace::Write_TopArea()
+{
+    Page().Write_NameChainWithLinks( Me() );
+
+    adcdisp::PageTitle_Std fTitle;
+    xml::Element & rH3 = fTitle( CurOut() );
+    if ( Env().CurNamespace()->Owner().IsValid() )
+    {
+        rH3 << C_sHFTypeTitle_Namespace
+            << " "
+            << Env().CurNamespace()->LocalName();
+    }
+    else
+    {
+        rH3 << C_sHFTitle_GlobalNamespaceCpp;
+    }
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_Namespace::Write_DocuArea()
+{
+    Docu_Display aDocuShow( Env() );
+
+    aDocuShow.Assign_Out(CurOut());
+    aDocuShow.Process(Me().Docu());
+    aDocuShow.Unassign_Out();
+
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_Namespace::Write_ChildList( ary::SlotAccessId   i_nSlot,
+                                      const char *        i_sListTitle,
+                                      const char *        i_sLabel )
+
+{
+    bool    bChildrenExist = false;
+    ChildList_Display::Area_Result
+            aResult( bChildrenExist, CurOut() );
+
+    pChildDisplay->Run_Simple( aResult,
+                               i_nSlot,
+                               i_sLabel,
+                               i_sListTitle );
+
+    pNavi->AddItem(i_sListTitle, i_sLabel, bChildrenExist);
+    if (bChildrenExist)
+        CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_Namespace::Write_ChildLists_forClasses( const char *         i_sListTitle,
+                                                  const char *         i_sLabel,
+                                                  ary::cpp::E_ClassKey i_eFilter )
+
+{
+    bool    bChildrenExist = false;
+    ChildList_Display::Area_Result
+            aResult( bChildrenExist, CurOut() );
+
+    pChildDisplay->Run_GlobalClasses( aResult,
+                                      ary::cpp::Namespace::SLOT_Classes,
+                                      i_sLabel,
+                                      i_sListTitle,
+                                      i_eFilter );
+
+    pNavi->AddItem(i_sListTitle, i_sLabel, bChildrenExist);
+    if ( bChildrenExist )
+        CurOut() << new HorizontalLine;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/pm_namsp.hxx b/autodoc/source/display/html/pm_namsp.hxx
new file mode 100644
index 000000000000..c2f0535ad7d7
--- /dev/null
+++ b/autodoc/source/display/html/pm_namsp.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 ADC_DISPLAY_HTML_PM_NAMSP_HXX
+#define ADC_DISPLAY_HTML_PM_NAMSP_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "pm_base.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+class ChildList_Display;
+class NavigationBar;
+
+class PageMaker_Namespace : public SpecializedPageMaker
+{
+  public:
+                        PageMaker_Namespace(
+                            PageDisplay &       io_rPage );
+
+    virtual             ~PageMaker_Namespace();
+
+    virtual void        MakePage();
+
+  private:
+    virtual void        Write_NavBar();
+    virtual void        Write_TopArea();
+    virtual void        Write_DocuArea();
+    virtual void        Write_ChildList(
+                            ary::SlotAccessId   i_nSlot,
+                            const char *        i_nListTitle,
+                            const char *        i_nLabel );
+    void                Write_ChildLists_forClasses(
+                            const char *         i_sListTitle,
+                            const char *         i_sLabel,
+                            ary::cpp::E_ClassKey i_eFilter );
+
+    const ary::cpp::Namespace &
+                        Me() const              { return *pMe; }
+    // DATA
+    const ary::cpp::Namespace *
+                        pMe;
+    Dyn<ChildList_Display>
+                        pChildDisplay;
+    Dyn<NavigationBar>  pNavi;
+};
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/pm_start.cxx b/autodoc/source/display/html/pm_start.cxx
new file mode 100644
index 000000000000..335783b1b809
--- /dev/null
+++ b/autodoc/source/display/html/pm_start.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pm_start.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/ary.hxx>
+#include "hd_chlst.hxx"
+#include "hd_docu.hxx"
+#include "navibar.hxx"
+#include "html_kit.hxx"
+#include "opageenv.hxx"
+#include "pagemake.hxx"
+#include "strconst.hxx"
+
+
+using namespace csi;
+using csi::html::Paragraph;
+using csi::html::HorizontalLine;
+using csi::html::AlignAttr;
+using csi::html::Bold;
+using csi::html::Link;
+using csi::html::Sbr;
+using csi::html::LineBreak;
+
+
+
+PageMaker_Overview::PageMaker_Overview( PageDisplay & io_rPage )
+    :   SpecializedPageMaker(io_rPage),
+        pNavi(0)
+{
+}
+
+PageMaker_Overview::~PageMaker_Overview()
+{
+}
+
+void
+PageMaker_Overview::MakePage()
+{
+    pNavi = new NavigationBar( Env(), NavigationBar::LOC_Overview );
+    Write_NavBar();
+
+    Write_TopArea();
+    Write_DocuArea();
+}
+
+void
+PageMaker_Overview::Write_NavBar()
+{
+    pNavi->Write( CurOut() );
+    CurOut() << new HorizontalLine;
+}
+
+void
+PageMaker_Overview::Write_TopArea()
+{
+    adcdisp::PageTitle_Std fTitle;
+    fTitle( CurOut(), Env().RepositoryTitle(), "" );
+
+    CurOut()
+        >> *new Paragraph
+            << new html::StyleAttr("font-size:14pt;")
+            << "This is a reference documentation for the C++ source code."
+            << new LineBreak
+            << new LineBreak
+            << "Points to start:";
+
+    html::SimpleList &
+        rList = *new html::SimpleList;
+    CurOut() >> rList;
+
+    html::ListItem & rNamedObjsItem =
+        rList.AddItem();
+
+    StreamLock sNspDir(50);
+    rNamedObjsItem
+            << new html::StyleAttr("font-size:14pt;")
+            >> *new Link( sNspDir() << C_sDIR_NamespacesCpp
+                                    << "/"
+                                    << C_sHFN_Namespace
+                                    << c_str )
+                    >> *new Bold
+                        << "Named Objects";
+    rNamedObjsItem << " (classes, functions, namespaces, etc.)"
+                   << new html::LineBreak;
+    rList.AddItem()
+            << new html::StyleAttr("font-size:14pt;")
+            >> *new Link( "def-all.html" )
+                    >> *new Bold
+                        << "Defines and Macros"
+                        << new html::LineBreak;
+    StreamLock sIndexDir(50);
+    rList.AddItem()
+            << new html::StyleAttr("font-size:14pt;")
+            >> *new Link( sIndexDir() << C_sDIR_Index
+                                      << "/index-1.html"
+                                      << c_str )
+                    >> *new Bold
+                        << "Global Index"
+                        << new html::LineBreak;
+}
+
+void
+PageMaker_Overview::Write_DocuArea()
+{
+    CurOut() << new HorizontalLine;
+}
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/pm_start.hxx b/autodoc/source/display/html/pm_start.hxx
new file mode 100644
index 000000000000..26614b33bc7d
--- /dev/null
+++ b/autodoc/source/display/html/pm_start.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 ADC_DISPLAY_HTML_PM_START_HXX
+#define ADC_DISPLAY_HTML_PM_START_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "pm_base.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+class NavigationBar;
+
+class PageMaker_Overview : public SpecializedPageMaker
+{
+  public:
+                        PageMaker_Overview(
+                            PageDisplay &       io_rPage );
+
+    virtual             ~PageMaker_Overview();
+
+    virtual void        MakePage();
+
+  private:
+    virtual void        Write_NavBar();
+    virtual void        Write_TopArea();
+    virtual void        Write_DocuArea();
+
+    // DATA
+    Dyn<NavigationBar>  pNavi;
+};
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/protarea.cxx b/autodoc/source/display/html/protarea.cxx
new file mode 100644
index 000000000000..d581014eccac
--- /dev/null
+++ b/autodoc/source/display/html/protarea.cxx
@@ -0,0 +1,140 @@
+/* -*- 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 <precomp.h>
+#include "protarea.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include "hdimpl.hxx"
+
+
+inline UINT8
+ProtectionArea::Index( ary::cpp::E_ClassKey i_eClassKey ) const
+{
+     return i_eClassKey == ary::cpp::CK_class
+                ?   0
+                :   i_eClassKey == ary::cpp::CK_struct
+                        ?   1
+                        :   2;
+}
+
+
+
+ProtectionArea::ProtectionArea( const char *        i_sLabel,
+                                const char *        i_sTitle )
+    :   pSglTable( new S_Slot_Table(i_sTitle) ),
+        aClassesTables(),
+        sLabel(i_sLabel)
+{
+}
+
+ProtectionArea::~ProtectionArea()
+{
+
+}
+
+csi::html::Table &
+ProtectionArea::GetTable()
+{
+    csv_assert(pSglTable);
+
+    return pSglTable->GetTable();
+}
+
+csi::html::Table &
+ProtectionArea::GetTable( ary::cpp::E_ClassKey i_eClassKey )
+{
+    csv_assert(aClassesTables[Index(i_eClassKey)]);
+    return aClassesTables[Index(i_eClassKey)]->GetTable();
+}
+
+DYN csi::html::Table *
+ProtectionArea::ReleaseTable()
+{
+    csv_assert(pSglTable);
+    return pSglTable->ReleaseTable();
+}
+
+DYN csi::html::Table *
+ProtectionArea::ReleaseTable( ary::cpp::E_ClassKey i_eClassKey )
+{
+    csv_assert(aClassesTables[Index(i_eClassKey)]);
+    return aClassesTables[Index(i_eClassKey)]->ReleaseTable();
+}
+
+const char *
+ProtectionArea::Label() const
+{
+    return sLabel;
+}
+
+
+bool
+ProtectionArea::WasUsed_Area() const
+{
+    if ( pSglTable )
+    {
+         return pSglTable->WasUsed();
+    }
+
+    typedef const Dyn<ProtectionArea::S_Slot_Table> cdyntab;
+
+    // Workaround a maybe compiler bug in Solaris5-CC ?
+    //   should normally work without the cast,
+    //   because that is exactly the genuine type, given:
+    return static_cast< cdyntab& >(aClassesTables[0])->WasUsed()
+           OR static_cast< cdyntab& >(aClassesTables[1])->WasUsed()
+           OR static_cast< cdyntab& >(aClassesTables[2])->WasUsed();
+}
+
+//*******************        S_Slot_Table        **********************//
+
+ProtectionArea::
+S_Slot_Table::S_Slot_Table(const char * i_sTitle)
+    :   sTableTitle(i_sTitle)
+{
+}
+
+ProtectionArea::
+S_Slot_Table::~S_Slot_Table()
+{
+}
+
+csi::html::Table &
+ProtectionArea::
+S_Slot_Table::GetTable()
+{
+    return pTable
+                ?   *pTable
+                :   *( pTable = &Create_ChildListTable(sTableTitle) );
+}
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/protarea.hxx b/autodoc/source/display/html/protarea.hxx
new file mode 100644
index 000000000000..348afbe5ef78
--- /dev/null
+++ b/autodoc/source/display/html/protarea.hxx
@@ -0,0 +1,96 @@
+/* -*- 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 ADC_DISPLAY_HTML_PROTAREA_HXX
+#define ADC_DISPLAY_HTML_PROTAREA_HXX
+
+// USED SERVICES
+#include <ary/cpp/c_types4cpp.hxx>
+
+namespace csi
+{
+namespace html
+{
+    class Table;
+}
+}
+
+
+
+
+class ProtectionArea
+{
+  public:
+                            ProtectionArea(
+                                const char *        i_sLabel,
+                                const char *        i_sTitle );
+                            ~ProtectionArea();
+
+    csi::html::Table &      GetTable();
+    csi::html::Table &      GetTable(
+                                ary::cpp::E_ClassKey
+                                                    i_eClassKey );
+    DYN csi::html::Table *  ReleaseTable();
+    DYN csi::html::Table *  ReleaseTable(
+                                ary::cpp::E_ClassKey
+                                                    i_eClassKey );
+    const char *            Label() const;
+
+    int                     Size() const            { return pSglTable ? 1 : 3; }
+
+    bool                    WasUsed_Area() const;
+  private:
+    struct S_Slot_Table
+    {
+        const char *        sTableTitle;
+        Dyn< csi::html::Table >
+                            pTable;
+
+                            S_Slot_Table(
+                                const char *        i_sTitle );
+                            ~S_Slot_Table();
+        csi::html::Table &  GetTable();
+        DYN csi::html::Table *
+                            ReleaseTable()          { return pTable.Release(); }
+        bool                WasUsed() const         { return pTable; }
+    };
+
+    UINT8                   Index(
+                                ary::cpp::E_ClassKey
+                                                    i_eClassKey ) const;
+    // DATA
+    Dyn<S_Slot_Table>       pSglTable;
+    Dyn<S_Slot_Table>       aClassesTables[3];
+    const char *            sLabel;
+};
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/html/strconst.hxx b/autodoc/source/display/html/strconst.hxx
new file mode 100644
index 000000000000..0bddc803249d
--- /dev/null
+++ b/autodoc/source/display/html/strconst.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 ADC_DISPLAY_HTML_STRCONST_HXX
+#define ADC_DISPLAY_HTML_STRCONST_HXX
+
+
+const char * const C_sDIR_NamespacesCpp = "names";
+const char * const C_sDIR_Index = "index-files";   // Convention recognised by Javadoc
+
+const char * const C_sPath_Index = "index-files/index-1.html";   // Convention recognised by Javadoc
+
+const char * const C_sHFN_Css           = "cpp.css";
+const char * const C_sHFN_Overview      = "index.html";
+const char * const C_sHFN_Help          = "help.html";
+
+const char * const C_sHFN_Namespace     = "index.html";
+
+const char * const C_sTitle_SubNamespaces   = "Nested Namespaces";
+const char * const C_sTitle_Classes         = "Classes";
+const char * const C_sTitle_Structs         = "Structs";
+const char * const C_sTitle_Unions          = "Unions";
+const char * const C_sTitle_Enums           = "Enums";
+const char * const C_sTitle_Typedefs        = "Typedefs";
+const char * const C_sTitle_Operations      = "Functions";
+const char * const C_sTitle_Constants       = "Constants";
+const char * const C_sTitle_Variables       = "Variables";
+const char * const C_sTitle_EnumValues      = "Values";
+
+const char * const C_sLabel_SubNamespaces   = "subnsps";
+const char * const C_sLabel_Classes         = "classes";
+const char * const C_sLabel_Structs         = "structs";
+const char * const C_sLabel_Unions          = "unions";
+const char * const C_sLabel_Enums           = "enums";
+const char * const C_sLabel_Typedefs        = "tydefs";
+const char * const C_sLabel_Operations      = "ops";
+const char * const C_sLabel_Constants       = "consts";
+const char * const C_sLabel_Variables       = "vars";
+const char * const C_sLabel_EnumValues      = "envals";
+
+const char * const C_sHFTitle_Overview              = "C++ Reference Documentation Overview";
+const char * const C_sHFTitle_Help                  = "How This Reference Document Is Organized";
+
+const char * const C_sHFTitle_GlobalNamespaceCpp    = "Global Namespace in C++";
+const char * const C_sHFTypeTitle_Namespace         = "namespace";
+const char * const C_sHFTypeTitle_Class             = "class";
+const char * const C_sHFTypeTitle_Struct            = "struct";
+const char * const C_sHFTypeTitle_Union             = "union";
+const char * const C_sHFTypeTitle_Enum              = "enum";
+const char * const C_sHFTypeTitle_Typedef           = "typedef";
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_constgroup.cxx b/autodoc/source/display/idl/hfi_constgroup.cxx
new file mode 100644
index 000000000000..d197e55234db
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_constgroup.cxx
@@ -0,0 +1,140 @@
+/* -*- 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 <precomp.h>
+#include "hfi_constgroup.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/ik_constgroup.hxx>
+#include <toolkit/hf_linachain.hxx>
+#include <toolkit/hf_navi_sub.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_navibar.hxx"
+#include "hfi_property.hxx"
+#include "hi_linkhelper.hxx"
+
+
+extern const String
+    C_sCePrefix_Constants("constants group");
+
+
+namespace
+{
+
+const String
+    C_sList_Constants("Constants");
+const String
+    C_sList_Constants_Label("Constants");
+const String
+    C_sList_ConstantDetails("Constants' Details");
+const String
+    C_sList_ConstantDetails_Label("ConstantDetails");
+
+enum E_SubListIndices
+{
+    sli_ConstantsSummary = 0,
+    sli_ConstantDetails = 1
+};
+
+
+}   // anonymous namespace
+
+
+
+HF_IdlConstGroup::HF_IdlConstGroup( Environment &   io_rEnv,
+                                    Xml::Element &  o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut)
+{
+}
+
+HF_IdlConstGroup::~HF_IdlConstGroup()
+{
+}
+
+void
+HF_IdlConstGroup::Produce_byData( const client & i_ce ) const
+{
+    Dyn<HF_NaviSubRow>
+        pNaviSubRow( &make_Navibar(i_ce) );
+
+    HF_TitleTable
+        aTitle(CurOut());
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+
+    aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker);
+    produce_Title(aTitle, C_sCePrefix_Constants, i_ce);
+
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+
+    dyn_ce_list
+        dpConstants;
+    ary::idl::ifc_constgroup::attr::Get_Constants(dpConstants, i_ce);
+
+    if ( (*dpConstants).operator bool() )
+    {
+        produce_Members( *dpConstants,
+                         C_sList_Constants,
+                         C_sList_Constants_Label,
+                         C_sList_ConstantDetails,
+                         C_sList_ConstantDetails_Label );
+        pNaviSubRow->SwitchOn(sli_ConstantsSummary);
+        pNaviSubRow->SwitchOn(sli_ConstantDetails);
+    }
+    pNaviSubRow->Produce_Row();
+}
+
+HF_NaviSubRow &
+HF_IdlConstGroup::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_CeMainRow(i_ce,true);  // true := avoid link to Use-page.
+
+    DYN HF_NaviSubRow &
+        ret = aNaviBar.Add_SubRow();
+    ret.AddItem(C_sList_Constants, C_sList_Constants_Label, false);
+    ret.AddItem(C_sList_ConstantDetails, C_sList_ConstantDetails_Label, false);
+
+    CurOut() << new Html::HorizontalLine();
+    return ret;
+}
+
+void
+HF_IdlConstGroup::produce_MemberDetails( HF_SubTitleTable &  o_table,
+                                         const client &      i_ce ) const
+{
+    HF_IdlConstant
+        aElement( Env(), o_table );
+    aElement.Produce_byData(i_ce);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_constgroup.hxx b/autodoc/source/display/idl/hfi_constgroup.hxx
new file mode 100644
index 000000000000..044f8925ed01
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_constgroup.hxx
@@ -0,0 +1,68 @@
+/* -*- 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 ADC_DISPLAY_HFI_CONSTGROUP_HXX
+#define ADC_DISPLAY_HFI_CONSTGROUP_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+class HF_IdlConstGroup : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlConstGroup(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlConstGroup();
+
+    void                Produce_byData(
+                            const client &      ce ) const;
+  private:
+    HF_NaviSubRow &     make_Navibar(
+                            const client &      ce ) const;
+    virtual void        produce_MemberDetails(
+                            HF_SubTitleTable &  o_table,
+                            const client &      ce ) const;
+};
+
+
+
+// IMPLEMENTATION
+
+
+extern const String
+    C_sCePrefix_Constants;
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_doc.cxx b/autodoc/source/display/idl/hfi_doc.cxx
new file mode 100644
index 000000000000..e5a7b3661489
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_doc.cxx
@@ -0,0 +1,194 @@
+/* -*- 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 <precomp.h>
+#include "hfi_doc.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <ary_i/d_token.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include "hfi_tag.hxx"
+#include "hi_ary.hxx"
+
+
+
+
+HF_IdlDocu::HF_IdlDocu( Environment &       io_rEnv,
+                        HF_DocEntryList &   o_rOut )
+    :   HtmlFactory_Idl( io_rEnv, &o_rOut.CurOut() ),
+        rOut(o_rOut)
+{
+}
+
+HF_IdlDocu::~HF_IdlDocu()
+{
+}
+
+void
+HF_IdlDocu::Produce_fromCodeEntity( const client & i_ce ) const
+{
+    const ce_info *
+        i_pDocu = Get_IdlDocu(i_ce.Docu());
+    if (i_pDocu != 0)
+        Produce_byDocuAndScope(*i_pDocu, &i_ce, i_ce);
+}
+
+void
+HF_IdlDocu::Produce_fromReference( const ce_info &   i_rDocuForReference,
+                                   const client &    i_rScopeGivingCe ) const
+{
+    Produce_byDocuAndScope(i_rDocuForReference, 0, i_rScopeGivingCe );
+}
+
+void
+HF_IdlDocu::Produce_byDocuAndScope( const ce_info & i_rDocu,
+                                    const client *  i_pClient,
+                                    const client &  i_rScopeGivingCe ) const
+{
+    bool bShort = NOT i_rDocu.Short().IsEmpty();
+    bool bDescr = NOT i_rDocu.Description().IsEmpty();
+
+    if ( i_rDocu.IsDeprecated()
+         OR (
+             (i_pClient != 0 ? i_pClient->SightLevel() == ary::idl::sl_File : false)
+             AND NOT i_rDocu.IsPublished()
+            )
+         OR i_rDocu.IsOptional() )
+    {   // any usage restriction
+        rOut.Produce_Term("Usage Restrictions");
+
+        if ( i_rDocu.IsDeprecated() )
+            rOut.Produce_Definition() >> *new Html::Italic << "deprecated";
+        if ( (i_pClient != 0 ? i_pClient->SightLevel() == ary::idl::sl_File : false)
+             AND NOT i_rDocu.IsPublished() )
+            rOut.Produce_Definition() >> *new Html::Italic << "not published";
+        if ( i_rDocu.IsOptional() )
+            rOut.Produce_Definition() >> *new Html::Italic << "optional";
+
+        if ( i_rDocu.IsDeprecated() AND
+             // KORR_FUTURE
+             // Workaround, because DocuTex2::IsEmpty() does not
+             //   calculate whitespace tokens only as empty.
+             i_rDocu.DeprecatedText().Tokens().size() > 1 )
+        {
+            rOut.Produce_Term("Deprecation Info");
+
+            HF_IdlDocuTextDisplay
+                aDescription( Env(), 0, i_rScopeGivingCe);
+            aDescription.Out().Enter( rOut.Produce_Definition() );
+            i_rDocu.DeprecatedText().DisplayAt( aDescription );
+            aDescription.Out().Leave();
+        }
+    }   // end if (<any usage restriction>)
+
+    if ( bShort OR bDescr )
+    {
+        rOut.Produce_Term("Description");
+        HF_IdlDocuTextDisplay
+                aDescription( Env(), 0, i_rScopeGivingCe);
+        if (bShort)
+        {
+            aDescription.Out().Enter( rOut.Produce_Definition() );
+            i_rDocu.Short().DisplayAt( aDescription );
+            aDescription.Out().Leave();
+        }
+        if (bDescr)
+        {
+            aDescription.Out().Enter( rOut.Produce_Definition() );
+            i_rDocu.Description().DisplayAt( aDescription );
+            aDescription.Out().Leave();
+        }
+    }
+
+    std::vector< csi::dsapi::DT_SeeAlsoAtTag* >
+        aSeeAlsosWithoutText;
+    std::vector< csi::dsapi::DT_SeeAlsoAtTag* >
+        aSeeAlsosWithText;
+
+    for ( std::vector< ary::inf::AtTag2* >::const_iterator
+                iter = i_rDocu.Tags().begin();
+          iter != i_rDocu.Tags().end();
+          ++iter )
+    {
+        csi::dsapi::DT_SeeAlsoAtTag*
+            pSeeAlso = dynamic_cast< csi::dsapi::DT_SeeAlsoAtTag * >(*iter);
+        if (pSeeAlso != 0 )
+        {
+            if ( pSeeAlso->Text().IsEmpty() )
+            {
+                aSeeAlsosWithoutText.push_back(pSeeAlso);
+            }
+            else
+            {
+                aSeeAlsosWithText.push_back(pSeeAlso);
+            }
+            continue;
+        }
+
+        if ( strlen( (*iter)->Title() ) > 0 )
+        {
+            HF_IdlTag
+                    aTag(Env(), i_rScopeGivingCe);
+            Xml::Element &
+                rTerm = rOut.Produce_Term();
+            aTag.Produce_byData( rTerm,
+                                 rOut.Produce_Definition(),
+                                 *(*iter) );
+        }
+    }   // end for
+
+    if (!aSeeAlsosWithoutText.empty())
+    {
+        HF_IdlTag
+            aSeeAlsoTag(Env(),  i_rScopeGivingCe);
+        Xml::Element &
+            rTerm = rOut.Produce_Term();
+        aSeeAlsoTag.Produce_byData( rTerm,
+                                    rOut.Produce_Definition(),
+                                    aSeeAlsosWithoutText );
+    }
+
+    for ( std::vector< csi::dsapi::DT_SeeAlsoAtTag* >::const_iterator
+                itSee2 = aSeeAlsosWithText.begin();
+          itSee2 != aSeeAlsosWithText.end();
+          ++itSee2 )
+    {
+        HF_IdlTag
+            aTag(Env(),  i_rScopeGivingCe);
+        Xml::Element &
+            rTerm = rOut.Produce_Term();
+            aTag.Produce_byData( rTerm,
+                                 rOut.Produce_Definition(),
+                                 *(*itSee2) );
+    }   // end for
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_doc.hxx b/autodoc/source/display/idl/hfi_doc.hxx
new file mode 100644
index 000000000000..c27e9708b485
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_doc.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 ADC_DISPLAY_HFI_DOC_HXX
+#define ADC_DISPLAY_HFI_DOC_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+
+class HF_DocEntryList;
+
+
+class HF_IdlDocu : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlDocu(
+                            Environment &       io_rEnv,
+                            HF_DocEntryList &   o_rOut );
+    virtual             ~HF_IdlDocu();
+
+
+    /** Produces documentation by the CodeInfo accompanying
+        ->i_ce.
+    */
+    void                Produce_fromCodeEntity(
+                            const client &      i_ce ) const;
+
+    /** Produces documentation by the CodeInfo accompanying
+        a link or reference to a CodeEntity.
+
+        @param i_rScopeGivingCe
+        Gives the scope from which links are to be calculated.
+    */
+    void                Produce_fromReference(
+                            const ce_info &     i_rDocuForReference,
+                            const client &      i_rScopeGivingCe ) const;
+
+  private:
+    // Locals
+    /** Produces documentation.
+
+        @param i_rScopeGivingCe
+        Gives the scope from which links are to be calculated.
+    */
+    void                Produce_byDocuAndScope(
+                            const ce_info &     i_rDocu,
+                            const client *      i_pClient,      /// May be 0.
+                            const client &      i_rScopeGivingCe ) const;
+
+    // DATA
+    HF_DocEntryList &   rOut;
+};
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_enum.cxx b/autodoc/source/display/idl/hfi_enum.cxx
new file mode 100644
index 000000000000..18f97880bc7f
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_enum.cxx
@@ -0,0 +1,136 @@
+/* -*- 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 <precomp.h>
+#include "hfi_enum.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/ik_enum.hxx>
+#include <toolkit/hf_linachain.hxx>
+#include <toolkit/hf_navi_sub.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_navibar.hxx"
+#include "hfi_property.hxx"
+#include "hi_linkhelper.hxx"
+
+
+extern const String
+    C_sCePrefix_Enum("enum");
+
+namespace
+{
+
+const String
+    C_sList_Values("Values");
+const String
+    C_sList_Values_Label("Values");
+const String
+    C_sList_ValueDetails("Values' Details");
+const String
+    C_sList_ValueDetails_Label("ValueDetails");
+
+enum E_SubListIndices
+{
+    sli_ValuesSummary = 0,
+    sli_ValueDetails = 1
+};
+
+}   // anonymous namespace
+
+HF_IdlEnum::HF_IdlEnum( Environment &       io_rEnv,
+                        Xml::Element &      o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut)
+{
+}
+
+HF_IdlEnum::~HF_IdlEnum()
+{
+}
+
+void
+HF_IdlEnum::Produce_byData( const client & i_ce ) const
+{
+    Dyn<HF_NaviSubRow>
+        pNaviSubRow( &make_Navibar(i_ce) );
+
+    HF_TitleTable
+        aTitle(CurOut());
+
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+
+    aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker);
+    produce_Title(aTitle, C_sCePrefix_Enum, i_ce);
+
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+
+    dyn_ce_list
+        dpValues;
+    ary::idl::ifc_enum::attr::Get_Values(dpValues, i_ce);
+    if ( (*dpValues).operator bool() )
+    {
+        produce_Members( *dpValues,
+                         C_sList_Values,
+                         C_sList_Values_Label,
+                         C_sList_ValueDetails,
+                         C_sList_ValueDetails_Label );
+        pNaviSubRow->SwitchOn(sli_ValuesSummary);
+        pNaviSubRow->SwitchOn(sli_ValueDetails);
+    }
+    pNaviSubRow->Produce_Row();
+}
+
+HF_NaviSubRow &
+HF_IdlEnum::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_CeMainRow(i_ce);
+
+    DYN HF_NaviSubRow &
+        ret = aNaviBar.Add_SubRow();
+    ret.AddItem(C_sList_Values, C_sList_Values_Label, false);
+    ret.AddItem(C_sList_ValueDetails, C_sList_ValueDetails_Label, false);
+
+    CurOut() << new Html::HorizontalLine();
+    return ret;
+}
+
+void
+HF_IdlEnum::produce_MemberDetails( HF_SubTitleTable &  o_table,
+                                   const client &      i_ce) const
+{
+    HF_IdlEnumValue
+        aElement( Env(), o_table );
+    aElement.Produce_byData(i_ce);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_enum.hxx b/autodoc/source/display/idl/hfi_enum.hxx
new file mode 100644
index 000000000000..1f92b983a4ba
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_enum.hxx
@@ -0,0 +1,70 @@
+/* -*- 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 ADC_DISPLAY_HFI_ENUM_HXX
+#define ADC_DISPLAY_HFI_ENUM_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+
+class HF_IdlEnum : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlEnum(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlEnum();
+
+    void                Produce_byData(
+                            const client &      ce ) const;
+  private:
+    HF_NaviSubRow &     make_Navibar(
+                            const client &      ce ) const;
+    virtual void        produce_MemberDetails(
+                            HF_SubTitleTable &  o_table,
+                            const client &      ce ) const;
+};
+
+
+
+// IMPLEMENTATION
+
+
+extern const String
+    C_sCePrefix_Enum;
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_globalindex.cxx b/autodoc/source/display/idl/hfi_globalindex.cxx
new file mode 100644
index 000000000000..dc0766b665b8
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_globalindex.cxx
@@ -0,0 +1,278 @@
+/* -*- 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 <precomp.h>
+#include "hfi_globalindex.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_types4idl.hxx>
+#include <ary/idl/i_module.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_navibar.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_linkhelper.hxx"
+
+
+
+
+namespace
+{
+
+/**
+*/
+enum E_Types
+{
+        t_service           = 0,
+        t_interface         = 1,
+        t_struct            = 2,
+        t_exception         = 3,
+        t_enum              = 4,
+        t_typedef           = 5,
+        t_constantsgroup    = 6,
+        t_property          = 7,
+        t_function          = 8,
+        t_structelement     = 9,
+        t_enumvalue         = 10,
+        t_constant          = 11,
+        t_module            = 12,
+        t_singleton         = 13,
+        t_attribute         = 14,
+        t_siservice         = 15,
+        t_sisingleton       = 16,
+        t_MAX
+};
+
+String  G_sDummy;
+
+
+/*  RC-Ids for IDL types (see reposy.cxx):
+
+    Module              2000
+    Interface           2001
+    Function            2002
+    Service             2003
+    Property            2004
+
+    Enum                2005
+    EnumValue           2006
+    Typedef             2007
+    Struct              2008
+    StructElement       2009
+
+    Exception           2010
+    ConstantGroup       2011
+    Constant            2012
+    Singleton           2013
+    Attribute           2014
+    SglIfcService       2015
+    SglIfcSingleton     2016
+*/
+const int C_nNumberOfIdlTypes = 17;
+const char *    C_sTypeNames[C_nNumberOfIdlTypes] =
+                    { "module ",    "interface ",   "function ",    "service ",     "property ",
+                      "enum ",      "value ",       "typedef ",     "struct ",      "field ",
+                      "exception ", "constants group ", "constant ","singleton ",   "attribute ",
+                      "service",    "singleton"
+                    };
+const char *    C_sOwnerNames[C_nNumberOfIdlTypes] =
+                    { "module ",    "module ",      "interface ",   "module ",      "service ",
+                      "module ",    "enum ",        "module ",      "module ",      "", // could be struct or exception
+                      "module ",    "module ",      "constants group ", "module ",  "interface ",
+                      "module",     "module"
+                    };
+const intt C_nNamesArrayOffset = intt(ary::idl::Module::class_id);
+const int C_nIxField = 9;
+
+
+
+
+const char C_cAlphabet[] =
+"<a class=\"inverse\" href=\"index-1.html\"><B>A</B></a> <a class=\"inverse\" href=\"index-2.html\"><B>B</B></a> <a class=\"inverse\" href=\"index-3.html\"><B>C</B></a> <a class=\"inverse\" href=\"index-4.html\"><B>D</B></a> <a class=\"inverse\" href=\"index-5.html\"><B>E</B></a> "
+"<a class=\"inverse\" href=\"index-6.html\"><B>F</B></a> <a class=\"inverse\" href=\"index-7.html\"><B>G</B></a> <a class=\"inverse\" href=\"index-8.html\"><B>H</B></a> <a class=\"inverse\" href=\"index-9.html\"><B>I</B></a> <a class=\"inverse\" href=\"index-10.html\"><B>J</B></a> "
+"<a class=\"inverse\" href=\"index-11.html\"><B>K</B></a> <a class=\"inverse\" href=\"index-12.html\"><B>L</B></a> <a class=\"inverse\" href=\"index-13.html\"><B>M</B></a> <a class=\"inverse\" href=\"index-14.html\"><B>N</B></a> <a class=\"inverse\" href=\"index-15.html\"><B>O</B></a> "
+"<a class=\"inverse\" href=\"index-16.html\"><B>P</B></a> <a class=\"inverse\" href=\"index-17.html\"><B>Q</B></a> <a class=\"inverse\" href=\"index-18.html\"><B>R</B></a> <a class=\"inverse\" href=\"index-19.html\"><B>S</B></a> <a class=\"inverse\" href=\"index-20.html\"><B>T</B></a> "
+"<a class=\"inverse\" href=\"index-21.html\"><B>U</B></a> <a class=\"inverse\" href=\"index-22.html\"><B>V</B></a> <a class=\"inverse\" href=\"index-23.html\"><B>W</B></a> <a class=\"inverse\" href=\"index-24.html\"><B>X</B></a> <a class=\"inverse\" href=\"index-25.html\"><B>Y</B></a> "
+"<a class=\"inverse\" href=\"index-26.html\"><B>Z</B></a>";
+
+
+
+HF_IdlGlobalIndex::PageData     G_PageData;
+
+}   // end anonymous namespace
+
+
+inline void
+HF_IdlGlobalIndex::write_EntryItself( Xml::Element &               o_destination,
+                                      const ary::idl::CodeEntity & i_ce,
+                                      const HF_IdlTypeText &       i_typeLinkWriter ) const
+{
+    i_typeLinkWriter.Produce_IndexLink(o_destination, i_ce);
+    o_destination << " - ";
+}
+
+
+HF_IdlGlobalIndex::HF_IdlGlobalIndex( Environment &     io_rEnv,
+                                      Xml::Element &    o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut)
+{
+}
+
+HF_IdlGlobalIndex::~HF_IdlGlobalIndex()
+{
+}
+
+void
+HF_IdlGlobalIndex::Produce_Page(ary::idl::alphabetical_index::E_Letter i_letter) const
+{
+    make_Navibar();
+
+    HF_TitleTable
+        aTitle(CurOut());
+    StreamLock sl(100);
+    aTitle.Produce_Title( sl()
+                          << "Global Index "
+                          << ( i_letter != ary::idl::alphabetical_index::non_alpha
+                                ?   char(int(i_letter)-'a'+'A')
+                                :   '_' )
+                          << c_str );
+
+    // Letters Index
+    aTitle.Add_Row()
+        << new Xml::XmlCode(
+            "<p align=\"center\"><a href=\"index-1.html\"><b>A</b></a> <a href=\"index-2.html\"><b>B</b></a> <a href=\"index-3.html\"><b>C</b></a> <a href=\"index-4.html\"><b>D</b></a> <a href=\"index-5.html\"><b>E</b></a> <a href=\"index-6.html\"><b>F</b></a> <a href=\"index-7.html\"><b>G</b></a> <a href=\"index-8.html\"><b>H</b></a> <a href=\"index-9.html\"><b>I</b></a> <a href=\"index-10.html\"><b>J</b></a>"
+            " <a href=\"index-11.html\"><b>K</b></a> <a href=\"index-12.html\"><b>L</b></a> <a href=\"index-13.html\"><b>M</b></a> <a href=\"index-14.html\"><b>N</b></a> <a href=\"index-15.html\"><b>O</b></a> <a href=\"index-16.html\"><b>P</b></a> <a href=\"index-17.html\"><b>Q</b></a> <a href=\"index-18.html\"><b>R</b></a> <a href=\"index-19.html\"><b>S</b></a> <a href=\"index-20.html\"><b>T</b></a>"
+            " <a href=\"index-21.html\"><b>U</b></a> <a href=\"index-22.html\"><b>V</b></a> <a href=\"index-23.html\"><b>W</b></a> <a href=\"index-24.html\"><b>X</b></a> <a href=\"index-25.html\"><b>Y</b></a> <a href=\"index-26.html\"><b>Z</b></a> <a href=\"index-27.html\"><b>_</b></a></p>" );
+
+    Out().Enter(CurOut() >> *new Html::DefList);
+
+    csv::erase_container(G_PageData);
+    Env().Data().Get_IndexData(G_PageData, i_letter);
+
+    // Helper object to produce links to the index Entries.
+    HF_IdlTypeText aTypeLinkWriter(Env(),HF_IdlTypeText::use_for_javacompatible_index);
+
+    PageData::const_iterator itEnd = G_PageData.end();
+    for ( PageData::const_iterator iter = G_PageData.begin();
+          iter != itEnd;
+          ++iter )
+    {
+        produce_Line(iter, aTypeLinkWriter);
+    }   // end for
+
+    Out().Leave();
+    CurOut() << new Html::HorizontalLine;
+}
+
+void
+HF_IdlGlobalIndex::make_Navibar() const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_IndexMainRow();
+
+    CurOut() << new Html::HorizontalLine();
+}
+
+void
+HF_IdlGlobalIndex::produce_Line( PageData::const_iterator i_entry,
+                                 const HF_IdlTypeText &   i_typeLinkWriter) const
+{
+    const client &
+        rCe = Env().Data().Find_Ce(*i_entry);
+    if (NOT rCe.Owner().IsValid())
+        return; // Omit global namespace.
+
+    // The destination for the created output:
+    Xml::Element & rDT = CurOut() >> *new Html::DefListTerm;
+
+    /** The following code is intended to produce an output that
+        will be recognized by the context help system of Forte.
+        That is reached by making it similar to the indices, that
+        Javadoc produces.
+        If the link to the Entry contains a hashmark, the Forte-Help
+        requires following a link to the owner.
+        But if there is no hashmark, the following link must go to
+        the same Entry again. Doesn't make really sense :-(, but that's
+        like it is.
+    */
+    write_EntryItself(rDT,rCe,i_typeLinkWriter);
+    if (rCe.SightLevel() == ary::idl::sl_Member)
+        write_OwnerOfEntry(rDT,rCe,i_typeLinkWriter);
+    else
+        write_EntrySecondTime(rDT,rCe,i_typeLinkWriter);
+
+    // This produces an empty "<dd></dd>", which is also needed to reach
+    //   similarity to the Javadoc index:
+    CurOut() << new Html::DefListDefinition;
+}
+
+void
+HF_IdlGlobalIndex::write_OwnerOfEntry( Xml::Element &               o_destination,
+                                       const ary::idl::CodeEntity & i_ce,
+                                       const HF_IdlTypeText &       i_typeLinkWriter ) const
+{
+    const client &
+        rOwner = Env().Data().Find_Ce(i_ce.Owner());
+
+    int nIx = int(i_ce.AryClass() - C_nNamesArrayOffset);
+    csv_assert(csv::in_range(0,nIx,C_nNumberOfIdlTypes));
+
+    o_destination << C_sTypeNames[nIx]
+                  << "in ";
+    if (nIx != C_nIxField)
+    {
+        o_destination << C_sOwnerNames[nIx];
+    }
+    else
+    {
+        uintt
+            nOwnerIx = rOwner.AryClass() - C_nNamesArrayOffset;
+        csv_assert(
+            nOwnerIx < static_cast< unsigned int >(C_nNumberOfIdlTypes));
+        o_destination << C_sTypeNames[nOwnerIx];
+    }
+    i_typeLinkWriter.Produce_IndexOwnerLink(o_destination, rOwner);
+}
+
+void
+HF_IdlGlobalIndex::write_EntrySecondTime( Xml::Element &                o_destination,
+                                          const ary::idl::CodeEntity &  i_ce,
+                                          const HF_IdlTypeText &        i_typeLinkWriter ) const
+{
+    int nIx = int(i_ce.AryClass() - C_nNamesArrayOffset);
+    csv_assert(csv::in_range(0,nIx,C_nNumberOfIdlTypes));
+
+    o_destination << C_sTypeNames[nIx]
+                  << " ";
+    i_typeLinkWriter.Produce_IndexSecondEntryLink(o_destination, i_ce);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_globalindex.hxx b/autodoc/source/display/idl/hfi_globalindex.hxx
new file mode 100644
index 000000000000..fe1c254b47f6
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_globalindex.hxx
@@ -0,0 +1,91 @@
+/* -*- 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 ADC_DISPLAY_HFI_GLOBALINDEX_HXX
+#define ADC_DISPLAY_HFI_GLOBALINDEX_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_gate.hxx>
+
+
+class HF_IdlTypeText;
+
+class HF_IdlGlobalIndex : public HtmlFactory_Idl
+{
+  public:
+    typedef std::vector<ary::idl::Ce_id> PageData;
+
+                        HF_IdlGlobalIndex(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlGlobalIndex();
+
+    void                Produce_Page(
+                            ary::idl::alphabetical_index::E_Letter
+                                                i_letter ) const;
+  private:
+    void                make_Navibar() const;   /// Called by @->Produce_Page()
+    void                produce_Line(           /// Called by @->Produce_Page()
+                            PageData::const_iterator
+                                                i_entry,
+                            const HF_IdlTypeText &
+                                                i_typeLinkWriter ) const;
+
+    void                write_EntryItself(      /// Called by @->produceLine()
+                            Xml::Element &      o_destination,
+                            const ary::idl::CodeEntity &
+                                                i_entry,
+                            const HF_IdlTypeText &
+                                                i_typeLinkWriter ) const;
+
+    void                write_OwnerOfEntry(     /// Called by @->produceLine()
+                            Xml::Element &      o_destination,
+                            const ary::idl::CodeEntity &
+                                                i_entry,
+                            const HF_IdlTypeText &
+                                                i_typeLinkWriter ) const;
+
+    void                write_EntrySecondTime(  /// Called by @->produceLine()
+                            Xml::Element &      o_destination,
+                            const ary::idl::CodeEntity &
+                                                i_entry,
+                            const HF_IdlTypeText &
+                                                i_typeLinkWriter ) const;
+};
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_hierarchy.cxx b/autodoc/source/display/idl/hfi_hierarchy.cxx
new file mode 100644
index 000000000000..c968b9d2c8d4
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_hierarchy.cxx
@@ -0,0 +1,205 @@
+/* -*- 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 <precomp.h>
+#include "hfi_hierarchy.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <udm/html/htmlitem.hxx>
+#include <ary/stdconstiter.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_type.hxx>
+#include <ary/idl/ik_interface.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/idl/ip_type.hxx>
+#include "hfi_interface.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_env.hxx"
+
+
+
+HF_IdlBaseNode::HF_IdlBaseNode( const TYPE &            i_rType,
+                                const GATE &            i_rGate,
+                                intt                    i_nPositionOffset,
+                                HF_IdlBaseNode &        io_rDerived )
+    :   nType(i_rType.TypeId()),
+        aBases(),
+        nCountBases(0),
+        nPosition(i_nPositionOffset),
+        pDerived(&io_rDerived)
+{
+    Ce_id nCe = i_rGate.Types().Search_CeRelatedTo(nType);
+    if (nCe.IsValid())
+    {
+        GatherBases(i_rGate.Ces().Find_Ce(nCe), i_rGate);
+    }
+}
+
+HF_IdlBaseNode::~HF_IdlBaseNode()
+{
+}
+
+void
+HF_IdlBaseNode::FillPositionList( std::vector< const HF_IdlBaseNode* > & o_rPositionList ) const
+{
+    for ( BaseList::const_iterator it = aBases.begin();
+          it != aBases.end();
+          ++it )
+    {
+        (*it)->FillPositionList(o_rPositionList);
+    }  // end for
+
+    o_rPositionList.push_back(this);
+}
+
+void
+HF_IdlBaseNode::GatherBases( const CE &       i_rCe,
+                             const GATE &     i_rGate )
+{
+    ary::Dyn_StdConstIterator<ary::idl::CommentedRelation>
+        aHelp;
+    ary::idl::ifc_interface::attr::Get_Bases(aHelp,i_rCe);
+
+    for ( ary::StdConstIterator<ary::idl::CommentedRelation> & it = *aHelp;
+          it.operator bool();
+          ++it )
+    {
+        const TYPE &
+            rBaseType = i_rGate.Types().Find_Type((*it).Type());
+
+        Dyn<HF_IdlBaseNode>
+            pBaseNode( new HF_IdlBaseNode( rBaseType,
+                                           i_rGate,
+                                           nPosition,
+                                           *this )
+                     );
+
+        intt nAddedBases = pBaseNode->BaseCount() + 1;
+        nCountBases += nAddedBases;
+        nPosition += nAddedBases;
+        aBases.push_back( pBaseNode.Release() );
+    }   // end for
+}
+
+
+void
+Write_BaseHierarchy( csi::xml::Element &            o_rOut,
+                     HtmlEnvironment_Idl &          i_env,
+                     const ary::idl::CodeEntity &   i_ce )
+{
+    csi::xml::Element &
+        rPre = o_rOut
+               >> *new csi::xml::AnElement("pre")
+                   << new csi::html::StyleAttr("font-family:monospace;");
+
+    std::vector<uintt>
+        aSetColumns;
+    rPre
+        >> *new csi::html::Strong
+            << i_ce.LocalName();
+    rPre
+        << "\n";
+    Write_Bases( rPre,
+                 i_env,
+                 i_ce,
+                         aSetColumns );
+    rPre
+        << "\n";
+
+}
+
+
+void
+Write_Bases( csi::xml::Element &            o_out,
+             HtmlEnvironment_Idl &          i_env,
+             const ary::idl::CodeEntity &   i_rCe,
+             std::vector<uintt> &           io_setColumns )
+{
+    ary::Dyn_StdConstIterator<ary::idl::CommentedRelation>
+        aHelp;
+    ary::idl::ifc_interface::attr::Get_Bases(aHelp,i_rCe);
+
+    for ( ary::StdConstIterator<ary::idl::CommentedRelation> & it = *aHelp;
+          it.operator bool();
+          // NO INCREMENT HERE, see below
+        )
+    {
+        ary::idl::Type_id
+            nType = (*it).Type();
+        ++it;
+        bool
+            bThereComesMore = it.operator bool();
+
+        ary::idl::Ce_id
+            nCe = i_env.Gate().Types().Search_CeRelatedTo(nType);
+        if (nCe.IsValid())
+        {
+            // KORR_FUTURE
+            //   Rather check for id(!) of com::sun::star::uno::XInterface.
+            if (i_env.Gate().Ces().Find_Ce(nCe).LocalName() == "XInterface")
+                continue;
+        }
+
+        for (uintt i = 0; i < io_setColumns.size(); ++i)
+        {
+            if (io_setColumns[i] == 1)
+                o_out << new csi::xml::XmlCode("&#x2503");
+            else
+                o_out << "  ";
+            o_out << " ";
+        }
+
+        if (bThereComesMore)
+            o_out << new csi::xml::XmlCode("&#x2523");
+        else
+            o_out << new csi::xml::XmlCode("&#x2517");
+        o_out << " ";
+
+        HF_IdlTypeText
+            aDisplay( i_env, o_out, true, i_env.CurPageCe());
+        aDisplay.Produce_byData(nType);
+        o_out << "\n";
+
+        if (nCe.IsValid())
+        {
+            io_setColumns.push_back(bThereComesMore ? 1 : 0);
+
+            const ary::idl::CodeEntity &
+                rCe = i_env.Gate().Ces().Find_Ce(nCe);
+            Write_Bases( o_out,
+                         i_env,
+                         rCe,
+                         io_setColumns );
+            io_setColumns.pop_back();
+        }
+    }   // end for
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_hierarchy.hxx b/autodoc/source/display/idl/hfi_hierarchy.hxx
new file mode 100644
index 000000000000..1da58b14cf0c
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_hierarchy.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 ADC_DISPLAY_HFI_HIERARCHY_HXX
+#define ADC_DISPLAY_HFI_HIERARCHY_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_comrela.hxx>
+#include <ary/idl/i_types4idl.hxx>
+
+
+namespace csi
+{
+namespace xml
+{
+    class Element;
+}
+}
+
+
+class HF_IdlInterface;
+class HtmlEnvironment_Idl;
+
+
+
+/** Represents a node in an pyramidic inheritance hierarchy which shall be
+    displayed in text mode.
+*/
+class HF_IdlBaseNode
+{
+  public:
+    typedef ary::idl::CodeEntity            CE;
+    typedef ary::idl::Type                  TYPE;
+    typedef ary::idl::Gate                  GATE;
+    typedef ary::idl::Ce_id                 Ce_id;
+    typedef ary::idl::Type_id               Type_id;
+
+    /** @descr
+        The constructor recursively calls further constructors of
+        HF_IdlBaseNode for the bases of ->i_rType, if ->i_rType matches to a
+        ->CE.
+        So it builds up a complete hierarchy tree of all base classes
+        of ->i_pEntity.
+    */
+                        HF_IdlBaseNode(
+                            const TYPE &        i_rType,
+                            const GATE &        i_rGate,
+                            intt                i_nPositionOffset,
+                            HF_IdlBaseNode &    io_rDerived );
+                        ~HF_IdlBaseNode();
+
+    /** Recursively fills ->o_rPositionList with the instances of base
+        classes in the order in which they will be displayed.
+    */
+    void                FillPositionList(
+                            std::vector< const HF_IdlBaseNode* > &
+                                                o_rPositionList ) const;
+
+    Type_id             Type() const            { return nType; }
+    intt                BaseCount() const       { return nCountBases; }
+    intt                Position() const        { return nPosition; }
+    int                 Xpos() const            { return 3*Position(); }
+    int                 Ypos() const            { return 2*Position(); }
+    const HF_IdlBaseNode *        Derived() const         { return pDerived; }
+
+  private:
+    typedef std::vector< DYN HF_IdlBaseNode* > BaseList;
+
+    void                GatherBases(
+                            const CE &          i_rCe,
+                            const GATE &        i_rGate );
+
+    // DATA
+    Type_id             nType;
+    BaseList            aBases;
+    intt                nCountBases;
+    intt                nPosition;
+    HF_IdlBaseNode *    pDerived;
+};
+
+void                Write_BaseHierarchy(
+                        csi::xml::Element & o_rOut,
+                        HtmlEnvironment_Idl &
+                                            i_env,
+                        const ary::idl::CodeEntity &
+                                            i_rCe );
+
+void                Write_Bases(
+                        csi::xml::Element & o_rOut,
+                        HtmlEnvironment_Idl &
+                                            i_env,
+                        const ary::idl::CodeEntity &
+                                            i_rCe,
+                        std::vector<uintt> &
+                                            io_setColumns );
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_interface.cxx b/autodoc/source/display/idl/hfi_interface.cxx
new file mode 100644
index 000000000000..d5e35a5e2a83
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_interface.cxx
@@ -0,0 +1,360 @@
+/* -*- 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 <precomp.h>
+#include "hfi_interface.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ik_function.hxx>
+#include <ary/idl/ik_interface.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/idl/ip_type.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_linachain.hxx>
+#include <toolkit/hf_navi_sub.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_doc.hxx"
+#include "hfi_hierarchy.hxx"
+#include "hfi_method.hxx"
+#include "hfi_navibar.hxx"
+#include "hfi_property.hxx"
+#include "hfi_tag.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_linkhelper.hxx"
+
+
+extern const String
+    C_sCePrefix_Interface("interface");
+
+namespace
+{
+
+const String
+    C_sBaseInterface("Base Interfaces");
+const String
+    C_sList_BaseComments("Comments on Base Interfaces");
+const String
+    C_sList_Methods("Methods' Summary");
+const String
+    C_sList_Methods_Label("MethodsSummary");
+const String
+    C_sDetails_Methods("Methods' Details");
+const String
+    C_sDetails_Methods_Label("MethodsDetails");
+
+const String
+    C_sList_Attributes("Attributes' Summary");
+const String
+    C_sList_Attributes_Label("AttributesSummary");
+const String
+    C_sList_AttributesDetails("Attributes' Details");
+const String
+    C_sList_AttributesDetails_Label("AttributesDetails");
+
+
+
+enum E_SubListIndices
+{
+    sli_MethodsSummay = 0,
+    sli_AttributesSummary = 1,
+    sli_MethodDetails = 2,
+    sli_AttributesDetails = 3
+};
+
+} //anonymous namespace
+
+
+
+
+HF_IdlInterface::HF_IdlInterface( Environment &         io_rEnv,
+                                  Xml::Element &        o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut),
+        eCurProducedMembers(mem_none)
+{
+}
+
+HF_IdlInterface::~HF_IdlInterface()
+{
+}
+
+void
+HF_IdlInterface::Produce_byData( const client & i_ce ) const
+{
+    Dyn<HF_NaviSubRow>
+        pNaviSubRow( &make_Navibar(i_ce) );
+
+    HF_TitleTable
+        aTitle(CurOut());
+
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+    aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker);
+
+    produce_Title(aTitle, C_sCePrefix_Interface, i_ce);
+
+    produce_BaseHierarchy( aTitle.Add_Row(),
+                           i_ce,
+                           C_sBaseInterface );
+
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+
+    dyn_ce_list dpFunctions;
+    ary::idl::ifc_interface::attr::Get_Functions(dpFunctions, i_ce);
+    if ( (*dpFunctions).operator bool() )
+    {
+        eCurProducedMembers = mem_Functions;
+
+        produce_Members( *dpFunctions,
+                         C_sList_Methods,
+                         C_sList_Methods_Label,
+                         C_sDetails_Methods,
+                         C_sDetails_Methods_Label,
+                         HtmlFactory_Idl::viewtype_summary );
+        pNaviSubRow->SwitchOn(sli_MethodsSummay);
+    }
+
+    dyn_ce_list
+        dpAttributes;
+    ary::idl::ifc_interface::attr::Get_Attributes(dpAttributes, i_ce);
+    if ( (*dpAttributes).operator bool() )
+    {
+        eCurProducedMembers = mem_Attributes;
+
+        produce_Members( *dpAttributes,
+                         C_sList_Attributes,
+                         C_sList_Attributes_Label,
+                         C_sList_AttributesDetails,
+                         C_sList_AttributesDetails_Label,
+                         HtmlFactory_Idl::viewtype_summary );
+        pNaviSubRow->SwitchOn(sli_AttributesSummary);
+    }
+
+    ary::idl::ifc_interface::attr::Get_Functions(dpFunctions, i_ce);
+    if ( (*dpFunctions).operator bool() )
+    {
+        eCurProducedMembers = mem_Functions;
+
+        produce_Members( *dpFunctions,
+                         C_sList_Methods,
+                         C_sList_Methods_Label,
+                         C_sDetails_Methods,
+                         C_sDetails_Methods_Label,
+                         HtmlFactory_Idl::viewtype_details );
+        pNaviSubRow->SwitchOn(sli_MethodDetails);
+    }
+
+    ary::idl::ifc_interface::attr::Get_Attributes(dpAttributes, i_ce);
+    if ( (*dpAttributes).operator bool() )
+    {
+        eCurProducedMembers = mem_Attributes;
+
+        produce_Members( *dpAttributes,
+                         C_sList_Attributes,
+                         C_sList_Attributes_Label,
+                         C_sList_AttributesDetails,
+                         C_sList_AttributesDetails_Label,
+                         HtmlFactory_Idl::viewtype_details );
+        pNaviSubRow->SwitchOn(sli_AttributesDetails);
+    }
+
+    eCurProducedMembers = mem_none;
+
+    pNaviSubRow->Produce_Row();
+}
+
+DYN HF_NaviSubRow &
+HF_IdlInterface::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_CeMainRow(i_ce);
+
+    DYN HF_NaviSubRow &
+        ret = aNaviBar.Add_SubRow();
+    ret.AddItem(C_sList_Methods, C_sList_Methods_Label, false);
+    ret.AddItem(C_sList_Attributes, C_sList_Attributes_Label, false);
+    ret.AddItem(C_sDetails_Methods, C_sDetails_Methods_Label, false);
+    ret.AddItem(C_sList_AttributesDetails, C_sList_AttributesDetails_Label, false);
+
+    CurOut() << new Html::HorizontalLine();
+    return ret;
+}
+
+void
+HF_IdlInterface::produce_MemberDetails( HF_SubTitleTable &  o_table,
+                                        const client &      i_ce ) const
+{
+    switch (eCurProducedMembers)
+    {
+        case mem_Functions:
+                    break;
+        case mem_Attributes:
+        {
+                    HF_IdlAttribute
+                        aAttribute( Env(), o_table);
+                    aAttribute.Produce_byData( i_ce );
+                    return;
+        };
+        default:    //Won't happen.
+                    return;
+    }   // end switch
+
+    typedef ary::idl::ifc_function::attr    funcAttr;
+
+    HF_IdlMethod
+        aFunction(  Env(),
+                    o_table.Add_Row()
+                        >> *new Html::TableCell
+                           << new Html::ClassAttr(C_sCellStyle_MDetail) );
+
+    ary::Dyn_StdConstIterator<ary::idl::Parameter>
+        pParameters;
+    funcAttr::Get_Parameters(pParameters, i_ce);
+
+    ary::Dyn_StdConstIterator<ary::idl::Type_id>
+        pExceptions;
+    funcAttr::Get_Exceptions(pExceptions, i_ce);
+
+    aFunction.Produce_byData( i_ce.LocalName(),
+                              funcAttr::ReturnType(i_ce),
+                              *pParameters,
+                              *pExceptions,
+                              funcAttr::IsOneway(i_ce),
+                              funcAttr::HasEllipse(i_ce),
+                              i_ce );
+}
+
+void
+HF_IdlInterface::produce_BaseHierarchy( Xml::Element &      o_screen,
+                                        const client &      i_ce,
+                                        const String &      i_sLabel ) const
+{
+    ary::Dyn_StdConstIterator<ary::idl::CommentedRelation>
+        pHelp;
+    ary::idl::ifc_interface::attr::Get_Bases(pHelp, i_ce);
+    if (NOT (*pHelp).operator bool())
+        return;
+
+    // Check for XInterface as only base:
+    ary::StdConstIterator<ary::idl::CommentedRelation> &
+        itTest = *pHelp;
+    ary::idl::Ce_id
+        nCe = Env().Gate().Types().Search_CeRelatedTo((*itTest).Type());
+    if (nCe.IsValid())
+    {
+        // KORR_FUTURE
+        //   Rather check for id(!) of com::sun::star::uno::XInterface.
+        if (Env().Gate().Ces().Find_Ce(nCe).LocalName() == "XInterface")
+        {
+            ++itTest;
+            if (NOT itTest.operator bool())
+                return;
+        }
+    }
+
+    // Write hierarchy:
+
+    HF_DocEntryList
+        aDocList( o_screen );
+    aDocList.Produce_Term(i_sLabel);
+    Xml::Element &
+        rBaseList = aDocList.Produce_Definition();
+
+// NEW
+    Write_BaseHierarchy(rBaseList, Env(), i_ce);
+
+    // Write comments:
+        // KORR_FUTURE: Make sure, no empty table is constructed when comments list is empty.
+    HF_SubTitleTable
+        aBaseTable( aDocList.Produce_Definition(),
+                "",
+                C_sList_BaseComments,
+                2,
+                HF_SubTitleTable::sublevel_3 );
+
+    ary::Dyn_StdConstIterator<ary::idl::CommentedRelation>
+        pBases;
+    ary::idl::ifc_interface::attr::Get_Bases(pBases, i_ce);
+    for ( ary::StdConstIterator<ary::idl::CommentedRelation> & it = *pBases;
+          it.operator bool();
+          ++it )
+    {
+        Xml::Element &
+            rRow = aBaseTable.Add_Row();
+
+        Xml::Element &
+            rTerm = rRow
+                        >> *new Html::TableCell
+                            << new Html::ClassAttr(C_sCellStyle_SummaryLeft);
+        HF_IdlTypeText
+            aTypeDisplay( Env(), rTerm, false, 0);
+        aTypeDisplay.Produce_byData((*it).Type());
+
+        Xml::Element &
+            rDocu = rRow
+                        >> *new Html::TableCell
+                            << new Html::ClassAttr(C_sCellStyle_SummaryRight);
+
+        HF_DocEntryList
+            aDocuList(rDocu);
+
+        if ((*it).Info() != 0)
+        {
+//          aDocuList.Produce_Term("Comment on Base Reference");
+
+            HF_IdlDocu
+                aDocuDisplay(Env(), aDocuList);
+            aDocuDisplay.Produce_fromReference(*(*it).Info(), i_ce);
+        }
+        else
+        {
+            const client *
+                pCe = Env().Linker().Search_CeFromType((*it).Type());
+            const ce_info *
+                pShort = pCe != 0
+                            ?   Get_IdlDocu(pCe->Docu())
+                            :   (const ce_info *)(0);
+            if ( pShort != 0 )
+            {
+                aDocuList.Produce_NormalTerm("(referenced interface's summary:)");
+
+                Xml::Element &
+                    rDef = aDocuList.Produce_Definition();
+                HF_IdlDocuTextDisplay
+                    aShortDisplay( Env(), &rDef, *pCe);
+                pShort->Short().DisplayAt(aShortDisplay);
+            }   // end if (pShort != 0)
+        }   // endif ( (*i_commentedRef).Info() != 0 ) else
+    }   // end for
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_interface.hxx b/autodoc/source/display/idl/hfi_interface.hxx
new file mode 100644
index 000000000000..5566649381da
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_interface.hxx
@@ -0,0 +1,93 @@
+/* -*- 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 ADC_DISPLAY_HFI_INTERFACE_HXX
+#define ADC_DISPLAY_HFI_INTERFACE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_types4idl.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+
+
+class HF_NaviSubRow;
+class HF_SubTitleTable;
+class HF_IdlBaseNode;
+
+class HF_IdlInterface : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlInterface(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlInterface();
+
+    void                Produce_byData(
+                            const client &      i_ce ) const;
+  private:
+    // Locals
+    DYN HF_NaviSubRow & make_Navibar(
+                            const client &      i_ce ) const;
+
+    virtual void        produce_MemberDetails(
+                            HF_SubTitleTable &  o_table,
+                            const client &      ce ) const;
+    void                produce_BaseHierarchy(
+                            Xml::Element &      o_screen,
+                            const client &      i_ce,
+                            const String &      i_sLabel ) const;
+
+    // Locals
+    enum E_CurProducedMembers
+    {
+        mem_none,
+        mem_Functions,
+        mem_Attributes
+    };
+
+    // DATA
+    mutable E_CurProducedMembers
+                        eCurProducedMembers;
+};
+
+
+
+// IMPLEMENTATION
+
+extern const String
+    C_sCePrefix_Interface;
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_linklist.cxx b/autodoc/source/display/idl/hfi_linklist.cxx
new file mode 100644
index 000000000000..f0cf47e29c8c
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_linklist.cxx
@@ -0,0 +1,380 @@
+/* -*- 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 <precomp.h>
+#include "hfi_linklist.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/idl/ip_type.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_doc.hxx"
+#include "hfi_tag.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_ary.hxx"
+#include "hi_env.hxx"
+
+
+
+
+//*******************           HF_CommentedLink_Table         **********************************//
+
+HF_CommentedLink_Table::HF_CommentedLink_Table( Environment  &          io_rEnv,
+                                                Xml::Element &          o_rOut,
+                                                const String &          i_sTitle,
+                                                const String &          i_sLabel,
+                                                bool                    i_bBorder )
+    :    HtmlFactory_Idl(io_rEnv,&o_rOut),
+         pTable( new Html::Table( (i_bBorder ? "1" : "0"), "100%", "5", "0") ),
+         pCurLinkColumn(0),
+         pCurCommentColumn(0)
+{
+    *pTable
+        << new Html::ClassAttr("commentedlinks");
+
+    CurOut()
+        >> *new Html::Label(i_sLabel)
+           << new Html::LineBreak;
+    CurOut()
+        << pTable;
+//    HF_SubTitle aTitle(*pTable);
+//    aTitle.Produce_it(i_sTitle);
+}
+
+HF_CommentedLink_Table::~HF_CommentedLink_Table()
+{
+}
+
+void
+HF_CommentedLink_Table::Add_Line()
+{
+    Html::TableRow &
+        rRow = pTable->AddRow();
+
+    pCurLinkColumn = & (rRow.AddCell()
+                            << new Html::WidthAttr("30%")
+                            << new Xml::AnAttribute("valign","top") );
+    pCurCommentColumn  = & rRow.AddCell();
+}
+
+Xml::Element &
+HF_CommentedLink_Table::Cur_LinkColumn()
+{
+    csv_assert(pCurLinkColumn != 0);
+    return *pCurLinkColumn;
+}
+
+Xml::Element &
+HF_CommentedLink_Table::Cur_CommentColumn()
+{
+    csv_assert(pCurCommentColumn != 0);
+    return *pCurCommentColumn;
+}
+
+
+//*******************           HF_MemberTable         **********************************//
+
+HF_MemberTable::HF_MemberTable( Environment  &      io_rEnv,
+                                Xml::Element &      o_rOut,
+                                const String &      i_sTitle,
+                                const String &      i_sLabel,
+                                bool                i_bInline )
+    :    HtmlFactory_Idl(io_rEnv,&o_rOut),
+         pTable( new Html::Table("1", "100%", "5", "0") ),
+         pCurDeclaration(0),
+         pCurDescription(0),
+         bInline(i_bInline)
+{
+    *pTable
+        << new Html::ClassAttr("memberlist");
+
+    CurOut()
+        >> *new Html::Label(i_sLabel)
+           << new Html::LineBreak;
+    CurOut()
+        << pTable;
+//    HF_SubTitle aTitle(*pTable);
+//    aTitle.Produce_it(i_sTitle);
+}
+
+HF_MemberTable::~HF_MemberTable()
+{
+}
+
+void
+HF_MemberTable::Add_Line()
+{
+    if (bInline)
+    {
+        Html::TableRow & rRow = pTable->AddRow();
+
+        pCurDeclaration = &( rRow.AddCell()
+                                << new Xml::AnAttribute("valign","top")
+                                << new Html::WidthAttr("30%") );
+        pCurDescription = & rRow.AddCell();
+    }
+    else
+    {
+        Html::DefList *
+            pMemberSpace = new Html::DefList;
+        *pMemberSpace
+            << new Html::ClassAttr("member");
+
+        pTable->AddRow().AddCell() << pMemberSpace;
+
+        pCurDeclaration =
+            & ( *pMemberSpace
+                    >> *new Html::DefListTerm
+                        << new Html::ClassAttr("member") );
+        pCurDescription =
+            & ( *pMemberSpace
+                    >> *new Html::DefListDefinition()
+                        << new Html::ClassAttr("member") );
+    }
+}
+
+Xml::Element &
+HF_MemberTable::Cur_Declaration()
+{
+    csv_assert(pCurDeclaration != 0);
+    return *pCurDeclaration;
+}
+
+Xml::Element &
+HF_MemberTable::Cur_Description()
+{
+    csv_assert(pCurDescription != 0);
+    return *pCurDescription;
+}
+
+
+
+//*******************           HF_IdlLinkList         **********************************//
+
+HF_IdlLinkList::HF_IdlLinkList( Environment  &   io_rEnv,
+                                Xml::Element *   o_pOut )
+    :    HtmlFactory_Idl(io_rEnv,o_pOut)
+{
+}
+
+HF_IdlLinkList::~HF_IdlLinkList()
+{
+}
+
+void
+HF_IdlLinkList::Produce_NamespaceMembers( const String &                        i_sTitle,
+                                          const String &                        i_sLabel,
+                                          const std::vector<ary::idl::Ce_id> &  i_rList,
+                                          bool                                  i_bNestedNamespaces ) const
+{
+    HF_CommentedLink_Table
+        aTableMaker( Env(), CurOut(),
+                     i_sTitle, i_sLabel,
+                     true );
+
+    std::vector<ary::idl::Ce_id>::const_iterator itEnd = i_rList.end();
+    for ( std::vector<ary::idl::Ce_id>::const_iterator it = i_rList.begin();
+          it != itEnd;
+          ++it )
+    {
+        static String   sEntryName;
+        static String   sEntryLink;
+        const ce_info *
+                        pDocu = 0;
+        Get_EntryData_NamespaceMembers( sEntryName, sEntryLink, pDocu, *it, i_bNestedNamespaces );
+        aTableMaker.Add_Line();
+
+        aTableMaker.Cur_LinkColumn()
+           >> *new Html::Link(sEntryLink)
+              << sEntryName;
+
+        if ( pDocu != 0 )
+        {
+            HF_IdlShortDocu
+                aTextDisplay(Env(), aTableMaker.Cur_CommentColumn() );
+            aTextDisplay.Produce_byData( pDocu );
+        }
+    }   // end for
+}
+
+void
+HF_IdlLinkList::Produce_GlobalLinks( const String &      i_sTitle,
+                                     const String &      i_sLabel,
+                                     ce_list &           i_rList ) const
+{
+    HF_CommentedLink_Table
+        aTableMaker( Env(), CurOut(),
+                     i_sTitle, i_sLabel,
+                     true );
+
+    for ( ; i_rList; ++i_rList )
+    {
+        aTableMaker.Add_Line();
+        HF_IdlTypeText
+            aLinkText( Env(), aTableMaker.Cur_LinkColumn(), true );
+        aLinkText.Produce_byData(*i_rList);
+
+        const ce_info *
+            pDocu = Get_EntryDocu(*i_rList);
+        if ( pDocu != 0 )
+        {
+            HF_IdlShortDocu
+                aTextDisplay(Env(), aTableMaker.Cur_CommentColumn() );
+            aTextDisplay.Produce_byData( pDocu, *i_rList );
+        }
+    }
+}
+
+void
+HF_IdlLinkList::Produce_GlobalCommentedLinks( const String &          i_sTitle,
+                                              const String &          i_sLabel,
+                                              comref_list &           i_rList ) const
+{
+    HF_CommentedLink_Table
+        aTableMaker( Env(), CurOut(),
+                     i_sTitle, i_sLabel,
+                     true );
+/*
+    for ( ; i_rList; ++i_rList )
+    {
+        aTableMaker.Add_Line();
+        HF_IdlTypeText
+            aLinkText( Env(), aTableMaker.Cur_LinkColumn(), true );
+        aLinkText.Produce_byData( (*i_rList).first );
+
+        HF_DocEntryList
+            aDocList( aTableMaker.Cur_CommentColumn() );
+        if ( (*i_rList).second != 0 )
+        {
+            HF_IdlDocu
+                aDocuDisplay( Env(), aDocList );
+            aDocuDisplay.Produce_byData( (*i_rList).second );
+        }
+        else
+        {
+            const ce_info *
+                pShort = Get_EntryDocu(
+                            Env().Gate().Types().Search_CeRelatedTo(
+                                            (*i_rList).first) );
+            if ( pShort != 0 )
+            {
+                if (pShort->IsDeprecated())
+                {
+                    aDocList.Produce_Term()
+                        << "[ DEPRECATED ]";
+                }
+                if (pShort->IsOptional())
+                {
+                    aDocList.Produce_Term()
+                        << "[ OPTIONAL ]";
+                }
+
+                aDocList.Produce_Term()
+                    << "Description";
+
+                HF_IdlDocuTextDisplay
+                    aShortDisplay( Env(), &aDocList.Produce_Definition() );
+                aShortDisplay.Set_CurScopeTo(
+                        Env().Gate().Types().Search_CeRelatedTo((*i_rList).first) );
+                pShort->Short().DisplayAt(aShortDisplay);
+            }
+        }
+    }
+*/
+}
+
+void
+HF_IdlLinkList::Produce_MemberLinks( const String &     i_sTitle,
+                                     const String &     i_sLabel,
+                                     ce_list &          i_rList ) const
+{
+    HF_CommentedLink_Table
+        aTableMaker( Env(), CurOut(),
+                     i_sTitle, i_sLabel,
+                     true );
+
+/*
+    for ( ; i_rList; ++i_rList )
+    {
+        const ary::idl::CodeEntity &
+            rCe = Env().Gate().Ces().Find_Ce(*i_rList);
+
+        aTableMaker.Add_Line();
+        aTableMaker.Cur_LinkColumn()
+            >> *new Html::Link(
+                    StreamLock(200)() << "#" << rCe.LocalName() << c_str)
+               << rCe.LocalName();
+
+        const ce_info *
+            pDocu = rCe.Docu();
+        if ( pDocu != 0 )
+        {
+            HF_IdlShortDocu
+                aTextDisplay(Env(), aTableMaker.Cur_CommentColumn() );
+            aTextDisplay.Produce_byData( *pDocu );
+        }
+    }   // end for
+*/
+}
+
+void
+HF_IdlLinkList::Get_EntryData_NamespaceMembers(
+                            String &                o_sEntryName,
+                            String &                o_sEntryLink,
+                            const ce_info * &       o_pDocu,
+                            ce_id                   i_nMemberId,
+                            bool                    i_bIsNestedNamespace  ) const
+{
+    const ary::idl::CodeEntity &
+        rCe = Env().Data().Find_Ce(i_nMemberId);
+
+    o_sEntryName = rCe.LocalName();
+    o_sEntryLink = StreamLock(200)() << rCe.LocalName()
+                                     << ( i_bIsNestedNamespace
+                                                ?   "/module-ix"
+                                                :   "" )
+                                     << ".html"
+                                     << c_str;
+    o_pDocu = rCe.Docu();
+}
+
+const ary::doc::OldIdlDocu *
+HF_IdlLinkList::Get_EntryDocu(ce_id i_nMemberId) const
+{
+    if (i_nMemberId.IsValid())
+        return Env().Data().Find_Ce(i_nMemberId).Docu();
+    else
+        return 0;
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_linklist.hxx b/autodoc/source/display/idl/hfi_linklist.hxx
new file mode 100644
index 000000000000..83a8998a2976
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_linklist.hxx
@@ -0,0 +1,147 @@
+/* -*- 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 ADC_DISPLAY_HFI_LINKLIST_HXX
+#define ADC_DISPLAY_HFI_LINKLIST_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_comrela.hxx>
+#include <ary_i/ci_text2.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+
+
+
+
+class HF_CommentedLink_Table : public HtmlFactory_Idl
+{
+  public:
+                        HF_CommentedLink_Table(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut,
+                            const String &      i_sTitle,
+                            const String &      i_sLabel,
+                            bool                i_bBorder = false );
+    virtual             ~HF_CommentedLink_Table();
+
+    void                Add_Line();
+    Xml::Element &      Cur_LinkColumn();
+    Xml::Element &      Cur_CommentColumn();
+
+  private:
+    // DATA
+    Html::Table *       pTable;
+    Xml::Element *      pCurLinkColumn;
+    Xml::Element *      pCurCommentColumn;
+};
+
+class HF_MemberTable : public HtmlFactory_Idl
+{
+  public:
+                        HF_MemberTable(
+                            Environment  &      io_rEnv,
+                            Xml::Element &      o_rOut,
+                            const String &      i_sTitle,
+                            const String &      i_sLabel,
+                            bool                i_bInline = false );
+    virtual             ~HF_MemberTable();
+
+    void                Add_Line();
+    Xml::Element &      Cur_Declaration();
+    Xml::Element &      Cur_Description();
+
+  private:
+    // DATA
+    Html::Table *       pTable;
+    Xml::Element *      pCurDeclaration;
+    Xml::Element *      pCurDescription;
+    bool                bInline;
+};
+
+
+
+
+class HF_IdlLinkList : public HtmlFactory_Idl
+{
+  public:
+    typedef ary::StdConstIterator<ary::idl::CommentedRelation>
+                                            comref_list;
+
+                        HF_IdlLinkList(
+                            Environment &       io_rEnv,
+                            Xml::Element *      o_pOut );
+    virtual             ~HF_IdlLinkList();
+
+    void                Produce_NamespaceMembers(
+                            const String &      i_sTitle,
+                            const String &      i_sLabel,
+                            const std::vector<ary::idl::Ce_id> &
+                                                i_rList,
+                            bool                i_bNestedNamespaces = false ) const;
+    void                Produce_GlobalLinks(
+                            const String &      i_sTitle,
+                            const String &      i_sLabel,
+                            ce_list &           i_rList ) const;
+    void                Produce_GlobalCommentedLinks(
+                            const String &      i_sTitle,
+                            const String &      i_sLabel,
+                            comref_list &       i_rList ) const;
+    void                Produce_MemberLinks(
+                            const String &      i_sTitle,
+                            const String &      i_sLabel,
+                            ce_list &           i_rList ) const;
+  private:
+    void                Get_EntryData_NamespaceMembers(
+                            String &            o_sEntryName,
+                            String &            o_sEntryLink,
+                            const ce_info * &   o_pDocuText,
+                            ce_id               i_nMemberId,
+                            bool                i_bIsNestedNamespace ) const;
+    const ce_info *     Get_EntryDocu(
+                            ce_id               i_nMemberId ) const;
+};
+
+
+
+
+
+
+
+
+// IMPLEMENTATION
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_method.cxx b/autodoc/source/display/idl/hfi_method.cxx
new file mode 100644
index 000000000000..b5d1aa9d3d8c
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_method.cxx
@@ -0,0 +1,238 @@
+/* -*- 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 <precomp.h>
+#include "hfi_method.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_exception.hxx>
+#include <ary/idl/i_param.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_funcdecl.hxx>
+#include "hfi_doc.hxx"
+#include "hfi_globalindex.hxx"
+#include "hfi_typetext.hxx"
+
+
+
+
+
+HF_IdlMethod::HF_IdlMethod( Environment &           io_rEnv,
+                            Xml::Element &          o_cell)
+    :   HtmlFactory_Idl(io_rEnv,&o_cell)
+{
+}
+
+
+HF_IdlMethod::~HF_IdlMethod()
+{
+}
+
+
+void
+HF_IdlMethod::Produce_byData( const String &      i_sName,
+                              type_id             i_nReturnType,
+                              param_list &        i_rParams,
+                              type_list &         i_rExceptions,
+                              bool                i_bOneway,
+                              bool                i_bEllipse,
+                              const client &      i_ce ) const
+{
+    CurOut()
+        >> *new Html::Label(i_sName)
+            << new Html::ClassAttr(C_sMemberTitle)
+            << i_sName;
+    enter_ContentCell();
+    write_Declaration( i_sName,
+                       i_nReturnType,
+                       i_rParams,
+                       i_rExceptions,
+                       i_bOneway,
+                       i_bEllipse );
+    CurOut() << new Html::HorizontalLine;
+    write_Docu(CurOut(), i_ce);
+    leave_ContentCell();
+}
+
+void
+HF_IdlMethod::write_Declaration( const String &      i_sName,
+                                 type_id             i_nReturnType,
+                                 param_list &        i_rParams,
+                                 type_list &         i_rExceptions,
+                                 bool                i_bOneway,
+                                 bool                i_bEllipse ) const
+{
+    HF_FunctionDeclaration
+        aDecl(CurOut(), "raises") ;
+    Xml::Element &
+        rReturnLine = aDecl.ReturnCell();
+
+    // Return line:
+    if (i_bOneway)
+        rReturnLine << "[oneway] ";
+    if (i_nReturnType.IsValid())
+    {   // Normal function, but not constructors:
+        HF_IdlTypeText
+            aReturn(Env(), rReturnLine, true);
+        aReturn.Produce_byData(i_nReturnType);
+    }
+
+    //  Main line:
+    Xml::Element &
+        rNameCell = aDecl.NameCell();
+    rNameCell
+        >> *new Html::Bold
+            << i_sName;
+
+    Xml::Element *
+        pParamEnd  = 0;
+
+    bool bParams = i_rParams.operator bool();
+    if (bParams)
+    {
+        rNameCell
+            << "(";
+
+        pParamEnd  = write_Param( aDecl, *i_rParams );
+        for (++i_rParams; i_rParams; ++i_rParams)
+        {
+            *pParamEnd << ",";
+            pParamEnd  = write_Param( aDecl, *i_rParams );
+        }   // end for
+
+        if (i_bEllipse)
+        {
+            Xml::Element &
+                rParamType = aDecl.NewParamTypeCell();
+            rParamType
+                << " ...";
+            pParamEnd = &rParamType;
+        }
+        *pParamEnd
+            << " )";
+    }
+    else
+    {
+        rNameCell
+            << "()";
+    }
+
+    if ( i_rExceptions.operator bool() )
+    {
+        Xml::Element &
+            rExcOut = aDecl.ExceptionCell();
+        HF_IdlTypeText
+            aExc(Env(), rExcOut, true);
+        aExc.Produce_byData(*i_rExceptions);
+
+        for (++i_rExceptions; i_rExceptions; ++i_rExceptions)
+        {
+            rExcOut
+                << ","
+                << new Html::LineBreak;
+            aExc.Produce_byData(*i_rExceptions);
+        }   // end for
+
+        rExcOut << " );";
+    }
+    else if (bParams)
+    {
+        *pParamEnd << ";";
+    }
+    else
+    {
+        rNameCell << ";";
+    }
+}
+
+Xml::Element *
+HF_IdlMethod::write_Param( HF_FunctionDeclaration &     o_decl,
+                           const ary::idl::Parameter &  i_param ) const
+{
+    Xml::Element &
+        rTypeCell  = o_decl.NewParamTypeCell();
+    Xml::Element &
+        rNameCell  = o_decl.ParamNameCell();
+
+    switch ( i_param.Direction() )
+    {
+        case ary::idl::param_in:
+                    rTypeCell << "[in] ";
+                    break;
+        case ary::idl::param_out:
+                    rTypeCell << "[out] ";
+                    break;
+        case ary::idl::param_inout:
+                    rTypeCell << "[inout] ";
+                    break;
+    }   // end switch
+
+    HF_IdlTypeText
+        aTypeWriter(Env(), rTypeCell, true);
+    aTypeWriter.Produce_byData( i_param.Type() );
+
+    rNameCell
+        << i_param.Name();
+    return &rNameCell;
+}
+
+const String sContentBorder("0");
+const String sContentWidth("96%");
+const String sContentPadding("5");
+const String sContentSpacing("0");
+
+const String sBgWhite("#ffffff");
+const String sCenter("center");
+
+void
+HF_IdlMethod::enter_ContentCell() const
+{
+
+    Xml::Element &
+        rContentCell = CurOut()
+                        >> *new Html::Table( sContentBorder,
+                                             sContentWidth,
+                                             sContentPadding,
+                                             sContentSpacing )
+                            << new Html::ClassAttr("table-in-method")
+                            << new Html::BgColorAttr(sBgWhite)
+                            << new Html::AlignAttr(sCenter)
+                            >> *new Html::TableRow
+                                >> *new Html::TableCell;
+    Out().Enter(rContentCell);
+}
+
+
+void
+HF_IdlMethod::leave_ContentCell() const
+{
+    Out().Leave();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_method.hxx b/autodoc/source/display/idl/hfi_method.hxx
new file mode 100644
index 000000000000..7da0e5fd605c
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_method.hxx
@@ -0,0 +1,106 @@
+/* -*- 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 ADC_DISPLAY_HFI_METHOD_HXX
+#define ADC_DISPLAY_HFI_METHOD_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_param.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+typedef ary::doc::OldIdlDocu CodeInfo;
+#include "hfi_linklist.hxx"
+
+
+
+namespace csi
+{
+    namespace idl
+    {
+        class Parameter;
+    }
+}
+
+class HF_FunctionDeclaration;
+
+class HF_IdlMethod : public HtmlFactory_Idl
+{
+  public:
+    typedef ary::StdConstIterator<ary::idl::Parameter>  param_list;
+
+                        HF_IdlMethod(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_cell );
+    virtual             ~HF_IdlMethod();
+
+    void                Produce_byData(
+                            const String &      i_sName,
+                            type_id             i_nReturnType,
+                            param_list &        i_rParams,
+                            type_list &         i_rExceptions,
+                            bool                i_bOneway,
+                            bool                i_bEllipse,
+                            const client &      i_ce ) const;
+  private:
+    void                write_Declaration(
+                            const String &      i_sName,
+                            type_id             i_nReturnType,
+                            param_list &        i_rParams,
+                            type_list &         i_rExceptions,
+                            bool                i_bOneway,
+                            bool                i_bEllipse ) const;
+//    void                write_Param(
+//                            HF_IdlTypeText &    o_type,
+//                            Xml::Element &      o_names,
+//                            const ary::idl::Parameter &
+//                                                i_param ) const;
+
+    Xml::Element *      write_Param(
+                            HF_FunctionDeclaration &
+                                                o_decl,
+                            const ary::idl::Parameter &
+                                                i_param ) const;
+    void                enter_ContentCell() const;
+    void                leave_ContentCell() const;
+};
+
+
+
+// IMPLEMENTATION
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_module.cxx b/autodoc/source/display/idl/hfi_module.cxx
new file mode 100644
index 000000000000..eb65a14de9ae
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_module.cxx
@@ -0,0 +1,302 @@
+/* -*- 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 <precomp.h>
+#include "hfi_module.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/ik_module.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <ary/getncast.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_linachain.hxx>
+#include <toolkit/hf_navi_sub.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_doc.hxx"
+#include "hfi_navibar.hxx"
+#include "hfi_tag.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_linkhelper.hxx"
+
+
+extern const String
+    C_sCePrefix_Module("module");
+
+namespace
+{
+
+const String
+    C_sList_NestedModules("Nested Modules");
+const String
+    C_sList_NestedModules_Label("NestedModules");
+const String
+    C_sList_Services("Services");
+const String
+    C_sList_Singletons("Singletons");
+const String
+    C_sList_Interfaces("Interfaces");
+const String
+    C_sList_Structs("Structs");
+const String
+    C_sList_Exceptions("Exceptions");
+const String
+    C_sList_Enums("Enums");
+const String
+    C_sList_Typedefs("Typedefs");
+const String
+    C_sList_ConstGroups("Constant Groups");
+const String
+    C_sList_ConstGroups_Label("ConstantGroups");
+
+
+enum E_SubListIndices
+{   // In case of changes, also adapt make_Navibar() !!
+    sli_NestedModules = 0,
+    sli_Services = 1,
+    sli_Singletons = 2,
+    sli_Interfaces = 3,
+    sli_Structs = 4,
+    sli_Exceptions = 5,
+    sli_Enums = 6,
+    sli_Typedefs = 7,
+    sli_ConstGroups = 8
+};
+
+} //anonymous namespace
+
+
+HF_IdlModule::HF_IdlModule( Environment &         io_rEnv,
+                            Xml::Element &        o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut)
+{
+}
+
+HF_IdlModule::~HF_IdlModule()
+{
+}
+
+typedef ary::idl::ifc_module::attr  ModuleAttr;
+
+
+void
+HF_IdlModule::Produce_byData( const client & i_ce ) const
+{
+    Dyn<HF_NaviSubRow>
+        pNaviSubRow( &make_Navibar(i_ce) );
+
+    HF_TitleTable
+        aTitle(CurOut());
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+
+    if ( Env().CurPosition().Depth() > 0 )
+    {
+        aNameChain.Produce_CompleteChain_forModule(Env().CurPosition(), nameChainLinker);
+
+        StreamLock
+            sl(200);
+        aTitle.Produce_Title( sl()
+                                << C_sCePrefix_Module
+                                  << " "
+                                << i_ce.LocalName()
+                                << c_str );
+    }
+    else
+    {
+        aTitle.Produce_Title( "Global Module" );
+    }
+
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+
+
+    // Write children lists:
+    ce_ptr_list aNestedModules;
+    ce_ptr_list aServices;
+    ce_ptr_list aInterfaces;
+    ce_ptr_list aStructs;
+    ce_ptr_list aExceptions;
+    ce_ptr_list aEnums;
+    ce_ptr_list aTypedefs;
+    ce_ptr_list aConstantGroups;
+    ce_ptr_list aSingletons;
+
+    ModuleAttr::Get_AllChildrenSeparated(
+                                aNestedModules,
+                                aServices,
+                                aInterfaces,
+                                aStructs,
+                                aExceptions,
+                                aEnums,
+                                aTypedefs,
+                                aConstantGroups,
+                                aSingletons,
+                                Env().Data().Ces(),
+                                i_ce );
+
+    // Has this to be in the order of enum E_SubListIndices ???
+    if (produce_ChildList(C_sList_NestedModules, C_sList_NestedModules_Label, aNestedModules ))
+        pNaviSubRow->SwitchOn(sli_NestedModules);
+    if (produce_ChildList(C_sList_Services, C_sList_Services, aServices))
+        pNaviSubRow->SwitchOn(sli_Services);
+    if (produce_ChildList(C_sList_Singletons, C_sList_Singletons, aSingletons))
+        pNaviSubRow->SwitchOn(sli_Singletons);
+    if (produce_ChildList(C_sList_Interfaces, C_sList_Interfaces, aInterfaces))
+        pNaviSubRow->SwitchOn(sli_Interfaces);
+    if (produce_ChildList(C_sList_Structs, C_sList_Structs, aStructs))
+        pNaviSubRow->SwitchOn(sli_Structs);
+    if (produce_ChildList(C_sList_Exceptions, C_sList_Exceptions, aExceptions))
+        pNaviSubRow->SwitchOn(sli_Exceptions);
+    if (produce_ChildList(C_sList_Enums, C_sList_Enums, aEnums))
+        pNaviSubRow->SwitchOn(sli_Enums);
+    if (produce_ChildList(C_sList_Typedefs, C_sList_Typedefs, aTypedefs))
+        pNaviSubRow->SwitchOn(sli_Typedefs);
+    if (produce_ChildList(C_sList_ConstGroups, C_sList_ConstGroups_Label, aConstantGroups))
+        pNaviSubRow->SwitchOn(sli_ConstGroups);
+    pNaviSubRow->Produce_Row();
+}
+
+DYN HF_NaviSubRow &
+HF_IdlModule::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_ModuleMainRow(i_ce);
+
+    DYN HF_NaviSubRow &
+        ret = aNaviBar.Add_SubRow();
+
+    // Has to be in the order of E_SubListIndices:
+    ret.AddItem(C_sList_NestedModules, C_sList_NestedModules_Label, false);
+    ret.AddItem(C_sList_Services, C_sList_Services, false);
+    ret.AddItem(C_sList_Singletons, C_sList_Singletons, false);
+    ret.AddItem(C_sList_Interfaces, C_sList_Interfaces, false);
+    ret.AddItem(C_sList_Structs, C_sList_Structs, false);
+    ret.AddItem(C_sList_Exceptions, C_sList_Exceptions, false);
+    ret.AddItem(C_sList_Enums, C_sList_Enums, false);
+    ret.AddItem(C_sList_Typedefs, C_sList_Typedefs, false);
+    ret.AddItem(C_sList_ConstGroups, C_sList_ConstGroups_Label, false);
+
+    CurOut() << new Html::HorizontalLine();
+    return ret;
+}
+
+bool
+HF_IdlModule::produce_ChildList( const String &      i_sName,
+                                 const String &      i_sLabel,
+                                 const ce_ptr_list & i_list ) const
+{
+    if ( i_list.size() == 0 )
+        return false;
+
+    HF_SubTitleTable
+        aTable( CurOut(),
+                i_sLabel,
+                i_sName,
+                2 );
+
+    ce_ptr_list::const_iterator
+        itEnd = i_list.end();
+    for ( ce_ptr_list::const_iterator it = i_list.begin();
+          it != itEnd;
+          ++it )
+    {
+        Xml::Element &
+            rRow = aTable.Add_Row();
+        produce_Link(rRow, *it);
+        produce_LinkDoc(rRow, *it);
+    }   // end for
+
+    return true;
+}
+
+void
+HF_IdlModule::produce_Link( Xml::Element &      o_row,
+                            const client *      i_ce ) const
+{
+    csv_assert(i_ce != 0);
+    Xml::Element &
+        rCell = o_row
+                >> *new Html::TableCell
+                    << new Html::ClassAttr(C_sCellStyle_SummaryLeft);
+
+    if ( NOT ary::is_type<ary::idl::Module>(*i_ce) )
+    {
+        HF_IdlTypeText
+            aText(Env(), rCell, true);
+        aText.Produce_byData(i_ce->CeId());
+    }
+    else
+    {
+        StreamLock slBuf(100);
+         rCell
+            >> *new Html::Link( slBuf() << i_ce->LocalName()
+                                        << "/module-ix.html"
+                                        << c_str )
+                << i_ce->LocalName();
+    }
+}
+
+void
+HF_IdlModule::produce_LinkDoc( Xml::Element &      o_row,
+                               const client *      i_ce ) const
+{
+    csv_assert(i_ce != 0);
+
+    // We need the cell in any case, because, the rendering may be hurt else.
+    Xml::Element &
+        rCell = o_row
+                    >> *new Html::TableCell
+                        << new Html::ClassAttr(C_sCellStyle_SummaryRight);
+
+    const client &
+        rCe = *i_ce;
+    const ce_info *
+        pShort = Get_IdlDocu(rCe.Docu());
+    if ( pShort == 0 )
+        return;
+
+
+    if (pShort->IsDeprecated())
+    {
+        rCell << "[ DEPRECATED ]" << new Html::LineBreak;
+    }
+    if (pShort->IsOptional())
+    {
+        rCell << "[ OPTIONAL ]" << new Html::LineBreak;
+    }
+
+    HF_IdlDocuTextDisplay
+        aShortDisplay(Env(), &rCell, *i_ce);
+    pShort->Short().DisplayAt(aShortDisplay);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_module.hxx b/autodoc/source/display/idl/hfi_module.hxx
new file mode 100644
index 000000000000..23aa25176cb5
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_module.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 ADC_DISPLAY_HFI_MODULE_HXX
+#define ADC_DISPLAY_HFI_MODULE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+
+class HF_NaviSubRow;
+
+class HF_IdlModule : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlModule(
+                            Environment &       io_rEnv,    // The CurDirectory() is the one of the here displayed Module.
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlModule();
+
+    void                Produce_byData(
+                           const client &       i_ce ) const;
+  private:
+    typedef std::vector< const ary::idl::CodeEntity* >  ce_ptr_list;
+
+    DYN HF_NaviSubRow & make_Navibar(
+                            const client &      i_ce ) const;
+    bool                produce_ChildList(
+                            const String &      i_sName,
+                            const String &      i_sLabel,
+                            const ce_ptr_list & i_list ) const;
+    void                produce_Link(
+                            Xml::Element &      o_row,
+                            const client *      i_ce ) const;
+    void                produce_LinkDoc(
+                            Xml::Element &      o_row,
+                            const client *      i_ce ) const;
+};
+
+
+
+// IMPLEMENTATION
+
+
+extern const String
+    C_sCePrefix_Module;
+
+
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_navibar.cxx b/autodoc/source/display/idl/hfi_navibar.cxx
new file mode 100644
index 000000000000..eb33b3e84905
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_navibar.cxx
@@ -0,0 +1,227 @@
+/* -*- 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 <precomp.h>
+#include "hfi_navibar.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <toolkit/hf_navi_main.hxx>
+#include <toolkit/hf_navi_sub.hxx>
+#include "hfi_interface.hxx"
+#include "hfi_module.hxx"
+#include "hfi_service.hxx"
+#include "hi_linkhelper.hxx"
+
+
+extern const String
+    C_sLocalManualLinks("#devmanual");
+
+
+const String        C_sTop      = "Overview";
+const String        C_sModule   = "Module";
+const String        C_sUse      = "Use";
+const String        C_sManual   = "Devguide";
+const String        C_sIndex    = "Index";
+
+
+
+
+HF_IdlNavigationBar::HF_IdlNavigationBar( Environment &         io_rEnv,
+                                          Xml::Element &        o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut)
+{
+}
+
+HF_IdlNavigationBar::~HF_IdlNavigationBar()
+{
+}
+
+void
+HF_IdlNavigationBar::Produce_CeMainRow( const client & i_ce,
+                                        bool  i_bNoUsePage )
+{
+    HF_NaviMainRow
+                aNaviMain( CurOut() );
+
+    StreamLock  aLink(500);
+    StreamStr & rLink = aLink();
+
+    Env().Get_LinkTo( rLink.reset(),
+                      Env().OutputTree().Overview() );
+    aNaviMain.Add_StdItem( C_sTop, rLink.c_str() );
+
+    Env().Get_LinkTo( rLink.reset(),
+                      Env().Linker().PositionOf_CurModule() );
+    aNaviMain.Add_StdItem( C_sModule, rLink.c_str() );
+
+    if (i_bNoUsePage)
+    {
+        aNaviMain.Add_NoneItem( C_sUse );
+    }
+    else
+    {
+        Env().Get_LinkTo( rLink.reset(),
+                          Env().Linker().PositionOf_CurXRefs(i_ce.LocalName()) );
+        aNaviMain.Add_StdItem( C_sUse, rLink.c_str() );
+    }
+
+    const StringVector &
+        rManualDescrs = i_ce.Secondaries().Links2DescriptionInManual();
+    if (rManualDescrs.size() == 2)
+    {
+        aNaviMain.Add_StdItem(C_sManual, Env().Link2Manual( rManualDescrs.front() ));
+    }
+    else if (rManualDescrs.size() > 2)
+    {
+        aNaviMain.Add_StdItem(C_sManual, C_sLocalManualLinks);
+    }
+    else
+    {
+        aNaviMain.Add_NoneItem( C_sManual );
+    }
+
+    Env().Get_LinkTo( rLink.reset(),
+                      Env().Linker().PositionOf_Index() );
+    aNaviMain.Add_StdItem( C_sIndex, rLink.c_str() );
+
+    aNaviMain.Produce_Row();
+}
+
+void
+HF_IdlNavigationBar::Produce_CeXrefsMainRow( const client & i_ce )
+{
+    HF_NaviMainRow
+                aNaviMain( CurOut() );
+
+    StreamLock  aLink(500);
+    StreamStr & rLink = aLink();
+
+    Env().Get_LinkTo( rLink.reset(),
+                      Env().OutputTree().Overview() );
+    aNaviMain.Add_StdItem( C_sTop, rLink.c_str() );
+
+    Env().Get_LinkTo( rLink.reset(),
+                      Env().Linker().PositionOf_CurModule() );
+    aNaviMain.Add_StdItem( C_sModule, rLink.c_str() );
+
+    aNaviMain.Add_SelfItem( C_sUse );
+
+    const StringVector &
+        rManualDescrs = i_ce.Secondaries().Links2DescriptionInManual();
+    if (rManualDescrs.size() == 2)
+    {
+        aNaviMain.Add_StdItem(C_sManual, Env().Link2Manual( rManualDescrs.front() ));
+    }
+    else if (rManualDescrs.size() > 2)
+    {
+        aNaviMain.Add_StdItem(C_sManual, C_sLocalManualLinks);
+    }
+    else
+    {
+        aNaviMain.Add_NoneItem( C_sManual );
+    }
+
+    Env().Get_LinkTo( rLink.reset(),
+                      Env().Linker().PositionOf_Index() );
+    aNaviMain.Add_StdItem( C_sIndex, rLink.c_str() );
+
+    aNaviMain.Produce_Row();
+}
+
+void
+HF_IdlNavigationBar::Produce_ModuleMainRow( const client & i_ce )
+{
+    HF_NaviMainRow
+        aNaviMain( CurOut() );
+
+    StreamLock  aLink(500);
+    StreamStr & rLink = aLink();
+
+    Env().Get_LinkTo( rLink.reset(),
+                      Env().OutputTree().Overview() );
+    aNaviMain.Add_StdItem( C_sTop, rLink.c_str() );
+
+    aNaviMain.Add_SelfItem( C_sModule );
+
+    aNaviMain.Add_NoneItem( C_sUse );
+
+    const StringVector &
+        rManualDescrs = i_ce.Secondaries().Links2DescriptionInManual();
+    if (rManualDescrs.size() == 1)
+    {
+        aNaviMain.Add_StdItem(C_sManual, Env().Link2Manual( rManualDescrs.front() ));
+    }
+    else if (rManualDescrs.size() > 1)
+    {
+        aNaviMain.Add_StdItem(C_sManual, C_sLocalManualLinks);
+    }
+    else
+    {
+        aNaviMain.Add_NoneItem( C_sManual );
+    }
+
+    Env().Get_LinkTo( rLink.reset(),
+                      Env().Linker().PositionOf_Index() );
+    aNaviMain.Add_StdItem( C_sIndex, rLink.c_str() );
+
+    aNaviMain.Produce_Row();
+}
+
+void
+HF_IdlNavigationBar::Produce_IndexMainRow()
+{
+    HF_NaviMainRow
+                aNaviMain( CurOut() );
+
+    StreamLock  aLink(500);
+    StreamStr & rLink = aLink();
+
+    Env().Get_LinkTo( rLink.reset(),
+                      Env().OutputTree().Overview() );
+    aNaviMain.Add_StdItem( C_sTop, rLink.c_str() );
+
+    aNaviMain.Add_NoneItem( C_sModule );
+    aNaviMain.Add_NoneItem( C_sUse );
+    aNaviMain.Add_NoneItem( C_sManual );
+
+    aNaviMain.Add_SelfItem( C_sIndex );
+
+    aNaviMain.Produce_Row();
+
+    CurOut() << new Html::HorizontalLine();
+}
+
+DYN HF_NaviSubRow &
+HF_IdlNavigationBar::Add_SubRow()
+{
+    return *new HF_NaviSubRow( CurOut() );
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_navibar.hxx b/autodoc/source/display/idl/hfi_navibar.hxx
new file mode 100644
index 000000000000..d6ffc16ba455
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_navibar.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 ADC_DISPLAY_HFI_NAVIBAR_HXX
+#define ADC_DISPLAY_HFI_NAVIBAR_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include "hi_factory.hxx"
+    // PARAMETERS
+
+namespace ary
+{
+namespace idl
+{
+class CodeEntity;
+}
+}
+
+
+class HF_NaviSubRow;
+
+/** @resp
+    Creates a navigation bar for an IDL HTML documentation page.
+*/
+class HF_IdlNavigationBar : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlNavigationBar(
+                            HtmlEnvironment_Idl &
+                                                io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlNavigationBar();
+
+    void                Produce_CeMainRow(
+                            const client &      i_ce,
+                            bool                i_bNoUsePage = false );
+    void                Produce_CeXrefsMainRow(
+                            const client &      i_ce );
+    void                Produce_ModuleMainRow(
+                            const client &      i_ce );
+    void                Produce_IndexMainRow();
+
+    /** Adds the subrow to the o_rOut argument of the constructor.
+    */
+    DYN HF_NaviSubRow & Add_SubRow();
+
+  private:
+    const ary::idl::CodeEntity *
+                        pCe;
+};
+
+extern const String
+    C_sLocalManualLinks;
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_property.cxx b/autodoc/source/display/idl/hfi_property.cxx
new file mode 100644
index 000000000000..f10e6694799c
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_property.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 <precomp.h>
+#include "hfi_property.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/ik_attribute.hxx>
+#include <ary/idl/ik_constant.hxx>
+#include <ary/idl/ik_enumvalue.hxx>
+#include <ary/idl/ik_property.hxx>
+#include <ary/idl/ik_structelem.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_typetext.hxx"
+#include "hfi_doc.hxx"
+#include "hfi_tag.hxx"
+#include "hi_env.hxx"
+#include "hi_ary.hxx"
+#include "hi_linkhelper.hxx"
+
+void
+HF_IdlDataMember::Produce_byData( const client & ce ) const
+{
+    write_Title(ce);
+    enter_ContentCell();
+    write_Declaration(ce);
+    write_Description(ce);
+    leave_ContentCell();
+}
+
+HF_IdlDataMember::HF_IdlDataMember( Environment &       io_rEnv,
+                                    HF_SubTitleTable &  o_table )
+    :   HtmlFactory_Idl( io_rEnv,
+                         &(o_table.Add_Row()
+                            >> *new Html::TableCell
+                                << new Html::ClassAttr(C_sCellStyle_MDetail))
+                       )
+{
+}
+
+const String sContentBorder("0");
+const String sContentWidth("96%");
+const String sContentPadding("5");
+const String sContentSpacing("0");
+
+const String sBgWhite("#ffffff");
+const String sCenter("center");
+
+void
+HF_IdlDataMember::write_Title( const client & i_ce ) const
+{
+    CurOut()
+        >> *new Html::Label(i_ce.LocalName())
+            << new Html::ClassAttr(C_sMemberTitle)
+            << i_ce.LocalName();
+}
+
+void
+HF_IdlDataMember::write_Description( const client & i_ce ) const
+{
+    CurOut() << new Html::HorizontalLine;
+    write_Docu(CurOut(), i_ce);
+}
+
+void
+HF_IdlDataMember::enter_ContentCell() const
+{
+
+    Xml::Element &
+        rContentCell = CurOut()
+                        >> *new Html::Table( sContentBorder,
+                                             sContentWidth,
+                                             sContentPadding,
+                                             sContentSpacing )
+                            << new Html::ClassAttr("table-in-data")
+                            << new Html::BgColorAttr(sBgWhite)
+                            << new Html::AlignAttr(sCenter)
+                            >> *new Html::TableRow
+                                >> *new Html::TableCell;
+    Out().Enter(rContentCell);
+}
+
+
+void
+HF_IdlDataMember::leave_ContentCell() const
+{
+    Out().Leave();
+}
+
+
+HF_IdlProperty::~HF_IdlProperty()
+{
+}
+
+typedef ary::idl::ifc_property::attr    PropertyAttr;
+
+void
+HF_IdlProperty::write_Declaration( const client & i_ce ) const
+{
+    if (PropertyAttr::HasAnyStereotype(i_ce))
+    {
+        CurOut() << "[ ";
+        if (PropertyAttr::IsReadOnly(i_ce))
+            CurOut() << "readonly ";
+        if (PropertyAttr::IsBound(i_ce))
+            CurOut() << "bound ";
+        if (PropertyAttr::IsConstrained(i_ce))
+            CurOut() << "constrained ";
+        if (PropertyAttr::IsMayBeAmbiguous(i_ce))
+            CurOut() << "maybeambiguous ";
+        if (PropertyAttr::IsMayBeDefault(i_ce))
+            CurOut() << "maybedefault ";
+        if (PropertyAttr::IsMayBeVoid(i_ce))
+            CurOut() << "maybevoid ";
+        if (PropertyAttr::IsRemovable(i_ce))
+            CurOut() << "removable ";
+        if (PropertyAttr::IsTransient(i_ce))
+            CurOut() << "transient ";
+        CurOut() << "] ";
+    }   // end if
+
+    HF_IdlTypeText
+        aType( Env(), CurOut(), true );
+    aType.Produce_byData( PropertyAttr::Type(i_ce) );
+
+    CurOut() << " " >> *new Html::Bold << i_ce.LocalName();
+    CurOut() << ";";
+}
+
+
+
+
+HF_IdlAttribute::~HF_IdlAttribute()
+{
+}
+
+typedef ary::idl::ifc_attribute::attr    AttributeAttr;
+
+void
+HF_IdlAttribute::write_Declaration( const client & i_ce ) const
+{
+    if (AttributeAttr::HasAnyStereotype(i_ce))
+    {
+        CurOut() << "[ ";
+        if (AttributeAttr::IsReadOnly(i_ce))
+            CurOut() << "readonly ";
+        if (AttributeAttr::IsBound(i_ce))
+            CurOut() << "bound ";
+        CurOut() << "] ";
+    }
+
+    HF_IdlTypeText
+        aType( Env(), CurOut(), true );
+    aType.Produce_byData( AttributeAttr::Type(i_ce) );
+
+    CurOut()
+        << " "
+        >> *new Html::Bold
+            << i_ce.LocalName();
+
+    dyn_type_list pGetExceptions;
+    dyn_type_list pSetExceptions;
+    AttributeAttr::Get_GetExceptions(pGetExceptions, i_ce);
+    AttributeAttr::Get_SetExceptions(pSetExceptions, i_ce);
+
+    bool bGetRaises = (*pGetExceptions).IsValid();
+    bool bSetRaises = (*pSetExceptions).IsValid();
+    bool bRaises = bGetRaises OR bSetRaises;
+    if (bRaises)
+    {
+        HF_DocEntryList aSub(CurOut());
+
+        if (bGetRaises)
+        {
+            Xml::Element &
+                rGet = aSub.Produce_Definition();
+            HF_IdlTypeText
+                aExc(Env(), rGet, true);
+            type_list & itExc = *pGetExceptions;
+
+            rGet << "get raises (";
+            aExc.Produce_byData(*itExc);
+            for (++itExc; itExc.operator bool(); ++itExc)
+            {
+                rGet
+                    << ",";
+                aExc.Produce_byData(*itExc);
+            }   // end for
+            rGet << ")";
+            if (NOT bSetRaises)
+                rGet << ";";
+        }   // end if (bGetRaises)
+
+        if (bSetRaises)
+        {
+            Xml::Element &
+                rSet = aSub.Produce_Definition();
+            HF_IdlTypeText
+                aExc(Env(), rSet, true);
+            type_list & itExc = *pSetExceptions;
+
+            rSet << "set raises (";
+            aExc.Produce_byData(*itExc);
+            for (++itExc; itExc.operator bool(); ++itExc)
+            {
+                rSet
+                    << ",";
+                aExc.Produce_byData(*itExc);
+            }   // end for
+            rSet << ");";
+        }   // end if (bSetRaises)
+    }
+    else
+    {
+        CurOut() << ";";
+    }
+}
+
+
+
+
+HF_IdlEnumValue::~HF_IdlEnumValue()
+{
+}
+
+typedef ary::idl::ifc_enumvalue::attr    EnumValueAttr;
+
+void
+HF_IdlEnumValue::write_Declaration( const client & i_ce ) const
+{
+    CurOut()
+        >> *new Html::Bold
+            << i_ce.LocalName();
+
+    const String &
+        rValue = EnumValueAttr::Value(i_ce);
+    if ( NOT rValue.empty() )
+    {    CurOut() << " " // << " = "    // In the moment this is somehow in the value
+                 << rValue;
+        // CurOut() << ",";             // In the moment this is somehow in the value
+    }
+    else
+        CurOut() << ",";
+}
+
+
+HF_IdlConstant::~HF_IdlConstant()
+{
+}
+
+typedef ary::idl::ifc_constant::attr    ConstantAttr;
+
+void
+HF_IdlConstant::write_Declaration( const client & i_ce ) const
+{
+    CurOut() << "const ";
+    HF_IdlTypeText
+        aType( Env(), CurOut(), true );
+    aType.Produce_byData(ConstantAttr::Type(i_ce));
+    CurOut()
+        << " "
+        >> *new Html::Bold
+            << i_ce.LocalName();
+    const String &
+        rValue = ConstantAttr::Value(i_ce);
+    CurOut() << " "     // << " = "    // In the moment this is somehow in the value
+             << rValue;
+    // << ";";  // In the moment this is somehow in the value
+}
+
+
+HF_IdlStructElement::~HF_IdlStructElement()
+{
+}
+
+typedef ary::idl::ifc_structelement::attr    StructElementAttr;
+
+void
+HF_IdlStructElement::write_Declaration( const client & i_ce ) const
+{
+    HF_IdlTypeText
+        aType( Env(), CurOut(), true );
+    aType.Produce_byData(StructElementAttr::Type(i_ce));
+    CurOut()
+        << " "
+        >> *new Html::Bold
+            << i_ce.LocalName();
+    CurOut()
+        << ";";
+}
+
+HF_IdlCommentedRelationElement::~HF_IdlCommentedRelationElement()
+{
+}
+
+void
+HF_IdlCommentedRelationElement::produce_Summary( Environment &   io_env,
+                                                 Xml::Element &  io_context,
+                                                 const comref &  i_commentedRef,
+                                                 const client &  i_rScopeGivingCe )
+{
+    csv_assert( i_commentedRef.Info() );
+
+    const ce_info &         rDocu = *i_commentedRef.Info();
+
+    bool bShort = NOT rDocu.Short().IsEmpty();
+    bool bDescr = NOT rDocu.Description().IsEmpty();
+
+    if ( bShort )
+    {
+        HF_IdlDocuTextDisplay
+                aDescription(io_env, 0, i_rScopeGivingCe);
+
+        Xml::Element& rPara = io_context >> *new Html::Paragraph;
+        aDescription.Out().Enter( rPara );
+        rDocu.Short().DisplayAt( aDescription );
+
+        // if there's more than just the summary - i.e. a description, or usage restrictions, or tags -,
+        // then add a link to the details section
+        if ( bDescr OR rDocu.IsDeprecated() OR rDocu.IsOptional() OR NOT rDocu.Tags().empty() )
+        {
+            StreamLock aLocalLink(100);
+            aLocalLink() << "#" << get_LocalLinkName(io_env, i_commentedRef);
+
+            aDescription.Out().Out() << "(";
+            aDescription.Out().Out()
+                >> *new Html::Link( aLocalLink().c_str() )
+                    << "details";
+            aDescription.Out().Out() << ")";
+        }
+
+        aDescription.Out().Leave();
+    }
+}
+
+void
+HF_IdlCommentedRelationElement::produce_LinkDoc( Environment &   io_env,
+                                                 const client &  i_ce,
+                                                 Xml::Element &  io_context,
+                                                 const comref &  i_commentedRef,
+                                                 const E_DocType i_docType )
+{
+    if ( i_commentedRef.Info() != 0 )
+    {
+        if ( i_docType == doctype_complete )
+        {
+            HF_DocEntryList aDocList(io_context);
+            HF_IdlDocu aDocuDisplay(io_env, aDocList);
+
+            aDocuDisplay.Produce_fromReference(*i_commentedRef.Info(), i_ce);
+        }
+        else
+        {
+            produce_Summary(io_env, io_context, i_commentedRef, i_ce);
+        }
+    }
+    else
+    {
+        HF_DocEntryList aDocList(io_context);
+
+        const client *
+            pCe = io_env.Linker().Search_CeFromType(i_commentedRef.Type());
+        const ce_info *
+            pShort = pCe != 0
+                        ?   Get_IdlDocu(pCe->Docu())
+                        :   (const ce_info *)(0);
+        if ( pShort != 0 )
+        {
+            aDocList.Produce_NormalTerm("(referenced entity's summary:)");
+            Xml::Element &
+                rDef = aDocList.Produce_Definition();
+            HF_IdlDocuTextDisplay
+                aShortDisplay( io_env, &rDef, *pCe);
+            pShort->Short().DisplayAt(aShortDisplay);
+        }   // end if (pShort != 0)
+    }   // endif ( (*i_commentedRef).Info() != 0 ) else
+}
+
+
+String
+HF_IdlCommentedRelationElement::get_LocalLinkName( Environment &  io_env,
+                                                   const comref & i_commentedRef )
+{
+    StringVector        aModules;
+    String              sLocalName;
+    ce_id               nCe;
+    int                 nSequenceCount = 0;
+
+    const ary::idl::Type &
+        rType = io_env.Data().Find_Type(i_commentedRef.Type());
+    io_env.Data().Get_TypeText(aModules, sLocalName, nCe, nSequenceCount, rType);
+
+    // speaking strictly, this is not correct: If we have two interfaces with the same local
+    // name, but in different modules, then the link name will be ambiguous. However, this should
+    // be too seldom a case to really make the link names that ugly by adding the module information.
+    return sLocalName;
+}
+
+void
+HF_IdlCommentedRelationElement::write_Title( const client & /*i_ce*/ ) const
+{
+
+    Xml::Element &
+        rAnchor = CurOut()
+                    >> *new Html::Label(get_LocalLinkName(Env(), m_relation))
+                        << new Html::ClassAttr(C_sMemberTitle);
+
+    HF_IdlTypeText
+        aText(Env(), rAnchor, true);
+    aText.Produce_byData(m_relation.Type());
+}
+
+void
+HF_IdlCommentedRelationElement::write_Declaration( const client & /*i_ce*/ ) const
+{
+    // nothing to do here - an entity which is a commented relation does not have a declaration
+}
+
+void
+HF_IdlCommentedRelationElement::write_Description( const client & i_ce ) const
+{
+    produce_LinkDoc( Env(), i_ce, CurOut(), m_relation, doctype_complete );
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_property.hxx b/autodoc/source/display/idl/hfi_property.hxx
new file mode 100644
index 000000000000..3c6da79fc61d
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_property.hxx
@@ -0,0 +1,185 @@
+/* -*- 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 ADC_DISPLAY_HFI_PROPERTY_HXX
+#define ADC_DISPLAY_HFI_PROPERTY_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_comrela.hxx>
+
+class HF_SubTitleTable;
+
+class HF_IdlDataMember : public HtmlFactory_Idl
+{
+  public:
+    void                Produce_byData(
+                            const client &      ce ) const;
+  protected:
+                        HF_IdlDataMember(
+                            Environment &       io_rEnv,
+                            HF_SubTitleTable &  o_table );
+    virtual             ~HF_IdlDataMember() {}
+
+  private:
+    virtual void        write_Title(
+                            const client &      i_ce ) const;
+
+    virtual void        write_Declaration(
+                            const client &      i_ce ) const = 0;
+
+    virtual void        write_Description(
+                            const client &      i_ce ) const;
+
+    void                enter_ContentCell() const;
+    void                leave_ContentCell() const;
+};
+
+
+
+class HF_IdlProperty : public HF_IdlDataMember
+{
+  public:
+                        HF_IdlProperty(
+                            Environment &       io_rEnv,
+                            HF_SubTitleTable &  o_table )
+                            :   HF_IdlDataMember(io_rEnv, o_table) {}
+    virtual             ~HF_IdlProperty();
+  private:
+    virtual void        write_Declaration(
+                            const client &      i_ce ) const;
+};
+
+class HF_IdlAttribute : public HF_IdlDataMember
+{
+  public:
+                        HF_IdlAttribute(
+                            Environment &       io_rEnv,
+                            HF_SubTitleTable &  o_table )
+                            :   HF_IdlDataMember(io_rEnv, o_table) {}
+    virtual             ~HF_IdlAttribute();
+
+  private:
+    virtual void        write_Declaration(
+                            const client &      i_ce ) const;
+};
+
+
+class HF_IdlEnumValue : public HF_IdlDataMember
+{
+  public:
+                        HF_IdlEnumValue(
+                            Environment &       io_rEnv,
+                            HF_SubTitleTable &  o_table )
+                            :   HF_IdlDataMember(io_rEnv, o_table) {}
+    virtual             ~HF_IdlEnumValue();
+
+  private:
+    virtual void        write_Declaration(
+                            const client &      i_ce ) const;
+};
+
+class HF_IdlConstant : public HF_IdlDataMember
+{
+  public:
+                        HF_IdlConstant(
+                            Environment &       io_rEnv,
+                            HF_SubTitleTable &  o_table )
+                            :   HF_IdlDataMember(io_rEnv, o_table) {}
+    virtual             ~HF_IdlConstant();
+
+  private:
+    virtual void        write_Declaration(
+                            const client &      i_ce ) const;
+};
+
+
+class HF_IdlStructElement : public HF_IdlDataMember
+{
+  public:
+                        HF_IdlStructElement(
+                            Environment &       io_rEnv,
+                            HF_SubTitleTable &  o_table )
+                            :   HF_IdlDataMember(io_rEnv, o_table) {}
+    virtual             ~HF_IdlStructElement();
+
+  private:
+    virtual void        write_Declaration(
+                            const client &      i_ce ) const;
+};
+
+class HF_IdlCommentedRelationElement : public HF_IdlDataMember
+{
+  public:
+                        HF_IdlCommentedRelationElement(
+                            Environment &                       io_rEnv,
+                            HF_SubTitleTable &                  o_table,
+                            const ary::idl::CommentedRelation&  i_relation )
+                            :   HF_IdlDataMember(io_rEnv, o_table)
+                            ,   m_relation( i_relation )
+                        {
+                        }
+    virtual             ~HF_IdlCommentedRelationElement();
+
+    typedef ::ary::idl::CommentedRelation       comref;
+
+    static void         produce_LinkDoc(
+                            Environment &   io_env,
+                            const client &  i_ce,
+                            Xml::Element &  io_context,
+                            const comref &  i_commentedRef,
+                            const E_DocType i_docType );
+
+  private:
+    virtual void        write_Title(
+                            const client &      i_ce ) const;
+    virtual void        write_Declaration(
+                            const client &      i_ce ) const;
+    virtual void        write_Description(
+                            const client &      i_ce ) const;
+  private:
+    static void         produce_Summary( Environment &  io_env,
+                                         Xml::Element & io_context,
+                                         const comref & i_commentedRef,
+                                         const client & i_rScopeGivingCe );
+
+    static String       get_LocalLinkName( Environment &  io_env,
+                                           const comref & i_commentedRef );
+
+  private:
+    const ary::idl::CommentedRelation&  m_relation;
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_service.cxx b/autodoc/source/display/idl/hfi_service.cxx
new file mode 100644
index 000000000000..ad19d336e7f1
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_service.cxx
@@ -0,0 +1,365 @@
+/* -*- 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 <precomp.h>
+#include "hfi_service.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/ik_property.hxx>
+#include <ary/idl/ik_service.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_linachain.hxx>
+#include <toolkit/hf_navi_sub.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_doc.hxx"
+#include "hfi_navibar.hxx"
+#include "hfi_property.hxx"
+#include "hfi_tag.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_linkhelper.hxx"
+
+
+
+
+extern const String
+    C_sCePrefix_Service("service");
+
+namespace
+{
+
+const String
+    C_sList_IncludedServices("Services' Summary");
+const String
+    C_sList_IncludedServices_Heading("Included Services - Summary");
+const String
+    C_sList_IncludedServices_Label("ServicesSummary");
+const String
+    C_sList_IncludedServicesDetails("Services' Details");
+const String
+    C_sList_IncludedServicesDetails_Heading("Included Services - Details");
+const String
+    C_sList_IncludedServicesDetails_Label("ServicesDetails");
+const String
+    C_sList_ExportedInterfaces("Interfaces' Summary");
+const String
+    C_sList_ExportedInterfaces_Heading("Exported Interfaces - Summary");
+const String
+    C_sList_ExportedInterfaces_Label("InterfacesSummary");
+const String
+    C_sList_ExportedInterfacesDetails("Interfaces' Details");
+const String
+    C_sList_ExportedInterfacesDetails_Heading("Exported Interfaces - Details");
+const String
+    C_sList_ExportedInterfacesDetails_Label("InterfacesDetails");
+const String
+    C_sList_Properties("Properties' Summary");
+const String
+    C_sList_Properties_Label("PropertiesSummary");
+const String
+    C_sList_PropertiesDetails("Properties' Details");
+const String
+    C_sList_PropertiesDetails_Label("PropertiesDetails");
+
+
+enum E_SubListIndices
+{
+    sli_IncludedServicesSummary = 0,
+    sli_InterfacesSummary = 1,
+    sli_PropertiesSummary = 2,
+    sli_IncludedServicesDetails = 3,
+    sli_InterfacesDetails = 4,
+    sli_PropertiesDetails = 5
+};
+
+} //anonymous namespace
+
+
+HF_IdlService::HF_IdlService( Environment &         io_rEnv,
+                              Xml::Element &        o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut)
+{
+}
+
+HF_IdlService::~HF_IdlService()
+{
+
+}
+
+typedef ::ary::idl::ifc_service::attr
+    ServiceAttr;
+typedef ::ary::Dyn_StdConstIterator< ::ary::idl::CommentedRelation >
+    dyn_comref_list;
+
+void
+HF_IdlService::produce_CommentedRelations( const client &   i_ce,
+                                           comref_list &    it_list,
+                                           const String &   i_summaryTitle,
+                                           const String &   i_summaryLabel,
+                                           const String &   i_detailsTitle,
+                                           const String &   i_detailsLabel,
+                                           const E_DocType  i_docType ) const
+{
+    csv_assert( it_list );
+
+    bool bSummaryOnly = ( i_docType == doctype_summaryOnly );
+    HF_SubTitleTable aTable(
+                CurOut(),
+                bSummaryOnly ? i_summaryLabel : i_detailsLabel,
+                bSummaryOnly ? i_summaryTitle : i_detailsTitle,
+                2 );
+
+    for ( ; it_list; ++it_list )
+    {
+        Xml::Element &
+            rRow = aTable.Add_Row();
+
+        if ( bSummaryOnly )
+        {
+            produce_Link(rRow, (*it_list).Type());
+            produce_LinkSummary(i_ce, rRow, *it_list);
+        }
+        else
+        {
+            HF_IdlCommentedRelationElement
+                aRelation( Env(), aTable, *it_list );
+            aRelation.Produce_byData( i_ce );
+        }
+    }   // end for
+}
+
+void
+HF_IdlService::Produce_byData( const client & i_ce ) const
+{
+    Dyn<HF_NaviSubRow>
+        pNaviSubRow( &make_Navibar(i_ce) );
+
+    HF_TitleTable
+        aTitle(CurOut());
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+
+    aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker);
+    produce_Title(aTitle, C_sCePrefix_Service, i_ce);
+
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+
+    // produce ...
+    // - included services: summary
+    dyn_comref_list dpIncludedServices;
+    ServiceAttr::Get_IncludedServices(dpIncludedServices, i_ce);
+    if ( (*dpIncludedServices).operator bool() )
+    {
+        produce_CommentedRelations( i_ce, *dpIncludedServices,
+                         C_sList_IncludedServices_Heading,
+                         C_sList_IncludedServices_Label,
+                         C_sList_IncludedServicesDetails_Heading,
+                         C_sList_IncludedServicesDetails_Label,
+                         doctype_summaryOnly );
+        pNaviSubRow->SwitchOn(sli_IncludedServicesSummary);
+    }
+
+    // - exported interfaces: summary
+    dyn_comref_list dpExportedInterfaces;
+    ServiceAttr::Get_ExportedInterfaces(dpExportedInterfaces, i_ce);
+    if ( (*dpExportedInterfaces).operator bool() )
+    {
+        produce_CommentedRelations( i_ce, *dpExportedInterfaces,
+                         C_sList_ExportedInterfaces_Heading,
+                         C_sList_ExportedInterfaces_Label,
+                         C_sList_ExportedInterfacesDetails_Heading,
+                         C_sList_ExportedInterfacesDetails_Label,
+                         doctype_summaryOnly );
+        pNaviSubRow->SwitchOn(sli_InterfacesSummary);
+    }
+
+    // - supported properties: summary
+    dyn_ce_list dpProperties;
+    ServiceAttr::Get_Properties(dpProperties, i_ce);
+    if ( (*dpProperties).operator bool() )
+    {
+        produce_Members( *dpProperties,
+                         C_sList_Properties,
+                         C_sList_Properties_Label,
+                         C_sList_PropertiesDetails,
+                         C_sList_PropertiesDetails_Label,
+                         viewtype_summary );
+        pNaviSubRow->SwitchOn(sli_PropertiesSummary);
+    }
+
+    // - included services: details
+    ServiceAttr::Get_IncludedServices(dpIncludedServices, i_ce);
+    if ( (*dpIncludedServices).operator bool() )
+    {
+        produce_CommentedRelations( i_ce, *dpIncludedServices,
+                         C_sList_IncludedServices_Heading,
+                         C_sList_IncludedServices_Label,
+                         C_sList_IncludedServicesDetails_Heading,
+                         C_sList_IncludedServicesDetails_Label,
+                         doctype_complete );
+        pNaviSubRow->SwitchOn(sli_IncludedServicesDetails);
+    }
+
+    // - exported interfaces: details
+    ServiceAttr::Get_ExportedInterfaces(dpExportedInterfaces, i_ce);
+    if ( (*dpExportedInterfaces).operator bool() )
+    {
+        produce_CommentedRelations( i_ce, *dpExportedInterfaces,
+                         C_sList_ExportedInterfaces_Heading,
+                         C_sList_ExportedInterfaces_Label,
+                         C_sList_ExportedInterfacesDetails_Heading,
+                         C_sList_ExportedInterfacesDetails_Label,
+                         doctype_complete );
+        pNaviSubRow->SwitchOn(sli_InterfacesDetails);
+    }
+
+    // supported properties: details
+    ServiceAttr::Get_Properties(dpProperties, i_ce);
+    if ( (*dpProperties).operator bool() )
+    {
+        produce_Members( *dpProperties,
+                         C_sList_Properties,
+                         C_sList_Properties_Label,
+                         C_sList_PropertiesDetails,
+                         C_sList_PropertiesDetails_Label,
+                         viewtype_details );
+        pNaviSubRow->SwitchOn(sli_PropertiesDetails);
+    }
+
+    pNaviSubRow->Produce_Row();
+    CurOut() << new Xml::XmlCode("<br>&nbsp;");
+}
+
+typedef ary::idl::ifc_property::attr    PropertyAttr;
+
+void
+HF_IdlService::produce_SummaryDeclaration( Xml::Element &      o_row,
+                                           const client &      i_property ) const
+{
+    // KORR_FUTURE
+    // Put this in to HF_IdlProperty!
+
+    Xml::Element &
+        rCell = o_row
+                    >> *new Html::TableCell
+                        << new Html::ClassAttr( C_sCellStyle_SummaryLeft );
+
+    if (PropertyAttr::HasAnyStereotype(i_property))
+    {
+        rCell << "[ ";
+        if (PropertyAttr::IsReadOnly(i_property))
+            rCell << "readonly ";
+        if (PropertyAttr::IsBound(i_property))
+            rCell << "bound ";
+        if (PropertyAttr::IsConstrained(i_property))
+            rCell << "constrained ";
+        if (PropertyAttr::IsMayBeAmbiguous(i_property))
+            rCell << "maybeambiguous ";
+        if (PropertyAttr::IsMayBeDefault(i_property))
+            rCell << "maybedefault ";
+        if (PropertyAttr::IsMayBeVoid(i_property))
+            rCell << "maybevoid ";
+        if (PropertyAttr::IsRemovable(i_property))
+            rCell << "removable ";
+        if (PropertyAttr::IsTransient(i_property))
+            rCell << "transient ";
+        rCell << "] ";
+    }   // end if
+
+    HF_IdlTypeText
+        aType( Env(), rCell, true );
+    aType.Produce_byData( PropertyAttr::Type(i_property) );
+
+    StreamLock aLocalLink(100);
+    aLocalLink() << "#" << i_property.LocalName();
+    rCell
+        << new Html::LineBreak
+        >> *new Html::Link( aLocalLink().c_str() )
+            << i_property.LocalName();
+}
+
+DYN HF_NaviSubRow &
+HF_IdlService::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_CeMainRow(i_ce);
+
+    DYN HF_NaviSubRow &
+        ret = aNaviBar.Add_SubRow();
+    ret.AddItem(C_sList_IncludedServices, C_sList_IncludedServices_Label, false);
+    ret.AddItem(C_sList_ExportedInterfaces, C_sList_ExportedInterfaces_Label, false);
+    ret.AddItem(C_sList_Properties, C_sList_Properties_Label, false);
+    ret.AddItem(C_sList_IncludedServicesDetails, C_sList_IncludedServicesDetails_Label, false);
+    ret.AddItem(C_sList_ExportedInterfacesDetails, C_sList_ExportedInterfacesDetails_Label, false);
+    ret.AddItem(C_sList_PropertiesDetails, C_sList_PropertiesDetails_Label, false);
+
+    CurOut() << new Html::HorizontalLine();
+    return ret;
+}
+
+void
+HF_IdlService::produce_Link( Xml::Element &     o_row,
+                             type_id            i_type ) const
+{
+    Xml::Element &
+        rCell = o_row
+                >> *new Html::TableCell
+                    << new Html::ClassAttr(C_sCellStyle_SummaryLeft);
+    HF_IdlTypeText
+        aText(Env(), rCell, true);
+    aText.Produce_byData(i_type);
+}
+
+void
+HF_IdlService::produce_LinkSummary( const client &  i_ce,
+                                    Xml::Element &  o_row,
+                                    const comref &  i_commentedRef ) const
+{
+    Xml::Element &
+        rCell = o_row
+                >> *new Html::TableCell
+                    << new Html::ClassAttr(C_sCellStyle_SummaryRight);
+
+    HF_IdlCommentedRelationElement::produce_LinkDoc( Env(), i_ce, rCell, i_commentedRef, doctype_summaryOnly );
+}
+
+void
+HF_IdlService::produce_MemberDetails( HF_SubTitleTable &  o_table,
+                                      const client &      i_ce ) const
+{
+    HF_IdlProperty
+        aProperty( Env(), o_table);
+    aProperty.Produce_byData( i_ce );
+}
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_service.hxx b/autodoc/source/display/idl/hfi_service.hxx
new file mode 100644
index 000000000000..95c6f4163548
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_service.hxx
@@ -0,0 +1,101 @@
+/* -*- 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 ADC_DISPLAY_HFI_SERVICE_HXX
+#define ADC_DISPLAY_HFI_SERVICE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_comrela.hxx>
+
+class HF_NaviSubRow;
+class HF_SubTitleTable;
+
+class HF_IdlService : public HtmlFactory_Idl
+{
+  public:
+    typedef ::ary::idl::CommentedRelation       comref;
+    typedef ::ary::StdConstIterator< comref >   comref_list;
+
+                        HF_IdlService(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlService();
+
+    void                Produce_byData(
+                           const client &       i_ce ) const;
+   private:
+    // Overwritten from HtmlFactory_Idl:
+    virtual void        produce_SummaryDeclaration(
+                            Xml::Element &      o_row,
+                            const client &      i_ce ) const;
+
+    // Locals
+    DYN HF_NaviSubRow & make_Navibar(
+                            const client &      i_ce ) const;
+
+    void                produce_Link(
+                            Xml::Element &      o_row,
+                            type_id             i_type ) const;
+    void                produce_LinkSummary(
+                            const client &      i_ce,
+                            Xml::Element &      o_row,
+                            const comref &  i_commentedRef ) const;
+
+    void                produce_MemberDetails(        /// of property
+                            HF_SubTitleTable &  o_table,
+                            const client &      i_ce ) const;
+
+    void                produce_CommentedRelations(
+                            const client &  i_ce,
+                            comref_list &   it_list,
+                            const String &  i_summaryTitle,
+                            const String &  i_summaryLabel,
+                            const String &  i_detailsTitle,
+                            const String &  i_detailsLabel,
+                            const E_DocType i_docType ) const;
+
+};
+
+
+
+// IMPLEMENTATION
+
+extern const String
+    C_sCePrefix_Service;
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_singleton.cxx b/autodoc/source/display/idl/hfi_singleton.cxx
new file mode 100644
index 000000000000..39daf4b927ee
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_singleton.cxx
@@ -0,0 +1,136 @@
+/* -*- 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 <precomp.h>
+#include "hfi_singleton.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/ik_singleton.hxx>
+#include <ary/idl/ik_sisingleton.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_linachain.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_navibar.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_linkhelper.hxx"
+
+
+
+extern const String
+    C_sCePrefix_Singleton("singleton");
+
+const String
+    C_sAssociatedService("Associated Service");
+const String
+    C_sImplementedInterface("Supported Interface");
+
+
+
+HF_IdlSingleton::HF_IdlSingleton( Environment &         io_rEnv,
+                                  Xml::Element &        o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut)
+{
+}
+
+HF_IdlSingleton::~HF_IdlSingleton()
+{
+
+}
+
+typedef ::ary::idl::ifc_singleton::attr         SingletonAttr;
+typedef ::ary::idl::ifc_sglifcsingleton::attr   SglIfcSingletonAttr;
+
+void
+HF_IdlSingleton::Produce_byData_ServiceBased( const client & i_ce ) const
+{
+    make_Navibar(i_ce);
+
+    HF_TitleTable
+        aTitle(CurOut());
+
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+
+    aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker);
+    produce_Title(aTitle, C_sCePrefix_Singleton, i_ce);
+
+    HF_DocEntryList
+        aTopList( aTitle.Add_Row() );
+    aTopList.Produce_Term(C_sAssociatedService);
+
+    HF_IdlTypeText
+        aAssociatedService( Env(), aTopList.Produce_Definition(), true );
+    aAssociatedService.Produce_byData( SingletonAttr::AssociatedService(i_ce) );
+
+    CurOut() << new Html::HorizontalLine;
+
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+}
+
+void
+HF_IdlSingleton::Produce_byData_InterfaceBased( const client & i_ce ) const
+{
+    make_Navibar(i_ce);
+
+    HF_TitleTable
+        aTitle(CurOut());
+
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+
+    aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker);
+    produce_Title(aTitle, C_sCePrefix_Singleton, i_ce);
+
+    HF_DocEntryList
+        aTopList( aTitle.Add_Row() );
+    aTopList.Produce_Term(C_sImplementedInterface);
+
+    HF_IdlTypeText
+        aImplementedInterface( Env(), aTopList.Produce_Definition(), true );
+    aImplementedInterface.Produce_byData( SglIfcSingletonAttr::BaseInterface(i_ce) );
+
+    CurOut() << new Html::HorizontalLine;
+
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+}
+
+void
+HF_IdlSingleton::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_CeMainRow(i_ce,true);  // true := avoid link to Use-page.
+
+    CurOut() << new Html::HorizontalLine();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_singleton.hxx b/autodoc/source/display/idl/hfi_singleton.hxx
new file mode 100644
index 000000000000..3d1ec1b5c2fd
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_singleton.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 ADC_DISPLAY_HFI_SINGLETON_HXX
+#define ADC_DISPLAY_HFI_SINGLETON_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+class HF_NaviSubRow;
+
+
+class HF_IdlSingleton : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlSingleton(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlSingleton();
+
+    void                Produce_byData_ServiceBased(
+                           const client &       i_ce ) const;
+    void                Produce_byData_InterfaceBased(
+                           const client &       i_ce ) const;
+   private:
+    void                make_Navibar(
+                            const client &      i_ce ) const;
+};
+
+
+
+// IMPLEMENTATION
+
+extern const String
+    C_sCePrefix_Singleton;
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_siservice.cxx b/autodoc/source/display/idl/hfi_siservice.cxx
new file mode 100644
index 000000000000..7e36c79e07c1
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_siservice.cxx
@@ -0,0 +1,178 @@
+/* -*- 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 <precomp.h>
+#include "hfi_siservice.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/ik_function.hxx>
+#include <ary/idl/ik_siservice.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_linachain.hxx>
+#include <toolkit/hf_navi_sub.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_doc.hxx"
+#include "hfi_method.hxx"
+#include "hfi_navibar.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_env.hxx"
+#include "hi_linkhelper.hxx"
+
+
+
+namespace
+{
+
+const String
+    C_sImplementedInterface("Supported Interface");
+
+const String
+    C_sList_Constructors("Constructors' Summary");
+const String
+    C_sList_Constructors_Label("ConstructorsSummary");
+const String
+    C_sDetails_Constructors("Constructors' Details");
+const String
+    C_sDetails_Constructors_Label("ConstructorsDetails");
+
+
+enum E_SubListIndices
+{
+    sli_ConstructorsSummary = 0,
+    sli_ConstructorsDetails = 1
+};
+
+} //anonymous namespace
+
+
+HF_IdlSglIfcService::HF_IdlSglIfcService( Environment &         io_rEnv,
+                                          Xml::Element &        o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut)
+{
+}
+
+HF_IdlSglIfcService::~HF_IdlSglIfcService()
+{
+}
+
+typedef ::ary::idl::ifc_sglifcservice::attr SglIfcServiceAttr;
+
+void
+HF_IdlSglIfcService::Produce_byData( const client & i_ce ) const
+{
+    Dyn<HF_NaviSubRow>
+        pNaviSubRow( &make_Navibar(i_ce) );
+
+    HF_TitleTable
+        aTitle(CurOut());
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+
+    aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker);
+    produce_Title(aTitle, C_sCePrefix_Service, i_ce);
+
+    HF_DocEntryList
+        aTopList( aTitle.Add_Row() );
+    aTopList.Produce_Term(C_sImplementedInterface);
+
+    HF_IdlTypeText
+        aImplementedInterface( Env(), aTopList.Produce_Definition(), true, &i_ce);
+    aImplementedInterface.Produce_byData( SglIfcServiceAttr::BaseInterface(i_ce) );
+
+    CurOut() << new Html::HorizontalLine;
+
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+
+    dyn_ce_list
+        dpConstructors;
+    SglIfcServiceAttr::Get_Constructors(dpConstructors, i_ce);
+    if ( (*dpConstructors).operator bool() )
+    {
+        produce_Members( *dpConstructors,
+                         C_sList_Constructors,
+                         C_sList_Constructors_Label,
+                         C_sDetails_Constructors,
+                         C_sDetails_Constructors_Label );
+        pNaviSubRow->SwitchOn(sli_ConstructorsSummary);
+        pNaviSubRow->SwitchOn(sli_ConstructorsDetails);
+    }
+
+    pNaviSubRow->Produce_Row();
+    CurOut() << new Xml::XmlCode("<br>&nbsp;");
+}
+
+DYN HF_NaviSubRow &
+HF_IdlSglIfcService::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_CeMainRow(i_ce, true);
+
+    DYN HF_NaviSubRow &
+        ret = aNaviBar.Add_SubRow();
+    ret.AddItem(C_sList_Constructors, C_sList_Constructors_Label, false);
+    ret.AddItem(C_sDetails_Constructors, C_sDetails_Constructors_Label, false);
+
+    CurOut() << new Html::HorizontalLine();
+    return ret;
+}
+
+typedef ary::idl::ifc_function::attr    funcAttr;
+
+void
+HF_IdlSglIfcService::produce_MemberDetails( HF_SubTitleTable &  o_table,
+                                            const client &      i_ce ) const
+{
+    HF_IdlMethod
+        aConstructor( Env(),
+                      o_table.Add_Row()
+                            >> *new Html::TableCell
+                                << new Html::ClassAttr(C_sCellStyle_MDetail) );
+
+    ary::Dyn_StdConstIterator<ary::idl::Parameter>
+        pParameters;
+    funcAttr::Get_Parameters(pParameters, i_ce);
+
+    ary::Dyn_StdConstIterator<ary::idl::Type_id>
+        pExceptions;
+    funcAttr::Get_Exceptions(pExceptions, i_ce);
+
+    aConstructor.Produce_byData( i_ce.LocalName(),
+                                 funcAttr::ReturnType(i_ce),
+                                 *pParameters,
+                                 *pExceptions,
+                                 funcAttr::IsOneway(i_ce),
+                                 funcAttr::HasEllipse(i_ce),
+                                 i_ce );
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_siservice.hxx b/autodoc/source/display/idl/hfi_siservice.hxx
new file mode 100644
index 000000000000..e1953a93a1ca
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_siservice.hxx
@@ -0,0 +1,74 @@
+/* -*- 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 ADC_DISPLAY_HFI_SISERVICE_HXX
+#define ADC_DISPLAY_HFI_SISERVICE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_comrela.hxx>
+
+class HF_NaviSubRow;
+class HF_SubTitleTable;
+
+class HF_IdlSglIfcService : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlSglIfcService(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlSglIfcService();
+
+    void                Produce_byData(
+                           const client &       i_ce ) const;
+   private:
+    DYN HF_NaviSubRow & make_Navibar(
+                            const client &      i_ce ) const;
+
+    void                produce_MemberDetails(
+                            HF_SubTitleTable &  o_table,
+                            const client &      i_ce ) const;
+};
+
+
+
+// IMPLEMENTATION
+
+extern const String
+    C_sCePrefix_Service;
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_struct.cxx b/autodoc/source/display/idl/hfi_struct.cxx
new file mode 100644
index 000000000000..ada9d7618ca2
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_struct.cxx
@@ -0,0 +1,206 @@
+/* -*- 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 <precomp.h>
+#include "hfi_struct.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_struct.hxx>
+#include <ary/idl/ik_exception.hxx>
+#include <ary/idl/ik_struct.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_linachain.hxx>
+#include <toolkit/hf_navi_sub.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_navibar.hxx"
+#include "hfi_property.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_linkhelper.hxx"
+
+
+extern const String
+    C_sCePrefix_Struct("struct");
+extern const String
+    C_sCePrefix_Exception("exception");
+
+
+namespace
+{
+
+const String
+    C_sBaseStruct("Base Hierarchy");
+const String
+    C_sBaseException("Base Hierarchy");
+
+const String
+    C_sList_Elements("Elements' Summary");
+const String
+    C_sList_Elements_Label("Elements");
+
+const String
+    C_sList_ElementDetails("Elements' Details");
+const String
+    C_sList_ElementDetails_Label("ElementDetails");
+
+enum E_SubListIndices
+{
+    sli_ElementsSummary = 0,
+    sli_ElementsDetails = 1
+};
+
+}   // anonymous namespace
+
+
+
+HF_IdlStruct::HF_IdlStruct( Environment &         io_rEnv,
+                            Xml::Element &        o_rOut,
+                            bool                  i_bIsException )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut),
+        bIsException(i_bIsException)
+{
+}
+
+HF_IdlStruct::~HF_IdlStruct()
+{
+}
+
+void
+HF_IdlStruct::Produce_byData( const client & i_ce ) const
+{
+    const ary::idl::Struct *
+        pStruct =
+            bIsException
+                ?   0
+                :   static_cast< const ary::idl::Struct* >(&i_ce);
+    bool bIsTemplate =
+            pStruct != 0
+                ?   pStruct->TemplateParameterType().IsValid()
+                :   false;
+
+    Dyn<HF_NaviSubRow>
+        pNaviSubRow( &make_Navibar(i_ce) );
+
+    HF_TitleTable
+        aTitle(CurOut());
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+
+    aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker);
+
+    // Title:
+    StreamLock
+        slAnnotations(200);
+    get_Annotations(slAnnotations(), i_ce);
+
+    StreamLock rTitle(200);
+    if (bIsTemplate)
+        rTitle() << "template ";
+    rTitle()
+        << (bIsException
+            ?   C_sCePrefix_Exception
+            :   C_sCePrefix_Struct)
+        << " "
+        << i_ce.LocalName();
+    if (bIsTemplate)
+    {
+        csv_assert(pStruct != 0);
+        rTitle()
+            << "<"
+            << pStruct->TemplateParameter()
+            << ">";
+    }
+    aTitle.Produce_Title(slAnnotations().c_str(), rTitle().c_str());
+
+    // Bases:
+    produce_Bases( aTitle.Add_Row(),
+                   i_ce,
+                   bIsException
+                    ?   C_sBaseException
+                    :   C_sBaseStruct );
+
+    // Docu:
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+
+    // Elements:
+    dyn_ce_list
+        dpElements;
+    if (bIsException)
+        ary::idl::ifc_exception::attr::Get_Elements(dpElements, i_ce);
+    else
+        ary::idl::ifc_struct::attr::Get_Elements(dpElements, i_ce);
+
+    if ( (*dpElements).operator bool() )
+    {
+        produce_Members( *dpElements,
+                         C_sList_Elements,
+                         C_sList_Elements_Label,
+                         C_sList_ElementDetails,
+                         C_sList_ElementDetails_Label );
+        pNaviSubRow->SwitchOn(sli_ElementsSummary);
+        pNaviSubRow->SwitchOn(sli_ElementsDetails);
+    }
+    pNaviSubRow->Produce_Row();
+}
+
+HtmlFactory_Idl::type_id
+HF_IdlStruct::inq_BaseOf( const client & i_ce ) const
+{
+    return bIsException
+                ?   ary::idl::ifc_exception::attr::Base(i_ce)
+                :   ary::idl::ifc_struct::attr::Base(i_ce);
+}
+
+HF_NaviSubRow &
+HF_IdlStruct::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_CeMainRow(i_ce);
+
+    DYN HF_NaviSubRow &
+        ret = aNaviBar.Add_SubRow();
+    ret.AddItem(C_sList_Elements, C_sList_Elements_Label, false);
+    ret.AddItem(C_sList_ElementDetails, C_sList_ElementDetails_Label, false);
+
+    CurOut() << new Html::HorizontalLine();
+    return ret;
+}
+
+void
+HF_IdlStruct::produce_MemberDetails( HF_SubTitleTable &  o_table,
+                                     const client &      i_ce) const
+{
+    HF_IdlStructElement
+        aElement( Env(), o_table );
+    aElement.Produce_byData(i_ce);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_struct.hxx b/autodoc/source/display/idl/hfi_struct.hxx
new file mode 100644
index 000000000000..4c51a4c66c84
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_struct.hxx
@@ -0,0 +1,81 @@
+/* -*- 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 ADC_DISPLAY_HFI_STRUCT_HXX
+#define ADC_DISPLAY_HFI_STRUCT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+/** Is used to display ->ary::idl::Exception s as well as ->ary::idl::Struct s.
+*/
+class HF_IdlStruct : public HtmlFactory_Idl
+{
+  public:
+
+                        HF_IdlStruct(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut,
+                            bool                i_bIsException );
+    virtual             ~HF_IdlStruct();
+
+    void                Produce_byData(
+                            const client &      ce ) const;
+  private:
+    // Interface HtmlFactory_Idl:
+    virtual type_id     inq_BaseOf(
+                            const client &      i_ce ) const;
+    // Locals
+    HF_NaviSubRow &     make_Navibar(
+                            const client &      ce ) const;
+    virtual void        produce_MemberDetails(
+                            HF_SubTitleTable &  o_table,
+                            const client &      ce ) const;
+    // DATA
+    bool                bIsException;
+};
+
+
+
+// IMPLEMENTATION
+
+
+extern const String
+    C_sCePrefix_Struct;
+extern const String
+    C_sCePrefix_Exception;
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_tag.cxx b/autodoc/source/display/idl/hfi_tag.cxx
new file mode 100644
index 000000000000..a2b97a4b41ff
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_tag.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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_tag.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary_i/ci_text2.hxx>
+#include <ary_i/d_token.hxx>
+#include <toolkit/out_tree.hxx>
+#include <adc_cl.hxx>
+#include <adc_msg.hxx>
+#include "hfi_typetext.hxx"
+#include "hi_ary.hxx"
+#include "hi_env.hxx"
+#include "hi_linkhelper.hxx"
+
+
+using ary::inf::DocuTex2;
+
+
+inline void
+HF_IdlTag::Enter_TextOut( Xml::Element & o_rText ) const
+{
+    aTextOut.Out().Enter(o_rText);
+}
+
+inline void
+HF_IdlTag::Leave_TextOut() const
+{
+    aTextOut.Out().Leave();
+}
+
+inline void
+HF_IdlTag::PutText_Out( const ary::inf::DocuTex2 & i_rText ) const
+{
+    i_rText.DisplayAt( const_cast< HF_IdlDocuTextDisplay& >(aTextOut) );
+}
+
+
+
+HF_IdlTag::HF_IdlTag( Environment &                 io_rEnv,
+                      const ary::idl::CodeEntity &  i_rScopeGivingCe )
+    :   HtmlFactory_Idl( io_rEnv, 0 ),
+        pTitleOut(0),
+        aTextOut(io_rEnv, 0, i_rScopeGivingCe)
+{
+}
+
+HF_IdlTag::~HF_IdlTag()
+{
+}
+
+void
+HF_IdlTag::Produce_byData( Xml::Element &              o_rTitle,
+                           Xml::Element &              o_rText,
+                           const ary::inf::AtTag2 &   i_rTag ) const
+{
+    pTitleOut = &o_rTitle;
+    Enter_TextOut(o_rText);
+    i_rTag.DisplayAt( const_cast< HF_IdlTag& >(*this) );
+    Leave_TextOut();
+}
+
+void
+HF_IdlTag::Produce_byData( Xml::Element &      o_rTitle,
+                           Xml::Element &      o_rText,
+                           const std::vector< csi::dsapi::DT_SeeAlsoAtTag* > &
+                                                i_seeAlsoVector ) const
+{
+    o_rTitle << "See also";
+    for ( std::vector< csi::dsapi::DT_SeeAlsoAtTag* >::const_iterator
+            it = i_seeAlsoVector.begin();
+          it != i_seeAlsoVector.end();
+          ++it )
+    {
+        if (it != i_seeAlsoVector.begin())
+        {
+            o_rText << ", ";
+        }
+        HF_IdlTypeText
+            aLinkText(Env(), o_rText, true, &aTextOut.ScopeGivingCe());
+        aLinkText.Produce_byData( (*it)->LinkText() );
+    }
+}
+
+void
+HF_IdlTag::Display_StdAtTag( const csi::dsapi::DT_StdAtTag & i_rTag )
+{
+    if ( i_rTag.Text().IsEmpty() )
+        return;
+
+    csv_assert( pTitleOut != 0 );
+    *pTitleOut << i_rTag.Title();
+    PutText_Out( i_rTag.Text() );
+}
+
+void
+HF_IdlTag::Display_SeeAlsoAtTag( const csi::dsapi::DT_SeeAlsoAtTag & i_rTag )
+{
+    if ( i_rTag.Text().IsEmpty() )
+        return;
+
+    csv_assert( pTitleOut != 0 );
+    *pTitleOut << "See also";
+
+    HF_IdlTypeText aLinkText(Env(),aTextOut.CurOut(),true, &aTextOut.ScopeGivingCe());
+    aLinkText.Produce_byData( i_rTag.LinkText() );
+
+    aTextOut.CurOut() << new Html::LineBreak;
+    PutText_Out( i_rTag.Text() );
+}
+
+void
+HF_IdlTag::Display_ParameterAtTag( const csi::dsapi::DT_ParameterAtTag & i_rTag )
+{
+    csv_assert( pTitleOut != 0 );
+    StreamLock sl(100);
+    *pTitleOut
+        << ( sl() << "Parameter " << i_rTag.Title() << c_str );
+    PutText_Out( i_rTag.Text() );
+}
+
+void
+HF_IdlTag::Display_SinceAtTag( const csi::dsapi::DT_SinceAtTag & i_rTag )
+{
+    csv_assert(pTitleOut != 0);
+
+    if ( i_rTag.Text().IsEmpty() )
+    {
+         return;
+    }
+
+    // Transform the value of the @since tag into the text to be displayed.
+    String sDisplay =
+        autodoc::CommandLine::Get_().DisplayOf_SinceTagValue(
+                                        i_rTag.Text().TextOfFirstToken() );
+    if (sDisplay.empty())
+        return;
+
+    *pTitleOut << "Since ";
+    DocuTex2 aHelp;
+    aHelp.AddToken(* new csi::dsapi::DT_TextToken(sDisplay));
+    PutText_Out(aHelp);
+}
+
+
+//********************      HF_IdlShortDocu     *********************/
+
+HF_IdlShortDocu::HF_IdlShortDocu( Environment &         io_rEnv,
+                                  Xml::Element &        o_rOut )
+    :   HtmlFactory_Idl( io_rEnv, &o_rOut )
+{
+}
+
+HF_IdlShortDocu::~HF_IdlShortDocu()
+{
+}
+
+void
+HF_IdlShortDocu::Produce_byData( const ary::idl::CodeEntity & i_rCe )
+{
+    const ce_info *
+        pDocu = Get_IdlDocu(i_rCe.Docu());
+    if (pDocu == 0)
+        return;
+
+    const ce_info &
+        rDocu = *pDocu;
+    if ( rDocu.IsDeprecated() )
+    {
+        CurOut()
+            >> *new Html::Bold
+                << "[ DEPRECATED ]" << new Html::LineBreak;
+    }
+    if ( rDocu.IsOptional() )
+    {
+        CurOut()
+            >> *new Html::Bold
+                << "[ OPTIONAL ]" << new Html::LineBreak;
+    }
+
+    HF_IdlDocuTextDisplay
+        aText( Env(), &CurOut(), i_rCe);
+    rDocu.Short().DisplayAt(aText);
+}
+
+
+//********************      HF_IdlDocuTextDisplay       *********************/
+
+
+HF_IdlDocuTextDisplay::HF_IdlDocuTextDisplay( Environment &                 io_rEnv,
+                                              Xml::Element *                o_pOut,
+                                              const ary::idl::CodeEntity &  i_rScopeGivingCe )
+    :   HtmlFactory_Idl(io_rEnv, o_pOut),
+        sScope(),
+        sLinkToken(),
+        bGatherLink(false),
+        pScopeGivingCe(&i_rScopeGivingCe)
+{
+}
+
+HF_IdlDocuTextDisplay::~HF_IdlDocuTextDisplay()
+{
+}
+
+void
+HF_IdlDocuTextDisplay::Display_TextToken( const csi::dsapi::DT_TextToken & i_rToken )
+{
+    if (bGatherLink)
+    {
+        if (sLinkToken.length() == 0)
+        {
+            sLinkToken = i_rToken.GetText();
+            return;
+        }
+        else
+        {
+            if ( pScopeGivingCe == 0 )
+            {   // only in original file
+                TheMessages().Out_TypeVsMemberMisuse(sLinkToken, Env().CurPageCe_AsText(), 0);
+            }
+
+            StopLinkGathering();
+        }
+    }   // endif (bGatherLink)
+
+    CurOut() << new Xml::XmlCode( i_rToken.GetText() );
+}
+
+void
+HF_IdlDocuTextDisplay::Display_White()
+{
+    CurOut() << " ";
+}
+
+void
+HF_IdlDocuTextDisplay::Display_MupType( const csi::dsapi::DT_MupType & i_rToken )
+{
+    if (i_rToken.IsBegin())
+    {
+        StartLinkGathering(i_rToken.Scope());
+    }
+    else
+    {
+        if (bGatherLink)
+        {
+            CreateTypeLink();
+            StopLinkGathering();
+        }
+    }
+}
+
+void
+HF_IdlDocuTextDisplay::Display_MupMember( const csi::dsapi::DT_MupMember & i_rToken )
+{
+    if (i_rToken.IsBegin())
+    {
+        StartLinkGathering(i_rToken.Scope());
+    }
+    else
+    {
+        if (bGatherLink)
+        {
+            CreateMemberLink();
+            StopLinkGathering();
+        }
+    }
+}
+
+void
+HF_IdlDocuTextDisplay::Display_MupConst( const csi::dsapi::DT_MupConst & i_rToken )
+{
+    CurOut()
+        >> *new Html::Bold
+           << i_rToken.GetText();
+}
+
+void
+HF_IdlDocuTextDisplay::Display_Style( const csi::dsapi::DT_Style & i_rToken )
+{
+    CurOut() << new Xml::XmlCode( i_rToken.GetText() );
+}
+
+void
+HF_IdlDocuTextDisplay::Display_EOL()
+{
+    CurOut() << "\n";
+}
+
+void
+HF_IdlDocuTextDisplay::CreateTypeLink()
+{
+    if (strchr(sLinkToken,':') != 0)
+    {
+        TheMessages().Out_TypeVsMemberMisuse(sLinkToken, Env().CurPageCe_AsFile(".idl"), 0);
+        CurOut() << sLinkToken;
+        return;
+    }
+    HF_IdlTypeText aLink(Env(), CurOut(), true, &ScopeGivingCe());
+    aLink.Produce_LinkInDocu(sScope, sLinkToken, String::Null_());
+}
+
+void
+HF_IdlDocuTextDisplay::CreateMemberLink()
+{
+
+    HF_IdlTypeText aLink(Env(), CurOut(), true, &ScopeGivingCe());
+
+    const char *
+        sSplit = strchr(sLinkToken,':');
+
+    if (sSplit != 0)
+    {
+        String sCe(sLinkToken.c_str(), sSplit - sLinkToken.c_str());
+        String sMember(sSplit+2);
+
+        if (NOT sScope.empty() OR ScopeGivingCe().LocalName() != sCe )
+            aLink.Produce_LinkInDocu(sScope, sCe, sMember);
+        else
+            aLink.Produce_LocalLinkInDocu(sMember);
+    }
+    else
+    {
+        aLink.Produce_LocalLinkInDocu(sLinkToken);
+    }
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_tag.hxx b/autodoc/source/display/idl/hfi_tag.hxx
new file mode 100644
index 000000000000..ed247bf27a4a
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_tag.hxx
@@ -0,0 +1,180 @@
+/* -*- 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 ADC_DISPLAY_HFI_TAG_HXX
+#define ADC_DISPLAY_HFI_TAG_HXX
+
+// BASE CLASSES
+#include "hi_factory.hxx"
+#include <ary_i/disdocum.hxx>
+// USED SERVICES
+#include <ary/idl/i_types4idl.hxx>
+#include <ary_i/ci_atag2.hxx>
+#include <ary_i/ci_text2.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+
+#include <toolkit/hf_docentry.hxx>
+
+namespace ary
+{
+namespace idl
+{
+    class Module;
+}
+}
+
+
+
+
+/** This class is an implementation of ary::inf::DocuText_Display
+    and will be used by that interface.
+*/
+class HF_IdlDocuTextDisplay : public HtmlFactory_Idl,
+                              public ary::inf::DocuText_Display
+{
+  public:
+                        HF_IdlDocuTextDisplay(
+                            Environment  &      io_rEnv,
+                            Xml::Element *      o_pOut,
+                            const ary::idl::CodeEntity &
+                                                i_rScopeGivingCe );
+    virtual             ~HF_IdlDocuTextDisplay();
+
+    const ary::idl::CodeEntity &
+                        ScopeGivingCe() const { return *pScopeGivingCe; }
+  private:
+    virtual void        Display_TextToken(
+                            const csi::dsapi::DT_TextToken &
+                                                i_rToken );
+    virtual void        Display_White();
+
+    virtual void        Display_MupType(
+                            const csi::dsapi::DT_MupType &
+                                                i_rToken );
+    virtual void        Display_MupMember(
+                            const csi::dsapi::DT_MupMember &
+                                                i_rToken );
+    virtual void        Display_MupConst(
+                            const csi::dsapi::DT_MupConst &
+                                                i_rToken );
+    virtual void        Display_Style(
+                            const csi::dsapi::DT_Style &    i_rToken );
+    virtual void        Display_EOL();
+
+    // Local
+    void                StartLinkGathering(
+                            const String &      i_sScope )
+                                                { sLinkToken = ""; sScope = i_sScope; bGatherLink = true; }
+    void                StopLinkGathering()     { bGatherLink = false; }
+    /** @precond
+        The scope is in sScope, the name is in sLinkToken.
+    */
+    void                CreateTypeLink();
+    /** @precond
+        The scope is in sScope, the qualified member-name is in sLinkToken.
+    */
+    void                CreateMemberLink();
+
+    // DATA
+    String              sScope;
+    String              sLinkToken;
+    bool                bGatherLink;
+    const ary::idl::CodeEntity *
+                        pScopeGivingCe;
+};
+
+
+
+class HF_IdlShortDocu : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlShortDocu(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlShortDocu();
+
+    void                Produce_byData(
+                            const ary::idl::CodeEntity &
+                                                i_rCe );
+};
+
+
+
+class HF_IdlTag : public HtmlFactory_Idl,
+                  public ary::inf::DocuTag_Display
+{
+  public:
+                        HF_IdlTag(
+                            Environment &       io_rEnv,
+                            const ary::idl::CodeEntity &
+                                                i_rScopeGivingCe );
+    virtual             ~HF_IdlTag();
+
+    void                Produce_byData(
+                            Xml::Element &      o_rTitle,
+                            Xml::Element &      o_rText,
+                            const ary::inf::AtTag2 &
+                                                i_rTag ) const;
+    void                Produce_byData(
+                            Xml::Element &      o_rTitle,
+                            Xml::Element &      o_rText,
+                            const std::vector< csi::dsapi::DT_SeeAlsoAtTag* > &
+                                                i_seeAlsoVector ) const;
+  private:
+    virtual void        Display_StdAtTag(
+                            const csi::dsapi::DT_StdAtTag &
+                                                i_rToken );
+    virtual void        Display_SeeAlsoAtTag(
+                            const csi::dsapi::DT_SeeAlsoAtTag &
+                                                i_rToken );
+    virtual void        Display_ParameterAtTag(
+                            const csi::dsapi::DT_ParameterAtTag &
+                                                i_rToken );
+    virtual void        Display_SinceAtTag(
+                            const csi::dsapi::DT_SinceAtTag &
+                                                i_rToken );
+
+    void                Enter_TextOut(
+                            Xml::Element &      o_rText ) const;
+    void                Leave_TextOut() const;
+    void                PutText_Out(
+                            const ary::inf::DocuTex2 &
+                                                i_rText ) const;
+    // DATA
+    mutable Xml::Element *
+                        pTitleOut;
+    mutable HF_IdlDocuTextDisplay
+                        aTextOut;
+};
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_typedef.cxx b/autodoc/source/display/idl/hfi_typedef.cxx
new file mode 100644
index 000000000000..b1b717572b65
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_typedef.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_typedef.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/ik_typedef.hxx>
+#include <toolkit/hf_docentry.hxx>
+#include <toolkit/hf_linachain.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_navibar.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_linkhelper.hxx"
+
+
+
+HF_IdlTypedef::HF_IdlTypedef( Environment &         io_rEnv,
+                              Xml::Element &        o_rOut )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut)
+{
+}
+
+HF_IdlTypedef::~HF_IdlTypedef()
+{
+}
+
+typedef ary::idl::ifc_typedef::attr TypedefAttr;
+
+void
+HF_IdlTypedef::Produce_byData( const client & i_ce ) const
+{
+    make_Navibar(i_ce);
+
+    HF_TitleTable
+        aTitle(CurOut());
+
+    HF_LinkedNameChain
+        aNameChain(aTitle.Add_Row());
+
+    aNameChain.Produce_CompleteChain(Env().CurPosition(), nameChainLinker);
+    produce_Title(aTitle, C_sCePrefix_Typedef, i_ce);
+
+    HF_DocEntryList
+        aTopList( aTitle.Add_Row() );
+    aTopList.Produce_Term("Defining Type");
+
+    HF_IdlTypeText
+        aDefinition( Env(), aTopList.Produce_Definition(), true );
+    aDefinition.Produce_byData( TypedefAttr::DefiningType(i_ce) );
+
+    CurOut() << new Html::HorizontalLine;
+
+    write_Docu(aTitle.Add_Row(), i_ce);
+    CurOut() << new Html::HorizontalLine();
+}
+
+void
+HF_IdlTypedef::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_CeMainRow(i_ce);
+
+    CurOut() << new Html::HorizontalLine();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_typedef.hxx b/autodoc/source/display/idl/hfi_typedef.hxx
new file mode 100644
index 000000000000..3ef08d494fe4
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_typedef.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 ADC_DISPLAY_HFI_TYPEDEF_HXX
+#define ADC_DISPLAY_HFI_TYPEDEF_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+
+class HF_IdlTypedef : public HtmlFactory_Idl
+{
+  public:
+                        HF_IdlTypedef(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_IdlTypedef();
+
+    void                Produce_byData(
+                            const client &      ce ) const;
+  private:
+    void                make_Navibar(
+                            const client &      ce ) const;
+};
+
+
+
+// IMPLEMENTATION
+
+
+const String
+    C_sCePrefix_Typedef("typedef");
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_typetext.cxx b/autodoc/source/display/idl/hfi_typetext.cxx
new file mode 100644
index 000000000000..574de30374d2
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_typetext.cxx
@@ -0,0 +1,760 @@
+/* -*- 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 <precomp.h>
+#include "hfi_typetext.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <string.h>
+#include <ary/idl/i_type.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/ik_ce.hxx>
+#include <adc_cl.hxx>
+#include <adc_msg.hxx>
+#include "hi_linkhelper.hxx"
+
+
+
+
+
+
+inline const ary::idl::Module *
+HF_IdlTypeText::referingModule() const
+{
+    if (pReferingCe == 0)
+        return Env().Linker().Search_CurModule();
+    else
+        return &Env().Data().Find_Module(pReferingCe->NameRoom());
+}
+
+inline const HF_IdlTypeText::client *
+HF_IdlTypeText::referingCe() const
+{
+    return pReferingCe;
+}
+
+
+HF_IdlTypeText::HF_IdlTypeText( Environment &       io_rEnv,
+                                Xml::Element &      o_rOut,
+                                bool                i_bWithLink,
+                                const client *      i_pScopeGivingCe )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut),
+        pReferingCe( i_pScopeGivingCe ),
+        bWithLink(i_bWithLink)
+{
+}
+
+HF_IdlTypeText::HF_IdlTypeText( Environment &       io_rEnv,
+                                E_Index             )
+    :   HtmlFactory_Idl(io_rEnv, 0),
+        pReferingCe( 0 ),
+        bWithLink(true)
+{
+}
+
+HF_IdlTypeText::~HF_IdlTypeText()
+{
+}
+
+void
+HF_IdlTypeText::Produce_byData(ary::idl::Type_id i_idType) const
+{
+    StringVector        aModule_;
+    String              sName;
+    ce_id               nCe;
+    int                 nSequenceCount = 0;
+    csv::erase_container(aModule_);
+
+    const ary::idl::Type &
+        rType = Env().Data().Find_Type(i_idType);
+    Env().Data().Get_TypeText(aModule_, sName, nCe, nSequenceCount, rType);
+
+    if ( Env().Data().IsBuiltInOrRelated(rType) )
+    {
+        produce_BuiltIn(sName,nSequenceCount);
+    }
+    else
+    {
+        produce_FromStd( aModule_,
+                         sName,
+                         String::Null_(),
+                         nSequenceCount,
+                         (nCe.IsValid() ? exists_yes : exists_no),
+                         rType.FirstEnclosedNonSequenceType(Env().Gate()).TemplateParameters() );
+    }
+}
+
+void
+HF_IdlTypeText::Produce_byData( ary::idl::Ce_id i_idCe ) const
+{
+    StringVector        aModule_;
+    String              sCe;
+    String              sMember;
+    csv::erase_container(aModule_);
+
+    const ary::idl::CodeEntity &
+        rCe = Env().Data().Find_Ce(i_idCe);
+    Env().Data().Get_CeText(aModule_, sCe, sMember, rCe);
+    produce_FromStd(aModule_, sCe, sMember, 0, exists_yes);
+}
+
+void
+HF_IdlTypeText::Produce_byData( const String & i_sFullName ) const
+{
+    if ( strncmp(i_sFullName,"http://", 7) == 0 )
+    {
+        CurOut()
+            >> *new Html::Link(i_sFullName)
+                << i_sFullName;
+        return;
+    }
+
+    StringVector        aModule_;
+    String              sCe,
+                        sMember;
+    int                 nSequence = 0;
+    String              sTypeText;
+    csv::erase_container(aModule_);
+
+    const ary::idl::Module *
+        pScopeModule = referingModule();
+    if (pScopeModule == 0)
+    {
+        // SYNTAX_ERR, but rather logical error: Missing module.
+        CurOut() << i_sFullName;
+        // KORR_FUTURE
+        // How to put a message about this?
+        // errorOut_UnresolvedLink(i_sFullName);
+        return;
+    }
+
+    const char * sTypeStart = strrchr(i_sFullName,'<');
+    if ( sTypeStart != 0 )
+    {
+        const char * sTypeEnd = strchr(i_sFullName,'>');
+        if (sTypeEnd == 0)
+        {   // SYNTAX_ERR
+            CurOut() << i_sFullName;
+            // KORR_FUTURE
+            // How to put a message about this?
+            // errorOut_UnresolvedLink(i_sFullName);
+            return;
+        }
+
+        nSequence = count_Sequences(i_sFullName);
+        sTypeStart++;
+        sTypeText.assign(sTypeStart, sTypeEnd-sTypeStart);
+    }
+    else
+    {
+        sTypeText = i_sFullName;
+    }
+
+    csv::erase_container(aModule_);
+    bool bFound =   // KORR : Check the semantics of this, see if ce really exists, if it is a member?
+        Env().Data().Search_Ce( aModule_,
+                                sCe,sMember,
+                                sTypeText,
+                                *pScopeModule );
+    if (NOT bFound)
+    {
+        if ( strchr(sTypeText,':') == 0
+             AND
+             *sTypeText.c_str() != 'X' )    // This is a HACK, make this correct!
+        {
+            Produce_LocalLinkInDocu(sTypeText);
+            return;
+        }
+        CurOut() << i_sFullName;
+        // KORR
+        // How to put a message about this?
+        // errorOut_UnresolvedLink(i_sFullName);
+        return;
+    }
+
+    produce_FromStd(aModule_, sCe, sMember, nSequence, exists_yes);
+}
+
+void
+HF_IdlTypeText::Produce_LinkInDocu( const String &      i_scope,
+                                    const String &      i_name,
+                                    const String &      i_member ) const
+{
+    StringVector        aModule_;
+    String              sName;
+    csv::erase_container(aModule_);
+
+    const ary::idl::Module *
+        pScopeModule = referingModule();
+    if (pScopeModule == 0)
+    {
+        // SYNTAX_ERR, but rather logical error: Missing module.
+        CurOut() << i_scope << "::" << i_name;
+        if (NOT i_member.empty())
+            CurOut() << "::" << i_member;
+        return;
+    }
+
+    bool
+        bFound = Env().Data().Search_CesModule( aModule_,
+                                                i_scope,
+                                                i_name,
+                                                *pScopeModule );
+    if (NOT bFound)
+    {
+        CurOut() << i_scope << "::" << i_name;
+        if (NOT i_member.empty())
+            CurOut() << "::" << i_member;
+        return;
+    }
+    produce_FromStd(aModule_, i_name, i_member, 0, exists_yes);
+}
+
+void
+HF_IdlTypeText::Produce_LocalLinkInDocu( const String & i_member ) const
+{
+    StringVector        aModule_;
+    String              sName;
+    csv::erase_container(aModule_);
+
+    csv_assert(referingCe() != 0);
+    if ( referingModule() == Env().Linker().Search_CurModule() )
+    {
+        StreamLock slLink(200);
+        if (referingCe()->SightLevel() == ary::idl::sl_Member)
+        {
+            slLink() << "#" << i_member;
+        }
+        else
+        {
+            slLink() << referingCe()->LocalName()
+                     << ".html#"
+                     << i_member;
+        }
+        CurOut()
+            >> *new Html::Link(slLink().c_str())
+               << i_member;
+        return;
+    }
+
+    String sDummyMember;
+    Env().Data().Get_CeText(aModule_, sName, sDummyMember, *referingCe());
+    produce_FromStd(aModule_, sName, i_member, 0, exists_yes);
+}
+
+void
+HF_IdlTypeText::Produce_IndexLink( Xml::Element &   o_out,
+                                   const client &   i_ce ) const
+{
+    StringVector        aModule_;
+    String              sCe;
+    String              sMember;
+    csv::erase_container(aModule_);
+
+    Out().Enter(o_out);
+
+    Env().Data().Get_CeText(aModule_, sCe, sMember, i_ce);
+    produce_IndexLink(aModule_, sCe, sMember, false);
+
+    Out().Leave();
+}
+
+void
+HF_IdlTypeText::Produce_IndexOwnerLink( Xml::Element &  o_out,
+                                        const client &  i_owner ) const
+{
+    StringVector        aModule_;
+    String              sCe;
+    String              sMember;
+    csv::erase_container(aModule_);
+
+    Out().Enter(o_out);
+
+    if (i_owner.Owner().IsValid())
+    {
+        Env().Data().Get_CeText(aModule_, sCe, sMember, i_owner);
+        produce_IndexLink(aModule_, sCe, sMember, true);
+    }
+    else
+    {   // global namespace:
+
+        CurOut()
+            << "."
+            >> *new Html::Link("../module-ix.html")
+               << "global namespace";
+    }
+
+
+    Out().Leave();
+}
+
+void
+HF_IdlTypeText::Produce_IndexSecondEntryLink( Xml::Element &      o_out,
+                                              const client &      i_ce ) const
+{
+    StringVector        aModule_;
+    String              sCe;
+    String              sMember;
+    csv::erase_container(aModule_);
+
+    Out().Enter(o_out);
+
+    Env().Data().Get_CeText(aModule_, sCe, sMember, i_ce);
+    produce_IndexLink(aModule_, sCe, sMember, true);
+    Out().Leave();
+}
+
+
+void
+HF_IdlTypeText::produce_FromStd( const StringVector & i_module,
+                                 const String &       i_ce,
+                                 const String &       i_member,
+                                 int                  i_sequenceCount,
+                                 E_Existence          i_ceExists,
+                                 const std::vector<ary::idl::Type_id> *
+                                                      i_templateParameters ) const
+{
+    if (i_ceExists == exists_no)
+    {
+        if ( is_ExternLink(i_module) )
+        {
+            produce_ExternLink(i_module,i_ce,i_member,i_sequenceCount,i_templateParameters);
+            return;
+        }
+        errorOut_UnresolvedLink(i_module, i_ce, i_member);
+    }
+
+    output::Node &
+        rCeNode = Env().OutputTree().Provide_Node(i_module);
+    output::Position
+        aTargetPos(rCeNode);
+    bool
+        bShowModule = rCeNode != Env().CurPosition().RelatedNode()
+                            ?   i_module.size() > 0
+                            :   false;
+    bool
+        bUseMember = NOT i_member.empty();
+    bool
+        bLink2Module = i_ceExists == exists_yes;
+    bool
+        bLink2Ce = i_ceExists == exists_yes;
+    bool
+        bLink2Member = NOT Env().Is_MemberExistenceCheckRequired()
+                       AND i_ceExists == exists_yes;
+    bool
+        bHasCeOrName = NOT i_ce.empty();
+
+    if (i_sequenceCount > 0)
+        start_Sequence(i_sequenceCount);
+
+    StreamLock  aLink(300);
+    StreamStr & rLink = aLink();
+
+    // Produce output: module
+    if (bShowModule)
+    {
+        int nMax = i_module.size() - 1;
+        int nCount = 0;
+        StringVector::const_iterator
+            itm = i_module.begin();
+        for ( ;
+              nCount < nMax;
+              ++itm, ++nCount )
+        {
+            CurOut() << "::" << *itm;
+        }
+
+        CurOut() << "::";
+        if (bLink2Module)
+        {
+            aTargetPos.Set_File(output::ModuleFileName());
+            Env().Linker().Get_Link2Position(rLink, aTargetPos);
+            CurOut()
+                >> *new Html::Link( rLink.c_str() )
+                    << *itm;
+            rLink.reset();
+        }
+        else
+        {
+            CurOut() << *itm;
+        }
+
+        if (bHasCeOrName)
+            CurOut() << "::";
+    }   // end if (bShowModule)
+
+    // CodeEntity and member:
+    aTargetPos.Set_File( rLink << i_ce << ".html" << c_str );
+    rLink.reset();
+
+    if (bHasCeOrName)
+    {
+        if (bLink2Ce)
+        {
+            Env().Linker().Get_Link2Position(rLink, aTargetPos);
+            CurOut()
+                >> *new Html::Link(rLink.c_str())
+                    << i_ce;
+            rLink.reset();
+        }
+        else
+        {
+            CurOut() << i_ce;
+        }
+
+        if (i_templateParameters != 0)
+            write_TemplateParameterList(*i_templateParameters);
+
+        if (bUseMember)
+        {
+            CurOut() << "::";
+
+            if (bLink2Member)
+            {
+                bool bFunction = strstr(i_member,"()") != 0;
+                String sMember( i_member );
+                if (bFunction)
+                    sMember.assign(i_member.c_str(), sMember.length()-2);
+
+                Env().Linker().Get_Link2Member(rLink, aTargetPos, sMember);
+                CurOut()
+                    >> *new Html::Link(rLink.c_str())
+                        << i_member;
+                rLink.reset();
+            }
+            else
+            {
+                CurOut()
+                    << i_member;
+            }
+        }   // endif (bUseMember)
+    }   // endif (bHasCeOrName)
+
+    if (i_sequenceCount > 0)
+        finish_Sequence(i_sequenceCount);
+}
+
+void
+HF_IdlTypeText::produce_BuiltIn( const String &      i_type,
+                                 int                 i_sequenceCount ) const
+{
+    if (i_sequenceCount > 0)
+        start_Sequence(i_sequenceCount);
+    CurOut() << i_type;
+    if (i_sequenceCount > 0)
+        finish_Sequence(i_sequenceCount);
+}
+
+void
+HF_IdlTypeText::produce_IndexLink( const StringVector & i_module,
+                                   const String &       i_ce,
+                                   const String &       i_member,
+                                   bool                 i_bIsOwner ) const
+{
+    output::Node &
+        rCeNode = Env().OutputTree().Provide_Node(i_module);
+    output::Position
+        aTargetPos(rCeNode);
+    bool
+        bShowModule = i_bIsOwner OR (i_module.size() > 0 AND i_ce.empty());
+    bool
+        bShowNonModule = NOT bShowModule OR (i_bIsOwner AND NOT i_ce.empty());
+    bool
+        bUseMember = NOT i_member.empty();
+
+    StreamLock  aLink(300);
+    StreamStr & rLink = aLink();
+
+    // Produce output: module
+    if (bShowModule)
+    {
+        if (i_bIsOwner)
+        {
+            int nMax = bShowNonModule ? i_module.size() : i_module.size() - 1;
+            int nCount = 0;
+            for ( StringVector::const_iterator itm = i_module.begin();
+                  nCount < nMax;
+                  ++itm, ++nCount )
+            {
+                CurOut() << "::" << *itm;
+            }
+            CurOut() << ":: .";
+        }
+
+        if (NOT bShowNonModule)
+        {
+            aTargetPos.Set_File(output::ModuleFileName());
+            Env().Linker().Get_Link2Position(rLink, aTargetPos);
+            CurOut()
+                >> *new Html::Link( rLink.c_str() )
+                    >> *new Html::Bold
+                        << i_module.back();
+            rLink.reset();
+        }
+    }   // end if (bShowModule)
+
+    if (bShowNonModule)
+    {
+        aTargetPos.Set_File( rLink << i_ce << ".html" << c_str );
+        rLink.reset();
+
+        if (bUseMember)
+        {
+            bool bFunction = strstr(i_member,"()") != 0;
+            String sMember( i_member );
+            if (bFunction)
+                sMember.assign(i_member.c_str(), sMember.length()-2);
+            Env().Linker().Get_Link2Member(rLink, aTargetPos, sMember);
+            CurOut()
+                >> *new Html::Link(rLink.c_str())
+                    >> *new Html::Bold
+                        << i_member;
+            rLink.reset();
+        }
+        else
+        {
+            Env().Linker().Get_Link2Position(rLink, aTargetPos);
+            if (i_bIsOwner)
+            {
+                CurOut()
+                    >> *new Html::Link(rLink.c_str())
+                       << i_ce;
+            }
+            else
+            {
+                CurOut()
+                    >> *new Html::Link(rLink.c_str())
+                           >> *new Html::Bold
+                            << i_ce;
+            }
+            rLink.reset();
+        }
+    }   // endif (bHasCeOrName)
+}
+
+int
+HF_IdlTypeText::count_Sequences( const char * i_sFullType ) const
+{
+    int ret = 0;
+
+    for ( const char * pCount = i_sFullType;
+          *pCount != 0;
+           )
+    {
+        pCount = strstr(pCount,"sequence");
+        if (pCount != 0)
+        {
+            pCount += sizeof("sequence");   // = strlen(sequence) + 1 for '<'.
+            if ( *(pCount-1) == '\0' )
+            {
+                // SYNTAX_ERR
+                return 0;
+            }
+            ++ret;
+        }
+    }   // end for
+
+    return ret;
+}
+
+void
+HF_IdlTypeText::start_Sequence( int i_count ) const
+{
+    csv_assert( i_count > 0 );
+    for (int i = 0; i < i_count; ++i )
+    {
+        CurOut() << "sequence< ";
+    }
+}
+
+void
+HF_IdlTypeText::finish_Sequence( int i_count ) const
+{
+    csv_assert( i_count > 0 );
+    for (int i = 0; i < i_count; ++i )
+    {
+        CurOut() << " >";
+    }
+}
+
+void
+HF_IdlTypeText::errorOut_UnresolvedLink( const char *        i_name ) const
+{
+    StreamLock slFile(1000);
+
+    // KORR
+    // Handle links in cited documentation from other entities.
+    slFile() << Env().CurPageCe_AsText();
+    slFile().pop_back(5);
+    slFile() << ".idl";
+
+    // KORR
+    // Retrieve, correct line number.
+    TheMessages().Out_UnresolvedLink( i_name,
+                                      slFile().c_str(),
+                                      0 );
+}
+
+void
+HF_IdlTypeText::errorOut_UnresolvedLink( const StringVector & i_module,
+                                         const String &       i_ce,
+                                         const String &       i_member ) const
+{
+    StreamLock slName(500);
+
+    if (i_module.size() > 0)
+    {
+        slName().operator_join(i_module.begin(), i_module.end(), "::");
+         if (NOT i_ce.empty())
+            slName() << "::";
+    }
+    if (NOT i_ce.empty())
+    {
+        slName() << i_ce;
+        if (NOT i_member.empty())
+            slName() << "::" << i_member;
+    }
+    errorOut_UnresolvedLink(slName().c_str());
+}
+
+bool
+HF_IdlTypeText::is_ExternLink( const StringVector & i_module ) const
+{
+    const autodoc::CommandLine &
+        rCmdLine = autodoc::CommandLine::Get_();
+    uintt nExtNspLength = rCmdLine.ExternNamespace().length();
+    if (nExtNspLength == 0)
+        return false;
+
+    StreamStr s(1000);
+    s << "::";
+    s.operator_join( i_module.begin(),
+                     i_module.end(),
+                     "::" );
+
+    if (s.length() < nExtNspLength)
+        return false;
+    return ( strncmp( rCmdLine.ExternNamespace().c_str(),
+                      s.c_str(),
+                      nExtNspLength ) == 0 );
+}
+
+void
+HF_IdlTypeText::produce_ExternLink( const StringVector & i_module,
+                                    const String &       i_ce,
+                                    const String &       i_member,
+                                    int                  i_sequenceCount,
+                                    const std::vector<ary::idl::Type_id> *
+                                                         i_templateParameters ) const
+{
+    // KORR
+    // Look again at this code and take some time.
+
+    StreamLock  aLink(1000);
+    StreamStr & rLink = aLink();
+
+    rLink << autodoc::CommandLine::Get_().ExternRoot();
+    rLink.operator_join( i_module.begin(),
+                         i_module.end(),
+                         "/" );
+    rLink << '/'
+          << i_ce
+          << ".html";
+    if (i_member.length() > 0)
+        rLink << "/#" << i_member;
+
+    if (i_sequenceCount > 0)
+        start_Sequence(i_sequenceCount);
+
+    // module
+    int nMax = i_module.size();
+    int nCount = 0;
+    StringVector::const_iterator
+        itm = i_module.begin();
+    for ( ;
+          nCount < nMax;
+          ++itm, ++nCount )
+    {
+        CurOut() << "::" << *itm;
+    }
+    CurOut() << "::";
+
+
+    // CodeEntity
+    if (i_member.length() == 0)
+    {
+        CurOut()
+           >> *new Html::Link(rLink.c_str())
+              << i_ce;
+    }
+    else
+    {
+        CurOut()
+            << i_ce;
+    }
+
+    if (i_templateParameters != 0)
+        write_TemplateParameterList(*i_templateParameters);
+
+    // Member
+    if (i_member.length() > 0)
+    {
+        CurOut()
+            >> *new Html::Link(rLink.c_str())
+                << i_member;
+    }
+
+    if (i_sequenceCount > 0)
+        finish_Sequence(i_sequenceCount);
+}
+
+void
+HF_IdlTypeText::write_TemplateParameterList(
+                    const std::vector<ary::idl::Type_id> & i_templateParameters ) const
+{
+    if (i_templateParameters.empty())
+        return;
+
+    HF_IdlTypeText
+        aTemplateParamWriter(Env(), CurOut(), true, pReferingCe);
+    CurOut() << "< ";
+    std::vector<ary::idl::Type_id>::const_iterator
+        it = i_templateParameters.begin();
+    aTemplateParamWriter.Produce_byData(*it);
+    for ( ++it; it != i_templateParameters.end(); ++it )
+    {
+        CurOut() << ", ";
+        aTemplateParamWriter.Produce_byData(*it);
+    }
+    CurOut() << " >";
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_typetext.hxx b/autodoc/source/display/idl/hfi_typetext.hxx
new file mode 100644
index 000000000000..6d8c690976af
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_typetext.hxx
@@ -0,0 +1,160 @@
+/* -*- 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 ADC_DISPLAY_HFI_TYPETEXT_HXX
+#define ADC_DISPLAY_HFI_TYPETEXT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+
+class HF_IdlTypeText : public HtmlFactory_Idl
+{
+  public:
+    enum E_Index { use_for_javacompatible_index };
+
+                        HF_IdlTypeText(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut,
+                            bool                i_bWithLink,
+                            const client *      i_pScopeGivingCe = 0 );
+                        HF_IdlTypeText(
+                            Environment &       io_rEnv,
+                            E_Index             e );
+    virtual             ~HF_IdlTypeText();
+
+    void                Produce_byData(
+                            ary::idl::Type_id   i_idType ) const;
+    void                Produce_byData(
+                            ary::idl::Ce_id     i_idCe ) const;
+    void                Produce_byData(
+                            const String &      i_sFullName ) const;
+    void                Produce_LinkInDocu(
+                            const String &      i_scope,
+                            const String &      i_name,
+                            const String &      i_member ) const;
+    void                Produce_LocalLinkInDocu(
+                            const String &      i_member ) const;
+
+    /// Produce the first link for Java-help understood index entries.
+    void                Produce_IndexLink(
+                            Xml::Element &      o_out,
+                            const client &      i_ce ) const;
+    /** Produce the second link for Java-help understood index entries.
+        For members this will be a link to their owner (this function is
+        used), else see @->Produce_IndexSecondEntryLink();
+    */
+    void                Produce_IndexOwnerLink(
+                            Xml::Element &      o_out,
+                            const client &      i_owner ) const;
+    /** Produce the second link for Java-help understood index entries.
+        For non- members this will again be a link to to the entry itself
+        (this function is used), else see @->Produce_IndexOwnerLink();
+    */
+    void                Produce_IndexSecondEntryLink(
+                            Xml::Element &      o_out,
+                            const client &      i_ce ) const;
+  private:
+    // Locals
+    enum E_Existence
+    {
+        exists_dontknow,
+        exists_yes,
+        exists_no
+    };
+
+    void                produce_FromStd(
+                            const StringVector &
+                                                i_module,
+                            const String &      i_ce,
+                            const String &      i_member,
+                            int                 i_sequenceCount,
+                            E_Existence         i_ceExists,
+                            const std::vector<ary::idl::Type_id> *
+                                                i_templateParameters = 0 ) const;
+    void                produce_BuiltIn(
+                            const String &      i_type,
+                            int                 i_sequenceCount ) const;
+    void                produce_IndexLink(
+                            const StringVector &
+                                                i_module,
+                            const String &      i_ce,
+                            const String &      i_member,
+                            bool                i_bIsOwner ) const;
+    int                 count_Sequences(
+                            const char *        i_sFullType ) const;
+    void                start_Sequence(
+                            int                 i_count ) const;
+    void                finish_Sequence(
+                            int                 i_count ) const;
+    void                errorOut_UnresolvedLink(
+                            const char *        i_name ) const;
+    void                errorOut_UnresolvedLink(
+                            const StringVector &
+                                                i_module,
+                            const String &      i_ce,
+                            const String &      i_member ) const;
+    bool                is_ExternLink(
+                            const StringVector &
+                                                i_module ) const;
+    void                produce_ExternLink(
+                            const StringVector &
+                                                i_module,
+                            const String &      i_ce,
+                            const String &      i_member,
+                            int                 i_sequenceCount,
+                            const std::vector<ary::idl::Type_id> *
+                                                i_templateParameters ) const;
+    void                write_TemplateParameterList(
+                            const std::vector<ary::idl::Type_id> &
+                                                i_templateParameters ) const;
+    const ary::idl::Module *
+                        referingModule() const;
+    const client *      referingCe() const;
+
+    // DATA
+    mutable const client *
+                        pReferingCe;
+    bool                bWithLink;
+};
+
+
+
+// IMPLEMENTATION
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_xrefpage.cxx b/autodoc/source/display/idl/hfi_xrefpage.cxx
new file mode 100644
index 000000000000..e067308295ca
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_xrefpage.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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "hfi_xrefpage.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_navibar.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_env.hxx"
+
+
+namespace
+{
+
+const String
+    C_sTitleStart("uses of ");
+const String
+    C_sCRLF("\n");
+const String
+    C_sDevMan("References in Developers Guide");
+
+}   // anonymous namespace
+
+
+
+HF_IdlXrefs::HF_IdlXrefs( Environment &         io_rEnv,
+                          Xml::Element &        o_rOut,
+                          const String &        i_prefix,
+                          const client &        i_ce )
+    :   HtmlFactory_Idl(io_rEnv, &o_rOut),
+        rContentDirectory(*new Html::Paragraph),
+        pClient(&i_ce)
+{
+    produce_Main(i_prefix, i_ce);
+}
+
+HF_IdlXrefs::~HF_IdlXrefs()
+{
+}
+
+void
+HF_IdlXrefs::Write_ManualLinks( const client &  i_ce ) const
+{
+    const StringVector &
+        rLinks2Refs = i_ce.Secondaries().Links2RefsInManual();
+    if ( rLinks2Refs.size() == 0 )
+    {
+        rContentDirectory
+            << C_sDevMan
+            << new Html::LineBreak
+            << C_sCRLF;
+        return;
+    }
+
+
+    rContentDirectory
+        >> *new Html::Link("#devmanrefs")
+            << C_sDevMan
+            << new Html::LineBreak
+            << C_sCRLF;
+
+    HF_SubTitleTable
+        aList(CurOut(), "devmanrefs", C_sDevMan, 1);
+    Xml::Element &
+        rOutCell = aList.Add_Row() >>* new Html::TableCell;
+
+    csv_assert(rLinks2Refs.size() % 2 == 0);
+    for ( StringVector::const_iterator it = rLinks2Refs.begin();
+          it != rLinks2Refs.end();
+          ++it )
+    {
+        Xml::Element &
+            rLink = rOutCell >> *new Html::Link( Env().Link2Manual(*it));
+        if ( (*(it+1)).empty() )
+
+            // HACK KORR_FUTURE
+            // Research what happens with manual links which contain normal characters
+            // in non-utf-8 texts. And research, why utfF-8 does not work here.
+            rLink << new Xml::XmlCode(*it);
+        else
+            // HACK KORR_FUTURE, see above.
+            rLink << new Xml::XmlCode( *(it+1) );
+        rOutCell
+            << new Html::LineBreak
+            << C_sCRLF;
+        ++it;
+    }   // end for
+}
+
+void
+HF_IdlXrefs::Produce_List( const char *        i_title,
+                           const char *        i_label,
+                           ce_list &           i_iterator ) const
+{
+    if (NOT i_iterator)
+    {
+        rContentDirectory
+            << i_title
+            << new Html::LineBreak
+            << C_sCRLF;
+        return;
+    }
+
+    csv_assert(*i_label == '#');
+
+    rContentDirectory
+        >> *new Html::Link(i_label)
+            << i_title
+            << new Html::LineBreak
+            << C_sCRLF;
+
+    HF_SubTitleTable
+        aList(CurOut(), i_label+1, i_title, 1);
+    Xml::Element &
+        rOutCell = aList.Add_Row() >>* new Html::TableCell;
+    HF_IdlTypeText
+        aTypeWriter(Env(), rOutCell, true, pClient);
+    for ( ce_list & it = i_iterator; it; ++it )
+    {
+        aTypeWriter.Produce_byData(*it);
+        rOutCell << new Html::LineBreak;
+    }   // end for
+}
+
+void
+HF_IdlXrefs::Produce_Tree(  const char *        i_title,
+                            const char *        i_label,
+                            const client &      i_ce,
+                            F_GET_SUBLIST       i_sublistcreator ) const
+{
+    dyn_ce_list pResult;
+    (*i_sublistcreator)(pResult, i_ce);
+
+    if (NOT (*pResult).operator bool())
+    {
+        rContentDirectory
+            << i_title
+            << new Html::LineBreak
+            << C_sCRLF;
+        return;
+    }
+
+    csv_assert(*i_label == '#');
+
+    rContentDirectory
+        >> *new Html::Link(i_label)
+            << i_title
+            << new Html::LineBreak
+            << C_sCRLF;
+
+    HF_SubTitleTable
+        aList(CurOut(), i_label+1, i_title, 1);
+    Xml::Element &
+        rOut = aList.Add_Row()
+                    >>* new Html::TableCell
+                        >> *new csi::xml::AnElement("pre")
+                            << new csi::html::StyleAttr("font-family:monospace;");
+
+    recursive_make_ListInTree( rOut,
+                               0,
+                               i_ce,
+                               *pResult,
+                               i_sublistcreator );
+}
+
+void
+HF_IdlXrefs::produce_Main( const String &        i_prefix,
+                           const client &        i_ce ) const
+{
+    make_Navibar(i_ce);
+
+    HF_TitleTable
+        aTitle(CurOut());
+    StreamLock sl(200);
+    aTitle.Produce_Title( sl()
+                          << C_sTitleStart
+                          << i_prefix
+                          << " "
+                          << i_ce.LocalName()
+                          << c_str );
+
+    aTitle.Add_Row() << &rContentDirectory;
+    sl().reset();
+    rContentDirectory
+        >> *new Html::Link( sl()    << i_ce.LocalName()
+                                    << ".html"
+                                    << c_str )
+            >> *new Html::Bold
+                << "back to "
+                << i_prefix
+                << " "
+                << i_ce.LocalName();
+    rContentDirectory
+        << new Html::LineBreak
+        << new Html::LineBreak
+        << C_sCRLF;
+
+    CurOut() << new Html::HorizontalLine();
+}
+
+void
+HF_IdlXrefs::make_Navibar( const client & i_ce ) const
+{
+    HF_IdlNavigationBar
+        aNaviBar(Env(), CurOut());
+    aNaviBar.Produce_CeXrefsMainRow(i_ce);
+    CurOut() << new Html::HorizontalLine();
+}
+
+void
+HF_IdlXrefs::recursive_make_ListInTree( Xml::Element &      o_rDisplay,
+                                        uintt               i_level,
+                                        const client &      i_ce,
+                                        ce_list &           i_iterator,
+                                        F_GET_SUBLIST       i_sublistcreator ) const
+{
+    const char * sLevelIndentation = "    ";
+
+    HF_IdlTypeText
+        aTypeWriter(Env(), o_rDisplay, true, &i_ce);
+    for ( ; i_iterator.operator bool(); ++i_iterator )
+    {
+        for (uintt i = 0; i < i_level; ++i)
+        {
+            o_rDisplay << sLevelIndentation;
+        }   // end for
+
+        aTypeWriter.Produce_byData(*i_iterator);
+        o_rDisplay << C_sCRLF;
+
+        dyn_ce_list     pResult;
+        const client &  rCe = Env().Gate().Ces().Find_Ce(*i_iterator);
+        (*i_sublistcreator)(pResult, rCe);
+        if ( (*pResult).operator bool() )
+        {
+            recursive_make_ListInTree( o_rDisplay,
+                                       i_level + 1,
+                                       rCe,
+                                       *pResult,
+                                       i_sublistcreator );
+        }
+    }   // end for
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hfi_xrefpage.hxx b/autodoc/source/display/idl/hfi_xrefpage.hxx
new file mode 100644
index 000000000000..34bde3af9722
--- /dev/null
+++ b/autodoc/source/display/idl/hfi_xrefpage.hxx
@@ -0,0 +1,107 @@
+/* -*- 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 ADC_DISPLAY_HFI_XREFPAGE_HXX
+#define ADC_DISPLAY_HFI_XREFPAGE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "hi_factory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+
+class HF_IdlXrefs : public HtmlFactory_Idl
+{
+  public:
+    typedef void (*F_GET_SUBLIST)(dyn_ce_list&, const client&);
+
+                        HF_IdlXrefs(
+                            Environment &       io_rEnv,
+                            Xml::Element &      o_rOut,
+                            const String &      i_prefix,
+                            const client &      i_ce);
+    virtual             ~HF_IdlXrefs();
+
+    /** @descr
+        Only lists which are tried to be produced by Produce_List() or
+        Produce_Tree(), will occur in the content directory of the page.
+        They will have links, if the list or tree has at least one element,
+        else the list is mentioned in the directory without link.
+
+        @param i_label [*i_label == '#']
+    */
+    void                Produce_List(
+                            const char *        i_title,
+                            const char *        i_label,
+                            ce_list &           i_iterator ) const;
+    void                Write_ManualLinks(
+                            const client &      i_ce ) const;
+    /** @descr
+        Only lists which are tried to be produced by Produce_List() or
+        Produce_Tree(), will occur in the content directory of the page.
+        They will have links, if the list or tree has at least one element,
+        else the list is mentioned in the directory without link.
+
+        @param i_label [*i_label == '#']
+    */
+    void                Produce_Tree(
+                            const char *        i_title,
+                            const char *        i_label,
+                            const client &      i_ce,
+                            F_GET_SUBLIST       i_sublistcreator ) const;
+
+  private:
+    // Locals
+    void                produce_Main(
+                            const String &      i_prefix,
+                            const client &      i_ce ) const;
+    void                make_Navibar(
+                            const client &      i_ce ) const;
+    /// @return true if there are any elements in sub lists.
+    void                recursive_make_ListInTree(
+                            Xml::Element &      o_rDisplay,
+                            uintt               i_level,    /// 0 is highest
+                            const client &      i_ce,
+                            ce_list &           i_iterator,
+                            F_GET_SUBLIST       i_sublistcreator ) const;
+
+    // DATA
+    Xml::Element &      rContentDirectory;
+    const client *      pClient;
+};
+
+
+
+// IMPLEMENTATION
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hi_ary.cxx b/autodoc/source/display/idl/hi_ary.cxx
new file mode 100644
index 000000000000..855b9ede1536
--- /dev/null
+++ b/autodoc/source/display/idl/hi_ary.cxx
@@ -0,0 +1,273 @@
+/* -*- 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 <precomp.h>
+#include "hi_ary.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/ploc_dir.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_type.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/idl/ip_type.hxx>
+
+
+inline const ary::idl::Gate &
+AryAccess::gate() const
+    { return rGate; }
+
+inline const ary::idl::CePilot &
+AryAccess::ces() const
+    { return rGate.Ces(); }
+
+inline const ary::idl::TypePilot &
+AryAccess::types() const
+    { return rGate.Types(); }
+
+inline const ary::idl::Module *
+AryAccess::find_SubModule( const ary::idl::Module & i_parent,
+                           const String &           i_name ) const
+{
+    ary::idl::Ce_id
+        nModule = i_parent.Search_Name(i_name);
+    return ces().Search_Module(nModule);
+}
+
+bool
+AryAccess::nextName( const char * &      io_TextPtr,
+                     String &            o_name ) const
+{
+    if ( strncmp(io_TextPtr,"::", 2) == 0 )
+        io_TextPtr += 2;
+
+    const char *    pEnd = strchr(io_TextPtr,':');
+    size_t          nLen = pEnd == 0
+                                ?   strlen(io_TextPtr)
+                                :   pEnd - io_TextPtr;
+    o_name.assign(io_TextPtr, nLen);
+    io_TextPtr += nLen;
+
+    return nLen > 0;
+}
+
+
+
+AryAccess::AryAccess( const ary::idl::Gate & i_rGate )
+    :   rGate(i_rGate)
+{
+}
+
+const ary::idl::Module &
+AryAccess::GlobalNamespace() const
+{
+    return ces().GlobalNamespace();
+}
+
+const ary::idl::Module &
+AryAccess::Find_Module( ary::idl::Ce_id i_ce ) const
+{
+    return ces().Find_Module(i_ce);
+}
+
+
+const ary::idl::CodeEntity &
+AryAccess::Find_Ce( ary::idl::Ce_id i_ce ) const
+{
+    return ces().Find_Ce(i_ce);
+}
+
+const ary::idl::Type &
+AryAccess::Find_Type( ary::idl::Type_id i_type ) const
+{
+    return types().Find_Type(i_type);
+}
+
+ary::idl::Ce_id
+AryAccess::CeFromType( ary::idl::Type_id i_type ) const
+{
+    return types().Search_CeRelatedTo(i_type);
+}
+
+bool
+AryAccess::IsBuiltInOrRelated( const ary::idl::Type & i_type ) const
+{
+    return types().IsBuiltInOrRelated(i_type);
+}
+
+bool
+AryAccess::Search_Ce( StringVector &            o_module,
+                      String &                  o_mainEntity,
+                      String &                  o_memberEntity,
+                      const char *              i_sText,
+                      const ary::idl::Module &  i_referingScope ) const
+{
+    o_module.erase(o_module.begin(),o_module.end());
+    o_mainEntity = String::Null_();
+    o_memberEntity = String::Null_();
+
+    const ary::idl::Module *    pModule = 0;
+
+    if ( strncmp(i_sText, "::", 2) == 0
+         OR strncmp(i_sText, "com::sun::star", 14) == 0 )
+        pModule = &GlobalNamespace();
+    else
+    {
+        pModule = &i_referingScope;
+        ces().Get_Text(o_module, o_mainEntity, o_memberEntity, *pModule);
+    }
+
+    const char *    pNext = i_sText;
+    String          sNextName;
+
+    // Find Module:
+    while ( nextName(pNext, sNextName) )
+    {
+        const ary::idl::Module *
+            pSub = find_SubModule(*pModule, sNextName);
+        if (pSub != 0)
+        {
+            pModule = pSub;
+            o_module.push_back(sNextName);
+        }
+        else
+            break;
+    }
+
+    // Find main CodeEntity:
+    if ( sNextName.length() == 0 )
+        return true;
+    const ary::idl::Ce_id
+        nCe = pModule->Search_Name(sNextName);
+    if (NOT nCe.IsValid())
+        return false;
+    o_mainEntity = sNextName;
+
+    // Find member:
+    if ( *pNext == 0 )
+        return true;
+    nextName(pNext, o_memberEntity);
+    if (strchr(o_memberEntity,':') != 0)
+        return false;   // This must not happen in IDL
+
+    return true;
+}
+
+bool
+AryAccess::Search_CesModule( StringVector &             o_module,
+                             const String &             i_scope,
+                             const String &             i_ce,
+                             const ary::idl::Module &   i_referingScope ) const
+{
+    o_module.erase(o_module.begin(),o_module.end());
+
+    const ary::idl::Module *
+        pModule = 0;
+
+    if ( strncmp(i_scope, "::", 2) == 0
+         OR strncmp(i_scope, "com::sun::star", 14) == 0 )
+        pModule = &GlobalNamespace();
+    else
+    {
+        pModule = &i_referingScope;
+        static String Dummy1;
+        static String Dummy2;
+        ces().Get_Text(o_module, Dummy1, Dummy2, *pModule);
+    }
+
+    const char *    pNext = i_scope;
+    String          sNextName;
+
+    // Find Module:
+    while ( nextName(pNext, sNextName) )
+    {
+        const ary::idl::Module *
+            pSub = find_SubModule(*pModule, sNextName);
+        if (pSub != 0)
+        {
+            pModule = pSub;
+            o_module.push_back(sNextName);
+        }
+        else
+            return false;
+    }  // end while
+    return pModule->Search_Name(i_ce).IsValid();
+}
+
+const ary::idl::Module *
+AryAccess::Search_Module( const StringVector & i_nameChain ) const
+{
+    const ary::idl::Module * ret =
+        &GlobalNamespace();
+    for ( StringVector::const_iterator it = i_nameChain.begin();
+          it != i_nameChain.end();
+          ++it )
+    {
+        ret = find_SubModule(*ret, *it);
+        if (ret == 0)
+            break;
+    }   // end for
+    return ret;
+}
+
+void
+AryAccess::Get_CeText( StringVector &               o_module,
+                       String &                     o_ce,
+                       String &                     o_member,
+                       const ary::idl::CodeEntity & i_ce ) const
+{
+    ces().Get_Text(o_module, o_ce, o_member, i_ce);
+}
+
+void
+AryAccess::Get_TypeText( StringVector &         o_module,
+                         String &               o_sCe,
+                         ary::idl::Ce_id &      o_nCe,
+                         int &                  o_sequenceCount,
+                         const ary::idl::Type & i_type ) const
+{
+    i_type.Get_Text(o_module, o_sCe, o_nCe, o_sequenceCount, gate());
+}
+
+void
+AryAccess::Get_IndexData( std::vector<ary::idl::Ce_id> &            o_data,
+                          ary::idl::alphabetical_index::E_Letter    i_letter ) const
+{
+    rGate.Ces().Get_AlphabeticalIndex(o_data, i_letter);
+}
+
+
+const ary::idl::CePilot &
+AryAccess::Ces() const
+{
+    return rGate.Ces();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hi_ary.hxx b/autodoc/source/display/idl/hi_ary.hxx
new file mode 100644
index 000000000000..21dc60454fd5
--- /dev/null
+++ b/autodoc/source/display/idl/hi_ary.hxx
@@ -0,0 +1,164 @@
+/* -*- 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 ADC_DISPLAY_HI_ARY_HXX
+#define ADC_DISPLAY_HI_ARY_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <ary/idl/i_types4idl.hxx>
+    // PARAMETERS
+#include <ary/idl/i_gate.hxx>
+#include <ary/doc/d_docu.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+    class Module;
+    class Gate;
+    class CePilot;
+    class TypePilot;
+}
+}
+namespace output
+{
+    class Position;
+}
+
+
+
+
+inline const ary::doc::OldIdlDocu *
+Get_IdlDocu(const ary::doc::Documentation & i_doc)
+{
+    return dynamic_cast< const ary::doc::OldIdlDocu* >(i_doc.Data());
+}
+
+
+
+
+
+/** A helper class to wrap the access to data in the Autodoc Repository.
+*/
+class AryAccess
+{
+  public:
+    // LIFECYCLE
+                        AryAccess(
+                            const ary::idl::Gate &
+                                                i_rGate );
+    // INQUIRY
+    const ary::idl::Module &
+                        GlobalNamespace() const;
+    const ary::idl::Module &
+                        Find_Module(
+                            ary::idl::Ce_id     i_ce ) const;
+    const ary::idl::CodeEntity &
+                        Find_Ce(
+                            ary::idl::Ce_id     i_ce ) const;
+    const ary::idl::Type &
+                        Find_Type(
+                            ary::idl::Type_id   i_type ) const;
+    ary::idl::Ce_id     CeFromType(
+                            ary::idl::Type_id   i_type ) const;
+    bool                IsBuiltInOrRelated(
+                            const ary::idl::Type &
+                                                i_type ) const;
+    bool                Search_Ce(
+                            StringVector &      o_module,
+                            String &            o_mainEntity,
+                            String &            o_memberEntity,
+                            const char *        i_sText,
+                            const ary::idl::Module &
+                                                i_referingScope ) const;
+    bool                Search_CesModule(
+                            StringVector &      o_module,
+                            const String &      i_scope,
+                            const String &      i_ce,
+                            const ary::idl::Module &
+                                                i_referingScope ) const;
+    const ary::idl::Module *
+                        Search_Module(
+                            const StringVector &
+                                                i_nameChain ) const;
+
+    void                Get_CeText(
+                            StringVector &      o_module,
+                            String &            o_ce,
+                            String &            o_member,
+                            const ary::idl::CodeEntity &
+                                                i_ce ) const;
+    void                Get_TypeText(
+                            StringVector &      o_module,
+                            String &            o_sCe,
+                            ary::idl::Ce_id  &  o_nCe,
+                            int &               o_sequenceCount,
+                            const ary::idl::Type &
+                                                i_type ) const;
+    void                Get_IndexData(
+                            std::vector<ary::idl::Ce_id> &
+                                                o_data,
+                            ary::idl::alphabetical_index::E_Letter
+                                                i_letter ) const;
+
+    const ary::idl::CePilot &
+                        Ces() const;
+  private:
+    const ary::idl::Module *
+                        find_SubModule(
+                            const ary::idl::Module &
+                                                i_parent,
+                            const String &      i_name ) const;
+
+    /// Gets "::"-separated names out of a string.
+    bool                nextName(
+                            const char * &      io_TextPtr,
+                            String &            o_name ) const;
+
+
+    const ary::idl::Gate &
+                        gate() const;
+    const ary::idl::CePilot &
+                        ces() const;
+    const ary::idl::TypePilot &
+                        types() const;
+    // DATA
+    const ary::idl::Gate &
+                        rGate;
+};
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hi_display.cxx b/autodoc/source/display/idl/hi_display.cxx
new file mode 100644
index 000000000000..b3eaa76279d6
--- /dev/null
+++ b/autodoc/source/display/idl/hi_display.cxx
@@ -0,0 +1,200 @@
+/* -*- 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 <precomp.h>
+#include <idl/hi_display.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/file.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/getncast.hxx>
+#include <toolkit/out_tree.hxx>
+#include <cfrstd.hxx>
+#include "hi_ary.hxx"
+#include "hi_env.hxx"
+#include "hi_main.hxx"
+
+
+extern const String C_sCssFilename_Idl;
+
+
+inline bool
+HtmlDisplay_Idl::IsModule( const ary::idl::CodeEntity & i_ce ) const
+{
+     return ary::is_type<ary::idl::Module>(i_ce);
+}
+
+inline const ary::idl::Module &
+HtmlDisplay_Idl::Module_Cast( const ary::idl::CodeEntity & i_ce ) const
+{
+     return ary::ary_cast<ary::idl::Module>(i_ce);
+}
+
+
+
+
+HtmlDisplay_Idl::HtmlDisplay_Idl()
+    :   pCurPageEnv(),
+        pMainDisplay()
+{
+}
+
+HtmlDisplay_Idl::~HtmlDisplay_Idl()
+{
+}
+
+void
+HtmlDisplay_Idl::do_Run( const char *                       i_sOutputDirectory,
+                         const ary::idl::Gate &             i_rAryGate,
+                         const display::CorporateFrame &    i_rLayout )
+{
+    SetRunData( i_sOutputDirectory, i_rAryGate, i_rLayout );
+
+    Create_StartFile();
+    Create_CssFile();
+    Create_FilesInNameTree();
+    Create_IndexFiles();
+    Create_FilesInProjectTree();
+    Create_PackageList();
+    Create_HelpFile();
+}
+
+void
+HtmlDisplay_Idl::SetRunData( const char *                       i_sOutputDirectory,
+                             const ary::idl::Gate &             i_rAryGate,
+                             const display::CorporateFrame &    i_rLayout  )
+{
+    csv::ploc::Path aOutputDir( i_sOutputDirectory, true );
+    pCurPageEnv = new HtmlEnvironment_Idl( aOutputDir, i_rAryGate, i_rLayout );
+    pMainDisplay = new MainDisplay_Idl(*pCurPageEnv);
+}
+
+void
+HtmlDisplay_Idl::Create_StartFile()
+{
+}
+
+void
+HtmlDisplay_Idl::Create_FilesInNameTree()
+{
+    Cout() << "\nCreate files in subtree namespaces ..." << Endl();
+
+    const ary::idl::Module &
+        rGlobalNamespace = pCurPageEnv->Data().GlobalNamespace();
+    pCurPageEnv->Goto_Directory( pCurPageEnv->OutputTree().NamesRoot(), true );
+
+    RecursiveDisplay_Module(rGlobalNamespace);
+
+    Cout() << "... done." << Endl();
+}
+
+void
+HtmlDisplay_Idl::Create_IndexFiles()
+{
+    Cout() << "\nCreate files in subtree index ..." << Endl();
+    pCurPageEnv->Goto_Directory( pCurPageEnv->OutputTree().IndexRoot(), true );
+    pMainDisplay->WriteGlobalIndices();
+    Cout() << "... done.\n" << Endl();
+}
+
+typedef ary::Dyn_StdConstIterator<ary::idl::Ce_id>  Dyn_CeIterator;
+typedef ary::StdConstIterator<ary::idl::Ce_id>      CeIterator;
+
+void
+HtmlDisplay_Idl::RecursiveDisplay_Module( const ary::idl::Module & i_module )
+{
+    i_module.Accept(*pMainDisplay);
+
+    Dyn_CeIterator
+        aMembers;
+    i_module.Get_Names(aMembers);
+
+    for ( CeIterator & iter = *aMembers;
+          iter;
+          ++iter )
+    {
+        const ary::idl::CodeEntity &
+            rCe = pCurPageEnv->Data().Find_Ce(*iter);
+
+        if ( NOT IsModule(rCe) )
+            rCe.Accept(*pMainDisplay);
+        else
+        {
+            pCurPageEnv->Goto_DirectoryLevelDown( rCe.LocalName(), true );
+            RecursiveDisplay_Module( Module_Cast(rCe) );
+            pCurPageEnv->Goto_DirectoryLevelUp();
+        }
+    }   // end for
+}
+
+void
+HtmlDisplay_Idl::Create_FilesInProjectTree()
+{
+}
+
+void
+HtmlDisplay_Idl::Create_PackageList()
+{
+}
+
+void
+HtmlDisplay_Idl::Create_HelpFile()
+{
+}
+
+void
+HtmlDisplay_Idl::Create_CssFile()
+{
+    Cout() << "\nCreate css file ..." << Endl();
+
+    pCurPageEnv->Goto_Directory( pCurPageEnv->OutputTree().Root(), true );
+    pCurPageEnv->Set_CurFile( C_sCssFilename_Idl );
+
+    StreamLock
+        slCurFilePath(700);
+    pCurPageEnv->Get_CurFilePath(slCurFilePath());
+
+    csv::File
+        aCssFile(slCurFilePath().c_str(), csv::CFM_CREATE);
+    csv::OpenCloseGuard
+        aOpenGuard(aCssFile);
+    if (NOT aOpenGuard)
+    {
+        Cerr() << "Can't create file " << slCurFilePath().c_str() << "." << Endl();
+        return;
+    }
+
+    aCssFile.write("/*      Autodoc css file for IDL documentation      */\n\n\n");
+    aCssFile.write(pCurPageEnv->Layout().CssStyle());
+    aCssFile.write("\n\n\n");
+    aCssFile.write(pCurPageEnv->Layout().CssStylesExplanation());
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hi_env.cxx b/autodoc/source/display/idl/hi_env.cxx
new file mode 100644
index 000000000000..db4589efbe43
--- /dev/null
+++ b/autodoc/source/display/idl/hi_env.cxx
@@ -0,0 +1,202 @@
+/* -*- 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 <precomp.h>
+#include "hi_env.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/ploc_dir.hxx>
+#include <cfrstd.hxx>
+#include <toolkit/out_tree.hxx>
+#include "hi_ary.hxx"
+#include "hi_linkhelper.hxx"
+
+
+
+const String C_s_index_files("index-files");
+
+const String C_sUseFileSuffix("-use.html");
+const String C_IndexA_FileName("index-1.html");
+
+
+HtmlEnvironment_Idl::HtmlEnvironment_Idl( const csv::ploc::Path &           i_rOutputDir,
+                                          const ary::idl::Gate &            i_rGate,
+                                          const display::CorporateFrame &   i_rLayout )
+    :   aOutputRoot(i_rOutputDir),
+        pData(new AryAccess(i_rGate)),
+        pGate(&i_rGate),
+        pOutputTree(new output::Tree),
+        aCurPosition(pOutputTree->Root()),
+        pCurPageCe(0),
+        pLayout(&i_rLayout),
+        pLinker()
+{
+    StringVector    aHelp;
+    pOutputTree->Set_NamesRoot(aHelp);
+
+    aHelp.push_back(output::IndexFilesDirName());
+    pOutputTree->Set_IndexRoot(aHelp);
+
+    (*aHelp.begin()) = String("com");
+    aHelp.push_back(String("sun"));
+    aHelp.push_back(String("star"));
+    pOutputTree->Set_Overview(aHelp, output::ModuleFileName() );
+
+    pLinker = new LinkHelper(*this);
+}
+
+HtmlEnvironment_Idl::~HtmlEnvironment_Idl()
+{
+}
+
+namespace
+{
+StringVector    G_aChain;
+}
+
+void
+HtmlEnvironment_Idl::Goto_Directory( output::Position   i_pos,
+                                     bool               i_bCreateDirectoryIfNecessary )
+{
+    aCurPosition = i_pos;
+    aCurPath = aOutputRoot.MyPath();
+
+    aCurPosition.Get_Chain(G_aChain);
+    for ( StringVector::const_iterator it = G_aChain.begin();
+          it != G_aChain.end();
+          ++it )
+    {
+        aCurPath.DirChain() += *it;
+    }
+
+    if (i_bCreateDirectoryIfNecessary)
+        create_Directory(aCurPath);
+}
+
+void
+HtmlEnvironment_Idl::Goto_DirectoryLevelDown( const String & i_subDirName,
+                                              bool           i_bCreateDirectoryIfNecessary )
+{
+    aCurPosition +=(i_subDirName);
+
+    aCurPath.SetFile(String::Null_());
+    aCurPath.DirChain() += i_subDirName;
+
+    if (i_bCreateDirectoryIfNecessary)
+        create_Directory(aCurPath);
+}
+
+void
+HtmlEnvironment_Idl::Goto_DirectoryLevelUp()
+{
+    aCurPosition -= 1;
+
+    aCurPath.SetFile(String::Null_());
+    aCurPath.DirChain() -= 1;
+}
+
+void
+HtmlEnvironment_Idl::Set_CurFile( const String & i_fileName )
+{
+    aCurPath.SetFile(i_fileName);
+}
+
+void
+HtmlEnvironment_Idl::create_Directory( const csv::ploc::Path & i_path )
+
+{
+    csv::ploc::Directory aCurDir(i_path);
+    if (NOT aCurDir.Exists())
+        aCurDir.PhysicalCreate();
+}
+
+inline bool
+IsAbsoluteLink(const char * i_link)
+{
+    const char
+        shttp[] = "http://";
+    const char
+        sfile[] = "file://";
+    const int
+        csize = sizeof shttp - 1;
+    csv_assert(csize == sizeof sfile - 1);
+
+    return      strncmp(i_link,shttp,csize) == 0
+            OR  strncmp(i_link,sfile,csize) == 0;
+}
+
+
+const char *
+HtmlEnvironment_Idl::Link2Manual( const String & i_link ) const
+{
+    if ( IsAbsoluteLink(i_link.c_str()) )
+        return i_link;
+
+    static StreamStr aLink_(200);
+    aLink_.reset();
+    String
+        sDvgRoot(pLayout->DevelopersGuideHtmlRoot());
+    if (sDvgRoot.empty())
+        sDvgRoot = "../DevelopersGuide";
+
+    // KORR_FUTURE
+    // Enhance performance by calculating this only one time:
+    if ( NOT IsAbsoluteLink(sDvgRoot.c_str()) )
+        aCurPosition.Get_LinkToRoot(aLink_);
+    aLink_ << sDvgRoot
+           << "/"
+           << i_link;
+    return aLink_.c_str();
+}
+
+String
+HtmlEnvironment_Idl::CurPageCe_AsText() const
+{
+    return CurPageCe_AsFile(".html");
+}
+
+String
+HtmlEnvironment_Idl::CurPageCe_AsFile(const char * i_sEnding) const
+{
+    if (pCurPageCe == 0)
+        return String::Null_();
+
+    static StringVector aModule_;
+    String sCe;
+    String sDummy;
+    Data().Get_CeText(aModule_, sCe, sDummy, *pCurPageCe);
+    StreamLock slCe(500);
+    if (aModule_.size() > 0)
+        slCe().operator_join(aModule_.begin(), aModule_.end(), "/");
+    if (NOT sCe.empty())
+        slCe() << "/" << sCe << i_sEnding;
+    return String(slCe().c_str());
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hi_env.hxx b/autodoc/source/display/idl/hi_env.hxx
new file mode 100644
index 000000000000..675db9ab7ab6
--- /dev/null
+++ b/autodoc/source/display/idl/hi_env.hxx
@@ -0,0 +1,163 @@
+/* -*- 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 ADC_DISPLAY_HI_ENV_HXX
+#define ADC_DISPLAY_HI_ENV_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <cosv/ploc.hxx>
+#include <cosv/ploc_dir.hxx>
+    // PARAMETERS
+#include <toolkit/out_position.hxx>
+
+namespace ary
+{
+namespace idl
+{
+    class Gate;
+    class CodeEntity;
+}
+}
+namespace display
+{
+    class CorporateFrame;
+}
+namespace output
+{
+    class Tree;
+}
+
+class AryAccess;
+class LinkHelper;
+
+/** @resp
+    Provides enviroment information to the HTML factory
+    classes.
+
+    @descr
+    All information that is not included in the data, especially
+    about the layout of the output tree and the access to
+    information from the repository are provided here.
+
+    @see HtmlFactory
+*/
+class HtmlEnvironment_Idl
+{
+  public:
+    // LIFECYCLE
+                        HtmlEnvironment_Idl(
+                            const csv::ploc::Path &
+                                                io_rOutputDir,
+                            const ary::idl::Gate &
+                                                i_rGate,
+                            const display::CorporateFrame &
+                                                i_rLayout );
+                        ~HtmlEnvironment_Idl();
+
+    // OPERATIONS
+    void                Goto_Directory(
+                            output::Position    i_pos,
+                            bool                i_bCreateDirectoryIfNecessary );
+    void                Goto_DirectoryLevelDown(
+                            const String &      i_subDirName,
+                            bool                i_bCreateDirectoryIfNecessary );
+    void                Goto_DirectoryLevelUp();
+    void                Set_CurFile(
+                            const String &      i_fileName );
+    void                Set_CurPageCe(
+                            const ary::idl::CodeEntity *
+                                                i_ce )
+                                                { pCurPageCe = i_ce; }
+    // INQUIRY
+    const ary::idl::Gate &
+                        Gate() const            { return *pGate; }
+    const AryAccess &   Data() const            { return *pData; }
+    const char *        Link2Manual(
+                            const String &      i_link ) const;
+
+    /// This may be reimplemented for removing dead links to members.
+    bool                Is_MemberExistenceCheckRequired() const
+                                                { return false; }
+
+    /// @return Holds only the current directory, not the current file.
+    output::Position &  CurPosition() const     { return aCurPosition; }
+    void                Get_CurFilePath(
+                            StreamStr &         o_buffer ) const
+                                                { o_buffer << aCurPath; }
+
+    const display::CorporateFrame &
+                        Layout() const          { return *pLayout; }
+    const LinkHelper &  Linker() const          { return *pLinker; }
+
+    void                Get_LinkTo(
+                            StreamStr &         o_result,
+                            output::Position    i_destination )
+                                                { CurPosition().Get_LinkTo(o_result, i_destination); }
+    String              CurPageCe_AsText() const;
+    String              CurPageCe_AsFile(
+                            const char *        i_sEnding) const;
+    const ary::idl::CodeEntity *
+                        CurPageCe() const       { return pCurPageCe; }
+
+    // ACCESS
+    output::Tree &      OutputTree()            { return *pOutputTree; }
+
+  private:
+    // Local
+    void                create_Directory(
+                            const csv::ploc::Path &
+                                                i_path );
+
+    // DATA
+    csv::ploc::Directory
+                        aOutputRoot;
+    csv::ploc::Path     aCurPath;
+
+    Dyn<AryAccess>      pData;          /// @invariant *pData is valid.
+    const ary::idl::Gate *
+                        pGate;          /// @invariant pGate != 0.
+    Dyn<output::Tree>   pOutputTree;    /// @invariant *pOutputTree is valid.
+    mutable output::Position
+                        aCurPosition;
+    const ary::idl::CodeEntity *
+                        pCurPageCe;
+
+    const display::CorporateFrame *
+                        pLayout;
+
+    Dyn<LinkHelper>     pLinker;
+};
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hi_factory.cxx b/autodoc/source/display/idl/hi_factory.cxx
new file mode 100644
index 000000000000..d194d6015744
--- /dev/null
+++ b/autodoc/source/display/idl/hi_factory.cxx
@@ -0,0 +1,323 @@
+/* -*- 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 <precomp.h>
+#include "hi_factory.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_ce.hxx>
+#include <toolkit/hf_title.hxx>
+#include "hfi_doc.hxx"
+#include "hfi_navibar.hxx"
+#include "hfi_tag.hxx"
+#include "hfi_typetext.hxx"
+#include "hi_linkhelper.hxx"
+
+
+extern const String
+    C_sCellStyle_SummaryLeft("imsum_left");
+extern const String
+    C_sCellStyle_SummaryRight("imsum_right");
+extern const String
+    C_sCellStyle_MDetail("imdetail");
+extern const String
+    C_sMemberTitle("membertitle");
+
+
+namespace
+{
+
+const char C_sSpace[92] = "                              "
+                          "                              "
+                          "                               ";
+}
+
+
+void
+HtmlFactory_Idl::produce_SummaryDeclaration( Xml::Element &      o_row,
+                                             const client &      i_ce ) const
+{
+    produce_InternalLink(o_row, i_ce);
+}
+
+void
+HtmlFactory_Idl::produce_InternalLink( Xml::Element &  o_screen,
+                                       const client &  i_ce ) const
+{
+    StreamLock aLocalLink(100);
+    aLocalLink() << "#" << i_ce.LocalName();
+
+    o_screen
+        >> *new Html::TableCell
+            << new Html::ClassAttr( C_sCellStyle_SummaryLeft )
+            >> *new Html::Link( aLocalLink().c_str() )
+                << i_ce.LocalName();
+}
+
+void
+HtmlFactory_Idl::produce_ShortDoc( Xml::Element &   o_screen,
+                                   const client &   i_ce ) const
+{
+    Xml::Element &
+        rDetailsRowCell = o_screen
+                            >> *new Html::TableCell
+                                << new Html::ClassAttr( C_sCellStyle_SummaryRight );
+    HF_IdlShortDocu
+        aLinkDoc(Env(), rDetailsRowCell);
+    aLinkDoc.Produce_byData( i_ce );
+
+    rDetailsRowCell << new Xml::XmlCode("&nbsp;");
+}
+
+// KORR_FUTURE: Does not belong here (implementation inheritance)!
+void
+HtmlFactory_Idl::produce_Bases( Xml::Element &   o_screen,
+                                const client &   i_ce,
+                                const String &   i_sLabel ) const
+{
+    ary::idl::Type_id nBaseT = baseOf(i_ce);
+    if ( nBaseT.IsValid() )
+    {
+        HF_DocEntryList
+            aDocList( o_screen );
+        aDocList.Produce_Term(i_sLabel);
+
+        int nDepth = 0;
+        Xml::Element &
+            rBaseList = aDocList.Produce_Definition()
+                                >> *new Xml::AnElement("pre")
+                                    << new Xml::AnAttribute("style","font-family:monospace;");
+        rBaseList
+            >> *new Html::Strong
+                << i_ce.LocalName();
+        rBaseList
+            << "\n";
+        recursive_ShowBases( rBaseList,
+                             nBaseT,
+                             nDepth );
+    }
+}
+
+void
+HtmlFactory_Idl::produce_Members( ce_list &               it_list,
+                                  const String &          i_summaryTitle,
+                                  const String &          i_summaryLabel,
+                                  const String &          i_detailsTitle,
+                                  const String &          i_detailsLabel,
+                                  const E_MemberViewType  i_viewType ) const
+{
+    csv_assert( it_list );
+
+    Dyn< HF_SubTitleTable > pSummary;
+    if  (   ( i_viewType == viewtype_summary )
+        ||  ( i_viewType == viewtype_complete )
+        )
+    {
+        pSummary = new HF_SubTitleTable(
+                CurOut(),
+                i_summaryLabel,
+                i_summaryTitle,
+                2 );
+    }
+
+    Dyn< HF_SubTitleTable > pDetails;
+    if  (   ( i_viewType == viewtype_details )
+        ||  ( i_viewType == viewtype_complete )
+        )
+    {
+        pDetails = new HF_SubTitleTable(
+                CurOut(),
+                i_detailsLabel,
+                i_detailsTitle,
+                1 );
+    }
+
+    for ( ; it_list.operator bool(); ++it_list )
+    {
+        const ary::idl::CodeEntity &
+            rCe = Env().Data().Find_Ce(*it_list);
+
+        if ( pSummary )
+        {
+            Xml::Element &
+                rSummaryRow = pSummary->Add_Row();
+            produce_SummaryDeclaration(rSummaryRow, rCe);
+//            produce_InternalLink(rSummaryRow, rCe);
+            produce_ShortDoc(rSummaryRow, rCe);
+        }
+
+        if ( pDetails )
+            produce_MemberDetails(*pDetails, rCe);
+    }
+}
+
+void
+HtmlFactory_Idl::produce_Title( HF_TitleTable &     o_title,
+                                const String &      i_label,
+                                const client &      i_ce ) const
+{
+    StreamLock
+        slAnnotations(200);
+    get_Annotations(slAnnotations(), i_ce);
+    StreamLock
+        slTitle(200);
+    slTitle() << i_label << " " << i_ce.LocalName();
+    o_title.Produce_Title( slAnnotations().c_str(),
+                           slTitle().c_str() );
+}
+
+void
+HtmlFactory_Idl::get_Annotations( StreamStr &         o_out,
+                                  const client &      i_ce ) const
+{
+    const ary::doc::OldIdlDocu *
+        doc = Get_IdlDocu(i_ce.Docu());
+    if (doc != 0)
+    {
+        if (doc->IsDeprecated())
+            o_out << "deprecated ";
+        if (NOT doc->IsPublished())
+            o_out << "unpublished ";
+    }
+
+    // KORR
+    //  Need to display "unpublished", if there is no docu.
+}
+
+void
+HtmlFactory_Idl::write_Docu( Xml::Element &     o_screen,
+                             const client &     i_ce ) const
+{
+    const ary::doc::OldIdlDocu *
+        doc = Get_IdlDocu(i_ce.Docu());
+    if (doc != 0)
+    {
+        HF_DocEntryList
+            aDocuList( o_screen );
+        HF_IdlDocu
+            aDocu( Env(), aDocuList );
+        aDocu.Produce_fromCodeEntity(i_ce);
+    }
+
+    write_ManualLinks(o_screen, i_ce);
+}
+
+void
+HtmlFactory_Idl::write_ManualLinks( Xml::Element &  o_screen,
+                                    const client &  i_ce ) const
+{
+    const StringVector &
+        rLinks2Descrs = i_ce.Secondaries().Links2DescriptionInManual();
+    if ( rLinks2Descrs.size() == 0 )
+        return;
+
+    o_screen
+        >> *new Html::Label(C_sLocalManualLinks.c_str()+1)  // Leave out the leading '#'.
+            << " ";
+    HF_DocEntryList
+        aDocuList( o_screen );
+    aDocuList.Produce_Term("Developers Guide");
+    csv_assert(rLinks2Descrs.size() % 2 == 0);
+    for ( StringVector::const_iterator it = rLinks2Descrs.begin();
+          it != rLinks2Descrs.end();
+          ++it )
+    {
+        Xml::Element &
+            rLink = aDocuList.Produce_Definition() >> *new Html::Link( Env().Link2Manual(*it));
+        if ( (*(it+1)).empty() )
+            // HACK KORR_FUTURE
+            // Research what happens with manual links which contain normal characters
+            // in non-utf-8 texts. And research, why utfF-8 does not work here.
+            rLink << new Xml::XmlCode(*it);
+        else
+            rLink << new Xml::XmlCode( *(it+1) );
+        ++it;
+    }   // end for
+}
+
+void
+HtmlFactory_Idl::produce_MemberDetails(  HF_SubTitleTable &  ,
+                                         const client &      ) const
+{
+    // Dummy, which does not need to do anything.
+}
+
+void
+HtmlFactory_Idl::recursive_ShowBases( Xml::Element &     o_screen,
+                                      type_id            i_baseType,
+                                      int &              io_nDepth ) const
+{
+    // Show this base
+    ++io_nDepth;
+    const ary::idl::CodeEntity *
+        pCe = Env().Linker().Search_CeFromType(i_baseType);
+
+    csv_assert(io_nDepth > 0);
+    if (io_nDepth > 30)
+        io_nDepth = 30;
+    o_screen
+        << (C_sSpace + 93 - 3*io_nDepth)
+        << new csi::xml::XmlCode("&#x2517")
+        << " ";
+
+    if (pCe == 0)
+    {
+        HF_IdlTypeText
+            aText( Env(), o_screen, false );
+        aText.Produce_byData( i_baseType );
+        o_screen
+            << "\n";
+        --io_nDepth;
+        return;
+    }
+
+    HF_IdlTypeText
+        aBaseLink( Env(), o_screen, true );
+    aBaseLink.Produce_byData(pCe->CeId());
+    o_screen
+        << "\n";
+
+    // Bases
+    ary::idl::Type_id
+        nBaseT = baseOf(*pCe);
+    if (nBaseT.IsValid())
+        recursive_ShowBases(o_screen,nBaseT,io_nDepth);
+
+    --io_nDepth;
+    return;
+}
+
+HtmlFactory_Idl::type_id
+HtmlFactory_Idl::inq_BaseOf( const client & ) const
+{
+    // Unused dummy.
+    return type_id(0);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hi_factory.hxx b/autodoc/source/display/idl/hi_factory.hxx
new file mode 100644
index 000000000000..fff162e083f5
--- /dev/null
+++ b/autodoc/source/display/idl/hi_factory.hxx
@@ -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.
+ *
+ ************************************************************************/
+
+#ifndef ADC_DISPLAY_HI_FACTORY_HXX
+#define ADC_DISPLAY_HI_FACTORY_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <toolkit/htmlfactory.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/stdconstiter.hxx>
+#include <ary/idl/i_types4idl.hxx>
+#include <toolkit/out_position.hxx>
+
+
+namespace ary
+{
+namespace idl
+{
+    class Module;
+}
+namespace doc
+{
+    class OldIdlDocu;
+}
+}
+
+
+class HtmlEnvironment_Idl;
+class LinkHelper;
+class HF_NaviSubRow;
+class HF_TitleTable;
+class HF_SubTitleTable;
+
+
+class HtmlFactory_Idl : public HtmlFactory<HtmlEnvironment_Idl>
+{
+  public:
+    enum E_MemberViewType
+    {
+        viewtype_summary,   // the summary of the members
+        viewtype_details,   // the details of the members
+        viewtype_complete   // everything
+    };
+
+    enum E_DocType
+    {
+        doctype_summaryOnly,    // only the summary
+        doctype_complete        // the complete documentation
+    };
+
+  public:
+    typedef ary::idl::CodeEntity                client;
+    typedef ary::idl::Ce_id                     ce_id;
+    typedef ary::idl::Type_id                   type_id;
+    typedef ary::doc::OldIdlDocu                ce_info;
+
+    typedef ary::Dyn_StdConstIterator<ce_id>    dyn_ce_list;
+    typedef ary::Dyn_StdConstIterator<type_id>  dyn_type_list;
+    typedef ary::StdConstIterator<ce_id>        ce_list;
+    typedef ary::StdConstIterator<type_id>      type_list;
+
+    typedef HtmlEnvironment_Idl                 Environment;
+    typedef output::Position                    OutPosition;
+
+  protected:
+                        HtmlFactory_Idl(
+                            Environment &       io_rEnv,
+                            Xml::Element *      o_pOut = 0 )
+                            :   HtmlFactory<Environment>(io_rEnv, o_pOut)
+                            { }
+    virtual             ~HtmlFactory_Idl() {}
+
+    /** The default version only calls ->produce_InternalLink().
+        This may be overwritten by derived classes.
+    */
+    virtual void        produce_SummaryDeclaration(
+                            Xml::Element &      o_row,
+                            const client &      i_ce ) const;
+    void                produce_InternalLink(
+                            Xml::Element &      o_row,
+                            const client &      i_ce ) const;
+    void                produce_ShortDoc(
+                            Xml::Element &      o_row,
+                            const client &      i_ce ) const;
+
+    // KORR_FUTURE: Does not belong here (implementation inheritance)!
+    void                produce_Bases(
+                                Xml::Element &   o_screen,
+                                const client &   i_ce,
+                                const String &   i_sLabel ) const;
+    void                produce_Members(
+                            ce_list &               it_list,
+                            const String &          i_summaryTitle,
+                            const String &          i_summaryLabel,
+                            const String &          i_detailsTitle,
+                            const String &          i_detailsLabel,
+                            const E_MemberViewType  i_viewType = viewtype_complete ) const;
+
+    void                produce_Title(
+                            HF_TitleTable &     o_title,
+                            const String &      i_label,
+                            const client &      i_ce ) const;
+    void                get_Annotations(
+                            StreamStr &         o_out,
+                            const client &      i_ce ) const;
+
+    /// Writes complete docu in standard format.
+    void                write_Docu(
+                            Xml::Element &      o_screen,
+                            const client &      i_ce ) const;
+
+    void                write_ManualLinks(
+                            Xml::Element &      o_screen,
+                            const client &      i_ce ) const;
+  private:
+    // Dummy does nothing
+    virtual void        produce_MemberDetails(
+                            HF_SubTitleTable &  o_table,
+                            const client &      i_ce ) const;
+    void                recursive_ShowBases(
+                            Xml::Element &      o_screen,
+                            type_id             i_baseType,
+                            int &               io_nDepth ) const;
+    type_id             baseOf(
+                            const client &      i_ce ) const
+                                                { return inq_BaseOf(i_ce); }
+    virtual type_id     inq_BaseOf(
+                            const client &      i_ce ) const;
+};
+
+
+extern const String
+    C_sCellStyle_SummaryLeft;
+extern const String
+    C_sCellStyle_SummaryRight;
+extern const String
+    C_sCellStyle_MDetail;
+extern const String
+    C_sMemberTitle;
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hi_linkhelper.cxx b/autodoc/source/display/idl/hi_linkhelper.cxx
new file mode 100644
index 000000000000..4d6ae7a735ad
--- /dev/null
+++ b/autodoc/source/display/idl/hi_linkhelper.cxx
@@ -0,0 +1,99 @@
+/* -*- 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 <precomp.h>
+#include "hi_linkhelper.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_module.hxx>
+
+
+
+
+const ary::idl::Module *
+LinkHelper::Search_CurModule() const
+{
+    return Search_Module( rEnv.CurPosition().RelatedNode() );
+}
+
+const ary::idl::Module *
+LinkHelper::Search_Module( output::Node & i_node ) const
+{
+    static StringVector aNames_;
+
+    output::Node::relative_id
+        nId = i_node.RelatedNameRoom();
+    if (nId == 0)
+    {
+        csv::erase_container(aNames_);
+        i_node.Get_Chain(aNames_);
+        const ary::idl::Module *  pModule =
+            rEnv.Data().Search_Module(aNames_);
+        if ( pModule == 0 )
+            return 0;
+        nId = static_cast<output::Node::relative_id>(pModule->Id());
+        rEnv.CurPosition().RelatedNode().Set_RelatedNameRoom(nId);
+    }
+
+    return & rEnv.Data().Find_Module( ary::idl::Ce_id(nId) );
+}
+
+namespace
+{
+    const String C_sXrefsSuffix("-xref");
+}
+
+
+LinkHelper::OutPosition
+LinkHelper::PositionOf_CurXRefs( const String & i_ceName ) const
+{
+    StreamLock sl(100);
+    return OutPosition( rEnv.CurPosition(),
+                        sl()    << i_ceName
+                                << C_sXrefsSuffix
+                                << ".html"
+                                << c_str );
+}
+
+const String &
+LinkHelper::XrefsSuffix() const
+{
+    return C_sXrefsSuffix;
+}
+
+
+String
+nameChainLinker( const char * )
+{
+    static const String
+        sModuleFileName_( output::ModuleFileName() );
+    return sModuleFileName_;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hi_linkhelper.hxx b/autodoc/source/display/idl/hi_linkhelper.hxx
new file mode 100644
index 000000000000..4bac748fa072
--- /dev/null
+++ b/autodoc/source/display/idl/hi_linkhelper.hxx
@@ -0,0 +1,108 @@
+/* -*- 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 ADC_DISPLAY_HI_LINKHELPER_HXX
+#define ADC_DISPLAY_HI_LINKHELPER_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include "hi_ary.hxx"
+#include "hi_env.hxx"
+#include <toolkit/out_position.hxx>
+#include <toolkit/out_tree.hxx>
+
+
+class LinkHelper
+{
+  public:
+    typedef ary::idl::CodeEntity                CE;
+    typedef output::Position                    OutPosition;
+
+                        LinkHelper(
+                            HtmlEnvironment_Idl &
+                                                io_rEnv )
+                            :   rEnv(io_rEnv) {}
+
+    OutPosition         PositionOf_CurModule() const
+                        { return OutPosition( rEnv.CurPosition(),
+                                              output::ModuleFileName()); }
+
+    OutPosition         PositionOf_CurXRefs(
+                            const String &      i_ceName) const;
+    OutPosition         PositionOf_Index() const
+                        { OutPosition ret1 = rEnv.OutputTree().IndexRoot();
+                          return OutPosition( ret1, String(output::IndexFile_A()) ); }
+
+
+    const ary::idl::Module *
+                        Search_CurModule() const;
+    const ary::idl::Module *
+                        Search_Module(
+                            output::Node &      i_node ) const;
+
+    const CE *          Search_CeFromType(
+                            ary::idl::Type_id   i_type ) const;
+
+    void                Get_Link2Position(
+                            StreamStr &         o_link,
+                            OutPosition &       i_pos ) const
+                        { rEnv.CurPosition().Get_LinkTo(o_link, i_pos); }
+
+    void                Get_Link2Member(
+                            StreamStr &         o_link,
+                            OutPosition &       i_ownerPos,
+                            const String &      i_memberName ) const
+                        { Get_Link2Position(o_link, i_ownerPos);
+                          o_link << "#" << i_memberName; }
+    const String &      XrefsSuffix() const;
+
+  private:
+    HtmlEnvironment_Idl & rEnv;
+};
+
+inline const ary::idl::CodeEntity *
+LinkHelper::Search_CeFromType( ary::idl::Type_id i_type ) const
+{
+    ary::idl::Ce_id nCe = rEnv.Data().CeFromType(i_type);
+    if (nCe.IsValid())
+        return &rEnv.Data().Find_Ce(nCe);
+    return 0;
+}
+
+
+
+String              nameChainLinker(
+                        const char *        i_levelName );
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hi_main.cxx b/autodoc/source/display/idl/hi_main.cxx
new file mode 100644
index 000000000000..f6b346fcdc15
--- /dev/null
+++ b/autodoc/source/display/idl/hi_main.cxx
@@ -0,0 +1,766 @@
+/* -*- 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 <precomp.h>
+#include "hi_main.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <algorithm>
+#include <cosv/ploc.hxx>
+#include <cosv/file.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/ik_ce.hxx>
+#include <ary/idl/ik_enum.hxx>
+#include <ary/idl/ik_typedef.hxx>
+#include <ary/idl/ik_interface.hxx>
+#include <ary/idl/ik_struct.hxx>
+#include <ary/idl/ik_exception.hxx>
+#include <ary/idl/i_constant.hxx>
+#include <ary/idl/i_constgroup.hxx>
+#include <ary/idl/i_enum.hxx>
+#include <ary/idl/i_singleton.hxx>
+#include <ary/idl/i_sisingleton.hxx>
+#include <ary/idl/i_exception.hxx>
+#include <ary/idl/i_interface.hxx>
+#include <ary/idl/i_service.hxx>
+#include <ary/idl/i_siservice.hxx>
+#include <ary/idl/i_struct.hxx>
+#include <ary/idl/i_typedef.hxx>
+#include <ary/idl/i_module.hxx>
+#include <cfrstd.hxx>
+#include <toolkit/htmlfile.hxx>
+#include <toolkit/out_position.hxx>
+#include <toolkit/out_tree.hxx>
+#include "hfi_constgroup.hxx"
+#include "hfi_enum.hxx"
+#include "hfi_globalindex.hxx"
+#include "hfi_interface.hxx"
+#include "hfi_module.hxx"
+#include "hfi_struct.hxx"
+#include "hfi_service.hxx"
+#include "hfi_singleton.hxx"
+#include "hfi_siservice.hxx"
+#include "hfi_typedef.hxx"
+#include "hfi_xrefpage.hxx"
+#include "hi_env.hxx"
+#include "hi_linkhelper.hxx"
+
+
+using       ::ary::idl::Ce_id;
+using       ::ary::idl::Type_id;
+using       ::ary::idl::ifc_ce::Dyn_CeIterator;
+
+
+
+extern const String C_sCssFilename_Idl("idl.css");
+
+/*
+typedef     ::ary::Dyn_StdConstIterator< ::ary::idl::CommentedRelation>
+            Dyn_ComRefIterator;
+namespace   read_module     = ::ary::idl::ifc_module;
+namespace   read_interface  = ::ary::idl::ifc_interface;
+namespace   read_service    = ::ary::idl::ifc_service;
+namespace   read_struct     = ::ary::idl::ifc_struct;
+namespace   read_exception  = ::ary::idl::ifc_exception;
+namespace   read_enum       = ::ary::idl::ifc_enum;
+namespace   read_typedef    = ::ary::idl::ifc_typedef;
+namespace   read_constgroup = ::ary::idl::ifc_constantsgroup;
+*/
+
+namespace
+{
+
+/** @resp
+    Inits (constructor) and creates (destructor) the current
+    html documentation file ( MainDisplay_Idl.pMyFile ).
+*/
+class Guard_CurFile
+{
+  public:
+                        Guard_CurFile(          /// For CodeEntities
+                            DocuFile_Html &     io_client,
+                            HtmlEnvironment_Idl &
+                                                io_env,
+                            const ary::idl::CodeEntity &
+                                                i_ce,
+                            const String &      i_titlePrefix );
+                        Guard_CurFile(          /// For Use pages
+                            DocuFile_Html &     io_client,
+                            HtmlEnvironment_Idl &
+                                                io_env,
+                            const String &      i_fileName,
+                            const String &      i_titlePrefix );
+                        Guard_CurFile(          /// For Modules
+                            DocuFile_Html &     io_client,
+                            HtmlEnvironment_Idl &
+                                                io_env,
+                            const ary::idl::CodeEntity &
+                                                i_ce );
+                        Guard_CurFile(          /// For Indices
+                            DocuFile_Html &     io_client,
+                            HtmlEnvironment_Idl &
+                                                io_env,
+                            char                i_letter );
+                        ~Guard_CurFile();
+  private:
+    DocuFile_Html &     rClient;
+    HtmlEnvironment_Idl &
+                        rEnv;
+
+};
+
+/** @resp
+    Sets and releases the current factory pointer
+    ( MainDisplay_Idl.pCurFactory ).
+*/
+class Guard_CurFactoryPtr
+{
+  public:
+                        Guard_CurFactoryPtr(
+                            HtmlFactory_Idl *&  io_client,
+                            HtmlFactory_Idl &   i_factory )
+                            :   rpClient(io_client)
+                        { rpClient = &i_factory; }
+
+                        ~Guard_CurFactoryPtr()
+                        { rpClient = 0; }
+
+  private:
+    HtmlFactory_Idl *&  rpClient;
+
+};
+
+
+Guard_CurFile::Guard_CurFile( DocuFile_Html &               io_client,
+                              HtmlEnvironment_Idl &         io_env,
+                              const ary::idl::CodeEntity &  i_ce,
+                              const String &                i_titlePrefix )
+    :   rClient(io_client),
+        rEnv(io_env)
+{   // For Ces
+    StreamLock sl(300);
+    io_env.Set_CurFile( sl()    << i_ce.LocalName()
+                                << ".html"
+                                << c_str );
+    StreamLock aCurFilePath(700);
+    io_env.Get_CurFilePath(aCurFilePath());
+
+    rClient.EmptyBody();
+    csv::ploc::Path
+        aLocation(aCurFilePath().c_str());
+    rClient.SetLocation(aLocation);
+    sl().reset();
+    rClient.SetTitle( sl()  << i_titlePrefix
+                            << " "
+                            << i_ce.LocalName()
+                            << c_str );
+    sl().reset();
+    rClient.SetRelativeCssPath(
+                      sl()  << io_env.CurPosition().LinkToRoot()
+                            << C_sCssFilename_Idl
+                            << c_str );
+
+    io_env.Set_CurPageCe(&i_ce);
+}
+
+Guard_CurFile::Guard_CurFile( DocuFile_Html &       io_client,
+                              HtmlEnvironment_Idl & io_env,
+                              const String &        i_fileName,
+                              const String &        i_titlePrefix )
+    :   rClient(io_client),
+        rEnv(io_env)
+{   // For Use pages
+    StreamLock sl(300);
+    io_env.Set_CurFile( sl()    << i_fileName
+                                << ".html"
+                                << c_str );
+    StreamLock aCurFilePath(700);
+    io_env.Get_CurFilePath(aCurFilePath());
+    csv::ploc::Path
+        aLocation(aCurFilePath().c_str());
+
+    rClient.EmptyBody();
+    rClient.SetLocation(aLocation);
+    sl().reset();
+    rClient.SetTitle( sl() << i_titlePrefix << " " << i_fileName << c_str );
+    sl().reset();
+    rClient.SetRelativeCssPath(
+                      sl()  << io_env.CurPosition().LinkToRoot()
+                            << C_sCssFilename_Idl
+                            << c_str );
+
+    io_env.Set_CurPageCe(0);
+}
+
+Guard_CurFile::Guard_CurFile( DocuFile_Html &               io_client,
+                              HtmlEnvironment_Idl &         io_env,
+                              const ary::idl::CodeEntity &  i_ce )
+    :   rClient(io_client),
+        rEnv(io_env)
+{   // For Modules
+    io_env.Set_CurFile( output::ModuleFileName() );
+    StreamLock aCurFilePath(700);
+    io_env.Get_CurFilePath(aCurFilePath());
+    csv::ploc::Path
+        aLocation(aCurFilePath().c_str());
+
+    rClient.EmptyBody();
+    rClient.SetLocation(aLocation);
+    StreamLock sl(300);
+    rClient.SetTitle( sl() << "Module " << io_env.CurPosition().Name() << c_str );
+    sl().reset();
+    rClient.SetRelativeCssPath(
+                      sl()  << io_env.CurPosition().LinkToRoot()
+                            << C_sCssFilename_Idl
+                            << c_str );
+
+    io_env.Set_CurPageCe(&i_ce);
+}
+
+Guard_CurFile::Guard_CurFile( DocuFile_Html &       io_client,
+                              HtmlEnvironment_Idl & io_env,
+                              char                  i_letter )
+    :   rClient(io_client),
+        rEnv(io_env)
+{   // For Index pages
+    StreamLock sl(300);
+    io_env.Set_CurFile( sl()    << "index-"
+                                << ( i_letter != '_'
+                                        ?   int(i_letter)-'a'+1
+                                        :   27 )
+                                << ".html"
+                                << c_str );
+    StreamLock aCurFilePath(700);
+    io_env.Get_CurFilePath(aCurFilePath());
+    csv::ploc::Path
+        aLocation(aCurFilePath().c_str());
+
+    rClient.EmptyBody();
+    rClient.SetLocation(aLocation);
+    sl().reset();
+    rClient.SetTitle( sl() << "Global Index "
+                           << ( i_letter != '_'
+                                    ?   char(i_letter-'a'+'A')
+                                    :   '_' )
+                           << c_str );
+    sl().reset();
+    rClient.SetRelativeCssPath(
+                      sl()  << "../"
+                            << C_sCssFilename_Idl
+                            << c_str );
+}
+
+Guard_CurFile::~Guard_CurFile()
+{
+    rClient.CreateFile();
+    rEnv.Set_CurPageCe(0);
+}
+
+
+}   // anonymous namespace
+
+
+
+
+MainDisplay_Idl::MainDisplay_Idl( HtmlEnvironment_Idl & io_rEnv )
+    :   pEnv(&io_rEnv),
+        pMyFile(new DocuFile_Html),
+        pCurFactory(0)
+{
+//  pMyFile->SetStyle( Env().Layout().CssStyle() );
+    pMyFile->SetCopyright( Env().Layout().CopyrightText() );
+}
+
+MainDisplay_Idl::~MainDisplay_Idl()
+{
+}
+
+
+void
+MainDisplay_Idl::WriteGlobalIndices()
+{
+    for ( const char * pLetter = "abcdefghijklmnopqrstuvwxyz_X"; *pLetter != 'X'; ++pLetter )
+    {
+        Guard_CurFile       gFile( *pMyFile, Env(), *pLetter );
+
+        HF_IdlGlobalIndex   aFactory( *pEnv, pMyFile->Body() );
+        Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+        aFactory.Produce_Page( ary::idl::alphabetical_index::E_Letter(*pLetter) );
+    }   // end for
+}
+
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::Module & i_ce )
+{
+    Guard_CurFile    gFile( *pMyFile,
+                            Env(),
+                            i_ce );
+    HF_IdlModule     aFactory( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::Interface & i_ce )
+{
+    do_InterfaceDescr(i_ce);
+    do_Interface2s(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::Service & i_ce )
+{
+    do_ServiceDescr(i_ce);
+    do_Service2s(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::SglIfcService & i_ce )
+{
+    do_SglIfcServiceDescr(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::Struct & i_ce )
+{
+    do_StructDescr(i_ce);
+    do_Struct2s(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::Exception & i_ce )
+{
+    do_ExceptionDescr(i_ce);
+    do_Exception2s(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::Enum & i_ce )
+{
+    do_EnumDescr(i_ce);
+    do_Enum2s(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::Typedef & i_ce )
+{
+    do_TypedefDescr(i_ce);
+    do_Typedef2s(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::ConstantsGroup & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Constants' Group" );
+    HF_IdlConstGroup    aFactory( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::Singleton & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Singleton" );
+    HF_IdlSingleton     aFactory( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData_ServiceBased(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Process( const ary::idl::SglIfcSingleton & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Singleton" );
+    HF_IdlSingleton     aFactory( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData_InterfaceBased(i_ce);
+}
+
+void
+MainDisplay_Idl::do_InterfaceDescr( const ary::idl::CodeEntity & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Interface" );
+    HF_IdlInterface     aInterface( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aInterface);
+
+    aInterface.Produce_byData(i_ce);
+}
+
+void
+MainDisplay_Idl::do_ServiceDescr( const ary::idl::CodeEntity & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Service" );
+    HF_IdlService       aFactory( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData(i_ce);
+}
+
+void
+MainDisplay_Idl::do_SglIfcServiceDescr( const ary::idl::CodeEntity & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Service" );
+    HF_IdlSglIfcService aFactory( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData(i_ce);
+}
+
+void
+MainDisplay_Idl::do_StructDescr( const ary::idl::CodeEntity & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Struct" );
+    HF_IdlStruct        aFactory( *pEnv, pMyFile->Body(), false );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData(i_ce);
+}
+
+void
+MainDisplay_Idl::do_ExceptionDescr( const ary::idl::CodeEntity & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Exception" );
+    HF_IdlStruct        aFactory( *pEnv, pMyFile->Body(), true );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData(i_ce);
+}
+
+void
+MainDisplay_Idl::do_EnumDescr( const ary::idl::CodeEntity & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Enum" );
+    HF_IdlEnum        aFactory( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData(i_ce);
+}
+
+void
+MainDisplay_Idl::do_TypedefDescr( const ary::idl::CodeEntity & i_ce )
+{
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               i_ce,
+                               "Typedef" );
+    HF_IdlTypedef       aFactory( *pEnv, pMyFile->Body() );
+    Guard_CurFactoryPtr gFactory(pCurFactory,aFactory);
+
+    aFactory.Produce_byData(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Interface2s( const ary::idl::CodeEntity & i_ce )
+{
+    StreamLock sl(100);
+    String sUsesFileName(
+                sl()
+                    << i_ce.LocalName()
+                    << Env().Linker().XrefsSuffix()
+                    << c_str );
+    Guard_CurFile       gFile( *pMyFile,
+                               Env(),
+                               sUsesFileName,
+                               "Uses of Interface" );
+    HF_IdlXrefs         aUses( *pEnv,
+                               pMyFile->Body(),
+                               C_sCePrefix_Interface,
+                               i_ce );
+
+
+    aUses.Produce_Tree(
+        "Derived Interfaces",
+        "#Deriveds",
+        i_ce,
+        &ary::idl::ifc_interface::xref::Get_Derivations );
+
+    Dyn_CeIterator  pXrefList;
+
+    ary::idl::ifc_interface::xref::Get_SynonymTypedefs(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Synonym Typedefs",
+        "#Synonyms",
+        *pXrefList );
+    ary::idl::ifc_interface::xref::Get_ExportingServices(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Services which Support this Interface",
+        "#SupportingServices",
+        *pXrefList );
+    ary::idl::ifc_interface::xref::Get_ExportingSingletons(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Singletons which Support this Interface",
+        "#SupportingSingletons",
+        *pXrefList );
+    ary::idl::ifc_interface::xref::Get_AsReturns(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Return Type",
+        "#Returns",
+        *pXrefList );
+    ary::idl::ifc_interface::xref::Get_AsParameters(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Parameter",
+        "#Parameters",
+        *pXrefList );
+    ary::idl::ifc_interface::xref::Get_AsDataTypes(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Data Type",
+        "#DataTypes",
+        *pXrefList );
+    aUses.Write_ManualLinks(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Service2s( const ary::idl::CodeEntity & i_ce )
+{
+    StreamLock sl(100);
+    String sUsesFileName(
+                sl()
+                    << i_ce.LocalName()
+                    << Env().Linker().XrefsSuffix()
+                    << c_str );
+    Guard_CurFile   gFile(  *pMyFile,
+                            Env(),
+                            sUsesFileName,
+                            "Uses of Service" );
+    HF_IdlXrefs     aUses(  *pEnv,
+                            pMyFile->Body(),
+                            C_sCePrefix_Service,
+                            i_ce );
+    Dyn_CeIterator  pXrefList;
+    ary::idl::ifc_service::xref::Get_IncludingServices(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Services which Include this Service",
+        "#IncludingServices",
+        *pXrefList );
+
+    ary::idl::ifc_service::xref::Get_InstantiatingSingletons(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Singletons which Instantiate this Service",
+        "#Singletons",
+        *pXrefList );
+    aUses.Write_ManualLinks(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Struct2s( const ary::idl::CodeEntity & i_ce )
+{
+    StreamLock sl(100);
+    String sUsesFileName(
+                sl()
+                    << i_ce.LocalName()
+                    << Env().Linker().XrefsSuffix()
+                    << c_str );
+    Guard_CurFile   gFile(  *pMyFile,
+                            Env(),
+                            sUsesFileName,
+                            "Uses of Struct" );
+    HF_IdlXrefs     aUses(  *pEnv,
+                            pMyFile->Body(),
+                            C_sCePrefix_Struct,
+                            i_ce );
+
+    aUses.Produce_Tree(
+        "Derived Structs",
+        "#Deriveds",
+        i_ce,
+        &ary::idl::ifc_struct::xref::Get_Derivations );
+
+    Dyn_CeIterator  pXrefList;
+
+    ary::idl::ifc_struct::xref::Get_SynonymTypedefs(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Synonym Typedefs",
+        "#Synonyms",
+        *pXrefList );
+    ary::idl::ifc_struct::xref::Get_AsReturns(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Return Type",
+        "#Returns",
+        *pXrefList );
+    ary::idl::ifc_struct::xref::Get_AsParameters(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Parameter",
+        "#Parameters",
+        *pXrefList );
+    ary::idl::ifc_struct::xref::Get_AsDataTypes(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Data Type",
+        "#DataTypes",
+        *pXrefList );
+    aUses.Write_ManualLinks(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Exception2s( const ary::idl::CodeEntity & i_ce )
+{
+    StreamLock sl(100);
+    String sUsesFileName(
+                sl()
+                    << i_ce.LocalName()
+                    << Env().Linker().XrefsSuffix()
+                    << c_str );
+    Guard_CurFile   gFile(  *pMyFile,
+                            Env(),
+                            sUsesFileName,
+                            "Uses of Exception" );
+    HF_IdlXrefs     aUses(  *pEnv,
+                            pMyFile->Body(),
+                            C_sCePrefix_Exception,
+                            i_ce );
+
+    aUses.Produce_Tree(
+        "Derived Exceptions",
+        "#Deriveds",
+        i_ce,
+        &ary::idl::ifc_exception::xref::Get_Derivations );
+
+    Dyn_CeIterator  pXrefList;
+
+    ary::idl::ifc_exception::xref::Get_RaisingFunctions(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Raising Functions",
+        "#Raisers",
+        *pXrefList );
+    aUses.Write_ManualLinks(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Enum2s( const ary::idl::CodeEntity & i_ce )
+{
+    StreamLock sl(100);
+    String sUsesFileName(
+                sl()
+                    << i_ce.LocalName()
+                    << Env().Linker().XrefsSuffix()
+                    << c_str );
+    Guard_CurFile   gFile(  *pMyFile,
+                            Env(),
+                            sUsesFileName,
+                            "Uses of Enum" );
+    HF_IdlXrefs     aUses(  *pEnv,
+                            pMyFile->Body(),
+                            C_sCePrefix_Enum,
+                            i_ce );
+    Dyn_CeIterator  pXrefList;
+    ary::idl::ifc_enum::xref::Get_SynonymTypedefs(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Synonym Typedefs",
+        "#Synonyms",
+        *pXrefList );
+    ary::idl::ifc_enum::xref::Get_AsReturns(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Return Type",
+        "#Returns",
+        *pXrefList );
+    ary::idl::ifc_enum::xref::Get_AsParameters(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Parameter",
+        "#Parameters",
+        *pXrefList );
+    ary::idl::ifc_enum::xref::Get_AsDataTypes(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Data Type",
+        "#DataTypes",
+        *pXrefList );
+    aUses.Write_ManualLinks(i_ce);
+}
+
+void
+MainDisplay_Idl::do_Typedef2s( const ary::idl::CodeEntity & i_ce )
+{
+    StreamLock sl(100);
+    String sUsesFileName(
+               sl() << i_ce.LocalName()
+                    << Env().Linker().XrefsSuffix()
+                    << c_str );
+    Guard_CurFile   gFile(  *pMyFile,
+                            Env(),
+                            sUsesFileName,
+                            "Uses of Typedef" );
+    HF_IdlXrefs     aUses(  *pEnv,
+                            pMyFile->Body(),
+                            C_sCePrefix_Typedef,
+                            i_ce );
+    Dyn_CeIterator  pXrefList;
+    ary::idl::ifc_typedef::xref::Get_SynonymTypedefs(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Synonym Typedefs",
+        "#Synonyms",
+        *pXrefList );
+    ary::idl::ifc_typedef::xref::Get_AsReturns(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Return Type",
+        "#Returns",
+        *pXrefList );
+    ary::idl::ifc_typedef::xref::Get_AsParameters(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Parameter",
+        "#Parameters",
+        *pXrefList );
+    ary::idl::ifc_typedef::xref::Get_AsDataTypes(pXrefList,i_ce);
+    aUses.Produce_List(
+        "Uses as Data Type",
+        "#DataTypes",
+        *pXrefList );
+    aUses.Write_ManualLinks(i_ce);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/hi_main.hxx b/autodoc/source/display/idl/hi_main.hxx
new file mode 100644
index 000000000000..a70daa4087a1
--- /dev/null
+++ b/autodoc/source/display/idl/hi_main.hxx
@@ -0,0 +1,181 @@
+/* -*- 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 ADC_DISPLAY_HFIDMAIN_HXX
+#define ADC_DISPLAY_HFIDMAIN_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cosv/tpl/processor.hxx>
+    // COMPONENTS
+#include "hi_factory.hxx"
+    // PARAMETERS
+
+
+class HtmlEnvironment_Idl;
+class HtmlFactory_Idl;
+class DocuFile_Html;
+
+namespace ary
+{
+namespace idl
+{
+
+    class Module;
+    class Service;
+    class SglIfcService;
+    class Interface;
+    class Struct;
+    class Exception;
+    class Enum;
+    class Typedef;
+    class ConstantsGroup;
+    class Singleton;
+    class SglIfcSingleton;
+
+}   // namespace idl
+}   // namespace ary
+
+
+class MainDisplay_Idl : public csv::ProcessorIfc,
+                        public csv::ConstProcessor<ary::idl::Module>,
+                        public csv::ConstProcessor<ary::idl::Service>,
+                        public csv::ConstProcessor<ary::idl::SglIfcService>,
+                        public csv::ConstProcessor<ary::idl::Interface>,
+                        public csv::ConstProcessor<ary::idl::Struct>,
+                        public csv::ConstProcessor<ary::idl::Exception>,
+                        public csv::ConstProcessor<ary::idl::Enum>,
+                        public csv::ConstProcessor<ary::idl::Typedef>,
+                        public csv::ConstProcessor<ary::idl::ConstantsGroup>,
+                        public csv::ConstProcessor<ary::idl::Singleton>,
+                        public csv::ConstProcessor<ary::idl::SglIfcSingleton>
+{
+  public:
+                        MainDisplay_Idl(
+                            HtmlEnvironment_Idl &
+                                                io_rEnv );
+    virtual             ~MainDisplay_Idl();
+
+    void                WriteGlobalIndices();
+
+    void                Display_NamedEntityHierarchy();
+
+  private:
+    // Interface csv::ProcessorIfc:
+    virtual void        do_Process(
+                            const ary::idl::Module  &     i_client );
+    virtual void        do_Process(
+                            const ary::idl::Service &     i_client );
+    virtual void        do_Process(
+                            const ary::idl::SglIfcService &
+                                                          i_client );
+    virtual void        do_Process(
+                            const ary::idl::Interface &   i_client );
+    virtual void        do_Process(
+                            const ary::idl::Struct  &     i_client );
+    virtual void        do_Process(
+                            const ary::idl::Exception &   i_client );
+    virtual void        do_Process(
+                            const ary::idl::Enum &        i_client );
+    virtual void        do_Process(
+                            const ary::idl::Typedef &     i_client );
+    virtual void        do_Process(
+                            const ary::idl::ConstantsGroup &
+                                                i_client );
+    virtual void        do_Process(
+                            const ary::idl::Singleton &   i_client );
+    virtual void        do_Process(
+                            const ary::idl::SglIfcSingleton &
+                                                i_client );
+    // Locals
+    void                do_ServiceDescr(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_SglIfcServiceDescr(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_InterfaceDescr(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_StructDescr(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_ExceptionDescr(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_EnumDescr(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_TypedefDescr(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_SingletonDescr(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_Service2s(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_Interface2s(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_Struct2s(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_Exception2s(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_Enum2s(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_Typedef2s(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+    void                do_Singleton2s(
+                            const ary::idl::CodeEntity &
+                                                i_rData );
+
+    const HtmlEnvironment_Idl &
+                        Env() const             { return *pEnv; }
+    HtmlEnvironment_Idl &
+                        Env()                   { return *pEnv; }
+    Xml::Element &      CurHtmlOut()            { return pCurFactory->CurOut(); }
+
+    // DATA
+    HtmlEnvironment_Idl *
+                        pEnv;
+    Dyn<DocuFile_Html>  pMyFile;
+    HtmlFactory_Idl *   pCurFactory;
+};
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/idl/makefile.mk b/autodoc/source/display/idl/makefile.mk
new file mode 100644
index 000000000000..383983a1fb22
--- /dev/null
+++ b/autodoc/source/display/idl/makefile.mk
@@ -0,0 +1,77 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=display_idl
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/hfi_constgroup.obj  \
+    $(OBJ)$/hfi_doc.obj         \
+    $(OBJ)$/hfi_enum.obj        \
+    $(OBJ)$/hfi_globalindex.obj \
+    $(OBJ)$/hfi_hierarchy.obj   \
+    $(OBJ)$/hfi_interface.obj   \
+    $(OBJ)$/hfi_method.obj      \
+    $(OBJ)$/hfi_module.obj      \
+    $(OBJ)$/hfi_navibar.obj     \
+    $(OBJ)$/hfi_property.obj    \
+    $(OBJ)$/hfi_service.obj     \
+    $(OBJ)$/hfi_singleton.obj   \
+    $(OBJ)$/hfi_siservice.obj   \
+    $(OBJ)$/hfi_struct.obj      \
+    $(OBJ)$/hfi_tag.obj         \
+    $(OBJ)$/hfi_typedef.obj     \
+    $(OBJ)$/hfi_typetext.obj    \
+    $(OBJ)$/hfi_xrefpage.obj    \
+    $(OBJ)$/hi_ary.obj        	\
+    $(OBJ)$/hi_display.obj      \
+    $(OBJ)$/hi_env.obj          \
+    $(OBJ)$/hi_factory.obj      \
+    $(OBJ)$/hi_linkhelper.obj   \
+    $(OBJ)$/hi_main.obj
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/display/inc/cfrstd.hxx b/autodoc/source/display/inc/cfrstd.hxx
new file mode 100644
index 000000000000..dce0db3b886f
--- /dev/null
+++ b/autodoc/source/display/inc/cfrstd.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 ADC_CFRSTD_HXX
+#define ADC_CFRSTD_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <display/corframe.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+
+class StdFrame : public display::CorporateFrame
+{
+  public:
+    // LIFECYCLE
+                        StdFrame();
+
+    // INQUIRY
+    virtual DYN Html_Image *
+                        LogoSrc() const;
+    virtual const char *
+                        LogoLink() const;
+    virtual const char *
+                        CopyrightText() const;
+    virtual const char *
+                        CssStyle() const;
+    virtual const char *
+                        CssStylesExplanation() const;
+    virtual const char *
+                        DevelopersGuideHtmlRoot() const;
+    virtual bool        SimpleLinks() const;
+
+    // ACCESS
+    virtual void        Set_DevelopersGuideHtmlRoot(
+                            const String &      i_directory );
+    virtual void        Set_SimpleLinks();
+
+  private:
+    String              sDevelopersGuideHtmlRoot;
+    bool                bSimpleLinks;
+};
+
+
+
+// IMPLEMENTATION
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/inc/html/chd_udk2.hxx b/autodoc/source/display/inc/html/chd_udk2.hxx
new file mode 100644
index 000000000000..b8a17b999fb5
--- /dev/null
+++ b/autodoc/source/display/inc/html/chd_udk2.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 ADC_DISPLAY_HTML_CHD_UDK2_HXX
+#define ADC_DISPLAY_HTML_CHD_UDK2_HXX
+
+// BASE CLASSES
+#include <autodoc/dsp_html_std.hxx>
+// USED SERVICES
+#include <cosv/ploc.hxx>
+
+namespace ary
+{
+namespace cpp
+{
+    class Namespace;
+    class Gate;
+}
+}
+
+class OuputPage_Environment;
+
+
+
+
+class CppHtmlDisplay_Udk2 : public autodoc::HtmlDisplay_UdkStd
+{
+  public:
+                        CppHtmlDisplay_Udk2();
+                        ~CppHtmlDisplay_Udk2();
+  private:
+    // Interface CppHtmlDisplay_UdkStd:
+    virtual void        do_Run(
+                            const char *        i_sOutputDirectory,
+                            const ary::cpp::Gate &
+                                                i_rAryGate,
+                            const display::CorporateFrame &
+                                                i_rLayout );
+
+    // Local
+    void                SetRunData(
+                            const char *        i_sOutputDirectory,
+                            const ary::cpp::Gate &
+                                                i_rAryGate,
+                            const display::CorporateFrame &
+                                                i_rLayout );
+
+    void                Create_Css_File();
+    void                Create_Overview_File();
+    void                Create_Help_File();
+    void                Create_AllDefs_File();
+    void                CreateFiles_InSubTree_Namespaces();
+    void                CreateFiles_InSubTree_Index();
+
+    void                RecursiveDisplay_Namespace(
+                            const ary::cpp::Namespace &
+                                                i_rNsp );
+    void                DisplayFiles_InNamespace(
+                            const ary::cpp::Namespace &
+                                                i_rNsp );
+    const ary::cpp::Gate &
+                        Gate() const;
+    // DATA
+    Dyn<OuputPage_Environment>
+                        pCurPageEnv;
+};
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/inc/idl/hi_display.hxx b/autodoc/source/display/inc/idl/hi_display.hxx
new file mode 100644
index 000000000000..6fb4ca50ab38
--- /dev/null
+++ b/autodoc/source/display/inc/idl/hi_display.hxx
@@ -0,0 +1,113 @@
+/* -*- 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 ADC_DISPLAY_HI_DISPLAY_HXX
+#define ADC_DISPLAY_HI_DISPLAY_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <autodoc/dsp_html_std.hxx>
+    // COMPONENTS
+#include <cosv/ploc.hxx>
+    // PARAMETERS
+
+
+
+namespace ary
+{
+    namespace idl
+    {
+        class Module;
+        class CodeEntity;
+    }   // namspace idl
+}   // namspace csi
+
+
+class MainDisplay_Idl;
+class HtmlEnvironment_Idl;
+
+class HtmlDisplay_Idl : public autodoc::HtmlDisplay_Idl_Ifc
+{
+  public:
+                        HtmlDisplay_Idl();
+                        ~HtmlDisplay_Idl();
+  private:
+    // Interface HtmlDisplay_Idl_Ifc:
+    virtual void        do_Run(
+                            const char *        i_sOutputDirectory,
+                            const ary::idl::Gate &
+                                                i_rAryGate,
+                            const display::CorporateFrame &
+                                                i_rLayout );
+    void                SetRunData(
+                            const char *        i_sOutputDirectory,
+                            const ary::idl::Gate &
+                                                i_rAryGate,
+                            const display::CorporateFrame &
+                                                i_rLayout );
+    void                Create_StartFile();
+    void                Create_FilesInNameTree();
+    void                Create_IndexFiles();
+    void                Create_FilesInProjectTree();
+    void                Create_PackageList();
+    void                Create_HelpFile();
+    void                Create_CssFile();
+
+    /** @descr
+        - makes sure, the module's directory exists
+        - creates the module's docu file
+        - creates docu files for all members of the module
+        - does the same recursive for all sub-modules.
+    */
+    void                RecursiveDisplay_Module(
+                            const ary::idl::Module &
+                                                i_rNamespace );
+    bool                IsModule(
+                            const ary::idl::CodeEntity &
+                                                i_ce ) const;
+    const ary::idl::Module &
+                        Module_Cast(            /// @precond Cast must be valid.
+                            const ary::idl::CodeEntity &
+                                                i_ce ) const;
+    // DATA
+    Dyn<HtmlEnvironment_Idl>
+                        pCurPageEnv;
+    Dyn<MainDisplay_Idl>
+                        pMainDisplay;
+};
+
+
+
+// IMPLEMENTATION
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/inc/toolkit/hf_docentry.hxx b/autodoc/source/display/inc/toolkit/hf_docentry.hxx
new file mode 100644
index 000000000000..028f47b68af1
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/hf_docentry.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 ADC_DISPLAY_HF_DOCENTRY_HXX
+#define ADC_DISPLAY_HF_DOCENTRY_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "htmlfactory.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+/** @resp
+    Produces a list of <DT>..</DT> and <DD>.
+*/
+class HF_DocEntryList : public HtmlMaker
+{
+  public:
+
+                        HF_DocEntryList(
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_DocEntryList();
+
+    Xml::Element &      Produce_Term(
+                            const char *        i_sTerm = 0 );
+    Xml::Element &      Produce_NormalTerm(     /// Font will not be bold.
+                            const char *        i_sTerm = 0 );
+    Xml::Element &      Produce_Definition();
+};
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/inc/toolkit/hf_funcdecl.hxx b/autodoc/source/display/inc/toolkit/hf_funcdecl.hxx
new file mode 100644
index 000000000000..013a8d2e123d
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/hf_funcdecl.hxx
@@ -0,0 +1,74 @@
+/* -*- 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 ADC_DISPLAY_HF_FUNCDECL_HXX
+#define ADC_DISPLAY_HF_FUNCDECL_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <toolkit/htmlfactory.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+class HF_FunctionDeclaration : public HtmlMaker
+{
+  public:
+                        HF_FunctionDeclaration(
+                            Xml::Element &      o_rParent,
+                            const String &      i_sRaisesText );
+    virtual             ~HF_FunctionDeclaration();
+
+    // OPERATIONS
+    Xml::Element &      ReturnCell();
+    Xml::Element &      NameCell();
+    Xml::Element &      NewParamTypeCell();
+    Xml::Element &      ParamNameCell();
+    Xml::Element &      ExceptionCell();
+
+  private:
+    Html::TableRow &    ParameterLine();
+
+    // DATA
+    String              sRaisesText;
+    Html::Table *       pTable;
+    Xml::Element *      pReturnCell;
+    Xml::Element *      pNameCell;
+    Html::TableRow *    pParameterLine;
+    Xml::Element *      pLastParameterCell;
+    Xml::Element *      pExceptionCell;
+};
+
+
+// IMPLEMENTATION
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/inc/toolkit/hf_linachain.hxx b/autodoc/source/display/inc/toolkit/hf_linachain.hxx
new file mode 100644
index 000000000000..143e864c700e
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/hf_linachain.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 ADC_DISPLAY_HF_LINACHAIN_HXX
+#define ADC_DISPLAY_HF_LINACHAIN_HXX
+
+// BASE CLASSES
+#include "htmlfactory.hxx"
+#include "out_position.hxx"
+
+
+
+
+class HF_LinkedNameChain : public HtmlMaker
+{
+  public:
+    /** F_LinkMaker makes a link out of the name of the
+        parent position.
+
+        Returns true, if there is a link, false if not.
+    */
+    typedef String (*F_LinkMaker)(const char *);
+
+
+                        HF_LinkedNameChain(
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_LinkedNameChain();
+
+    void                Produce_CompleteChain(
+                            const output::Position &
+                                                i_curPosition,
+                            F_LinkMaker         i_linkMaker ) const;
+    void                Produce_CompleteChain_forModule(
+                            const output::Position &
+                                                i_curPosition,  /// current Module's node
+                            F_LinkMaker         i_linkMaker ) const;
+  private:
+    void                produce_Level(
+                            output::Node &      i_levelNode,
+                            const output::Position &
+                                                i_startPosition,
+                            F_LinkMaker         i_linkMaker ) const;
+};
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/inc/toolkit/hf_navi_main.hxx b/autodoc/source/display/inc/toolkit/hf_navi_main.hxx
new file mode 100644
index 000000000000..0fbb726a4fcb
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/hf_navi_main.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 ADC_DISPLAY_HF_NAVI_MAIN_HXX
+#define ADC_DISPLAY_HF_NAVI_MAIN_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include "htmlfactory.hxx"
+    // PARAMETERS
+
+
+class HF_MainItem;
+
+
+/** @task
+    Create a HTML navigation bar with lightly coloured background.
+
+    @descr
+    There are three kinds of items:
+    Item with link:             Add_StdItem(),
+    Item without link:          Add_NoneItem(),
+    Item that is current page:  Add_SelfItem().
+*/
+class HF_NaviMainRow : public HtmlMaker
+{
+  public:
+    enum E_Style
+    {
+        eStd,
+        eSelf,
+        eNo
+    };
+                        HF_NaviMainRow(
+                            Xml::Element &      o_out );
+                        ~HF_NaviMainRow();
+
+    void                Add_StdItem(
+                            const char *        i_sText,
+                            const char *        i_sLink );
+    void                Add_SelfItem(
+                            const char *        i_sText );
+    void                Add_NoneItem(
+                            const char *        i_sText );
+
+    void                Produce_Row();
+
+  private:
+    // DATA
+    typedef std::vector< DYN HF_MainItem* > ItemList;
+
+    ItemList            aItems;
+    Xml::Element *      pRow;
+};
+
+
+
+// IMPLEMENTATION
+
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/inc/toolkit/hf_navi_sub.hxx b/autodoc/source/display/inc/toolkit/hf_navi_sub.hxx
new file mode 100644
index 000000000000..24980ed666d8
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/hf_navi_sub.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 ADC_DISPLAY_HF_NAVI_SUB_HXX
+#define ADC_DISPLAY_HFI_NAVI_SUB_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include "htmlfactory.hxx"
+    // PARAMETERS
+
+
+class HF_NaviSubRow : public HtmlMaker
+{
+  public:
+                        HF_NaviSubRow(
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_NaviSubRow();
+
+    void                AddItem(
+                            const String &      i_sText,
+                            const String &      i_sLink,
+                            bool                i_bSwitchOn );
+    void                SwitchOn(
+                            int                 i_nIndex );
+    void                Produce_Row();
+
+  private:
+    typedef std::pair<String,String>    SubRow_Data;
+    typedef std::pair<SubRow_Data,bool> SubRow_Item;
+    typedef std::vector<SubRow_Item>    SubRow;
+
+    /** Puts the row's table into the parent XML-element, but
+        doesn't write the items, because the actvity-status of
+        the subitems isn't known yet.
+    */
+    void                Setup_Row();
+
+    // DATA
+    SubRow              aRow;
+    Xml::Element *      pMyRow;
+};
+
+
+
+
+// IMPLEMENTATION
+
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/inc/toolkit/hf_title.hxx b/autodoc/source/display/inc/toolkit/hf_title.hxx
new file mode 100644
index 000000000000..d0045182ac85
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/hf_title.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 ADC_DISPLAY_HF_TITLE_HXX
+#define ADC_DISPLAY_HF_TITLE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <toolkit/htmlfactory.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+class HF_TitleTable : public HtmlMaker
+{
+  public:
+                        HF_TitleTable(
+                            Xml::Element &      o_rOut );
+    virtual             ~HF_TitleTable();
+
+    void                Produce_Title(
+                            const char *        i_title );
+    void                Produce_Title(
+                            const char *        i_annotations,
+//                            const char *        i_label,
+                            const char *        i_title );
+
+    /// @return a Html::TableCell reference.
+    Xml::Element &      Add_Row();
+};
+
+
+class HF_SubTitleTable : public HtmlMaker
+{
+  public:
+    enum E_SubLevel
+    {
+        sublevel_1,     /// Big title.
+        sublevel_2,     /// Small title.
+        sublevel_3      /// No title.
+    };
+
+    /** @param i_nColumns [1 .. n]
+        @param i_nSubTitleLevel [1 .. 2]
+        1 is a bit bigger than 2.
+    */
+
+                        HF_SubTitleTable(
+                            Xml::Element &      o_rOut,
+                            const String &      i_label,
+                            const String &      i_title,
+                            int                 i_nColumns,
+                            E_SubLevel          i_eSubTitleLevel = sublevel_1 );
+    virtual             ~HF_SubTitleTable();
+
+    /// @return an Html::TableRow reference.
+    Xml::Element &      Add_Row();
+};
+
+
+// IMPLEMENTATION
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/inc/toolkit/htmlfactory.hxx b/autodoc/source/display/inc/toolkit/htmlfactory.hxx
new file mode 100644
index 000000000000..4be72412832e
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/htmlfactory.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 ADC_DISPLAY_HTMLFACTORY_HXX
+#define ADC_DISPLAY_HTMLFACTORY_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include "outputstack.hxx"
+    // PARAMETERS
+#include <udm/xml/xmlitem.hxx>
+#include <udm/html/htmlitem.hxx>
+
+namespace Xml = ::csi::xml;
+namespace Html = ::csi::html;
+
+/** @resp
+    Base class for HTML page creators (factories) for code entites or
+    similar items.
+*/
+template <class ENV>
+class HtmlFactory
+{
+  public:
+    // INQUIRY
+    ENV &               Env() const             { return *pEnv; }
+    Xml::Element &      CurOut() const          { return aDestination.Out(); }
+
+    // ACCESS
+    OutputStack &       Out() const             { return aDestination; }
+
+  protected:
+                        HtmlFactory(
+                            ENV &               io_rEnv,
+                            Xml::Element *      o_pOut = 0 )
+                            :   pEnv(&io_rEnv)  { if (o_pOut != 0) aDestination.Enter(*o_pOut); }
+                        ~HtmlFactory() {}
+  private:
+    // DATA
+    ENV *               pEnv;
+    mutable OutputStack aDestination;
+};
+
+
+/** @resp
+    Base class for HTML paragraph creators, which are to be put into
+    a parent HTML element.
+*/
+class HtmlMaker
+{
+  public:
+
+    // INQUIRY
+    Xml::Element &      CurOut() const          { return *pOut; }
+
+  protected:
+                        HtmlMaker(
+                            Xml::Element &      o_rOut )
+                            :   pOut(&o_rOut)   {}
+  private:
+    // DATA
+    Xml::Element *      pOut;
+};
+
+
+
+
+// IMPLEMENTATION
+
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/inc/toolkit/htmlfile.hxx b/autodoc/source/display/inc/toolkit/htmlfile.hxx
new file mode 100644
index 000000000000..ae4f773e6680
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/htmlfile.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 ADC_DISPLAY_HTMLFILE_HXX
+#define ADC_DISPLAY_HTMLFILE_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <udm/html/htmlitem.hxx>
+    // PARAMETERS
+#include <cosv/ploc.hxx>
+
+namespace csv
+{
+     class File;
+}
+
+/** Represents an HTML output file.
+*/
+class DocuFile_Html
+{
+  public:
+    // LIFECYCLE
+                        DocuFile_Html();
+
+    void                SetLocation(
+                            const csv::ploc::Path &
+                                                i_rFilePath );
+    void                SetTitle(
+                            const char *        i_sTitle );
+    void                SetRelativeCssPath(
+                            const char *        i_sCssFile_relativePath );
+    void                SetCopyright(
+                            const char *        i_sCopyright );
+    void                EmptyBody();
+
+    Html::Body &        Body()                  { return aBodyData; }
+    bool                CreateFile();
+
+  private:
+    void                WriteHeader(
+                            csv::File &         io_aFile );
+    void                WriteBody(
+                            csv::File &         io_aFile );
+    // DATA
+    String              sFilePath;
+    String              sTitle;
+    String              sLocation;
+    String              sStyle;
+    String              sCssFile;
+    String              sCopyright;
+
+    Html::Body          aBodyData;
+    StreamStr           aBuffer;
+};
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/inc/toolkit/out_node.hxx b/autodoc/source/display/inc/toolkit/out_node.hxx
new file mode 100644
index 000000000000..d870a4e26390
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/out_node.hxx
@@ -0,0 +1,126 @@
+/* -*- 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 ADC_DISPLAY_OUT_NODE_HXX
+#define ADC_DISPLAY_OUT_NODE_HXX
+
+namespace output
+{
+
+
+/** @resp
+    Represents a tree of names where each node can have only one parent,
+    but a list of children.
+
+    @see    Position
+    @see    Tree
+*/
+class Node
+{
+public:
+    typedef std::vector< Node* >    NodeList;
+    typedef UINT32                  relative_id;
+
+      // LIFECYCLE
+    enum E_NullObject   { null_object };
+
+                        Node();
+    explicit            Node( E_NullObject );
+                        ~Node();
+
+    // OPERATORS
+    bool                operator==( const Node& i_node ) const
+                        { return pParent == i_node.pParent AND sName == i_node.sName; }
+
+    bool                operator!=( const Node& i_node ) const
+                        { return NOT operator==(i_node); }
+
+    // OPERATIONS
+    /// Seek, and if not existent, create.
+    Node&               Provide_Child( const String& i_name );
+
+    /// Seek, and if not existent, create.
+    Node&               Provide_Child( const StringVector& i_path )
+                        { return provide_Child(i_path.begin(), i_path.end()); }
+      // INQUIRY
+    intt                Depth() const           { return nDepth; }
+
+    const String &      Name() const            { return sName; }
+
+    /// @return Id of a namespace or class etc. this directory represents.
+    relative_id         RelatedNameRoom() const { return nNameRoomId; }
+    /// @return No delimiter at start, with delimiter at end.
+    void                Get_Path(
+                            StreamStr &         o_result,
+                            intt                i_maxDepth = -1
+                        ) const;
+
+    void                Get_Chain(
+                            StringVector &      o_result,
+                            intt                i_maxDepth = -1
+                        ) const;
+
+    // ACCESS
+    void                Set_RelatedNameRoom( relative_id i_nNameRoomId )
+                        { nNameRoomId = i_nNameRoomId; }
+
+    Node*               Parent()                { return pParent; }
+    Node*               Child( const String& i_name )
+                        { return find_Child(i_name); }
+
+    /// @return a reference to a Node with Depth() == -1.
+    static Node&        Null_();
+
+private:
+    // Local
+                        Node(
+                            const String&   i_name,
+                            Node&           i_parent
+                        );
+
+    Node*               find_Child( const String& i_name );
+
+    Node&               add_Child( const String& i_name );
+
+    Node&               provide_Child(
+                            StringVector::const_iterator i_next,
+                            StringVector::const_iterator i_end
+                        );
+    // Data
+    String              sName;
+    Node*               pParent;
+    NodeList            aChildren;
+    intt                nDepth;
+    relative_id         nNameRoomId;
+};
+
+
+}   // namespace output
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/inc/toolkit/out_position.hxx b/autodoc/source/display/inc/toolkit/out_position.hxx
new file mode 100644
index 000000000000..0bc236cdf871
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/out_position.hxx
@@ -0,0 +1,120 @@
+/* -*- 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 ADC_DISPLAY_OUT_POSITION_HXX
+#define ADC_DISPLAY_OUT_POSITION_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <toolkit/out_node.hxx>
+    // PARAMETERS
+
+
+
+namespace output
+{
+
+
+
+class Position
+{
+  public:
+    // LIFECYCLE
+                        Position();
+    explicit            Position(
+                            Node &              i_directory,
+                            const String &      i_file = String::Null_() );
+                        Position(
+                            const Position &    i_directory,
+                            const String &      i_rDifferentFile );
+                        ~Position();
+
+    // OPERATIONS
+    Position &          operator=(
+                            Node &              i_node );
+    Position &          operator+=(
+                            const String &      i_nodeName );
+    Position &          operator-=(
+                            intt                i_levels );
+
+    // INQUIRY
+    bool                IsValid() const         { return pDirectory->Depth() >= 0; }
+    const String &      Name() const            { return pDirectory->Name(); }
+    const String &      File() const            { return sFile; }
+    intt                Depth() const           { return pDirectory->Depth(); }
+
+    void                Get_Chain(
+                            StringVector &      o_result ) const
+                                                { pDirectory->Get_Chain(o_result); }
+    String              LinkToRoot(
+                            const String &      i_localLabel = String::Null_() ) const;
+
+    void                Get_LinkTo(
+                            StreamStr &         o_result,
+                            const Position &    i_destination,
+                            const String &      i_localLabel = String::Null_() ) const;
+    void                Get_LinkToRoot(
+                            StreamStr &         o_result,
+                            const String &      i_localLabel = String::Null_() ) const;
+
+    static char         Delimiter()             { return '/'; }
+
+    // ACCESS
+    Node &              RelatedNode() const     { return *pDirectory; }
+
+    void                Set(
+                            Node &              i_node,
+                            const String &      i_file = String::Null_() );
+    void                Set_File(
+                            const String &      i_file );
+
+  private:
+    // DATA
+    String              sFile;
+    Node *              pDirectory;
+};
+
+
+/// @return No delimiter at start, with delimiter at end.
+const char *        get_UpLink(
+                        uintt                   i_depth );
+
+
+// IMPLEMENTATION
+
+inline void
+Position::Set_File( const String & i_file )
+    { sFile = i_file; }
+
+}   // namespace output
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/inc/toolkit/out_tree.hxx b/autodoc/source/display/inc/toolkit/out_tree.hxx
new file mode 100644
index 000000000000..d04d51b780d4
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/out_tree.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 ADC_DISPLAY_OUT_TREE_HXX
+#define ADC_DISPLAY_OUT_TREE_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include "out_position.hxx"
+    // PARAMETERS
+
+
+namespace output
+{
+
+inline const char *
+ModuleFileName()
+{ return "module-ix.html"; }
+inline const char *
+IndexFilesDirName()
+{ return "index-files"; }
+inline const char *
+IndexFile_A()
+{ return "index-1.html"; }
+
+
+class Tree
+{
+  public:
+    // LIFECYCLE
+                        Tree();
+                        ~Tree();
+
+    // OPERATIONS
+    void                Set_Overview(
+                            const StringVector &
+                                                i_path,
+                            const String &      i_sFileName );
+    Node &              Set_NamesRoot(
+                            const StringVector &
+                                                i_path );
+    Node &              Set_IndexRoot(
+                            const StringVector &
+                                                i_path );
+    Node &              Set_ProjectsRoot(
+                            const StringVector &
+                                                i_path );
+    Node &              Provide_Node(
+                            const StringVector &
+                                                i_path );
+
+    // ACCESS
+    Node &              RootNode()              { return *pRoot; }
+    Node &              NamesRootNode()         { return *pNamesRoot; }
+    Node &              IndexRootNode()         { return *pIndexRoot; }
+    Node &              ProjectsRootNode()      { return *pProjectsRoot; }
+
+    Position            Root()                  { return Position(*pRoot); }
+    Position            Overview()              { return aOverview; }
+    Position            NamesRoot()             { return Position(*pNamesRoot); }
+    Position            IndexRoot()             { return Position(*pIndexRoot); }
+    Position            ProjectsRoot()          { return Position(*pProjectsRoot); }
+
+  private:
+    // forbidden:
+                        Tree(const Tree&);
+    Tree &              operator=(const Tree&);
+
+    // DATA
+    Dyn<Node>           pRoot;
+    Node *              pNamesRoot;
+    Node *              pIndexRoot;
+    Node *              pProjectsRoot;
+    Position            aOverview;
+};
+
+
+// IMPLEMENTATION
+
+inline Node &
+Tree::Provide_Node( const StringVector & i_path )
+    { return pRoot->Provide_Child(i_path); }
+
+
+inline void
+Tree::Set_Overview( const StringVector & i_path,
+                    const String &       i_sFileName )
+    { aOverview.Set(Provide_Node(i_path), i_sFileName); }
+
+inline Node &
+Tree::Set_NamesRoot( const StringVector & i_path )
+    { pNamesRoot = &Provide_Node(i_path);
+      return *pNamesRoot; }
+
+inline Node &
+Tree::Set_IndexRoot( const StringVector & i_path )
+    { pIndexRoot = &Provide_Node(i_path);
+      return *pIndexRoot; }
+
+inline Node &
+Tree::Set_ProjectsRoot( const StringVector & i_path )
+    { pProjectsRoot = &Provide_Node(i_path);
+      return *pProjectsRoot; }
+
+
+
+}   // namespace output
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/inc/toolkit/outputstack.hxx b/autodoc/source/display/inc/toolkit/outputstack.hxx
new file mode 100644
index 000000000000..e874516ff157
--- /dev/null
+++ b/autodoc/source/display/inc/toolkit/outputstack.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 ADC_DISPLAY_OUTPUTSTACK_HXX
+#define ADC_DISPLAY_OUTPUTSTACK_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <estack.hxx>
+    // PARAMETERS
+#include <udm/xml/xmlitem.hxx>
+
+
+class OutputStack
+{
+  public:
+    // LIFECYCLE
+                        OutputStack();
+                        ~OutputStack();
+
+    // OPERATIONS
+    void                Enter(
+                            csi::xml::Element & io_rDestination );
+    void                Leave();
+
+    // ACCESS
+    csi::xml::Element & Out() const;                  // CurOutputNode
+
+  private:
+    EStack< csi::xml::Element * >
+                        aCurDestination;        // The front element is the currently used.
+                                                //   The later ones are the parents.
+};
+
+inline csi::xml::Element &
+OutputStack::Out() const
+{
+    csv_assert( aCurDestination.size() > 0 );
+    return *aCurDestination.top();
+}
+
+// IMPLEMENTATION
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/kernel/displfct.cxx b/autodoc/source/display/kernel/displfct.cxx
new file mode 100644
index 000000000000..4e2973d4c359
--- /dev/null
+++ b/autodoc/source/display/kernel/displfct.cxx
@@ -0,0 +1,91 @@
+/* -*- 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 <precomp.h>
+#include "displfct.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <html/chd_udk2.hxx>
+#include <idl/hi_display.hxx>
+#include <cfrstd.hxx>
+
+
+DYN DisplayToolsFactory * DisplayToolsFactory::dpTheInstance_ = 0;
+
+
+namespace autodoc
+{
+
+DisplayToolsFactory_Ifc &
+DisplayToolsFactory_Ifc::GetIt_()
+{
+    if ( DisplayToolsFactory::dpTheInstance_ == 0 )
+        DisplayToolsFactory::dpTheInstance_ = new DisplayToolsFactory;
+    return *DisplayToolsFactory::dpTheInstance_;
+}
+
+}   // namespace autodoc
+
+
+DisplayToolsFactory::DisplayToolsFactory()
+{
+}
+
+DisplayToolsFactory::~DisplayToolsFactory()
+{
+}
+
+// DYN autodoc::TextDisplay_FunctionList_Ifc *
+// DisplayToolsFactory::Create_TextDisplay_FunctionList() const
+// {
+//      return new CppTextDisplay_FunctionList;
+// }
+
+
+DYN autodoc::HtmlDisplay_UdkStd *
+DisplayToolsFactory::Create_HtmlDisplay_UdkStd() const
+{
+    return new CppHtmlDisplay_Udk2;
+}
+
+DYN autodoc::HtmlDisplay_Idl_Ifc *
+DisplayToolsFactory::Create_HtmlDisplay_Idl() const
+{
+    return new HtmlDisplay_Idl;
+}
+
+const display::CorporateFrame &
+DisplayToolsFactory::Create_StdFrame() const
+{
+    static StdFrame aFrame;
+    return aFrame;
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/kernel/displfct.hxx b/autodoc/source/display/kernel/displfct.hxx
new file mode 100644
index 000000000000..cd0274078162
--- /dev/null
+++ b/autodoc/source/display/kernel/displfct.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 ADC_DISPLAY_DISPLFCT_HXX
+#define ADC_DISPLAY_DISPLFCT_HXX
+
+
+#include <autodoc/displaying.hxx>
+
+
+/** Interface for parsing code of a programming language and
+    delivering the information into an Autodoc Repository.
+**/
+class DisplayToolsFactory : public autodoc::DisplayToolsFactory_Ifc
+{
+  public:
+                        DisplayToolsFactory();
+    virtual             ~DisplayToolsFactory();
+
+//    virtual DYN autodoc::TextDisplay_FunctionList_Ifc *
+//                        Create_TextDisplay_FunctionList() const;
+
+    virtual DYN autodoc::HtmlDisplay_UdkStd *
+                        Create_HtmlDisplay_UdkStd() const;
+    virtual DYN autodoc::HtmlDisplay_Idl_Ifc *
+                        Create_HtmlDisplay_Idl() const;
+
+    virtual const display::CorporateFrame &
+                        Create_StdFrame() const;
+  private:
+    static DYN DisplayToolsFactory *
+                        dpTheInstance_;
+
+    friend class autodoc::DisplayToolsFactory_Ifc;
+};
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/kernel/makefile.mk b/autodoc/source/display/kernel/makefile.mk
new file mode 100644
index 000000000000..992456dcd667
--- /dev/null
+++ b/autodoc/source/display/kernel/makefile.mk
@@ -0,0 +1,55 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=display_kernel
+TARGETTYPE=CUI
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/displfct.obj	
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/display/toolkit/hf_docentry.cxx b/autodoc/source/display/toolkit/hf_docentry.cxx
new file mode 100644
index 000000000000..961ee34ebee3
--- /dev/null
+++ b/autodoc/source/display/toolkit/hf_docentry.cxx
@@ -0,0 +1,77 @@
+/* -*- 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 <precomp.h>
+#include <toolkit/hf_docentry.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+HF_DocEntryList::HF_DocEntryList( Xml::Element & o_out )
+    :   HtmlMaker( o_out >>* new Html::DefList )
+{
+}
+
+HF_DocEntryList::~HF_DocEntryList()
+{
+}
+
+Xml::Element &
+HF_DocEntryList::Produce_Term(const char * i_sTerm )
+{
+    Xml::Element &
+        ret = CurOut()
+           >> *new Html::DefListTerm
+              >> *new Html::Bold;
+    if ( NOT csv::no_str(i_sTerm))
+        ret
+            << i_sTerm;
+    return ret;
+}
+
+Xml::Element &
+HF_DocEntryList::Produce_NormalTerm(const char * i_sTerm)
+{
+    Xml::Element &
+        ret = CurOut()
+           >> *new Html::DefListTerm;
+    if ( NOT csv::no_str(i_sTerm))
+        ret
+            << i_sTerm;
+    return ret;
+}
+
+Xml::Element &
+HF_DocEntryList::Produce_Definition()
+{
+    return CurOut()
+           >> *new Html::DefListDefinition;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/toolkit/hf_funcdecl.cxx b/autodoc/source/display/toolkit/hf_funcdecl.cxx
new file mode 100644
index 000000000000..4f0c652b1934
--- /dev/null
+++ b/autodoc/source/display/toolkit/hf_funcdecl.cxx
@@ -0,0 +1,159 @@
+/* -*- 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 <precomp.h>
+#include <toolkit/hf_funcdecl.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+const String C_sValignTop("top");
+const String C_sValignBottom("bottom");
+
+
+
+HF_FunctionDeclaration::HF_FunctionDeclaration( Xml::Element & o_rParent,
+                                                const String & i_sRaisesText )
+    :   HtmlMaker(o_rParent),
+        sRaisesText(i_sRaisesText),
+        pTable(0),
+        pReturnCell(0),
+        pNameCell(0),
+        pParameterLine(0),
+        pLastParameterCell(0),
+        pExceptionCell(0)
+{
+    pTable = new Html::Table;
+    CurOut()
+        >> *pTable
+            << new Html::ClassAttr("table-in-method")
+            << new Xml::AnAttribute("border","0");
+}
+
+HF_FunctionDeclaration::~HF_FunctionDeclaration()
+{
+}
+
+Xml::Element &
+HF_FunctionDeclaration::ReturnCell()
+{
+    if (pReturnCell != 0)
+        return *pReturnCell;
+
+    pReturnCell = &( *pTable
+                        >> *new Html::TableRow
+                            >> *new Html::TableCell
+                                << new Html::VAlignAttr(C_sValignTop)
+                                << new Xml::AnAttribute("colspan", "3")
+                    );
+    return *pReturnCell;
+}
+
+Xml::Element &
+HF_FunctionDeclaration::NameCell()
+{
+    if (pNameCell != 0)
+        return *pNameCell;
+
+    pNameCell = &( ParameterLine()
+                    >> *new Html::TableCell
+                        << new Html::VAlignAttr(C_sValignTop)
+                 );
+    pLastParameterCell = pNameCell;
+
+    return *pNameCell;
+}
+
+Xml::Element &
+HF_FunctionDeclaration::NewParamTypeCell()
+{
+    if (pLastParameterCell != pNameCell)
+    {
+        pParameterLine = 0;
+        ParameterLine()
+            >> *new Html::TableCell;
+    }
+
+    Xml::Element &
+        rParamType = ParameterLine()
+                        >> *new Html::TableCell
+                            << new Html::VAlignAttr(C_sValignTop);
+    pLastParameterCell
+                   = &( ParameterLine()
+                            >> *new Html::TableCell
+                                << new Html::VAlignAttr(C_sValignBottom)
+                                << new Xml::XmlCode("&nbsp;")
+                      );
+    return rParamType;
+}
+
+Xml::Element &
+HF_FunctionDeclaration::ParamNameCell()
+{
+    csv_assert(pLastParameterCell != pNameCell);
+    return *pLastParameterCell;
+}
+
+Xml::Element &
+HF_FunctionDeclaration::ExceptionCell()
+{
+    if (pExceptionCell != 0)
+        return *pExceptionCell;
+
+    Xml::Element &
+        rExceptionRow = *pTable
+                            >> *new Html::TableRow;
+    rExceptionRow
+        >> *new Html::TableCell
+            << new Html::VAlignAttr(C_sValignTop)
+            << new Xml::AnAttribute("align", "right")
+            << sRaisesText
+            << "( ";
+
+    pExceptionCell = &( rExceptionRow
+                            >> *new Html::TableCell
+                                << new Html::VAlignAttr(C_sValignTop)
+                                << new Xml::AnAttribute("colspan", "2")
+                      );
+    return *pExceptionCell;
+}
+
+Html::TableRow &
+HF_FunctionDeclaration::ParameterLine()
+{
+    if (pParameterLine != 0)
+        return *pParameterLine;
+
+    pParameterLine = new Html::TableRow;
+    *pTable
+        >> *pParameterLine;
+
+    return *pParameterLine;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/toolkit/hf_linachain.cxx b/autodoc/source/display/toolkit/hf_linachain.cxx
new file mode 100644
index 000000000000..1d603d0a4b93
--- /dev/null
+++ b/autodoc/source/display/toolkit/hf_linachain.cxx
@@ -0,0 +1,113 @@
+/* -*- 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 <precomp.h>
+#include <toolkit/hf_linachain.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <toolkit/out_position.hxx>
+
+
+
+HF_LinkedNameChain::HF_LinkedNameChain( Xml::Element & o_rOut )
+    :   HtmlMaker( o_rOut
+                        >> *new Html::Paragraph
+                            << new Html::ClassAttr("namechain") )
+{
+}
+
+HF_LinkedNameChain::~HF_LinkedNameChain()
+{
+}
+
+void
+HF_LinkedNameChain::Produce_CompleteChain( const output::Position & i_curPosition,
+                                           F_LinkMaker              i_linkMaker ) const
+{
+    produce_Level(i_curPosition.RelatedNode(), i_curPosition, i_linkMaker);
+}
+
+void
+HF_LinkedNameChain::Produce_CompleteChain_forModule( const output::Position &  i_curPosition,
+                                                     F_LinkMaker               i_linkMaker ) const
+{
+    if (i_curPosition.Depth() == 0)
+        return;
+    produce_Level(*i_curPosition.RelatedNode().Parent(), i_curPosition, i_linkMaker);
+}
+
+
+
+namespace
+{
+
+StreamStr aLinkBuf(200);
+
+}
+
+void
+HF_LinkedNameChain::produce_Level( output::Node &           i_levelNode,
+                                   const output::Position & i_startPosition,
+                                   F_LinkMaker              i_linkMaker ) const
+{
+    if ( i_levelNode.Depth() > 0 )
+    {
+        produce_Level( *i_levelNode.Parent(),
+                       i_startPosition,
+                       i_linkMaker );
+    }
+
+    aLinkBuf.reset();
+
+    String
+        sFileName = (*i_linkMaker)(i_levelNode.Name());
+    output::Position
+        aLevelPos(i_levelNode, sFileName);
+
+    i_startPosition.Get_LinkTo(aLinkBuf, aLevelPos);
+
+    if ( i_levelNode.Depth() > 0 )
+    {
+        CurOut()
+        >> *new Html::Link(aLinkBuf.c_str())
+            << new Html::ClassAttr("namechain")
+            << i_levelNode.Name();
+        CurOut() << " :: ";
+    }
+    else
+    {
+        CurOut()
+        >> *new Html::Link(aLinkBuf.c_str())
+            << new Html::ClassAttr("namechain")
+            << "::";
+        CurOut() << " ";
+    }
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/toolkit/hf_navi_main.cxx b/autodoc/source/display/toolkit/hf_navi_main.cxx
new file mode 100644
index 000000000000..ab378a153bca
--- /dev/null
+++ b/autodoc/source/display/toolkit/hf_navi_main.cxx
@@ -0,0 +1,240 @@
+/* -*- 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 <precomp.h>
+#include <toolkit/hf_navi_main.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+
+
+
+//********************    MainItem and derived ones      ***************//
+class HF_MainItem : public HtmlMaker
+{
+  public:
+    virtual             ~HF_MainItem() {}
+    void                Produce_Item() const    { do_ProduceItem(); }
+  protected:
+                        HF_MainItem(
+                            Xml::Element &      o_out )
+                                                :   HtmlMaker(o_out) {}
+  private:
+    virtual void        do_ProduceItem() const = 0;
+};
+
+
+namespace
+{
+
+class StdItem : public HF_MainItem
+{
+  public:
+                        StdItem(
+                            Xml::Element &      o_out,
+                            const char *        i_sText,
+                            const char *        i_sLink );
+
+                        ~StdItem();
+  private:
+    virtual void        do_ProduceItem() const;
+
+    // DATA
+    String              sText;
+    String              sLink;
+};
+
+class SelfItem : public HF_MainItem
+{
+  public:
+                        SelfItem(
+                            Xml::Element &      o_out,
+                            const char *        i_sText );
+                        ~SelfItem();
+  private:
+    virtual void        do_ProduceItem() const;
+
+    // DATA
+    String              sText;
+};
+
+class NoneItem : public HF_MainItem
+{
+  public:
+                        NoneItem(
+                            Xml::Element &      o_out,
+                            const char *        i_sText );
+                        ~NoneItem();
+  private:
+    virtual void        do_ProduceItem() const;
+
+    // DATA
+    String              sText;
+};
+
+}   // anonymous namespace
+
+
+
+//********************    HF_NaviMainRow      ***************//
+
+
+
+HF_NaviMainRow::HF_NaviMainRow( Xml::Element & o_out )
+    :   HtmlMaker(o_out),
+        aItems(),
+        pRow(0)
+{
+    aItems.reserve(5);
+
+    pRow =
+    &(  CurOut()
+        >> *new Html::Table
+           << new Html::ClassAttr("navimain")
+           << new Xml::AnAttribute( "border", "0" )
+           << new Xml::AnAttribute( "cellpadding", "3" )
+           >> *new Html::TableRow
+     );
+}
+
+HF_NaviMainRow::~HF_NaviMainRow()
+{
+    csv::erase_container_of_heap_ptrs(aItems);
+}
+
+void
+HF_NaviMainRow::Add_StdItem( const char * i_sText,
+                             const char * i_sLink )
+{
+    aItems.push_back(new StdItem( *pRow,i_sText,i_sLink ));
+}
+
+void
+HF_NaviMainRow::Add_SelfItem( const char * i_sText )
+{
+    aItems.push_back(new SelfItem( *pRow,i_sText ));
+}
+
+void
+HF_NaviMainRow::Add_NoneItem( const char * i_sText )
+{
+    aItems.push_back(new NoneItem( *pRow,i_sText ));
+}
+
+void
+HF_NaviMainRow::Produce_Row()
+{
+    ItemList::iterator itEnd = aItems.end();
+    for ( ItemList::iterator iter = aItems.begin();
+          iter != itEnd;
+          ++iter )
+    {
+         (*iter)->Produce_Item();
+    }
+}
+
+
+
+
+//********************    MainItem and derived ones      ***************//
+
+namespace
+{
+
+StdItem::StdItem( Xml::Element &      o_out,
+                  const char *        i_sText,
+                  const char *        i_sLink )
+    :   HF_MainItem(o_out),
+        sText(i_sText),
+        sLink(i_sLink)
+{
+}
+
+StdItem::~StdItem()
+{
+}
+
+void
+StdItem::do_ProduceItem() const
+{
+    Xml::Element &
+                rCell = CurOut() >>* new Html::TableCell;
+    rCell
+        << new Html::ClassAttr( "navimain" )
+        >> *new Html::Link(sLink.c_str())
+            << new Html::ClassAttr( "navimain" )
+            << sText.c_str();
+}
+
+SelfItem::SelfItem( Xml::Element &      o_out,
+                    const char *        i_sText )
+    :   HF_MainItem(o_out),
+        sText(i_sText)
+{
+}
+
+SelfItem::~SelfItem()
+{
+}
+
+void
+SelfItem::do_ProduceItem() const
+{
+    Xml::Element &
+                rCell = CurOut() >>* new Html::TableCell;
+    rCell
+        << new Html::ClassAttr( "navimainself" )
+        << sText.c_str();
+}
+
+NoneItem::NoneItem( Xml::Element &      o_out,
+                    const char *        i_sText )
+    :   HF_MainItem(o_out),
+        sText(i_sText)
+{
+}
+
+NoneItem::~NoneItem()
+{
+}
+
+void
+NoneItem::do_ProduceItem() const
+{
+    Xml::Element &
+                rCell = CurOut() >>* new Html::TableCell;
+    rCell
+        << new Html::ClassAttr( "navimainnone" )
+        << sText.c_str();
+}
+
+}   // anonymous namespace
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/toolkit/hf_navi_sub.cxx b/autodoc/source/display/toolkit/hf_navi_sub.cxx
new file mode 100644
index 000000000000..c983ddfe69ca
--- /dev/null
+++ b/autodoc/source/display/toolkit/hf_navi_sub.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <toolkit/hf_navi_sub.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+HF_NaviSubRow::HF_NaviSubRow( Xml::Element & o_rOut )
+    :   HtmlMaker(o_rOut),
+        aRow(),
+        pMyRow(0)
+{
+    Setup_Row();
+}
+
+HF_NaviSubRow::~HF_NaviSubRow()
+{
+}
+
+void
+HF_NaviSubRow::AddItem( const String &      i_sText,
+                        const String &      i_sLink,
+                        bool                i_bSwitchOn )
+{
+    aRow.push_back( SubRow_Item( SubRow_Data(i_sText,i_sLink),
+                                 i_bSwitchOn ));
+}
+
+void
+HF_NaviSubRow::SwitchOn( int i_nIndex )
+{
+    if ( i_nIndex < int(aRow.size()) )
+        aRow[i_nIndex].second = true;
+}
+
+void
+HF_NaviSubRow::Setup_Row()
+{
+    Html::Table *
+                pTable = new Html::Table;
+    CurOut()
+        >> *pTable
+           << new Html::ClassAttr("navisub")
+           << new Xml::AnAttribute( "border", "0" )
+           << new Xml::AnAttribute( "cellpadding", "0" );
+    pMyRow = &pTable->AddRow();
+}
+
+void
+HF_NaviSubRow::Produce_Row()
+{
+    for ( SubRow::const_iterator it = aRow.begin();
+          it != aRow.end();
+          ++it )
+    {
+        Xml::Element &
+            rCell = *pMyRow
+                     >> *new Html::TableCell
+                         << new Html::ClassAttr("navisub");
+        StreamLock sl(100);
+        Xml::Element &
+            rGoon = (*it).second
+                            ?   ( rCell
+                                  >> *new Html::Link( sl()
+                                                      << "#"
+                                                      << (*it).first.second
+                                                      << c_str )
+                                     << new Html::ClassAttr("navisub")
+                                )
+                            :   rCell;
+        rGoon
+            << (*it).first.first;
+    }
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/toolkit/hf_title.cxx b/autodoc/source/display/toolkit/hf_title.cxx
new file mode 100644
index 000000000000..e68f7a1afb21
--- /dev/null
+++ b/autodoc/source/display/toolkit/hf_title.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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <toolkit/hf_title.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <stdlib.h>
+
+
+const String C_sTitleBorder("0");
+const String C_sTitleWidth("100%");
+const String C_sTitlePadding("5");
+const String C_sTitleSpacing("3");
+
+const String C_sSubTitleBorder("1");
+const String C_sSubTitleWidth("100%");
+const String C_sSubTitlePadding("5");
+const String C_sSubTitleSpacing("0");
+const String C_sColSpan("colspan");
+
+
+HF_TitleTable::HF_TitleTable( Xml::Element & o_rOut )
+    :   HtmlMaker(o_rOut >> *new Html::Table( C_sTitleBorder,
+                                              C_sTitleWidth,
+                                              C_sTitlePadding,
+                                              C_sTitleSpacing )
+                            << new Html::ClassAttr("title-table")
+                            << new Html::StyleAttr("margin-bottom:6pt;") )
+{
+}
+
+HF_TitleTable::~HF_TitleTable()
+{
+}
+
+void
+HF_TitleTable::Produce_Title( const char * i_title )
+{
+    Add_Row()
+        << new Html::ClassAttr("title")
+        << i_title;
+}
+
+void
+HF_TitleTable::Produce_Title( const char *        i_annotations,
+                              const char *        i_title )
+{
+    if (csv::no_str(i_annotations))
+    {
+        Produce_Title(i_title);
+        return;
+    }
+
+    Xml::Element &
+        rRow = Add_Row();
+    rRow
+        << new Html::ClassAttr("title");
+
+    Xml::Element &
+        rTable = rRow
+                    >> *new Html::Table()
+                        << new Html::ClassAttr("title-table")
+                        << new Html::WidthAttr("99%");
+    Xml::Element &
+        rInnerRow = rTable
+                        >> *new Html::TableRow;
+    rInnerRow
+        >> *new Html::TableCell
+            << new Html::WidthAttr("25%")
+            << new Html::ClassAttr("title2")
+            << i_annotations;
+    rInnerRow
+        >> *new Html::TableCell
+            << new Html::WidthAttr("50%")
+            << new Html::ClassAttr("title")
+            << i_title;
+    rInnerRow
+        >> *new Html::TableCell
+            << new Html::WidthAttr("*");
+}
+
+Xml::Element &
+HF_TitleTable::Add_Row()
+{
+    return CurOut()
+            >> *new Html::TableRow
+                >> *new Html::TableCell;
+}
+
+
+inline const char *
+get_SubTitleCssClass(HF_SubTitleTable::E_SubLevel i_eSubTitleLevel)
+{
+    return i_eSubTitleLevel == HF_SubTitleTable::sublevel_1
+            ?   "subtitle"
+            :   "crosstitle";
+}
+
+
+HF_SubTitleTable::HF_SubTitleTable( Xml::Element &      o_rOut,
+                                    const String &      i_label,
+                                    const String &      i_title,
+                                    int                 i_nColumns,
+                                    E_SubLevel          i_eSubTitleLevel )
+    :   HtmlMaker( o_rOut
+                    << new Html::Label(i_label)
+                    >> *new Html::Table( C_sSubTitleBorder,
+                                         C_sSubTitleWidth,
+                                         C_sSubTitlePadding,
+                                         C_sSubTitleSpacing )
+                        << new Html::ClassAttr(get_SubTitleCssClass(i_eSubTitleLevel)) )
+{
+    csv_assert(i_nColumns > 0);
+
+    if (i_eSubTitleLevel == sublevel_3)
+        return;
+
+    Xml::Element &
+        rCell = CurOut()
+                    >> *new Html::TableRow
+                        >> *new Html::TableCell
+                        << new Html::ClassAttr(get_SubTitleCssClass(i_eSubTitleLevel)) ;
+
+    if (i_nColumns > 1)
+    {
+        StreamLock sl(20);
+        String sColumns = sl() << i_nColumns << c_str;
+        rCell
+            << new Xml::AnAttribute(C_sColSpan, sColumns);
+    }
+    rCell
+        << i_title;
+}
+
+HF_SubTitleTable::~HF_SubTitleTable()
+{
+}
+
+Xml::Element &
+HF_SubTitleTable::Add_Row()
+{
+    return CurOut() >> *new Html::TableRow;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/toolkit/htmlfile.cxx b/autodoc/source/display/toolkit/htmlfile.cxx
new file mode 100644
index 000000000000..f0387f485492
--- /dev/null
+++ b/autodoc/source/display/toolkit/htmlfile.cxx
@@ -0,0 +1,213 @@
+/* -*- 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 <precomp.h>
+#include <toolkit/htmlfile.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/file.hxx>
+#include <udm/html/htmlitem.hxx>
+
+namespace
+{
+bool            bUse_OOoFrameDiv = true;
+const String    C_sOOoFrameDiv_IdlId("adc-idlref");
+}
+
+using namespace csi;
+using csi::xml::AnAttribute;
+
+DocuFile_Html::DocuFile_Html()
+    :   sFilePath(),
+        sTitle(),
+        sLocation(),
+        sStyle(),
+        sCssFile(),
+        sCopyright(),
+        aBodyData(),
+        aBuffer(60000) // Grows dynamically, when necessary.
+{
+}
+
+void
+DocuFile_Html::SetLocation( const csv::ploc::Path & i_rFilePath )
+{
+    StreamLock sPath(1000);
+    i_rFilePath.Get( sPath() );
+
+    sFilePath = sPath().c_str();
+}
+
+void
+DocuFile_Html::SetTitle( const char * i_sTitle )
+{
+    sTitle = i_sTitle;
+}
+
+void
+DocuFile_Html::SetRelativeCssPath( const char * i_sCssFile_relativePath )
+{
+    sCssFile = i_sCssFile_relativePath;
+}
+
+void
+DocuFile_Html::SetCopyright( const char * i_sCopyright )
+{
+    sCopyright = i_sCopyright;
+}
+
+void
+DocuFile_Html::EmptyBody()
+{
+    aBodyData.SetContent(0);
+
+     if (bUse_OOoFrameDiv)
+     {
+        // Insert <div> tag to allow better formatting for OOo.
+        aBodyData
+            << new xml::XmlCode("<div id=\"")
+            << new xml::XmlCode(C_sOOoFrameDiv_IdlId)
+            << new xml::XmlCode("\">\n\n");
+     }
+
+    aBodyData
+        >> *new html::Label( "_top_" )
+        << " ";
+}
+
+bool
+DocuFile_Html::CreateFile()
+{
+    csv::File aFile(sFilePath, csv::CFM_CREATE);
+    if (NOT aFile.open())
+    {
+        Cerr() << "Can't create file " << sFilePath << "." << Endl();
+        return false;
+    }
+
+    WriteHeader(aFile);
+    WriteBody(aFile);
+
+    // Write end
+    static const char sCompletion[] = "\n</html>\n";
+    aFile.write( sCompletion );
+
+    aFile.close();
+    Cout() << '.' << Flush();
+    return true;
+}
+
+
+void
+DocuFile_Html::WriteHeader( csv::File & io_aFile )
+{
+    aBuffer.reset();
+
+    static const char s1[] =
+        "<html>\n<head>\n<title>";
+    static const char s2[] =
+        "</title>\n"
+        "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n";
+
+    aBuffer.write( s1 );
+    aBuffer.write( sTitle );
+    aBuffer.write( s2 );
+
+
+    if (NOT sCssFile.empty())
+    {
+        static const char s3[] =
+            "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
+        static const char s4[] =
+            "\">\n";
+
+        aBuffer.write(s3);
+        aBuffer.write(sCssFile);
+        aBuffer.write(s4);
+    }
+
+    if (NOT sStyle.empty())
+    {
+        static const char s5[] =
+            "<style>";
+        static const char s6[] =
+            "</style>\n";
+
+        aBuffer.write(s5);
+        aBuffer.write(sStyle);
+        aBuffer.write(s6);
+    }
+
+    static const char s7[] =
+        "</head>\n";
+    aBuffer.write(s7);
+
+    io_aFile.write(aBuffer.c_str(), aBuffer.size());
+}
+
+void
+DocuFile_Html::WriteBody( csv::File & io_aFile )
+{
+    aBuffer.reset();
+
+    aBodyData
+        >> *new html::Link( "#_top_" )
+                << "Top of Page";
+
+    if ( sCopyright.length() > 0 )
+    {
+        aBodyData
+            << new xml::XmlCode("<hr size=\"3\">");
+
+        aBodyData
+            >> *new html::Paragraph
+                    << new html::ClassAttr( "copyright" )
+                    << new xml::AnAttribute( "align", "center" )
+                    << new xml::XmlCode(sCopyright);
+    }
+
+     if (bUse_OOoFrameDiv)
+    {
+        // Insert <div> tag to allow better formatting for OOo.
+        aBodyData
+            << new xml::XmlCode("\n</div> <!-- id=\"")
+            << new xml::XmlCode(C_sOOoFrameDiv_IdlId)
+            << new xml::XmlCode("\" -->\n");
+    }
+
+    aBodyData.WriteOut(aBuffer);
+    io_aFile.write(aBuffer.c_str(), aBuffer.size());
+}
+
+
+
+
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/toolkit/makefile.mk b/autodoc/source/display/toolkit/makefile.mk
new file mode 100644
index 000000000000..ab374990eb7a
--- /dev/null
+++ b/autodoc/source/display/toolkit/makefile.mk
@@ -0,0 +1,64 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=display_toolkit
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/hf_docentry.obj     \
+    $(OBJ)$/hf_funcdecl.obj     \
+    $(OBJ)$/hf_linachain.obj    \
+    $(OBJ)$/hf_navi_main.obj    \
+    $(OBJ)$/hf_navi_sub.obj     \
+    $(OBJ)$/hf_title.obj     	\
+    $(OBJ)$/htmlfile.obj        \
+    $(OBJ)$/out_node.obj        \
+    $(OBJ)$/out_position.obj    \
+    $(OBJ)$/out_tree.obj        \
+    $(OBJ)$/outputstack.obj
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/display/toolkit/out_node.cxx b/autodoc/source/display/toolkit/out_node.cxx
new file mode 100644
index 000000000000..f66b7aafe4fb
--- /dev/null
+++ b/autodoc/source/display/toolkit/out_node.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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <toolkit/out_node.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <algorithm>
+
+
+namespace output
+{
+
+
+namespace
+{
+
+struct Less_NodePtr
+{
+    bool                operator()(
+                            Node *              p1,
+                            Node *              p2 ) const
+                        { return p1->Name() < p2->Name(); }
+};
+
+struct Less_NodePtr     C_Less_NodePtr;
+
+
+Node  C_aNullNode(Node::null_object);
+
+
+}   // namepace anonymous
+
+
+//**********************        Node        ***************************//
+
+
+Node::Node()
+    :   sName(),
+        pParent(0),
+        aChildren(),
+        nDepth(0),
+        nNameRoomId(0)
+{
+}
+
+Node::Node( E_NullObject )
+    :   sName(),
+        pParent(0),
+        aChildren(),
+         nDepth(-1),
+        nNameRoomId(0)
+{
+}
+
+Node::Node(
+    const String &  i_name,
+    Node &          i_parent
+) :
+    sName(i_name),
+    pParent(&i_parent),
+    aChildren(),
+    nDepth(i_parent.Depth()+1),
+    nNameRoomId(0)
+{
+}
+
+Node::~Node()
+{
+    for ( NodeList::iterator it = aChildren.begin();
+          it != aChildren.end();
+          ++it )
+    {
+        delete *it;
+    }
+}
+
+Node& Node::Provide_Child( const String & i_name )
+{
+    Node* ret = find_Child(i_name);
+    if (ret != 0)
+        return *ret;
+    return add_Child(i_name);
+}
+
+void Node::Get_Path(
+    StreamStr&  o_result,
+    intt        i_maxDepth
+) const
+{
+    // Intentionally 'i_maxDepth != 0', so max_Depth == -1 sets no limit:
+    if (i_maxDepth != 0)
+    {
+        if (pParent != 0)
+            pParent->Get_Path(o_result, i_maxDepth-1);
+        o_result << sName << '/';
+    }
+}
+
+void Node::Get_Chain(
+    StringVector & o_result,
+    intt           i_maxDepth
+) const
+{
+    if (i_maxDepth != 0)
+    {
+        // This is called also for the toplevel Node,
+        //   but there happens nothing:
+        if (pParent != 0)
+        {
+            pParent->Get_Chain(o_result, i_maxDepth-1);
+            o_result.push_back(sName);
+        }
+    }
+}
+
+Node* Node::find_Child( const String & i_name )
+{
+    Node aSearch;
+    aSearch.sName = i_name;
+
+    NodeList::const_iterator
+        ret = std::lower_bound( aChildren.begin(),
+                                aChildren.end(),
+                                &aSearch,
+                                C_Less_NodePtr );
+    if ( ret != aChildren.end() ? (*ret)->Name() == i_name : false )
+        return *ret;
+
+    return 0;
+}
+
+Node& Node::add_Child( const String & i_name )
+{
+    DYN Node* pNew = new Node(i_name,*this);
+    aChildren.insert( std::lower_bound( aChildren.begin(),
+                                        aChildren.end(),
+                                        pNew,
+                                        C_Less_NodePtr ),
+                      pNew );
+    return *pNew;
+}
+
+Node& Node::provide_Child(
+    StringVector::const_iterator i_next,
+    StringVector::const_iterator i_end
+)
+{
+    if (i_next == i_end)
+        return *this;
+    return Provide_Child(*i_next).provide_Child(i_next+1,i_end);
+}
+
+
+
+
+Node& Node::Null_()
+{
+    return C_aNullNode;
+}
+
+
+}   // namespace output
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/toolkit/out_position.cxx b/autodoc/source/display/toolkit/out_position.cxx
new file mode 100644
index 000000000000..efb4495fb0b4
--- /dev/null
+++ b/autodoc/source/display/toolkit/out_position.cxx
@@ -0,0 +1,242 @@
+/* -*- 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 <precomp.h>
+#include <toolkit/out_position.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+
+namespace output
+{
+
+
+
+namespace
+{
+
+const int       C_nAssumedMaxLinkLength = 500;
+
+void                move_ToParent(
+                        Node * &            io_node,
+                        intt                i_levels = 1 );
+
+void
+move_ToParent( Node * &   io_node,
+               intt       i_levels )
+{
+    for ( intt n = 0; n < i_levels; ++n )
+    {
+        csv_assert(io_node != 0);
+        io_node = io_node->Parent();
+    }
+}
+
+
+
+}   // namepace anonymous
+
+
+
+Position::Position()
+    :   sFile(),
+        pDirectory(&Node::Null_())
+{
+}
+
+
+Position::Position( Node &              i_directory,
+                    const String &      i_file )
+    :   sFile(i_file),
+        pDirectory(&i_directory)
+{
+}
+
+Position::Position( const Position &    i_directory,
+                    const String &      i_sDifferentFile )
+    :   sFile(i_sDifferentFile),
+        pDirectory(i_directory.pDirectory)
+{
+}
+
+
+Position::~Position()
+{
+}
+
+
+Position &
+Position::operator=( Node & i_node )
+{
+    pDirectory = &i_node;
+    sFile.clear();
+    return *this;
+}
+
+Position &
+Position::operator+=( const String & i_nodeName )
+{
+    csv_assert(pDirectory != 0);
+
+    pDirectory = &pDirectory->Provide_Child(i_nodeName);
+    sFile.clear();
+
+    return *this;
+}
+
+Position &
+Position::operator-=( intt i_levels )
+{
+    csv_assert(pDirectory != 0);
+
+    for ( intt i = i_levels; i > 0; --i )
+    {
+        pDirectory = pDirectory->Parent();
+        if (pDirectory == 0)
+        {
+            pDirectory = &Node::Null_();
+            i = 0;
+        }
+    }
+    sFile.clear();
+
+    return *this;
+}
+
+String
+Position::LinkToRoot( const String & ) const
+{
+    StreamLock sl(C_nAssumedMaxLinkLength);
+    return sl() << get_UpLink(Depth()) << c_str;
+}
+
+void
+Position::Get_LinkTo( StreamStr &         o_result,
+                      const Position &    i_destination,
+                      const String &      i_localLabel ) const
+{
+    Node * p1 = pDirectory;
+    Node * p2 = i_destination.pDirectory;
+
+    intt diff = Depth() - i_destination.Depth();
+    intt pathLength1 = 0;
+    intt pathLength2 = 0;
+
+    if ( diff > 0 )
+    {
+        pathLength1 = diff;
+        move_ToParent(p1,pathLength1);
+    }
+    else if ( diff < 0 )
+    {
+        pathLength2 = -diff;
+        move_ToParent(p2,pathLength2);
+    }
+
+    while ( p1 != p2 )
+    {
+        move_ToParent(p1);
+        move_ToParent(p2);
+        ++pathLength1;
+        ++pathLength2;
+    }
+
+    o_result << get_UpLink(pathLength1);
+    i_destination.pDirectory->Get_Path(o_result, pathLength2);
+    o_result << i_destination.sFile;
+    if (i_localLabel.length())
+        o_result << "#" << i_localLabel;
+}
+
+void
+Position::Get_LinkToRoot( StreamStr &         o_result,
+                          const String &      ) const
+{
+    o_result << get_UpLink(Depth());
+}
+
+void
+Position::Set( Node &           i_node,
+               const String &   i_file )
+{
+    sFile = i_file;
+    pDirectory = &i_node;
+}
+
+
+
+
+const char *
+get_UpLink(uintt i_depth)
+{
+    static const uintt
+        C_nMaxDepth = 30;
+    static const char
+        C_sUpLinkArray[3*C_nMaxDepth+1] =
+                        "../../../../../../../../../../"
+                        "../../../../../../../../../../"
+                        "../../../../../../../../../../";
+    static const char *
+        C_sUpLink = &C_sUpLinkArray[0];
+
+    if ( i_depth <= C_nMaxDepth )
+    {
+        return C_sUpLink + 3*(C_nMaxDepth - i_depth);
+    }
+    else
+    {   // not THREAD fast
+        static std::vector<char>
+            aRet;
+        uintt nNeededSize = i_depth * 3 + 1;
+
+        if (aRet.size() < nNeededSize)
+        {
+            aRet.resize(nNeededSize);
+            char * pEnd = &aRet[nNeededSize-1];
+            *pEnd = '\0';
+
+            for ( char * pFill = &(*aRet.begin());
+                  pFill != pEnd;
+                  pFill += 3 )
+            {
+                memcpy(pFill, C_sUpLink, 3);
+            }
+        }   // end if
+
+        return &aRet[aRet.size() - 1 - 3*i_depth];
+    }
+}
+
+
+
+
+}   // namespace output
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/toolkit/out_tree.cxx b/autodoc/source/display/toolkit/out_tree.cxx
new file mode 100644
index 000000000000..b0330671bd27
--- /dev/null
+++ b/autodoc/source/display/toolkit/out_tree.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <toolkit/out_tree.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+namespace output
+{
+
+Tree::Tree()
+    :   pRoot(new Node),
+        pNamesRoot(pRoot.Ptr()),
+        pIndexRoot(pRoot.Ptr()),
+        pProjectsRoot(pRoot.Ptr()),
+        aOverview()
+{
+}
+
+Tree::~Tree()
+{
+}
+
+
+
+}   // namespace output
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/display/toolkit/outputstack.cxx b/autodoc/source/display/toolkit/outputstack.cxx
new file mode 100644
index 000000000000..296e77b412f8
--- /dev/null
+++ b/autodoc/source/display/toolkit/outputstack.cxx
@@ -0,0 +1,60 @@
+/* -*- 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 <precomp.h>
+#include <toolkit/outputstack.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+
+OutputStack::OutputStack()
+{
+}
+
+OutputStack::~OutputStack()
+{
+}
+
+void
+OutputStack::Enter( csi::xml::Element & io_rDestination )
+{
+    aCurDestination.push(&io_rDestination);
+}
+
+void
+OutputStack::Leave()
+{
+    csv_assert( NOT aCurDestination.empty() );
+    aCurDestination.pop();
+}
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/exes/adc_uni/adc_cl.cxx b/autodoc/source/exes/adc_uni/adc_cl.cxx
new file mode 100644
index 000000000000..45c98b7c7548
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/adc_cl.cxx
@@ -0,0 +1,402 @@
+/* -*- 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 <precomp.h>
+#include <adc_cl.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <algorithm>
+#include <cosv/x.hxx>
+#include <cosv/file.hxx>
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/ary.hxx>
+#include <tools/tkpchars.hxx>
+#include <adc_msg.hxx>
+#include "adc_cmds.hxx"
+#include "adc_cmd_parse.hxx"
+#include "cmd_sincedata.hxx"
+
+
+namespace autodoc
+{
+
+CommandLine * CommandLine::pTheInstance_ = 0;
+
+const char * const C_sUserGuide =
+"\n\n\n"
+"               General Use of Autodoc\n"
+"               ----------------------\n"
+"\n"
+"   Example for C++:\n"
+"\n"
+"   -html <OutputDirectory> -name \"UDK 3.x anything\" -lg c++\n"
+"        -p <ProjName> <ProjectRootDirectory>\n"
+"            -t <SourceDir_relativeToProjectRoot>\n"
+"\n"
+"   There may be several projects specified by -p.\n"
+"\n"
+"\n"
+"   Example for IDL:\n"
+"\n"
+"   -html <OutputDirectory> -name \"UDK 3.x anything\" -lg idl\n"
+"         -t <SourceDir1> <SourceDir2>\n"
+"\n"
+"   For both languages, instead of or in addition to -t may be\n"
+"   used -d (no subdirectories) or -f (just one file). There can\n"
+"   be multiple arguments after each of these options (-t -d -f).\n"
+"\n"
+"\n"
+"           Replacing @since Tag Content\n"
+"           ----------------------------\n"
+"\n"
+"   In both languages you can give a transformation file to replace\n"
+"   entries in @since tags by different entries.\n"
+"   This file is given by the option\n"
+"       -sincefile <TransformationFilePath>\n"
+"   This option has to appear between the -html and the -lg option.\n"
+"   Example:\n"
+"   -html <OutputDirectory> -sincefile replacesince.txt\n"
+"       -name \"UDK 3.x anything\" -lg idl -t <SourceDir>\n"
+"\n"
+"\n";
+
+CommandLine::CommandLine()
+    :   nDebugStyle(0),
+        pSinceTransformator(new command::SinceTagTransformationData),
+        aCommands(),
+        bInitOk(false),
+        pCommand_CreateHtml(0),
+        pReposy( & ary::Repository::Create_() ),
+        bCpp(false),
+        bIdl(false)
+{
+    csv_assert(pTheInstance_ == 0);
+    pTheInstance_ = this;
+}
+
+CommandLine::~CommandLine()
+{
+    csv::erase_container_of_heap_ptrs(aCommands);
+    pTheInstance_ = 0;
+}
+
+int
+CommandLine::Run() const
+{
+    Cout() << "\nAutodoc version 2.2.5"
+           << "\n---------------------"
+           << "\n" << Endl();
+
+    bool
+        ok = true;
+    for ( CommandList::const_iterator it = aCommands.begin();
+          ok AND it != aCommands.end();
+          ++it )
+    {
+        ok = (*it)->Run();
+    }
+
+    if (pCommand_CreateHtml != 0)
+    {
+        StreamStr aDiagnosticMessagesFile(700);
+        aDiagnosticMessagesFile
+            << pCommand_CreateHtml->OutputDir()
+            << csv::ploc::Delimiter()
+            << "Autodoc_DiagnosticMessages.txt";
+        TheMessages().WriteFile(aDiagnosticMessagesFile.c_str());
+    }
+
+    return ok ? 0 : 1;
+}
+
+CommandLine &
+CommandLine::Get_()
+{
+    csv_assert(pTheInstance_ != 0);
+    return *pTheInstance_;
+}
+
+bool
+CommandLine::DoesTransform_SinceTag() const
+{
+    return pSinceTransformator->DoesTransform();
+}
+
+//bool
+//CommandLine::Strip_SinceTagText( String & io_sSinceTagValue ) const
+//{
+//    return pSinceTransformator->StripSinceTagText(io_sSinceTagValue);
+//}
+
+const String &
+CommandLine::DisplayOf_SinceTagValue( const String & i_sVersionNumber ) const
+{
+    return pSinceTransformator->DisplayOf(i_sVersionNumber);
+}
+
+void
+CommandLine::do_Init( int                 argc,
+                      char *              argv[] )
+{
+  try
+  {
+    bInitOk = false;
+    StringVector    aParameters;
+
+    char * * itpEnd = &argv[0] + argc;
+    for ( char * * itp = &argv[1]; itp != itpEnd; ++itp )
+    {
+         if ( strncmp(*itp, "-I:", 3) != 0 )
+            aParameters.push_back(String(*itp));
+        else
+            load_IncludedCommands(aParameters, (*itp)+3);
+    }
+
+    StringVector::const_iterator itEnd = aParameters.end();
+    for ( StringVector::const_iterator it = aParameters.begin();
+          it != itEnd;
+        )
+    {
+        if ( *it == command::C_opt_Verbose )
+            do_clVerbose(it,itEnd);
+        else if ( *it == command::C_opt_LangAll
+                  OR *it == command::C_opt_Name
+                  OR *it == command::C_opt_DevmanFile )
+            do_clParse(it,itEnd);
+        else if (*it == command::C_opt_CreateHtml)
+            do_clCreateHtml(it,itEnd);
+        else if (*it == command::C_opt_SinceFile)
+            do_clSinceFile(it,itEnd);
+        else if (*it == command::C_opt_ExternNamespace)
+        {
+            sExternNamespace = *(++it);
+            ++it;
+            if ( strncmp(sExternNamespace.c_str(), "::", 2) != 0)
+            {
+                 throw command::X_CommandLine(
+                        "-extnsp needs an absolute qualified namespace, starting with \"::\"."
+                        );
+            }
+        }
+        else if (*it == command::C_opt_ExternRoot)
+        {
+            ++it;
+            StreamLock sl(1000);
+            if ( csv::compare(*it, 0, "http://", 7) != 0 )
+            {
+                sl() << "http://" << *it;
+            }
+            if ( *(sl().end()-1) != '/')
+                sl() << '/';
+            sExternRoot = sl().c_str();
+
+            ++it;
+        }
+//        else if (*it == command::C_opt_CreateXml)
+//            do_clCreateXml(it,itEnd);
+//        else if (command::C_opt_Load)
+//            do_clLoad(it,itEnd);
+//        else if (*it == command::C_opt_Save)
+//            do_clSave(it,itEnd);
+        else if (*it == "-h" OR *it == "-?" OR *it == "?")
+            // Leads to displaying help, because bInitOk stays on false.
+             return;
+        else if ( *it == command::C_opt_Parse )
+            // Only for backwards compatibility.
+            //   Just ignore "-parse".
+            ++it;
+        else
+        {
+            StreamLock sl(200);
+             throw command::X_CommandLine(
+                            sl() << "Unknown commandline option \""
+                                 << *it
+                                 << "\"."
+                                 << c_str );
+        }
+    }   // end for
+    sort_Commands();
+
+    bInitOk = true;
+
+  }   // end try
+  catch ( command::X_CommandLine & xxx )
+  {
+    xxx.Report( Cerr() );
+  }
+  catch ( csv::Exception & xxx )
+  {
+    xxx.GetInfo( Cerr() );
+  }
+}
+
+void
+CommandLine::do_PrintUse() const
+{
+    Cout() << C_sUserGuide << Endl();
+}
+
+bool
+CommandLine::inq_CheckParameters() const
+{
+    if (NOT bInitOk OR aCommands.size() == 0)
+        return false;
+    return true;
+}
+
+void
+CommandLine::load_IncludedCommands( StringVector &      out,
+                                    const char *        i_filePath )
+{
+    CharacterSource
+        aIncludedCommands;
+    csv::File
+        aFile(i_filePath, csv::CFM_READ);
+    if (NOT aFile.open())
+    {
+         Cerr() << "Command include file \""
+               << i_filePath
+               << "\" not found."
+               << Endl();
+        throw command::X_CommandLine("Invalid file in option -I:<command-file>.");
+    }
+    aIncludedCommands.LoadText(aFile);
+    aFile.close();
+
+    bool bInToken = false;
+    StreamLock aTransmit(200);
+    for ( ; NOT aIncludedCommands.IsFinished(); aIncludedCommands.MoveOn() )
+    {
+        if (bInToken)
+        {
+            if (aIncludedCommands.CurChar() <= 32)
+            {
+                const char *
+                    pToken = aIncludedCommands.CutToken();
+                bInToken = false;
+
+                 if ( strncmp(pToken, "-I:", 3) != 0 )
+                 {
+                     aTransmit().seekp(0);
+                     aTransmit() << pToken;
+                     aTransmit().replace_all('\\', *csv::ploc::Delimiter());
+                     aTransmit().replace_all('/', *csv::ploc::Delimiter());
+                    out.push_back(String(aTransmit().c_str()));
+                 }
+                else
+                    load_IncludedCommands(out, pToken+3);
+            }
+        }
+        else
+        {
+            if (aIncludedCommands.CurChar() > 32)
+            {
+                aIncludedCommands.CutToken();
+                bInToken = true;
+            }
+        }   // endif (bInToken) else
+
+    }   // end while()
+}
+
+namespace
+{
+inline int
+v_nr(StringVector::const_iterator it)
+{
+     return int( *(*it).c_str() ) - int('0');
+}
+}   // anonymous namespace
+
+void
+CommandLine::do_clVerbose(  opt_iter &          it,
+                            opt_iter            itEnd )
+{
+    ++it;
+    if ( it == itEnd ? true : v_nr(it) < 0 OR v_nr(it) > 7 )
+        throw command::X_CommandLine( "Missing or invalid number in -v option." );
+    nDebugStyle = v_nr(it);
+    ++it;
+}
+
+void
+CommandLine::do_clParse( opt_iter &          it,
+                         opt_iter            itEnd )
+{
+    command::Command *
+        pCmd_Parse = new command::Parse;
+    pCmd_Parse->Init(it, itEnd);
+    aCommands.push_back(pCmd_Parse);
+}
+
+void
+CommandLine::do_clCreateHtml( opt_iter &          it,
+                              opt_iter            itEnd )
+{
+    pCommand_CreateHtml = new command::CreateHtml;
+    pCommand_CreateHtml->Init(it, itEnd);
+    aCommands.push_back(pCommand_CreateHtml);
+}
+
+void
+CommandLine::do_clSinceFile( opt_iter &          it,
+                             opt_iter            itEnd )
+{
+    pSinceTransformator->Init(it, itEnd);
+}
+
+
+namespace
+{
+
+struct Less_RunningRank
+{
+    bool                operator()(
+                            const command::Command * const &
+                                                i1,
+                            const command::Command * const &
+                                                i2 ) const
+                        { return i1->RunningRank() < i2->RunningRank(); }
+};
+
+}   // anonymous namespace
+
+
+
+void
+CommandLine::sort_Commands()
+{
+    std::sort( aCommands.begin(),
+               aCommands.end(),
+               Less_RunningRank() );
+}
+
+}   // namespace autodoc
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/exes/adc_uni/adc_cmd.hxx b/autodoc/source/exes/adc_uni/adc_cmd.hxx
new file mode 100644
index 000000000000..47e5ab7edfe0
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/adc_cmd.hxx
@@ -0,0 +1,134 @@
+/* -*- 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 ADC_ADC_CMD_HXX
+#define ADC_ADC_CMD_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cosv/comdline.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace autodoc
+{
+namespace command
+{
+
+/** Context for a command, which can be read from the command line.
+*/
+class Context
+{
+  public:
+    typedef StringVector::const_iterator opt_iter;
+
+    virtual             ~Context() {}
+
+    void                Init(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+  private:
+    virtual void        do_Init(
+                            opt_iter &          it,
+                            opt_iter            itEnd ) = 0;
+};
+
+// IMPLEMENTATION
+inline void
+Context::Init( opt_iter &          i_nCurArgsBegin,
+               opt_iter            i_nEndOfAllArgs )
+
+{ do_Init(i_nCurArgsBegin, i_nEndOfAllArgs); }
+
+
+
+/** Interface for commands, autodoc is able to perform.
+*/
+class Command : public Context
+{
+  public:
+    /** Running ranks of the commands are to be maintained at one location:
+        Here!
+    */
+    enum E_Ranks
+    {
+        rank_Load       = 10,
+        rank_Parse      = 20,
+        rank_Save       = 30,
+        rank_CreateHtml = 40,
+        rank_CreateXml  = 50
+    };
+
+
+    bool                Run() const;
+    int                 RunningRank() const;
+
+  private:
+    virtual bool        do_Run() const = 0;
+    virtual int         inq_RunningRank() const = 0;
+};
+
+// IMPLEMENTATION
+inline bool
+Command::Run() const
+{ return do_Run(); }
+inline int
+Command::RunningRank() const
+{ return inq_RunningRank(); }
+
+
+
+
+/** The exception thrown, if the command line is invalid.
+*/
+class X_CommandLine
+{
+  public:
+                        X_CommandLine(
+                            const char *        i_sExplanation )
+                            :   sExplanation(i_sExplanation) {}
+
+    void                Report(
+                            std::ostream &      o_rOut )
+                            { o_rOut << "Error in command line: "
+                                     << sExplanation << Endl(); }
+  private:
+    String              sExplanation;
+};
+
+
+
+
+}   // namespace command
+}   // namespace autodoc
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx b/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx
new file mode 100644
index 000000000000..8bdf6b01df1b
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx
@@ -0,0 +1,345 @@
+/* -*- 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 <precomp.h>
+#include "adc_cmd_parse.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <adc_cl.hxx>
+#include "adc_cmds.hxx"
+#include "cmd_run.hxx"
+
+
+
+namespace autodoc
+{
+namespace command
+{
+
+namespace
+{
+
+const String C_FileEnding_hxx("*.hxx");
+const String C_FileEnding_h("*.h");
+const String C_FileEnding_idl("*.idl");
+const String C_FileEnding_java("*.java");
+
+inline void
+CHECK( bool b, const String & text )
+{
+    if (NOT b)
+        throw X_CommandLine( text );
+}
+
+}   // anonymous namespace
+
+
+
+//**************************     S_LanguageInfo     ***********************//
+
+S_LanguageInfo::~S_LanguageInfo()
+{
+}
+
+void
+S_LanguageInfo::do_Init( opt_iter &          it,
+                         opt_iter            itEnd )
+{
+    ++it;   // Cur is language.
+    CHECKOPT(   it != itEnd AND
+              ( *it == C_arg_Cplusplus OR
+                *it == C_arg_Idl OR
+                *it == C_arg_Java ),
+              "language",
+              C_opt_LangAll );
+
+    if ( *it == C_arg_Cplusplus ) {
+        eLanguage = cpp;
+    }
+    else if ( *it == C_arg_Idl ) {
+        eLanguage = idl;
+    }
+    else if ( *it == C_arg_Java ) {
+        eLanguage = java;
+    }
+    else {
+         csv_assert(false);
+    }
+
+    switch (eLanguage)
+    {
+        case cpp:   aExtensions.push_back( C_FileEnding_hxx );
+                    aExtensions.push_back( C_FileEnding_h );
+                    CommandLine::Get_().Set_CppUsed();
+                    break;
+        case idl:   aExtensions.push_back( C_FileEnding_idl );
+                    CommandLine::Get_().Set_IdlUsed();
+                    break;
+        case java:  aExtensions.push_back( C_FileEnding_java );
+                    break;
+        default:    //  do nothing.
+                    ;
+    }
+
+    ++it;   // Cur is next option.
+}
+
+void
+S_LanguageInfo::InitExtensions( opt_iter &          it,
+                                opt_iter            itEnd )
+{
+    ++it;
+    CHECKOPT( it != itEnd AND (*it).char_at(0) == '.',
+              "extensions",
+              C_opt_ExtensionsAll );
+
+    StreamLock slCheck(150);
+    slCheck() << C_opt_ExtensionsAll
+              << " used without previous "
+              << C_opt_LangAll;
+
+    CHECK( eLanguage != none,
+           slCheck().c_str() );
+
+    do {
+        aExtensions.push_back(*it);
+        ++it;
+    }   while (it != itEnd AND (*it).char_at(0) == '.');
+}
+
+
+
+//**************************     Parse     ***********************//
+
+Parse::Parse()
+    :   sRepositoryName(),
+        aGlobalLanguage(),
+        aProjects(),
+        sDevelopersManual_RefFilePath()
+{
+}
+
+Parse::~Parse()
+{
+    csv::erase_container_of_heap_ptrs(aProjects);
+}
+
+void
+Parse::do_Init( opt_iter &          it,
+                opt_iter            itEnd )
+{
+    for ( ; it != itEnd;  )
+    {
+        if (*it == C_opt_Name)
+            do_clName(it, itEnd);
+        else if (*it == C_opt_LangAll)
+            aGlobalLanguage.Init(it, itEnd);
+        else if (*it == C_opt_ExtensionsAll)
+            aGlobalLanguage.InitExtensions(it, itEnd);
+        else if (*it == C_opt_DevmanFile)
+            do_clDevManual(it, itEnd);
+        else if (*it == C_opt_Project)
+            do_clProject(it, itEnd);
+        else if (    *it == C_opt_SourceTree
+                  OR *it == C_opt_SourceDir
+                  OR *it == C_opt_SourceFile )
+            do_clDefaultProject(it, itEnd);
+        else
+            break;
+    }   // for
+}
+
+void
+Parse::do_clName( opt_iter &    it,
+                  opt_iter      itEnd )
+{
+    ++it;
+    CHECKOPT( it != itEnd AND (*it).char_at(0) != '-',
+              "name",
+              C_opt_Name );
+    sRepositoryName = *it;
+    ++it;
+}
+
+void
+Parse::do_clDevManual( opt_iter &    it,
+                       opt_iter      itEnd )
+{
+    ++it;
+    CHECKOPT( it != itEnd AND (*it).char_at(0) != '-',
+              "link file path",
+              C_opt_DevmanFile );
+    sDevelopersManual_RefFilePath = *it;
+    ++it;
+}
+
+void
+Parse::do_clProject( opt_iter &    it,
+                     opt_iter      itEnd )
+{
+    if ( aProjects.size() == 1 )
+    {
+         if ( aProjects.front()->IsDefault() )
+            throw X_CommandLine( "Both, named projects and a default project, cannot be used together." );
+    }
+
+    S_ProjectData * dpProject = new S_ProjectData(aGlobalLanguage);
+    ++it;
+    dpProject->Init(it, itEnd);
+    aProjects.push_back(dpProject);
+}
+
+void
+Parse::do_clDefaultProject( opt_iter &    it,
+                            opt_iter      itEnd )
+{
+    if ( !aProjects.empty() )
+    {
+        throw X_CommandLine( "Both, named projects and a default project, cannot be used together." );
+    }
+
+    S_ProjectData * dpProject = new S_ProjectData( aGlobalLanguage,
+                                                   S_ProjectData::default_prj );
+    dpProject->Init(it, itEnd);
+    aProjects.push_back(dpProject);
+}
+
+bool
+Parse::do_Run() const
+{
+    run::Parser
+        aParser(*this);
+    return aParser.Perform();
+}
+
+int
+Parse::inq_RunningRank() const
+{
+    return static_cast<int>(rank_Parse);
+}
+
+
+
+//**************************     S_Sources      ***********************//
+
+void
+S_Sources::do_Init( opt_iter &          it,
+                    opt_iter            itEnd )
+{
+    StringVector *
+        pList = 0;
+    csv_assert((*it)[0] == '-');
+
+    for ( ; it != itEnd; ++it)
+    {
+        if ((*it)[0] == '-')
+        {
+            if (*it == C_opt_SourceTree)
+                pList = &aTrees;
+            else if (*it == C_opt_SourceDir)
+                pList = &aDirectories;
+            else if (*it == C_opt_SourceFile)
+                pList = &aFiles;
+            else
+                return;
+        }
+        else
+            pList->push_back(*it);
+    }   // end for
+}
+
+
+
+//**************************     S_ProjectData     ***********************//
+
+
+S_ProjectData::S_ProjectData( const S_LanguageInfo & i_globalLanguage )
+    :   sName(),
+        aRootDirectory(),
+        aLanguage(i_globalLanguage),
+        aFiles(),
+        bIsDefault(false)
+{
+}
+
+S_ProjectData::S_ProjectData( const S_LanguageInfo & i_globalLanguage,
+                              E_Default              )
+    :   sName(),
+        aRootDirectory("."),
+        aLanguage(i_globalLanguage),
+        aFiles(),
+        bIsDefault(true)
+{
+}
+
+S_ProjectData::~S_ProjectData()
+{
+}
+
+void
+S_ProjectData::do_Init( opt_iter &          it,
+                        opt_iter            itEnd )
+{
+    if (NOT IsDefault())
+    {
+        CHECKOPT( it != itEnd AND (*it).char_at(0) != '-',
+                  "name",
+                  C_opt_Project );
+        sName = *it;
+        ++it;
+
+        CHECKOPT( it != itEnd AND  (*it).char_at(0) != '-',
+                  "root directory",
+                  C_opt_Project );
+        aRootDirectory.Set((*it).c_str(), true);
+        ++it;
+    }
+
+    for ( ; it != itEnd; )
+    {
+        if (    *it == C_opt_SourceTree
+             OR *it == C_opt_SourceDir
+             OR *it == C_opt_SourceFile )
+            aFiles.Init(it, itEnd);
+//        else if (*it == C_opt_Lang)
+//            aLanguage.Init(it, itEnd);
+//        else if (*it == C_opt_Extensions)
+//            aLanguage.InitExtensions(it, itEnd);
+        else
+            break;
+    }   // for
+}
+
+}   // namespace command
+}   // namespace autodoc
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/exes/adc_uni/adc_cmd_parse.hxx b/autodoc/source/exes/adc_uni/adc_cmd_parse.hxx
new file mode 100644
index 000000000000..dc78f3d4a2fd
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/adc_cmd_parse.hxx
@@ -0,0 +1,211 @@
+/* -*- 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 ADC_ADC_CMD_PARSE_HXX
+#define ADC_ADC_CMD_PARSE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "adc_cmd.hxx"
+    // COMPONENTS
+#include <cosv/ploc.hxx>
+    // PARAMETERS
+
+namespace autodoc
+{
+namespace command
+{
+
+/** A command context which holds the currently parsed programing language
+    and its valid file extensions.
+*/
+struct S_LanguageInfo : public Context
+{
+    enum E_ProgrammingLanguage
+    {
+        none,
+        cpp,
+        idl,
+        java
+    };
+                        S_LanguageInfo()
+                            :   eLanguage(none),
+                                aExtensions() {}
+                        ~S_LanguageInfo();
+
+    void                InitExtensions(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+    // DATA
+    E_ProgrammingLanguage
+                        eLanguage;
+    StringVector        aExtensions;        // An empty string is possible and means exactly that: files without extension.
+
+  private:
+    // Interface Context:
+    virtual void        do_Init(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+};
+
+
+class S_ProjectData;
+
+
+/** A command that parses source code into the Autodoc Repository.
+*/
+class Parse : public Command
+{
+  public:
+    typedef std::vector< DYN S_ProjectData * >  ProjectList;
+    typedef ProjectList::const_iterator         ProjectIterator;
+
+                        Parse();
+                        ~Parse();
+
+    // INQUIRY
+    const String &      ReposyName() const;
+    const S_LanguageInfo &
+                        GlobalLanguage() const;
+    ProjectIterator     ProjectsBegin() const;
+    ProjectIterator     ProjectsEnd() const;
+    const String &      DevelopersManual_RefFilePath() const
+                                                { return sDevelopersManual_RefFilePath; }
+
+  private:
+    // Interface Context:
+    virtual void        do_Init(
+                            opt_iter &          i_nCurArgsBegin,
+                            opt_iter            i_nEndOfAllArgs );
+    // Interface Command:
+    virtual bool        do_Run() const;
+    virtual int         inq_RunningRank() const;
+
+    // Locals
+    void                do_clName(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+    void                do_clDevManual(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+    void                do_clProject(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+    void                do_clDefaultProject(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+
+    // DATA
+    String              sRepositoryName;
+    S_LanguageInfo      aGlobalLanguage;
+
+    ProjectList         aProjects;
+
+    String              sDevelopersManual_RefFilePath;
+};
+
+inline const String &
+Parse::ReposyName() const
+    { return sRepositoryName; }
+inline const S_LanguageInfo &
+Parse::GlobalLanguage() const
+    { return aGlobalLanguage; }
+inline Parse::ProjectIterator
+Parse::ProjectsBegin() const
+    { return aProjects.begin(); }
+inline Parse::ProjectIterator
+Parse::ProjectsEnd() const
+    { return aProjects.end(); }
+//inline const String &
+//Parse::DevelopersManual_RefFilePath() const
+//    { return sDevelopersManual_RefFilePath; }
+//inline const String &
+//Parse::DevelopersManual_HtmlRoot() const
+//    { return sDevelopersManual_HtmlRoot; }
+
+
+struct S_Sources : public Context
+{
+    StringVector        aTrees;
+    StringVector        aDirectories;
+    StringVector        aFiles;
+
+  private:
+    // Interface Context:
+    virtual void        do_Init(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+};
+
+class S_ProjectData : public Context
+{
+  public:
+    enum E_Default { default_prj };
+
+                        S_ProjectData(
+                            const S_LanguageInfo &
+                                                i_globalLanguage );
+                        S_ProjectData(
+                            const S_LanguageInfo &
+                                                i_globalLanguage,
+                            E_Default           unused );
+                        ~S_ProjectData();
+
+    bool                IsDefault() const       { return bIsDefault; }
+    const String &      Name() const            { return sName; }
+    const csv::ploc::Path &
+                        RootDirectory() const   { return aRootDirectory; }
+    const S_LanguageInfo &
+                        Language() const        { return aLanguage; }
+    const S_Sources     Sources() const         { return aFiles; }
+
+  private:
+    // Interface Context:
+    virtual void        do_Init(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+    // Locals
+
+    // DATA
+    String              sName;
+    csv::ploc::Path     aRootDirectory;
+    S_LanguageInfo      aLanguage;
+    S_Sources           aFiles;
+    bool                bIsDefault;
+};
+
+
+}   // namespace command
+}   // namespace autodoc
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/exes/adc_uni/adc_cmds.cxx b/autodoc/source/exes/adc_uni/adc_cmds.cxx
new file mode 100644
index 000000000000..93f54a52ce6a
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/adc_cmds.cxx
@@ -0,0 +1,180 @@
+/* -*- 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 <precomp.h>
+#include "adc_cmds.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/ary.hxx>
+#include <autodoc/displaying.hxx>
+#include <autodoc/dsp_html_std.hxx>
+#include <display/corframe.hxx>
+#include <adc_cl.hxx>
+
+
+namespace autodoc
+{
+namespace command
+{
+
+extern const String C_opt_Include("-I:");
+
+extern const String C_opt_Verbose("-v");
+
+extern const String C_opt_Parse("-parse");
+extern const String C_opt_Name("-name");
+extern const String C_opt_LangAll("-lg");
+extern const String C_opt_ExtensionsAll("-extg");
+extern const String C_opt_DevmanFile("-dvgfile");
+extern const String C_opt_SinceFile("-sincefile");
+
+extern const String C_arg_Cplusplus("c++");
+extern const String C_arg_Idl("idl");
+extern const String C_arg_Java("java");
+
+extern const String C_opt_Project("-p");
+//extern const String C_opt_Lang;
+//extern const String C_opt_Extensions;
+extern const String C_opt_SourceDir("-d");
+extern const String C_opt_SourceTree("-t");
+extern const String C_opt_SourceFile("-f");
+
+extern const String C_opt_CreateHtml("-html");
+extern const String C_opt_DevmanRoot("-dvgroot");
+
+//extern const String C_opt_CreateXml("-xml");
+//extern const String C_opt_Load("-load");
+//extern const String C_opt_Save("-save");
+
+extern const String C_opt_ExternNamespace("-extnsp");
+extern const String C_opt_ExternRoot("-extroot");
+
+
+
+//**************************        CreateHTML    ***********************//
+
+CreateHtml::CreateHtml()
+    :   sOutputRootDirectory(),
+        sDevelopersManual_HtmlRoot()
+{
+}
+
+CreateHtml::~CreateHtml()
+{
+}
+
+void
+CreateHtml::do_Init( opt_iter &          it,
+                     opt_iter            itEnd )
+{
+    ++it;
+    CHECKOPT( it != itEnd && (*it).char_at(0) != '-',
+              "output directory", C_opt_CreateHtml );
+    sOutputRootDirectory = *it;
+
+    for ( ++it;
+          it != itEnd AND (*it == C_opt_DevmanRoot);
+          ++it )
+    {
+        if (*it == C_opt_DevmanRoot)
+        {
+            ++it;
+            CHECKOPT( it != itEnd AND (*it).char_at(0) != '-',
+                      "HTML root directory of Developers Guide",
+                      C_opt_DevmanRoot );
+            sDevelopersManual_HtmlRoot = *it;
+        }
+    }   // end for
+}
+
+bool
+CreateHtml::do_Run() const
+{
+    if ( CommandLine::Get_().IdlUsed() )
+        run_Idl();
+    if ( CommandLine::Get_().CppUsed() )
+        run_Cpp();
+    return true;
+}
+
+int
+CreateHtml::inq_RunningRank() const
+{
+    return static_cast<int>(rank_CreateHtml);
+}
+
+void
+CreateHtml::run_Idl() const
+{
+    const ary::idl::Gate &
+        rGate = CommandLine::Get_().TheRepository().Gate_Idl();
+
+    Cout() << "Creating HTML-output into the directory "
+              << sOutputRootDirectory
+              << "."
+              << Endl();
+
+    const DisplayToolsFactory_Ifc &
+        rToolsFactory = DisplayToolsFactory_Ifc::GetIt_();
+    Dyn<autodoc::HtmlDisplay_Idl_Ifc>
+        pDisplay( rToolsFactory.Create_HtmlDisplay_Idl() );
+
+    DYN display::CorporateFrame &   // KORR_FUTURE: Remove the need for const_cast
+        drFrame = const_cast< display::CorporateFrame& >(rToolsFactory.Create_StdFrame());
+    if (NOT DevelopersManual_HtmlRoot().empty())
+        drFrame.Set_DevelopersGuideHtmlRoot( DevelopersManual_HtmlRoot() );
+
+    pDisplay->Run( sOutputRootDirectory,
+                   rGate,
+                   drFrame );
+}
+
+void
+CreateHtml::run_Cpp() const
+{
+    const ary::Repository &
+        rReposy = CommandLine::Get_().TheRepository();
+    const ary::cpp::Gate &
+        rGate = rReposy.Gate_Cpp();
+
+    const DisplayToolsFactory_Ifc &
+        rToolsFactory = DisplayToolsFactory_Ifc::GetIt_();
+    Dyn< autodoc::HtmlDisplay_UdkStd >
+        pDisplay( rToolsFactory.Create_HtmlDisplay_UdkStd() );
+
+    pDisplay->Run( sOutputRootDirectory,
+                   rGate,
+                   rToolsFactory.Create_StdFrame() );
+}
+
+
+}   // namespace command
+}   // namespace autodoc
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/exes/adc_uni/adc_cmds.hxx b/autodoc/source/exes/adc_uni/adc_cmds.hxx
new file mode 100644
index 000000000000..461bbcbbbeec
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/adc_cmds.hxx
@@ -0,0 +1,128 @@
+/* -*- 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 ADC_ADC_CMDS_HXX
+#define ADC_ADC_CMDS_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "adc_cmd.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+namespace autodoc
+{
+namespace command
+{
+
+
+/** A command that produces HTML output from the Autodoc Repository.
+*/
+class CreateHtml : public Command
+{
+  public:
+                        CreateHtml();
+                        ~CreateHtml();
+
+    const String &      OutputDir() const;
+    const String &      DevelopersManual_HtmlRoot() const
+                                                { return sDevelopersManual_HtmlRoot; }
+
+  private:
+    // Interface Context:
+    virtual void        do_Init(
+                            opt_iter &          i_nCurArgsBegin,
+                            opt_iter            i_nEndOfAllArgs );
+    // Interface Command:
+    virtual bool        do_Run() const;
+    virtual int         inq_RunningRank() const;
+
+    // Locals
+    void                run_Cpp() const;
+    void                run_Idl() const;
+
+    // DATA
+    String              sOutputRootDirectory;
+    String              sDevelopersManual_HtmlRoot;
+};
+
+inline const String &
+CreateHtml::OutputDir() const
+    { return sOutputRootDirectory; }
+
+
+extern const String C_opt_Verbose;
+
+extern const String C_opt_Parse;
+extern const String C_opt_Name;
+extern const String C_opt_LangAll;
+extern const String C_opt_ExtensionsAll;
+extern const String C_opt_DevmanFile;
+extern const String C_opt_SinceFile;
+
+extern const String C_arg_Cplusplus;
+extern const String C_arg_Idl;
+extern const String C_arg_Java;
+
+extern const String C_opt_Project;
+//extern const String C_opt_Lang;
+//extern const String C_opt_Extensions;
+extern const String C_opt_SourceTree;
+extern const String C_opt_SourceDir;
+extern const String C_opt_SourceFile;
+
+extern const String C_opt_CreateHtml;
+extern const String C_opt_DevmanRoot;
+
+//extern const String C_opt_CreateXml;
+//extern const String C_opt_Load;
+//extern const String C_opt_Save;
+
+extern const String C_opt_ExternNamespace;
+extern const String C_opt_ExternRoot;
+
+
+inline void
+CHECKOPT( bool b, const char * miss, const String & opt )
+{
+    if ( NOT b )
+    {
+        StreamLock slMsg(100);
+        throw X_CommandLine( slMsg() << "Missing " << miss <<" after " << opt << "." << c_str );
+    }
+}
+
+}   // namespace command
+}   // namespace autodoc
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/exes/adc_uni/adc_msg.cxx b/autodoc/source/exes/adc_uni/adc_msg.cxx
new file mode 100644
index 000000000000..ad8b9d5745f0
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/adc_msg.cxx
@@ -0,0 +1,211 @@
+/* -*- 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 <precomp.h>
+#include <adc_msg.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/file.hxx>
+#include <cosv/tpl/tpltools.hxx>
+
+
+namespace autodoc
+{
+
+
+Messages::Messages()
+    :   aMissingDocs(),
+        aParseErrors(),
+        aInvalidConstSymbols(),
+        aUnresolvedLinks(),
+        aTypeVsMemberMisuses()
+{
+}
+
+Messages::~Messages()
+{
+}
+
+void
+Messages::WriteFile(const String & i_sOutputFilePath)
+{
+    csv::File
+        aOut(i_sOutputFilePath, csv::CFM_CREATE);
+    aOut.open();
+
+    // KORR_FUTURE Enable this when appropriate:
+    WriteParagraph( aOut,
+                    aParseErrors,
+                    "Incompletely Parsed Files",
+                    "Stopped parsing at " );
+
+    WriteParagraph( aOut,
+                    aMissingDocs,
+                    "Entities Without Documentation",
+                    " in " );
+
+    WriteParagraph( aOut,
+                    aInvalidConstSymbols,
+                    "Incorrectly Written Const Symbols",
+                    " in " );
+
+    WriteParagraph( aOut,
+                    aUnresolvedLinks,
+                    "Unresolved Links",
+                    " in\n        " );
+
+    WriteParagraph( aOut,
+                    aTypeVsMemberMisuses,
+                    "Confusion or Misuse of <Type> vs. <Member>",
+                    " in " );
+    aOut.close();
+}
+
+void
+Messages::Out_MissingDoc(   const String &      i_sEntity,
+                            const String &      i_sFile,
+                            uintt               i_nLine)
+{
+    AddValue( aMissingDocs,
+              i_sEntity,
+              i_sFile,
+              i_nLine );
+}
+
+void
+Messages::Out_ParseError(   const String &      i_sFile,
+                            uintt               i_nLine)
+{
+    aParseErrors[Location(i_sFile,i_nLine)] = String::Null_();
+}
+
+void
+Messages::Out_InvalidConstSymbol( const String &      i_sText,
+                                  const String &      i_sFile,
+                                  uintt               i_nLine)
+{
+    AddValue( aInvalidConstSymbols,
+              i_sText,
+              i_sFile,
+              i_nLine );
+}
+
+void
+Messages::Out_UnresolvedLink( const String &      i_sLinkText,
+                              const String &      i_sFile,
+                              uintt               i_nLine)
+{
+    AddValue( aUnresolvedLinks,
+              i_sLinkText,
+              i_sFile,
+              i_nLine );
+}
+
+void
+Messages::Out_TypeVsMemberMisuse( const String &      i_sLinkText,
+                                  const String &      i_sFile,
+                                  uintt               i_nLine)
+{
+    AddValue( aTypeVsMemberMisuses,
+              i_sLinkText,
+              i_sFile,
+              i_nLine );
+}
+
+Messages &
+Messages::The_()
+{
+    static Messages TheMessages_;
+    return TheMessages_;
+}
+
+void
+Messages::AddValue( MessageMap &        o_dest,
+                    const String &      i_sText,
+                    const String &      i_sFile,
+                    uintt               i_nLine )
+{
+    String &
+        rDest = o_dest[Location(i_sFile,i_nLine)];
+    StreamLock
+        slDest(2000);
+    if (NOT rDest.empty())
+        slDest() << rDest;
+    slDest() << "\n    " << i_sText;
+    rDest = slDest().c_str();
+}
+
+void
+Messages::WriteParagraph( csv::File &         o_out,
+                          const MessageMap &  i_source,
+                          const String &      i_title,
+                          const String &      )
+{
+    StreamStr   aLine(2000);
+
+    // Write title of paragraph:
+    aLine << i_title
+          << "\n";
+    o_out.write(aLine.c_str());
+
+    aLine.seekp(0);
+    for (uintt i = i_title.size(); i > 0; --i)
+    {
+        aLine << '-';
+    }
+    aLine << "\n\n";
+    o_out.write(aLine.c_str());
+
+    // Write Content
+    MessageMap::const_iterator it = i_source.begin();
+    MessageMap::const_iterator itEnd = i_source.end();
+    for ( ; it != itEnd; ++it )
+    {
+        aLine.seekp(0);
+        aLine << (*it).first.sFile;
+        // Nobody wants to see this, if we don't know the line:
+        if ((*it).first.nLine != 0)
+        {
+            aLine << ", line "
+                  << (*it).first.nLine;
+        }
+        if (NOT (*it).second.empty())
+        {
+            aLine << ':'
+                  << (*it).second
+                  << "\n";
+        }
+        o_out.write(aLine.c_str());
+    }
+    o_out.write("\n\n\n");
+}
+
+}   // namespace autodoc
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/exes/adc_uni/cmd_run.cxx b/autodoc/source/exes/adc_uni/cmd_run.cxx
new file mode 100644
index 000000000000..5b79de482114
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/cmd_run.cxx
@@ -0,0 +1,281 @@
+/* -*- 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 <precomp.h>
+#include "cmd_run.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/file.hxx>
+#include <cosv/x.hxx>
+#include <ary/ary.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <autodoc/filecoli.hxx>
+#include <autodoc/parsing.hxx>
+#include <autodoc/prs_code.hxx>
+#include <autodoc/prs_docu.hxx>
+#include <parser/unoidl.hxx>
+#include <adc_cl.hxx>
+#include "adc_cmd_parse.hxx"
+#include "adc_cmds.hxx"
+
+namespace autodoc
+{
+namespace command
+{
+namespace run
+{
+
+Parser::Parser( const Parse & i_command )
+    :   rCommand(i_command),
+        pCppParser(),
+        pCppDocuInterpreter(),
+        pIdlParser()
+{
+}
+
+Parser::~Parser()
+{
+}
+
+bool
+Parser::Perform()
+{
+    Cout() << "Parsing the repository "
+              << rCommand.ReposyName()
+              << " ..."
+              << Endl();
+  try
+  {
+    ::ary::Repository &
+        rAry = CommandLine::Get_().TheRepository();
+    rAry.Set_Title(rCommand.ReposyName());
+
+    Dyn< FileCollector_Ifc >
+        pFiles( ParseToolsFactory().Create_FileCollector(6000) );
+
+    bool bIDL = false;
+    bool bCpp = false;
+
+    command::Parse::ProjectIterator
+        itEnd = rCommand.ProjectsEnd();
+    for ( command::Parse::ProjectIterator it = rCommand.ProjectsBegin();
+          it != itEnd;
+          ++it )
+    {
+        uintt nCount = GatherFiles( *pFiles, *(*it) );
+        Cout() << nCount
+             << " files found to parse in project "
+             << (*it)->Name()
+             << "."
+             << Endl();
+
+        switch ( (*it)->Language().eLanguage )
+        {
+            case command::S_LanguageInfo::idl:
+            {
+                Get_IdlParser().Run(*pFiles);
+                bIDL = true;
+            }   break;
+            case command::S_LanguageInfo::cpp:
+            {
+                Get_CppParser().Run( *pFiles );
+                bCpp = true;
+            }   break;
+            default:
+                Cerr() << "Project in yet unimplemented language skipped."
+                       << Endl();
+        }
+    }   // end for
+
+    if (bCpp)
+    {
+        rAry.Gate_Cpp().Calculate_AllSecondaryInformation();
+    }
+    if (bIDL)
+    {
+        rAry.Gate_Idl().Calculate_AllSecondaryInformation(
+                            rCommand.DevelopersManual_RefFilePath() );
+
+//        ::ary::idl::SecondariesPilot &
+//            rIdl2sPilot = rAry.Gate_Idl().Secondaries();
+//
+//        rIdl2sPilot.CheckAllInterfaceBases( rAry.Gate_Idl() );
+//        rIdl2sPilot.Connect_Types2Ces();
+//        rIdl2sPilot.Gather_CrossReferences();
+//
+//        if (NOT rCommand.DevelopersManual_RefFilePath().empty())
+//        {
+//            csv::File
+//                aFile(rCommand.DevelopersManual_RefFilePath(), csv::CFM_READ);
+//            if ( aFile.open() )
+//            {
+//                rIdl2sPilot.Read_Links2DevManual(aFile);
+//              aFile.close();
+//            }
+//        }
+    }   // endif (bIDL)
+
+    return true;
+
+  }   // end try
+  catch (csv::Exception & xx)
+  {
+    xx.GetInfo(Cerr());
+    Cerr() << " program will exit." << Endl();
+
+    return false;
+  }
+}
+
+CodeParser_Ifc &
+Parser::Get_CppParser()
+{
+    if ( NOT pCppParser )
+        Create_CppParser();
+    return *pCppParser;
+}
+
+IdlParser &
+Parser::Get_IdlParser()
+{
+    if ( NOT pIdlParser )
+        Create_IdlParser();
+    return *pIdlParser;
+}
+
+void
+Parser::Create_CppParser()
+{
+    pCppParser          = ParseToolsFactory().Create_Parser_Cplusplus();
+    pCppDocuInterpreter = ParseToolsFactory().Create_DocuParser_AutodocStyle();
+
+    pCppParser->Setup( CommandLine::Get_().TheRepository(),
+                       *pCppDocuInterpreter );
+}
+
+void
+Parser::Create_IdlParser()
+{
+    pIdlParser = new IdlParser(CommandLine::Get_().TheRepository());
+}
+
+const ParseToolsFactory_Ifc &
+Parser::ParseToolsFactory()
+{
+    return ParseToolsFactory_Ifc::GetIt_();
+}
+
+uintt
+Parser::GatherFiles( FileCollector_Ifc &    o_rFiles,
+                     const S_ProjectData &  i_rProject )
+{
+    uintt ret = 0;
+    o_rFiles.EraseAll();
+
+    typedef StringVector                StrVector;
+    typedef StrVector::const_iterator   StrIterator;
+    const S_Sources &
+        rSources = i_rProject.Sources();
+    const StrVector &
+        rExtensions = i_rProject.Language().aExtensions;
+
+    StrIterator     it;
+    StrIterator     itTreesEnd  = rSources.aTrees.end();
+    StrIterator     itDirsEnd   = rSources.aDirectories.end();
+    StrIterator     itFilesEnd  = rSources.aFiles.end();
+    StrIterator     itExt;
+    StrIterator     itExtEnd    = rExtensions.end();
+
+    csv::StreamStr aDir(500);
+    i_rProject.RootDirectory().Get( aDir );
+
+    uintt nProjectDir_AddPosition =
+            ( strcmp(aDir.c_str(),".\\") == 0 OR strcmp(aDir.c_str(),"./") == 0 )
+                ?   0
+                :   uintt( aDir.tellp() );
+
+    for ( it = rSources.aDirectories.begin();
+          it != itDirsEnd;
+          ++it )
+    {
+        aDir.seekp( nProjectDir_AddPosition );
+        aDir << *it;
+
+        for ( itExt = rExtensions.begin();
+              itExt != itExtEnd;
+              ++itExt )
+        {
+            ret += o_rFiles.AddFilesFrom( aDir.c_str(),
+                                          *itExt,
+                                          FileCollector_Ifc::flat );
+        }   // end for itExt
+    }   // end for it
+    for ( it = rSources.aTrees.begin();
+          it != itTreesEnd;
+          ++it )
+    {
+        aDir.seekp( nProjectDir_AddPosition );
+        aDir << *it;
+
+        for ( itExt = rExtensions.begin();
+              itExt != itExtEnd;
+              ++itExt )
+        {
+            ret += o_rFiles.AddFilesFrom( aDir.c_str(),
+                                          *itExt,
+                                          FileCollector_Ifc::recursive );
+        }   // end for itExt
+    }   // end for it
+    for ( it = rSources.aFiles.begin();
+          it != itFilesEnd;
+          ++it )
+    {
+        aDir.seekp( nProjectDir_AddPosition );
+        aDir << *it;
+
+        o_rFiles.AddFile( aDir.c_str() );
+    }   // end for it
+    ret += rSources.aFiles.size();
+
+    return ret;
+}
+
+
+}   // namespace run
+}   // namespace command
+}   // namespace autodoc
+
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/exes/adc_uni/cmd_run.hxx b/autodoc/source/exes/adc_uni/cmd_run.hxx
new file mode 100644
index 000000000000..523df6eb34dc
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/cmd_run.hxx
@@ -0,0 +1,107 @@
+/* -*- 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 ADC_CMD_RUN_HXX
+#define ADC_CMD_RUN_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cosv/comdline.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+     class Repository;
+}
+
+namespace autodoc
+{
+    class FileCollector_Ifc;
+    class ParseToolsFactory_Ifc;
+    class CodeParser_Ifc;
+    class DocumentationParser_Ifc;
+    class IdlParser;
+
+
+namespace command
+{
+    class Parse;
+     class S_ProjectData;
+     struct S_LanguageInfo;
+
+namespace run
+{
+
+/** Performs an ::autodoc::command::Parse .
+*/
+class Parser
+{
+  public:
+                        Parser(
+                            const Parse &       i_command );
+                        ~Parser();
+
+    bool                Perform();
+
+  private:
+    // Locals
+    CodeParser_Ifc &    Get_CppParser();
+    IdlParser &         Get_IdlParser();
+    void                Create_CppParser();
+    void                Create_IdlParser();
+    const ParseToolsFactory_Ifc &
+                        ParseToolsFactory();
+    uintt               GatherFiles(
+                            FileCollector_Ifc & o_rFiles,
+                            const S_ProjectData &
+                                                i_rProject );
+    // DATA
+    const Parse &       rCommand;
+
+    Dyn<CodeParser_Ifc> pCppParser;
+    Dyn<DocumentationParser_Ifc>
+                        pCppDocuInterpreter;
+    Dyn<IdlParser>      pIdlParser;
+};
+
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace run
+}   // namespace command
+}   // namespace autodoc
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/exes/adc_uni/cmd_sincedata.cxx b/autodoc/source/exes/adc_uni/cmd_sincedata.cxx
new file mode 100644
index 000000000000..ca3ac084d00e
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/cmd_sincedata.cxx
@@ -0,0 +1,132 @@
+/* -*- 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 <precomp.h>
+#include "cmd_sincedata.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/file.hxx>
+#include <cosv/tpl/tpltools.hxx>
+#include "adc_cmds.hxx"
+
+
+
+namespace autodoc
+{
+namespace command
+{
+
+SinceTagTransformationData::SinceTagTransformationData()
+    :   aTransformationTable()
+{
+}
+
+SinceTagTransformationData::~SinceTagTransformationData()
+{
+}
+
+bool
+SinceTagTransformationData::DoesTransform() const
+{
+    return NOT aTransformationTable.empty();
+}
+
+const String &
+SinceTagTransformationData::DisplayOf( const String & i_versionNumber ) const
+{
+    if (DoesTransform())
+    {
+        StreamLock
+            sl(200);
+        sl() << i_versionNumber;
+        sl().strip_frontback_whitespace();
+        String
+            sVersionNumber(sl().c_str());
+
+        const String *
+            ret = csv::find_in_map(aTransformationTable, sVersionNumber);
+        return ret != 0
+                ?   *ret
+                :   String::Null_();
+    }
+    else
+    {
+        return i_versionNumber;
+    }
+}
+
+void
+SinceTagTransformationData::do_Init( opt_iter &  it,
+                                     opt_iter    itEnd )
+{
+    ++it;   // Cur is since-file path.
+
+    CHECKOPT(   it != itEnd ,
+              "file path",
+              C_opt_SinceFile );
+
+    csv::File           aSinceFile(*it);
+    csv::OpenCloseGuard aSinceFileGuard(aSinceFile);
+    StreamStr           sLine(200);
+
+    if (aSinceFileGuard)
+    {
+        for ( sLine.operator_read_line(aSinceFile);
+              NOT sLine.empty();
+              sLine.operator_read_line(aSinceFile) )
+        {
+
+            if (*sLine.begin() != '"')
+                continue;
+
+            const char * pVersion = sLine.c_str() + 1;
+            const char * pVersionEnd = strchr(pVersion, '"');
+            if (pVersionEnd == 0)
+                continue;
+            const char * pDisplay = strchr(pVersionEnd+1, '"');
+            if (pDisplay == 0)
+                continue;
+            ++pDisplay;
+            const char * pDisplayEnd = strchr(pDisplay, '"');
+            if (pDisplayEnd == 0)
+                continue;
+
+            aTransformationTable[ String(pVersion,pVersionEnd) ]
+                                        = String(pDisplay,pDisplayEnd);
+            sLine.clear();
+        }   // end for
+    }   // end if
+
+    ++it;   // Cur is next option.
+}
+
+}   // namespace command
+}   // namespace autodoc
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/exes/adc_uni/cmd_sincedata.hxx b/autodoc/source/exes/adc_uni/cmd_sincedata.hxx
new file mode 100644
index 000000000000..adac72c93594
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/cmd_sincedata.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 ADC_CMD_SINCEDATA_HXX
+#define ADC_CMD_SINCEDATA_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "adc_cmd.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+namespace autodoc
+{
+namespace command
+{
+
+
+/** Provides replacements for the contents of the @@since documentation tag.
+
+    Because the @@since tag is part of the source code, it allows only one kind
+    of version information there. If this is to be mapped for different products
+    (example: from OpenOffice.org versions in the @@since tag to StarOffice or
+    StarSuite products), the value of @@since needs a replacement, which is provided
+    by this class.
+
+*/
+class SinceTagTransformationData : public Context
+{
+  public:
+    /** The key of this map are the version numbers within @since.
+        The value is the string to display for each version number.
+    */
+    typedef std::map<String,String>     Map_Version2Display;
+
+    // LIFECYCLE
+                        SinceTagTransformationData();
+    virtual             ~SinceTagTransformationData();
+
+    // INQUIRY
+    /// False, if no transformation table exists.
+    bool                DoesTransform() const;
+
+    /** Gets the string to display for a version number.
+
+        @param i_sVersionNumber
+        Usually should be the result of ->StripSinceTagValue().
+    */
+    const String &      DisplayOf(
+                            const String &      i_sVersionNumber ) const;
+  private:
+    // Interface Context:
+    virtual void        do_Init(
+                            opt_iter &          i_nCurArgsBegin,
+                            opt_iter            i_nEndOfAllArgs );
+    // DATA
+    Map_Version2Display aTransformationTable;
+};
+
+
+}   // namespace command
+}   // namespace autodoc
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/exes/adc_uni/main.cxx b/autodoc/source/exes/adc_uni/main.cxx
new file mode 100644
index 000000000000..6e5a11a6e0b6
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/main.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+
+
+// NOT FULLY DECLARED SERVICES
+
+#include <adc_cl.hxx>
+#include "cmd_run.hxx"
+
+
+int
+#ifdef WNT
+    _cdecl
+#endif
+main( int        argc,
+      char *     argv[] )
+{
+    autodoc::CommandLine    aCL;
+    aCL.Init(argc, argv);
+    if (NOT aCL.CheckParameters() )
+        return 1;
+
+    int ret = aCL.Run();
+    return ret;
+}
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/exes/adc_uni/makefile.mk b/autodoc/source/exes/adc_uni/makefile.mk
new file mode 100644
index 000000000000..bf959e72b0f1
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/makefile.mk
@@ -0,0 +1,104 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=autodoc
+TARGETTYPE=CUI
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+UWINAPILIB=$(0)
+LIBSALCPPRT=$(0)
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/adc_cl.obj	        \
+    $(OBJ)$/adc_cmd_parse.obj	\
+    $(OBJ)$/adc_cmds.obj        \
+    $(OBJ)$/adc_msg.obj	        \
+    $(OBJ)$/cmd_run.obj         \
+    $(OBJ)$/cmd_sincedata.obj
+
+
+# --- Targets ------------------------------------------------------
+
+LIB1TARGET=$(LB)$/atdoc.lib
+LIB1FILES= \
+            $(LB)$/$(TARGET).lib $(LB)$/autodoc_tools.lib \
+            $(LB)$/ary_kernel.lib $(LB)$/ary_cpp.lib $(LB)$/ary_idl.lib  \
+            $(LB)$/ary_info.lib $(LB)$/ary_loc.lib \
+            $(LB)$/parser_kernel.lib $(LB)$/parser_tokens.lib $(LB)$/parser_semantic.lib \
+            $(LB)$/parser_cpp.lib $(LB)$/parser_adoc.lib \
+            $(LB)$/display_kernel.lib $(LB)$/display_html.lib $(LB)$/display_idl.lib \
+            $(LB)$/display_toolkit.lib $(LB)$/parser2_tokens.lib  \
+            $(LB)$/parser2_s2_luidl.lib $(LB)$/parser2_s2_dsapi.lib \
+            $(LB)$/ary2_cinfo.lib $(LB)$/ary_doc.lib
+
+
+
+APP1TARGET=	$(TARGET)
+APP1STACK=	1000000
+APP1OBJS=   $(OBJ)$/main.obj
+
+APP1RPATH=SDK
+
+.IF "$(GUI)"=="WNT"
+APP1STDLIBS= $(COSVLIB) $(UDMLIB)
+.ELSE
+.IF "$(OS)"=="MACOSX"
+# See <http://porting.openoffice.org/servlets/ReadMsg?list=mac&msgNo=6911>:
+APP1STDLIBS= -Wl,-all_load -ludm -lcosv
+.ELSE
+APP1STDLIBS= -lcosv -ludm
+.ENDIF
+.ENDIF
+
+APP1LIBS=$(LB)$/atdoc.lib
+
+DEPOBJFILES += $(APP1OBJS)
+
+APP1DEPN=   $(LB)$/$(TARGET).lib $(LB)$/autodoc_tools.lib \
+            $(LB)$/ary_kernel.lib $(LB)$/ary_cpp.lib $(LB)$/ary_idl.lib  \
+            $(LB)$/ary_info.lib $(LB)$/ary_loc.lib \
+            $(LB)$/parser_kernel.lib $(LB)$/parser_tokens.lib $(LB)$/parser_semantic.lib \
+            $(LB)$/parser_cpp.lib $(LB)$/parser_adoc.lib \
+            $(LB)$/display_kernel.lib $(LB)$/display_html.lib $(LB)$/display_idl.lib \
+            $(LB)$/display_toolkit.lib $(LB)$/parser2_tokens.lib  \
+            $(LB)$/parser2_s2_luidl.lib $(LB)$/parser2_s2_dsapi.lib \
+            $(LB)$/ary2_cinfo.lib $(LB)$/ary_doc.lib
+
+
+.INCLUDE :  target.mk
diff --git a/autodoc/source/exes/adc_uni/spec-CommandLine.txt b/autodoc/source/exes/adc_uni/spec-CommandLine.txt
new file mode 100644
index 000000000000..756b3184a2e4
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/spec-CommandLine.txt
@@ -0,0 +1,181 @@
+        Command Line Options
+        --------------------
+
+autodoc [-v <level>]
+        -html <out>
+        [-extroot <externroot> -extnsp <externnamespace>]
+        -lg <proglang>
+        [-t <sourcetree>[ <sourcetree> ...]
+        [-d <sourcedir>[ <sourcedir> ...]
+        [-f <sourcefile>[ <sourcefile> ...]
+
+
+    -html <OutputDirectory>
+        Directory where the output will be created.
+
+    -lg <ProgrammingLanguage>
+        Allowed values: "c++" or "idl"
+
+    -extroot <externroot>
+        Only together with "-lg idl" and -extnsp.
+        Links to code entities not found within the current parsed
+        code, will be linked there, but only if -extnsp is given and
+        the linked entity is in the given namespace.
+        <externroot> is a http link, it needs no "http://" at the
+        beginning nor slash at the end.
+
+    -extnsp <externnamespace>
+        Only together with "-lg idl" and -extroot.
+        If a code entity is not found in the current parsed code, but
+        dwells in the namespace (or its children) given here, it is
+        linked into the loc�tion given by -extroot.
+        <externnamespace> is an absolute qualified namespace,
+        starting with "::".
+
+    -t <SourceTree>*
+        Directory with all subdirectories.
+
+    -d <SourceDirectory>*
+        Directory without subdirectories.
+
+    -f <SourceFile>*
+        Any file. Here also files with extensions not matching the
+        language are accepted.
+
+    -I:<ResponseFile>
+        Each line in the response file has to have one command line
+        option. No whitespace at start of line.
+
+    -C:<ConfigurationFile>
+        Format see below.
+
+    -v <VerboseLevel>
+        Only for debugging. Bits 1, 2 and 4 in any combination give
+        different output.
+
+    -h
+        Displays help.
+    -?
+        Displays help.
+
+
+
+
+
+        Command Line Options especially for the OpenOffice.org SDK
+        ----------------------------------------------------------
+
+    -dvgroot <DevelopersGuide>
+        Root directory of the SDK Developers Guide.
+
+    -dvgfile <ReferenceFile>
+        File with references to the SDK Developers Guide.
+
+    -sincefile <@since-AssociationFile>
+        File that maps OpenOffice versions to the wished displayed version names.
+
+    -idlref <IdlDocumentationRoot> <Namespace[,Namespace ...]>
+        Gives the outputdirectory of an IDL documentation, where
+        symbols not found in the currently parsed namespaces of C++
+        or Java can be found.
+
+
+
+        Configure File Format
+        ---------------------
+
+<AutodocConfiguration>
+    <RepositoryName></RepositoryName>
+        // Base name of the binary repository files.
+        // Has to be a valid file name.
+
+    <HtmlOutputTitle></HtmlOutputTitle>
+        // Title on the "welcome page" of the created HTML documentation.
+        // Can be any text.
+
+    <CppExtensions></CppExtensions>
+        // Overwrites the default. Default is: .hxx .h .hpp
+        // Format: File extensions with a dot in front, like ".hcc".
+
+    <IdlExtensions></IdlExtensions>
+        // Overwrites the default. Default is: .idl
+        // Format: File extensions with a dot in front, like ".txt".
+
+    <CppDocu html="(on|off) off"/>
+
+    <IdlDocu html="(on|off) on"/>
+
+</AutodocConfiguration>
+
+
+
+
+
+
+        Historical Command Line Options
+        -------------------------------
+
+autodoc.exe
+    [ -v <VerboseNr> ]
+    -html <OutputDirectory>
+    {
+        [ -parse ]
+	[ -name <RepositoryName> ]
+        -lg <ProgrammingLanguage>
+        {
+            [ -p <ProjectName> <ProjectRootDirectory> ]
+            {
+                -t <SourceDirectory>*
+                -d <SourceDirectory>*
+                -f <SourceFile>*
+            }+
+        }+
+    }
+
+Legend:
+    <Text>
+    	command line parameter
+    [ ]
+    	optional
+    { }
+    	Block of connected options.
+    The sequence of not connected options does not matter. So the -html or -v options can be used before or after all the parsing options.
+    +
+    	once or more times
+    *
+    	none or more times
+
+
+Explanation of the Options
+    -v <VerboseNr> 	Only for debugging. Bits 1, 2 and 4 in any combination give different output.
+    -html <OutputDirectory>
+    	Gives the directory, where a HTML version of the docu shall be generated.
+    -parse 	Starts the block, where all the parse options are given. This can be omitted, because the parse options are identifiable without it, but it may make a commandline more readable.
+    -name <RepositoryName> 	This name appears as title of the documentation (currently only in the in the C++ version).
+    -lg <ProgrammingLanguage>
+
+
+    Possible values are:
+
+    c++
+        This parses all files with the endings .hxx and .h .
+    idl
+        This parses all files with the ending .idl .
+
+    -p with -t/-d/-f: 	If there are more than one project, the -p option is required for each one.
+
+    The directory given wit the -p option is the root directory of the project.
+    If there is no -p option, the working directory is seen as root.
+
+    All paths given with -t/-d/-f are relative to that root directory. It is possible to use "." as argument for -t or -d.
+
+    Each of -t/-d/-f can have several arguments:
+    One could write "-f file1.hxx file2.hxx file_xyz.hxx"
+    After each -p (or after -lg, if there is no -p option), there has to be at least one of the following three:
+    -t 	Tree, which means: include subdirectories
+    -d 	Directory, which means: no subdirectories
+    -f 	File", which means: single file name with ending.
+    This option also allows to parse some files with an ending different from those, the -lg option implies.
+
+
+
diff --git a/autodoc/source/exes/adc_uni/spec-DevGuideReferenceFile.txt b/autodoc/source/exes/adc_uni/spec-DevGuideReferenceFile.txt
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/spec-DevGuideReferenceFile.txt
diff --git a/autodoc/source/exes/adc_uni/spec-SinceTag_Handling.txt b/autodoc/source/exes/adc_uni/spec-SinceTag_Handling.txt
new file mode 100644
index 000000000000..7cf264e76be3
--- /dev/null
+++ b/autodoc/source/exes/adc_uni/spec-SinceTag_Handling.txt
@@ -0,0 +1,49 @@
+		General Handling
+		----------------
+
+- The developer inserts the OpenOffice.org version into the @since tag.
+
+- @since-Tag may contain any string which needs to end with a Version number.
+  The first cipher following immediately on a white space is interpreted as start of the version number.
+
+- The @since Tag must stay completely within one line to allow tool support for retargeting.
+
+- To replace @since entries in the generated documentation, one needs to use
+  the command line option
+
+  -sincefile <TransformationFile-path>
+
+  This option has to occur immediately after the -html option.
+  If this option is not given, the original text of the @since tag is
+  displayed.
+
+  If the TransformationFile does not contain a specific entry,
+  nothing is displayed for this entry.
+
+
+
+		Format of the @since Tag Transformation File
+		--------------------------------------------
+
+Example
+-------
+
+***** BEGIN OF FILE ******
+"1.1" "StarOffice 7.0"
+"2.0" "StarOffice 8.0"
+"2.1" "StarOffice 9.0"
+***** END OF FILE ******
+
+
+
+Rules and Restrictions
+----------------------
+
+*	Each line contains two strings within "".
+	The first string is the OpenOffice.org version number which is found in the @since tag.
+	The second string is the string to display for this version.
+*	No specific order among product versions is needed.
+*	Empty lines and whitespaces are allowed, except:
+	- Non empty lines must not start with white space.
+	- Within OpenOffice.org version strings, no whitespace is allowed.
+*	Whitespace within display strings is displayed as it is.
diff --git a/autodoc/source/inc/adc_cl.hxx b/autodoc/source/inc/adc_cl.hxx
new file mode 100644
index 000000000000..07fff0a9d940
--- /dev/null
+++ b/autodoc/source/inc/adc_cl.hxx
@@ -0,0 +1,195 @@
+/* -*- 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 ADC_ADC_CL_HXX
+#define ADC_ADC_CL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cosv/comdline.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+    class Repository;
+}
+
+namespace autodoc
+{
+namespace command
+{
+    class Command;
+    class CreateHtml;
+    class SinceTagTransformationData;
+}
+
+
+/** Reads and runs an Autodoc command line.
+*/
+class CommandLine : public csv::CommandLine_Ifc
+{
+  public:
+    // LIFECYCLE
+                        CommandLine();
+                        ~CommandLine();
+    // OPERATIONS
+    int                 Run() const;
+
+    // INQUIRY
+        // debugging
+    bool                DebugStyle_ShowText() const;
+    bool                DebugStyle_ShowStoredObjects() const;
+    bool                DebugStyle_ShowTokens() const;
+
+        // @since tags
+    bool                DoesTransform_SinceTag() const;
+
+//    /// @see command::SinceTagTransformationData::StripSinceTagValue()
+//    bool                Strip_SinceTagText(
+//                            String &            io_sSinceTagValue ) const;
+
+    /// @see command::SinceTagTransformationData::DisplayOf()
+    const String &      DisplayOf_SinceTagValue(
+                            const String &      i_sVersionNumber ) const;
+
+        // extern IDL links
+    const String &      ExternRoot() const      { return sExternRoot; }
+    const String &      ExternNamespace() const { return sExternNamespace; }
+
+    bool                CppUsed() const         { return bCpp; }
+    bool                IdlUsed() const         { return bIdl; }
+
+    // ACCESS
+    static CommandLine &
+                        Get_();
+    void                Set_ExternRoot(
+                            const String &      i_s )
+                                                { sExternRoot = i_s; }
+    void                Set_ExternNamespace(
+                            const String &      i_s )
+                                                { sExternNamespace = i_s; }
+    ary::Repository &   TheRepository() const   { csv_assert(pReposy != 0);
+                                                  return *pReposy; }
+    void                Set_CppUsed()           { bCpp = true; }
+    void                Set_IdlUsed()           { bIdl = true; }
+
+  private:
+    // Interface cosv::CommandLine_Ifc:
+    virtual void        do_Init(
+                            int                 argc,
+                            char *              argv[] );
+    virtual void        do_PrintUse() const;
+    virtual bool        inq_CheckParameters() const;
+
+    // Locals
+    typedef StringVector::const_iterator            opt_iter;
+    typedef std::vector< DYN command::Command* >    CommandList;
+
+    void                load_IncludedCommands(
+                            StringVector &      out,
+                            const char *        i_filePath );
+
+    void                do_clVerbose(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+    void                do_clParse(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+    void                do_clCreateHtml(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+    void                do_clSinceFile(
+                            opt_iter &          it,
+                            opt_iter            itEnd );
+
+//    void                do_clCreateXml(
+//                            opt_iter &          it,
+//                            opt_iter            itEnd );
+//    void                do_clLoad(
+//                            opt_iter &          it,
+//                            opt_iter            itEnd );
+//    void                do_clSave(
+//                            opt_iter &          it,
+//                            opt_iter            itEnd );
+
+    void                sort_Commands();
+
+    // DATA
+    uintt               nDebugStyle;
+    Dyn<command::SinceTagTransformationData>
+                        pSinceTransformator;
+
+    CommandList         aCommands;
+    bool                bInitOk;
+    command::CreateHtml *
+                        pCommand_CreateHtml;
+
+    String              sExternRoot;
+    String              sExternNamespace;
+
+    mutable Dyn<ary::Repository>
+                        pReposy;
+    bool                bCpp;
+    bool                bIdl;
+
+    static CommandLine *
+                        pTheInstance_;
+};
+
+
+
+// IMPLEMENTATION
+inline bool
+CommandLine::DebugStyle_ShowText() const
+    { return (nDebugStyle & 2) != 0; }
+inline bool
+CommandLine::DebugStyle_ShowStoredObjects() const
+    { return (nDebugStyle & 4) != 0; }
+inline bool
+CommandLine::DebugStyle_ShowTokens() const
+    { return (nDebugStyle & 1) != 0; }
+
+}   // namespace autodoc
+
+
+inline bool
+DEBUG_ShowText()
+    { return autodoc::CommandLine::Get_().DebugStyle_ShowText(); }
+inline bool
+DEBUG_ShowStoring()
+    { return autodoc::CommandLine::Get_().DebugStyle_ShowStoredObjects(); }
+inline bool
+DEBUG_ShowTokens()
+    { return autodoc::CommandLine::Get_().DebugStyle_ShowTokens(); }
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/inc/adc_msg.hxx b/autodoc/source/inc/adc_msg.hxx
new file mode 100644
index 000000000000..e88ccf5ce526
--- /dev/null
+++ b/autodoc/source/inc/adc_msg.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 ADC_ADC_MSG_HXX
+#define ADC_ADC_MSG_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+namespace csv
+{
+    class File;
+}
+
+
+namespace autodoc
+{
+
+
+/** Gathers, sorts and displays (mainly diagnostic) messages to the
+    user of Autodoc.
+*/
+class Messages
+{
+  public:
+    // LIFECYCLE
+                        Messages();
+                        ~Messages();
+    // OPERATIONS
+    void                WriteFile(
+                            const String &      i_sOutputFilePath);
+    // INQUIRY
+
+    // ACCESS
+    void                Out_MissingDoc(
+                            const String &      i_sEntity,
+                            const String &      i_sFile,
+                            uintt               i_nLine);
+    void                Out_ParseError(
+                            const String &      i_sFile,
+                            uintt               i_nLine);
+    void                Out_InvalidConstSymbol(
+                            const String &      i_sText,
+                            const String &      i_sFile,
+                            uintt               i_nLine);
+    void                Out_UnresolvedLink(
+                            const String &      i_sLinkText,
+                            const String &      i_sFile,
+                            uintt               i_nLine);
+    void                Out_TypeVsMemberMisuse(
+                            const String &      i_sLinkText,
+                            const String &      i_sFile,
+                            uintt               i_nLine);
+
+    static Messages &   The_();
+
+  private:
+    struct Location
+    {
+        String              sFile;
+        uintt               nLine;
+
+                            Location(
+                                const String &      i_file,
+                                uintt               i_line)
+                                :   sFile(i_file),
+                                    nLine(i_line)   {}
+        bool                operator<(
+                                const Location &    i_other) const
+                                { int cmp = csv::compare(sFile,i_other.sFile);
+                                  return cmp < 0
+                                            ?   true
+                                            :   cmp > 0
+                                                    ?   false
+                                                    :   nLine < i_other.nLine;
+                                }
+    };
+
+    typedef std::map<Location,String>   MessageMap;
+
+    // Locals
+    void                AddValue(
+                            MessageMap &        o_dest,
+                            const String &      i_sText,
+                            const String &      i_sFile,
+                            uintt               i_nLine );
+    void                WriteParagraph(
+                            csv::File &         o_out,
+                            const MessageMap &  i_source,
+                            const String &      i_title,
+                            const String &      i_firstIntermediateText );
+
+    // DATA
+    MessageMap          aMissingDocs;
+    MessageMap          aParseErrors;
+    MessageMap          aInvalidConstSymbols;
+    MessageMap          aUnresolvedLinks;
+    MessageMap          aTypeVsMemberMisuses;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace autodoc
+
+inline autodoc::Messages &
+TheMessages()
+{
+    return autodoc::Messages::The_();
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/inc/docu_node_ids.hxx b/autodoc/source/inc/docu_node_ids.hxx
new file mode 100644
index 000000000000..95f8e20dcebf
--- /dev/null
+++ b/autodoc/source/inc/docu_node_ids.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 ADC_DOCU_NODE_IDS_HXX
+#define ADC_DOCU_NODE_IDS_HXX
+
+
+
+namespace ary
+{
+namespace doc
+{
+namespace nodetype
+{
+enum E_Ids
+{
+
+    nt_none,
+    nt_OldCppDocu,
+    nt_OldIdlDocu
+
+
+
+
+
+
+
+
+
+};
+}   // namespace nodetype
+}   // namespace doc
+}   // namespace ary
+
+namespace docnt = ::ary::doc::nodetype;
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/inc/estack.hxx b/autodoc/source/inc/estack.hxx
new file mode 100644
index 000000000000..1cb5855a1122
--- /dev/null
+++ b/autodoc/source/inc/estack.hxx
@@ -0,0 +1,96 @@
+/* -*- 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 ARY_ESTACK_HXX
+#define ARY_ESTACK_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <list>
+    // COMPONENTS
+    // PARAMETERS
+
+
+
+template <class ELEM>
+class EStack : private std::list<ELEM>
+{
+  private:
+    typedef std::list<ELEM>    base;
+    const base &        Base() const            { return *this; }
+    base &              Base()                  { return *this; }
+
+  public:
+    typedef ELEM                                    value_type;
+    typedef typename std::list<ELEM>::size_type    size_type;
+
+    // LIFECYCLE
+                        EStack()                {}
+                        EStack(
+                            const EStack &      i_rStack )
+                                                :   base( (const base &)(i_rStack) ) {}
+                        ~EStack()               {}
+    // OPERATORS
+    EStack &            operator=(
+                            const EStack &      i_rStack )
+                                                { base::operator=( i_rStack.Base() );
+                                                  return *this; }
+    bool                operator==(
+                            const EStack<ELEM> &
+                                                i_r2 ) const
+                                                { return std::operator==( Base(), this->i_rStack.Base() ); }
+    bool                operator<(
+                            const EStack<ELEM> &
+                                                i_r2 ) const
+                                                { return std::operator<( Base(), this->i_rStack.Base() ); }
+    // OPERATIONS
+    void                push(
+                            const value_type &  i_rElem )
+                                                { base::push_front(i_rElem); }
+    void                pop()                   { base::pop_front(); }
+    void                erase_all()             { while (NOT empty()) pop(); }
+
+    // INQUIRY
+    const value_type &  top() const             { return base::front(); }
+    size_type           size() const            { return base::size(); }
+    bool                empty() const           { return base::empty(); }
+
+    // ACCESS
+    value_type &        top()                   { return base::front(); }
+};
+
+
+
+// IMPLEMENTATION
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/inc/luxenum.hxx b/autodoc/source/inc/luxenum.hxx
new file mode 100644
index 000000000000..5cac60403b56
--- /dev/null
+++ b/autodoc/source/inc/luxenum.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 UDM_LUXENUM_HXX
+#define UDM_LUXENUM_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <map>
+#include <algorithm>
+
+
+namespace lux
+{
+
+typedef std::map< intt, String  > EnumValueMap;
+
+
+template <class DIFF>
+class Enum // : public Template_Base
+{
+  public:
+    // TYPES
+    typedef Enum< DIFF >    self;
+
+    // LIFECYCLE
+                        Enum(
+                            DIFF                i_nValue,
+                            const char *        i_sText )
+                                                :   nValue(i_nValue) { Values_()[nValue] = i_sText;
+                                                                       // Sequence_().insert(
+                                                                       //       std::lower_bound( Sequence_().begin(), Sequence_().end(), i_nValue ),
+                                                                       //       i_nValue );
+                                                                     }
+                        Enum(
+                            DIFF                i_nValue )
+                                                :   nValue(i_nValue) { ; }
+                        Enum(
+                            intt                i_nValue = 0 )
+                                                :   nValue(i_nValue) { if ( NOT CheckIntt(i_nValue) ) { csv_assert(false); } }
+                        Enum(
+                            const self &        i_rEnum )
+                                                :   nValue(i_rEnum.nValue) {;}
+
+    self &              operator=(
+                            DIFF                i_nValue )
+                                                { nValue = i_nValue; return *this; }
+    self &              operator=(
+                            intt                i_nValue )
+                                                { if ( CheckIntt(i_nValue) ) {nValue = DIFF(i_nValue);}
+                                                  else {csv_assert(false);} return *this; }
+    self &              operator=(
+                            const self &        i_rEnum )
+                                                { nValue = i_rEnum.nValue; return *this; }
+                        operator DIFF() const   { return DIFF(nValue); }
+
+    DIFF                operator()() const      { return nValue; }
+    const String  &     Text() const            { return Values_()[nValue]; }
+
+  private:
+    static EnumValueMap &
+                        Values_();
+    bool                CheckIntt(
+                            intt                i_nNumber )
+                                                { return Values_().find(i_nNumber) != Values_().end(); }
+    // DATA
+    intt                nValue;
+};
+
+
+
+
+}   // namespace lux
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/inc/manip.hxx b/autodoc/source/inc/manip.hxx
new file mode 100644
index 000000000000..cd07815d3fd9
--- /dev/null
+++ b/autodoc/source/inc/manip.hxx
@@ -0,0 +1,63 @@
+/* -*- 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 ARY_MANIP_HXX
+#define ARY_MANIP_HXX
+
+template <class XY >
+class Manipulator
+{
+  public:
+    virtual             ~Manipulator() {}
+
+    void                operator()(
+                            XY &                io_r ) const
+                            { op_fcall(io_r); }
+  private:
+    virtual void        op_fcall(
+                            XY &                io_r ) const = 0;
+};
+
+template <class XY >
+class Const_Manipulator
+{
+  public:
+    virtual             ~Const_Manipulator() {}
+
+    void                operator()(
+                            const XY &          io_r ) const
+                            { op_fcall(io_r); }
+  private:
+    virtual void        op_fcall(
+                            const XY &          io_r ) const = 0;
+};
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/inc/precomp.h b/autodoc/source/inc/precomp.h
new file mode 100644
index 000000000000..9519999f22c4
--- /dev/null
+++ b/autodoc/source/inc/precomp.h
@@ -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 ADC_PRECOMP_H_06071998
+#define ADC_PRECOMP_H_06071998
+
+
+// For en/disabling csv_assertions:
+#ifndef DEBUG
+#define CSV_NO_ASSERTIONS
+#endif
+
+#include <cosv/csv_precomp.h>
+
+#include <vector>
+#include <map>
+#include <set>
+
+
+
+// Shortcuts to access csv::-types:
+using csv::String;
+using csv::StringVector;
+using csv::StreamStr;
+using csv::c_str;
+typedef csv::StreamStrLock  StreamLock;
+
+
+
+inline std::ostream &
+Cout() { return std::cout; }
+inline std::ostream &
+Cerr() { return std::cerr; }
+
+inline csv::F_FLUSHING_FUNC
+Endl()  { return csv::Endl; }
+inline csv::F_FLUSHING_FUNC
+Flush() { return csv::Flush; }
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/inc/prprpr.hxx b/autodoc/source/inc/prprpr.hxx
new file mode 100644
index 000000000000..eafc28fff86f
--- /dev/null
+++ b/autodoc/source/inc/prprpr.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 ARY_CPP_PRPRPR_HXX  // PRePRocessorPRocessing
+#define ARY_CPP_PRPRPR_HXX
+
+
+
+// Implemented in autodoc/source/parser/cpp/defdescr.cxx .
+
+bool                CheckForOperator(
+                        bool &              o_bStringify,
+                        bool &              o_bConcatenate,
+                        const String &     i_sTextItem );
+void                Do_bConcatenate(
+                        csv::StreamStr &    o_rText,
+                        bool &              io_bConcatenate );
+void                Do_bStringify_begin(
+                        csv::StreamStr &    o_rText,
+                        bool                i_bStringify );
+void                Do_bStringify_end(
+                        csv::StreamStr &    o_rText,
+                        bool &              io_bStringify );
+bool                HandleOperatorsBeforeTextItem(  /// @return true, if text item is done here
+                        csv::StreamStr &    o_rText,
+                        bool &              io_bStringify,
+                        bool &              io_bConcatenate,
+                        const String &     i_sTextItem );
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/inc/tools/filecoll.hxx b/autodoc/source/inc/tools/filecoll.hxx
new file mode 100644
index 000000000000..c30f864a242f
--- /dev/null
+++ b/autodoc/source/inc/tools/filecoll.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 ADC_FILECOLL_HXX
+#define ADC_FILECOLL_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <autodoc/filecoli.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+
+class FileCollector : public autodoc::FileCollector_Ifc
+{
+  public:
+    // LIFECYCLE
+                        FileCollector(
+                            uintt               i_nRoughNrOfFiles = 0 );
+
+    // OPERATIONS
+    virtual uintt       AddFilesFrom(
+                            const char *        i_sRootDir,
+                            const char *        i_sFilter,
+                            E_SearchMode        i_eSearchMode );
+    virtual uintt       AddFile(
+                            const char *        i_sFilePath );
+    virtual void        EraseAll();
+
+    // INQUIRY
+    virtual const_iterator
+                        Begin() const;
+    virtual const_iterator
+                        End() const;
+    virtual uintt       Size() const;
+
+  private:
+    // DATA
+    StringVector        aFoundFiles;
+};
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/inc/tools/tkpchars.hxx b/autodoc/source/inc/tools/tkpchars.hxx
new file mode 100644
index 000000000000..780352b888b3
--- /dev/null
+++ b/autodoc/source/inc/tools/tkpchars.hxx
@@ -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.
+ *
+ ************************************************************************/
+
+#ifndef ADC_TKPCHARS_HXX
+#define ADC_TKPCHARS_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETRS
+#include <adc_cl.hxx>
+#include <stack>
+
+
+
+/** @descr
+
+    dpSource:
+
+    1||||||||||||||||||||||a||||||||||||b|||c||||||||||||||||||||...
+
+
+    1 := first character of Sourcecode.
+    a := nLastTokenStart, there starts the last cut token.
+    b := nLastCut, there is a '\0'-char which marks the end of
+         the last cut token. The original character at b is stored
+         in cCharAtLastCut and will replace the '\0'-char, when the
+         next token is cut.
+    c := The current cursor position.
+
+
+    @needs  cosv.lib
+
+    @use    This class can be used by any parser to get the chars of a
+            text one by one and separate them to tokens.
+**/
+
+class CharacterSource
+{
+    public:
+        // LIFECYCLE
+                        CharacterSource();
+                        ~CharacterSource();
+
+        // OPERATIONS
+        /** Loads the complete contents of in_rSource into the classes private memory.
+            If in_rSource is a file, it has to be open of course.
+            After loading the text, the CurChar() is set on the begin of the text.
+        **/
+        void            LoadText(
+                            csv::bstream &      io_rSource);
+
+        void            InsertTextAtCurPos(
+                            const char *        i_sText2Insert );
+
+        /// @return CurChar() after moving forward one char.
+            char            MoveOn();
+        /** @return
+            The token which starts at the char which was CurChar(), when
+            CutToken() was called the last time - or at the beginning of the text.
+            The token ends by the CurChar() being replaced by a '\0'.
+
+            Value is valid until the next call of CutToken() or ~CharacterSource().
+        **/
+        const char *    CutToken();
+
+        // INQUIRY
+        char            CurChar() const;
+        /// @return The result of the last CutToken(). Or NULL, if there was none yet.
+        const char *    CurToken() const;
+
+    // INQUIRY
+        /// @return true, if
+        bool            IsFinished() const;
+
+    private:
+        struct S_SourceState
+        {
+            DYN char *      dpSource;
+            intt            nSourceSize;
+
+            intt            nCurPos;
+            intt            nLastCut;
+            intt            nLastTokenStart;
+            char            cCharAtLastCut;
+
+                            S_SourceState(
+                                DYN char *      dpSource,
+                                intt            nSourceSize,
+                                intt            nCurPos,
+                                intt            nLastCut,
+                                intt            nLastTokenStart,
+                                char            cCharAtLastCut );
+        };
+
+        void            BeginSource();
+        intt            CurPos() const;
+        char            MoveOn_OverStack();
+
+        // DATA
+        std::stack< S_SourceState >
+                        aSourcesStack;
+
+        DYN char *      dpSource;
+        intt            nSourceSize;
+
+        intt            nCurPos;
+        intt            nLastCut;
+        intt            nLastTokenStart;
+        char            cCharAtLastCut;
+};
+
+
+inline char
+CharacterSource::MoveOn()
+    {
+if (DEBUG_ShowText())
+{
+        Cerr() << char(dpSource[nCurPos+1]) << Flush();
+}
+        if ( nCurPos < nSourceSize-1 )
+            return dpSource[++nCurPos];
+        else if ( aSourcesStack.size() > 0 )
+            return MoveOn_OverStack();
+        else
+            return dpSource[nCurPos = nSourceSize];
+    }
+inline char
+CharacterSource::CurChar() const
+    { return nCurPos != nLastCut ? dpSource[nCurPos] : cCharAtLastCut; }
+inline const char *
+CharacterSource::CurToken() const
+    { return &dpSource[nLastTokenStart]; }
+inline bool
+CharacterSource::IsFinished() const
+    { return nCurPos >= nSourceSize; }
+inline intt
+CharacterSource::CurPos() const
+    { return nCurPos; }
+
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/mkinc/fullcpp.mk b/autodoc/source/mkinc/fullcpp.mk
new file mode 100644
index 000000000000..00f08bda77c7
--- /dev/null
+++ b/autodoc/source/mkinc/fullcpp.mk
@@ -0,0 +1,55 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+
+
+# --- Settings -----------------------------------------------------
+# Has to be included AFTER settings.mk !
+
+
+# RTTI
+.IF "$(COM)"=="MSC"
+CFLAGS+= -GR
+.ENDIF
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || \
+    "$(OS)"=="DRAGONFLY" || $(COM) == "GCC"
+CFLAGSCXX+= -frtti
+.ENDIF
+
+
+
+# Precompiled Headers
+.IF "$(NP_LOCALBUILD)"!="" && "$(GUI)"=="WNT"
+
+PCH_NAME=autodoc
+.IF "$(debug)"==""
+CFLAGS+= -YX"precomp.h" -Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pch
+.ELSE
+CFLAGS+= -YX"precomp.h" -Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd
+.ENDIF
+
+.ENDIF  # "$(NP_LOCALBUILD)"!="" && "$(GUI)"=="WNT"
diff --git a/autodoc/source/parser/adoc/a_rdocu.cxx b/autodoc/source/parser/adoc/a_rdocu.cxx
new file mode 100644
index 000000000000..212541a2f535
--- /dev/null
+++ b/autodoc/source/parser/adoc/a_rdocu.cxx
@@ -0,0 +1,92 @@
+/* -*- 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 <precomp.h>
+#include <adoc/a_rdocu.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <adoc/docu_pe.hxx>
+#include <adoc/adoc_tok.hxx>
+#include <ary/doc/d_oldcppdocu.hxx>
+#include <doc_deal.hxx>
+
+
+
+namespace adoc
+{
+
+
+DocuExplorer::DocuExplorer()
+    :   pDocuDistributor(0),
+        pPE(new Adoc_PE),
+        bIsPassedFirstDocu(false)
+{
+}
+
+DocuExplorer::~DocuExplorer()
+{
+}
+
+void
+DocuExplorer::StartNewFile( DocuDealer & o_rDocuDistributor )
+{
+    pDocuDistributor = &o_rDocuDistributor;
+    bIsPassedFirstDocu = false;
+}
+
+
+void
+DocuExplorer::Process_Token( DYN adoc::Token & let_drToken )
+{
+    csv_assert(pDocuDistributor != 0);
+
+    let_drToken.Trigger(*pPE);
+    if ( pPE->IsComplete() )
+    {
+        ary::doc::OldCppDocu *
+            pDocu = pPE->ReleaseJustParsedDocu();
+        if ( pDocu != 0 )
+        {
+            if (bIsPassedFirstDocu)
+                pDocuDistributor->TakeDocu( *pDocu );
+            else
+            {
+                delete pDocu;
+                bIsPassedFirstDocu = true;
+            }
+        }
+    }
+
+    delete &let_drToken;
+}
+
+
+}   // namespace adoc
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/adoc/adoc_tok.cxx b/autodoc/source/parser/adoc/adoc_tok.cxx
new file mode 100644
index 000000000000..4a63c2d0dc8f
--- /dev/null
+++ b/autodoc/source/parser/adoc/adoc_tok.cxx
@@ -0,0 +1,49 @@
+/* -*- 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 <precomp.h>
+#include <adoc/adoc_tok.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <adoc/atokdeal.hxx>
+#include <../cpp/c_dealer.hxx>
+
+
+namespace adoc {
+
+void
+Token::DealOut( ::TokenDealer & o_rDealer )
+{
+    o_rDealer.AsDistributor()->Deal_AdcDocu(*this);
+}
+
+
+}   // namespace adoc
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/adoc/cx_a_std.cxx b/autodoc/source/parser/adoc/cx_a_std.cxx
new file mode 100644
index 000000000000..18d11b560ab0
--- /dev/null
+++ b/autodoc/source/parser/adoc/cx_a_std.cxx
@@ -0,0 +1,518 @@
+/* -*- 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 <precomp.h>
+#include <adoc/cx_a_std.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <adoc/cx_a_sub.hxx>
+#include <x_parse.hxx>
+#include <tools/tkpchars.hxx>
+#include <adoc/tk_attag.hxx>
+#include <adoc/tk_docw.hxx>
+#include <tokens/tokdeal.hxx>
+
+
+
+namespace adoc {
+
+
+const intt C_nStatusSize = 128;
+const intt C_nCppInitialNrOfStati = 400;
+
+
+const uintt nF_fin_Error = 1;
+const uintt nF_fin_Ignore = 2;
+const uintt nF_fin_LineStart = 3;
+const uintt nF_fin_Eol = 4;
+const uintt nF_fin_Eof = 5;
+const uintt nF_fin_AnyWord = 6;
+const uintt nF_fin_Whitespace = 7;
+
+const uintt nF_goto_AtTag = 20;
+const uintt nF_goto_CheckStar = 21;
+
+DYN TextToken * TCF_DocWord(const char * text) { return new Tok_DocWord(text); }
+
+DYN TextToken * TCF_atstd_ATT(const char * ) { return new Tok_at_std(ary::info::atid_ATT); }
+DYN TextToken * TCF_atstd_author(const char * ) { return new Tok_at_std(ary::info::atid_author); }
+DYN TextToken * TCF_atstd_change(const char * ) { return new Tok_at_std(ary::info::atid_change); }
+DYN TextToken * TCF_atstd_collab(const char * ) { return new Tok_at_std(ary::info::atid_collab); }
+DYN TextToken * TCF_atstd_contact(const char * ) { return new Tok_at_std(ary::info::atid_contact); }
+DYN TextToken * TCF_atstd_copyright(const char * ) { return new Tok_at_std(ary::info::atid_copyright); }
+DYN TextToken * TCF_atstd_descr(const char * ) { return new Tok_at_std(ary::info::atid_descr); }
+DYN TextToken * TCF_atstd_docdate(const char * ) { return new Tok_at_std(ary::info::atid_docdate); }
+DYN TextToken * TCF_atstd_derive(const char * ) { return new Tok_at_std(ary::info::atid_derive); }
+DYN TextToken * TCF_atstd_instance(const char * ) { return new Tok_at_std(ary::info::atid_instance); }
+DYN TextToken * TCF_atstd_life(const char * ) { return new Tok_at_std(ary::info::atid_life); }
+DYN TextToken * TCF_atstd_multi(const char * ) { return new Tok_at_std(ary::info::atid_multi); }
+DYN TextToken * TCF_atstd_onerror(const char * ) { return new Tok_at_std(ary::info::atid_onerror); }
+DYN TextToken * TCF_atstd_persist(const char * ) { return new Tok_at_std(ary::info::atid_persist); }
+DYN TextToken * TCF_atstd_postcond(const char * ) { return new Tok_at_std(ary::info::atid_postcond); }
+DYN TextToken * TCF_atstd_precond(const char * ) { return new Tok_at_std(ary::info::atid_precond); }
+DYN TextToken * TCF_atstd_responsibility(const char * ) { return new Tok_at_std(ary::info::atid_resp); }
+DYN TextToken * TCF_atstd_return(const char * ) { return new Tok_at_std(ary::info::atid_return); }
+DYN TextToken * TCF_atstd_short(const char * ) { return new Tok_at_std(ary::info::atid_short); }
+DYN TextToken * TCF_atstd_todo(const char * ) { return new Tok_at_std(ary::info::atid_todo); }
+DYN TextToken * TCF_atstd_version(const char * ) { return new Tok_at_std(ary::info::atid_version); }
+
+DYN TextToken * TCF_at_base(const char *) { return new Tok_at_base; }
+DYN TextToken * TCF_at_exception(const char *) { return new Tok_at_exception; }
+DYN TextToken * TCF_at_impl(const char *) { return new Tok_at_impl; }
+DYN TextToken * TCF_at_interface(const char *) { return new Tok_at_interface; }
+DYN TextToken * TCF_at_key(const char *) { return new Tok_at_key; }
+DYN TextToken * TCF_at_param(const char *) { return new Tok_at_param; }
+DYN TextToken * TCF_at_see(const char *) { return new Tok_at_see; }
+DYN TextToken * TCF_at_template(const char *) { return new Tok_at_template; }
+DYN TextToken * TCF_at_internal(const char *) { return new Tok_at_internal; }
+DYN TextToken * TCF_at_obsolete(const char *) { return new Tok_at_obsolete; }
+DYN TextToken * TCF_at_module(const char *) { return new Tok_at_module; }
+DYN TextToken * TCF_at_file(const char *) { return new Tok_at_file; }
+DYN TextToken * TCF_at_gloss(const char *) { return new Tok_at_gloss; }
+DYN TextToken * TCF_at_global(const char *) { return new Tok_at_global; }
+DYN TextToken * TCF_at_include(const char *) { return new Tok_at_include; }
+DYN TextToken * TCF_at_label(const char *) { return new Tok_at_label; }
+DYN TextToken * TCF_at_since(const char *) { return new Tok_at_since; }
+DYN TextToken * TCF_at_HTML(const char *) { return new Tok_at_HTML; }
+DYN TextToken * TCF_at_NOHTML(const char *) { return new Tok_at_NOHTML; }
+DYN TextToken * TCF_Whitespace(const char * i_sText);
+DYN TextToken * TCF_EoDocu(const char *) { return new Tok_EoDocu; }
+DYN TextToken * TCF_EoLine(const char *) { return new Tok_Eol; }
+DYN TextToken * TCF_Eof(const char *) { return new Tok_Eof; }
+
+
+
+
+Context_AdocStd::Context_AdocStd()
+    :   aStateMachine(C_nStatusSize, C_nCppInitialNrOfStati),
+        pDealer(0),
+        pParentContext(0),
+        pFollowUpContext(0),
+        pCx_LineStart(0),
+        pCx_CheckStar(0),
+        pCx_AtTagCompletion(0),
+        pNewToken(0),
+        bIsMultiline(false)
+{
+    pCx_LineStart = new Cx_LineStart(*this);
+    pCx_CheckStar = new Cx_CheckStar(*this);
+    pCx_AtTagCompletion = new Cx_AtTagCompletion(*this);
+
+    SetupStateMachine();
+}
+
+void
+Context_AdocStd::SetParentContext( TkpContext & io_rParentContext,
+                                   const char * )
+{
+    pFollowUpContext = pParentContext = &io_rParentContext;
+    pCx_CheckStar->Set_End_FollowUpContext(io_rParentContext);
+}
+
+Context_AdocStd::~Context_AdocStd()
+{
+}
+
+void
+Context_AdocStd::AssignDealer( TokenDealer & o_rDealer )
+{
+    pDealer = &o_rDealer;
+    pCx_LineStart->AssignDealer(o_rDealer);
+    pCx_CheckStar->AssignDealer(o_rDealer);
+    pCx_AtTagCompletion->AssignDealer(o_rDealer);
+}
+
+void
+Context_AdocStd::ReadCharChain( CharacterSource & io_rText )
+{
+    csv_assert(pParentContext != 0);
+    pNewToken = 0;
+
+    TextToken::F_CRTOK  fTokenCreateFunction = 0;
+    StmBoundsStatus & rBound = aStateMachine.GetCharChain(fTokenCreateFunction, io_rText);
+
+    // !!!
+    //   The order of the next two lines is essential, because
+    //   pFollowUpContext may be changed by PerformStatusFunction() also,
+    //   which then MUST override the previous assignment.
+    pFollowUpContext = rBound.FollowUpContext();
+    PerformStatusFunction(rBound.StatusFunctionNr(), fTokenCreateFunction, io_rText);
+}
+
+bool
+Context_AdocStd::PassNewToken()
+{
+    if (pNewToken)
+    {
+        pNewToken.Release()->DealOut(*pDealer);
+        return true;
+    }
+    return false;
+}
+
+TkpContext &
+Context_AdocStd::FollowUpContext()
+{
+    csv_assert(pFollowUpContext != 0);
+    return *pFollowUpContext;
+}
+
+void
+Context_AdocStd::PerformStatusFunction( uintt               i_nStatusSignal,
+                                        F_CRTOK             i_fTokenCreateFunction,
+                                        CharacterSource &   io_rText )
+{
+    switch (i_nStatusSignal)
+    {
+        case nF_fin_Error:
+        {
+            char cCC = io_rText.CurChar();
+            String sChar( &cCC, 1 );
+            throw X_Parser(X_Parser::x_InvalidChar, sChar, String ::Null_(), 0);
+        }   // no break, because of throw
+        case nF_fin_Ignore:
+            io_rText.CutToken();
+            pNewToken = 0;
+            break;
+        case nF_fin_LineStart:
+            csv_assert(i_fTokenCreateFunction != 0);
+            pNewToken = (*i_fTokenCreateFunction)(io_rText.CutToken());
+            break;
+        case nF_fin_Eol:
+            io_rText.CutToken();
+            pDealer->Deal_Eol();
+            if ( bIsMultiline )
+            {
+                pNewToken = TCF_EoLine(0);
+                pFollowUpContext = pCx_LineStart.Ptr();
+            }
+            else
+            {
+                pNewToken = TCF_EoDocu(0);
+                pFollowUpContext = pParentContext;
+            }
+            break;
+        case nF_fin_Eof:
+            pNewToken = TCF_Eof(0);
+            break;
+        case nF_fin_AnyWord:
+            if (i_fTokenCreateFunction != 0)
+                pNewToken = (*i_fTokenCreateFunction)(io_rText.CutToken());
+            else
+                pNewToken = TCF_DocWord(io_rText.CutToken());
+            break;
+        case nF_fin_Whitespace:
+            pNewToken = TCF_Whitespace(io_rText.CutToken());
+            break;
+        case nF_goto_AtTag:
+            pNewToken = 0;
+            pCx_AtTagCompletion->SetCurToken(i_fTokenCreateFunction);
+            break;
+        case nF_goto_CheckStar:
+            pNewToken = 0;
+            pCx_CheckStar->SetCanBeEnd( bIsMultiline );
+            break;
+        default:
+        {
+            char cCC = io_rText.CurChar();
+            String  sChar( &cCC, 1 );
+            throw X_Parser(X_Parser::x_InvalidChar, sChar, String::Null_(), 0);
+        }
+    }   // end switch (i_nStatusSignal)
+}
+
+void
+Context_AdocStd::SetupStateMachine()
+{
+    // Besondere Array-Stati (kein Tokenabschluss oder Kontextwechsel):
+//  const INT16 bas = 0;        // Base-Status
+    const INT16 wht = 1;        // Whitespace-Status
+    const INT16 awd = 2;        // Any-Word-Read-Status
+
+    // Kontextwechsel-Stati:
+    const INT16 goto_CheckStar = 3;
+    const INT16 goto_AtTag = 4;
+
+    // Tokenfinish-Stati:
+    const INT16 finError = 5;
+//  const INT16 finIgnore = 6;
+    const INT16 finEol = 7;
+    const INT16 finEof = 8;
+    const INT16 finAnyWord = 9;
+    const INT16 finWhitespace = 10;
+
+    // Konstanten zur Benutzung in der Tabelle:
+    const INT16 fof = finEof;
+    const INT16 err = finError;
+    const INT16 faw = finAnyWord;
+//  const INT16 fig = finIgnore;
+    const INT16 fwh = finWhitespace;
+
+    /// The '0's  will be replaced by calls of AddToken().
+
+    const INT16 A_nTopStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fof,err,err,err,err,err,err,err,err,wht,  0,wht,wht,  0,err,err,
+     err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // ... 31
+     wht,awd,awd,awd,awd,awd,awd,awd,awd,awd,  0,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd, // ... 63
+       0,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd, // ... 95
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd  // ... 127
+    };
+
+    const INT16 A_nWhitespaceStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fof,err,err,err,err,err,err,err,err,wht,fwh,wht,wht,fwh,err,err,
+     err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // ... 31
+     wht,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh, // ... 63
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh, // ... 95
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh  // ... 127
+    };
+
+    const INT16 A_nWordStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {faw,err,err,err,err,err,err,err,err,faw,faw,faw,faw,faw,err,err,
+     err,err,err,err,err,err,err,err,err,err,faw,err,err,err,err,err, // ... 31
+     faw,awd,awd,awd,awd,awd,awd,awd,awd,awd,faw,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd, // ... 63
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd, // ... 95
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd  // ... 127
+    };
+
+    const INT16 A_nAtTagDefStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {faw,err,err,err,err,err,err,err,err,faw,faw,faw,faw,faw,err,err,
+     err,err,err,err,err,err,err,err,err,err,faw,err,err,err,err,err, // ... 31
+     faw,awd,awd,awd,awd,awd,awd,awd,awd,awd,faw,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd, // ... 63
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd, // ... 95
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd  // ... 127
+    };
+
+    const INT16 A_nPunctDefStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 16 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 48 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 80 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err  // 112 ...
+    };
+
+    DYN StmArrayStatus * dpStatusTop
+            = new StmArrayStatus( C_nStatusSize, A_nTopStatus, 0, true);
+    DYN StmArrayStatus * dpStatusWhite
+            = new StmArrayStatus( C_nStatusSize, A_nWhitespaceStatus, 0, true);
+    DYN StmArrayStatus * dpStatusWord
+            = new StmArrayStatus( C_nStatusSize, A_nWordStatus, TCF_DocWord, true);
+
+    DYN StmBoundsStatus *   dpBst_goto_CheckStar
+            = new StmBoundsStatus( *this, *pCx_CheckStar, nF_goto_CheckStar, true );
+    DYN StmBoundsStatus *   dpBst_goto_AtTag
+            = new StmBoundsStatus( *this, *pCx_AtTagCompletion, nF_goto_AtTag, true );
+
+    DYN StmBoundsStatus *   dpBst_finError
+            = new StmBoundsStatus( *this, TkpContext::Null_(), nF_fin_Error, true );
+    DYN StmBoundsStatus *   dpBst_finIgnore
+            = new StmBoundsStatus( *this, *this, nF_fin_Ignore, true);
+    DYN StmBoundsStatus *   dpBst_finEol
+            = new StmBoundsStatus( *this, *pCx_LineStart, nF_fin_Eol, false);
+    DYN StmBoundsStatus *   dpBst_finEof
+            = new StmBoundsStatus(  *this, TkpContext::Null_(), nF_fin_Eof, false);
+    DYN StmBoundsStatus *   dpBst_finAnyWord
+            = new StmBoundsStatus( *this, *this, nF_fin_AnyWord, true);
+    DYN StmBoundsStatus *   dpBst_finWhitespace
+            = new StmBoundsStatus( *this, *this, nF_fin_Whitespace, true);
+
+    // dpMain aufbauen:
+    aStateMachine.AddStatus(dpStatusTop);
+    aStateMachine.AddStatus(dpStatusWhite);
+    aStateMachine.AddStatus(dpStatusWord);
+
+    aStateMachine.AddStatus(dpBst_goto_CheckStar);
+    aStateMachine.AddStatus(dpBst_goto_AtTag);
+
+    aStateMachine.AddStatus(dpBst_finError);
+    aStateMachine.AddStatus(dpBst_finIgnore);
+    aStateMachine.AddStatus(dpBst_finEol);
+    aStateMachine.AddStatus(dpBst_finEof);
+    aStateMachine.AddStatus(dpBst_finAnyWord);
+    aStateMachine.AddStatus(dpBst_finWhitespace);
+
+    aStateMachine.AddToken( "*",        0,                  A_nPunctDefStatus, goto_CheckStar );
+    aStateMachine.AddToken( "@ATT",     TCF_atstd_ATT,      A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@att",     TCF_atstd_ATT,      A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@ATTENTION",
+                                        TCF_atstd_ATT,      A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@attention",
+                                        TCF_atstd_ATT,      A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@author",  TCF_atstd_author,   A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@change",  TCF_atstd_change,   A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@collab",  TCF_atstd_collab,   A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@collaborator",
+                                        TCF_atstd_collab,   A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@contact", TCF_atstd_contact,  A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@copyright",TCF_atstd_copyright, A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@descr",   TCF_atstd_descr,    A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@docdate", TCF_atstd_docdate,  A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@derive",  TCF_atstd_derive,   A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@instance",TCF_atstd_instance, A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@life",    TCF_atstd_life,     A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@lifecycle",
+                                        TCF_atstd_life,     A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@multi",   TCF_atstd_multi,    A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@multiplicity",
+                                        TCF_atstd_multi,    A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@onerror", TCF_atstd_onerror,  A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@persist", TCF_atstd_persist,  A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@postcond",TCF_atstd_postcond,A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@precond", TCF_atstd_precond,  A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@resp",    TCF_atstd_responsibility,
+                                                            A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@responsibility",
+                                        TCF_atstd_return,   A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@return",  TCF_atstd_return,   A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@short",   TCF_atstd_short,    A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@todo",    TCF_atstd_todo,     A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@version", TCF_atstd_version,  A_nAtTagDefStatus, goto_AtTag );
+
+    aStateMachine.AddToken( "@base",    TCF_at_base,        A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@exception",TCF_at_exception,  A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@impl",    TCF_at_impl,        A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@key",     TCF_at_key,         A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@param",   TCF_at_param,       A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@see",     TCF_at_see,         A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@seealso", TCF_at_see,         A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@since",   TCF_at_since,       A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@tpl",     TCF_at_template,    A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@tplparam",
+                                        TCF_at_template,    A_nAtTagDefStatus, goto_AtTag );
+
+    aStateMachine.AddToken( "@interface",TCF_at_interface,  A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@internal",TCF_at_internal,    A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@obsolete",TCF_at_obsolete,    A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@deprecated",TCF_at_obsolete,  A_nAtTagDefStatus, goto_AtTag );
+
+    aStateMachine.AddToken( "@module",  TCF_at_module,      A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@file",    TCF_at_file,        A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@gloss",   TCF_at_gloss,       A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@global#", TCF_at_global,      A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@include#",TCF_at_include,     A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@#",       TCF_at_label,       A_nAtTagDefStatus, goto_AtTag );
+
+    aStateMachine.AddToken( "@HTML",    TCF_at_HTML,        A_nAtTagDefStatus, goto_AtTag );
+    aStateMachine.AddToken( "@NOHTML",  TCF_at_NOHTML,      A_nAtTagDefStatus, goto_AtTag );
+
+    aStateMachine.AddToken( "\r\n",     0,                  A_nPunctDefStatus, finEol );
+    aStateMachine.AddToken( "\n",       0,                  A_nPunctDefStatus, finEol );
+    aStateMachine.AddToken( "\r",       0,                  A_nPunctDefStatus, finEol );
+};
+
+void
+Context_AdocStd::SetMode_IsMultiLine( bool  i_bTrue )
+{
+    bIsMultiline = i_bTrue;
+}
+
+DYN TextToken *
+TCF_Whitespace(const char * i_sText)
+{
+    UINT8 nSize = static_cast<UINT8>(strlen(i_sText));
+    for ( const char * pTab = strchr(i_sText,'\t');
+          pTab != 0;
+          pTab = strchr(pTab+1,'\t') )
+    {
+         nSize += 3;
+    }
+
+    return new Tok_Whitespace(nSize);
+}
+
+
+}   // namespace adoc
+
+
+/*
+@ATT[ENTION]
+@author
+@change[s]
+@collab[orators]
+@contact
+@copyright
+@descr
+@devstat[e]
+@docdate
+@derive
+@instance
+@life[cycle]
+@multi[plicity]
+@onerror
+@persist[ence]
+@postcond
+@precond
+@return
+@short
+@todo
+
+@module
+@file
+@gloss[ary]
+
+
+@base <BasisklassenName>
+@exception <ExceptionName>
+@impl[ements] <IDL-Construct>
+@key[words]|[s]
+@param <FunctionParameterName> [<Range of valid values>]
+@see[also]
+@templ[ate] <FormalTemplateParameterName>
+
+@internal
+@obsolete
+
+@#<Label>
+
+@global#<Label> Global comment.
+@include#<Label>
+
+
+*/
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/adoc/cx_a_sub.cxx b/autodoc/source/parser/adoc/cx_a_sub.cxx
new file mode 100644
index 000000000000..335e2adbc6a1
--- /dev/null
+++ b/autodoc/source/parser/adoc/cx_a_sub.cxx
@@ -0,0 +1,184 @@
+/* -*- 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 <precomp.h>
+#include <adoc/cx_a_sub.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <tokens/parseinc.hxx>
+#include <x_parse.hxx>
+#include <adoc/tk_docw.hxx>
+
+
+namespace adoc {
+
+//************************    Cx_LineStart      ************************//
+
+Cx_LineStart::Cx_LineStart( TkpContext &    i_rFollowUpContext )
+    :   pDealer(0),
+        pFollowUpContext(&i_rFollowUpContext)
+{
+}
+
+void
+Cx_LineStart::ReadCharChain( CharacterSource & io_rText )
+{
+    uintt nCount = 0;
+    for ( char cNext = io_rText.CurChar(); cNext == 32 OR cNext == 9; cNext = io_rText.MoveOn() )
+    {
+        if (cNext == 32)
+            nCount++;
+        else if (cNext == 9)
+            nCount += 4;
+    }
+    io_rText.CutToken();
+
+    if (nCount < 50)
+        pNewToken = new Tok_LineStart(UINT8(nCount));
+    else
+        pNewToken = new Tok_LineStart(0);
+}
+
+bool
+Cx_LineStart::PassNewToken()
+{
+    if (pNewToken)
+    {
+        pNewToken.Release()->DealOut(*pDealer);
+        return true;
+    }
+    return false;
+}
+
+TkpContext &
+Cx_LineStart::FollowUpContext()
+{
+    return *pFollowUpContext;
+}
+
+
+//************************    Cx_CheckStar      ************************//
+
+Cx_CheckStar::Cx_CheckStar( TkpContext &        i_rFollowUpContext )
+    :   pDealer(0),
+        pFollowUpContext(&i_rFollowUpContext),
+        pEnd_FollowUpContext(0),
+        bCanBeEnd(false),
+        bEndTokenFound(false)
+{
+}
+
+
+void
+Cx_CheckStar::ReadCharChain( CharacterSource & io_rText )
+{
+    bEndTokenFound = false;
+    if (bCanBeEnd)
+    {
+        char cNext = jumpOver(io_rText,'*');
+        if ( NULCH == cNext )
+            throw X_Parser(X_Parser::x_UnexpectedEOF, "", String::Null_(), 0);
+        if (cNext == '/')
+        {
+            io_rText.MoveOn();
+            pNewToken = new Tok_EoDocu;
+            bEndTokenFound = true;
+        }
+        else
+        {
+            pNewToken = new Tok_DocWord(io_rText.CutToken());
+        }
+    }
+    else
+    {
+        jumpToWhite(io_rText);
+        pNewToken = new Tok_DocWord(io_rText.CutToken());
+    }
+}
+
+bool
+Cx_CheckStar::PassNewToken()
+{
+    if (pNewToken)
+    {
+        pNewToken.Release()->DealOut(*pDealer);
+        return true;
+    }
+    return false;
+}
+
+TkpContext &
+Cx_CheckStar::FollowUpContext()
+{
+    if (bEndTokenFound)
+        return *pEnd_FollowUpContext;
+    else
+        return *pFollowUpContext;
+}
+
+
+//************************    Cx_AtTagCompletion        ************************//
+
+Cx_AtTagCompletion::Cx_AtTagCompletion( TkpContext &    i_rFollowUpContext )
+    :   pDealer(0),
+        pFollowUpContext(&i_rFollowUpContext)
+{
+}
+
+void
+Cx_AtTagCompletion::ReadCharChain( CharacterSource & io_rText )
+{
+    jumpToWhite(io_rText);
+    csv_assert(fCur_TokenCreateFunction != 0);
+    pNewToken = (*fCur_TokenCreateFunction)(io_rText.CutToken());
+}
+
+bool
+Cx_AtTagCompletion::PassNewToken()
+{
+    if (pNewToken)
+    {
+        pNewToken.Release()->DealOut(*pDealer);
+        return true;
+    }
+    return false;
+}
+
+TkpContext &
+Cx_AtTagCompletion::FollowUpContext()
+{
+    return *pFollowUpContext;
+}
+
+
+
+
+}   // namespace adoc
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/adoc/docu_pe.cxx b/autodoc/source/parser/adoc/docu_pe.cxx
new file mode 100644
index 000000000000..d54e0295f38e
--- /dev/null
+++ b/autodoc/source/parser/adoc/docu_pe.cxx
@@ -0,0 +1,405 @@
+/* -*- 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 <precomp.h>
+#include <adoc/docu_pe.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/doc/d_oldcppdocu.hxx>
+#include <ary/info/ci_attag.hxx>
+#include <ary/info/ci_text.hxx>
+#include <adoc/adoc_tok.hxx>
+#include <adoc/tk_attag.hxx>
+#include <adoc/tk_docw.hxx>
+
+
+namespace adoc
+{
+
+
+inline bool
+Adoc_PE::UsesHtmlInDocuText()
+{
+    return bUsesHtmlInDocuText;
+}
+
+
+
+
+Adoc_PE::Adoc_PE()
+    :   pCurDocu(0),
+        pCurAtTag(0),
+        nLineCountInDocu(0),
+        nCurSpecialMeaningTokens(0),
+        nCurSubtractFromLineStart(0),
+        eCurTagState(ts_new),
+        eDocuState(ds_wait_for_short),
+        bIsComplete(false),
+        bUsesHtmlInDocuText(false)
+{
+}
+
+Adoc_PE::~Adoc_PE()
+{
+}
+
+void
+Adoc_PE::Hdl_at_std( const Tok_at_std & i_rTok )
+{
+    InstallAtTag(
+        CurDocu().Create_StdTag(i_rTok.Id()) );
+}
+
+void
+Adoc_PE::Hdl_at_base( const Tok_at_base & )
+{
+    InstallAtTag(
+        CurDocu().CheckIn_BaseTag() );
+}
+
+void
+Adoc_PE::Hdl_at_exception( const Tok_at_exception & )
+{
+    InstallAtTag(
+        CurDocu().CheckIn_ExceptionTag() );
+}
+
+void
+Adoc_PE::Hdl_at_impl( const Tok_at_impl & )
+{
+    InstallAtTag(
+        CurDocu().Create_ImplementsTag() );
+}
+
+void
+Adoc_PE::Hdl_at_key( const Tok_at_key & )
+{
+    InstallAtTag(
+        CurDocu().Create_KeywordTag() );
+}
+
+void
+Adoc_PE::Hdl_at_param( const Tok_at_param & )
+{
+    InstallAtTag(
+        CurDocu().CheckIn_ParameterTag() );
+}
+
+void
+Adoc_PE::Hdl_at_see( const Tok_at_see & )
+{
+    InstallAtTag(
+        CurDocu().CheckIn_SeeTag() );
+}
+
+void
+Adoc_PE::Hdl_at_template( const Tok_at_template & )
+{
+    InstallAtTag(
+        CurDocu().CheckIn_TemplateTag() );
+}
+
+void
+Adoc_PE::Hdl_at_interface( const Tok_at_interface & )
+{
+    CurDocu().Set_Interface();
+}
+
+void
+Adoc_PE::Hdl_at_internal( const Tok_at_internal & )
+{
+    CurDocu().Set_Internal();
+}
+
+void
+Adoc_PE::Hdl_at_obsolete( const Tok_at_obsolete & )
+{
+    CurDocu().Set_Obsolete();
+}
+
+void
+Adoc_PE::Hdl_at_module( const Tok_at_module & )
+{
+    // KORR_FUTURE
+
+//  pCurAtTag = CurDocu().Assign2_ModuleTag();
+//  nCurSpecialMeaningTokens = pCurAtTag->NrOfSpecialMeaningTokens();
+}
+
+void
+Adoc_PE::Hdl_at_file( const Tok_at_file & )
+{
+    // KORR_FUTURE
+
+//  pCurAtTag = CurDocu().Assign2_FileTag();
+//  nCurSpecialMeaningTokens = pCurAtTag->NrOfSpecialMeaningTokens();
+}
+
+void
+Adoc_PE::Hdl_at_gloss( const Tok_at_gloss & )
+{
+    // KORR_FUTURE
+
+//  Create_GlossaryEntry();
+}
+
+void
+Adoc_PE::Hdl_at_global( const Tok_at_global & )
+{
+    // KORR_FUTURE
+//  Create_GlobalTextComponent();
+}
+
+void
+Adoc_PE::Hdl_at_include( const Tok_at_include & )
+{
+    // KORR_FUTURE
+}
+
+void
+Adoc_PE::Hdl_at_label( const Tok_at_label & )
+{
+    InstallAtTag(
+        CurDocu().Create_LabelTag() );
+}
+
+void
+Adoc_PE::Hdl_at_since( const Tok_at_since & )
+{
+    InstallAtTag(
+        CurDocu().Create_SinceTag() );
+}
+
+void
+Adoc_PE::Hdl_at_HTML( const Tok_at_HTML &  )
+{
+    bUsesHtmlInDocuText = true;
+}
+
+void
+Adoc_PE::Hdl_at_NOHTML( const Tok_at_NOHTML & )
+{
+    bUsesHtmlInDocuText = false;
+}
+
+void
+Adoc_PE::Hdl_DocWord( const Tok_DocWord & i_rTok )
+{
+    bool bIsSpecial = false;
+    if ( nCurSpecialMeaningTokens > 0 )
+    {
+        bIsSpecial = CurAtTag().Add_SpecialMeaningToken(
+                                    i_rTok.Text(),
+                                    CurAtTag().NrOfSpecialMeaningTokens()
+                                        - (--nCurSpecialMeaningTokens) );
+    }
+
+    if ( NOT bIsSpecial )
+    {
+        if ( eDocuState == ds_wait_for_short OR eDocuState == ds_1newline_after_short )
+            eDocuState = ds_in_short;
+        if (nLineCountInDocu == 0)
+            nLineCountInDocu = 1;
+
+        uintt nLength = i_rTok.Length();
+        if ( nLength > 2 )
+        {
+            bool bMaybeGlobalLink = strncmp( "::", i_rTok.Text(), 2 ) == 0;
+            bool bMayBeFunction = *(i_rTok.Text() + nLength - 2) == '('
+                                  AND *(i_rTok.Text() + nLength - 1) == ')';
+            if ( bMaybeGlobalLink OR bMayBeFunction )
+            {
+                CurAtTag().Add_PotentialLink( i_rTok.Text(),
+                                              bMaybeGlobalLink,
+                                              bMayBeFunction );
+                return;
+            }
+        }
+
+        CurAtTag().Add_Token( i_rTok.Text() );
+        eCurTagState = ts_std;
+    }
+}
+
+void
+Adoc_PE::Hdl_Whitespace( const Tok_Whitespace & i_rTok )
+{
+    if ( eCurTagState == ts_std )
+    {
+
+        CurAtTag().Add_Whitespace(i_rTok.Size());
+    }
+}
+
+void
+Adoc_PE::Hdl_LineStart( const Tok_LineStart & i_rTok )
+{
+    if ( pCurAtTag == 0 )
+        return;
+
+    if ( nLineCountInDocu == 2 )
+    {
+        nCurSubtractFromLineStart = i_rTok.Size();
+        eCurTagState = ts_std;
+    }
+    else if ( nLineCountInDocu > 2 )
+    {
+        if ( i_rTok.Size() > nCurSubtractFromLineStart )
+        {
+            CurAtTag().Add_Whitespace( i_rTok.Size()
+                                       - nCurSubtractFromLineStart );
+        }
+        // else do nothing, because there is no whitespace.
+    }
+}
+
+void
+Adoc_PE::Hdl_Eol( const Tok_Eol & )
+{
+    if ( pCurAtTag == 0 )
+        return;
+
+    nLineCountInDocu++;
+
+    if ( nCurSpecialMeaningTokens == 0 )
+    {
+        CurAtTag().Add_Eol();
+
+        switch ( eDocuState )
+        {
+            case ds_wait_for_short:         break;
+             case ds_in_short:               if ( nLineCountInDocu < 4 )
+                                                eDocuState = ds_1newline_after_short;
+                                            else
+                                            {
+                                                RenameCurShortTag();
+                                                eDocuState = ds_in_descr;
+                                            }
+                                            break;
+            case ds_1newline_after_short:   FinishCurShortTag();
+                                            eDocuState = ds_in_descr;
+                                            break;
+            default:
+                                            ;   // Do noting.
+        }
+    }
+    else
+    {
+        nCurSpecialMeaningTokens = 0;
+    }
+
+
+}
+
+void
+Adoc_PE::Hdl_EoDocu( const Tok_EoDocu & )
+{
+    bIsComplete = true;
+}
+
+DYN ary::doc::OldCppDocu *
+Adoc_PE::ReleaseJustParsedDocu()
+{
+    pCurAtTag = 0;
+    nLineCountInDocu = 0;
+    nCurSpecialMeaningTokens = 0;
+    nCurSubtractFromLineStart = 0;
+    eCurTagState = ts_new;
+    eDocuState = ds_wait_for_short;
+    bIsComplete = false;
+    return pCurDocu.Release();
+}
+
+void
+Adoc_PE::InstallAtTag( DYN ary::info::AtTag * let_dpTag,
+                       bool                   i_bImplicit )
+{
+    pCurAtTag = let_dpTag;
+    if ( pCurAtTag != 0 )
+    {
+        nCurSpecialMeaningTokens = pCurAtTag->NrOfSpecialMeaningTokens();
+        pCurAtTag->Set_HtmlUseInDocuText( bUsesHtmlInDocuText );
+    }
+
+    eCurTagState = ts_new;
+    if ( NOT i_bImplicit )
+        eDocuState = ds_std;
+}
+
+ary::doc::OldCppDocu &
+Adoc_PE::CurDocu()
+{
+    if (NOT pCurDocu)
+        pCurDocu = new ary::doc::OldCppDocu;
+    return *pCurDocu;
+}
+
+ary::info::AtTag &
+Adoc_PE::CurAtTag()
+{
+    if (NOT pCurAtTag)
+    {
+        if ( int(eDocuState) <  int(ds_in_descr) )
+        {
+            InstallAtTag(
+                CurDocu().Create_StdTag(ary::info::atid_short),
+                true );
+        }
+        else
+        {
+            InstallAtTag(
+                CurDocu().Create_StdTag(ary::info::atid_descr),
+                true );
+        }
+    }
+    return *pCurAtTag;
+}
+
+void
+Adoc_PE::RenameCurShortTag()
+{
+    CurDocu().Replace_AtShort_By_AtDescr();
+}
+
+void
+Adoc_PE::FinishCurShortTag()
+{
+    InstallAtTag(
+        CurDocu().Create_StdTag(ary::info::atid_descr),
+        true );
+}
+
+
+}   // namespace adoc
+
+
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/adoc/makefile.mk b/autodoc/source/parser/adoc/makefile.mk
new file mode 100644
index 000000000000..48e4084ee401
--- /dev/null
+++ b/autodoc/source/parser/adoc/makefile.mk
@@ -0,0 +1,62 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=parser_adoc
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/adoc_tok.obj   	\
+    $(OBJ)$/a_rdocu.obj		\
+    $(OBJ)$/cx_a_std.obj	\
+    $(OBJ)$/cx_a_sub.obj	\
+    $(OBJ)$/docu_pe.obj		\
+    $(OBJ)$/prs_adoc.obj	\
+    $(OBJ)$/tk_attag.obj  	\
+    $(OBJ)$/tk_docw.obj
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/parser/adoc/prs_adoc.cxx b/autodoc/source/parser/adoc/prs_adoc.cxx
new file mode 100644
index 000000000000..f2e48f7ee75d
--- /dev/null
+++ b/autodoc/source/parser/adoc/prs_adoc.cxx
@@ -0,0 +1,59 @@
+/* -*- 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 <precomp.h>
+#include <adoc/prs_adoc.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <adoc/cx_a_std.hxx>
+
+
+
+namespace adoc
+{
+
+DocuParser_AutodocStyle::DocuParser_AutodocStyle()
+{
+}
+
+DocuParser_AutodocStyle::~DocuParser_AutodocStyle()
+{
+}
+
+DYN autodoc::TkpDocuContext *
+DocuParser_AutodocStyle::Create_DocuContext() const
+{
+    return new Context_AdocStd;
+}
+
+}   // namespace adoc
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/adoc/tk_attag.cxx b/autodoc/source/parser/adoc/tk_attag.cxx
new file mode 100644
index 000000000000..6c9b500d4740
--- /dev/null
+++ b/autodoc/source/parser/adoc/tk_attag.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <adoc/tk_attag.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <adoc/tokintpr.hxx>
+
+
+
+namespace adoc {
+
+void
+Tok_at_std::Trigger( TokenInterpreter & io_rInterpreter ) const
+{
+    io_rInterpreter.Hdl_at_std(*this);
+}
+
+const char *
+Tok_at_std::Text() const
+{
+    // KORR_FUTURE
+    return "A Tag";
+
+//  return eId.Text();
+}
+
+
+#define DEFINE_TOKEN_CLASS(name, text) \
+void \
+Tok_##name::Trigger( TokenInterpreter & io_rInterpreter ) const \
+{   io_rInterpreter.Hdl_##name(*this); } \
+const char * \
+Tok_##name::Text() const \
+{   return text; }
+
+DEFINE_TOKEN_CLASS(at_base,  "Base Classes")
+DEFINE_TOKEN_CLASS(at_exception,  "Exceptions")
+DEFINE_TOKEN_CLASS(at_impl,  "Implements")
+DEFINE_TOKEN_CLASS(at_key,  "Keywords")
+DEFINE_TOKEN_CLASS(at_param,  "Parameters")
+DEFINE_TOKEN_CLASS(at_see,  "See Also")
+DEFINE_TOKEN_CLASS(at_template,  "Template Parameters")
+DEFINE_TOKEN_CLASS(at_interface, "Interface")
+DEFINE_TOKEN_CLASS(at_internal,  "[ INTERNAL ]")
+DEFINE_TOKEN_CLASS(at_obsolete,  "[ DEPRECATED ]")
+DEFINE_TOKEN_CLASS(at_module,  "Module")
+DEFINE_TOKEN_CLASS(at_file,  "File")
+DEFINE_TOKEN_CLASS(at_gloss,  "Glossary")
+DEFINE_TOKEN_CLASS(at_global,  "<global doc text>")
+DEFINE_TOKEN_CLASS(at_include,  "<included text>")
+DEFINE_TOKEN_CLASS(at_label,  "Label")
+DEFINE_TOKEN_CLASS(at_HTML,  "")
+DEFINE_TOKEN_CLASS(at_NOHTML,  "")
+DEFINE_TOKEN_CLASS(at_since, "Since");
+
+}   // namespace adoc
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/adoc/tk_docw.cxx b/autodoc/source/parser/adoc/tk_docw.cxx
new file mode 100644
index 000000000000..f7c3adb55761
--- /dev/null
+++ b/autodoc/source/parser/adoc/tk_docw.cxx
@@ -0,0 +1,130 @@
+/* -*- 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 <precomp.h>
+#include <adoc/tk_docw.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <adoc/tokintpr.hxx>
+
+
+
+namespace adoc {
+
+
+    static const char C_sSpace[300] =
+        "                                         "
+        "                                         "
+        "                                         "
+        "                                         "
+        "                                         "
+        "                                        ";
+
+
+//***********************   Tok_DocWord     ******************//
+
+void
+Tok_DocWord::Trigger( TokenInterpreter & io_rInterpreter ) const
+{
+    io_rInterpreter.Hdl_DocWord(*this);
+}
+
+const char *
+Tok_DocWord::Text() const
+{
+    return sText;
+}
+
+//***********************   Tok_Whitespace     ******************//
+
+
+void
+Tok_Whitespace::Trigger( TokenInterpreter & io_rInterpreter ) const
+{
+    io_rInterpreter.Hdl_Whitespace(*this);
+}
+
+const char *
+Tok_Whitespace::Text() const
+{
+    return C_sSpace + 299 - nSize;
+}
+
+
+
+//***********************   Tok_LineStart     ******************//
+
+
+void
+Tok_LineStart::Trigger( TokenInterpreter &  io_rInterpreter ) const
+{
+    io_rInterpreter.Hdl_LineStart(*this);
+}
+
+const char *
+Tok_LineStart::Text() const
+{
+    return C_sSpace + 299 - nSize;
+}
+
+
+//***********************   Tok_Eol     ******************//
+
+void
+Tok_Eol::Trigger( TokenInterpreter & io_rInterpreter ) const
+{
+    io_rInterpreter.Hdl_Eol(*this);
+}
+
+const char *
+Tok_Eol::Text() const
+{
+    return "\n";
+}
+
+
+
+//***********************   Tok_EoDocu     ******************//
+
+void
+Tok_EoDocu::Trigger( TokenInterpreter & io_rInterpreter ) const
+{
+    io_rInterpreter.Hdl_EoDocu(*this);
+}
+
+const char *
+Tok_EoDocu::Text() const
+{
+    return "*/";
+}
+
+}   // namespace adoc
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/all_toks.cxx b/autodoc/source/parser/cpp/all_toks.cxx
new file mode 100644
index 000000000000..3ea666ee94a9
--- /dev/null
+++ b/autodoc/source/parser/cpp/all_toks.cxx
@@ -0,0 +1,154 @@
+/* -*- 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 <precomp.h>
+#include <all_toks.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cpp/ctokdeal.hxx>
+#include "c_dealer.hxx"
+#include "tokintpr.hxx"
+
+
+
+namespace cpp {
+
+
+void
+Token::DealOut( ::TokenDealer & o_rDealer )
+{
+    // KORR_FUTURE HACK (casting to derivation cpp::TokenDealer)
+    o_rDealer.AsDistributor()->Deal_CppCode(*this);
+}
+
+
+#define DEF_TOKEN_CLASS(name) \
+void \
+Tok_##name::Trigger( TokenInterpreter & io_rInterpreter ) const \
+{ io_rInterpreter.Hdl_##name(*this); } \
+INT16 \
+Tok_##name::TypeId() const { return Tid_##name; } \
+const char * \
+Tok_##name::Text() const { return #name; }
+
+#define DEF_TOKEN_CLASS_WITHTEXT(name, text ) \
+void \
+Tok_##name::Trigger( TokenInterpreter & io_rInterpreter ) const \
+{ io_rInterpreter.Hdl_##name(*this); } \
+INT16 \
+Tok_##name::TypeId() const { return Tid_##name; } \
+const char * \
+Tok_##name::Text() const { return text; }
+
+
+DEF_TOKEN_CLASS_WITHTEXT(Identifier,sText)
+DEF_TOKEN_CLASS_WITHTEXT(Operator,sText)
+
+DEF_TOKEN_CLASS(operator)
+DEF_TOKEN_CLASS(class)
+DEF_TOKEN_CLASS(struct)
+DEF_TOKEN_CLASS(union)
+DEF_TOKEN_CLASS(enum)
+DEF_TOKEN_CLASS(typedef)
+DEF_TOKEN_CLASS(public)
+DEF_TOKEN_CLASS(protected)
+DEF_TOKEN_CLASS(private)
+DEF_TOKEN_CLASS(template)
+DEF_TOKEN_CLASS(virtual)
+DEF_TOKEN_CLASS(friend)
+DEF_TOKEN_CLASS_WITHTEXT(Tilde,"~")
+DEF_TOKEN_CLASS(const)
+DEF_TOKEN_CLASS(volatile)
+DEF_TOKEN_CLASS(extern)
+DEF_TOKEN_CLASS(static)
+DEF_TOKEN_CLASS(mutable)
+DEF_TOKEN_CLASS(register)
+DEF_TOKEN_CLASS(inline)
+DEF_TOKEN_CLASS(explicit)
+DEF_TOKEN_CLASS(namespace)
+DEF_TOKEN_CLASS(using)
+DEF_TOKEN_CLASS(throw)
+DEF_TOKEN_CLASS_WITHTEXT(SwBracket_Left,"{")
+DEF_TOKEN_CLASS_WITHTEXT(SwBracket_Right,"}")
+DEF_TOKEN_CLASS_WITHTEXT(ArrayBracket_Left,"[")
+DEF_TOKEN_CLASS_WITHTEXT(ArrayBracket_Right,"]")
+DEF_TOKEN_CLASS_WITHTEXT(Bracket_Left,"(")
+DEF_TOKEN_CLASS_WITHTEXT(Bracket_Right,")")
+DEF_TOKEN_CLASS_WITHTEXT(DoubleColon,"::")
+DEF_TOKEN_CLASS_WITHTEXT(Semicolon,";")
+DEF_TOKEN_CLASS_WITHTEXT(Comma,",")
+DEF_TOKEN_CLASS_WITHTEXT(Colon,":")
+DEF_TOKEN_CLASS_WITHTEXT(Assign,"=")
+DEF_TOKEN_CLASS_WITHTEXT(Less,"<")
+DEF_TOKEN_CLASS_WITHTEXT(Greater,">")
+DEF_TOKEN_CLASS_WITHTEXT(Asterix,"*")
+DEF_TOKEN_CLASS_WITHTEXT(AmpersAnd,"&")
+DEF_TOKEN_CLASS_WITHTEXT(Ellipse,"...")
+DEF_TOKEN_CLASS(typename)
+
+DEF_TOKEN_CLASS_WITHTEXT(DefineName,sText)
+DEF_TOKEN_CLASS_WITHTEXT(MacroName,sText)
+DEF_TOKEN_CLASS_WITHTEXT(MacroParameter,sText)
+// DEF_TOKEN_CLASS_WITHTEXT(PreProDefinition,sText)
+
+void
+Tok_PreProDefinition::Trigger( TokenInterpreter &   io_rInterpreter ) const
+{ io_rInterpreter.Hdl_PreProDefinition(*this); }
+
+INT16
+Tok_PreProDefinition::TypeId() const { return Tid_PreProDefinition; }
+
+const char *
+Tok_PreProDefinition::Text() const
+{
+    return sText;
+}
+
+
+
+DEF_TOKEN_CLASS_WITHTEXT(BuiltInType,sText)
+DEF_TOKEN_CLASS_WITHTEXT(TypeSpecializer,sText)
+DEF_TOKEN_CLASS_WITHTEXT(Constant,sText)
+
+const char *
+Tok_UnblockMacro::Text() const
+{
+    return sMacroName;
+}
+
+void
+Tok_UnblockMacro::DealOut( ::TokenDealer & o_rDealer )
+{
+    // KORR_FUTURE HACK (casting to derivation cpp::TokenDealer)
+    o_rDealer.AsDistributor()->Deal_Cpp_UnblockMacro(*this);
+}
+
+}   // namespace cpp
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/all_toks.hxx b/autodoc/source/parser/cpp/all_toks.hxx
new file mode 100644
index 000000000000..4aeae6e1ce0e
--- /dev/null
+++ b/autodoc/source/parser/cpp/all_toks.hxx
@@ -0,0 +1,221 @@
+/* -*- 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 ADC_CPP_ALL_TOKS_HXX
+#define ADC_CPP_ALL_TOKS_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_tok.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+namespace cpp {
+
+class Tok_Identifier : public cpp::Token
+{
+  public:
+                        Tok_Identifier(
+                            const char *        i_sText ) : sText(i_sText) {}
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual INT16       TypeId() const;
+    virtual const char *
+                        Text() const;
+  private:
+    String              sText;
+};
+const INT16 Tid_Identifier = 1;
+
+/** == != <= >=  && || !
+
+    new delete sizeof typeid
+    + - / %  ^ | << >>
+    . ->  ?
+    += -= *= /= %= &= |= ^= <<= >>=
+*/
+class Tok_Operator : public cpp::Token
+{
+  public:
+                        Tok_Operator(
+                            const char *        i_sText ) : sText(i_sText) {}
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual INT16       TypeId() const;
+    virtual const char *
+                        Text() const;
+  private:
+    String              sText;
+};
+const INT16 Tid_Operator = 2;
+
+
+
+#define DECL_TOKEN_CLASS(name,tid) \
+class Tok_##name : public cpp::Token \
+{ public: \
+    virtual void        Trigger( \
+                            TokenInterpreter &  io_rInterpreter ) const; \
+    virtual INT16       TypeId() const; \
+    virtual const char * \
+                        Text() const; \
+}; \
+const INT16 Tid_##name = tid
+
+DECL_TOKEN_CLASS(operator,3);
+DECL_TOKEN_CLASS(class,4);
+DECL_TOKEN_CLASS(struct,5);
+DECL_TOKEN_CLASS(union,6);
+DECL_TOKEN_CLASS(enum,7);
+DECL_TOKEN_CLASS(typedef,8);
+DECL_TOKEN_CLASS(public,9);
+DECL_TOKEN_CLASS(protected,10);
+DECL_TOKEN_CLASS(private,11);
+DECL_TOKEN_CLASS(template,12);
+DECL_TOKEN_CLASS(virtual,13);
+DECL_TOKEN_CLASS(friend,14);
+DECL_TOKEN_CLASS(Tilde,15);
+DECL_TOKEN_CLASS(const,16);
+DECL_TOKEN_CLASS(volatile,17);
+DECL_TOKEN_CLASS(extern,18);
+DECL_TOKEN_CLASS(static,19);
+DECL_TOKEN_CLASS(mutable,20);
+DECL_TOKEN_CLASS(register,21);
+DECL_TOKEN_CLASS(inline,22);
+DECL_TOKEN_CLASS(explicit,23);
+DECL_TOKEN_CLASS(namespace,24);
+DECL_TOKEN_CLASS(using,25);
+DECL_TOKEN_CLASS(throw,26);
+DECL_TOKEN_CLASS(SwBracket_Left,27);
+DECL_TOKEN_CLASS(SwBracket_Right,28);
+DECL_TOKEN_CLASS(ArrayBracket_Left,29);
+DECL_TOKEN_CLASS(ArrayBracket_Right,30);
+DECL_TOKEN_CLASS(Bracket_Left,31);
+DECL_TOKEN_CLASS(Bracket_Right,32);
+DECL_TOKEN_CLASS(DoubleColon,33);
+DECL_TOKEN_CLASS(Semicolon,34);
+DECL_TOKEN_CLASS(Comma,35);
+DECL_TOKEN_CLASS(Colon,36);
+DECL_TOKEN_CLASS(Assign,37);
+DECL_TOKEN_CLASS(Less,38);
+DECL_TOKEN_CLASS(Greater,39);
+DECL_TOKEN_CLASS(Asterix,40);
+DECL_TOKEN_CLASS(AmpersAnd,41);
+DECL_TOKEN_CLASS(Ellipse,42);
+DECL_TOKEN_CLASS(typename,43);
+
+#undef DECL_TOKEN_CLASS
+
+#define DECL_TOKEN_CLASS_WITHTEXT(name,tid) \
+class Tok_##name : public cpp::Token \
+{ public: \
+                        Tok_##name( \
+                            const char *        i_sText ) : sText(i_sText) {} \
+    virtual void        Trigger( \
+                            TokenInterpreter &  io_rInterpreter ) const; \
+    virtual INT16       TypeId() const; \
+    virtual const char * \
+                        Text() const; \
+  private: \
+    String              sText; \
+}; \
+const INT16 Tid_##name = tid
+
+
+
+DECL_TOKEN_CLASS_WITHTEXT(DefineName,44);
+DECL_TOKEN_CLASS_WITHTEXT(MacroName,45);
+DECL_TOKEN_CLASS_WITHTEXT(MacroParameter,46);
+DECL_TOKEN_CLASS_WITHTEXT(PreProDefinition,47);
+
+/** char short int long float double wchar_t size_t
+*/
+DECL_TOKEN_CLASS_WITHTEXT(BuiltInType, 48);
+
+/** signed unsigned
+*/
+DECL_TOKEN_CLASS_WITHTEXT(TypeSpecializer, 49);
+DECL_TOKEN_CLASS_WITHTEXT(Constant, 50);
+
+
+
+/** This token does nothing in C++ code. It is added by the
+    internal macro-replacer to mark the position, where a
+    define or macro becomes valid again, which was until then
+    invalid, because the text was a replacement of this macro.
+    ( Avoiding endless recursive macro replacement. )
+*/
+class Tok_UnblockMacro : public ::TextToken
+{
+  public:
+                        Tok_UnblockMacro(
+                            const char *        i_sMacroName ) : sMacroName(i_sMacroName) {}
+    virtual const char* Text() const;
+
+    virtual void        DealOut(
+                            ::TokenDealer &     o_rDealer );
+  private:
+    String              sMacroName;
+};
+
+
+
+/* just for viewing:
+class Tok_TypeKey : public cpp::Token                  // file-><type-PE>
+class Tok_Template : public cpp::Token                 // file
+class Tok_Namespace : public cpp::Token                // file
+class Tok_Bracket : public cpp::Token                  // ueberall
+class Tok_Separator : public cpp::Token                // ueberall
+
+class Tok_Identifier : public cpp::Token               // ueberall
+class Tok_NameSeparator : public cpp::Token            // Type, Name
+class Tok_BuiltInType : public cpp::Token              // ueberall
+class Tok_ConVol : public cpp::Token                   // class-><FuVa>
+class Tok_StorageClass : public cpp::Token             // file-><type>,<FuVa>
+class Tok_OperatorFunctionName : public cpp::Token     // class
+
+class Tok_Protection : public cpp::Token               // class
+class Tok_Virtual : public cpp::Token                  // class
+class Tok_Friend : public cpp::Token                   // class
+class Tok_Tilde : public cpp::Token                    // class, expression
+
+class Tok_Ellipse : public cpp::Token                  // function-ParaList
+class Tok_Assignment : public cpp::Token               // VariableDeclaraton, Function, Parameter
+class Tok_Throw : public cpp::Token                    // function
+class Tok_LessMore : public cpp::Token
+class Tok_Operator : public cpp::Token                 // expression
+
+class Tok_Ignore : public cpp::Token
+class Tok_ContextChanger : public cpp::Token
+*/
+
+}   // namespace cpp
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/c_dealer.cxx b/autodoc/source/parser/cpp/c_dealer.cxx
new file mode 100644
index 000000000000..a366e1883c69
--- /dev/null
+++ b/autodoc/source/parser/cpp/c_dealer.cxx
@@ -0,0 +1,149 @@
+/* -*- 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 <precomp.h>
+#include "c_dealer.hxx"
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/cpp/c_gate.hxx>
+#include <ary/loc/locp_le.hxx>
+#include <ary/loc/loc_root.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <adoc/a_rdocu.hxx>
+#include "all_toks.hxx"
+#include "c_rcode.hxx"
+
+
+namespace ary
+{
+namespace loc
+{
+    class Root;
+}
+}
+
+
+
+
+namespace cpp
+{
+
+Distributor::Distributor( ary::cpp::Gate & io_rAryGate )
+    :   aCppPreProcessor(),
+        aCodeExplorer(io_rAryGate),
+        aDocuExplorer(),
+        pGate(&io_rAryGate),
+        pFileEventHandler(0),
+        pDocuDistributor(0)
+{
+    pFileEventHandler = & aCodeExplorer.FileEventHandler();
+    pDocuDistributor = & aCodeExplorer.DocuDistributor();
+}
+
+void
+Distributor::AssignPartners( CharacterSource &   io_rSourceText,
+                             const MacroMap &    i_rValidMacros )
+{
+    aCppPreProcessor.AssignPartners(aCodeExplorer, io_rSourceText, i_rValidMacros);
+}
+
+Distributor::~Distributor()
+{
+}
+
+void
+Distributor::StartNewFile( const csv::ploc::Path & i_file )
+{
+    const csv::ploc::Root &
+        root_dir = i_file.RootDir();
+    StreamLock
+        sl(700);
+    root_dir.Get(sl());
+    csv::ploc::Path
+        root_path( sl().c_str(), true );
+    ary::loc::Le_id
+        root_id = pGate->Locations().CheckIn_Root(root_path).LeId();
+    ary::loc::File &
+        rFile = pGate->Locations().CheckIn_File(
+                                        i_file.File(),
+                                        i_file.DirChain(),
+                                        root_id  );
+    pFileEventHandler->SetCurFile(rFile);
+
+    aCodeExplorer.StartNewFile();
+
+    csv_assert( pDocuDistributor != 0 );
+    aDocuExplorer.StartNewFile(*pDocuDistributor);
+}
+
+
+void
+Distributor::Deal_Eol()
+{
+    pFileEventHandler->Event_IncrLineCount();
+}
+
+void
+Distributor::Deal_Eof()
+{
+    // Do nothing yet.
+}
+
+void
+Distributor::Deal_Cpp_UnblockMacro( Tok_UnblockMacro & let_drToken )
+{
+    aCppPreProcessor.UnblockMacro(let_drToken.Text());
+    delete &let_drToken;
+}
+
+void
+Distributor::Deal_CppCode( cpp::Token & let_drToken )
+{
+    aCppPreProcessor.Process_Token(let_drToken);
+}
+
+void
+Distributor::Deal_AdcDocu( adoc::Token & let_drToken )
+{
+    aDocuExplorer.Process_Token(let_drToken);
+}
+
+Distributor *
+Distributor::AsDistributor()
+{
+     return this;
+}
+
+
+
+
+
+}   // namespace cpp
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/c_dealer.hxx b/autodoc/source/parser/cpp/c_dealer.hxx
new file mode 100644
index 000000000000..64e833de622f
--- /dev/null
+++ b/autodoc/source/parser/cpp/c_dealer.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 ADC_CPP_C_DEALER_HXX
+#define ADC_CPP_C_DEALER_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cpp/ctokdeal.hxx>
+#include <adoc/atokdeal.hxx>
+#include <ary/info/docstore.hxx>
+    // COMPONENTS
+#include "preproc.hxx"
+#include "c_rcode.hxx"
+#include <adoc/a_rdocu.hxx>
+    // PARAMETERS
+
+namespace csv
+{
+    namespace ploc
+    {
+        class Path;
+        class DirectoryChain;
+    }
+}
+
+
+class TokenParser;
+
+
+namespace cpp
+{
+
+class PE_File;
+class DefineDescription;
+
+
+class Distributor : public cpp::TokenDealer,        /// Handle C++ code tokens.
+                    public adoc::TokenDealer        /// Handle Autodoc documentation tokens.
+{
+  public:
+    typedef std::map< String, DefineDescription* >     MacroMap;
+
+    // LIFECYCLE
+                        Distributor(
+                            ary::cpp::Gate &    io_rGate );
+                        ~Distributor();
+    // OPERATIONS
+    void                AssignPartners(
+                            CharacterSource &   io_rSourceText,
+                            const MacroMap &    i_rValidMacros );
+    void                StartNewFile(
+                            const csv::ploc::Path &
+                                                i_file );
+    virtual void        Deal_Eol();
+    virtual void        Deal_Eof();
+
+    virtual void        Deal_CppCode(
+                            cpp::Token &        let_drToken );
+    virtual void        Deal_Cpp_UnblockMacro(
+                            Tok_UnblockMacro &  let_drToken );
+
+    virtual void        Deal_AdcDocu(
+                            adoc::Token &       let_drToken );
+    virtual Distributor *
+                        AsDistributor();
+  private:
+    // DATA
+    PreProcessor        aCppPreProcessor;
+    CodeExplorer        aCodeExplorer;
+    adoc::DocuExplorer  aDocuExplorer;
+    ary::cpp::Gate *    pGate;
+    FileScope_EventHandler *
+                        pFileEventHandler;
+    DocuDealer *        pDocuDistributor;
+};
+
+
+
+}   // namespace cpp
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/c_rcode.cxx b/autodoc/source/parser/cpp/c_rcode.cxx
new file mode 100644
index 000000000000..cdec22bbdc58
--- /dev/null
+++ b/autodoc/source/parser/cpp/c_rcode.cxx
@@ -0,0 +1,161 @@
+/* -*- 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 <precomp.h>
+#include "c_rcode.hxx"
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/loc/locp_le.hxx>
+#include "cpp_pe.hxx"
+#include <adc_cl.hxx>
+#include <x_parse.hxx>
+#include "pe_file.hxx"
+
+const uintt C_nNO_TRY = uintt(-1);
+
+
+namespace cpp {
+
+
+CodeExplorer::CodeExplorer( ary::cpp::Gate & io_rAryGate )
+    :   aGlobalParseContext(io_rAryGate),
+        // aEnvironments,
+        pPE_File(0),
+        pGate(&io_rAryGate),
+        dpCurToken(0)
+{
+    pPE_File = new PE_File( aGlobalParseContext );
+}
+
+CodeExplorer::~CodeExplorer()
+{
+}
+
+void
+CodeExplorer::StartNewFile()
+{
+    csv::erase_container(aEnvironments);
+
+    aEnvironments.push_back( pPE_File.MutablePtr() );
+    pPE_File->Enter(push);
+}
+
+void
+CodeExplorer::Process_Token( DYN cpp::Token & let_drToken )
+{
+if (DEBUG_ShowTokens())
+{
+    Cout() << let_drToken.Text() << Endl();
+}
+    dpCurToken = &let_drToken;
+    aGlobalParseContext.ResetResult();
+
+    do {
+        CurToken().Trigger( CurEnv() );
+        AcknowledgeResult();
+    } while ( dpCurToken );
+}
+
+void
+CodeExplorer::AcknowledgeResult()
+{
+    if (CurResult().eDone == done)
+        dpCurToken = 0;
+
+    switch ( CurResult().eStackAction )
+    {
+        case stay:
+                break;
+        case push:
+                CurEnv().Leave(push);
+                aEnvironments.push_back( &PushEnv() );
+                PushEnv().Enter(push);
+                break;
+        case pop_success:
+                CurEnv().Leave(pop_success);
+                aEnvironments.pop_back();
+                CurEnv().Enter(pop_success);
+                break;
+        case pop_failure:
+        {
+                Cpp_PE * pRecover = 0;
+                do {
+                    CurEnv().Leave(pop_failure);
+                    aEnvironments.pop_back();
+                    if ( aEnvironments.empty() )
+                        break;
+                    pRecover = CurEnv().Handle_ChildFailure();
+                } while ( pRecover == 0 );
+                if ( pRecover != 0 )
+                {
+                    aEnvironments.push_back(pRecover);
+                    pRecover->Enter(push);
+                }
+                else
+                {
+                    throw X_Parser( X_Parser::x_UnexpectedToken, CurToken().Text(), aGlobalParseContext.CurFileName(), aGlobalParseContext.LineCount() );
+                }
+        }       break;
+        default:
+            csv_assert(false);
+    }   // end switch(CurResult().eStackAction)
+}
+
+const Token &
+CodeExplorer::CurToken() const
+{
+    csv_assert(dpCurToken);
+
+    return *dpCurToken;
+}
+
+Cpp_PE &
+CodeExplorer::CurEnv() const
+{
+    csv_assert(!aEnvironments.empty());
+    csv_assert(aEnvironments.back() != 0);
+
+    return *aEnvironments.back();
+}
+
+Cpp_PE &
+CodeExplorer::PushEnv() const
+{
+    TokenProcessing_Result & rCurResult = const_cast< TokenProcessing_Result& >(aGlobalParseContext.CurResult());
+    Cpp_PE * ret = dynamic_cast< Cpp_PE* >(rCurResult.pEnv2Push);
+    csv_assert( ret != 0 );
+    return *ret;
+}
+
+
+
+}   // namespace cpp
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/c_rcode.hxx b/autodoc/source/parser/cpp/c_rcode.hxx
new file mode 100644
index 000000000000..740faaa9b9a9
--- /dev/null
+++ b/autodoc/source/parser/cpp/c_rcode.hxx
@@ -0,0 +1,106 @@
+/* -*- 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 ADC_CPP_C_RCODE_HXX
+#define ADC_CPP_C_RCODE_HXX
+
+// BASE CLASSES
+#include <tokens/tokproct.hxx>
+// USED SERVICES
+#include <cosv/ploc.hxx>
+#include "cxt2ary.hxx"
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/loc/loc_types4loc.hxx>
+
+
+
+namespace ary
+{
+namespace cpp
+{
+    class Gate;
+}
+namespace doc
+{
+    class OldCppDocu;
+}
+}
+
+namespace cpp
+{
+    class PE_File;
+    class Token;
+    class Cpp_PE;
+
+
+
+
+class CodeExplorer : private TokenProcessing_Types
+
+{
+  public:
+                        CodeExplorer(
+                            ary::cpp::Gate &    io_rAryGate );
+                        ~CodeExplorer();
+
+    void                StartNewFile();
+    void                Process_Token(
+                            DYN cpp::Token &    let_drToken );
+    // ACCESS
+    FileScope_EventHandler &
+                        FileEventHandler()      { return aGlobalParseContext; }
+    DocuDealer &        DocuDistributor()       { return aGlobalParseContext; }
+
+  private:
+    typedef std::vector< cpp::Cpp_PE* >      EnvironmentStack;
+
+    void                AcknowledgeResult();
+    const Token &       CurToken() const;
+    Cpp_PE &            CurEnv() const;
+    Cpp_PE &            PushEnv() const;
+    TokenProcessing_Result &
+                        CurResult()             { return aGlobalParseContext.CurResult(); }
+
+    // DATA
+    ContextForAry       aGlobalParseContext;
+
+    EnvironmentStack    aEnvironments;
+    Dyn<PE_File>        pPE_File;
+
+    ary::cpp::Gate *    pGate;
+    cpp::Token *        dpCurToken;
+};
+
+
+
+}   // namespace cpp
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/cpp_pe.cxx b/autodoc/source/parser/cpp/cpp_pe.cxx
new file mode 100644
index 000000000000..1e224897186d
--- /dev/null
+++ b/autodoc/source/parser/cpp/cpp_pe.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "cpp_pe.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/doc/d_oldcppdocu.hxx>
+#include "cpp_tok.hxx"
+
+
+
+
+namespace cpp {
+
+void
+Cpp_PE::SetTokenResult( E_TokenDone         i_eDone,
+                        E_EnvStackAction    i_eWhat2DoWithEnvStack,
+                        ParseEnvironment *  i_pParseEnv2Push )
+{
+    rMyEnv.SetTokenResult(      i_eDone,
+                                i_eWhat2DoWithEnvStack,
+                                i_pParseEnv2Push );
+}
+
+Cpp_PE::Cpp_PE( Cpp_PE * io_pParent )
+    :   ParseEnvironment( io_pParent ),
+        rMyEnv( io_pParent->Env() )
+{
+    csv_assert(io_pParent != 0);
+}
+
+Cpp_PE::Cpp_PE( EnvData & i_rEnv )
+    :   ParseEnvironment(0),
+        rMyEnv(i_rEnv)
+{
+}
+
+void
+Cpp_PE::StdHandlingOfSyntaxError( const char * )
+{
+    SetTokenResult(not_done, pop_failure);
+}
+
+
+Cpp_PE *
+Cpp_PE::Handle_ChildFailure()
+{
+     return 0;
+}
+
+}   // namespace cpp
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/cpp_pe.hxx b/autodoc/source/parser/cpp/cpp_pe.hxx
new file mode 100644
index 000000000000..cd3ba0af46f2
--- /dev/null
+++ b/autodoc/source/parser/cpp/cpp_pe.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 ADC_CPP_CPP_PE_HXX
+#define ADC_CPP_CPP_PE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <semantic/parseenv.hxx>
+#include "tokintpr.hxx"
+    // COMPONENTS
+#include "pev.hxx"
+    // PARAMETERS
+#include <ary/cpp/c_types4cpp.hxx>
+
+
+namespace cpp {
+
+class Cpp_PE : public ::ParseEnvironment,
+               public TokenInterpreter
+{
+  public:
+    typedef cpp::PeEnvironment  EnvData;
+
+    void                SetTokenResult(
+                            E_TokenDone         i_eDone,
+                            E_EnvStackAction    i_eWhat2DoWithEnvStack,
+                            ParseEnvironment *  i_pParseEnv2Push = 0 );
+
+    virtual Cpp_PE *    Handle_ChildFailure();  // Defaulted to 0.
+
+  protected:
+                        Cpp_PE(
+                            Cpp_PE *            io_pParent );
+                        Cpp_PE(
+                            EnvData &           i_rEnv );
+
+    EnvData &           Env() const;
+
+    void                StdHandlingOfSyntaxError(
+                            const char *        i_sText );
+
+  private:
+    // DATA
+    EnvData &           rMyEnv;
+};
+
+inline  Cpp_PE::EnvData &
+Cpp_PE::Env() const
+    { return rMyEnv; }
+
+}   // namespace cpp
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/cpp_tok.hxx b/autodoc/source/parser/cpp/cpp_tok.hxx
new file mode 100644
index 000000000000..7f4200a86dda
--- /dev/null
+++ b/autodoc/source/parser/cpp/cpp_tok.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 ADC_CPP_TOK_HXX
+#define ADC_CPP_TOK_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/token.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace cpp {
+
+
+class TokenInterpreter;
+
+
+class Token : public TextToken
+{
+  public:
+    // LIFECYCLE
+    virtual             ~Token() {}
+
+    // OPERATIONS
+    virtual INT16       TypeId() const = 0;
+    virtual void        DealOut(
+                            ::TokenDealer &     o_rDealer );
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const = 0;
+};
+
+
+}   // namespace cpp
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/cx_base.cxx b/autodoc/source/parser/cpp/cx_base.cxx
new file mode 100644
index 000000000000..dad8a50b10e0
--- /dev/null
+++ b/autodoc/source/parser/cpp/cx_base.cxx
@@ -0,0 +1,79 @@
+/* -*- 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 <precomp.h>
+#include "cx_base.hxx"
+
+// NOT FULLY DECLARED SERVICES
+#include <tokens/token.hxx>
+#include "c_dealer.hxx"
+
+
+
+namespace cpp {
+
+
+
+Cx_Base::Cx_Base( TkpContext * io_pFollowUpContext )
+    :   pDealer(0),
+        pFollowUpContext(io_pFollowUpContext)
+        // pNewToken
+{
+}
+
+bool
+Cx_Base::PassNewToken()
+{
+    if (pNewToken)
+    {
+        pNewToken.Release()->DealOut(Dealer());
+        return true;
+    }
+    return false;
+}
+
+TkpContext &
+Cx_Base::FollowUpContext()
+{
+    csv_assert(pFollowUpContext != 0);
+    return *pFollowUpContext;
+}
+
+void
+Cx_Base::AssignDealer( Distributor &  o_rDealer )
+{
+    pDealer = &o_rDealer;
+}
+
+
+}   // namespace cpp
+
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/cx_base.hxx b/autodoc/source/parser/cpp/cx_base.hxx
new file mode 100644
index 000000000000..4e7ff2e3b34b
--- /dev/null
+++ b/autodoc/source/parser/cpp/cx_base.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 ADC_CPP_CX_BASE_HXX
+#define ADC_CPP_CX_BASE_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcontx.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+class TextToken;
+
+
+namespace cpp
+{
+
+class Distributor;
+
+
+class Cx_Base : public ::TkpContext
+{
+  public:
+    virtual bool        PassNewToken();
+    virtual TkpContext &
+                        FollowUpContext();
+
+    virtual void        AssignDealer(
+                            Distributor &       o_rDealer );
+  protected:
+    // LIFECYCLE
+                        Cx_Base(
+                            TkpContext *        io_pFollowUpContext );
+
+    void                SetNewToken(
+                            DYN ::TextToken *   let_dpToken );
+    void                SetFollowUpContext(
+                            TkpContext  *       io_pContext );
+
+    Distributor &       Dealer() const;
+
+  private:
+    // DATA
+    Distributor *       pDealer;
+    TkpContext *        pFollowUpContext;
+    Dyn< ::TextToken >  pNewToken;
+};
+
+
+
+
+inline void
+Cx_Base::SetNewToken( DYN ::TextToken * let_dpToken )
+    { pNewToken = let_dpToken; }
+inline void
+Cx_Base::SetFollowUpContext( TkpContext * io_pContext )
+    { pFollowUpContext = io_pContext; }
+inline Distributor &
+Cx_Base::Dealer() const
+    { csv_assert(pDealer != 0);
+      return *pDealer; }
+
+
+
+
+
+} // namespace cpp
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/cx_c_pp.cxx b/autodoc/source/parser/cpp/cx_c_pp.cxx
new file mode 100644
index 000000000000..9c81fe71af36
--- /dev/null
+++ b/autodoc/source/parser/cpp/cx_c_pp.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "cx_c_pp.hxx"
+
+
+
+// NOT FULLY DECLARED SERVICES
+#include "c_dealer.hxx"
+#include <tokens/parseinc.hxx>
+#include <x_parse.hxx>
+#include "all_toks.hxx"
+
+
+namespace cpp
+{
+
+Context_Preprocessor::Context_Preprocessor( TkpContext & i_rFollowUpContext )
+    :   Cx_Base(&i_rFollowUpContext),
+        pContext_Parent(&i_rFollowUpContext),
+        pContext_PP_MacroParams( 0 ),
+        pContext_PP_Definition( new Context_PP_Definition(i_rFollowUpContext) )
+{
+    pContext_PP_MacroParams = new Context_PP_MacroParams(*pContext_PP_Definition);
+}
+
+void
+Context_Preprocessor::ReadCharChain( CharacterSource &  io_rText )
+{
+    jumpOverWhite( io_rText );
+    jumpToWhite( io_rText );
+    const char * sPP_Keyword = io_rText.CutToken();
+    if ( strcmp(sPP_Keyword, "define") == 0 )
+        ReadDefine(io_rText);
+    else
+        ReadDefault(io_rText);
+}
+
+void
+Context_Preprocessor::AssignDealer( Distributor & o_rDealer )
+{
+    Cx_Base::AssignDealer(o_rDealer);
+    pContext_PP_MacroParams->AssignDealer(o_rDealer);
+    pContext_PP_Definition->AssignDealer(o_rDealer);
+}
+
+void
+Context_Preprocessor::ReadDefault( CharacterSource & io_rText )
+{
+    int o_rCount_BackslashedLineBreaks = 0;
+    jumpToEol(io_rText,o_rCount_BackslashedLineBreaks);
+    for ( ; o_rCount_BackslashedLineBreaks > 0; --o_rCount_BackslashedLineBreaks )
+        Dealer().Deal_Eol();
+
+    if (io_rText.CurChar() != NULCH)
+        jumpOverEol(io_rText);
+    io_rText.CutToken();
+    Dealer().Deal_Eol();
+    SetNewToken(0);
+    SetFollowUpContext( pContext_Parent );
+}
+
+void
+Context_Preprocessor::ReadDefine( CharacterSource & io_rText )
+{
+    jumpOverWhite( io_rText );
+    io_rText.CutToken();
+
+    char cNext = '\0';
+    for ( cNext = io_rText.CurChar();
+          static_cast<UINT8>(cNext) > 32 AND cNext != '(';
+          cNext = io_rText.MoveOn() )
+    { }
+
+    bool bMacro = cNext == '(';
+
+    if ( NOT bMacro )
+    {
+        SetNewToken( new Tok_DefineName(io_rText.CutToken()) );
+        SetFollowUpContext( pContext_PP_Definition.Ptr() );
+    }
+    else
+    {
+        SetNewToken( new Tok_MacroName(io_rText.CutToken()) );
+        io_rText.MoveOn();
+        io_rText.CutToken();
+        SetFollowUpContext( pContext_PP_MacroParams.Ptr() );
+    }
+}
+
+
+Context_PP_MacroParams::Context_PP_MacroParams( Cx_Base & i_rFollowUpContext )
+    :   Cx_Base(&i_rFollowUpContext),
+        pContext_PP_Definition(&i_rFollowUpContext)
+{
+}
+
+void
+Context_PP_MacroParams::ReadCharChain( CharacterSource & io_rText )
+{
+    uintt nLen;
+
+    jumpOverWhite( io_rText );
+    // KORR_FUTURE Handling line breaks within macro parameters:
+    char cSeparator = jumpTo( io_rText, ',', ')' );
+    csv_assert( cSeparator != 0 );
+
+    static char cBuf[500];
+    // KORR_FUTURE, make it still safer, here:
+    strcpy( cBuf, io_rText.CutToken() );    // SAFE STRCPY (#100211# - checked)
+    for ( nLen = strlen(cBuf);
+          nLen > 0 AND cBuf[nLen-1] < 33;
+          --nLen )
+    { }
+    cBuf[nLen] = '\0';
+    SetNewToken( new Tok_MacroParameter(cBuf) );
+
+    io_rText.MoveOn();
+    io_rText.CutToken();
+    if ( cSeparator == ',')
+        SetFollowUpContext( this );
+    else    // Must be ')'
+        SetFollowUpContext( pContext_PP_Definition );
+}
+
+Context_PP_Definition::Context_PP_Definition( TkpContext & i_rFollowUpContext )
+    :   Cx_Base(&i_rFollowUpContext),
+        pContext_Parent(&i_rFollowUpContext)
+{
+}
+
+void
+Context_PP_Definition::ReadCharChain( CharacterSource & io_rText )
+{
+    int o_rCount_BackslashedLineBreaks = 0;
+    jumpToEol(io_rText,o_rCount_BackslashedLineBreaks);
+    for ( ; o_rCount_BackslashedLineBreaks > 0; --o_rCount_BackslashedLineBreaks )
+        Dealer().Deal_Eol();
+    SetNewToken( new Tok_PreProDefinition(io_rText.CutToken()) );
+    if (io_rText.CurChar() != NULCH)
+        jumpOverEol(io_rText);
+    Dealer().Deal_Eol();
+}
+
+
+}   // namespace cpp
+
+
+
+
+
+
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/cx_c_pp.hxx b/autodoc/source/parser/cpp/cx_c_pp.hxx
new file mode 100644
index 000000000000..0b0e86d2e690
--- /dev/null
+++ b/autodoc/source/parser/cpp/cx_c_pp.hxx
@@ -0,0 +1,97 @@
+/* -*- 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 ADC_CPP_CX_C_PP_HXX
+#define ADC_CPP_CX_C_PP_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcontx.hxx>
+#include "cx_base.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace cpp
+{
+
+class Context_Preprocessor : public Cx_Base
+{
+  public:
+                        Context_Preprocessor(
+                            TkpContext &        i_rFollowUpContext );
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    virtual void        AssignDealer(
+                            Distributor &       o_rDealer );
+  private:
+    // Locals
+    void                ReadDefault(
+                            CharacterSource &   io_rText );
+    void                ReadDefine(
+                            CharacterSource &   io_rText );
+
+    // DATA
+    TkpContext *        pContext_Parent;
+    Dyn<Cx_Base>        pContext_PP_MacroParams;
+    Dyn<Cx_Base>        pContext_PP_Definition;
+};
+
+class Context_PP_MacroParams : public Cx_Base
+{
+  public:
+                        Context_PP_MacroParams(
+                            Cx_Base &           i_rFollowUpContext );
+
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+  private:
+    // DATA
+    Cx_Base *           pContext_PP_Definition;
+};
+
+class Context_PP_Definition : public Cx_Base
+{
+  public:
+                        Context_PP_Definition(
+                            TkpContext &        i_rFollowUpContext );
+
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+
+  private:
+    // DATA
+    TkpContext *        pContext_Parent;
+};
+
+
+}   // namespace cpp
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/cx_c_std.cxx b/autodoc/source/parser/cpp/cx_c_std.cxx
new file mode 100644
index 000000000000..73eed711dad4
--- /dev/null
+++ b/autodoc/source/parser/cpp/cx_c_std.cxx
@@ -0,0 +1,531 @@
+/* -*- 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 <precomp.h>
+#include "cx_c_std.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include "all_toks.hxx"
+#include "cx_c_pp.hxx"
+#include "cx_c_sub.hxx"
+#include <tools/tkpchars.hxx>
+#include <tokens/tkpstama.hxx>
+#include <x_parse.hxx>
+#include "c_dealer.hxx"
+
+
+namespace cpp {
+
+
+const intt C_nCppInitialNrOfStati = 600;
+const intt C_nStatusSize = 128;
+
+
+
+const uintt nF_fin_Error = 1;
+const uintt nF_fin_CreateWithoutText = 2;
+const uintt nF_fin_CreateWithText = 3;
+const uintt nF_fin_Ignore = 4;
+const uintt nF_fin_EOL = 5;
+const uintt nF_fin_EOF = 6;
+const uintt nF_fin_Bezeichner = 7;
+
+const uintt nF_goto_Preprocessor = 10;
+const uintt nF_goto_Comment = 11;
+const uintt nF_goto_Docu = 12;
+const uintt nF_goto_Const = 13;
+const uintt nF_goto_UnblockMacro = 14;
+
+// Token create functions for the state machine:
+DYN TextToken * TCF_Identifier(const char * text) { return new Tok_Identifier(text); }
+
+DYN TextToken * TCF_operator(const char *) { return new Tok_operator; }
+DYN TextToken * TCF_class(const char *) { return new Tok_class; }
+DYN TextToken * TCF_struct(const char *) { return new Tok_struct; }
+DYN TextToken * TCF_union(const char *) { return new Tok_union; }
+DYN TextToken * TCF_enum(const char *) { return new Tok_enum; }
+DYN TextToken * TCF_typedef(const char *) { return new Tok_typedef; }
+DYN TextToken * TCF_public(const char *) { return new Tok_public; }
+DYN TextToken * TCF_protected(const char *) { return new Tok_protected; }
+DYN TextToken * TCF_private(const char *) { return new Tok_private; }
+DYN TextToken * TCF_template(const char *) { return new Tok_template; }
+DYN TextToken * TCF_virtual(const char *) { return new Tok_virtual; }
+DYN TextToken * TCF_friend(const char *) { return new Tok_friend; }
+DYN TextToken * TCF_Tilde(const char *) { return new Tok_Tilde; }
+DYN TextToken * TCF_const(const char *) { return new Tok_const; }
+DYN TextToken * TCF_volatile(const char *) { return new Tok_volatile; }
+DYN TextToken * TCF_extern(const char *) { return new Tok_extern; }
+DYN TextToken * TCF_static(const char *) { return new Tok_static; }
+DYN TextToken * TCF_mutable(const char *) { return new Tok_mutable; }
+DYN TextToken * TCF_register(const char *) { return new Tok_register; }
+DYN TextToken * TCF_inline(const char *) { return new Tok_inline; }
+DYN TextToken * TCF_explicit(const char *) { return new Tok_explicit; }
+DYN TextToken * TCF_namespace(const char *) { return new Tok_namespace; }
+DYN TextToken * TCF_using(const char *) { return new Tok_using; }
+DYN TextToken * TCF_throw(const char *) { return new Tok_throw; }
+DYN TextToken * TCF_SwBracketOpen(const char *) { return new Tok_SwBracket_Left; }
+DYN TextToken * TCF_SwBracketClose(const char *) { return new Tok_SwBracket_Right; }
+DYN TextToken * TCF_ArBracketOpen(const char *) { return new Tok_ArrayBracket_Left; }
+DYN TextToken * TCF_ArBracketClose(const char *) { return new Tok_ArrayBracket_Right; }
+DYN TextToken * TCF_BracketOpen(const char *) { return new Tok_Bracket_Left; }
+DYN TextToken * TCF_BracketClose(const char *) { return new Tok_Bracket_Right; }
+DYN TextToken * TCF_DblColon(const char *) { return new Tok_DoubleColon; }
+DYN TextToken * TCF_Semikolon(const char *) { return new Tok_Semicolon; }
+DYN TextToken * TCF_Komma(const char *) { return new Tok_Comma; }
+DYN TextToken * TCF_Colon(const char *) { return new Tok_Colon; }
+DYN TextToken * TCF_Zuweisung(const char *) { return new Tok_Assign; }
+DYN TextToken * TCF_Smaller(const char *) { return new Tok_Less; }
+DYN TextToken * TCF_Bigger(const char *) { return new Tok_Greater; }
+DYN TextToken * TCF_Stern(const char *) { return new Tok_Asterix; }
+DYN TextToken * TCF_Ampersand(const char *) { return new Tok_AmpersAnd; }
+DYN TextToken * TCF_Ellipse(const char *) { return new Tok_Ellipse; }
+DYN TextToken * TCF_typename(const char *) { return new Tok_typename; }
+
+    // Operators
+DYN TextToken * TCF_Operator(const char * text) { return new Tok_Operator(text); }
+
+DYN TextToken * TCF_BuiltInType(const char * text) { return new Tok_BuiltInType(text); }
+DYN TextToken * TCF_TypeModifier(const char * text) { return new Tok_TypeSpecializer(text); }
+
+DYN TextToken * TCF_Eof(const char *) { return new Tok_Eof; }
+
+
+
+Context_CppStd::Context_CppStd( DYN autodoc::TkpDocuContext & let_drContext_Docu )
+    :   Cx_Base(0),
+        aStateMachine(C_nStatusSize,C_nCppInitialNrOfStati),
+        pDocuContext(&let_drContext_Docu),
+        pContext_Comment(0),
+        pContext_Preprocessor(0),
+        pContext_ConstString(0),
+        pContext_ConstChar(0),
+        pContext_ConstNumeric(0),
+        pContext_UnblockMacro(0)
+{
+    pDocuContext->SetParentContext(*this,"*/");
+
+    pContext_Comment = new Context_Comment(*this);
+    pContext_Preprocessor = new Context_Preprocessor(*this);
+    pContext_ConstString = new Context_ConstString(*this);
+    pContext_ConstChar = new Context_ConstChar(*this);
+    pContext_ConstNumeric = new Context_ConstNumeric(*this);
+    pContext_UnblockMacro = new Context_UnblockMacro(*this);
+
+    SetupStateMachine();
+}
+
+Context_CppStd::~Context_CppStd()
+{
+}
+
+void
+Context_CppStd::ReadCharChain( CharacterSource & io_rText )
+{
+    SetNewToken(0);
+
+    TextToken::F_CRTOK fTokenCreateFunction = 0;
+    StmBoundsStatus & rBound = aStateMachine.GetCharChain(fTokenCreateFunction, io_rText);
+
+    // !!!
+    //   The order of the next two lines is essential, because
+    //   pFollowUpContext may be changed by PerformStatusFunction() also,
+    //   which then MUST override the previous assignment.
+    SetFollowUpContext(rBound.FollowUpContext());
+    PerformStatusFunction(rBound.StatusFunctionNr(), fTokenCreateFunction, io_rText);
+}
+
+void
+Context_CppStd::AssignDealer( Distributor & o_rDealer )
+{
+    Cx_Base::AssignDealer(o_rDealer);
+
+    pDocuContext->AssignDealer(o_rDealer);
+    pContext_Comment->AssignDealer(o_rDealer);
+    pContext_Preprocessor->AssignDealer(o_rDealer);
+    pContext_ConstString->AssignDealer(o_rDealer);
+    pContext_ConstChar->AssignDealer(o_rDealer);
+    pContext_ConstNumeric->AssignDealer(o_rDealer);
+    pContext_UnblockMacro->AssignDealer(o_rDealer);
+}
+
+void
+Context_CppStd::PerformStatusFunction( uintt                    i_nStatusSignal,
+                                       F_CRTOK                  i_fTokenCreateFunction,
+                                       CharacterSource &        io_rText )
+{
+    switch (i_nStatusSignal)
+    {
+        case nF_fin_CreateWithoutText:
+            io_rText.CutToken();
+            csv_assert(i_fTokenCreateFunction != 0);
+            SetNewToken( (*i_fTokenCreateFunction)(0) );
+            break;
+        case nF_fin_CreateWithText:
+            csv_assert(i_fTokenCreateFunction != 0);
+            SetNewToken( (*i_fTokenCreateFunction)(io_rText.CutToken()) );
+            break;
+        case nF_fin_Ignore:
+            io_rText.CutToken();
+            SetNewToken(0);
+            break;
+        case nF_fin_EOL:
+            io_rText.CutToken();
+            SetNewToken(0);
+            Dealer().Deal_Eol();
+            break;
+        case nF_fin_EOF:
+            io_rText.CutToken();
+            SetNewToken( TCF_Eof(0) );
+            break;
+        case nF_fin_Bezeichner:
+            SetNewToken( TCF_Identifier(io_rText.CutToken()) );
+            break;
+
+        case nF_goto_Preprocessor:
+            io_rText.CutToken();
+            SetNewToken(0);
+            break;
+        case nF_goto_Comment:
+            SetNewToken(0);
+            pContext_Comment->SetMode_IsMultiLine( io_rText.CutToken()[1] == '*' );
+            break;
+        case nF_goto_Docu:
+            SetNewToken(0);
+            pDocuContext->SetMode_IsMultiLine( io_rText.CutToken()[1] == '*' );
+            break;
+        case nF_goto_Const:
+            SetNewToken(0);
+            break;
+        case nF_goto_UnblockMacro:
+            SetNewToken(0);
+            break;
+
+        case nF_fin_Error:
+        default:
+        {
+            char cCC = io_rText.CurChar();
+            String  sCurChar( &cCC, 1 );
+            throw X_Parser( X_Parser::x_InvalidChar, sCurChar, String::Null_(), 0 );
+        }
+    }   // end switch (i_nStatusSignal)
+}
+
+void
+Context_CppStd::SetupStateMachine()
+{
+    // Besondere Array-Stati (kein Tokenabschluss oder Kontextwechsel):
+//  const INT16 top = 0;        // Top-Status
+    const INT16 wht = 1;        // Whitespace-�berlese-Status
+    const INT16 bez = 2;        // Bezeichner-lese-Status
+
+    // Tokenfinish-Stati:
+    const INT16 finError = 3;
+    const INT16 finIgnore = 4;
+    const INT16 finBezeichner = 5;
+    const INT16 finKeyword = 6;
+    const INT16 finPunctuation = 7;
+    const INT16 finBiType = 8;
+    const INT16 finTypeModifier = 9;
+    const INT16 finEOL = 10;
+    const INT16 finEOF = 11;
+
+    // Kontextwechsel-Stati:
+    const INT16 gotoComment = 12;
+    const INT16 gotoDocu = 13;
+    const INT16 gotoPreprocessor = 14;
+    const INT16 gotoConstString = 15;
+    const INT16 gotoConstChar = 16;
+    const INT16 gotoConstNumeric = 17;
+    const INT16 gotoUnblockMacro = 18;
+
+    // Abbreviations to be used in status tables:
+    const INT16 err = finError;
+    const INT16 fig = finIgnore;
+    const INT16 fbz = finBezeichner;
+    const INT16 fof = finEOF;
+    const INT16 cst = gotoConstString;
+    const INT16 cch = gotoConstChar;
+    const INT16 cnr = gotoConstNumeric;
+
+
+    /// Zeros - '0' - will be replaced by AddToken().
+
+    const INT16 A_nTopStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fof,err,err,err,err,err,err,err,err,wht,  0,wht,wht,  0,err,err,
+     err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // 16 ...
+     wht,  0,cst,  0,err,  0,  0,cch,  0,  0,  0,  0,  0,  0,  0,  0,
+     cnr,cnr,cnr,cnr,cnr,cnr,cnr,cnr,cnr,cnr,  0,  0,  0,  0,  0,  0, // 48 ...
+       0,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,  0,  0,  0,  0,bez, // 80 ...
+       0,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,  0,  0,  0,  0,err, // 80 ...
+    };
+
+    const INT16 A_nWhitespaceStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fof,err,err,err,err,err,err,err,err,wht,fig,wht,wht,fig,err,err,
+     err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // 16 ...
+     wht,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig, // 48 ...
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig, // 80 ...
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,err
+    };
+
+    const INT16 A_nBezeichnerStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fbz,err,err,err,err,err,err,err,err,fbz,fbz,fbz,fbz,fbz,err,err,
+     err,err,err,err,err,err,err,err,err,err,fbz,err,err,err,err,err, // 16 ...
+     fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,fbz,fbz, // 48 ...
+     fbz,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,bez, // 80 ...
+     fbz,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,err
+    };
+
+
+    const INT16 A_nOperatorDefStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 16 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 48 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 80 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err
+    };
+
+    const INT16 A_nBezDefStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fbz,err,err,err,err,err,err,err,err,fbz,fbz,fbz,fbz,fbz,err,err,
+     err,err,err,err,err,err,err,err,err,err,fbz,err,err,err,err,err, // 16 ...
+     fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,fbz,fbz, // 48 ...
+     fbz,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,bez, // 80 ...
+     fbz,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,err
+    };
+
+    DYN StmArrayStatus * dpStatusTop
+            = new StmArrayStatus( C_nStatusSize, A_nTopStatus, 0, true);
+    DYN StmArrayStatus * dpStatusWhite
+            = new StmArrayStatus( C_nStatusSize, A_nWhitespaceStatus, 0, true);
+    DYN StmArrayStatus * dpStatusBez
+            = new StmArrayStatus( C_nStatusSize, A_nBezeichnerStatus, TCF_Identifier, true);
+
+    DYN StmBoundsStatus *   dpBst_finError
+            = new StmBoundsStatus( *this, TkpContext::Null_(), nF_fin_Error, true );
+    DYN StmBoundsStatus *   dpBst_finIgnore
+            = new StmBoundsStatus( *this, *this, nF_fin_Ignore, true );
+    DYN StmBoundsStatus *   dpBst_finBezeichner
+            = new StmBoundsStatus( *this, *this, nF_fin_Bezeichner, true );
+    DYN StmBoundsStatus *   dpBst_finKeyword
+            = new StmBoundsStatus( *this, *this, nF_fin_CreateWithoutText, false );
+    DYN StmBoundsStatus *   dpBst_finPunctuation
+            = new StmBoundsStatus( *this, *this, nF_fin_CreateWithText, false );
+    DYN StmBoundsStatus *   dpBst_finBiType
+            = new StmBoundsStatus( *this, *this, nF_fin_CreateWithText, false );
+    DYN StmBoundsStatus *   dpBst_finTypeModifier
+            = new StmBoundsStatus( *this, *this, nF_fin_CreateWithText, false );
+    DYN StmBoundsStatus *   dpBst_finEOL
+            = new StmBoundsStatus( *this, *this, nF_fin_EOL, false );
+    DYN StmBoundsStatus *   dpBst_finEOF
+            = new StmBoundsStatus( *this, TkpContext::Null_(), nF_fin_EOF, false );
+
+    DYN StmBoundsStatus *   dpBst_gotoComment
+            = new StmBoundsStatus( *this, *pContext_Comment, nF_goto_Comment, false );
+    DYN StmBoundsStatus *   dpBst_gotoDocu
+            = new StmBoundsStatus( *this, *pDocuContext, nF_goto_Docu, false );
+    DYN StmBoundsStatus *   dpBst_gotoPreprocessor
+            = new StmBoundsStatus( *this, *pContext_Preprocessor, nF_goto_Preprocessor, false );
+    DYN StmBoundsStatus *   dpBst_gotoConstString
+            = new StmBoundsStatus( *this, *pContext_ConstString, nF_goto_Const, false );
+    DYN StmBoundsStatus *   dpBst_gotoConstChar
+            = new StmBoundsStatus( *this, *pContext_ConstChar, nF_goto_Const, false );
+    DYN StmBoundsStatus *   dpBst_gotoConstNumeric
+            = new StmBoundsStatus( *this, *pContext_ConstNumeric, nF_goto_Const, false );
+    DYN StmBoundsStatus *   dpBst_gotoUnblockMacro
+            = new StmBoundsStatus( *this, *pContext_UnblockMacro, nF_goto_UnblockMacro, false );
+
+    // dpMain aufbauen:
+    aStateMachine.AddStatus(dpStatusTop);
+
+    aStateMachine.AddStatus(dpStatusWhite);
+    aStateMachine.AddStatus(dpStatusBez);
+
+    aStateMachine.AddStatus(dpBst_finError);
+    aStateMachine.AddStatus(dpBst_finIgnore);
+    aStateMachine.AddStatus(dpBst_finBezeichner);
+    aStateMachine.AddStatus(dpBst_finKeyword);
+    aStateMachine.AddStatus(dpBst_finPunctuation);
+    aStateMachine.AddStatus(dpBst_finBiType);
+    aStateMachine.AddStatus(dpBst_finTypeModifier);
+    aStateMachine.AddStatus(dpBst_finEOL);
+    aStateMachine.AddStatus(dpBst_finEOF);
+
+    aStateMachine.AddStatus(dpBst_gotoComment);
+    aStateMachine.AddStatus(dpBst_gotoDocu);
+    aStateMachine.AddStatus(dpBst_gotoPreprocessor);
+    aStateMachine.AddStatus(dpBst_gotoConstString);
+    aStateMachine.AddStatus(dpBst_gotoConstChar);
+    aStateMachine.AddStatus(dpBst_gotoConstNumeric);
+    aStateMachine.AddStatus(dpBst_gotoUnblockMacro);
+
+    // Identifier
+
+    // Keywords and other unique Tokens
+    aStateMachine.AddToken("operator",TCF_operator,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("class",TCF_class,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("struct",TCF_struct,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("union",TCF_union,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("enum",TCF_enum,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("typedef",TCF_typedef,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("public",TCF_public,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("protected",TCF_protected,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("private",TCF_private,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("template",TCF_template,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("virtual",TCF_virtual,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("friend",TCF_friend,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("~",TCF_Tilde,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("const",TCF_const,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("volatile",TCF_volatile,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("extern",TCF_extern,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("static",TCF_static,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("mutable",TCF_mutable,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("register",TCF_register,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("inline",TCF_inline,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("explicit",TCF_explicit,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("namespace",TCF_namespace,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("using",TCF_using,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("throw",TCF_throw,A_nBezDefStatus,finKeyword);
+    aStateMachine.AddToken("{",TCF_SwBracketOpen,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("}",TCF_SwBracketClose,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("[",TCF_ArBracketOpen,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("]",TCF_ArBracketClose,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("(",TCF_BracketOpen,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken(")",TCF_BracketClose,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("::",TCF_DblColon,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken(";",TCF_Semikolon,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken(",",TCF_Komma,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken(":",TCF_Colon,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("=",TCF_Zuweisung,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("<",TCF_Smaller,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken(">",TCF_Bigger,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("*",TCF_Stern,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("&",TCF_Ampersand,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("...",TCF_Ellipse,A_nOperatorDefStatus,finKeyword);
+    aStateMachine.AddToken("typename",TCF_typename,A_nOperatorDefStatus,finKeyword);
+
+    // Operators
+    aStateMachine.AddToken("==",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("!=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("<=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken(">=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("&&",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("||",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("!",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("new",TCF_Operator,A_nBezDefStatus,finPunctuation);
+    aStateMachine.AddToken("delete",TCF_Operator,A_nBezDefStatus,finPunctuation);
+    aStateMachine.AddToken("sizeof",TCF_Operator,A_nBezDefStatus,finPunctuation);
+    aStateMachine.AddToken("typeid",TCF_Operator,A_nBezDefStatus,finPunctuation);
+    aStateMachine.AddToken("+",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("-",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("/",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("%",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("^",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("|",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("<<",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken(">>",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken(".",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("->",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("?",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("+=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("-=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("*=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("/=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("%=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("&=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("|=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("^=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken("<<=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+    aStateMachine.AddToken(">>=",TCF_Operator,A_nOperatorDefStatus,finPunctuation);
+
+    // Builtin types
+    aStateMachine.AddToken("char",  TCF_BuiltInType,    A_nBezDefStatus,    finBiType);
+    aStateMachine.AddToken("short", TCF_BuiltInType,    A_nBezDefStatus,    finBiType);
+    aStateMachine.AddToken("int",   TCF_BuiltInType,    A_nBezDefStatus,    finBiType);
+    aStateMachine.AddToken("long",  TCF_BuiltInType,    A_nBezDefStatus,    finBiType);
+    aStateMachine.AddToken("float", TCF_BuiltInType,    A_nBezDefStatus,    finBiType);
+    aStateMachine.AddToken("double",TCF_BuiltInType,    A_nBezDefStatus,    finBiType);
+    aStateMachine.AddToken("wchar_t",TCF_BuiltInType,   A_nBezDefStatus,    finBiType);
+    aStateMachine.AddToken("size_t",TCF_BuiltInType,    A_nBezDefStatus,    finBiType);
+
+    // Type modifiers
+    aStateMachine.AddToken("signed",    TCF_TypeModifier,   A_nBezDefStatus,    finTypeModifier);
+    aStateMachine.AddToken("unsigned",  TCF_TypeModifier,   A_nBezDefStatus,    finTypeModifier);
+
+    // To ignore
+    aStateMachine.AddToken("auto",      0,  A_nBezDefStatus,    finIgnore);
+    aStateMachine.AddToken("_cdecl",    0,  A_nBezDefStatus,    finIgnore);
+    aStateMachine.AddToken("__cdecl",   0,  A_nBezDefStatus,    finIgnore);
+    aStateMachine.AddToken("__stdcall", 0,  A_nBezDefStatus,    finIgnore);
+    aStateMachine.AddToken("__fastcall",0,  A_nBezDefStatus,    finIgnore);
+    aStateMachine.AddToken("/**/",      0,  A_nOperatorDefStatus,finIgnore);
+
+    // Context changers
+    aStateMachine.AddToken("#",     0,  A_nOperatorDefStatus,   gotoPreprocessor);
+    aStateMachine.AddToken("#undef",0,  A_nOperatorDefStatus,   gotoPreprocessor);
+    aStateMachine.AddToken("#unblock-",
+                                    0,  A_nOperatorDefStatus,   gotoUnblockMacro);
+    aStateMachine.AddToken("/*",    0,  A_nOperatorDefStatus,   gotoComment);
+    aStateMachine.AddToken("//",    0,  A_nOperatorDefStatus,   gotoComment);
+    aStateMachine.AddToken("/**",   0,  A_nOperatorDefStatus,   gotoDocu);
+    aStateMachine.AddToken("///",   0,  A_nOperatorDefStatus,   gotoDocu);
+
+    // Line ends
+        //  regular
+    aStateMachine.AddToken("\r\n",  0,  A_nOperatorDefStatus,   finEOL);
+    aStateMachine.AddToken("\n",    0,  A_nOperatorDefStatus,   finEOL);
+    aStateMachine.AddToken("\r",    0,  A_nOperatorDefStatus,   finEOL);
+        //  To ignore in some cases(may be only at preprocessor?), but
+        //      linecount has to be incremented.
+    aStateMachine.AddToken("\\\r\n",0,  A_nOperatorDefStatus,   finEOL);
+    aStateMachine.AddToken("\\\n",  0,  A_nOperatorDefStatus,   finEOL);
+    aStateMachine.AddToken("\\\r",  0,  A_nOperatorDefStatus,   finEOL);
+};
+
+
+}   // namespace cpp
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/cx_c_std.hxx b/autodoc/source/parser/cpp/cx_c_std.hxx
new file mode 100644
index 000000000000..fac94a548877
--- /dev/null
+++ b/autodoc/source/parser/cpp/cx_c_std.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 ADC_CPP_CX_C_STD_HXX
+#define ADC_CPP_CX_C_STD_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcontx.hxx>
+#include "cx_base.hxx"
+    // COMPONENTS
+#include <tokens/tkpstama.hxx>
+    // PARAMETERS
+
+
+
+namespace cpp {
+
+class Context_Comment;
+
+/**
+*/
+class Context_CppStd : public Cx_Base,
+                       private StateMachineContext
+{
+  public:
+    //  LIFECYCLE
+                        Context_CppStd(
+                            DYN autodoc::TkpDocuContext &
+                                                let_drContext_Docu  );
+                        ~Context_CppStd();
+    //  OPERATIONS
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    virtual void        AssignDealer(
+                            Distributor &       o_rDealer );
+  private:
+    //  SERVICE FUNCTIONS
+    void                PerformStatusFunction(
+                            uintt               i_nStatusSignal,
+                            StmArrayStatus::F_CRTOK
+                                                i_fTokenCreateFunction,
+                            CharacterSource &   io_rText );
+    void                SetupStateMachine();
+
+    //  DATA
+    StateMachine        aStateMachine;
+
+        // Contexts
+    Dyn<autodoc::TkpDocuContext>
+                        pDocuContext;
+
+    Dyn<Context_Comment>
+                        pContext_Comment;
+    Dyn<Cx_Base>        pContext_Preprocessor;
+    Dyn<Cx_Base>        pContext_ConstString;
+    Dyn<Cx_Base>        pContext_ConstChar;
+    Dyn<Cx_Base>        pContext_ConstNumeric;
+    Dyn<Cx_Base>        pContext_UnblockMacro;
+};
+
+
+
+}   // namespace cpp
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/cx_c_sub.cxx b/autodoc/source/parser/cpp/cx_c_sub.cxx
new file mode 100644
index 000000000000..76e5779312b4
--- /dev/null
+++ b/autodoc/source/parser/cpp/cx_c_sub.cxx
@@ -0,0 +1,160 @@
+/* -*- 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 <precomp.h>
+#include "cx_c_sub.hxx"
+
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ctype.h>
+#include "c_dealer.hxx"
+#include <tokens/parseinc.hxx>
+#include <x_parse.hxx>
+#include "all_toks.hxx"
+
+
+namespace cpp {
+
+
+
+void
+Context_Comment::ReadCharChain( CharacterSource &   io_rText )
+{
+    // KORR_FUTURE
+    //      Counting of lines must be implemented.
+    if (bCurrentModeIsMultiline)
+    {
+        char cNext = NULCH;
+
+        do {
+            do {
+                cNext = jumpTo( io_rText,'*',char(10) );
+                if (cNext == NULCH)
+                    throw X_Parser( X_Parser::x_UnexpectedEOF, "", String::Null_(), 0 );
+                else if ( cNext == char(10) )
+                {
+                    jumpOverEol(io_rText);
+                    Dealer().Deal_Eol();
+                }
+            }   while ( cNext != '*');
+            cNext = jumpOver(io_rText,'*');
+            if (cNext == NULCH)
+                throw X_Parser( X_Parser::x_UnexpectedEOF, "", String::Null_(), 0 );
+        } while (cNext != '/');
+        io_rText.MoveOn();
+        io_rText.CutToken();
+        SetNewToken(0);
+    }
+    else //
+    {
+        int o_rCount_BackslashedLineBreaks = 0;
+        jumpToEol(io_rText,o_rCount_BackslashedLineBreaks);
+        for ( ; o_rCount_BackslashedLineBreaks > 0; --o_rCount_BackslashedLineBreaks )
+            Dealer().Deal_Eol();
+
+        if (io_rText.CurChar() != NULCH)
+            jumpOverEol(io_rText);
+        io_rText.CutToken();
+        Dealer().Deal_Eol();
+        SetNewToken(0);
+    }  // endif
+}
+
+
+void
+Context_ConstString::ReadCharChain( CharacterSource &   io_rText )
+{
+    char cNext = io_rText.MoveOn();
+
+    while (cNext != '"')
+    {   // Get one complete string constant:  "...."
+        while (cNext != '"' AND cNext != '\\')
+        {   // Get string till next '\\'
+            cNext = io_rText.MoveOn();
+        }
+        if (cNext == '\\')
+        {
+            io_rText.MoveOn();
+            cNext = io_rText.MoveOn();
+        }
+    }
+    io_rText.MoveOn();
+    SetNewToken(new Tok_Constant(io_rText.CutToken()));
+}
+
+void
+Context_ConstChar::ReadCharChain( CharacterSource & io_rText )
+{
+    char cNext = io_rText.MoveOn();
+
+    while (cNext != '\'')
+    {   // Get one complete char constant:  "...."
+        while (cNext != '\'' AND cNext != '\\')
+        {   // Get string till next '\\'
+            cNext = io_rText.MoveOn();
+        }
+        if (cNext == '\\')
+        {
+            io_rText.MoveOn();
+            cNext = io_rText.MoveOn();
+        }
+    }
+    io_rText.MoveOn();
+    SetNewToken(new Tok_Constant(io_rText.CutToken()));
+}
+
+void
+Context_ConstNumeric::ReadCharChain(CharacterSource & io_rText)
+{
+    char cNext = 0;
+
+    do {
+        do {
+            cNext = static_cast<char>( tolower(io_rText.MoveOn()) );
+        } while ( (cNext != 'e' AND isalnum(cNext)) OR cNext == '.');
+        if (cNext == 'e')
+        {
+            cNext = io_rText.MoveOn();
+            if (cNext == '+' OR cNext == '-')
+                cNext = io_rText.MoveOn();
+        }   // endif
+    } while (isalnum(cNext) OR cNext == '.');     // Reicht aus, wenn Zahlen korrekt geschrieben sind
+    SetNewToken(new Tok_Constant(io_rText.CutToken()));
+}
+
+void
+Context_UnblockMacro::ReadCharChain(CharacterSource & io_rText)
+{
+    jumpToWhite(io_rText);
+    SetNewToken(new Tok_UnblockMacro( io_rText.CutToken() + strlen("#unblock-") ));
+}
+
+}   // namespace cpp
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/cx_c_sub.hxx b/autodoc/source/parser/cpp/cx_c_sub.hxx
new file mode 100644
index 000000000000..6e2d3d8807ed
--- /dev/null
+++ b/autodoc/source/parser/cpp/cx_c_sub.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 ADC_CPP_CX_C_SUB_HXX
+#define ADC_CPP_CX_C_SUB_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcontx.hxx>
+#include "cx_base.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace cpp {
+
+
+class Context_Comment : public Cx_Base
+{
+  public:
+                        Context_Comment(
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(&i_rFollowUpContext) {}
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    void                SetMode_IsMultiLine(
+                            bool                i_bTrue )
+                                                { bCurrentModeIsMultiline = i_bTrue; }
+  private:
+    bool                bCurrentModeIsMultiline;
+};
+
+class Context_ConstString : public Cx_Base
+{
+  public:
+                        Context_ConstString(
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(&i_rFollowUpContext) {}
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+};
+
+class Context_ConstChar : public Cx_Base
+{
+  public:
+                        Context_ConstChar(
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(&i_rFollowUpContext) {}
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+};
+
+class Context_ConstNumeric : public Cx_Base
+{
+  public:
+                        Context_ConstNumeric(
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(&i_rFollowUpContext) {}
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+};
+
+class Context_UnblockMacro : public Cx_Base
+{
+  public:
+                        Context_UnblockMacro(
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(&i_rFollowUpContext) {}
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+};
+
+
+
+}   // namespace cpp
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/cxt2ary.cxx b/autodoc/source/parser/cpp/cxt2ary.cxx
new file mode 100644
index 000000000000..eda70ca1045e
--- /dev/null
+++ b/autodoc/source/parser/cpp/cxt2ary.cxx
@@ -0,0 +1,360 @@
+/* -*- 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 <precomp.h>
+#include "cxt2ary.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/entity.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_define.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/c_enuval.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_macro.hxx>
+#include <ary/cpp/c_tydef.hxx>
+#include <ary/cpp/c_vari.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/loc/loc_file.hxx>
+#include <ary/doc/d_oldcppdocu.hxx>
+#include <ary/info/docstore.hxx>
+#include "icprivow.hxx"
+
+// Implementationheaders, only to be used in this file!
+#include "sfscope.hxx"
+#include "sownstck.hxx"
+#include "sdocdist.hxx"
+#include "srecover.hxx"
+
+
+
+
+
+namespace cpp
+{
+
+using ary::cpp::E_Protection;
+
+ContextForAry::ContextForAry( ary::cpp::Gate &  io_rAryGate )
+    :   pGate(&io_rAryGate),
+        aTokenResult(),
+        pFileScopeInfo( new S_FileScopeInfo ),
+        pOwnerStack( new S_OwnerStack ),
+        pDocuDistributor( new S_DocuDistributor ),
+        pRecoveryGuard( new S_RecoveryGuard )
+{
+    OpenNamespace( pGate->Ces().GlobalNamespace() );
+}
+
+ContextForAry::~ContextForAry()
+{
+}
+
+ary::loc::File &
+ContextForAry::inq_CurFile() const
+{
+    csv_assert(pFileScopeInfo->pCurFile != 0);
+
+    return *pFileScopeInfo->pCurFile;
+}
+
+ary::cpp::Namespace &
+ContextForAry::inq_CurNamespace() const
+{
+    return pOwnerStack->CurNamespace();
+}
+
+ary::cpp::Class *
+ContextForAry::inq_CurClass() const
+{
+    return pOwnerStack->CurClass();
+}
+
+ary::cpp::Enum *
+ContextForAry::inq_CurEnum() const
+{
+    return pOwnerStack->CurEnum();
+}
+
+
+ary::cpp::InputContext::Owner &
+ContextForAry::inq_CurOwner() const
+{
+    return pOwnerStack->CurOwner();
+}
+
+E_Protection
+ContextForAry::inq_CurProtection() const
+{
+    return pOwnerStack->CurProtection();
+}
+
+void
+ContextForAry::do_SetTokenResult( E_TokenDone           i_eDone,
+                                  E_EnvStackAction      i_eWhat2DoWithEnvStack,
+                                  ParseEnvironment *    i_pParseEnv2Push )
+{
+    aTokenResult.eDone = i_eDone;
+    aTokenResult.eStackAction = i_eWhat2DoWithEnvStack;
+    aTokenResult.pEnv2Push = i_pParseEnv2Push;
+}
+
+void
+ContextForAry::do_OpenNamespace( ary::cpp::Namespace & io_rOpenedNamespace )
+{
+    pOwnerStack->OpenNamespace( io_rOpenedNamespace );
+}
+
+void
+ContextForAry::do_OpenExternC( bool )
+{
+    pOwnerStack->OpenExternC();
+    // KORR_FUTURE
+    // use i_bOnlyForOneDeclaration
+}
+
+void
+ContextForAry::do_OpenClass( ary::cpp::Class & io_rOpenedClass )
+{
+    pOwnerStack->OpenClass(io_rOpenedClass);
+    pDocuDistributor->SetCurrentlyStoredRe(io_rOpenedClass);
+}
+
+void
+ContextForAry::do_OpenEnum( ary::cpp::Enum & io_rOpenedEnum )
+{
+    pOwnerStack->OpenEnum(io_rOpenedEnum);
+    pDocuDistributor->SetCurrentlyStoredRe(io_rOpenedEnum);
+}
+
+void
+ContextForAry::do_CloseBlock()
+{
+    pOwnerStack->CloseBlock();
+}
+
+void
+ContextForAry::do_CloseClass()
+{
+    pOwnerStack->CloseClass();
+}
+
+void
+ContextForAry::do_CloseEnum()
+{
+    pOwnerStack->CloseEnum();
+}
+
+void
+ContextForAry::do_SetCurProtection( ary::cpp::E_Protection i_eProtection )
+{
+    pOwnerStack->SetCurProtection(i_eProtection);
+}
+
+void
+ContextForAry::do_OpenTemplate( const StringVector & i_rParameters )
+{
+    pFileScopeInfo->pCurTemplateParameters = new StringVector(i_rParameters);
+}
+
+DYN StringVector *
+ContextForAry::do_Get_CurTemplateParameters()
+{
+    return pFileScopeInfo->pCurTemplateParameters.Release();
+}
+
+void
+ContextForAry::do_Close_OpenTemplate()
+{
+    if (pFileScopeInfo->pCurTemplateParameters)
+        delete pFileScopeInfo->pCurTemplateParameters.Release();
+}
+
+void
+ContextForAry::do_Event_Class_FinishedBase( const String & )
+{
+    // KORR_FUTURE
+}
+
+void
+ContextForAry::do_Event_Store_Typedef( ary::cpp::Typedef & io_rTypedef )
+{
+    pDocuDistributor->SetCurrentlyStoredRe(io_rTypedef);
+}
+
+void
+ContextForAry::do_Event_Store_EnumValue( ary::cpp::EnumValue & io_rEnumValue )
+{
+    pDocuDistributor->SetCurrentlyStoredRe(io_rEnumValue);
+}
+
+void
+ContextForAry::do_Event_Store_CppDefinition( ary::cpp::DefineEntity & io_rDefinition )
+{
+    pDocuDistributor->SetCurrentlyStoredRe(io_rDefinition);
+}
+
+void
+ContextForAry::do_Event_EnterFunction_ParameterList()
+{
+    // KORR_FUTURE
+    // Inform pDocuDistributor about possibility of parameters' inline documentation.
+}
+
+void
+ContextForAry::do_Event_Function_FinishedParameter( const String & )
+{
+    // KORR_FUTURE
+}
+
+void
+ContextForAry::do_Event_LeaveFunction_ParameterList()
+{
+    // KORR_FUTURE
+}
+
+void
+ContextForAry::do_Event_EnterFunction_Implementation()
+{
+    // KORR_FUTURE
+}
+
+void
+ContextForAry::do_Event_LeaveFunction_Implementation()
+{
+    // KORR_FUTURE
+}
+
+void
+ContextForAry::do_Event_Store_Function( ary::cpp::Function & io_rFunction )
+{
+    pDocuDistributor->SetCurrentlyStoredRe(io_rFunction);
+}
+
+
+void
+ContextForAry::do_Event_Store_Variable( ary::cpp::Variable & io_rVariable )
+{
+    pDocuDistributor->SetCurrentlyStoredRe(io_rVariable);
+}
+
+void
+ContextForAry::do_TakeDocu( DYN ary::doc::OldCppDocu & let_drInfo )
+{
+    let_drInfo.Store2(*pDocuDistributor);
+}
+
+void
+ContextForAry::do_StartWaitingFor_Recovery()
+{
+    pRecoveryGuard->StartWaitingFor_Recovery();
+}
+
+ary::cpp::Gate &
+ContextForAry::inq_AryGate() const
+{
+     return * const_cast< ary::cpp::Gate* >(pGate);
+}
+
+const ary::cpp::InputContext &
+ContextForAry::inq_Context() const
+{
+    return *this;
+}
+
+String
+ContextForAry::inq_CurFileName() const
+{
+    return pFileScopeInfo->pCurFile != 0
+            ?   pFileScopeInfo->pCurFile->LocalName()
+            :   String::Null_();
+}
+
+uintt
+ContextForAry::inq_LineCount() const
+{
+    return pFileScopeInfo->nLineCount;
+}
+
+bool
+ContextForAry::inq_IsWaitingFor_Recovery() const
+{
+    return pRecoveryGuard->IsWithinRecovery();
+}
+
+bool
+ContextForAry::inq_IsExternC() const
+{
+     return pOwnerStack->IsExternC();
+}
+
+void
+ContextForAry::do_SetCurFile( ary::loc::File &  io_rCurFile )
+{
+    pFileScopeInfo->pCurFile = &io_rCurFile;
+    pFileScopeInfo->nLineCount = 0;
+    pFileScopeInfo->pCurTemplateParameters = 0;
+
+    pOwnerStack->Reset();
+    pDocuDistributor->Reset();
+    pRecoveryGuard->Reset();
+}
+
+void
+ContextForAry::do_Event_IncrLineCount()
+{
+    ++pFileScopeInfo->nLineCount;
+    pDocuDistributor->Event_LineBreak();
+}
+
+void
+ContextForAry::do_Event_SwBracketOpen()
+{
+    pRecoveryGuard->Hdl_SwBracketOpen();
+}
+
+void
+ContextForAry::do_Event_SwBracketClose()
+{
+    pRecoveryGuard->Hdl_SwBracketClose();
+}
+
+void
+ContextForAry::do_Event_Semicolon()
+{
+    pRecoveryGuard->Hdl_Semicolon();
+}
+
+
+
+
+}   // namespace cpp
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/cxt2ary.hxx b/autodoc/source/parser/cpp/cxt2ary.hxx
new file mode 100644
index 000000000000..9006aefa645e
--- /dev/null
+++ b/autodoc/source/parser/cpp/cxt2ary.hxx
@@ -0,0 +1,201 @@
+/* -*- 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 ADC_CPP_CTX2ARY_HXX
+#define ADC_CPP_CTX2ARY_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/inpcontx.hxx>
+#include <doc_deal.hxx>
+#include "pev.hxx"
+#include "fevnthdl.hxx"
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+namespace loc
+{
+    class File;
+}
+}
+
+
+
+namespace cpp
+{
+
+
+/** @descr
+    This class provides information about the context of an
+    CodeEntity, which is going to be stored in the repository.
+    The information is used mainly by class ary::cpp::Gate.
+
+    Also it provides information for the parser about actual
+    state of several public variables.
+
+    @todo
+    Include events, which allow correct storing of inline
+    documentation after enum values, parameters,
+    base classes.
+*/
+class ContextForAry : public ary::cpp::InputContext,
+                      public cpp::PeEnvironment,
+                      public cpp::FileScope_EventHandler,
+                      public DocuDealer
+{
+  public:
+    // LIFECYCLE
+                        ContextForAry(
+                            ary::cpp::Gate &  io_rAryGate );
+    virtual             ~ContextForAry();
+
+    // OPERATIONS
+    void                ResetResult()           { aTokenResult.Reset(); }
+
+    // INQUIRY
+    const TokenProcessing_Result &
+                        CurResult() const       { return aTokenResult; }
+    // ACCESS
+    TokenProcessing_Result &
+                        CurResult()             { return aTokenResult; }
+
+  private:
+    // Interface ary::cpp::InputContext:
+    virtual ary::loc::File &
+                        inq_CurFile() const;
+    virtual ary::cpp::Namespace &
+                        inq_CurNamespace() const;
+    virtual ary::cpp::Class *
+                        inq_CurClass() const;
+    virtual ary::cpp::Enum *
+                        inq_CurEnum() const;
+
+    virtual Owner &     inq_CurOwner() const;
+    virtual ary::cpp::E_Protection
+                        inq_CurProtection() const;
+
+    // Interface PeEnvironment
+    virtual void        do_SetTokenResult(
+                            E_TokenDone         i_eDone,
+                            E_EnvStackAction    i_eWhat2DoWithEnvStack,
+                            ParseEnvironment *  i_pParseEnv2Push );
+    virtual void        do_OpenNamespace(
+                            ary::cpp::Namespace &
+                                                io_rOpenedNamespace );
+    virtual void        do_OpenExternC(
+                            bool                i_bOnlyForOneDeclaration );
+    virtual void        do_OpenClass(
+                            ary::cpp::Class &   io_rOpenedClass );
+    virtual void        do_OpenEnum(
+                            ary::cpp::Enum &    io_rOpenedEnum );
+    virtual void        do_CloseBlock();
+    virtual void        do_CloseClass();
+    virtual void        do_CloseEnum();
+    virtual void        do_SetCurProtection(
+                            ary::cpp::E_Protection
+                                                i_eProtection );
+    virtual void        do_OpenTemplate(
+                            const StringVector &
+                                                i_rParameters );
+    virtual DYN StringVector *
+                        do_Get_CurTemplateParameters();
+    virtual void        do_Close_OpenTemplate();
+    virtual void        do_Event_Class_FinishedBase(
+                            const String  &     i_sBaseName );
+
+    virtual void        do_Event_Store_Typedef(
+                            ary::cpp::Typedef & io_rTypedef );
+    virtual void        do_Event_Store_EnumValue(
+                            ary::cpp::EnumValue &
+                                                io_rEnumValue );
+    virtual void        do_Event_Store_CppDefinition(
+                            ary::cpp::DefineEntity &
+                                                io_rDefinition );
+    virtual void        do_Event_EnterFunction_ParameterList();
+    virtual void        do_Event_Function_FinishedParameter(
+                            const String  &     i_sParameterName );
+    virtual void        do_Event_LeaveFunction_ParameterList();
+    virtual void        do_Event_EnterFunction_Implementation();
+    virtual void        do_Event_LeaveFunction_Implementation();
+    virtual void        do_Event_Store_Function(
+                            ary::cpp::Function &
+                                                io_rFunction );
+    virtual void        do_Event_Store_Variable(
+                            ary::cpp::Variable &
+                                                io_rVariable );
+    virtual void        do_TakeDocu(
+                            DYN ary::doc::OldCppDocu &
+                                                let_drInfo );
+    virtual void        do_StartWaitingFor_Recovery();
+    virtual ary::cpp::Gate &
+                        inq_AryGate() const;
+    virtual const ary::cpp::InputContext &
+                        inq_Context() const;
+    virtual String      inq_CurFileName() const;
+    virtual uintt       inq_LineCount() const;
+    virtual bool        inq_IsWaitingFor_Recovery() const;
+    virtual bool        inq_IsExternC() const;
+
+    // Interface FileScope_EventHandler
+    virtual void        do_SetCurFile(
+                            ary::loc::File &    io_rCurFile );
+    virtual void        do_Event_IncrLineCount();
+    virtual void        do_Event_SwBracketOpen();
+    virtual void        do_Event_SwBracketClose();
+    virtual void        do_Event_Semicolon();
+
+    // Local types
+    struct S_FileScopeInfo;
+    struct S_OwnerStack;
+    struct S_DocuDistributor;
+    struct S_RecoveryGuard;
+
+    // DATA
+    ary::cpp::Gate *    pGate;
+    TokenProcessing_Result
+                        aTokenResult;
+    Dyn<S_FileScopeInfo>
+                        pFileScopeInfo;
+    Dyn<S_OwnerStack>   pOwnerStack;
+    Dyn<S_DocuDistributor>
+                        pDocuDistributor;
+    Dyn<S_RecoveryGuard>
+                        pRecoveryGuard;
+};
+
+
+
+
+}   // namespace cpp
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/defdescr.cxx b/autodoc/source/parser/cpp/defdescr.cxx
new file mode 100644
index 000000000000..c233a5d93be4
--- /dev/null
+++ b/autodoc/source/parser/cpp/defdescr.cxx
@@ -0,0 +1,227 @@
+/* -*- 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 <precomp.h>
+#include "defdescr.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <prprpr.hxx>
+
+
+
+
+namespace cpp
+{
+
+
+
+
+DefineDescription::DefineDescription( const String  &       i_sName,
+                                      const str_vector &    i_rDefinition )
+    :   sName(i_sName),
+        // aParams,
+        aDefinition(i_rDefinition),
+        eDefineType(type_define)
+{
+}
+
+DefineDescription::DefineDescription( const String  &       i_sName,
+                                      const str_vector &    i_rParams,
+                                      const str_vector &    i_rDefinition )
+    :   sName(i_sName),
+        aParams(i_rParams),
+        aDefinition(i_rDefinition),
+        eDefineType(type_macro)
+{
+}
+
+DefineDescription::~DefineDescription()
+{
+}
+
+void
+DefineDescription::GetDefineText( csv::StreamStr & o_rText ) const
+{
+    if ( aDefinition.begin() == aDefinition.end() OR eDefineType != type_define )
+        return;
+
+
+    bool bSwitch_Stringify = false;
+    bool bSwitch_Concatenate = false;
+
+    for ( str_vector::const_iterator it = aDefinition.begin();
+          it != aDefinition.end();
+          ++it )
+    {
+        if ( HandleOperatorsBeforeTextItem( o_rText,
+                                            bSwitch_Stringify,
+                                            bSwitch_Concatenate,
+                                            *it ) )
+        {
+            continue;
+        }
+
+        o_rText << (*it);
+
+        Do_bStringify_end(o_rText, bSwitch_Stringify);
+        o_rText << " ";
+    }
+    o_rText.seekp(-1, csv::cur);
+}
+
+void
+DefineDescription::GetMacroText( csv::StreamStr &               o_rText,
+                                 const StringVector & i_rGivenArguments ) const
+{
+    bool bSwitch_Stringify = false;
+    bool bSwitch_Concatenate = false;
+    intt nActiveParamNr = -1;
+
+    if ( aDefinition.begin() == aDefinition.end() OR eDefineType != type_macro )
+        return;
+
+    for ( str_vector::const_iterator it = aDefinition.begin();
+          it != aDefinition.end();
+          ++it )
+    {
+        if ( HandleOperatorsBeforeTextItem( o_rText,
+                                            bSwitch_Stringify,
+                                            bSwitch_Concatenate,
+                                            *it ) )
+        {
+            continue;
+        }
+
+        for ( str_vector::const_iterator param_it = aParams.begin();
+              param_it != aParams.end() AND nActiveParamNr == -1;
+              ++param_it )
+        {
+             if ( strcmp(*it, *param_it) == 0 )
+                nActiveParamNr = param_it - aParams.begin();
+        }
+        if ( nActiveParamNr == -1 )
+        {
+            o_rText << (*it);
+        }
+        else
+        {
+            o_rText << i_rGivenArguments[nActiveParamNr];
+            nActiveParamNr = -1;
+        }
+
+        Do_bStringify_end(o_rText, bSwitch_Stringify);
+        o_rText << " ";
+    }
+    o_rText.seekp(-1, csv::cur);
+}
+
+
+
+}   // end namespace cpp
+
+
+
+
+
+bool
+CheckForOperator( bool &              o_bStringify,
+                  bool &              o_bConcatenate,
+                  const String &      i_sTextItem )
+{
+    if ( strcmp(i_sTextItem, "##") == 0 )
+    {
+        o_bConcatenate = true;
+        return true;
+    }
+    else if ( strcmp(i_sTextItem, "#") == 0 )
+    {
+        o_bStringify = true;
+        return true;
+    }
+    return false;
+}
+
+void
+Do_bConcatenate( csv::StreamStr &    o_rText,
+                 bool &              io_bConcatenate )
+{
+    if ( io_bConcatenate )
+    {
+        uintt nPos;
+        for ( nPos = o_rText.tellp() - 1;
+              nPos > 0 ? o_rText.c_str()[nPos] == ' ' : false;
+              --nPos ) ;
+        o_rText.seekp(nPos+1);
+        io_bConcatenate = false;
+    }
+}
+
+void
+Do_bStringify_begin( csv::StreamStr & o_rText,
+                     bool             i_bStringify )
+{
+    if ( i_bStringify )
+    {
+        o_rText << "\"";
+    }
+}
+
+void
+Do_bStringify_end( csv::StreamStr & o_rText,
+                   bool &           io_bStringify )
+{
+    if ( io_bStringify )
+    {
+        o_rText << "\"";
+        io_bStringify = false;
+    }
+}
+
+
+bool
+HandleOperatorsBeforeTextItem( csv::StreamStr &    o_rText,
+                               bool &              io_bStringify,
+                               bool &              io_bConcatenate,
+                               const String  &     i_sTextItem )
+{
+    if ( CheckForOperator( io_bStringify,
+                           io_bConcatenate,
+                           i_sTextItem) )
+    {
+        return true;
+    }
+    Do_bConcatenate(o_rText, io_bConcatenate);
+    Do_bStringify_begin(o_rText, io_bStringify);
+
+    return false;
+}
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/defdescr.hxx b/autodoc/source/parser/cpp/defdescr.hxx
new file mode 100644
index 000000000000..3980ea7c77fa
--- /dev/null
+++ b/autodoc/source/parser/cpp/defdescr.hxx
@@ -0,0 +1,100 @@
+/* -*- 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 ADC_CPP_DEFDESCR_HXX
+#define ADC_CPP_DEFDESCR_HXX
+
+
+
+
+namespace cpp
+{
+
+/** Describes a C/C++ #define statement. May be a define or a macro, for which
+    two cases the two different constructors are to be used.
+
+    This class is used by cpp::PreProcessor.
+*/
+class DefineDescription
+{
+  public:
+    enum E_DefineType
+    {
+        type_define,
+        type_macro
+    };
+    typedef StringVector str_vector;
+
+                        DefineDescription(      /// Used for: #define DEFINE xyz
+                            const String  &     i_sName,
+                            const str_vector &  i_rDefinition );
+                        DefineDescription(      /// Used for: #define MACRO(...) abc
+                            const String  &     i_sName,
+                            const str_vector &  i_rParams,
+                            const str_vector &  i_rDefinition );
+                        ~DefineDescription();
+
+    /// Only vaild if (eDefineType == type_define) else returns "".
+    void                GetDefineText(
+                            csv::StreamStr &    o_rText ) const;
+
+    /// Only vaild if (eDefineType == type_macro) else returns "".
+    void                GetMacroText(
+                            csv::StreamStr &    o_rText,
+                            const StringVector &
+                                                i_rGivenArguments ) const;
+
+    uintt               ParamCount() const;
+    E_DefineType        DefineType() const;
+
+  private:
+    // DATA
+    String              sName;
+    str_vector          aParams;
+    str_vector          aDefinition;
+    E_DefineType        eDefineType;
+};
+
+
+
+
+// IMPLEMENTATION
+inline uintt
+DefineDescription::ParamCount() const
+    { return aParams.size(); }
+inline DefineDescription::E_DefineType
+DefineDescription::DefineType() const
+    { return eDefineType; }
+
+
+
+
+}   // end namespace cpp
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/fevnthdl.hxx b/autodoc/source/parser/cpp/fevnthdl.hxx
new file mode 100644
index 000000000000..0198f404f588
--- /dev/null
+++ b/autodoc/source/parser/cpp/fevnthdl.hxx
@@ -0,0 +1,107 @@
+/* -*- 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 ADC_CPP_FEVNTHDL_HXX
+#define ADC_CPP_FEVNTHDL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace loc
+{
+    class File;
+}
+}
+
+
+
+
+namespace cpp
+{
+
+
+/** This is an interface, which accepts the file scope events that may
+    be important for parsing. It is implementation-dependant, where to
+    put or what to do with them.
+*/
+class FileScope_EventHandler
+{
+  public:
+    // LIFECYCLE
+    virtual             ~FileScope_EventHandler() {}
+
+    // OPERATIONS
+    void                SetCurFile(
+                            ary::loc::File &    io_rCurFile );
+    void                Event_IncrLineCount();
+    void                Event_SwBracketOpen();
+    void                Event_SwBracketClose();
+    void                Event_Semicolon();
+
+  private:
+    virtual void        do_SetCurFile(
+                            ary::loc::File &    io_rCurFile ) = 0;
+    virtual void        do_Event_IncrLineCount() = 0;
+    virtual void        do_Event_SwBracketOpen() = 0;
+    virtual void        do_Event_SwBracketClose() = 0;
+    virtual void        do_Event_Semicolon() = 0;
+};
+
+
+// IMPLEMENTATION
+
+inline void
+FileScope_EventHandler::SetCurFile( ary::loc::File & io_rCurFile )
+    { do_SetCurFile(io_rCurFile); }
+inline void
+FileScope_EventHandler::Event_IncrLineCount()
+    { do_Event_IncrLineCount(); }
+inline void
+FileScope_EventHandler::Event_SwBracketOpen()
+    { do_Event_SwBracketOpen(); }
+inline void
+FileScope_EventHandler::Event_SwBracketClose()
+    { do_Event_SwBracketClose(); }
+inline void
+FileScope_EventHandler::Event_Semicolon()
+    { do_Event_Semicolon(); }
+
+
+
+
+}   // namespace cpp
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/icprivow.cxx b/autodoc/source/parser/cpp/icprivow.cxx
new file mode 100644
index 000000000000..8202e12862e7
--- /dev/null
+++ b/autodoc/source/parser/cpp/icprivow.cxx
@@ -0,0 +1,195 @@
+/* -*- 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 <precomp.h>
+#include <icprivow.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_class.hxx>
+
+
+
+namespace cpp
+{
+
+
+
+//******************          Owner_Namespace          ********************//
+Owner_Namespace::Owner_Namespace()
+    :   pScope(0)
+{
+}
+
+void
+Owner_Namespace::SetAnotherNamespace( ary::cpp::Namespace & io_rScope )
+{
+    pScope = &io_rScope;
+}
+
+bool
+Owner_Namespace::HasClass( const String & i_sLocalName )
+{
+    return pScope->Search_LocalClass(i_sLocalName).IsValid();
+}
+
+void
+Owner_Namespace::do_Add_Class( const String  &     i_sLocalName,
+                               Cid                 i_nId )
+{
+    csv_assert(pScope != 0);
+    pScope->Add_LocalClass(i_sLocalName, i_nId);
+}
+
+void
+Owner_Namespace::do_Add_Enum( const String  &     i_sLocalName,
+                              Cid                 i_nId )
+{
+    csv_assert(pScope != 0);
+    pScope->Add_LocalEnum(i_sLocalName, i_nId);
+}
+
+void
+Owner_Namespace::do_Add_Typedef( const String  &     i_sLocalName,
+                                 Cid                 i_nId )
+{
+    csv_assert(pScope != 0);
+    pScope->Add_LocalTypedef(i_sLocalName, i_nId);
+}
+
+void
+Owner_Namespace::do_Add_Operation( const String  &     i_sLocalName,
+                                   Cid                 i_nId,
+                                   bool                )
+{
+    csv_assert(pScope != 0);
+    pScope->Add_LocalOperation(i_sLocalName, i_nId);
+}
+
+void
+Owner_Namespace::do_Add_Variable( const String  &     i_sLocalName,
+                                  Cid                 i_nId,
+                                  bool                i_bIsConst,
+                                  bool                )
+{
+    csv_assert(pScope != 0);
+    if (i_bIsConst)
+        pScope->Add_LocalConstant(i_sLocalName, i_nId);
+    else
+        pScope->Add_LocalVariable(i_sLocalName, i_nId);
+}
+
+
+Cid
+Owner_Namespace::inq_CeId() const
+{
+    csv_assert(pScope != 0);
+    return pScope->CeId();
+}
+
+
+//******************            Owner_Class          ********************//
+
+Owner_Class::Owner_Class()
+    :   pScope(0)
+{
+}
+
+void
+Owner_Class::SetAnotherClass( ary::cpp::Class & io_rScope )
+{
+    pScope = &io_rScope;
+}
+
+bool
+Owner_Class::HasClass( const String  & )
+{
+    return false;
+}
+
+void
+Owner_Class::do_Add_Class( const String  &     i_sLocalName,
+                               Cid                 i_nId )
+{
+    csv_assert(pScope != 0);
+    pScope->Add_LocalClass(i_sLocalName, i_nId);
+}
+
+void
+Owner_Class::do_Add_Enum( const String  &     i_sLocalName,
+                              Cid                 i_nId )
+{
+    csv_assert(pScope != 0);
+    pScope->Add_LocalEnum(i_sLocalName, i_nId);
+}
+
+void
+Owner_Class::do_Add_Typedef( const String  &     i_sLocalName,
+                             Cid                 i_nId )
+{
+    csv_assert(pScope != 0);
+    pScope->Add_LocalTypedef(i_sLocalName, i_nId);
+}
+
+void
+Owner_Class::do_Add_Operation( const String  &      i_sLocalName,
+                               Cid                  i_nId,
+                               bool                 i_bIsStatic )
+{
+    csv_assert(pScope != 0);
+    if (i_bIsStatic)
+        pScope->Add_LocalStaticOperation(i_sLocalName, i_nId);
+    else
+        pScope->Add_LocalOperation(i_sLocalName, i_nId);
+}
+
+void
+Owner_Class::do_Add_Variable( const String  &     i_sLocalName,
+                              Cid                 i_nId,
+                              bool                ,
+                              bool                i_bIsStatic )
+{
+    csv_assert(pScope != 0);
+    if (i_bIsStatic)
+        pScope->Add_LocalStaticData(i_sLocalName, i_nId);
+    else
+        pScope->Add_LocalData(i_sLocalName, i_nId);
+}
+
+Cid
+Owner_Class::inq_CeId() const
+{
+    csv_assert(pScope != 0);
+    return pScope->CeId();
+}
+
+
+}   // namespace cpp
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/icprivow.hxx b/autodoc/source/parser/cpp/icprivow.hxx
new file mode 100644
index 000000000000..5321df48e34a
--- /dev/null
+++ b/autodoc/source/parser/cpp/icprivow.hxx
@@ -0,0 +1,126 @@
+/* -*- 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 ARY_CPP_ICPRIVOW_HXX
+#define ARY_CPP_ICPRIVOW_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <ary/cpp/inpcontx.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace cpp
+{
+
+
+
+typedef ary::cpp::Ce_id     Cid;
+
+
+class Owner_Namespace : public ary::cpp::InputContext::Owner
+{
+  public:
+                        Owner_Namespace();
+    void                SetAnotherNamespace(
+                            ary::cpp::Namespace &
+                                                io_rScope );
+    virtual bool        HasClass(
+                                const String  &     i_sLocalName );
+  private:
+    virtual void        do_Add_Class(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    virtual void        do_Add_Enum(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    virtual void        do_Add_Typedef(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    virtual void        do_Add_Operation(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId,
+                                bool                 );
+    virtual void        do_Add_Variable(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId,
+                                bool                i_bIsConst,
+                                bool                i_bIsStatic );
+    virtual Cid         inq_CeId() const;
+
+    // DATA
+    ary::cpp::Namespace *
+                        pScope;
+};
+
+class Owner_Class : public ary::cpp::InputContext::Owner
+{
+  public:
+                        Owner_Class();
+    void                SetAnotherClass(
+                            ary::cpp::Class &   io_rScope );
+
+    /** @attention Only a dummy for use at ary::cpp::Gate!
+        Will work nerver!
+    */
+    virtual bool        HasClass(
+                                const String  &     i_sLocalName );
+  private:
+    virtual void        do_Add_Class(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    virtual void        do_Add_Enum(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    virtual void        do_Add_Typedef(
+                            const String  &     i_sLocalName,
+                            Cid                 i_nId );
+    virtual void        do_Add_Operation(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId,
+                                bool                i_bIsStaticMember );
+    virtual void        do_Add_Variable(
+                                const String  &     i_sLocalName,
+                                Cid                 i_nId,
+                                bool                i_bIsConst,
+                                bool                i_bIsStatic );
+    virtual Cid         inq_CeId() const;
+
+    // DATA
+    ary::cpp::Class *   pScope;
+};
+
+
+
+
+}   // namespace cpp
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/makefile.mk b/autodoc/source/parser/cpp/makefile.mk
new file mode 100644
index 000000000000..9729ee2d57b1
--- /dev/null
+++ b/autodoc/source/parser/cpp/makefile.mk
@@ -0,0 +1,87 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=parser_cpp
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/all_toks.obj	\
+    $(OBJ)$/c_dealer.obj	\
+    $(OBJ)$/c_rcode.obj		\
+    $(OBJ)$/cpp_pe.obj		\
+    $(OBJ)$/cx_base.obj	    \
+    $(OBJ)$/cx_c_pp.obj	    \
+    $(OBJ)$/cx_c_std.obj	\
+    $(OBJ)$/cx_c_sub.obj	\
+    $(OBJ)$/cxt2ary.obj	    \
+    $(OBJ)$/defdescr.obj	\
+    $(OBJ)$/icprivow.obj	\
+    $(OBJ)$/pe_base.obj		\
+    $(OBJ)$/pe_class.obj	\
+    $(OBJ)$/pe_defs.obj	    \
+    $(OBJ)$/pe_expr.obj	    \
+    $(OBJ)$/pe_enum.obj	    \
+    $(OBJ)$/pe_enval.obj    \
+    $(OBJ)$/pe_file.obj		\
+    $(OBJ)$/pe_funct.obj	\
+    $(OBJ)$/pe_ignor.obj	\
+    $(OBJ)$/pe_namsp.obj	\
+    $(OBJ)$/pe_param.obj	\
+    $(OBJ)$/pe_tpltp.obj    \
+    $(OBJ)$/pe_type.obj		\
+    $(OBJ)$/pe_tydef.obj	\
+    $(OBJ)$/pe_vafu.obj		\
+    $(OBJ)$/pe_vari.obj		\
+    $(OBJ)$/preproc.obj		\
+    $(OBJ)$/prs_cpp.obj		\
+    $(OBJ)$/tkp_cpp.obj
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/parser/cpp/pe_base.cxx b/autodoc/source/parser/cpp/pe_base.cxx
new file mode 100644
index 000000000000..0a4c823a47a4
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_base.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_base.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_type.hxx>
+#include "pe_type.hxx"
+
+
+
+
+namespace cpp
+{
+
+
+static const PE_Base::Base aNullBase_;
+
+
+PE_Base::PE_Base( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati(new PeStatusArray<PE_Base>)
+        // aBaseIds,
+        // pSpType,
+        // pSpuBaseName
+{
+    Setup_StatusFunctions();
+    aBaseIds.reserve(4);
+
+    pSpType         = new SP_Type(*this);
+    pSpuBaseName    = new SPU_BaseName(*pSpType, 0, &PE_Base::SpReturn_BaseName);
+}
+
+
+PE_Base::~PE_Base()
+{
+}
+
+void
+PE_Base::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Base::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Base>::F_Tok    F_Tok;
+    static F_Tok stateF_startOfNext[] =     { &PE_Base::On_startOfNext_Identifier,
+                                              &PE_Base::On_startOfNext_public,
+                                              &PE_Base::On_startOfNext_protected,
+                                              &PE_Base::On_startOfNext_private,
+                                              &PE_Base::On_startOfNext_virtual,
+                                              &PE_Base::On_startOfNext_DoubleColon };
+    static INT16 stateT_startOfNext[] =     { Tid_Identifier,
+                                              Tid_public,
+                                              Tid_protected,
+                                              Tid_private,
+                                              Tid_virtual,
+                                              Tid_DoubleColon };
+    static F_Tok stateF_inName[] =          { &PE_Base::On_inName_Identifier,
+                                              &PE_Base::On_inName_virtual,
+                                              &PE_Base::On_inName_SwBracket_Left,
+                                              &PE_Base::On_inName_DoubleColon,
+                                              &PE_Base::On_inName_Comma };
+    static INT16 stateT_inName[] =          { Tid_Identifier,
+                                              Tid_virtual,
+                                              Tid_SwBracket_Left,
+                                              Tid_DoubleColon,
+                                              Tid_Comma };
+
+    SEMPARSE_CREATE_STATUS(PE_Base, startOfNext, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Base, inName, Hdl_SyntaxError);
+}
+
+void
+PE_Base::Hdl_SyntaxError( const char * i_sText)
+{
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_Base::InitData()
+{
+    pStati->SetCur(startOfNext);
+    csv::erase_container(aBaseIds);
+    aBaseIds.push_back(aNullBase_);
+}
+
+void
+PE_Base::TransferData()
+{
+    // Does nothing.
+}
+
+void
+PE_Base::SpReturn_BaseName()
+{
+    CurObject().nId = pSpuBaseName->Child().Result_Type().Id();
+
+    static StreamStr aBaseName(100);
+    aBaseName.seekp(0);
+    pSpuBaseName->Child().Result_Type().Get_Text( aBaseName, Env().AryGate() );
+
+    Env().Event_Class_FinishedBase(aBaseName.c_str());
+}
+
+void
+PE_Base::On_startOfNext_public(const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(inName);
+
+    CurObject().eProtection = ary::cpp::PROTECT_public;
+}
+
+void
+PE_Base::On_startOfNext_protected(const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(inName);
+
+    CurObject().eProtection = ary::cpp::PROTECT_protected;
+}
+
+void
+PE_Base::On_startOfNext_private(const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(inName);
+
+    CurObject().eProtection = ary::cpp::PROTECT_private;
+}
+
+void
+PE_Base::On_startOfNext_virtual(const char *)
+{
+    SetTokenResult(done, stay);
+
+    CurObject().eVirtuality = ary::cpp::VIRTUAL_virtual;
+}
+
+void
+PE_Base::On_startOfNext_Identifier(const char * )
+{
+    pSpuBaseName->Push(not_done);
+}
+
+void
+PE_Base::On_startOfNext_DoubleColon(const char *)
+{
+    pSpuBaseName->Push(not_done);
+}
+
+void
+PE_Base::On_inName_Identifier(const char * )
+{
+    pSpuBaseName->Push(not_done);
+}
+
+void
+PE_Base::On_inName_virtual(const char *)
+{
+    SetTokenResult(done, stay);
+
+    CurObject().eVirtuality = ary::cpp::VIRTUAL_virtual;
+}
+
+void
+PE_Base::On_inName_DoubleColon(const char *)
+{
+    pSpuBaseName->Push(not_done);
+}
+
+void
+PE_Base::On_inName_Comma(const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(startOfNext);
+
+    aBaseIds.push_back( aNullBase_ );
+}
+
+void
+PE_Base::On_inName_SwBracket_Left(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+
+}   // namespace cpp
+
+
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_base.hxx b/autodoc/source/parser/cpp/pe_base.hxx
new file mode 100644
index 000000000000..0a39160b6a19
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_base.hxx
@@ -0,0 +1,126 @@
+/* -*- 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 ADC_CPP_PE_BASE_HXX
+#define ADC_CPP_PE_BASE_HXX
+
+// BASE CLASSES
+#include "cpp_pe.hxx"
+// USED SERVICES
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_slntry.hxx>
+
+
+
+namespace cpp
+{
+
+class PE_Type;
+
+class PE_Base : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        startOfNext,
+        inName,
+        size_of_states
+    };
+
+    typedef ary::cpp::List_Bases        BaseList;
+    typedef ary::cpp::S_Classes_Base    Base;
+
+                        PE_Base(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Base();
+
+    const BaseList &    Result_BaseIds() const;
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+  private:
+    typedef SubPe< PE_Base, PE_Type >           SP_Type;
+    typedef SubPeUse< PE_Base, PE_Type>         SPU_BaseName;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError( const char *);
+
+    void                SpReturn_BaseName();
+
+    void                On_startOfNext_Identifier(const char *);
+    void                On_startOfNext_public(const char *);
+    void                On_startOfNext_protected(const char *);
+    void                On_startOfNext_private(const char *);
+    void                On_startOfNext_virtual(const char *);
+    void                On_startOfNext_DoubleColon(const char *);
+
+    void                On_inName_Identifier(const char *);
+    void                On_inName_virtual(const char *);
+    void                On_inName_SwBracket_Left(const char *);
+    void                On_inName_DoubleColon(const char *);
+    void                On_inName_Comma(const char *);
+
+    Base &              CurObject();
+
+    // DATA
+    Dyn< PeStatusArray<PE_Base> >
+                        pStati;
+
+    Dyn<SP_Type>        pSpType;            /// till "{" incl.
+    Dyn<SPU_BaseName>   pSpuBaseName;
+
+    BaseList            aBaseIds;
+};
+
+
+
+// IMPLEMENTATION
+
+inline const PE_Base::BaseList &
+PE_Base::Result_BaseIds() const
+    { return aBaseIds; }
+
+
+inline PE_Base::Base &
+PE_Base::CurObject()
+    { return aBaseIds.back(); }
+
+
+
+
+
+}   // namespace cpp
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_class.cxx b/autodoc/source/parser/cpp/pe_class.cxx
new file mode 100644
index 000000000000..1b4910aff9be
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_class.cxx
@@ -0,0 +1,496 @@
+/* -*- 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 <precomp.h>
+#include "pe_class.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <all_toks.hxx>
+#include "pe_base.hxx"
+#include "pe_defs.hxx"
+#include "pe_enum.hxx"
+#include "pe_tydef.hxx"
+#include "pe_vafu.hxx"
+#include "pe_ignor.hxx"
+
+
+namespace cpp {
+
+// using ary::Cid;
+
+PE_Class::PE_Class(Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Class> ),
+        // pSpBase,
+        // pSpTypedef,
+        // pSpVarFunc,
+        // pSpIgnore,
+        // pSpuBase,
+        // pSpuTypedef,
+        // pSpuVarFunc,
+        // pSpuUsing,
+        // pSpuIgnoreFailure,
+        // sLocalName,
+        eClassKey(ary::cpp::CK_class),
+        pCurObject(0),
+        // aBases,
+        eResult_KindOf(is_declaration)
+{
+    Setup_StatusFunctions();
+
+    pSpBase     = new SP_Base(*this);
+    pSpTypedef  = new SP_Typedef(*this);
+    pSpVarFunc  = new SP_VarFunc(*this);
+    pSpIgnore   = new SP_Ignore(*this);
+    pSpDefs     = new SP_Defines(*this);
+
+    pSpuBase    = new SPU_Base(*pSpBase, 0, &PE_Class::SpReturn_Base);
+    pSpuTypedef = new SPU_Typedef(*pSpTypedef, 0, 0);
+    pSpuVarFunc = new SPU_VarFunc(*pSpVarFunc, 0, 0);
+
+    pSpuTemplate= new SPU_Ignore(*pSpIgnore, 0, 0);
+    pSpuUsing   = new SPU_Ignore(*pSpIgnore, 0, 0);
+    pSpuIgnoreFailure
+                = new SPU_Ignore(*pSpIgnore, 0, 0);
+    pSpuDefs    = new SPU_Defines(*pSpDefs, 0, 0);
+}
+
+
+PE_Class::~PE_Class()
+{
+}
+
+void
+PE_Class::Call_Handler( const cpp::Token &  i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+Cpp_PE *
+PE_Class::Handle_ChildFailure()
+{
+    SetCurSPU(pSpuIgnoreFailure.Ptr());
+    return &pSpuIgnoreFailure->Child();
+}
+
+void
+PE_Class::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Class>::F_Tok   F_Tok;
+
+    static F_Tok stateF_start[] =           { &PE_Class::On_start_class,
+                                              &PE_Class::On_start_struct,
+                                              &PE_Class::On_start_union };
+    static INT16 stateT_start[] =           { Tid_class,
+                                              Tid_struct,
+                                              Tid_union };
+
+    static F_Tok stateF_expectName[] =      { &PE_Class::On_expectName_Identifier,
+                                              &PE_Class::On_expectName_SwBracket_Left,
+                                              &PE_Class::On_expectName_Colon
+                                            };
+    static INT16 stateT_expectName[] =      { Tid_Identifier,
+                                              Tid_SwBracket_Left,
+                                              Tid_Colon
+                                            };
+
+    static F_Tok stateF_gotName[] =         { &PE_Class::On_gotName_SwBracket_Left,
+                                              &PE_Class::On_gotName_Semicolon,
+                                              &PE_Class::On_gotName_Colon };
+    static INT16 stateT_gotName[] =         { Tid_SwBracket_Left,
+                                              Tid_Semicolon,
+                                              Tid_Colon };
+
+    static F_Tok stateF_bodyStd[] =         { &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_ClassKey,
+                                              &PE_Class::On_bodyStd_ClassKey,
+                                              &PE_Class::On_bodyStd_ClassKey,
+
+                                              &PE_Class::On_bodyStd_enum,
+                                              &PE_Class::On_bodyStd_typedef,
+                                              &PE_Class::On_bodyStd_public,
+                                              &PE_Class::On_bodyStd_protected,
+                                              &PE_Class::On_bodyStd_private,
+
+                                              &PE_Class::On_bodyStd_template,
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_friend,
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_VarFunc,
+
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_VarFunc,
+
+                                              &PE_Class::On_bodyStd_using,
+                                              &PE_Class::On_bodyStd_SwBracket_Right,
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_DefineName,
+                                              &PE_Class::On_bodyStd_MacroName,
+
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_VarFunc,
+                                              &PE_Class::On_bodyStd_VarFunc, };
+
+    static INT16 stateT_bodyStd[] =         { Tid_Identifier,
+                                              Tid_operator,
+                                              Tid_class,
+                                              Tid_struct,
+                                              Tid_union,
+
+                                              Tid_enum,
+                                              Tid_typedef,
+                                              Tid_public,
+                                              Tid_protected,
+                                              Tid_private,
+
+                                              Tid_template,
+                                              Tid_virtual,
+                                              Tid_friend,
+                                              Tid_Tilde,
+                                              Tid_const,
+
+                                              Tid_volatile,
+                                              Tid_static,
+                                              Tid_mutable,
+                                                Tid_inline,
+                                              Tid_explicit,
+
+                                              Tid_using,
+                                              Tid_SwBracket_Right,
+                                              Tid_DoubleColon,
+                                              Tid_typename,
+                                              Tid_DefineName,
+
+                                              Tid_MacroName,
+                                              Tid_BuiltInType,
+                                              Tid_TypeSpecializer };
+
+                                              static F_Tok stateF_inProtection[] =  { &PE_Class::On_inProtection_Colon };
+    static INT16 stateT_inProtection[] =    { Tid_Colon };
+
+    static F_Tok stateF_afterDecl[] =       { &PE_Class::On_afterDecl_Semicolon };
+    static INT16 stateT_afterDecl[] =       { Tid_Semicolon };
+
+    SEMPARSE_CREATE_STATUS(PE_Class, start, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Class, expectName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Class, gotName, On_gotName_Return2Type);
+    SEMPARSE_CREATE_STATUS(PE_Class, bodyStd, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Class, inProtection, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Class, afterDecl, On_afterDecl_Return2Type);
+
+}
+
+void
+PE_Class::InitData()
+{
+    pStati->SetCur(start);
+    sLocalName.clear();
+    eClassKey = ary::cpp::CK_class;
+    pCurObject = 0;
+    csv::erase_container(aBases);
+    eResult_KindOf = is_declaration;
+}
+
+void
+PE_Class::TransferData()
+{
+    pStati->SetCur(size_of_states);
+}
+
+void
+PE_Class::Hdl_SyntaxError( const char * i_sText)
+{
+    if ( *i_sText == ';' )
+    {
+         Cerr() << Env().CurFileName() << ", line "
+                  << Env().LineCount()
+                  << ": Sourcecode warning: ';' as a toplevel declaration is deprecated."
+                  << Endl();
+        SetTokenResult(done,stay);
+        return;
+    }
+
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_Class::Init_CurObject()
+{
+    // KORR_FUTURE
+    //   This will have to be done before parsing base classes, because of
+    //   possible inline documentation for base classes.
+    pCurObject = & Env().AryGate().Ces().Store_Class( Env().Context(), sLocalName, eClassKey );
+
+      for ( PE_Base::BaseList::const_iterator it = aBases.begin();
+          it !=  aBases.end();
+          ++it )
+    {
+        pCurObject->Add_BaseClass( *it );
+    }  // end for
+
+    Dyn< StringVector >
+            pTplParams( Env().Get_CurTemplateParameters() );
+    if ( pTplParams )
+    {
+          for ( StringVector::const_iterator it = pTplParams->begin();
+              it !=  pTplParams->end();
+              ++it )
+        {
+            pCurObject->Add_TemplateParameterType( *it, ary::cpp::Type_id(0) );
+        }  // end for
+    }
+}
+
+void
+PE_Class::SpReturn_Base()
+{
+    aBases = pSpuBase->Child().Result_BaseIds();
+    pStati->SetCur(gotName);
+}
+
+void
+PE_Class::On_start_class( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expectName);
+    eClassKey = ary::cpp::CK_class;
+}
+
+void
+PE_Class::On_start_struct( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expectName);
+    eClassKey = ary::cpp::CK_struct;
+}
+
+void
+PE_Class::On_start_union( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expectName);
+    eClassKey = ary::cpp::CK_union;
+}
+
+void
+PE_Class::On_expectName_Identifier( const char * i_sText )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(gotName);
+    sLocalName = i_sText;
+}
+
+void
+PE_Class::On_expectName_SwBracket_Left( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(bodyStd);
+
+    sLocalName = "";
+    Init_CurObject();
+    sLocalName = pCurObject->LocalName();
+
+    Env().OpenClass(*pCurObject);
+}
+
+void
+PE_Class::On_expectName_Colon( const char * )
+{
+    pStati->SetCur(gotName);
+    sLocalName = "";
+
+    pSpuBase->Push(done);
+}
+
+void
+PE_Class::On_gotName_SwBracket_Left( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(bodyStd);
+
+    Init_CurObject();
+    if ( sLocalName.empty() )
+        sLocalName = pCurObject->LocalName();
+
+    Env().OpenClass(*pCurObject);
+}
+
+void
+PE_Class::On_gotName_Semicolon( const char * )
+{
+    SetTokenResult(not_done, pop_success);
+
+    eResult_KindOf = is_predeclaration;
+}
+
+void
+PE_Class::On_gotName_Colon( const char * )
+{
+    pSpuBase->Push(done);
+}
+
+void
+PE_Class::On_gotName_Return2Type( const char * )
+{
+    SetTokenResult(not_done, pop_success);
+
+    eResult_KindOf = is_qualified_typename;
+}
+
+void
+PE_Class::On_bodyStd_VarFunc( const char * )
+{
+    pSpuVarFunc->Push(not_done);
+}
+
+void
+PE_Class::On_bodyStd_ClassKey( const char * )
+{
+    pSpuVarFunc->Push(not_done);        // This is correct,
+                                        //   classes are parsed via PE_Type.
+}
+
+void
+PE_Class::On_bodyStd_enum( const char * )
+{
+    pSpuVarFunc->Push(not_done);        // This is correct,
+                                        //   enums are parsed via PE_Type.
+}
+
+void
+PE_Class::On_bodyStd_typedef( const char * )
+{
+    pSpuTypedef->Push(not_done);
+}
+
+void
+PE_Class::On_bodyStd_public( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(inProtection);
+
+    Env().SetCurProtection(ary::cpp::PROTECT_public);
+}
+
+void
+PE_Class::On_bodyStd_protected( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(inProtection);
+
+    Env().SetCurProtection(ary::cpp::PROTECT_protected);
+}
+
+void
+PE_Class::On_bodyStd_private( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(inProtection);
+
+    Env().SetCurProtection(ary::cpp::PROTECT_private);
+}
+
+void
+PE_Class::On_bodyStd_template( const char * )
+{
+    pSpuTemplate->Push(done);
+}
+
+void
+PE_Class::On_bodyStd_friend( const char * )
+{
+    // KORR_FUTURE
+    pSpuUsing->Push(done);
+}
+
+void
+PE_Class::On_bodyStd_using( const char * )
+{
+    pSpuUsing->Push(done);
+}
+
+void
+PE_Class::On_bodyStd_SwBracket_Right( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(afterDecl);
+
+    Env().CloseClass();
+}
+
+void
+PE_Class::On_bodyStd_DefineName(const char * )
+{
+    pSpuDefs->Push(not_done);
+}
+
+void
+PE_Class::On_bodyStd_MacroName(const char * )
+{
+    pSpuDefs->Push(not_done);
+}
+
+
+void
+PE_Class::On_inProtection_Colon( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(bodyStd);
+}
+
+void
+PE_Class::On_afterDecl_Semicolon( const char * )
+{
+    SetTokenResult(not_done, pop_success);
+    eResult_KindOf = is_declaration;
+}
+
+void
+PE_Class::On_afterDecl_Return2Type( const char * )
+{
+    SetTokenResult(not_done, pop_success);
+    eResult_KindOf = is_implicit_declaration;
+}
+
+
+}   // namespace cpp
+
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_class.hxx b/autodoc/source/parser/cpp/pe_class.hxx
new file mode 100644
index 000000000000..d94123a26265
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_class.hxx
@@ -0,0 +1,255 @@
+/* -*- 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 ADC_CPP_PE_CLASS_HXX
+#define ADC_CPP_PE_CLASS_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // OTHER
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_slntry.hxx>
+#include "all_toks.hxx"
+
+namespace ary
+{
+namespace cpp
+{
+    class Class;
+}
+}
+
+
+namespace cpp
+{
+
+
+using ary::cpp::E_Protection;
+using ary::cpp::E_Virtuality;
+
+
+class PE_Base;
+class PE_Enum;
+class PE_Typedef;
+class PE_VarFunc;
+class PE_Ignore;
+class PE_Defines;
+
+
+class PE_Class : public cpp::Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        start,              /// before class, struct or union
+        expectName,         /// after class, struct or union
+        gotName,            /// after name, before : or {
+        bodyStd,            /// after {
+        inProtection,       /// after public, protected or private and before ":"
+        afterDecl,          /// after ending }
+        size_of_states
+    };
+
+    enum E_KindOfResult
+    {
+        is_declaration,             // normal
+        is_implicit_declaration,    // like in: class Abc { public int n; } aAbc;
+        is_predeclaration,          // like:    class Abc;
+        is_qualified_typename       // like in: class Abc * fx();
+
+    };
+
+                        PE_Class(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Class();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+    virtual Cpp_PE *    Handle_ChildFailure();
+
+    E_KindOfResult      Result_KindOf() const;
+    const String  &     Result_LocalName() const;
+    const String  &     Result_FirstNameSegment() const;
+
+  private:
+    typedef SubPe< PE_Class, PE_Base >          SP_Base;
+//  typedef SubPe< PE_Class, PE_Enum>           SP_Enum;
+    typedef SubPe< PE_Class, PE_Typedef>        SP_Typedef;
+    typedef SubPe< PE_Class, PE_VarFunc>        SP_VarFunc;
+    typedef SubPe< PE_Class, PE_Ignore >        SP_Ignore;
+    typedef SubPe< PE_Class, PE_Defines>        SP_Defines;
+
+    typedef SubPeUse< PE_Class, PE_Base>        SPU_Base;
+//  typedef SubPeUse< PE_Class, PE_Enum>            SPU_Enum;
+    typedef SubPeUse< PE_Class, PE_Typedef>     SPU_Typedef;
+    typedef SubPeUse< PE_Class, PE_VarFunc>     SPU_VarFunc;
+    typedef SubPeUse< PE_Class, PE_Ignore>      SPU_Ignore;
+    typedef SubPeUse< PE_Class, PE_Defines>     SPU_Defines;
+
+    typedef ary::cpp::List_Bases                BaseList;
+    typedef ary::cpp::S_Classes_Base            Base;
+    typedef ary::cpp::E_Protection              E_Protection;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError( const char *);
+    void                Init_CurObject();
+
+    void                SpReturn_Base();
+
+    void                On_start_class( const char * );
+    void                On_start_struct( const char * );
+    void                On_start_union( const char * );
+
+    void                On_expectName_Identifier( const char * );
+    void                On_expectName_SwBracket_Left( const char * );
+    void                On_expectName_Colon( const char * );
+
+    void                On_gotName_SwBracket_Left( const char * );
+    void                On_gotName_Semicolon( const char * );
+    void                On_gotName_Colon( const char * );
+    void                On_gotName_Return2Type( const char * );
+
+    void                On_bodyStd_VarFunc( const char * );
+    void                On_bodyStd_ClassKey( const char * );
+    void                On_bodyStd_enum( const char * );
+    void                On_bodyStd_typedef( const char * );
+    void                On_bodyStd_public( const char * );
+    void                On_bodyStd_protected( const char * );
+    void                On_bodyStd_private( const char * );
+    void                On_bodyStd_template( const char * );
+    void                On_bodyStd_friend( const char * );
+    void                On_bodyStd_using( const char * );
+    void                On_bodyStd_SwBracket_Right( const char * );
+    void                On_bodyStd_DefineName(const char * );
+    void                On_bodyStd_MacroName(const char * );
+
+    void                On_inProtection_Colon( const char * );
+
+    void                On_afterDecl_Semicolon( const char * );
+    void                On_afterDecl_Return2Type( const char * );
+
+    // DATA
+    Dyn< PeStatusArray<PE_Class> >
+                        pStati;
+
+    Dyn<SP_Base>        pSpBase;
+//  Dyn<SP_Enum>        pSpEnum;
+    Dyn<SP_Typedef>     pSpTypedef;
+    Dyn<SP_VarFunc>     pSpVarFunc;
+    Dyn<SP_Ignore>      pSpIgnore;
+    Dyn<SP_Defines>     pSpDefs;
+
+    Dyn<SPU_Base>       pSpuBase;
+//  Dyn<SPU_Enum>       pSpuEnum;
+    Dyn<SPU_Typedef>    pSpuTypedef;
+    Dyn<SPU_VarFunc>    pSpuVarFunc;
+
+    Dyn<SPU_Ignore>     pSpuTemplate;
+    Dyn<SPU_Ignore>     pSpuUsing;
+    Dyn<SPU_Ignore>     pSpuIgnoreFailure;
+    Dyn<SPU_Defines>    pSpuDefs;
+
+
+
+    String              sLocalName;
+    ary::cpp::E_ClassKey
+                        eClassKey;
+    ary::cpp::Class *   pCurObject;
+    BaseList            aBases;
+
+    E_KindOfResult      eResult_KindOf;
+};
+
+
+
+// IMPLEMENTATION
+
+inline PE_Class::E_KindOfResult
+PE_Class::Result_KindOf() const
+{
+    return eResult_KindOf;
+}
+
+inline const String  &
+PE_Class::Result_LocalName() const
+{
+    return sLocalName;
+}
+
+inline const String  &
+PE_Class::Result_FirstNameSegment() const
+{
+    return sLocalName;
+}
+
+
+
+
+}   // namespace cpp
+
+
+/* // Branches
+
+class struct union
+    -> Class
+    -> Predeclaration
+
+typedef
+    -> Typedef
+
+enum
+    -> Enum
+
+TypeDeclaration
+    -> Function In Class
+    -> Variable
+
+public, protected, private
+    -> Protection declaration
+
+friend
+    ->  Friend Class
+    ->  Friend Function
+
+virtual
+    -> Function In Class
+
+using
+    -> Using Declaration
+*/
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_defs.cxx b/autodoc/source/parser/cpp/pe_defs.cxx
new file mode 100644
index 000000000000..d599ea9de1eb
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_defs.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_defs.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_define.hxx>
+#include <ary/cpp/c_macro.hxx>
+#include <ary/cpp/cp_def.hxx>
+#include "all_toks.hxx"
+
+
+namespace cpp
+{
+
+
+PE_Defines::PE_Defines( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Defines> ),
+        // sName,
+        // aParameters,
+        // sDefinition,
+        bIsMacro(false)
+{
+    Setup_StatusFunctions();
+}
+
+
+PE_Defines::~PE_Defines()
+{
+}
+
+void
+PE_Defines::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Defines::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Defines>::F_Tok F_Tok;
+    static F_Tok stateF_expectName[] =      { &PE_Defines::On_expectName_DefineName,
+                                              &PE_Defines::On_expectName_MacroName
+                                            };
+    static INT16 stateT_expectName[] =      { Tid_DefineName,
+                                              Tid_MacroName
+                                            };
+
+    static F_Tok stateF_gotDefineName[] =   { &PE_Defines::On_gotDefineName_PreProDefinition };
+    static INT16 stateT_gotDefineName[] =   { Tid_PreProDefinition };
+
+    static F_Tok stateF_expectMacroParameters[] =
+                                            { &PE_Defines::On_expectMacroParameters_MacroParameter,
+                                              &PE_Defines::On_expectMacroParameters_PreProDefinition
+                                            };
+    static INT16 stateT_expectMacroParameters[] =
+                                               { Tid_MacroParameter,
+                                              Tid_PreProDefinition
+                                            };
+
+    SEMPARSE_CREATE_STATUS(PE_Defines, expectName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Defines, gotDefineName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Defines, expectMacroParameters, Hdl_SyntaxError);
+}
+
+void
+PE_Defines::InitData()
+{
+    pStati->SetCur(expectName);
+
+    sName.clear();
+    csv::erase_container( aParameters );
+    csv::erase_container( aDefinition );
+    bIsMacro = false;
+}
+
+void
+PE_Defines::TransferData()
+{
+    if (NOT bIsMacro)
+    {
+        if (aDefinition.empty() OR aDefinition.front().empty())
+            return;
+
+        ary::cpp::Define &
+            rNew = Env().AryGate().Defs().Store_Define(
+                            Env().Context(), sName, aDefinition );
+        Env().Event_Store_CppDefinition(rNew);
+    }
+    else
+    {
+        ary::cpp::Macro &
+            rNew = Env().AryGate().Defs().Store_Macro(
+                            Env().Context(), sName, aParameters, aDefinition );
+        Env().Event_Store_CppDefinition(rNew);
+    }
+    pStati->SetCur(size_of_states);
+}
+
+void
+PE_Defines::Hdl_SyntaxError( const char * i_sText)
+{
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_Defines::On_expectName_DefineName( const char * i_sText )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(gotDefineName);
+
+    sName = i_sText;
+    bIsMacro = false;
+}
+
+void
+PE_Defines::On_expectName_MacroName( const char * i_sText )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expectMacroParameters);
+
+    sName = i_sText;
+    bIsMacro = true;
+}
+
+void
+PE_Defines::On_gotDefineName_PreProDefinition( const char * i_sText )
+{
+    SetTokenResult(done, pop_success);
+
+    aDefinition.push_back( String (i_sText) );
+}
+
+void
+PE_Defines::On_expectMacroParameters_MacroParameter( const char * i_sText )
+{
+    SetTokenResult(done, stay);
+    aParameters.push_back( String (i_sText) );
+}
+
+void
+PE_Defines::On_expectMacroParameters_PreProDefinition( const char * i_sText )
+{
+    SetTokenResult(done, pop_success);
+
+    aDefinition.push_back( String (i_sText) );
+}
+
+
+}   // namespace cpp
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_defs.hxx b/autodoc/source/parser/cpp/pe_defs.hxx
new file mode 100644
index 000000000000..955dadef7828
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_defs.hxx
@@ -0,0 +1,96 @@
+/* -*- 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 ADC_CPP_PE_DEFS_HXX
+#define ADC_CPP_PE_DEFS_HXX
+
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+    // PARAMETERS
+
+
+namespace cpp
+{
+
+
+
+class PE_Defines : public cpp::Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        expectName,
+        gotDefineName,
+        expectMacroParameters,
+        size_of_states
+    };
+
+                        PE_Defines(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Defines();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+  private:
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError( const char *);
+
+    void                On_expectName_DefineName( const char * );
+    void                On_expectName_MacroName( const char * );
+
+    void                On_gotDefineName_PreProDefinition( const char * );
+
+    void                On_expectMacroParameters_MacroParameter( const char * );
+    void                On_expectMacroParameters_PreProDefinition( const char * );
+
+    // DATA
+    Dyn< PeStatusArray<PE_Defines> >
+                        pStati;
+
+    String              sName;
+    StringVector        aParameters;
+    StringVector        aDefinition;
+    bool                bIsMacro;
+};
+
+
+
+}   //namespace cpp
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_enum.cxx b/autodoc/source/parser/cpp/pe_enum.cxx
new file mode 100644
index 000000000000..b56ffc96380b
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_enum.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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_enum.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_enum.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <all_toks.hxx>
+#include "pe_enval.hxx"
+
+
+namespace cpp {
+
+
+PE_Enum::PE_Enum(Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Enum> ),
+        // pSpValue,
+        // pSpuValue,
+        // sLocalName,
+        pCurObject(0),
+        eResult_KindOf(is_declaration)
+{
+    Setup_StatusFunctions();
+
+    pSpValue    = new SP_EnumValue(*this);
+    pSpuValue   = new SPU_EnumValue(*pSpValue, 0, 0);
+}
+
+
+PE_Enum::~PE_Enum()
+{
+}
+
+void
+PE_Enum::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Enum::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Enum>::F_Tok    F_Tok;
+    static F_Tok stateF_expectName[] =      { &PE_Enum::On_expectName_Identifier,
+                                              &PE_Enum::On_expectName_SwBracket_Left
+                                            };
+    static INT16 stateT_expectName[] =      { Tid_Identifier,
+                                              Tid_SwBracket_Left
+                                            };
+
+    static F_Tok stateF_gotName[] =         { &PE_Enum::On_gotName_SwBracket_Left };
+    static INT16 stateT_gotName[] =         { Tid_SwBracket_Left };
+
+    static F_Tok stateF_bodyStd[] =         { &PE_Enum::On_bodyStd_Identifier,
+                                              &PE_Enum::On_bodyStd_SwBracket_Right };
+    static INT16 stateT_bodyStd[] =         { Tid_Identifier,
+                                              Tid_SwBracket_Right };
+
+    static F_Tok stateF_afterBlock[] =      { &PE_Enum::On_afterBlock_Semicolon };
+    static INT16 stateT_afterBlock[] =      { Tid_Semicolon };
+
+    SEMPARSE_CREATE_STATUS(PE_Enum, expectName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Enum, gotName, On_gotName_Return2Type);
+    SEMPARSE_CREATE_STATUS(PE_Enum, bodyStd, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Enum, afterBlock, On_afterBlock_Return2Type);
+}
+
+void
+PE_Enum::InitData()
+{
+    pStati->SetCur(expectName);
+    pCurObject = 0;
+    sLocalName.clear();
+    eResult_KindOf = is_declaration;
+}
+
+void
+PE_Enum::TransferData()
+{
+    pStati->SetCur(size_of_states);
+}
+
+void
+PE_Enum::Hdl_SyntaxError( const char * i_sText)
+{
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_Enum::On_expectName_Identifier( const char * i_sText )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(gotName);
+
+    sLocalName = i_sText;
+    pCurObject = & Env().AryGate().Ces().Store_Enum( Env().Context(), sLocalName );
+}
+
+void
+PE_Enum::On_expectName_SwBracket_Left( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(bodyStd);
+
+    sLocalName = "";
+    pCurObject = & Env().AryGate().Ces().Store_Enum( Env().Context(), sLocalName );
+    sLocalName = pCurObject->LocalName();
+
+    Env().OpenEnum(*pCurObject);
+}
+
+void
+PE_Enum::On_gotName_SwBracket_Left( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(bodyStd);
+    Env().OpenEnum(*pCurObject);
+}
+
+void
+PE_Enum::On_gotName_Return2Type( const char * )
+{
+    SetTokenResult(not_done, pop_success);
+
+    eResult_KindOf = is_qualified_typename;
+}
+
+void
+PE_Enum::On_bodyStd_Identifier( const char * )
+{
+    pSpuValue->Push(not_done);
+}
+
+void
+PE_Enum::On_bodyStd_SwBracket_Right( const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(afterBlock);
+
+    Env().CloseEnum();
+}
+
+void
+PE_Enum::On_afterBlock_Semicolon( const char * )
+{
+    SetTokenResult(not_done, pop_success);
+    eResult_KindOf = is_declaration;
+}
+
+void
+PE_Enum::On_afterBlock_Return2Type( const char * )
+{
+    SetTokenResult(not_done, pop_success);
+    eResult_KindOf = is_implicit_declaration;
+}
+
+}   // namespace cpp
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_enum.hxx b/autodoc/source/parser/cpp/pe_enum.hxx
new file mode 100644
index 000000000000..3f1a38e022bf
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_enum.hxx
@@ -0,0 +1,134 @@
+/* -*- 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 ADC_CPP_PE_ENUM_HXX
+#define ADC_CPP_PE_ENUM_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+
+namespace cpp {
+
+
+class PE_EnumValue;
+
+class PE_Enum : public cpp::Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        expectName,         /// after "enum"
+        gotName,            /// after name, before : or {
+        bodyStd,            /// after {
+        afterBlock,         /// after ending }
+        size_of_states
+    };
+
+    enum E_KindOfResult
+    {
+        is_declaration,             // normal
+        is_implicit_declaration,    // like in: enum Abc { rot, gelb, blau } aAbc;
+        is_qualified_typename       // like in: enum Abc * fx();
+
+    };
+                        PE_Enum(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Enum();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+    E_KindOfResult      Result_KindOf() const;
+    const String  &     Result_LocalName() const;
+    const String  &     Result_FirstNameSegment() const;
+
+  private:
+    typedef SubPe< PE_Enum, PE_EnumValue >      SP_EnumValue;
+    typedef SubPeUse< PE_Enum, PE_EnumValue>    SPU_EnumValue;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError( const char *);
+
+    void                On_expectName_Identifier( const char * );
+    void                On_expectName_SwBracket_Left( const char * );
+
+    void                On_gotName_SwBracket_Left( const char * );
+    void                On_gotName_Return2Type( const char * );
+
+    void                On_bodyStd_Identifier( const char * );
+    void                On_bodyStd_SwBracket_Right( const char * );
+
+    void                On_afterBlock_Semicolon( const char * );
+    void                On_afterBlock_Return2Type( const char * );
+
+    // DATA
+    Dyn< PeStatusArray<PE_Enum> >
+                        pStati;
+    Dyn<SP_EnumValue>   pSpValue;
+    Dyn<SPU_EnumValue>  pSpuValue;
+
+    String              sLocalName;
+    ary::cpp::Enum *    pCurObject;
+
+    E_KindOfResult      eResult_KindOf;
+};
+
+
+
+// IMPLEMENTATION
+inline PE_Enum::E_KindOfResult
+PE_Enum::Result_KindOf() const
+{
+    return eResult_KindOf;
+}
+
+inline const String  &
+PE_Enum::Result_LocalName() const
+{
+    return sLocalName;
+}
+
+inline const String  &
+PE_Enum::Result_FirstNameSegment() const
+{
+    return sLocalName;
+}
+
+
+}   // namespace cpp
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_enval.cxx b/autodoc/source/parser/cpp/pe_enval.cxx
new file mode 100644
index 000000000000..0480047fb10b
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_enval.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_enval.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include "pe_expr.hxx"
+
+
+
+namespace cpp {
+
+
+PE_EnumValue::PE_EnumValue( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_EnumValue> )
+        // pSpExpression,
+        // pSpuInitExpression
+{
+    Setup_StatusFunctions();
+
+    pSpExpression       = new SP_Expression(*this);
+    pSpuInitExpression  = new SPU_Expression(*pSpExpression, 0, &PE_EnumValue::SpReturn_InitExpression);
+}
+
+PE_EnumValue::~PE_EnumValue()
+{
+}
+
+void
+PE_EnumValue::Call_Handler( const cpp::Token &  i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_EnumValue::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_EnumValue>::F_Tok   F_Tok;
+
+    static F_Tok stateF_start[] =           { &PE_EnumValue::On_start_Identifier };
+    static INT16 stateT_start[] =           { Tid_Identifier };
+
+    static F_Tok stateF_afterName[] =       { &PE_EnumValue::On_afterName_SwBracket_Right,
+                                              &PE_EnumValue::On_afterName_Comma,
+                                              &PE_EnumValue::On_afterName_Assign };
+    static INT16 stateT_afterName[] =       { Tid_SwBracket_Right,
+                                              Tid_Comma,
+                                              Tid_Assign };
+
+    static F_Tok stateF_expectFinish[] =    { &PE_EnumValue::On_expectFinish_SwBracket_Right,
+                                              &PE_EnumValue::On_expectFinish_Comma };
+    static INT16 stateT_expectFinish[] =    { Tid_SwBracket_Right,
+                                              Tid_Comma };
+
+    SEMPARSE_CREATE_STATUS(PE_EnumValue, start, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_EnumValue, afterName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_EnumValue, expectFinish, Hdl_SyntaxError);
+}
+
+void
+PE_EnumValue::InitData()
+{
+    pStati->SetCur(start);
+
+    sName.clear();
+    sInitExpression.clear();
+}
+
+void
+PE_EnumValue::TransferData()
+{
+    pStati->SetCur(size_of_states);
+
+    ary::cpp::EnumValue &
+    rEnVal = Env().AryGate().Ces().Store_EnumValue(
+                     Env().Context(), sName, sInitExpression );
+    Env().Event_Store_EnumValue(rEnVal);
+}
+
+void
+PE_EnumValue::Hdl_SyntaxError( const char * i_sText)
+{
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_EnumValue::SpReturn_InitExpression()
+{
+    pStati->SetCur(expectFinish);
+
+    sInitExpression = pSpuInitExpression->Child().Result_Text();
+}
+
+void
+PE_EnumValue::On_start_Identifier(const char * i_sText)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(afterName);
+
+    sName = i_sText;
+}
+
+void
+PE_EnumValue::On_afterName_SwBracket_Right(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_EnumValue::On_afterName_Comma(const char * )
+{
+    SetTokenResult(done, pop_success);
+}
+
+void
+PE_EnumValue::On_afterName_Assign(const char * )
+{
+    pSpuInitExpression->Push(done);
+}
+
+void
+PE_EnumValue::On_expectFinish_SwBracket_Right(const char * )
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_EnumValue::On_expectFinish_Comma(const char * )
+{
+    SetTokenResult(done, pop_success);
+}
+
+
+}   // namespace cpp
+
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_enval.hxx b/autodoc/source/parser/cpp/pe_enval.hxx
new file mode 100644
index 000000000000..5cfdd5f447af
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_enval.hxx
@@ -0,0 +1,101 @@
+/* -*- 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 ADC_CPP_PE_ENVAL_HXX
+#define ADC_CPP_PE_ENVAL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+    // PARAMETERS
+
+
+namespace cpp {
+
+class PE_Expression;
+
+
+class PE_EnumValue : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        start,                      // before name
+        afterName,
+        expectFinish,               // after init-expression
+        size_of_states
+    };
+                        PE_EnumValue(
+                            Cpp_PE *            i_pParent );
+                        ~PE_EnumValue();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+  private:
+    typedef SubPe< PE_EnumValue, PE_Expression >        SP_Expression;
+    typedef SubPeUse< PE_EnumValue, PE_Expression>      SPU_Expression;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError(const char *);
+
+    void                SpReturn_InitExpression();
+
+    void                On_start_Identifier(const char * );
+
+    void                On_afterName_SwBracket_Right(const char * );
+    void                On_afterName_Comma(const char * );
+    void                On_afterName_Assign(const char * );
+
+    void                On_expectFinish_SwBracket_Right(const char * );
+    void                On_expectFinish_Comma(const char * );
+
+    // DATA
+    Dyn< PeStatusArray<PE_EnumValue> >
+                        pStati;
+    Dyn<SP_Expression>  pSpExpression;
+    Dyn<SPU_Expression> pSpuInitExpression;
+
+    String              sName;
+    String              sInitExpression;
+};
+
+
+
+
+}   // namespace cpp
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_expr.cxx b/autodoc/source/parser/cpp/pe_expr.cxx
new file mode 100644
index 000000000000..0594e57077c5
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_expr.cxx
@@ -0,0 +1,179 @@
+/* -*- 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 <precomp.h>
+#include "pe_expr.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+
+
+namespace cpp {
+
+
+
+PE_Expression::PE_Expression( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Expression> ),
+        aResult_Text(100),
+        nBracketCounter(0)
+{
+    Setup_StatusFunctions();
+}
+
+
+PE_Expression::~PE_Expression()
+{
+}
+
+void
+PE_Expression::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Expression::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Expression>::F_Tok  F_Tok;
+
+    static F_Tok stateF_std[] =             { &PE_Expression::On_std_SwBracket_Left,
+                                              &PE_Expression::On_std_SwBracket_Right,
+                                              &PE_Expression::On_std_ArrayBracket_Left,
+                                              &PE_Expression::On_std_ArrayBracket_Right,
+                                              &PE_Expression::On_std_Bracket_Left,
+                                              &PE_Expression::On_std_Bracket_Right,
+                                              &PE_Expression::On_std_Semicolon,
+                                              &PE_Expression::On_std_Comma };
+    static INT16 stateT_std[] =             { Tid_SwBracket_Left,
+                                              Tid_SwBracket_Right,
+                                              Tid_ArrayBracket_Left,
+                                              Tid_ArrayBracket_Right,
+                                              Tid_Bracket_Left,
+                                              Tid_Bracket_Right,
+                                              Tid_Semicolon,
+                                              Tid_Comma };
+
+    SEMPARSE_CREATE_STATUS(PE_Expression, std, On_std_Default);
+}
+
+void
+PE_Expression::InitData()
+{
+    pStati->SetCur(std);
+    aResult_Text.seekp(0);
+    nBracketCounter = 0;
+}
+
+void
+PE_Expression::TransferData()
+{
+    pStati->SetCur(size_of_states);
+    if ( aResult_Text.tellp() > 0)
+        aResult_Text.pop_back(1);
+}
+
+void
+PE_Expression::On_std_Default( const char * i_sText)
+{
+    SetTokenResult(done, stay);
+    aResult_Text << i_sText << " ";
+}
+
+void
+PE_Expression::On_std_SwBracket_Left( const char *)
+{
+    SetTokenResult(done, stay);
+    nBracketCounter++;
+}
+
+void
+PE_Expression::On_std_SwBracket_Right( const char *)
+{
+    nBracketCounter--;
+    if ( nBracketCounter >= 0 )
+        SetTokenResult(done, stay);
+    else
+        SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Expression::On_std_ArrayBracket_Left( const char *)
+{
+    SetTokenResult(done, stay);
+    nBracketCounter++;
+}
+
+void
+PE_Expression::On_std_ArrayBracket_Right( const char *)
+{
+    nBracketCounter--;
+    if ( nBracketCounter >= 0 )
+        SetTokenResult(done, stay);
+    else
+        SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Expression::On_std_Bracket_Left( const char *)
+{
+    SetTokenResult(done, stay);
+    nBracketCounter++;
+}
+
+void
+PE_Expression::On_std_Bracket_Right( const char *)
+{
+    nBracketCounter--;
+    if ( nBracketCounter >= 0 )
+        SetTokenResult(done, stay);
+    else
+        SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Expression::On_std_Semicolon( const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Expression::On_std_Comma( const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+
+}   // namespace cpp
+
+
+
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_expr.hxx b/autodoc/source/parser/cpp/pe_expr.hxx
new file mode 100644
index 000000000000..8c1b5a94af9d
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_expr.hxx
@@ -0,0 +1,107 @@
+/* -*- 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 ADC_CPP_PE_EXPR_HXX
+#define ADC_CPP_PE_EXPR_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+    // PARAMETERS
+
+
+namespace cpp {
+
+
+class PE_Expression : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        std,
+        size_of_states
+    };
+                        PE_Expression(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Expression();
+
+    const char *        Result_Text() const;
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+  private:
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                On_std_Default( const char *);
+
+    void                On_std_SwBracket_Left( const char *);
+    void                On_std_SwBracket_Right( const char *);
+    void                On_std_ArrayBracket_Left( const char *);
+    void                On_std_ArrayBracket_Right( const char *);
+    void                On_std_Bracket_Left( const char *);
+    void                On_std_Bracket_Right( const char *);
+    void                On_std_Semicolon( const char *);
+    void                On_std_Comma( const char *);
+
+    // DATA
+    Dyn< PeStatusArray<PE_Expression> >
+                        pStati;
+
+    csv::StreamStr      aResult_Text;
+
+    intt                nBracketCounter;
+};
+
+
+
+// IMPLEMENTATION
+
+inline const char *
+PE_Expression::Result_Text() const
+{
+    return aResult_Text.c_str();
+}
+
+
+}   // namespace cpp
+
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_file.cxx b/autodoc/source/parser/cpp/pe_file.cxx
new file mode 100644
index 000000000000..6160f97b89b8
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_file.cxx
@@ -0,0 +1,320 @@
+/* -*- 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 <precomp.h>
+#include "pe_file.hxx"
+
+// NOT FULLY DECLARED SERVICES
+#include "pe_defs.hxx"
+#include "pe_enum.hxx"
+#include "pe_namsp.hxx"
+#include "pe_tpltp.hxx"
+#include "pe_tydef.hxx"
+#include "pe_vafu.hxx"
+#include "pe_ignor.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+
+
+namespace cpp
+{
+
+PE_File::PE_File( cpp::PeEnvironment & io_rEnv)
+    :   Cpp_PE(io_rEnv),
+        pEnv(&io_rEnv),
+        pStati( new PeStatusArray<PE_File> ),
+        // pSpNamespace,
+        // pSpTypedef,
+        // pSpVarFunc,
+        // pSpIgnore,
+        // pSpuNamespace,
+        // pSpuClass,
+        // pSpuTypedef,
+        // pSpuVarFunc,
+        // pSpuTemplate,
+        // pSpuUsing,
+        // pSpuIgnoreFailure,
+        bWithinSingleExternC(false)
+{
+    Setup_StatusFunctions();
+
+    pSpNamespace = new SP_Namespace(*this);
+    pSpTypedef   = new SP_Typedef(*this);
+    pSpVarFunc   = new SP_VarFunc(*this);
+    pSpTemplate  = new SP_Template(*this);
+    pSpDefs      = new SP_Defines(*this);
+    pSpIgnore    = new SP_Ignore(*this);
+
+    pSpuNamespace   = new SPU_Namespace(*pSpNamespace, 0, 0);
+    pSpuTypedef     = new SPU_Typedef(*pSpTypedef, 0, 0);
+    pSpuVarFunc     = new SPU_VarFunc(*pSpVarFunc, 0, &PE_File::SpReturn_VarFunc);
+    pSpuTemplate    = new SPU_Template(*pSpTemplate, 0, &PE_File::SpReturn_Template);
+    pSpuDefs        = new SPU_Defines(*pSpDefs, 0, 0);
+    pSpuUsing       = new SPU_Ignore(*pSpIgnore, 0, 0);
+    pSpuIgnoreFailure
+                    = new SPU_Ignore(*pSpIgnore, 0, 0);
+}
+
+PE_File::~PE_File()
+{
+}
+
+void
+PE_File::Call_Handler( const cpp::Token &   i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+Cpp_PE *
+PE_File::Handle_ChildFailure()
+{
+    SetCurSPU(pSpuIgnoreFailure.Ptr());
+    return &pSpuIgnoreFailure->Child();
+}
+
+void
+PE_File::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_File>::F_Tok    F_Tok;
+    static F_Tok stateF_std[] =             { &PE_File::On_std_VarFunc,
+                                              &PE_File::On_std_ClassKey,
+                                              &PE_File::On_std_ClassKey,
+                                              &PE_File::On_std_ClassKey,
+                                              &PE_File::On_std_enum,
+
+                                              &PE_File::On_std_typedef,
+                                              &PE_File::On_std_template,
+                                              &PE_File::On_std_VarFunc,
+                                              &PE_File::On_std_VarFunc,
+                                              &PE_File::On_std_extern,
+
+                                              &PE_File::On_std_VarFunc,
+                                              &PE_File::On_std_VarFunc,
+                                              &PE_File::On_std_VarFunc,
+                                              &PE_File::On_std_namespace,
+                                              &PE_File::On_std_using,
+
+                                              &PE_File::On_std_SwBracketRight,
+                                              &PE_File::On_std_VarFunc,
+                                              &PE_File::On_std_VarFunc,
+                                              &PE_File::On_std_DefineName,
+                                              &PE_File::On_std_MacroName,
+
+                                              &PE_File::On_std_VarFunc,
+                                              &PE_File::On_std_VarFunc };
+
+    static INT16 stateT_std[] =             { Tid_Identifier,
+                                              Tid_class,
+                                              Tid_struct,
+                                              Tid_union,
+                                              Tid_enum,
+
+                                              Tid_typedef,
+                                              Tid_template,
+                                              Tid_const,
+                                              Tid_volatile,
+                                              Tid_extern,
+
+                                              Tid_static,
+                                              Tid_register,
+                                              Tid_inline,
+                                              Tid_namespace,
+                                              Tid_using,
+
+                                              Tid_SwBracket_Right,
+                                              Tid_DoubleColon,
+                                              Tid_typename,
+                                              Tid_DefineName,
+                                              Tid_MacroName,
+
+                                              Tid_BuiltInType,
+                                              Tid_TypeSpecializer };
+
+    static F_Tok stateF_in_extern[] =       { &PE_File::On_in_extern_Constant };
+    static INT16 stateT_in_extern[] =       { Tid_Constant };
+
+    static F_Tok stateF_in_externC[] =      { &PE_File::On_in_externC_SwBracket_Left };
+    static INT16 stateT_in_externC[] =      { Tid_SwBracket_Left };
+
+
+    SEMPARSE_CREATE_STATUS(PE_File, std, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_File, in_extern, On_in_extern_Ignore);
+    SEMPARSE_CREATE_STATUS(PE_File, in_externC, On_in_externC_NoBlock);
+}
+
+void
+PE_File::InitData()
+{
+    pStati->SetCur(std);
+}
+
+void
+PE_File::TransferData()
+{
+    pStati->SetCur(size_of_states);
+}
+
+void
+PE_File::Hdl_SyntaxError( const char * i_sText)
+{
+    if ( *i_sText == ';' )
+    {
+         Cerr() << Env().CurFileName() << ", line "
+                  << Env().LineCount()
+                  << ": Sourcecode warning: ';' as a toplevel declaration is deprecated."
+                  << Endl();
+        SetTokenResult(done,stay);
+        return;
+    }
+
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_File::SpReturn_VarFunc()
+{
+     if (bWithinSingleExternC)
+    {
+        access_Env().CloseBlock();
+         bWithinSingleExternC = false;
+    }
+}
+
+void
+PE_File::SpReturn_Template()
+{
+    access_Env().OpenTemplate( pSpuTemplate->Child().Result_Parameters() );
+}
+
+void
+PE_File::On_std_namespace(const char * )
+{
+    pSpuNamespace->Push(done);
+}
+
+void
+PE_File::On_std_ClassKey(const char * )
+{
+    pSpuVarFunc->Push(not_done);        // This is correct,
+                                        //   classes are parsed via PE_Type.
+}
+
+void
+PE_File::On_std_typedef(const char * )
+{
+    pSpuTypedef->Push(not_done);
+}
+
+void
+PE_File::On_std_enum(const char * )
+{
+    pSpuVarFunc->Push(not_done);        // This is correct,
+                                        //   enums are parsed via PE_Type.
+}
+
+void
+PE_File::On_std_VarFunc(const char * )
+{
+    pSpuVarFunc->Push(not_done);
+}
+
+void
+PE_File::On_std_template(const char * )
+{
+    pSpuTemplate->Push(done);
+}
+
+void
+PE_File::On_std_extern(const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(in_extern);
+}
+
+void
+PE_File::On_std_using(const char * )
+{
+    pSpuUsing->Push(done);
+}
+
+void
+PE_File::On_std_SwBracketRight(const char * )
+{
+    SetTokenResult(done,stay);
+    access_Env().CloseBlock();
+}
+
+void
+PE_File::On_std_DefineName(const char * )
+{
+    pSpuDefs->Push(not_done);
+}
+
+void
+PE_File::On_std_MacroName(const char * )
+{
+    pSpuDefs->Push(not_done);
+}
+
+void
+PE_File::On_in_extern_Constant(const char * )
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(in_externC);
+
+    access_Env().OpenExternC();
+}
+
+void
+PE_File::On_in_extern_Ignore(const char * )
+{
+    SetTokenResult(not_done, stay);
+    pStati->SetCur(std);
+}
+
+void
+PE_File::On_in_externC_SwBracket_Left(const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(std);
+}
+
+void
+PE_File::On_in_externC_NoBlock(const char * )
+{
+    SetTokenResult(not_done, stay);
+    pStati->SetCur(std);
+
+    bWithinSingleExternC = true;
+}
+
+
+}   // namespace cpp
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_file.hxx b/autodoc/source/parser/cpp/pe_file.hxx
new file mode 100644
index 000000000000..7a36f2c6fe9c
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_file.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 ADC_CPP_PE_FILE_HXX
+#define ADC_CPP_PE_FILE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+    // PARAMETERS
+
+
+namespace cpp {
+
+    class PeEnvironment;
+
+    class PE_Namespace;
+    class PE_Enum;
+    class PE_Typedef;
+    class PE_VarFunc;
+    class PE_TemplateTop;
+    class PE_Defines;
+    class PE_Ignore;
+
+class PE_File : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        std,            /// before class, struct or union
+        in_extern,
+        in_externC,
+        size_of_states
+    };
+
+                        PE_File(
+                            PeEnvironment &     io_rEnv );
+                        ~PE_File();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+    virtual Cpp_PE *    Handle_ChildFailure();
+
+  private:
+    typedef SubPe< PE_File, PE_Namespace>   SP_Namespace;
+    typedef SubPe< PE_File, PE_Typedef>     SP_Typedef;
+    typedef SubPe< PE_File, PE_VarFunc>     SP_VarFunc;
+    typedef SubPe< PE_File, PE_TemplateTop> SP_Template;
+    typedef SubPe< PE_File, PE_Defines>     SP_Defines;
+    typedef SubPe< PE_File, PE_Ignore >     SP_Ignore;
+
+    typedef SubPeUse< PE_File, PE_Namespace>    SPU_Namespace;
+    typedef SubPeUse< PE_File, PE_Typedef>      SPU_Typedef;
+    typedef SubPeUse< PE_File, PE_VarFunc>      SPU_VarFunc;
+    typedef SubPeUse< PE_File, PE_TemplateTop>  SPU_Template;
+    typedef SubPeUse< PE_File, PE_Defines>      SPU_Defines;
+    typedef SubPeUse< PE_File, PE_Ignore>       SPU_Ignore;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError( const char *);
+
+    void                SpReturn_VarFunc();
+    void                SpReturn_Template();
+
+    void                On_std_namespace(const char * i_sText);
+    void                On_std_ClassKey(const char * i_sText);
+    void                On_std_typedef(const char * i_sText);
+    void                On_std_enum(const char * i_sText);
+    void                On_std_VarFunc(const char * i_sText);
+    void                On_std_template(const char * i_sText);
+    void                On_std_extern(const char * i_sText);
+    void                On_std_using(const char * i_sText);
+    void                On_std_SwBracketRight(const char * i_sText);
+
+    void                On_std_DefineName(const char * i_sText);
+    void                On_std_MacroName(const char * i_sText);
+
+    void                On_in_extern_Constant(const char * i_sText);
+    void                On_in_extern_Ignore(const char * i_sText);
+    void                On_in_externC_SwBracket_Left(const char * i_sText);
+    void                On_in_externC_NoBlock(const char * i_sText);
+
+    PeEnvironment &     access_Env()            { return *pEnv; }
+
+
+    // DATA
+    PeEnvironment *     pEnv;
+
+    Dyn< PeStatusArray<PE_File> >
+                        pStati;
+
+    Dyn<SP_Namespace>   pSpNamespace;
+    Dyn<SP_Typedef>     pSpTypedef;
+    Dyn<SP_VarFunc>     pSpVarFunc;
+    Dyn<SP_Template>    pSpTemplate;
+    Dyn<SP_Defines>     pSpDefs;
+
+    Dyn<SP_Ignore>      pSpIgnore;
+
+    Dyn<SPU_Namespace>  pSpuNamespace;
+    Dyn<SPU_Typedef>    pSpuTypedef;
+    Dyn<SPU_VarFunc>    pSpuVarFunc;
+    Dyn<SPU_Template>   pSpuTemplate;
+    Dyn<SPU_Defines>    pSpuDefs;
+
+    Dyn<SPU_Ignore>     pSpuUsing;
+    Dyn<SPU_Ignore>     pSpuIgnoreFailure;
+
+    bool                bWithinSingleExternC;   /** After 'extern "C"' without following '{',
+                                                    waiting for the next function or variable to
+                                                    set back to false.
+                                                */
+};
+
+}   // namespace cpp
+
+
+
+/* // Branches
+
+namespace
+    -> Named Namespace declaration
+    -> Unnamed Namespace declaration
+    -> Namespace alias definition
+
+class struct union
+    -> Class
+    -> Predeclaration
+
+typedef
+    -> Typedef
+
+enum
+    -> Enum
+
+extern
+    -> Extern-"C"
+    -> TypeDeclaration
+
+TypeDeclaration
+    -> FunctionDecl
+    -> FunctionDef
+    -> Variable
+
+template
+    -> TemplateClass
+    -> TemplateFunction
+    -> TemplateFunction/Method-Implementation
+    -> TemplatePredeclaration
+
+}
+    -> End of Namespace
+    -> End of Extern-"C"
+
+asm
+    -> AssemblerDeclaration
+
+using
+    -> Using-Declaration
+    -> Using-Directive
+
+*/
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_funct.cxx b/autodoc/source/parser/cpp/pe_funct.cxx
new file mode 100644
index 000000000000..081f369a0c9c
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_funct.cxx
@@ -0,0 +1,612 @@
+/* -*- 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 <precomp.h>
+#include "pe_funct.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_funct.hxx>
+#include <ary/cpp/c_type.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/cpp/cp_type.hxx>
+#include <ary/cpp/inpcontx.hxx>
+#include "pe_type.hxx"
+#include "pe_param.hxx"
+
+
+
+
+namespace cpp
+{
+
+
+inline void
+PE_Function::PerformFinishingPunctuation()
+{
+    SetTokenResult(not_done,pop_success);
+}
+
+
+PE_Function::PE_Function( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Function> ),
+        // pSpParameter,
+        // pSpuParameter,
+        // pSpType,
+        // pSpuException,
+        // pSpuCastOperatorType,
+        nResult(0),
+        bResult_WithImplementation(false),
+        aName(60),
+        eVirtuality(ary::cpp::VIRTUAL_none),
+        eConVol(ary::cpp::CONVOL_none),
+        // aFlags,
+        nReturnType(0),
+        // aParameters
+        // aExceptions,
+        bThrow(false),
+        nBracketCounterInImplementation(0)
+{
+    Setup_StatusFunctions();
+
+    pSpParameter     = new SP_Parameter(*this);
+    pSpType          = new SP_Type(*this);
+
+    pSpuParameter           = new SPU_Parameter(*pSpParameter, 0, &PE_Function::SpReturn_Parameter);
+    pSpuException           = new SPU_Type(*pSpType, 0, &PE_Function::SpReturn_Exception);
+    pSpuCastOperatorType    = new SPU_Type(*pSpType, &PE_Function::SpInit_CastOperatorType, &PE_Function::SpReturn_CastOperatorType);
+}
+
+PE_Function::~PE_Function()
+{
+
+}
+
+void
+PE_Function::Init_Std( const String  &          i_sName,
+                       ary::cpp::Type_id        i_nReturnType,
+                       bool                     i_bVirtual,
+                       ary::cpp::FunctionFlags  i_aFlags )
+{
+    aName << i_sName;
+    eVirtuality = i_bVirtual ? ary::cpp::VIRTUAL_virtual : ary::cpp::VIRTUAL_none;
+    aFlags = i_aFlags;
+    nReturnType = i_nReturnType;
+    pStati->SetCur(afterName);
+}
+
+void
+PE_Function::Init_Ctor( const String  &         i_sName,
+                        ary::cpp::FunctionFlags i_aFlags )
+{
+    aName << i_sName;
+    eVirtuality = ary::cpp::VIRTUAL_none;
+    aFlags = i_aFlags;
+    nReturnType = 0;
+    pStati->SetCur(afterName);
+}
+
+void
+PE_Function::Init_Dtor( const String  &         i_sName,
+                        bool                    i_bVirtual,
+                        ary::cpp::FunctionFlags i_aFlags )
+{
+    aName << "~" << i_sName;
+    eVirtuality = i_bVirtual ? ary::cpp::VIRTUAL_virtual : ary::cpp::VIRTUAL_none;
+    aFlags = i_aFlags;
+    nReturnType = 0;
+    pStati->SetCur(afterName);
+}
+
+void
+PE_Function::Init_CastOperator( bool                    i_bVirtual,
+                                ary::cpp::FunctionFlags i_aFlags )
+{
+    aName << "operator ";
+    eVirtuality = i_bVirtual ? ary::cpp::VIRTUAL_virtual : ary::cpp::VIRTUAL_none;
+    aFlags = i_aFlags;
+    nReturnType = 0;
+    pStati->SetCur(afterCastOperator);
+}
+
+void
+PE_Function::Init_NormalOperator( ary::cpp::Type_id                  i_nReturnType,
+                                  bool                      i_bVirtual,
+                                  ary::cpp::FunctionFlags   i_aFlags )
+{
+    aName << "operator";
+    eVirtuality = i_bVirtual ? ary::cpp::VIRTUAL_virtual : ary::cpp::VIRTUAL_none;
+    aFlags = i_aFlags;
+    nReturnType = i_nReturnType;
+    pStati->SetCur(afterStdOperator);
+}
+
+ary::cpp::Ce_id
+PE_Function::Result_Id() const
+{
+    return nResult;
+}
+
+void
+PE_Function::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Function::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Function>::F_Tok    F_Tok;
+
+    static F_Tok stateF_afterStdOperator[] =
+                                            { &PE_Function::On_afterOperator_Std_Operator,
+                                              &PE_Function::On_afterOperator_Std_LeftBracket,
+                                              &PE_Function::On_afterOperator_Std_LeftBracket,
+                                              &PE_Function::On_afterOperator_Std_Operator,
+                                              &PE_Function::On_afterOperator_Std_Operator,
+                                              &PE_Function::On_afterOperator_Std_Operator,
+                                              &PE_Function::On_afterOperator_Std_Operator,
+                                              &PE_Function::On_afterOperator_Std_Operator,
+                                              &PE_Function::On_afterOperator_Std_Operator };
+    static INT16 stateT_afterStdOperator[] =
+                                            { Tid_Operator,
+                                              Tid_ArrayBracket_Left,
+                                              Tid_Bracket_Left,
+                                              Tid_Comma,
+                                              Tid_Assign,
+                                              Tid_Less,
+                                              Tid_Greater,
+                                              Tid_Asterix,
+                                              Tid_AmpersAnd };
+
+    static F_Tok stateF_afterStdOperatorLeftBracket[] =
+                                            { &PE_Function::On_afterStdOperatorLeftBracket_RightBracket,
+                                              &PE_Function::On_afterStdOperatorLeftBracket_RightBracket };
+    static INT16 stateT_afterStdOperatorLeftBracket[] =
+                                            { Tid_ArrayBracket_Right,
+                                              Tid_Bracket_Right };
+
+    static F_Tok stateF_afterCastOperator[] =
+                                            { &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type,
+                                              &PE_Function::On_afterOperator_Cast_Type };
+    static INT16 stateT_afterCastOperator[] =
+                                            { Tid_Identifier,
+                                              Tid_class,
+                                              Tid_struct,
+                                              Tid_union,
+                                              Tid_enum,
+                                              Tid_const,
+                                              Tid_volatile,
+                                              Tid_DoubleColon,
+                                              Tid_typename,
+                                              Tid_BuiltInType,
+                                              Tid_TypeSpecializer };
+
+    static F_Tok stateF_afterName[] =       { &PE_Function::On_afterName_Bracket_Left };
+    static INT16 stateT_afterName[] =       { Tid_Bracket_Left };
+
+    static F_Tok stateF_expectParameterSeparator[] =
+                                            { &PE_Function::On_expectParameterSeparator_BracketRight,
+                                              &PE_Function::On_expectParameterSeparator_Comma };
+    static INT16 stateT_expectParameterSeparator[] =
+                                            { Tid_Bracket_Right,
+                                              Tid_Comma };
+
+    static F_Tok stateF_afterParameters[] = { &PE_Function::On_afterParameters_const,
+                                              &PE_Function::On_afterParameters_volatile,
+                                              &PE_Function::On_afterParameters_throw,
+                                              &PE_Function::On_afterParameters_SwBracket_Left,
+                                              &PE_Function::On_afterParameters_Semicolon,
+                                              &PE_Function::On_afterParameters_Comma,
+                                              &PE_Function::On_afterParameters_Colon,
+                                              &PE_Function::On_afterParameters_Assign };
+    static INT16 stateT_afterParameters[] = { Tid_const,
+                                              Tid_volatile,
+                                              Tid_throw,
+                                              Tid_SwBracket_Left,
+                                              Tid_Semicolon,
+                                              Tid_Comma,
+                                              Tid_Colon,
+                                              Tid_Assign };
+
+    static F_Tok stateF_afterThrow[] =      { &PE_Function::On_afterThrow_Bracket_Left };
+    static INT16 stateT_afterThrow[] =      { Tid_Bracket_Left };
+
+    static F_Tok stateF_expectExceptionSeparator[] =
+                                            { &PE_Function::On_expectExceptionSeparator_BracketRight,
+                                              &PE_Function::On_expectExceptionSeparator_Comma };
+    static INT16 stateT_expectExceptionSeparator[] =
+                                            { Tid_Bracket_Right,
+                                              Tid_Comma };
+
+    static F_Tok stateF_afterExceptions[] = { &PE_Function::On_afterExceptions_SwBracket_Left,
+                                              &PE_Function::On_afterExceptions_Semicolon,
+                                              &PE_Function::On_afterExceptions_Comma,
+                                              &PE_Function::On_afterExceptions_Colon,
+                                              &PE_Function::On_afterExceptions_Assign };
+    static INT16 stateT_afterExceptions[] = { Tid_SwBracket_Left,
+                                              Tid_Semicolon,
+                                              Tid_Comma,
+                                              Tid_Colon,
+                                              Tid_Assign };
+
+    static F_Tok stateF_expectZero[] =      { &PE_Function::On_expectZero_Constant };
+    static INT16 stateT_expectZero[] =      { Tid_Constant };
+
+    static F_Tok stateF_inImplementation[] =
+                                            { &PE_Function::On_inImplementation_SwBracket_Left,
+                                              &PE_Function::On_inImplementation_SwBracket_Right };
+    static INT16 stateT_inImplementation[] =
+                                            { Tid_SwBracket_Left,
+                                              Tid_SwBracket_Right };
+
+    SEMPARSE_CREATE_STATUS(PE_Function, afterStdOperator, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, afterStdOperatorLeftBracket, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, afterCastOperator, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, afterName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, expectParameterSeparator, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, afterParameters, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, afterThrow, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, expectExceptionSeparator, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, afterExceptions, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, expectZero, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Function, inImplementation, On_inImplementation_Default );
+}
+
+void
+PE_Function::InitData()
+{
+    pStati->SetCur( afterName ),
+    nResult = 0;
+    bResult_WithImplementation = false;
+    aName.seekp(0);
+    eVirtuality = ary::cpp::VIRTUAL_none;
+    eConVol = ary::cpp::CONVOL_none;
+    aFlags.Reset();
+    nReturnType = 0;
+    csv::erase_container(aParameters);
+    csv::erase_container(aExceptions);
+    bThrow = false;
+}
+
+void
+PE_Function::TransferData()
+{
+    String  sName( aName.c_str() );
+    ary::cpp::Function *
+        pFunction = Env().AryGate().Ces().Store_Operation(
+                                                Env().Context(),
+                                                sName,
+                                                nReturnType,
+                                                aParameters,
+                                                eVirtuality,
+                                                eConVol,
+                                                aFlags,
+                                                bThrow,
+                                                aExceptions );
+    if (pFunction != 0)
+    {
+        // KORR_FUTURE: How to handle differing documentation?
+
+        Dyn< StringVector >
+                pTplParams ( Env().Get_CurTemplateParameters() );
+        if ( pTplParams )
+        {
+              for ( StringVector::const_iterator it = pTplParams->begin();
+                  it !=  pTplParams->end();
+                  ++it )
+            {
+                pFunction->Add_TemplateParameterType( *it, ary::cpp::Type_id(0) );
+            }  // end for
+        }
+
+        Env().Event_Store_Function(*pFunction);
+    }
+
+    pStati->SetCur(size_of_states);
+}
+
+void
+PE_Function::Hdl_SyntaxError(const char * i_sText)
+{
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_Function::SpInit_CastOperatorType()
+{
+    pSpuCastOperatorType->Child().Init_AsCastOperatorType();
+}
+
+void
+PE_Function::SpReturn_Parameter()
+{
+    pStati->SetCur(expectParameterSeparator);
+
+    ary::cpp::Type_id nParamType = pSpuParameter->Child().Result_FrontType();
+    if ( nParamType.IsValid() )      // Check, if there was a parameter, or only the closing ')'.
+    {
+        aParameters.push_back( pSpuParameter->Child().Result_ParamInfo() );
+    }
+}
+
+void
+PE_Function::SpReturn_Exception()
+{
+    pStati->SetCur(expectExceptionSeparator);
+
+    ary::cpp::Type_id
+        nException = pSpuException->Child().Result_Type().TypeId();
+    if ( nException.IsValid() AND pSpuException->Child().Result_KindOf() == PE_Type::is_type )
+    {
+        aExceptions.push_back( nException );
+    }
+}
+
+void
+PE_Function::SpReturn_CastOperatorType()
+{
+    pStati->SetCur(afterName);
+
+    Env().AryGate().Types().Get_TypeText(
+            aName, pSpuCastOperatorType->Child().Result_Type().TypeId() );
+}
+
+void
+PE_Function::On_afterOperator_Std_Operator(const char * i_sText)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(afterName);
+
+    if ( 'a' <= *i_sText AND *i_sText <= 'z' )
+        aName << ' ';
+    aName << i_sText;
+}
+
+void
+PE_Function::On_afterOperator_Std_LeftBracket(const char * i_sText)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(afterStdOperatorLeftBracket);
+
+    aName << i_sText;
+}
+
+void
+PE_Function::On_afterStdOperatorLeftBracket_RightBracket(const char * i_sText)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(afterName);
+
+    aName << i_sText;
+}
+
+void
+PE_Function::On_afterOperator_Cast_Type(const char *)
+{
+    pSpuCastOperatorType->Push(not_done);
+}
+
+void
+PE_Function::On_afterName_Bracket_Left(const char *)
+{
+    pSpuParameter->Push(done);
+}
+
+void
+PE_Function::On_expectParameterSeparator_BracketRight(const char *)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(afterParameters);
+}
+
+void
+PE_Function::On_expectParameterSeparator_Comma(const char *)
+{
+    pSpuParameter->Push(done);
+}
+
+void
+PE_Function::On_afterParameters_const(const char *)
+{
+    SetTokenResult(done,stay);
+    eConVol = static_cast<E_ConVol>(
+                    static_cast<int>(eConVol) | static_cast<int>(ary::cpp::CONVOL_const) );
+}
+
+void
+PE_Function::On_afterParameters_volatile(const char *)
+{
+    SetTokenResult(done,stay);
+    eConVol = static_cast<E_ConVol>(
+                    static_cast<int>(eConVol) | static_cast<int>(ary::cpp::CONVOL_volatile) );
+}
+
+void
+PE_Function::On_afterParameters_throw(const char *)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(afterThrow);
+    bThrow = true;
+}
+
+void
+PE_Function::On_afterParameters_SwBracket_Left(const char *)
+{
+    EnterImplementation(1);
+}
+
+void
+PE_Function::On_afterParameters_Semicolon(const char *)
+{
+    PerformFinishingPunctuation();
+}
+
+void
+PE_Function::On_afterParameters_Comma(const char *)
+{
+    PerformFinishingPunctuation();
+}
+
+void
+PE_Function::On_afterParameters_Colon(const char *)
+{
+    EnterImplementation(0);
+}
+
+void
+PE_Function::On_afterParameters_Assign(const char *)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(expectZero);
+}
+
+void
+PE_Function::On_afterThrow_Bracket_Left(const char *)
+{
+    pSpuException->Push(done);
+}
+
+void
+PE_Function::On_expectExceptionSeparator_BracketRight(const char *)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(afterExceptions);
+}
+
+void
+PE_Function::On_expectExceptionSeparator_Comma(const char *)
+{
+    pSpuException->Push(done);
+}
+
+void
+PE_Function::On_afterExceptions_SwBracket_Left(const char *)
+{
+    EnterImplementation(1);
+}
+
+void
+PE_Function::On_afterExceptions_Semicolon(const char *)
+{
+    PerformFinishingPunctuation();
+}
+
+void
+PE_Function::On_afterExceptions_Comma(const char *)
+{
+    PerformFinishingPunctuation();
+}
+
+void
+PE_Function::On_afterExceptions_Colon(const char *)
+{
+    EnterImplementation(0);
+}
+
+void
+PE_Function::On_afterExceptions_Assign(const char *)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(expectZero);
+}
+
+void
+PE_Function::On_expectZero_Constant(const char * i_sText)
+{
+    if ( strcmp(i_sText,"0") != 0 )
+        Hdl_SyntaxError(i_sText);
+
+    SetTokenResult(done,stay);
+    pStati->SetCur(afterExceptions);
+
+    eVirtuality = ary::cpp::VIRTUAL_abstract;
+}
+
+void
+PE_Function::On_inImplementation_SwBracket_Left(const char *)
+{
+    SetTokenResult(done,stay);
+    nBracketCounterInImplementation++;
+}
+
+void
+PE_Function::On_inImplementation_SwBracket_Right(const char *)
+{
+    nBracketCounterInImplementation--;
+    if (nBracketCounterInImplementation == 0)
+    {
+        SetTokenResult(done,pop_success);
+    }
+    else
+    {
+        SetTokenResult(done,stay);
+    }
+}
+
+void
+PE_Function::On_inImplementation_Default(const char *)
+{
+    SetTokenResult(done,stay);
+}
+
+void
+PE_Function::EnterImplementation( intt i_nBracketCountStart )
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(inImplementation);
+
+    bResult_WithImplementation = true;
+    nBracketCounterInImplementation = i_nBracketCountStart;
+    if ( Env().Context().CurClass() != 0 )
+    {
+        aFlags.SetInline();
+    }
+}
+
+
+
+}   // namespace cpp
+
+
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_funct.hxx b/autodoc/source/parser/cpp/pe_funct.hxx
new file mode 100644
index 000000000000..20d8b5e35d5c
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_funct.hxx
@@ -0,0 +1,284 @@
+/* -*- 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 ADC_CPP_PE_FUNCT_HXX
+#define ADC_CPP_PE_FUNCT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_vfflag.hxx>
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace cpp
+{
+class Function;
+struct S_VariableInfo;
+}
+}
+
+namespace cpp
+{
+
+class PE_Type;
+class PE_Parameter;
+
+class PE_Function : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        afterStdOperator,           // if initializes as operator
+        afterStdOperatorLeftBracket,
+                                    // if initializes as operator with ( or [
+        afterCastOperator,          // if initializes as operator
+        afterName,                  // undecided
+        expectParameterSeparator,   //
+        afterParameters,            // before const, volatile throw or = 0.
+        afterThrow,                 // expect (
+        expectExceptionSeparator,   //
+        afterExceptions,            // = 0 oder ; oder ,
+        expectZero,                 // after '='
+        inImplementation,           // after {
+        size_of_states
+    };
+    typedef ary::cpp::E_Protection              E_Protection;
+    typedef ary::cpp::E_Virtuality              E_Virtuality;
+    typedef ary::cpp::E_ConVol                  E_ConVol;
+
+                        PE_Function(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Function();
+
+    void                Init_Std(
+                            const String  &     i_sName,
+                            ary::cpp::Type_id   i_nReturnType,
+                            bool                i_bVirtual,
+                            ary::cpp::FunctionFlags
+                                                i_aFlags );
+    void                Init_Ctor(
+                            const String  &     i_sName,
+                            ary::cpp::FunctionFlags
+                                                i_aFlags );
+    void                Init_Dtor(
+                            const String  &     i_sName,
+                            bool                i_bVirtual,
+                            ary::cpp::FunctionFlags
+                                                i_aFlags );
+    void                Init_CastOperator(
+                            bool                i_bVirtual,
+                            ary::cpp::FunctionFlags
+                                                i_aFlags );
+    void                Init_NormalOperator(
+                            ary::cpp::Type_id   i_nReturnType,
+                            bool                i_bVirtual,
+                            ary::cpp::FunctionFlags
+                                                i_aFlags );
+
+    ary::cpp::Ce_id     Result_Id() const;
+    bool                Result_WithImplementation() const;
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+  private:
+    typedef SubPe< PE_Function, PE_Type >           SP_Type;
+    typedef SubPeUse< PE_Function, PE_Type >        SPU_Type;
+    typedef SubPe< PE_Function, PE_Parameter>       SP_Parameter;
+    typedef SubPeUse<PE_Function, PE_Parameter>     SPU_Parameter;
+
+    typedef std::vector<ary::cpp::S_Parameter>      ParameterList;
+    typedef std::vector<ary::cpp::Type_id>          ExceptionTypeList;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError(const char * i_sText);
+
+    void                SpInit_CastOperatorType();
+
+    void                SpReturn_Parameter();
+    void                SpReturn_Exception();
+    void                SpReturn_CastOperatorType();
+
+    void                On_afterOperator_Std_Operator(const char * i_sText);             // Operator+() etc.
+    void                On_afterOperator_Std_LeftBracket(const char * i_sText); // operator [] or ()
+    void                On_afterStdOperatorLeftBracket_RightBracket(const char * i_sText);
+    void                On_afterOperator_Cast_Type(const char * i_sText);    // Type
+
+    void                On_afterName_Bracket_Left(const char * i_sText);
+
+    void                On_expectParameterSeparator_BracketRight(const char * i_sText);
+    void                On_expectParameterSeparator_Comma(const char * i_sText);
+
+    void                On_afterParameters_const(const char * i_sText);
+    void                On_afterParameters_volatile(const char * i_sText);
+    void                On_afterParameters_throw(const char * i_sText);
+    void                On_afterParameters_SwBracket_Left(const char * i_sText);
+    void                On_afterParameters_Semicolon(const char * i_sText);
+    void                On_afterParameters_Comma(const char * i_sText);
+    void                On_afterParameters_Colon(const char * i_sText);
+    void                On_afterParameters_Assign(const char * i_sText);
+
+    void                On_afterThrow_Bracket_Left(const char * i_sText);
+
+    void                On_expectExceptionSeparator_BracketRight(const char * i_sText);
+    void                On_expectExceptionSeparator_Comma(const char * i_sText);
+
+    void                On_afterExceptions_SwBracket_Left(const char * i_sText);
+    void                On_afterExceptions_Semicolon(const char * i_sText);
+    void                On_afterExceptions_Comma(const char * i_sText);
+    void                On_afterExceptions_Colon(const char * i_sText);
+    void                On_afterExceptions_Assign(const char * i_sText);
+
+    void                On_expectZero_Constant(const char * i_sText);
+
+    void                On_inImplementation_SwBracket_Left(const char * i_sText);
+    void                On_inImplementation_SwBracket_Right(const char * i_sText);
+    void                On_inImplementation_Default(const char * i_sText);
+
+    void                PerformFinishingPunctuation();
+    void                EnterImplementation(
+                            intt                i_nBracketCountStart ); /// 1 normally, 0 in initialisation section of c'tors.
+
+    // DATA
+    Dyn< PeStatusArray<PE_Function> >
+                        pStati;
+
+    Dyn< SP_Parameter > pSpParameter;
+    Dyn< SPU_Parameter> pSpuParameter;
+    Dyn< SP_Type >      pSpType;
+    Dyn< SPU_Type >     pSpuException;
+    Dyn< SPU_Type >     pSpuCastOperatorType;       // in "operator int()" or "operator ThatClass *()"
+
+    ary::cpp::Ce_id     nResult;
+    bool                bResult_WithImplementation; // Necessary for the parent ParseEnvironment
+                                                    //   to know, there is no semicolon or comma following.
+        // Pre results
+    StreamStr           aName;
+    E_Virtuality        eVirtuality;
+    E_ConVol            eConVol;
+    ary::cpp::FunctionFlags
+                        aFlags;
+    ary::cpp::Type_id   nReturnType;
+    ParameterList       aParameters;
+    ExceptionTypeList   aExceptions;
+    bool                bThrow;                     // Indicates, if there is a throw - important, if there are 0 exceptions listed.
+    intt                nBracketCounterInImplementation;
+};
+
+
+
+
+// IMPLEMENTATION
+inline bool
+PE_Function::Result_WithImplementation() const
+    { return bResult_WithImplementation; }
+
+
+
+
+}   // namespace cpp
+#endif
+
+
+
+
+
+/*  // Overview of Stati
+
+Undecided
+---------
+
+start           // vor und w�hrend storage class specifiern
+
+->Typ
+
+expectName      // Typ ist da
+
+afterName
+
+
+
+
+Variable
+--------
+
+start           // vor und w�hrend storage class specifiern
+
+->Typ
+
+expectName      // Typ ist da  -> im Falle von '(': notyetimplemented
+afterName
+
+expectSize      // after [
+expectFinish
+                // vor ; oder ,
+expectNextVarName  // anders als bei expectName kann hier auch * oder & kommen
+
+
+
+
+
+Function
+--------
+
+start               // vor und w�hrend storage class specifiern
+
+->Typ
+
+expectName          // Typ ist da
+expectBracket       // Nach Name
+expectParameter     // nach ( oder ,
+-> Parameter
+after Parameters    // before const, volatile throw or = 0.
+after throw         // expect (
+expectException     // after (
+after exceptions    // = 0 oder ; oder ,
+
+
+expectNextVarName  // anders als bei expectName kann hier auch * oder & kommen
+
+
+
+
+
+
+
+*/
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_ignor.cxx b/autodoc/source/parser/cpp/pe_ignor.cxx
new file mode 100644
index 000000000000..67db5593c736
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_ignor.cxx
@@ -0,0 +1,118 @@
+/* -*- 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 <precomp.h>
+#include "pe_ignor.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+
+
+namespace cpp {
+
+
+
+PE_Ignore::PE_Ignore( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        nBracketCounter(0),
+        bBlockOpened(false)
+{
+    Setup_StatusFunctions();
+}
+
+
+PE_Ignore::~PE_Ignore()
+{
+}
+
+void
+PE_Ignore::Call_Handler( const cpp::Token & i_rTok )
+{
+    if ( NOT bBlockOpened )
+    {
+        switch (i_rTok.TypeId())
+        {
+            case Tid_SwBracket_Left:    SetTokenResult(done, stay);
+                                        nBracketCounter++;
+                                        bBlockOpened = true;
+                                        break;
+            case Tid_Semicolon:         SetTokenResult(done, pop_success);
+                                        break;
+            default:
+                                        SetTokenResult(done, stay);
+        }   // end switch
+    }
+    else if ( nBracketCounter > 0 )
+    {
+        SetTokenResult(done, stay);
+
+        switch (i_rTok.TypeId())
+        {
+            case Tid_SwBracket_Left:    nBracketCounter++;
+                                        break;
+            case Tid_SwBracket_Right:   nBracketCounter--;
+                                        break;
+        }   // end switch
+    }
+    else if ( i_rTok.TypeId() == Tid_Semicolon )
+    {
+        SetTokenResult(done, pop_success);
+    }
+    else
+    {
+        SetTokenResult(not_done, pop_success);
+    }
+}
+
+void
+PE_Ignore::Setup_StatusFunctions()
+{
+    // Does nothing.
+}
+
+void
+PE_Ignore::InitData()
+{
+    nBracketCounter = 0;
+    bBlockOpened = false;
+}
+
+void
+PE_Ignore::TransferData()
+{
+    // Does nothing.
+}
+
+
+}   // namespace cpp
+
+
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_ignor.hxx b/autodoc/source/parser/cpp/pe_ignor.hxx
new file mode 100644
index 000000000000..7efb2757479b
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_ignor.hxx
@@ -0,0 +1,77 @@
+/* -*- 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 ADC_CPP_PE_IGNOR_HXX
+#define ADC_CPP_PE_IGNOR_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cpp_pe.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace cpp {
+
+
+class PE_Ignore : public Cpp_PE
+{
+  public:
+                        PE_Ignore(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Ignore();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+  private:
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+
+    // DATA
+    uintt               nBracketCounter;
+    bool                bBlockOpened;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace cpp
+
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_namsp.cxx b/autodoc/source/parser/cpp/pe_namsp.cxx
new file mode 100644
index 000000000000..bf9ca483abbe
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_namsp.cxx
@@ -0,0 +1,165 @@
+/* -*- 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 <precomp.h>
+#include <pe_namsp.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <all_toks.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <semantic/callf.hxx>
+#include "x_parse.hxx"
+
+
+
+
+namespace cpp
+{
+
+PE_Namespace::PE_Namespace( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Namespace> ),
+        // sLocalname
+        bPush(false)
+{
+    Setup_StatusFunctions();
+}
+
+PE_Namespace::~PE_Namespace()
+{
+}
+
+void
+PE_Namespace::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Namespace>::F_Tok   F_Tok;
+    static F_Tok stateF_start[] =           { &PE_Namespace::On_start_Identifier,
+                                              &PE_Namespace::On_start_SwBracket_Left };
+    static INT16 stateT_start[] =           { Tid_Identifier,
+                                              Tid_SwBracket_Left };
+    static F_Tok stateF_gotName[] =         { &PE_Namespace::On_gotName_SwBracket_Left,
+                                              &PE_Namespace::On_gotName_Assign };
+    static INT16 stateT_gotName[] =         { Tid_SwBracket_Left,
+                                              Tid_Assign };
+    static F_Tok stateF_expectSemicolon[] = { &PE_Namespace::On_expectSemicolon_Semicolon };
+    static INT16 stateT_expectSemicolon[] = { Tid_Semicolon };
+
+    SEMPARSE_CREATE_STATUS(PE_Namespace, start, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Namespace, gotName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Namespace, expectSemicolon, Hdl_SyntaxError);
+}
+
+void
+PE_Namespace::Call_Handler( const cpp::Token &  i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Namespace::InitData()
+{
+    pStati->SetCur(start);
+    sLocalName = "";
+    bPush = false;
+}
+
+void
+PE_Namespace::TransferData()
+{
+    if (bPush)
+    {
+        ary::cpp::Namespace &
+            rNew = Env().AryGate().Ces().CheckIn_Namespace(
+                                             Env().Context(),
+                                             sLocalName );
+        Env().OpenNamespace(rNew);
+    }
+}
+
+void
+PE_Namespace::Hdl_SyntaxError( const char * i_sText)
+{
+    throw X_Parser( X_Parser::x_UnexpectedToken,
+                    i_sText != 0 ? i_sText : "",
+                    Env().CurFileName(),
+                    Env().LineCount() );
+}
+
+void
+PE_Namespace::On_start_Identifier(const char * i_sText)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(gotName);
+
+    sLocalName = i_sText;
+}
+
+void
+PE_Namespace::On_start_SwBracket_Left(const char * )
+{
+    SetTokenResult(done, pop_success);
+    pStati->SetCur(size_of_states);
+
+    sLocalName = "";    // Anonymous namespace, a name is created in
+                        //   Gate().CheckIn_Namespace() .
+
+    bPush = true;
+}
+
+void
+PE_Namespace::On_gotName_SwBracket_Left(const char * )
+{
+    SetTokenResult(done, pop_success);
+    pStati->SetCur(size_of_states);
+
+    bPush = true;
+}
+
+void
+PE_Namespace::On_gotName_Assign(const char * )
+{
+    // KORR_FUTURE
+    Hdl_SyntaxError(0);
+}
+
+void
+PE_Namespace::On_expectSemicolon_Semicolon(const char * )
+{
+    SetTokenResult(done,pop_success);
+    pStati->SetCur(size_of_states);
+}
+
+}   // namespace cpp
+
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_namsp.hxx b/autodoc/source/parser/cpp/pe_namsp.hxx
new file mode 100644
index 000000000000..d07ab61ad3b7
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_namsp.hxx
@@ -0,0 +1,101 @@
+/* -*- 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 ADC_CPP_PE_NAMSP_HXX
+#define ADC_CPP_PE_NAMSP_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <semantic/callf.hxx>
+#include <semantic/sub_pe.hxx>
+    // PARAMETERS
+
+namespace ary
+{
+namespace cpp
+{
+class Namespace;
+}
+}
+
+
+namespace cpp
+{
+
+
+class PE_Namespace : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        start,
+        gotName,
+        expectSemicolon,        /// after namespace assignment
+        size_of_states
+    };
+                        PE_Namespace(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Namespace();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+    ary::cpp::Namespace *
+                        Result_OpenedNamespace() const;
+  private:
+    void                Setup_StatusFunctions();
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError( const char *);
+
+    void                On_start_Identifier(const char * i_sText);
+    void                On_start_SwBracket_Left(const char * i_sText);
+    void                On_gotName_SwBracket_Left(const char * i_sText);
+    void                On_gotName_Assign(const char * i_sText);
+    void                On_expectSemicolon_Semicolon(const char * i_sText);
+
+    // DATA
+    Dyn< PeStatusArray<PE_Namespace> >
+                        pStati;
+
+    String              sLocalName;
+    bool                bPush;
+};
+
+
+
+
+}   // namespace cpp
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_param.cxx b/autodoc/source/parser/cpp/pe_param.cxx
new file mode 100644
index 000000000000..19ce4607d060
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_param.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_param.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/cp_type.hxx>
+#include "pe_type.hxx"
+#include "pe_vari.hxx"
+
+
+namespace cpp {
+
+
+
+//***********************       PE_Parameter        ***********************//
+
+
+PE_Parameter::PE_Parameter( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Parameter> )
+        // pSpType,
+        // pSpuType,
+        // pSpVariable,
+        // pSpuVariable,
+        // aResultParamInfo
+{
+    Setup_StatusFunctions();
+
+    pSpType         = new SP_Type(*this);
+    pSpuType        = new SPU_Type(*pSpType, &PE_Parameter::SpInit_Type, &PE_Parameter::SpReturn_Type);
+    pSpVariable     = new SP_Variable(*this);
+    pSpuVariable    = new SPU_Variable(*pSpVariable, &PE_Parameter::SpInit_Variable, &PE_Parameter::SpReturn_Variable);
+}
+
+PE_Parameter::~PE_Parameter()
+{
+}
+
+void
+PE_Parameter::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Parameter::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Parameter>::F_Tok   F_Tok;
+    static F_Tok stateF_start[] =           { &PE_Parameter::On_start_Type,
+                                              &PE_Parameter::On_start_Type,
+                                              &PE_Parameter::On_start_Type,
+                                              &PE_Parameter::On_start_Type,
+                                              &PE_Parameter::On_start_Type,
+
+                                              &PE_Parameter::On_start_Type,
+                                              &PE_Parameter::On_start_Type,
+                                              &PE_Parameter::On_start_Bracket_Right,
+                                              &PE_Parameter::On_start_Type,
+                                              &PE_Parameter::On_start_Ellipse,
+
+                                              &PE_Parameter::On_start_Type,
+                                              &PE_Parameter::On_start_Type,
+                                              &PE_Parameter::On_start_Type };
+    static INT16 stateT_start[] =           { Tid_Identifier,
+                                              Tid_class,
+                                              Tid_struct,
+                                              Tid_union,
+                                              Tid_enum,
+
+                                              Tid_const,
+                                              Tid_volatile,
+                                              Tid_Bracket_Right,
+                                              Tid_DoubleColon,
+                                              Tid_Ellipse,
+
+                                              Tid_typename,
+                                              Tid_BuiltInType,
+                                              Tid_TypeSpecializer };
+
+    static F_Tok stateF_expectName[] =      { &PE_Parameter::On_expectName_Identifier,
+                                              &PE_Parameter::On_expectName_ArrayBracket_Left,
+                                              &PE_Parameter::On_expectName_Bracket_Right,
+                                              &PE_Parameter::On_expectName_Comma,
+                                              &PE_Parameter::On_afterName_Assign  };
+    static INT16 stateT_expectName[] =      { Tid_Identifier,
+                                              Tid_ArrayBracket_Left,
+                                              Tid_Bracket_Right,
+                                              Tid_Comma,
+                                              Tid_Assign };
+    static F_Tok stateF_afterName[] =       { &PE_Parameter::On_afterName_ArrayBracket_Left,
+                                              &PE_Parameter::On_afterName_Bracket_Right,
+                                              &PE_Parameter::On_afterName_Comma,
+                                              &PE_Parameter::On_afterName_Assign };
+    static INT16 stateT_afterName[] =       { Tid_ArrayBracket_Left,
+                                              Tid_Bracket_Right,
+                                              Tid_Comma,
+                                              Tid_Assign };
+    static F_Tok stateF_finished[] =        { &PE_Parameter::On_finished_Comma,
+                                              &PE_Parameter::On_finished_Bracket_Right };
+    static INT16 stateT_finished[] =        { Tid_Bracket_Right,
+                                              Tid_Comma };
+
+    SEMPARSE_CREATE_STATUS(PE_Parameter, start, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Parameter, expectName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Parameter, afterName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Parameter, finished, Hdl_SyntaxError);
+}
+
+
+void
+PE_Parameter::InitData()
+{
+    pStati->SetCur(start);
+    aResultParamInfo.Empty();
+}
+
+void
+PE_Parameter::TransferData()
+{
+    pStati->SetCur(size_of_states);
+}
+
+void
+PE_Parameter::Hdl_SyntaxError( const char * i_sText)
+{
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_Parameter::SpInit_Type()
+{
+    // Does nothing.
+}
+
+void
+PE_Parameter::SpInit_Variable()
+{
+    // Does nothing.
+}
+
+void
+PE_Parameter::SpReturn_Type()
+{
+    aResultParamInfo.nType = pSpuType->Child().Result_Type().Id();
+    pStati->SetCur(expectName);
+}
+
+void
+PE_Parameter::SpReturn_Variable()
+{
+    if (pSpuVariable->Child().Result_Pattern() > 0)
+    {
+        aResultParamInfo.sSizeExpression = pSpuVariable->Child().Result_SizeExpression();
+        aResultParamInfo.sInitExpression = pSpuVariable->Child().Result_InitExpression();
+    }
+}
+
+void
+PE_Parameter::On_start_Type(const char *)
+{
+    pSpuType->Push(not_done);
+}
+
+void
+PE_Parameter::On_start_Bracket_Right(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Parameter::On_start_Ellipse(const char *)
+{
+    SetTokenResult(done, pop_success);
+
+    aResultParamInfo.nType = Env().AryGate().Types().Tid_Ellipse();
+}
+
+void
+PE_Parameter::On_expectName_Identifier(const char * i_sText)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(afterName);
+
+    aResultParamInfo.sName = i_sText;
+}
+
+void
+PE_Parameter::On_expectName_ArrayBracket_Left(const char * i_sText)
+{
+    On_afterName_ArrayBracket_Left(i_sText);
+}
+
+void
+PE_Parameter::On_expectName_Bracket_Right(const char * i_sText)
+{
+    On_afterName_Bracket_Right(i_sText);
+}
+
+void
+PE_Parameter::On_expectName_Comma(const char * i_sText)
+{
+    On_afterName_Comma(i_sText);
+}
+
+void
+PE_Parameter::On_afterName_ArrayBracket_Left(const char *)
+{
+    pSpuVariable->Push(not_done);
+}
+
+void
+PE_Parameter::On_afterName_Bracket_Right(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Parameter::On_afterName_Comma(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Parameter::On_afterName_Assign(const char *)
+{
+    pSpuVariable->Push(not_done);
+}
+
+void
+PE_Parameter::On_finished_Bracket_Right(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Parameter::On_finished_Comma(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+
+}   // namespace cpp
+
+
+
+
+
+
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_param.hxx b/autodoc/source/parser/cpp/pe_param.hxx
new file mode 100644
index 000000000000..44688796236f
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_param.hxx
@@ -0,0 +1,141 @@
+/* -*- 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 ADC_CPP_PE_PARAM_HXX
+#define ADC_CPP_PE_PARAM_HXX
+
+// BASE CLASSES
+#include "cpp_pe.hxx"
+// USED SERVICES
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+#include <ary/cpp/c_vfflag.hxx>
+
+
+
+
+namespace cpp
+{
+    class PE_Type;
+    class PE_Variable;
+
+
+
+
+class PE_Parameter : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        start,
+        expectName,
+        afterName,
+        finished,
+        size_of_states
+    };
+    typedef ary::cpp::S_Parameter       S_ParamInfo;
+
+    explicit            PE_Parameter(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Parameter();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+    ary::cpp::Type_id   Result_FrontType() const;
+    const S_ParamInfo & Result_ParamInfo() const;
+
+  private:
+    typedef SubPe< PE_Parameter, PE_Type >          SP_Type;
+    typedef SubPeUse< PE_Parameter, PE_Type >       SPU_Type;
+    typedef SubPe< PE_Parameter, PE_Variable >      SP_Variable;
+    typedef SubPeUse< PE_Parameter, PE_Variable >   SPU_Variable;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError( const char *);
+
+    void                SpInit_Type();       // Type and Ignore.
+    void                SpInit_Variable();
+    void                SpReturn_Type();
+    void                SpReturn_Variable();
+
+    void                On_start_Type(const char * i_sText);
+    void                On_start_Bracket_Right(const char * i_sText);
+    void                On_start_Ellipse(const char * i_sText);
+
+    void                On_expectName_Identifier(const char * i_sText);
+    void                On_expectName_ArrayBracket_Left(const char * i_sText);
+    void                On_expectName_Bracket_Right(const char * i_sText);
+    void                On_expectName_Comma(const char * i_sText);
+
+    void                On_afterName_ArrayBracket_Left(const char * i_sText);
+    void                On_afterName_Bracket_Right(const char * i_sText);
+    void                On_afterName_Comma(const char * i_sText);
+    void                On_afterName_Assign(const char * i_sText);
+
+    void                On_finished_Bracket_Right(const char * i_sText);
+    void                On_finished_Comma(const char * i_sText);
+
+    // DATA
+    Dyn< PeStatusArray<PE_Parameter> >
+                        pStati;
+
+    Dyn<SP_Type>        pSpType;
+    Dyn<SPU_Type>       pSpuType;
+    Dyn<SP_Variable>    pSpVariable;
+    Dyn<SPU_Variable>   pSpuVariable;
+
+    S_ParamInfo         aResultParamInfo;
+};
+
+
+
+
+// IMPLEMENTATION
+inline ary::cpp::Type_id
+PE_Parameter::Result_FrontType() const
+{
+    return aResultParamInfo.nType;
+}
+
+inline const PE_Parameter::S_ParamInfo &
+PE_Parameter::Result_ParamInfo() const
+{
+    return aResultParamInfo;
+}
+
+
+
+
+}   // namespace cpp
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_tpltp.cxx b/autodoc/source/parser/cpp/pe_tpltp.cxx
new file mode 100644
index 000000000000..1cbb5b47c851
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_tpltp.cxx
@@ -0,0 +1,178 @@
+/* -*- 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 <precomp.h>
+#include "pe_tpltp.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+
+
+
+namespace cpp {
+
+
+
+PE_TemplateTop::PE_TemplateTop( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_TemplateTop> ),
+        // aResult_Parameters,
+        bCurIsConstant(false)
+{
+        Setup_StatusFunctions();
+}
+
+
+PE_TemplateTop::~PE_TemplateTop()
+{
+}
+
+void
+PE_TemplateTop::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_TemplateTop::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_TemplateTop>::F_Tok F_Tok;
+
+    static F_Tok stateF_start[] =           { &PE_TemplateTop::On_start_Less };
+    static INT16 stateT_start[] =           { Tid_Less };
+
+    static F_Tok stateF_expect_qualifier[]= { &PE_TemplateTop::On_expect_qualifier_ClassOrTypename,
+                                              &PE_TemplateTop::On_expect_qualifier_Greater,
+                                              &PE_TemplateTop::On_expect_qualifier_ClassOrTypename };
+    static INT16 stateT_expect_qualifier[]= { Tid_class,
+                                              Tid_Greater,
+                                              Tid_typename };
+
+    static F_Tok stateF_expect_name[] =     { &PE_TemplateTop::On_expect_name_Identifier };
+    static INT16 stateT_expect_name[] =     { Tid_Identifier };
+
+    static F_Tok stateF_expect_separator[]= { &PE_TemplateTop::On_expect_separator_Comma,
+                                              &PE_TemplateTop::On_expect_separator_Greater };
+    static INT16 stateT_expect_separator[]= { Tid_Comma,
+                                              Tid_Greater };
+
+    SEMPARSE_CREATE_STATUS(PE_TemplateTop, start,            Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_TemplateTop, expect_qualifier, On_expect_qualifier_Other);
+    SEMPARSE_CREATE_STATUS(PE_TemplateTop, expect_name,      Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_TemplateTop, expect_separator, Hdl_SyntaxError);
+}
+
+void
+PE_TemplateTop::InitData()
+{
+    pStati->SetCur(start);
+    csv::erase_container(aResult_Parameters);
+    bCurIsConstant = false;
+}
+
+void
+PE_TemplateTop::TransferData()
+{
+    pStati->SetCur(size_of_states);
+}
+
+void
+PE_TemplateTop::Hdl_SyntaxError(const char * i_sText)
+{
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_TemplateTop::On_start_Less( const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expect_qualifier);
+}
+
+void
+PE_TemplateTop::On_expect_qualifier_ClassOrTypename( const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expect_name);
+}
+
+void
+PE_TemplateTop::On_expect_qualifier_Greater(const char *)
+{
+    SetTokenResult(done, pop_success);
+}
+
+void
+PE_TemplateTop::On_expect_qualifier_Other( const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expect_name);
+
+    bCurIsConstant = true;
+}
+
+void
+PE_TemplateTop::On_expect_name_Identifier( const char * i_sText)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expect_separator);
+
+    StreamLock sl(50);
+    if ( NOT bCurIsConstant )
+    {
+        String sText( sl() << "typename " << i_sText << c_str );
+        aResult_Parameters.push_back(sText);
+    }
+    else //
+    {
+        String sText( sl() << "constant " << i_sText << c_str );
+        aResult_Parameters.push_back(sText);
+        bCurIsConstant = false;
+    }  // endif
+}
+
+void
+PE_TemplateTop::On_expect_separator_Comma( const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expect_qualifier);
+}
+
+void
+PE_TemplateTop::On_expect_separator_Greater( const char *)
+{
+    SetTokenResult(done, pop_success);
+}
+
+
+
+
+}   // namespace cpp
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_tpltp.hxx b/autodoc/source/parser/cpp/pe_tpltp.hxx
new file mode 100644
index 000000000000..9d1fdbff8911
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_tpltp.hxx
@@ -0,0 +1,108 @@
+/* -*- 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 ADC_CPP_PE_TPLTP_HXX
+#define ADC_CPP_PE_TPLTP_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+    // PARAMETERS
+
+
+namespace cpp {
+
+
+
+class PE_TemplateTop : public cpp::Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        start,
+        expect_qualifier,
+        expect_name,
+        expect_separator,
+        size_of_states
+    };
+                        PE_TemplateTop(
+                            Cpp_PE *            i_pParent );
+                        ~PE_TemplateTop();
+
+    const StringVector &
+                        Result_Parameters() const;
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+  private:
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError(const char *);
+
+
+    void                On_start_Less(const char *);
+
+    void                On_expect_qualifier_ClassOrTypename(const char *);
+    void                On_expect_qualifier_Greater(const char *);
+    void                On_expect_qualifier_Other(const char *);
+
+    void                On_expect_name_Identifier(const char *);
+
+    void                On_expect_separator_Comma(const char *);
+    void                On_expect_separator_Greater(const char *);
+
+    // DATA
+    Dyn< PeStatusArray<PE_TemplateTop> >
+                        pStati;
+
+    StringVector
+                        aResult_Parameters;
+    bool                bCurIsConstant;
+};
+
+
+
+// IMPLEMENTATION
+
+inline const StringVector &
+PE_TemplateTop::Result_Parameters() const
+    { return aResult_Parameters; }
+
+
+}   // namespace cpp
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_tydef.cxx b/autodoc/source/parser/cpp/pe_tydef.cxx
new file mode 100644
index 000000000000..fa5527fefbc4
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_tydef.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "pe_tydef.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_type.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <all_toks.hxx>
+#include "pe_type.hxx"
+
+
+namespace cpp {
+
+
+PE_Typedef::PE_Typedef(Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Typedef> ),
+        // pSpType,
+        // pSpuType,
+        // sName
+        nType(0)
+{
+    Setup_StatusFunctions();
+
+    pSpType    = new SP_Type(*this);
+    pSpuType   = new SPU_Type(*pSpType, 0, &PE_Typedef::SpReturn_Type);
+}
+
+PE_Typedef::~PE_Typedef()
+{
+}
+
+void
+PE_Typedef::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Typedef::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Typedef>::F_Tok F_Tok;
+    static F_Tok stateF_start[] =       { &PE_Typedef::On_start_typedef };
+    static INT16 stateT_start[] =       { Tid_typedef };
+
+    static F_Tok stateF_expectName[] =  { &PE_Typedef::On_expectName_Identifier };
+    static INT16 stateT_expectName[] =  { Tid_Identifier };
+
+    static F_Tok stateF_afterName[] =   { &PE_Typedef::On_afterName_Semicolon };
+    static INT16 stateT_afterName[] =   { Tid_Semicolon };
+
+    SEMPARSE_CREATE_STATUS(PE_Typedef, start, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Typedef, expectName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Typedef, afterName, Hdl_SyntaxError);
+}
+
+void
+PE_Typedef::InitData()
+{
+    pStati->SetCur(start);
+
+    sName.clear();
+    nType = 0;
+}
+
+void
+PE_Typedef::TransferData()
+{
+    pStati->SetCur(size_of_states);
+
+    ary::cpp::Typedef &
+    rTypedef = Env().AryGate().Ces().Store_Typedef(
+                        Env().Context(), sName, nType );
+    Env().Event_Store_Typedef(rTypedef);
+}
+
+void
+PE_Typedef::Hdl_SyntaxError( const char * i_sText)
+{
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_Typedef::SpReturn_Type()
+{
+    pStati->SetCur(expectName);
+
+    nType = pSpuType->Child().Result_Type().Id();
+}
+
+void
+PE_Typedef::On_start_typedef( const char * )
+{
+    pSpuType->Push(done);
+}
+
+void
+PE_Typedef::On_expectName_Identifier( const char * i_sText )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(afterName);
+
+    sName = i_sText;
+}
+
+void
+PE_Typedef::On_afterName_Semicolon( const char * )
+{
+    SetTokenResult(done, pop_success);
+}
+
+}   // namespace cpp
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_tydef.hxx b/autodoc/source/parser/cpp/pe_tydef.hxx
new file mode 100644
index 000000000000..5c4cac474814
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_tydef.hxx
@@ -0,0 +1,93 @@
+/* -*- 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 ADC_CPP_PE_TYDEF_HXX
+#define ADC_CPP_PE_TYDEF_HXX
+
+// BASE CLASSES
+#include "cpp_pe.hxx"
+// USED SERVICES
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+
+
+namespace cpp
+{
+    class PE_Type;
+
+
+
+
+class PE_Typedef : public cpp::Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        start,
+        expectName,
+        afterName,
+        size_of_states
+    };
+                        PE_Typedef(
+                            Cpp_PE *        i_pParent );
+                        ~PE_Typedef();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+  private:
+    typedef SubPe< PE_Typedef, PE_Type >        SP_Type;
+    typedef SubPeUse< PE_Typedef, PE_Type>      SPU_Type;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError( const char *);
+
+    void                SpReturn_Type();
+
+    void                On_start_typedef( const char * );
+    void                On_expectName_Identifier( const char * );
+    void                On_afterName_Semicolon( const char * );
+
+    // DATA
+    Dyn< PeStatusArray<PE_Typedef> >
+                        pStati;
+    Dyn<SP_Type>        pSpType;
+    Dyn<SPU_Type>       pSpuType;
+
+    String              sName;
+    ary::cpp::Type_id   nType;
+};
+
+
+
+
+}   // namespace cpp
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_type.cxx b/autodoc/source/parser/cpp/pe_type.cxx
new file mode 100644
index 000000000000..1f34ddffc14e
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_type.cxx
@@ -0,0 +1,556 @@
+/* -*- 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 <precomp.h>
+#include "pe_type.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/cpp/inpcontx.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_namesp.hxx>
+#include <ary/cpp/cp_type.hxx>
+#include "pe_class.hxx"
+#include "pe_enum.hxx"
+#include <x_parse.hxx>
+
+
+
+class NullType : public ary::cpp::Type
+{
+  private:
+    virtual void        do_Accept(
+                            csv::ProcessorIfc & io_processor ) const;
+    virtual ary::ClassId
+                        get_AryClass() const;
+    virtual bool        inq_IsConst() const;
+    virtual void        inq_Get_Text(
+                            StreamStr &         o_rPreName,
+                            StreamStr &         o_rName,
+                            StreamStr &         o_rPostName,
+                            const ary::cpp::Gate &
+                                                i_rGate ) const;
+};
+
+void
+NullType::do_Accept(csv::ProcessorIfc & ) const
+{
+    // Does nothing.
+}
+
+ary::ClassId
+NullType::get_AryClass() const
+{
+    return 0;
+}
+
+bool
+NullType::inq_IsConst() const
+{
+    return true;
+}
+
+void
+NullType::inq_Get_Text(     StreamStr &         ,
+                            StreamStr &         ,
+                            StreamStr &         ,
+                            const ary::cpp::Gate &  ) const
+{
+    // Does nothing.
+}
+
+
+
+
+namespace cpp
+{
+
+
+inline bool
+PE_Type::IsType() const
+    { return eResult_KindOf == is_type; }
+
+
+PE_Type::PE_Type( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Type> ),
+        pSpType(0),
+        pSpuType_TemplateParameter(0),
+        // pSpClass,
+        // pSpuClass,
+        // pSpEnum,
+        // pSpuEnum,
+        pType(0),
+        pCurTemplate_ParameterList(0),
+        // sOwningClassName,
+        // sParsedClass_Name,
+        pResult_Type(0),
+        eResult_KindOf(is_none),
+        bIsCastOperatorType(false)
+{
+    Setup_StatusFunctions();
+
+    pSpType         = new SP_Type(*this);
+    pSpClass        = new SP_Class(*this);
+    pSpEnum         = new SP_Enum(*this);
+
+    pSpuType_TemplateParameter
+                    = new SPU_Type(  *pSpType, 0,
+                                     &PE_Type::SpReturn_Type_TemplateParameter );
+    pSpuClass       = new SPU_Class( *pSpClass, 0,
+                                &    PE_Type::SpReturn_Class );
+    pSpuEnum        = new SPU_Enum( *pSpEnum, 0,
+                                &    PE_Type::SpReturn_Enum );
+}
+
+PE_Type::~PE_Type()
+{
+}
+
+void
+PE_Type::Init_AsCastOperatorType()
+{
+    bIsCastOperatorType = true;
+}
+
+void
+PE_Type::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Type::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Type>::F_Tok    F_Tok;
+    static F_Tok stateF_start[] =               { &PE_Type::On_start_Identifier,
+                                                  &PE_Type::On_start_class,
+                                                  &PE_Type::On_start_class,
+                                                  &PE_Type::On_start_class,
+                                                  &PE_Type::On_start_enum,
+                                                  &PE_Type::On_start_const,
+                                                  &PE_Type::On_start_volatile,
+                                                  &PE_Type::On_start_Bracket_Right,
+                                                  &PE_Type::On_start_DoubleColon,
+                                                  &PE_Type::On_start_typename,
+                                                  &PE_Type::On_start_BuiltInType,
+                                                  &PE_Type::On_start_TypeSpecializer };
+    static INT16 stateT_start[] =               { Tid_Identifier,
+                                                  Tid_class,
+                                                  Tid_struct,
+                                                  Tid_union,
+                                                  Tid_enum,
+                                                  Tid_const,
+                                                  Tid_volatile,
+                                                  Tid_Bracket_Right,
+                                                  Tid_DoubleColon,
+                                                  Tid_typename,
+                                                  Tid_BuiltInType,
+                                                  Tid_TypeSpecializer };
+
+    static F_Tok stateF_expect_namesegment[] =  { &PE_Type::On_expect_namesegment_Identifier,
+                                                  &PE_Type::On_expect_namesegment_Identifier };
+    static INT16 stateT_expect_namesegment[] =  { Tid_Identifier,
+                                                  Tid_BuiltInType };
+
+    static F_Tok stateF_after_namesegment[] =   { &PE_Type::On_after_namesegment_const,
+                                                  &PE_Type::On_after_namesegment_volatile,
+                                                  &PE_Type::On_after_namesegment_Bracket_Left,
+                                                  &PE_Type::On_after_namesegment_DoubleColon,
+                                                  &PE_Type::On_after_namesegment_Less,
+                                                  &PE_Type::On_after_namesegment_Asterix,
+                                                  &PE_Type::On_after_namesegment_AmpersAnd };
+    static INT16 stateT_after_namesegment[] =   { Tid_const,
+                                                  Tid_volatile,
+                                                  Tid_Bracket_Left,
+                                                  Tid_DoubleColon,
+                                                  Tid_Less,
+                                                  Tid_Asterix,
+                                                  Tid_AmpersAnd };
+
+    static F_Tok stateF_afterclass_expect_semicolon[] =
+                                                { &PE_Type::On_afterclass_expect_semicolon_Semicolon };
+    static INT16 stateT_afterclass_expect_semicolon[] =
+                                                { Tid_Semicolon };
+
+    static F_Tok stateF_within_template[] =     { &PE_Type::On_within_template_Comma,
+                                                  &PE_Type::On_within_template_Greater,
+                                                  &PE_Type::On_within_template_Constant };
+    static INT16 stateT_within_template[] =     { Tid_Comma,
+                                                  Tid_Greater,
+                                                  Tid_Constant };
+
+    static F_Tok stateF_within_indirection[] =  { &PE_Type::On_within_indirection_const,
+                                                  &PE_Type::On_within_indirection_volatile,
+                                                  &PE_Type::On_within_indirection_Asterix,
+                                                  &PE_Type::On_within_indirection_AmpersAnd };
+    static INT16 stateT_within_indirection[] =  { Tid_const,
+                                                  Tid_volatile,
+                                                  Tid_Asterix,
+                                                  Tid_AmpersAnd };
+
+    SEMPARSE_CREATE_STATUS(PE_Type, start, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Type, expect_namesegment, On_EndOfType);
+    SEMPARSE_CREATE_STATUS(PE_Type, after_namesegment, On_EndOfType);
+    SEMPARSE_CREATE_STATUS(PE_Type, afterclass_expect_semicolon, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Type, within_template, On_within_template_TypeStart);
+    SEMPARSE_CREATE_STATUS(PE_Type, within_indirection, On_EndOfType);
+}
+
+void
+PE_Type::InitData()
+{
+    pStati->SetCur(start);
+
+    ary::cpp::Ce_id
+        scope_id = Env().Context().CurClass() != 0
+                    ?   Env().Context().CurClass()->CeId()
+                    :   Env().Context().CurNamespace().CeId();
+
+    pType = new ary::cpp::UsedType(scope_id);
+    pCurTemplate_ParameterList = 0;
+    sOwningClassName
+            =   Env().Context().CurClass() != 0
+                    ?   Env().Context().CurClass()->LocalName().c_str()
+                    :   "";
+    sParsedClass_Name.clear();
+    pResult_Type = 0;
+    eResult_KindOf = is_type;
+    bIsCastOperatorType = false;
+}
+
+void
+PE_Type::TransferData()
+{
+    pStati->SetCur(size_of_states);
+
+    if ( IsType() )
+        pResult_Type = & Env().AryGate().Types().CheckIn_UsedType(
+                                                        Env().Context(),
+                                                        *pType.Release() );
+    else
+        pResult_Type = new NullType;
+}
+
+void
+PE_Type::Hdl_SyntaxError( const char * i_sText )
+{
+    StdHandlingOfSyntaxError( i_sText );
+}
+
+void
+PE_Type::SpReturn_Type_TemplateParameter()
+{
+    if ( pSpuType_TemplateParameter->Child().Result_KindOf() != is_type )
+        throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", String::Null_(), 0);
+
+    pCurTemplate_ParameterList->AddParam_Type(
+            pSpuType_TemplateParameter->Child().Result_Type().TypeId() );
+}
+
+void
+PE_Type::SpReturn_Class()
+{
+    switch ( pSpuClass->Child().Result_KindOf() )
+    {
+        case PE_Class::is_declaration:
+                    pStati->SetCur(afterclass_expect_semicolon);
+                    eResult_KindOf = is_explicit_class_declaration;
+                    break;
+        case PE_Class::is_implicit_declaration:
+                    pStati->SetCur(after_namesegment);
+                    pType->Add_NameSegment(
+                            pSpuClass->Child().Result_LocalName() );
+                    break;
+        case PE_Class::is_predeclaration:
+                    pStati->SetCur(afterclass_expect_semicolon);
+                    eResult_KindOf = is_class_predeclaration;
+                    break;
+        case PE_Class::is_qualified_typename:
+                    pStati->SetCur(after_namesegment);
+                    pType->Add_NameSegment(
+                            pSpuClass->Child().Result_FirstNameSegment() );
+                    break;
+        default:
+                    csv_assert(false);
+    }
+}
+
+void
+PE_Type::SpReturn_Enum()
+{
+    switch ( pSpuEnum->Child().Result_KindOf() )
+    {
+        case PE_Enum::is_declaration:
+                    pStati->SetCur(afterclass_expect_semicolon);
+                    eResult_KindOf = is_explicit_enum_declaration;
+                    break;
+        case PE_Enum::is_implicit_declaration:
+                    pStati->SetCur(after_namesegment);
+                    pType->Add_NameSegment(
+                            pSpuEnum->Child().Result_LocalName() );
+                    break;
+        case PE_Enum::is_qualified_typename:
+                    pStati->SetCur(after_namesegment);
+                    pType->Add_NameSegment(
+                            pSpuEnum->Child().Result_FirstNameSegment() );
+                    break;
+        default:
+                    csv_assert(false);
+    }
+}
+
+void
+PE_Type::On_EndOfType(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Type::On_start_Identifier( const char * i_sText )
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(after_namesegment);
+
+    pType->Add_NameSegment(i_sText);
+}
+
+void
+PE_Type::On_start_class(const char *)
+{
+    pSpuClass->Push(not_done);
+}
+
+void
+PE_Type::On_start_enum(const char *)
+{
+    pSpuEnum->Push(done);
+}
+
+void
+PE_Type::On_start_const(const char *)
+{
+    SetTokenResult(done,stay);
+    pType->Set_Const();
+}
+
+void
+PE_Type::On_start_volatile(const char *)
+{
+    SetTokenResult(done,stay);
+    pType->Set_Volatile();
+}
+
+void
+PE_Type::On_start_Bracket_Right(const char *)
+{
+    SetTokenResult(not_done,pop_success);
+
+    eResult_KindOf = is_none;
+}
+
+void
+PE_Type::On_start_DoubleColon(const char *)
+{
+    SetTokenResult(done,stay);
+    pType->Set_Absolute();
+}
+
+void
+PE_Type::On_start_BuiltInType(const char * i_sText)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(after_namesegment);
+    pType->Set_BuiltIn(i_sText);
+}
+
+void
+PE_Type::On_start_TypeSpecializer(const char * i_sText)
+{
+    SetTokenResult(done,stay);
+    if (*i_sText == 'u') {
+        pType->Set_Unsigned();
+    }
+    else if (*i_sText == 's') {
+        pType->Set_Signed();
+    }
+    else {
+        csv_assert(false);
+    }
+}
+
+void
+PE_Type::On_start_typename(const char *)
+{
+    SetTokenResult(done,stay);
+}
+
+void
+PE_Type::On_expect_namesegment_Identifier(const char * i_sText)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(after_namesegment);
+    pType->Add_NameSegment(i_sText);
+}
+
+void
+PE_Type::On_after_namesegment_const(const char *)
+{
+    SetTokenResult(done,stay);
+    pType->Set_Const();
+}
+
+void
+PE_Type::On_after_namesegment_volatile(const char *)
+{
+    SetTokenResult(done,stay);
+    pType->Set_Volatile();
+}
+
+void
+PE_Type::On_after_namesegment_Bracket_Left(const char * i_sText)
+{
+    if ( bIsCastOperatorType )
+    {
+        SetTokenResult(not_done, pop_success);
+    }
+    else if ( pType->LocalName() == sOwningClassName )
+    {
+        SetTokenResult(not_done,pop_success);
+        eResult_KindOf = is_constructor;
+
+    }
+    else //
+    {
+        On_EndOfType(i_sText);
+    }  // endif
+}
+
+void
+PE_Type::On_after_namesegment_DoubleColon(const char *)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(expect_namesegment);
+}
+
+void
+PE_Type::On_after_namesegment_Less(const char *)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(within_template);
+
+    pCurTemplate_ParameterList = & pType->Enter_Template();
+}
+
+void
+PE_Type::On_after_namesegment_Asterix(const char *)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(within_indirection);
+    pType->Add_PtrLevel();
+}
+
+void
+PE_Type::On_after_namesegment_AmpersAnd(const char *)
+{
+    SetTokenResult(done,pop_success);
+    pType->Set_Reference();
+}
+
+void
+PE_Type::On_afterclass_expect_semicolon_Semicolon(const char *)
+{
+    csv_assert( NOT IsType() );
+    SetTokenResult(not_done,pop_success);
+}
+
+void
+PE_Type::On_within_template_Comma(const char *)
+{
+    SetTokenResult(done,stay);
+}
+
+void
+PE_Type::On_within_template_Greater(const char *)
+{
+    SetTokenResult(done,stay);
+    pStati->SetCur(after_namesegment);
+
+    pCurTemplate_ParameterList = 0;
+}
+
+void
+PE_Type::On_within_template_Constant(const char * i_sText)
+{
+    // KORR_FUTURE
+    Cerr() << "Templates with constants as parameters are not yet supported by Autodoc" << Endl();
+    Hdl_SyntaxError(i_sText);
+}
+
+void
+PE_Type::On_within_template_TypeStart(const char *)
+{
+    pSpuType_TemplateParameter->Push(not_done);
+}
+
+void
+PE_Type::On_within_indirection_const(const char *)
+{
+    SetTokenResult(done,stay);
+    pType->Set_Const();
+}
+
+void
+PE_Type::On_within_indirection_volatile(const char *)
+{
+    SetTokenResult(done,stay);
+    pType->Set_Volatile();
+}
+
+void
+PE_Type::On_within_indirection_Asterix(const char *)
+{
+    SetTokenResult(done,stay);
+    pType->Add_PtrLevel();
+}
+
+void
+PE_Type::On_within_indirection_AmpersAnd(const char *)
+{
+    SetTokenResult(done,pop_success);
+    pType->Set_Reference();
+}
+
+}   // namespace cpp
+
+
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_type.hxx b/autodoc/source/parser/cpp/pe_type.hxx
new file mode 100644
index 000000000000..55eeaa5279f4
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_type.hxx
@@ -0,0 +1,187 @@
+/* -*- 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 ADC_CPP_PE_TYPE_HXX
+#define ADC_CPP_PE_TYPE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <ary/cpp/usedtype.hxx>
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+    // PARAMETERS
+#include <ary/cpp/c_types4cpp.hxx>
+
+
+
+namespace cpp {
+
+class PE_Class;
+class PE_Enum;
+class PE_Expression;
+
+class PE_Type : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        start,
+        expect_namesegment,
+        after_namesegment,
+        afterclass_expect_semicolon,
+        within_template,
+        within_indirection,
+        size_of_states
+    };
+    enum E_KindOfResult
+    {
+        is_none,
+        is_type,
+        is_constructor,
+        is_explicit_class_declaration,
+        is_class_predeclaration,
+        is_explicit_enum_declaration
+    };
+
+                        PE_Type(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Type();
+
+    void                Init_AsCastOperatorType();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+    E_KindOfResult      Result_KindOf() const;
+    const ary::cpp::Type &
+                        Result_Type() const;
+  private:
+    typedef SubPe< PE_Type, PE_Type >           SP_Type;
+    typedef SubPe< PE_Type, PE_Class >          SP_Class;
+    typedef SubPe< PE_Type, PE_Enum >           SP_Enum;
+    typedef SubPeUse< PE_Type, PE_Type >        SPU_Type;
+    typedef SubPeUse< PE_Type, PE_Class >       SPU_Class;
+    typedef SubPeUse< PE_Type, PE_Enum >        SPU_Enum;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError( const char *);
+
+    void                SpReturn_Type_TemplateParameter();
+    void                SpReturn_Class();
+    void                SpReturn_Enum();
+
+    void                On_EndOfType(const char *);
+
+    void                On_start_Identifier(const char *);
+    void                On_start_class(const char *);
+    void                On_start_enum(const char *);
+    void                On_start_const(const char *);
+    void                On_start_volatile(const char *);
+    void                On_start_Bracket_Right(const char *);
+    void                On_start_DoubleColon(const char *);
+    void                On_start_BuiltInType(const char *);
+    void                On_start_TypeSpecializer(const char *);
+    void                On_start_typename(const char *);
+
+    void                On_expect_namesegment_Identifier(const char *);
+
+    void                On_after_namesegment_const(const char *);
+    void                On_after_namesegment_volatile(const char *);
+    void                On_after_namesegment_Bracket_Left(const char *);
+    void                On_after_namesegment_DoubleColon(const char *);
+    void                On_after_namesegment_Less(const char *);
+    void                On_after_namesegment_Asterix(const char *);
+    void                On_after_namesegment_AmpersAnd(const char *);
+
+    void                On_afterclass_expect_semicolon_Semicolon(const char *);
+
+    void                On_within_template_Comma(const char *);
+    void                On_within_template_Greater(const char *);
+    void                On_within_template_Constant(const char *);
+    void                On_within_template_TypeStart(const char *);
+
+    void                On_within_indirection_const(const char *);
+    void                On_within_indirection_volatile(const char *);
+    void                On_within_indirection_Asterix(const char *);
+    void                On_within_indirection_AmpersAnd(const char *);
+
+    bool                IsType() const;
+
+    // DATA
+    Dyn< PeStatusArray<PE_Type> >
+                        pStati;
+
+    Dyn<SP_Type>        pSpType;
+    Dyn<SPU_Type>       pSpuType_TemplateParameter;
+    Dyn<SP_Class>       pSpClass;
+    Dyn<SPU_Class>      pSpuClass;
+    Dyn<SP_Enum>        pSpEnum;
+    Dyn<SPU_Enum>       pSpuEnum;
+
+    Dyn<ary::cpp::UsedType>
+                        pType;
+    ary::cpp::ut::List_TplParameter *
+                        pCurTemplate_ParameterList;
+    String              sOwningClassName;
+    String              sParsedClass_Name;
+
+    const ary::cpp::Type *
+                        pResult_Type;
+    E_KindOfResult      eResult_KindOf;
+    bool                bIsCastOperatorType;
+};
+
+
+
+// IMPLEMENTATION
+
+
+inline const ary::cpp::Type &
+PE_Type::Result_Type() const
+    { csv_assert(pResult_Type != 0);
+      return *pResult_Type; }
+inline PE_Type::E_KindOfResult
+PE_Type::Result_KindOf() const
+    { return eResult_KindOf; }
+
+
+}   // namespace cpp
+
+
+#endif
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_vafu.cxx b/autodoc/source/parser/cpp/pe_vafu.cxx
new file mode 100644
index 000000000000..ca9a538f544e
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_vafu.cxx
@@ -0,0 +1,651 @@
+/* -*- 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 <precomp.h>
+#include "pe_vafu.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <ary/cpp/c_class.hxx>
+#include <ary/cpp/c_vari.hxx>
+#include <ary/cpp/c_vfflag.hxx>
+#include <ary/cpp/cp_ce.hxx>
+#include <ary/cpp/inpcontx.hxx>
+#include "pe_type.hxx"
+#include "pe_vari.hxx"
+#include "pe_funct.hxx"
+#include "pe_ignor.hxx"
+#include <x_parse.hxx>
+
+
+
+
+namespace cpp {
+
+
+
+//***********************       PE_VarFunc      ***********************//
+
+
+PE_VarFunc::PE_VarFunc( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_VarFunc> ),
+        // pSpType,
+        // pSpuType,
+        // pSpVariable,
+        // pSpuVariable,
+        // pSpFunction,
+        // pSpuFunctionStd,
+        // pSpuFunctionCtor,
+        // pSpuFunctionDtor,
+        // pSpuFunctionCastOperator,
+        // pSpuFunctionNormalOperator
+        // pSpIgnore,
+        // pSpuIgnore,
+        nCounter_TemplateBrackets(0),
+        bInDestructor(false),
+        // aResultIds,
+        nResultFrontType(0),
+        eResultType(result_unknown),
+        bVirtual(false),
+        bStatic(false),
+        bExtern(false),
+        bExternC(false),
+        bMutable(false),
+        bInline(false),
+        bRegister(false),
+        bExplicit(false)
+{
+    Setup_StatusFunctions();
+
+    pSpType             = new SP_Type(*this);
+    pSpuType            = new SPU_Type(*pSpType, 0, &PE_VarFunc::SpReturn_Type);
+    pSpVariable         = new SP_Variable(*this);
+    pSpuVariable        = new SPU_Variable(*pSpVariable, 0, &PE_VarFunc::SpReturn_Variable);
+    pSpFunction         = new SP_Function(*this);
+    pSpuFunctionStd     = new SPU_Function(*pSpFunction, &PE_VarFunc::SpInit_FunctionStd, &PE_VarFunc::SpReturn_FunctionStd);
+    pSpuFunctionCtor    = new SPU_Function(*pSpFunction, &PE_VarFunc::SpInit_FunctionCtor, &PE_VarFunc::SpReturn_FunctionStd);
+    pSpuFunctionDtor    = new SPU_Function(*pSpFunction, &PE_VarFunc::SpInit_FunctionDtor, &PE_VarFunc::SpReturn_FunctionStd);
+    pSpuFunctionCastOperator
+                        = new SPU_Function(*pSpFunction, &PE_VarFunc::SpInit_FunctionCastOperator, &PE_VarFunc::SpReturn_FunctionStd);
+    pSpuFunctionNormalOperator
+                        = new SPU_Function(*pSpFunction, &PE_VarFunc::SpInit_FunctionNormalOperator, &PE_VarFunc::SpReturn_FunctionStd);
+    pSpIgnore           = new SP_Ignore(*this);
+    pSpuIgnore          = new SPU_Ignore(*pSpIgnore, 0, &PE_VarFunc::SpReturn_Ignore);
+}
+
+PE_VarFunc::~PE_VarFunc()
+{
+}
+
+void
+PE_VarFunc::Call_Handler( const cpp::Token & i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_VarFunc::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_VarFunc>::F_Tok F_Tok;
+
+    static F_Tok stateF_start[] =           { &PE_VarFunc::On_start_Identifier,
+                                              &PE_VarFunc::On_start_operator,
+                                              &PE_VarFunc::On_start_TypeKey,
+                                              &PE_VarFunc::On_start_TypeKey,
+                                              &PE_VarFunc::On_start_TypeKey,
+                                              &PE_VarFunc::On_start_TypeKey,
+                                              &PE_VarFunc::On_start_virtual,
+                                              &PE_VarFunc::On_start_Tilde,
+                                              &PE_VarFunc::On_start_const,
+                                              &PE_VarFunc::On_start_volatile,
+                                              &PE_VarFunc::On_start_extern,
+                                              &PE_VarFunc::On_start_static,
+                                              &PE_VarFunc::On_start_mutable,
+                                              &PE_VarFunc::On_start_register,
+                                              &PE_VarFunc::On_start_inline,
+                                              &PE_VarFunc::On_start_explicit,
+                                              &PE_VarFunc::On_start_Bracket_Right,
+                                              &PE_VarFunc::On_start_Identifier,
+                                              &PE_VarFunc::On_start_typename,
+                                              &PE_VarFunc::On_start_Identifier,
+                                              &PE_VarFunc::On_start_Identifier };
+    static INT16 stateT_start[] =           { Tid_Identifier,
+                                              Tid_operator,
+                                              Tid_class,
+                                              Tid_struct,
+                                              Tid_union,
+                                              Tid_enum,
+                                              Tid_virtual,
+                                              Tid_Tilde,
+                                              Tid_const,
+                                              Tid_volatile,
+                                              Tid_extern,
+                                              Tid_static,
+                                              Tid_mutable,
+                                              Tid_register,
+                                              Tid_inline,
+                                              Tid_explicit,
+                                              Tid_Bracket_Right,
+                                              Tid_DoubleColon,
+                                              Tid_typename,
+                                              Tid_BuiltInType,
+                                              Tid_TypeSpecializer };
+
+    static F_Tok stateF_expectCtor[] =      { &PE_VarFunc::On_expectCtor_Bracket_Left };
+    static INT16 stateT_expectCtor[] =      { Tid_Bracket_Left };
+
+    static F_Tok stateF_afterClassDecl[] =  { &PE_VarFunc::On_afterClassDecl_Semicolon };
+    static INT16 stateT_afterClassDecl[] =  { Tid_Semicolon };
+
+    static F_Tok stateF_expectName[] =      { &PE_VarFunc::On_expectName_Identifier,
+                                              &PE_VarFunc::On_expectName_operator,
+                                              &PE_VarFunc::On_expectName_Bracket_Left };
+    static INT16 stateT_expectName[] =      { Tid_Identifier,
+                                              Tid_operator,
+                                              Tid_Bracket_Left };
+
+    static F_Tok stateF_afterName[] =       { &PE_VarFunc::On_afterName_ArrayBracket_Left,
+                                              &PE_VarFunc::On_afterName_Bracket_Left,
+                                              &PE_VarFunc::On_afterName_DoubleColon,
+                                              &PE_VarFunc::On_afterName_Semicolon,
+                                              &PE_VarFunc::On_afterName_Comma,
+                                              &PE_VarFunc::On_afterName_Assign,
+                                              &PE_VarFunc::On_afterName_Less };
+    static INT16 stateT_afterName[] =       { Tid_ArrayBracket_Left,
+                                              Tid_Bracket_Left,
+                                              Tid_DoubleColon,
+                                              Tid_Semicolon,
+                                              Tid_Comma,
+                                              Tid_Assign,
+                                              Tid_Less };
+
+    static F_Tok stateF_afterName_inErraneousTemplate[] =
+                                            { &PE_VarFunc::On_afterName_inErraneousTemplate_Less,
+                                              &PE_VarFunc::On_afterName_inErraneousTemplate_Greater };
+    static INT16 stateT_afterName_inErraneousTemplate[] =
+                                            { Tid_Less,
+                                              Tid_Greater };
+
+    static F_Tok stateF_finished[] =        { &PE_VarFunc::On_finished_Semicolon,
+                                              &PE_VarFunc::On_finished_Comma };
+    static INT16 stateT_finished[] =        { Tid_Semicolon,
+                                              Tid_Comma };
+
+    static F_Tok stateF_finishedIncludingFunctionImplementation[] =
+                                            { &PE_VarFunc::On_finishedIncludingFunctionImplementation_Default
+                                            };
+    static INT16 stateT_finishedIncludingFunctionImplementation[] =
+                                            { Tid_BuiltInType     // Just to have one entry, but it is default handled, too.
+                                            };
+
+    SEMPARSE_CREATE_STATUS(PE_VarFunc, start, Hdl_UnknownToken);
+    SEMPARSE_CREATE_STATUS(PE_VarFunc, expectCtor, Hdl_UnknownToken);
+    SEMPARSE_CREATE_STATUS(PE_VarFunc, afterClassDecl, Hdl_UnknownToken);
+    SEMPARSE_CREATE_STATUS(PE_VarFunc, expectName, Hdl_UnknownToken);
+    SEMPARSE_CREATE_STATUS(PE_VarFunc, afterName, Hdl_UnknownToken);
+    SEMPARSE_CREATE_STATUS(PE_VarFunc, afterName_inErraneousTemplate, On_afterName_inErraneousTemplate_Default);
+    SEMPARSE_CREATE_STATUS(PE_VarFunc, finished, On_finished_Default);
+    SEMPARSE_CREATE_STATUS(PE_VarFunc, finishedIncludingFunctionImplementation, On_finishedIncludingFunctionImplementation_Default);
+}
+
+void
+PE_VarFunc::InitData()
+{
+    pStati->SetCur(start);
+    csv::erase_container(aResultIds);
+
+    nCounter_TemplateBrackets = 0;
+    bInDestructor = false;
+
+    nResultFrontType = 0;
+    eResultType = result_unknown;
+    sName.clear();
+    bVirtual = ary::cpp::VIRTUAL_none;
+    bStatic = false;
+    bExtern = false;
+    bExternC = false;
+    bMutable = false;
+    bInline = false;
+    bRegister = false;
+    bExplicit = false;
+}
+
+void
+PE_VarFunc::TransferData()
+{
+    pStati->SetCur(size_of_states);
+}
+
+void
+PE_VarFunc::Hdl_UnknownToken( const char *)
+{
+    pSpuIgnore->Push(not_done);
+}
+
+void
+PE_VarFunc::SpInit_FunctionStd()
+{
+    if ( nResultFrontType.IsValid() AND sName.length() > 0 )
+    {
+        pSpuFunctionStd->Child().Init_Std(
+                                       sName,
+                                       nResultFrontType,
+                                       bVirtual,
+                                       CreateFunctionFlags() );
+    }
+    else
+    {
+        throw X_Parser( X_Parser::x_UnexpectedToken,
+                        "",
+                        Env().CurFileName(),
+                        Env().LineCount() );
+    }
+}
+
+void
+PE_VarFunc::SpInit_FunctionCtor()
+{
+    ary::cpp::Class * pOwnerClass = Env().Context().CurClass();
+    csv_assert( pOwnerClass != 0 );
+    pSpuFunctionStd->Child().Init_Ctor( pOwnerClass->LocalName(),
+                                        CreateFunctionFlags() );
+}
+
+void
+PE_VarFunc::SpInit_FunctionDtor()
+{
+    pSpuFunctionStd->Child().Init_Dtor( sName,
+                                        bVirtual,
+                                        CreateFunctionFlags() );
+}
+
+void
+PE_VarFunc::SpInit_FunctionCastOperator()
+{
+    pSpuFunctionStd->Child().Init_CastOperator( bVirtual,
+                                                CreateFunctionFlags() );
+}
+
+void
+PE_VarFunc::SpInit_FunctionNormalOperator()
+{
+    pSpuFunctionStd->Child().Init_NormalOperator( nResultFrontType,
+                                                  bVirtual,
+                                                  CreateFunctionFlags() );
+}
+
+void
+PE_VarFunc::SpReturn_Type()
+{
+    switch ( pSpuType->Child().Result_KindOf() )
+    {
+        case PE_Type::is_type:
+                            pStati->SetCur(expectName);
+                            nResultFrontType
+                                    = pSpuType->Child().Result_Type().Id();
+                            break;
+        case PE_Type::is_constructor:
+                            pStati->SetCur(expectCtor);
+                            eResultType = result_function;
+                            break;
+        case PE_Type::is_explicit_class_declaration:
+        case PE_Type::is_explicit_enum_declaration:
+                            pStati->SetCur(afterClassDecl);
+                            eResultType = result_ignore;
+                            break;
+        case PE_Type::is_class_predeclaration:
+                            pStati->SetCur(afterClassDecl);
+                            eResultType = result_ignore;
+                            break;
+        default:
+                            ;
+    }
+}
+
+void
+PE_VarFunc::SpReturn_Variable()
+{
+    typedef ary::cpp::VariableFlags  VarFlags;
+
+    if ( NOT bExtern )
+    {
+        VarFlags aFlags( UINT16(
+                           ( bStatic AND Env().Context().CurClass() == 0 ? VarFlags::f_static_local : 0 )
+                         | ( bStatic AND Env().Context().CurClass() != 0 ? VarFlags::f_static_member : 0 )
+                         | ( bMutable  ? VarFlags::f_mutable : 0 ) )
+                       );
+
+//      ary::S_InitData aData( 0, Env().CurCeSpace().Id(), i_sName, 0 );
+        ary::cpp::Variable & rCurParsedVariable
+                = Env().AryGate().Ces().Store_Variable( Env().Context(),
+                                                    sName,
+                                                    nResultFrontType,
+                                                    aFlags,
+                                                    pSpuVariable->Child().Result_SizeExpression(),
+                                                    pSpuVariable->Child().Result_InitExpression() );
+        Env().Event_Store_Variable(rCurParsedVariable);
+        aResultIds.push_back( rCurParsedVariable.CeId() );
+        eResultType = result_variable;
+    }
+    else if (bExtern)
+    {
+        eResultType = result_ignore;
+    }
+
+    pStati->SetCur(finished);
+}
+
+void
+PE_VarFunc::SpReturn_FunctionStd()
+{
+    if ( (NOT bExtern) OR bExternC )
+    {
+        aResultIds.push_back(pSpuFunctionStd->Child().Result_Id());
+        eResultType = result_function;
+    }
+    else
+    {
+        eResultType = result_ignore;
+    }
+
+    if ( NOT pSpuFunctionStd->Child().Result_WithImplementation() )
+        pStati->SetCur(finished);
+    else
+        pStati->SetCur(finishedIncludingFunctionImplementation);
+}
+
+void
+PE_VarFunc::SpReturn_Ignore()
+{
+    pStati->SetCur(finished);
+}
+
+void
+PE_VarFunc::On_start_Identifier(const char *)
+{
+    pSpuType->Push(not_done);
+}
+
+void
+PE_VarFunc::On_start_operator(const char *)
+{
+    pSpuFunctionCastOperator->Push(done);
+}
+
+void
+PE_VarFunc::On_start_TypeKey(const char *)
+{
+    pSpuType->Push(not_done);
+}
+
+void
+PE_VarFunc::On_start_virtual(const char *)
+{
+    SetTokenResult(done, stay);
+    bVirtual = true;
+}
+
+void
+PE_VarFunc::On_start_Tilde(const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expectName);
+
+    bInDestructor = true;
+}
+
+void
+PE_VarFunc::On_start_const(const char *)
+{
+    pSpuType->Push(not_done);
+}
+
+void
+PE_VarFunc::On_start_volatile(const char *)
+{
+    pSpuType->Push(not_done);
+}
+
+void
+PE_VarFunc::On_start_extern(const char *)
+{
+    SetTokenResult(done, stay);
+    bExtern = true;
+}
+
+void
+PE_VarFunc::On_start_static(const char *)
+{
+    SetTokenResult(done, stay);
+    bStatic = true;
+}
+
+void
+PE_VarFunc::On_start_mutable(const char *)
+{
+    SetTokenResult(done, stay);
+    bMutable = true;
+}
+
+void
+PE_VarFunc::On_start_register(const char *)
+{
+    SetTokenResult(done, stay);
+    bRegister = true;
+}
+
+void
+PE_VarFunc::On_start_inline(const char *)
+{
+       SetTokenResult(done, stay);
+
+    bInline = true;
+}
+
+void
+PE_VarFunc::On_start_explicit(const char *)
+{
+    SetTokenResult(done, stay);
+    bExplicit = true;
+}
+
+void
+PE_VarFunc::On_start_Bracket_Right(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_VarFunc::On_start_typename(const char *)
+{
+    pSpuType->Push(not_done);
+}
+
+void
+PE_VarFunc::On_expectCtor_Bracket_Left(const char *)
+{
+    pSpuFunctionCtor->Push(not_done);
+}
+
+void
+PE_VarFunc::On_afterClassDecl_Semicolon(const char *)
+{
+    SetTokenResult(done, pop_success);
+}
+
+void
+PE_VarFunc::On_expectName_Identifier(const char * i_sText)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(afterName);
+    sName = i_sText;
+}
+
+void
+PE_VarFunc::On_expectName_operator(const char *)
+{
+    pSpuFunctionNormalOperator->Push(done);
+}
+
+void
+PE_VarFunc::On_expectName_Bracket_Left(const char *)
+{
+    // Function pointer declaration
+    pSpuIgnore->Push(not_done);
+    // TODO
+}
+
+
+void
+PE_VarFunc::On_afterName_ArrayBracket_Left(const char *)
+{
+    pSpuVariable->Push(not_done);
+}
+
+void
+PE_VarFunc::On_afterName_Bracket_Left(const char *)
+{
+    if ( NOT bInDestructor)
+        pSpuFunctionStd->Push(not_done);
+    else
+        pSpuFunctionDtor->Push(not_done);
+}
+
+void
+PE_VarFunc::On_afterName_DoubleColon(const char *)
+{
+    pSpuIgnore->Push(done);   // This seems to be only an implementation.
+
+    // This may have been a template.
+    // In that case, the declaration needs to be closed.
+    Env().Close_OpenTemplate();
+}
+
+void
+PE_VarFunc::On_afterName_Semicolon(const char *)
+{
+    pSpuVariable->Push(not_done);
+}
+
+void
+PE_VarFunc::On_afterName_Comma(const char *)
+{
+    pSpuVariable->Push(not_done);
+}
+
+void
+PE_VarFunc::On_afterName_Assign(const char * )
+{
+    pSpuVariable->Push(not_done);
+}
+
+void
+PE_VarFunc::On_afterName_Less(const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(afterName_inErraneousTemplate);
+
+    nCounter_TemplateBrackets = 1;
+}
+
+void
+PE_VarFunc::On_afterName_inErraneousTemplate_Less(const char * )
+{
+    SetTokenResult(done, stay);
+
+    nCounter_TemplateBrackets++;
+}
+
+void
+PE_VarFunc::On_afterName_inErraneousTemplate_Greater(const char * )
+{
+    SetTokenResult(done, stay);
+
+    nCounter_TemplateBrackets--;
+    if ( nCounter_TemplateBrackets == 0 )
+        pStati->SetCur(afterName);
+}
+
+void
+PE_VarFunc::On_afterName_inErraneousTemplate_Default(const char * )
+{
+    SetTokenResult(done, stay);
+}
+
+void
+PE_VarFunc::On_finished_Semicolon(const char * )  // Should be Semicolon !!!
+{
+    SetTokenResult(done, pop_success);
+}
+
+void
+PE_VarFunc::On_finished_Comma(const char * )
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(expectName);
+}
+
+void
+PE_VarFunc::On_finished_Default(const char * )
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_VarFunc::On_finishedIncludingFunctionImplementation_Default(const char * )
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+ary::cpp::FunctionFlags
+PE_VarFunc::CreateFunctionFlags()
+{
+    typedef ary::cpp::FunctionFlags  FuncFlags;
+
+    return FuncFlags(     UINT16(
+                            ( bStatic AND Env().Context().CurClass() == 0 ? FuncFlags::f_static_local : 0 )
+                          | ( bStatic AND Env().Context().CurClass() != 0 ? FuncFlags::f_static_member : 0 )
+                          | ( bExtern ? FuncFlags::f_extern : 0 )
+                          | ( Env().IsExternC() ? FuncFlags::f_externC : 0 )
+                          | ( bMutable  ? FuncFlags::f_mutable : 0 )
+                          | ( bInline  ? FuncFlags::f_inline : 0 )
+                          | ( bRegister  ? FuncFlags::f_register : 0 )
+                          | ( bExplicit  ? FuncFlags::f_explicit : 0 ) )
+                        );
+
+}
+
+
+}   // namespace cpp
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_vafu.hxx b/autodoc/source/parser/cpp/pe_vafu.hxx
new file mode 100644
index 000000000000..c31bbb5daf47
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_vafu.hxx
@@ -0,0 +1,292 @@
+/* -*- 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 ADC_CPP_PE_VAFU_HXX
+#define ADC_CPP_PE_VAFU_HXX
+
+// BASE CLASSES
+#include "cpp_pe.hxx"
+// USED SERVICES
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_vfflag.hxx>
+
+
+
+namespace cpp
+{
+
+class PE_Type;
+class PE_Variable;
+class PE_Function;
+class PE_Ignore;
+
+
+
+
+class PE_VarFunc : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        start,
+        expectCtor,
+        afterClassDecl,     // Also used for after enum declaration.
+        expectName,
+        afterName,
+        afterName_inErraneousTemplate,
+        finished,
+        finishedIncludingFunctionImplementation,
+        size_of_states
+    };
+    enum E_ResultType
+    {
+        result_unknown = 0,
+        result_ignore,          /// Used for class and enum declarations and predeclarations and for extern variables and functions.
+        result_variable,
+        result_function
+    };
+
+    typedef ary::cpp::E_Protection              E_Protection;
+
+
+                        PE_VarFunc(
+                            Cpp_PE *            i_pParent );
+                        ~PE_VarFunc();
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+    const std::vector<ary::cpp::Ce_id> &
+                        Result_Ids() const;
+    ary::cpp::Type_id   Result_FrontType() const;
+    const StringVector &
+                        Result_Names() const;
+    E_ResultType        Result_CeType() const;
+
+  private:
+    typedef SubPe< PE_VarFunc, PE_Type >        SP_Type;
+    typedef SubPeUse< PE_VarFunc, PE_Type >     SPU_Type;
+    typedef SubPe< PE_VarFunc, PE_Variable >    SP_Variable;
+    typedef SubPeUse< PE_VarFunc, PE_Variable > SPU_Variable;
+    typedef SubPe< PE_VarFunc, PE_Function >    SP_Function;
+    typedef SubPeUse< PE_VarFunc, PE_Function > SPU_Function;
+    typedef SubPe< PE_VarFunc, PE_Ignore >      SP_Ignore;
+    typedef SubPeUse< PE_VarFunc, PE_Ignore >   SPU_Ignore;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_UnknownToken( const char *);
+
+    void                SpInit_FunctionStd();
+    void                SpInit_FunctionCtor();
+    void                SpInit_FunctionDtor();
+    void                SpInit_FunctionCastOperator();
+    void                SpInit_FunctionNormalOperator();
+    void                SpReturn_Type();
+    void                SpReturn_Variable();
+    void                SpReturn_FunctionStd();
+    void                SpReturn_Ignore();
+
+    void                On_start_Identifier(const char * i_sText);
+    void                On_start_operator(const char * i_sText);
+    void                On_start_TypeKey(const char * i_sText);
+    void                On_start_virtual(const char * i_sText);
+    void                On_start_Tilde(const char * i_sText);
+    void                On_start_const(const char * i_sText);
+    void                On_start_volatile(const char * i_sText);
+    void                On_start_extern(const char * i_sText);
+    void                On_start_static(const char * i_sText);
+    void                On_start_mutable(const char * i_sText);
+    void                On_start_register(const char * i_sText);
+    void                On_start_inline(const char * i_sText);
+    void                On_start_explicit(const char * i_sText);
+    void                On_start_Bracket_Right(const char * i_sText);
+    void                On_start_typename(const char * i_sText);
+
+    void                On_expectCtor_Bracket_Left(const char * i_sText);
+
+    void                On_afterClassDecl_Semicolon(const char * i_sText);
+
+    void                On_expectName_Identifier(const char * i_sText);
+    void                On_expectName_operator(const char * i_sText);
+    void                On_expectName_Bracket_Left(const char * i_sText);
+
+    void                On_afterName_ArrayBracket_Left(const char * i_sText);
+    void                On_afterName_Bracket_Left(const char * i_sText);
+    void                On_afterName_DoubleColon(const char * i_sText);
+    void                On_afterName_Semicolon(const char * i_sText);
+    void                On_afterName_Comma(const char * i_sText);
+    void                On_afterName_Assign(const char * i_sText);
+    void                On_afterName_Less(const char * i_sText);
+
+    void                On_afterName_inErraneousTemplate_Less(const char * i_sText);
+    void                On_afterName_inErraneousTemplate_Greater(const char * i_sText);
+    void                On_afterName_inErraneousTemplate_Default(const char * i_sText);
+
+    void                On_finished_Semicolon(const char * i_sText);
+    void                On_finished_Comma(const char * i_sText);
+    void                On_finished_Default(const char * i_sText);
+
+    void                On_finishedIncludingFunctionImplementation_Default(const char * i_sText);
+
+    ary::cpp::FunctionFlags
+                        CreateFunctionFlags();
+
+    // DATA
+    Dyn< PeStatusArray<PE_VarFunc> >
+                        pStati;
+
+    Dyn<SP_Type>        pSpType;
+    Dyn<SPU_Type>       pSpuType;
+    Dyn<SP_Variable>    pSpVariable;
+    Dyn<SPU_Variable>   pSpuVariable;
+    Dyn<SP_Function>    pSpFunction;
+    Dyn<SPU_Function>   pSpuFunctionStd;
+    Dyn<SPU_Function>   pSpuFunctionCtor;
+    Dyn<SPU_Function>   pSpuFunctionDtor;
+    Dyn<SPU_Function>   pSpuFunctionCastOperator;
+    Dyn<SPU_Function>   pSpuFunctionNormalOperator;
+    Dyn<SP_Ignore>      pSpIgnore;
+    Dyn<SPU_Ignore>     pSpuIgnore;
+
+    intt                nCounter_TemplateBrackets;
+    bool                bInDestructor;
+
+    std::vector<ary::cpp::Ce_id>
+                        aResultIds;
+    ary::cpp::Type_id   nResultFrontType;
+    E_ResultType        eResultType;
+
+    // Pre-Results
+    String              sName;
+
+    bool                bVirtual;
+    bool                bStatic;
+    bool                bExtern;
+    bool                bExternC;
+    bool                bMutable;
+    bool                bInline;
+    bool                bRegister;
+    bool                bExplicit;
+};
+
+
+
+// IMPLEMENTATION
+
+inline const std::vector<ary::cpp::Ce_id> &
+PE_VarFunc::Result_Ids() const
+    { return aResultIds; }
+inline ary::cpp::Type_id
+PE_VarFunc::Result_FrontType() const
+    { return nResultFrontType; }
+inline PE_VarFunc::E_ResultType
+PE_VarFunc::Result_CeType() const
+    { return eResultType; }
+
+
+
+}   // namespace cpp
+
+
+
+
+#endif
+
+
+/*  // Overview of Stati
+
+Undecided
+---------
+
+start           // vor und w�hrend storage class specifiern
+    any         ->stay
+    operaator   ->goto Function
+
+->Typ
+
+expectName
+    Identifier  ->stay
+    operator    ->goto Function
+
+afterName       ->goto Variable or Function
+
+
+
+
+Variable
+--------
+
+start           // vor und w�hrend storage class specifiern
+
+->Typ
+
+expectName      // Typ ist da  -> im Falle von '(': notyetimplemented
+afterName
+
+expectSize      // after [
+expectFinish
+                // vor ; oder ,
+expectNextVarName  // anders als bei expectName kann hier auch * oder & kommen
+
+
+
+
+
+Function
+--------
+
+start               // vor und w�hrend storage class specifiern
+
+->Typ
+
+expectName          // Typ ist da
+expectBracket       // Nach Name
+expectParameter     // nach ( oder ,
+-> Parameter
+after Parameters    // before const, volatile throw or = 0.
+after throw         // expect (
+expectException     // after (
+after exceptions    // = 0 oder ; oder ,
+
+
+expectNextVarName  // anders als bei expectName kann hier auch * oder & kommen
+
+
+
+
+
+
+
+*/
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_vari.cxx b/autodoc/source/parser/cpp/pe_vari.cxx
new file mode 100644
index 000000000000..f062c5a1901f
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_vari.cxx
@@ -0,0 +1,189 @@
+/* -*- 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 <precomp.h>
+#include "pe_vari.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include "pe_expr.hxx"
+
+
+
+
+namespace cpp {
+
+
+PE_Variable::PE_Variable( Cpp_PE * i_pParent )
+    :   Cpp_PE(i_pParent),
+        pStati( new PeStatusArray<PE_Variable> )
+        // pSpExpression,
+        // pSpuArraySizeExpression,
+        // pSpuInitExpression,
+        // sResultSizeExpression,
+        // sResultInitExpression
+{
+    Setup_StatusFunctions();
+
+    pSpExpression       = new SP_Expression(*this);
+
+    pSpuArraySizeExpression  = new SPU_Expression(*pSpExpression, 0, &PE_Variable::SpReturn_ArraySizeExpression);
+    pSpuInitExpression  = new SPU_Expression(*pSpExpression, 0, &PE_Variable::SpReturn_InitExpression);
+}
+
+PE_Variable::~PE_Variable()
+{
+}
+
+void
+PE_Variable::Call_Handler( const cpp::Token &   i_rTok )
+{
+    pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text());
+}
+
+void
+PE_Variable::Setup_StatusFunctions()
+{
+    typedef CallFunction<PE_Variable>::F_Tok    F_Tok;
+
+    static F_Tok stateF_afterName[] =       { &PE_Variable::On_afterName_ArrayBracket_Left,
+                                              &PE_Variable::On_afterName_Semicolon,
+                                              &PE_Variable::On_afterName_Comma,
+                                              &PE_Variable::On_afterName_Assign };
+    static INT16 stateT_afterName[] =       { Tid_ArrayBracket_Left,
+                                              Tid_Semicolon,
+                                              Tid_Comma,
+                                              Tid_Assign };
+    static F_Tok stateF_afterSize[] =       { &PE_Variable::On_afterSize_ArrayBracket_Right };
+    static INT16 stateT_afterSize[] =       { Tid_ArrayBracket_Right };
+    static F_Tok stateF_expectFinish[] =    { &PE_Variable::On_expectFinish_Bracket_Right,
+                                              &PE_Variable::On_expectFinish_Semicolon,
+                                              &PE_Variable::On_expectFinish_Comma };
+    static INT16 stateT_expectFinish[] =    { Tid_Bracket_Right,
+                                              Tid_Semicolon,
+                                              Tid_Comma };
+
+    SEMPARSE_CREATE_STATUS(PE_Variable, afterName, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Variable, afterSize, Hdl_SyntaxError);
+    SEMPARSE_CREATE_STATUS(PE_Variable, expectFinish, Hdl_SyntaxError);
+}
+
+void
+PE_Variable::InitData()
+{
+    pStati->SetCur(afterName);
+
+    sResultSizeExpression.clear();
+    sResultInitExpression.clear();
+}
+
+void
+PE_Variable::TransferData()
+{
+    pStati->SetCur(size_of_states);
+}
+
+void
+PE_Variable::Hdl_SyntaxError( const char * i_sText)
+{
+    StdHandlingOfSyntaxError(i_sText);
+}
+
+void
+PE_Variable::SpReturn_ArraySizeExpression()
+{
+    pStati->SetCur(afterSize);
+
+    sResultSizeExpression = pSpuArraySizeExpression->Child().Result_Text();
+}
+
+void
+PE_Variable::SpReturn_InitExpression()
+{
+    pStati->SetCur(expectFinish);
+
+    sResultInitExpression = pSpuInitExpression->Child().Result_Text();
+}
+
+void
+PE_Variable::On_afterName_ArrayBracket_Left(const char *)
+{
+    pSpuArraySizeExpression->Push(done);
+}
+
+void
+PE_Variable::On_afterName_Semicolon(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Variable::On_afterName_Comma(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Variable::On_afterName_Assign(const char *)
+{
+    pSpuInitExpression->Push(done);
+}
+
+void
+PE_Variable::On_afterSize_ArrayBracket_Right(const char *)
+{
+    SetTokenResult(done, stay);
+    pStati->SetCur(afterName);
+}
+
+void
+PE_Variable::On_expectFinish_Semicolon(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Variable::On_expectFinish_Comma(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+void
+PE_Variable::On_expectFinish_Bracket_Right(const char *)
+{
+    SetTokenResult(not_done, pop_success);
+}
+
+
+}   // namespace cpp
+
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pe_vari.hxx b/autodoc/source/parser/cpp/pe_vari.hxx
new file mode 100644
index 000000000000..58370616359a
--- /dev/null
+++ b/autodoc/source/parser/cpp/pe_vari.hxx
@@ -0,0 +1,132 @@
+/* -*- 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 ADC_CPP_PE_VARI_HXX
+#define ADC_CPP_PE_VARI_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cpp_pe.hxx"
+    // COMPONENTS
+#include <semantic/callf.hxx>
+#include <semantic/sub_peu.hxx>
+#include <ary/cpp/c_types4cpp.hxx>
+#include <ary/cpp/c_vfflag.hxx>
+    // PARAMETERS
+
+
+namespace cpp {
+
+class PE_Expression;
+
+
+class PE_Variable : public Cpp_PE
+{
+  public:
+    enum E_State
+    {
+        afterName,                  //
+        afterSize,                  // after ]
+        expectFinish,               // after InitExpression
+        size_of_states
+    };
+                        PE_Variable(
+                            Cpp_PE *            i_pParent );
+                        ~PE_Variable();
+
+    /** @return
+        Bit 0x0001 != 0, if there is a size and
+        bit 0x0002 != 0, if there is an initialisation.
+    */
+    UINT16              Result_Pattern() const;
+    const String  &     Result_SizeExpression() const;
+    const String  &     Result_InitExpression() const;
+
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok );
+
+  private:
+    typedef SubPe< PE_Variable, PE_Expression >         SP_Expression;
+    typedef SubPeUse< PE_Variable, PE_Expression>       SPU_Expression;
+
+    void                Setup_StatusFunctions();
+    virtual void        InitData();
+    virtual void        TransferData();
+    void                Hdl_SyntaxError(const char *);
+
+    void                SpReturn_ArraySizeExpression();
+    void                SpReturn_InitExpression();
+
+    void                On_afterName_ArrayBracket_Left(const char * i_sText);
+    void                On_afterName_Semicolon(const char * i_sText);
+    void                On_afterName_Comma(const char * i_sText);
+    void                On_afterName_Assign(const char * i_sText);
+
+    void                On_afterSize_ArrayBracket_Right(const char * i_sText);
+
+    void                On_expectFinish_Semicolon(const char * i_sText);
+    void                On_expectFinish_Comma(const char * i_sText);
+    void                On_expectFinish_Bracket_Right(const char * i_sText);
+
+    // DATA
+    Dyn< PeStatusArray<PE_Variable> >
+                        pStati;
+
+    Dyn<SP_Expression>  pSpExpression;
+    Dyn<SPU_Expression> pSpuArraySizeExpression;
+    Dyn<SPU_Expression> pSpuInitExpression;
+
+    String              sResultSizeExpression;
+    String              sResultInitExpression;
+};
+
+
+
+// IMPLEMENTATION
+
+
+inline UINT16
+PE_Variable::Result_Pattern() const
+    { return ( sResultSizeExpression.length() > 0 ? 1 : 0 )
+             + ( sResultInitExpression.length() > 0 ? 2 : 0 ); }
+inline const String  &
+PE_Variable::Result_SizeExpression() const
+    { return sResultSizeExpression; }
+inline const String  &
+PE_Variable::Result_InitExpression() const
+    { return sResultInitExpression; }
+
+
+}   // namespace cpp
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/pev.hxx b/autodoc/source/parser/cpp/pev.hxx
new file mode 100644
index 000000000000..31a873ef7f0f
--- /dev/null
+++ b/autodoc/source/parser/cpp/pev.hxx
@@ -0,0 +1,306 @@
+/* -*- 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 ADC_CPP_PEV_HXX
+#define ADC_CPP_PEV_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tokproct.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/cpp/c_types4cpp.hxx>
+
+namespace ary
+{
+    namespace cpp
+    {
+        class Gate;
+        class InputContext;
+
+        class Namespace;
+        class Class;
+        class Enum;
+        class Typedef;
+        class Function;
+        class Variable;
+        class EnumValue;
+
+        class DefineEntity;
+    }
+
+    class Documentation;
+}
+
+
+namespace cpp
+{
+
+
+class PeEnvironment : protected TokenProcessing_Types
+{
+  public:
+    // INQUIRY
+    virtual             ~PeEnvironment() {}
+
+    // OPERATIONS
+        // Token results
+    void                SetTokenResult(
+                            E_TokenDone         i_eDone,
+                            E_EnvStackAction    i_eWhat2DoWithEnvStack,
+                            ParseEnvironment *  i_pParseEnv2Push = 0 );
+
+        // Owner stack
+    void                OpenNamespace(
+                            ary::cpp::Namespace &
+                                                io_rOpenedNamespace );
+    void                OpenExternC(
+                            bool                i_bOnlyForOneDeclaration = false );
+    void                OpenClass(
+                            ary::cpp::Class &   io_rOpenedClass );
+    void                OpenEnum(
+                            ary::cpp::Enum &    io_rOpenedEnum );
+    void                CloseBlock();           /// Handles a '}' on file scope.
+    void                CloseClass();
+    void                CloseEnum();
+    void                SetCurProtection(       /// Handles 'public:', 'protected:' and 'private:' on class scope.
+                            ary::cpp::E_Protection
+                                                i_eProtection );
+    void                OpenTemplate(
+                            const StringVector &
+                                                i_rParameters );
+    /// Removes parameters from this object.
+    DYN StringVector *  Get_CurTemplateParameters();
+    /// Checks, if a template is still open, and if yes, closes it.
+    void                Close_OpenTemplate();
+
+        // Special events
+    void                Event_Class_FinishedBase(
+                            const String  &     i_sParameterName );
+
+    void                Event_Store_Typedef(
+                            ary::cpp::Typedef & io_rTypedef );
+    void                Event_Store_EnumValue(
+                            ary::cpp::EnumValue &
+                                                io_rEnumValue );
+    void                Event_Store_CppDefinition(
+                            ary::cpp::DefineEntity  &
+                                                io_rDefinition );
+
+    void                Event_EnterFunction_ParameterList();
+    void                Event_Function_FinishedParameter(
+                            const String  &     i_sParameterName );
+    void                Event_LeaveFunction_ParameterList();
+    void                Event_EnterFunction_Implementation();
+    void                Event_LeaveFunction_Implementation();
+
+    void                Event_Store_Function(
+                            ary::cpp::Function &
+                                                io_rFunction );
+    void                Event_Store_Variable(
+                            ary::cpp::Variable &
+                                                io_rVariable );
+        // Error recovery
+    void                StartWaitingFor_Recovery();
+
+    // INQUIRY
+    ary::cpp::Gate &  AryGate() const;
+    const ary::cpp::InputContext &
+                        Context() const;
+    String              CurFileName() const;
+    uintt               LineCount() const;
+    bool                IsWaitingFor_Recovery() const;
+    bool                IsExternC() const;
+
+  private:
+    virtual void        do_SetTokenResult(
+                            E_TokenDone         i_eDone,
+                            E_EnvStackAction    i_eWhat2DoWithEnvStack,
+                            ParseEnvironment *  i_pParseEnv2Push ) = 0;
+    virtual void        do_OpenNamespace(
+                            ary::cpp::Namespace &
+                                                io_rOpenedNamespace ) = 0;
+    virtual void        do_OpenExternC(
+                            bool                i_bOnlyForOneDeclaration ) = 0;
+    virtual void        do_OpenClass(
+                            ary::cpp::Class &   io_rOpenedClass ) = 0;
+    virtual void        do_OpenEnum(
+                            ary::cpp::Enum &    io_rOpenedEnum ) = 0;
+    virtual void        do_CloseBlock() = 0;
+    virtual void        do_CloseClass() = 0;
+    virtual void        do_CloseEnum() = 0;
+    virtual void        do_SetCurProtection(
+                            ary::cpp::E_Protection
+                                                i_eProtection ) = 0;
+    virtual void        do_OpenTemplate(
+                            const StringVector &
+                                                i_rParameters ) = 0;
+    virtual DYN StringVector *
+                        do_Get_CurTemplateParameters() = 0;
+    virtual void        do_Close_OpenTemplate() = 0;
+    virtual void        do_Event_Class_FinishedBase(
+                            const String  &     i_sBaseName ) = 0;
+
+    virtual void        do_Event_Store_Typedef(
+                            ary::cpp::Typedef & io_rTypedef ) = 0;
+    virtual void        do_Event_Store_EnumValue(
+                            ary::cpp::EnumValue &
+                                                io_rEnumValue ) = 0;
+    virtual void        do_Event_Store_CppDefinition(
+                            ary::cpp::DefineEntity &
+                                                io_rDefinition ) = 0;
+    virtual void        do_Event_EnterFunction_ParameterList() = 0;
+    virtual void        do_Event_Function_FinishedParameter(
+                            const String  &     i_sParameterName ) = 0;
+    virtual void        do_Event_LeaveFunction_ParameterList() = 0;
+    virtual void        do_Event_EnterFunction_Implementation() = 0;
+    virtual void        do_Event_LeaveFunction_Implementation() = 0;
+    virtual void        do_Event_Store_Function(
+                            ary::cpp::Function &
+                                                io_rFunction ) = 0;
+    virtual void        do_Event_Store_Variable(
+                            ary::cpp::Variable &
+                                                io_rVariable ) = 0;
+    virtual void        do_StartWaitingFor_Recovery() = 0;
+    virtual ary::cpp::Gate &
+                        inq_AryGate() const = 0;
+    virtual const ary::cpp::InputContext &
+                        inq_Context() const = 0;
+    virtual String      inq_CurFileName() const = 0;
+    virtual uintt       inq_LineCount() const = 0;
+    virtual bool        inq_IsWaitingFor_Recovery() const = 0;
+    virtual bool        inq_IsExternC() const = 0;
+};
+
+
+
+// IMPLEMENTATION
+
+inline void
+PeEnvironment::SetTokenResult( E_TokenDone          i_eDone,
+                               E_EnvStackAction     i_eWhat2DoWithEnvStack,
+                               ParseEnvironment *   i_pParseEnv2Push )
+    { do_SetTokenResult(i_eDone, i_eWhat2DoWithEnvStack,  i_pParseEnv2Push); }
+inline void
+PeEnvironment::OpenNamespace( ary::cpp::Namespace & io_rOpenedNamespace )
+    { do_OpenNamespace(io_rOpenedNamespace); }
+inline void
+PeEnvironment::OpenExternC( bool i_bOnlyForOneDeclaration )
+    { do_OpenExternC(i_bOnlyForOneDeclaration); }
+inline void
+PeEnvironment::OpenClass( ary::cpp::Class & io_rOpenedClass )
+    { do_OpenClass(io_rOpenedClass); }
+inline void
+PeEnvironment::OpenEnum( ary::cpp::Enum & io_rOpenedEnum )
+    { do_OpenEnum(io_rOpenedEnum); }
+inline void
+PeEnvironment::CloseBlock()
+    { do_CloseBlock(); }
+inline void
+PeEnvironment::CloseClass()
+    { do_CloseClass(); }
+inline void
+PeEnvironment::CloseEnum()
+    { do_CloseEnum(); }
+inline void
+PeEnvironment::SetCurProtection( ary::cpp::E_Protection i_eProtection )
+    { do_SetCurProtection(i_eProtection); }
+inline void
+PeEnvironment::OpenTemplate( const StringVector & i_rParameters )
+    { do_OpenTemplate(i_rParameters); }
+inline DYN StringVector *
+PeEnvironment::Get_CurTemplateParameters()
+    { return do_Get_CurTemplateParameters(); }
+inline void
+PeEnvironment::Close_OpenTemplate()
+    { do_Close_OpenTemplate(); }
+inline void
+PeEnvironment::Event_Class_FinishedBase( const String  &  i_sBaseName )
+    { do_Event_Class_FinishedBase(i_sBaseName); }
+inline void
+PeEnvironment::Event_Store_Typedef( ary::cpp::Typedef & io_rTypedef )
+    { do_Event_Store_Typedef(io_rTypedef); }
+inline void
+PeEnvironment::Event_Store_EnumValue( ary::cpp::EnumValue & io_rEnumValue )
+    { do_Event_Store_EnumValue(io_rEnumValue); }
+inline void
+PeEnvironment::Event_Store_CppDefinition( ary::cpp::DefineEntity & io_rDefinition )
+    { do_Event_Store_CppDefinition(io_rDefinition); }
+inline void
+PeEnvironment::Event_EnterFunction_ParameterList()
+    { do_Event_EnterFunction_ParameterList(); }
+inline void
+PeEnvironment::Event_Function_FinishedParameter( const String  & i_sParameterName )
+    { do_Event_Function_FinishedParameter(i_sParameterName); }
+inline void
+PeEnvironment::Event_LeaveFunction_ParameterList()
+    { do_Event_LeaveFunction_ParameterList(); }
+inline void
+PeEnvironment::Event_EnterFunction_Implementation()
+    { do_Event_EnterFunction_Implementation(); }
+inline void
+PeEnvironment::Event_LeaveFunction_Implementation()
+    { do_Event_LeaveFunction_Implementation(); }
+inline void
+PeEnvironment::Event_Store_Function( ary::cpp::Function & io_rFunction )
+    { do_Event_Store_Function(io_rFunction); }
+inline void
+PeEnvironment::Event_Store_Variable( ary::cpp::Variable & io_rVariable )
+    { do_Event_Store_Variable(io_rVariable); }
+inline void
+PeEnvironment::StartWaitingFor_Recovery()
+    { do_StartWaitingFor_Recovery(); }
+inline ary::cpp::Gate &
+PeEnvironment::AryGate() const
+    { return inq_AryGate(); }
+inline const ary::cpp::InputContext &
+PeEnvironment::Context() const
+    { return inq_Context(); }
+inline String
+PeEnvironment::CurFileName() const
+    { return inq_CurFileName(); }
+inline uintt
+PeEnvironment::LineCount() const
+    { return inq_LineCount(); }
+inline bool
+PeEnvironment::IsWaitingFor_Recovery() const
+    { return inq_IsWaitingFor_Recovery(); }
+inline bool
+PeEnvironment::IsExternC() const
+    { return inq_IsExternC(); }
+
+
+
+}   // namespace cpp
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/preproc.cxx b/autodoc/source/parser/cpp/preproc.cxx
new file mode 100644
index 000000000000..856736b96442
--- /dev/null
+++ b/autodoc/source/parser/cpp/preproc.cxx
@@ -0,0 +1,233 @@
+/* -*- 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 <precomp.h>
+#include "preproc.hxx"
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/tpl/tpltools.hxx>
+#include "all_toks.hxx"
+#include "defdescr.hxx"
+#include <tools/tkpchars.hxx>
+#include "c_rcode.hxx"
+
+
+namespace cpp
+{
+
+
+PreProcessor::F_TOKENPROC PreProcessor::aTokProcs[PreProcessor::state_MAX] =
+    {
+        &PreProcessor::On_plain,
+        &PreProcessor::On_expect_macro_bracket_left,
+        &PreProcessor::On_expect_macro_param
+    };
+
+
+PreProcessor::PreProcessor()
+    :   pCppExplorer(0),
+        pSourceText(0),
+        pCurValidDefines(0),
+        // aTokens,
+        eState(plain),
+        pCurMacro(0),
+        dpCurMacroName(0),
+        // aCurMacroParams,
+        aCurParamText(60000),
+        nBracketInParameterCounter(0)
+        // aBlockedMacroNames
+{
+}
+
+PreProcessor::~PreProcessor()
+{
+}
+
+void
+PreProcessor::AssignPartners( CodeExplorer &      o_rCodeExplorer,
+                              CharacterSource &   o_rCharSource,
+                              const MacroMap &    i_rCurValidDefines )
+{
+    pCppExplorer = &o_rCodeExplorer;
+    pSourceText = &o_rCharSource;
+    pCurValidDefines = &i_rCurValidDefines;
+}
+
+void
+PreProcessor::Process_Token( cpp::Token & let_drToken )
+{
+    csv_assert(pCppExplorer != 0);  // Implies pSourceText and pCurValidDefines.
+
+    (this->*aTokProcs[eState])(let_drToken);
+}
+
+void
+PreProcessor::On_plain( cpp::Token & let_drToken )
+{
+    if ( let_drToken.TypeId() == Tid_Identifier )
+    {
+        if (CheckForDefine(let_drToken))
+            return;
+    }
+
+    pCppExplorer->Process_Token(let_drToken);
+}
+
+void
+PreProcessor::On_expect_macro_bracket_left( cpp::Token & let_drToken )
+{
+    if ( let_drToken.TypeId() == Tid_Bracket_Left )
+    {
+        aCurParamText.seekp(0);
+        eState = expect_macro_param;
+    }
+    else
+    {
+        pCppExplorer->Process_Token(*dpCurMacroName);
+        dpCurMacroName = 0;
+        pCppExplorer->Process_Token(let_drToken);
+        eState = plain;
+    }
+}
+
+void
+PreProcessor::On_expect_macro_param( cpp::Token & let_drToken )
+{
+    if ( let_drToken.TypeId() == Tid_Bracket_Left )
+        nBracketInParameterCounter++;
+    else if ( let_drToken.TypeId() == Tid_Bracket_Right )
+    {
+        if ( nBracketInParameterCounter > 0 )
+            nBracketInParameterCounter--;
+        else
+        {
+            if ( NOT csv::no_str(aCurParamText.c_str()) )
+            {
+                aCurMacroParams.push_back( String(aCurParamText.c_str()) );
+            }
+            csv_assert( aCurMacroParams.size() == pCurMacro->ParamCount() );
+
+            InterpretMacro();
+            eState = plain;
+            return;
+        }
+    }
+    else if ( let_drToken.TypeId() == Tid_Comma AND nBracketInParameterCounter == 0 )
+    {
+        aCurMacroParams.push_back( String (aCurParamText.c_str()) );
+        aCurParamText.seekp(0);
+        return;
+    }
+
+    // KORR_FUTURE:
+    //  If in future whitespace is parsed also, that should match exactly and the
+    //  safety spaces, " ", here should be removed.
+    aCurParamText << let_drToken.Text() << " ";
+}
+
+bool
+PreProcessor::CheckForDefine( cpp::Token & let_drToken )
+{
+    String  sTokenText(let_drToken.Text());
+     pCurMacro = csv::value_from_map( *pCurValidDefines, sTokenText );
+    if (pCurMacro == 0 )
+        return false;
+    for ( StringVector::const_iterator it = aBlockedMacroNames.begin();
+          it != aBlockedMacroNames.end();
+          ++it )
+    {
+        if ( strcmp( (*it).c_str(), let_drToken.Text() ) == 0 )
+            return false;
+    }
+
+    if ( pCurMacro->DefineType() == DefineDescription::type_define )
+    {
+        delete &let_drToken;
+
+        aCurParamText.seekp(0);
+        pCurMacro->GetDefineText(aCurParamText);
+
+        if ( aCurParamText.tellp() > 1 )
+            pSourceText->InsertTextAtCurPos(aCurParamText.c_str());
+    }
+    else // ( pCurMacro->DefineType() == DefineDescription::type_macro )
+    {
+        dpCurMacroName = &let_drToken;
+        eState = expect_macro_bracket_left;
+        csv::erase_container( aCurMacroParams );
+        aCurParamText.seekp(0);
+        nBracketInParameterCounter = 0;
+    }  // endif
+
+    return true;
+}
+
+void
+PreProcessor::UnblockMacro( const char * i_sMacroName )
+{
+    for ( StringVector::iterator it = aBlockedMacroNames.begin();
+          it != aBlockedMacroNames.end();
+          ++it )
+    {
+        if ( strcmp( (*it), i_sMacroName ) == 0 )
+        {
+            aBlockedMacroNames.erase(it);
+            break;
+        }
+    }   /// end for
+}
+
+void
+PreProcessor::InterpretMacro()
+{
+    aCurParamText.seekp(0);
+    pCurMacro->GetMacroText(aCurParamText, aCurMacroParams);
+
+    if ( NOT csv::no_str(aCurParamText.c_str()) )
+    {
+        aCurParamText.seekp(-1, csv::cur);
+        aCurParamText << " #unblock-" << dpCurMacroName->Text() << " ";
+
+        pSourceText->InsertTextAtCurPos(aCurParamText.c_str());
+        String  sCurMacroName(dpCurMacroName->Text());
+        aBlockedMacroNames.insert( aBlockedMacroNames.begin(), sCurMacroName );
+    }
+
+    delete dpCurMacroName;
+    dpCurMacroName = 0;
+    pCurMacro = 0;
+    csv::erase_container(aCurMacroParams);
+    aCurParamText.seekp(0);
+}
+
+
+}   // end namespace cpp
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/preproc.hxx b/autodoc/source/parser/cpp/preproc.hxx
new file mode 100644
index 000000000000..0f78e5affb1f
--- /dev/null
+++ b/autodoc/source/parser/cpp/preproc.hxx
@@ -0,0 +1,118 @@
+/* -*- 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 ADC_CPP_PREPROC_HXX
+#define ADC_CPP_PREPROC_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+#include <deque>
+    // PARAMETERS
+
+class CharacterSource;
+
+
+namespace cpp
+{
+
+class Token;
+class CodeExplorer;
+class DefineDescription;
+
+
+class PreProcessor
+{
+  public:
+    typedef std::map< String, DefineDescription* > MacroMap;
+
+    // LIFECYCLE
+                        PreProcessor();
+                        ~PreProcessor();
+    // OPERATONS
+    void                AssignPartners(
+                            CodeExplorer &      o_rCodeExplorer,
+                            CharacterSource &   o_rCharSource,
+                            const MacroMap &    i_rCurValidDefines );
+    void                Process_Token(
+                            cpp::Token &        let_drToken );
+    void                UnblockMacro(
+                            const char *        i_sMacroName );
+  private:
+    public: // Necessary for instantiation of static variable:
+    enum E_State
+    {
+        plain = 0,
+        expect_macro_bracket_left,
+        expect_macro_param,
+        state_MAX
+    };
+    typedef void (PreProcessor::*                   F_TOKENPROC )(cpp::Token &);
+    void                On_plain( cpp::Token & );
+    void                On_expect_macro_bracket_left( cpp::Token & );
+    void                On_expect_macro_param( cpp::Token & );
+
+    private:  // Reprivate again:
+    typedef std::deque< DYN cpp::Token * >          TokenQueue;
+    typedef StringVector                  List_MacroParams;
+
+
+    bool                CheckForDefine(
+                            cpp::Token &        let_drToken );
+    void                InterpretMacro();
+
+    // DATA
+    static F_TOKENPROC  aTokProcs[state_MAX];
+        // Referenced extern objects
+    CodeExplorer *      pCppExplorer;
+    CharacterSource *   pSourceText;
+    const MacroMap *    pCurValidDefines;
+
+        // internal data
+    TokenQueue          aTokens;
+
+    E_State             eState;
+
+    DefineDescription * pCurMacro;
+    DYN Token *         dpCurMacroName;
+    List_MacroParams    aCurMacroParams;
+    csv::StreamStr      aCurParamText;
+
+    intt                nBracketInParameterCounter;
+    StringVector        aBlockedMacroNames;
+};
+
+
+
+}   // end namespace cpp
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/prs_cpp.cxx b/autodoc/source/parser/cpp/prs_cpp.cxx
new file mode 100644
index 000000000000..6cda9eab509a
--- /dev/null
+++ b/autodoc/source/parser/cpp/prs_cpp.cxx
@@ -0,0 +1,250 @@
+/* -*- 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 <precomp.h>
+#include <cpp/prs_cpp.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/file.hxx>
+#include <ary/ary.hxx>
+#include <ary/cpp/c_gate.hxx>
+#include <autodoc/prs_docu.hxx>
+#include <autodoc/filecoli.hxx>
+#include <autodoc/x_parsing.hxx>
+#include <tools/tkpchars.hxx>
+#include <adc_cl.hxx>
+#include "c_dealer.hxx"
+#include "defdescr.hxx"
+#include "tkp_cpp.hxx"
+
+
+// Helper function
+static bool         Local_LoadFile(
+                        CharacterSource &       o_rTextBuffer,
+                        const String  &         i_rFullFilePath );
+
+
+
+
+namespace cpp
+{
+
+// This class is used for the UDK as workaround for the missing
+//   feature of parsing #define s.
+
+class Udk_MacroMap
+{
+  public:
+    typedef std::map< String , DefineDescription* > Data;
+
+                        Udk_MacroMap();
+                        ~Udk_MacroMap();
+
+    const Data &        GetData() const         { return aData; }
+
+  private:
+    Data                aData;
+};
+
+struct S_RunningData
+{
+    CharacterSource     aFileContent;
+    ary::cpp::Gate &    rCppGate;
+    Udk_MacroMap        aMacros;
+    Distributor         aDealer;
+    TokenParser_Cpp     aTkp;
+
+                            S_RunningData(
+                                ary::Repository &   o_rRepository,
+                                const autodoc::DocumentationParser_Ifc &
+                                                    i_rDocumentationInterpreter );
+};
+
+
+
+
+Cpluplus_Parser::Cpluplus_Parser()
+//    : pRunningData
+{
+}
+
+Cpluplus_Parser::~Cpluplus_Parser()
+{
+}
+
+void
+Cpluplus_Parser::Setup( ary::Repository &                        o_rRepository,
+                        const autodoc::DocumentationParser_Ifc & i_rDocumentationInterpreter )
+{
+    pRunningData = new S_RunningData(o_rRepository, i_rDocumentationInterpreter);
+}
+
+void
+Cpluplus_Parser::Run( const autodoc::FileCollector_Ifc &    i_rFiles )
+{
+    for ( autodoc::FileCollector_Ifc::const_iterator iter = i_rFiles.Begin();
+          iter != i_rFiles.End();
+          ++iter )
+    {
+        csv::ploc::Path
+            aFilePath(*iter);
+
+        try
+        {
+            if ( NOT Local_LoadFile(pRunningData->aFileContent, *iter) )
+                continue;
+            for ( pRunningData->aTkp.StartNewFile(aFilePath);
+                  pRunningData->aTkp.HasMore();
+                  pRunningData->aTkp.GetNextToken() )
+                ;
+        }
+        catch (autodoc::X_Parser_Ifc & rX_Parse)
+        {
+            if ( DEBUG_ShowStoring() OR DEBUG_ShowText() )
+                Cerr() << rX_Parse << Endl();
+        }
+        catch (...)
+        {
+            if ( DEBUG_ShowStoring() OR DEBUG_ShowText() )
+                Cerr() << "Error:  Unknown exception." << Endl();
+        }
+    }   // end for (iter)
+}
+
+S_RunningData::S_RunningData( ary::Repository &                        o_rRepository,
+                              const autodoc::DocumentationParser_Ifc & i_rDocumentationInterpreter )
+    :   aFileContent(),
+        rCppGate( o_rRepository.Gate_Cpp() ),
+        aMacros(),
+        aDealer(o_rRepository.Gate_Cpp()),
+        aTkp( * i_rDocumentationInterpreter.Create_DocuContext() )
+{
+    aDealer.AssignPartners( aFileContent,
+                            aMacros.GetData() );
+    aTkp.AssignPartners( aFileContent, aDealer );
+}
+
+
+Udk_MacroMap::Udk_MacroMap()
+{
+    String  sSAL_CALL("SAL_CALL");
+    String  sSAL_CALL_ELLIPSE("SAL_CALL_ELLIPSE");
+    String  sSAL_NO_VTABLE("SAL_NO_VTABLE");
+    String  sREGISTRY_CALLTYPE("REGISTRY_CALLTYPE");
+    String  sSAL_THROW("SAL_THROW");
+    String  sSAL_THROW_EXTERN_C("SAL_THROW_EXTERN_C");
+
+    String  s__DEF_COMPIMPLHELPER_A("__DEF_COMPIMPLHELPER_A");
+    String  s__DEF_COMPIMPLHELPER_B("__DEF_COMPIMPLHELPER_B");
+    String  s__DEF_COMPIMPLHELPER("__DEF_COMPIMPLHELPER");
+
+    String  s__DEF_IMPLHELPER_PRE("__DEF_IMPLHELPER_PRE");
+    String  s__IFC_WRITEOFFSET("__IFC_WRITEOFFSET");
+    String  s__DEF_IMPLHELPER_POST("__DEF_IMPLHELPER_POST");
+
+    String  sSAL_EXCEPTION_DLLPUBLIC_EXPORT("SAL_EXCEPTION_DLLPUBLIC_EXPORT");
+    String  sSAL_EXCEPTION_DLLPRIVATE("SAL_EXCEPTION_DLLPRIVATE");
+
+
+    StringVector aEmpty;
+
+    StringVector aParamsSAL_THROW;
+    aParamsSAL_THROW.push_back( String ("exc") );
+    StringVector aDefSAL_THROW;
+    aDefSAL_THROW.push_back( String ("throw") );
+    aDefSAL_THROW.push_back( String ("exc") );
+
+    StringVector aCompImplHelperParams;
+    aCompImplHelperParams.push_back(String ("N"));
+
+
+    // filling up the list
+
+
+    aData[sSAL_CALL] = new DefineDescription(sSAL_CALL, aEmpty);
+    aData[sSAL_CALL_ELLIPSE] = new DefineDescription(sSAL_CALL_ELLIPSE, aEmpty);
+    aData[sSAL_NO_VTABLE] = new DefineDescription(sSAL_NO_VTABLE, aEmpty);
+    aData[sREGISTRY_CALLTYPE] = new DefineDescription(sREGISTRY_CALLTYPE, aEmpty);
+
+    aData[sSAL_THROW] = new DefineDescription(sSAL_THROW, aParamsSAL_THROW, aDefSAL_THROW);
+    aData[sSAL_THROW_EXTERN_C] = new DefineDescription(sSAL_THROW_EXTERN_C, aEmpty, aEmpty);
+
+    aData[s__DEF_COMPIMPLHELPER_A]
+        = new DefineDescription( s__DEF_COMPIMPLHELPER_A, aCompImplHelperParams, aEmpty);
+    aData[s__DEF_COMPIMPLHELPER_B]
+        = new DefineDescription(s__DEF_COMPIMPLHELPER_B, aCompImplHelperParams, aEmpty);
+    aData[s__DEF_COMPIMPLHELPER]
+        = new DefineDescription(s__DEF_COMPIMPLHELPER, aCompImplHelperParams, aEmpty);
+
+    aData[s__DEF_IMPLHELPER_PRE]
+        = new DefineDescription(s__DEF_IMPLHELPER_PRE, aCompImplHelperParams, aEmpty);
+    aData[s__IFC_WRITEOFFSET]
+        = new DefineDescription(s__IFC_WRITEOFFSET, aCompImplHelperParams, aEmpty);
+    aData[s__DEF_IMPLHELPER_POST]
+        = new DefineDescription(s__DEF_IMPLHELPER_POST, aCompImplHelperParams, aEmpty);
+
+    aData[sSAL_EXCEPTION_DLLPUBLIC_EXPORT]
+        = new DefineDescription(sSAL_EXCEPTION_DLLPUBLIC_EXPORT, aEmpty);
+    aData[sSAL_EXCEPTION_DLLPRIVATE]
+        = new DefineDescription(sSAL_EXCEPTION_DLLPRIVATE, aEmpty);
+}
+
+Udk_MacroMap::~Udk_MacroMap()
+{
+    for ( Data::iterator it = aData.begin(); it != aData.end(); ++it )
+    {
+         delete (*it).second;
+    }
+}
+
+
+
+} // namespace cpp
+
+
+bool
+Local_LoadFile( CharacterSource &       o_rTextBuffer,
+                const String  &         i_rFullFilePath )
+{
+    Cout() << "Parse " << i_rFullFilePath << " ..." << Endl();
+
+    csv::File aFile( i_rFullFilePath, csv::CFM_READ );
+    if (NOT aFile.open())
+    {
+        Cerr() << "   could not be opened.\n" << Endl();
+        return false;
+    }
+    o_rTextBuffer.LoadText(aFile);
+    aFile.close();
+    return true;
+}
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/sdocdist.hxx b/autodoc/source/parser/cpp/sdocdist.hxx
new file mode 100644
index 000000000000..10e6fd4dced8
--- /dev/null
+++ b/autodoc/source/parser/cpp/sdocdist.hxx
@@ -0,0 +1,161 @@
+/* -*- 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 ADC_CPP_SDOCDIST_HXX
+#define ADC_CPP_SDOCDIST_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cxt2ary.hxx"
+#include <ary/info/docstore.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace cpp
+{
+
+using ary::Documentation;
+
+/** Implementation struct for cpp::ContextForAry.
+*/
+
+struct ContextForAry::S_DocuDistributor : public ary::info::DocuStore
+{
+  public:
+                        S_DocuDistributor()     :   pCurRe(0) {}
+                        ~S_DocuDistributor()    {}
+
+    void                Reset()                 { pCurRe = 0; pLastStoredDocu = 0; }
+
+    void                SetCurrentlyStoredRe(
+                            ary::cpp::CppEntity &
+                                                io_rRe );
+    void                Event_LineBreak();
+
+  private:
+    // Interface ary::info::DocuStore
+    virtual void        do_Store2CurFile(
+                            DYN ary::doc::Node& let_drDocu );
+    virtual void        do_Store2CurNamespace(
+                            DYN ary::doc::Node& let_drDocu );
+
+    virtual void        do_Store2ConnectedDeclaration(
+                            DYN ary::doc::Node& let_drDocu );
+
+    virtual void        do_Store2Glossary(
+                            DYN ary::doc::Node& let_drDocu,
+                            const String  &     i_sExplainedTerm );
+    virtual void        do_Store2GlobalTexts(
+                            DYN ary::doc::Node& let_drDocu,
+                            ary::info::GlobalTextId
+                                                i_nId );
+    // DATA
+    ary::cpp::CppEntity *
+                        pCurRe;
+    Dyn<ary::doc::Node> pLastStoredDocu;
+};
+
+
+// IMPLEMENTATION
+
+/*  The implementation is in header, though not all inline, because this file
+    is included in cxt2ary.cxx only!
+*/
+
+
+void
+ContextForAry::
+S_DocuDistributor::SetCurrentlyStoredRe( ary::cpp::CppEntity & io_rRe )
+{
+    pCurRe = &io_rRe;
+    if ( pLastStoredDocu )
+        pCurRe->Set_Docu( *pLastStoredDocu.Release() );
+}
+
+inline void
+ContextForAry::
+S_DocuDistributor::Event_LineBreak()
+{
+    pCurRe = 0;
+}
+
+void
+ContextForAry::
+S_DocuDistributor::do_Store2CurFile( DYN ary::doc::Node & let_drDocu )
+{
+    // KORR_FUTURE
+    delete &let_drDocu;
+}
+
+void
+ContextForAry::
+S_DocuDistributor::do_Store2CurNamespace( DYN ary::doc::Node & let_drDocu )
+{
+    // KORR_FUTURE
+    delete &let_drDocu;
+}
+
+void
+ContextForAry::
+S_DocuDistributor::do_Store2ConnectedDeclaration( DYN ary::doc::Node & let_drDocu )
+{
+    if ( pCurRe != 0 )
+        pCurRe->Set_Docu(let_drDocu);
+    else
+        pLastStoredDocu = &let_drDocu;
+}
+
+void
+ContextForAry::
+S_DocuDistributor::do_Store2Glossary( DYN ary::doc::Node & let_drDocu,
+                                      const String &           // i_sExplainedTerm
+                                      )
+{
+    // KORR_FUTURE
+    delete &let_drDocu;
+}
+
+void
+ContextForAry::
+S_DocuDistributor::do_Store2GlobalTexts( DYN ary::doc::Node &       let_drDocu,
+                                         ary::info::GlobalTextId    // i_nId
+                                       )
+{
+    // KORR_FUTURE
+    delete &let_drDocu;
+}
+
+
+
+
+}   // namespace cpp
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/sfscope.hxx b/autodoc/source/parser/cpp/sfscope.hxx
new file mode 100644
index 000000000000..6f3eaa7b4225
--- /dev/null
+++ b/autodoc/source/parser/cpp/sfscope.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 ADC_CPP_SFSCOPE_HXX
+#define ADC_CPP_SFSCOPE_HXX
+
+// USED SERVICES
+#include "cxt2ary.hxx"
+
+
+
+
+namespace cpp
+{
+
+
+/** Implementation struct for cpp::ContextForAry.
+*/
+struct ContextForAry::S_FileScopeInfo
+{
+    ary::loc::File *    pCurFile;
+    uintt               nLineCount;
+    Dyn<StringVector>   pCurTemplateParameters;
+
+                        S_FileScopeInfo();
+};
+
+
+
+
+// IMPLEMENTATION
+inline
+ContextForAry::
+S_FileScopeInfo::S_FileScopeInfo()
+    :   pCurFile(0),
+        nLineCount(0),
+        pCurTemplateParameters(0)
+{
+}
+
+
+
+
+}   // namespace cpp
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/sownstck.hxx b/autodoc/source/parser/cpp/sownstck.hxx
new file mode 100644
index 000000000000..5c00e40dabf7
--- /dev/null
+++ b/autodoc/source/parser/cpp/sownstck.hxx
@@ -0,0 +1,327 @@
+/* -*- 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 ADC_CPP_SOWNSTCK_HXX
+#define ADC_CPP_SOWNSTCK_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cxt2ary.hxx"
+    // COMPONENTS
+#include <ary/cpp/c_types4cpp.hxx>
+#include <estack.hxx>
+    // PARAMETERS
+#include <ary/cpp/c_namesp.hxx>
+#include <x_parse.hxx>
+
+
+namespace cpp
+{
+
+using ary::cpp::E_Protection;
+
+
+/** Implementation struct for cpp::ContextForAry.
+*/
+struct ContextForAry::S_OwnerStack
+{
+  public:
+                        S_OwnerStack();
+    void                SetGlobalNamespace(
+                            ary::cpp::Namespace &
+                                                io_rGlobalNamespace );
+                        ~S_OwnerStack();
+
+    void                Reset();
+
+    void                OpenNamespace(
+                            ary::cpp::Namespace &
+                                                io_rOpenedNamespace );
+    void                OpenExternC();
+    void                OpenClass(
+                            ary::cpp::Class &   io_rOpenedClass );
+    void                OpenEnum(
+                            ary::cpp::Enum &    io_rOpenedEnum );
+    void                CloseBlock();
+    void                CloseClass();
+    void                CloseEnum();
+    void                SetCurProtection(
+                            ary::cpp::E_Protection
+                                                i_eProtection );
+    ary::cpp::Namespace &
+                        CurNamespace() const;
+    ary::cpp::Class *   CurClass() const;
+    ary::cpp::Enum *    CurEnum() const;
+
+    Owner &             CurOwner() const;
+    ary::cpp::E_Protection
+                        CurProtection() const;
+    bool                IsExternC() const       { return nExternC > 0; }
+
+  private:
+    typedef std::pair< ary::cpp::Class*, E_Protection >     ClassEnv;
+    typedef EStack< ary::cpp::Namespace* >                  Stack_Namespaces;
+    typedef EStack< ClassEnv >                              Stack_Classes;
+    typedef ary::cpp::InputContext::Owner                   Ifc_Owner;
+
+    void                SetOwner_2CurNamespace();
+    void                SetOwner_2CurClass();
+    void                SetOwner_2None();
+
+    // DATA
+    Stack_Namespaces    aStack_Namespaces;
+    Stack_Classes       aStack_Classes;
+    ary::cpp::Enum *    pCurEnum;
+    uintt               nExternC;               /// This is a number, for the case that extern "C" blocks are nested.
+
+    Dyn<Owner_Namespace>
+                        pOwner_Namespace;
+    Dyn<Owner_Class>    pOwner_Class;
+    Ifc_Owner *         pOwner_Cur;
+};
+
+
+// IMPLEMENTATION
+
+/*  The implementation is in header, though not inline, because this file is included
+    in cxt2ary.cxx only!
+*/
+
+inline ary::cpp::Namespace &
+ContextForAry::
+S_OwnerStack::CurNamespace() const
+{
+    csv_assert( aStack_Namespaces.size() > 0 );
+    return *aStack_Namespaces.top();
+}
+
+inline ary::cpp::Class *
+ContextForAry::
+S_OwnerStack::CurClass() const
+{
+    return aStack_Classes.size() > 0
+                ?   aStack_Classes.top().first
+                :   (ary::cpp::Class *) 0;
+}
+
+inline void
+ContextForAry::
+S_OwnerStack::SetOwner_2CurNamespace()
+{
+    csv_assert( aStack_Namespaces.size() > 0 );
+    pOwner_Cur = pOwner_Namespace.MutablePtr();
+    pOwner_Namespace->SetAnotherNamespace( CurNamespace() );
+}
+
+inline void
+ContextForAry::
+S_OwnerStack::SetOwner_2CurClass()
+{
+    csv_assert( aStack_Classes.size() > 0 );
+    pOwner_Cur = pOwner_Class.MutablePtr();
+    pOwner_Class->SetAnotherClass( *CurClass() );
+}
+
+ContextForAry::
+S_OwnerStack::S_OwnerStack()
+    :   // aStack_Namespaces,
+        // aStack_Classes,
+        pCurEnum(0),
+        nExternC(0),
+        pOwner_Namespace(new Owner_Namespace),
+        pOwner_Class(new Owner_Class),
+        pOwner_Cur(0)
+{
+}
+
+void
+ContextForAry::
+S_OwnerStack::Reset()
+{
+    while ( aStack_Namespaces.top()->Owner().IsValid() )
+        aStack_Namespaces.pop();
+    while ( NOT aStack_Classes.empty() )
+        aStack_Classes.pop();
+    pCurEnum = 0;
+    nExternC = 0;
+    SetOwner_2CurNamespace();
+}
+
+inline void
+ContextForAry::
+S_OwnerStack::SetGlobalNamespace( ary::cpp::Namespace & io_rGlobalNamespace )
+{
+    csv_assert( aStack_Namespaces.size() == 0 );
+    aStack_Namespaces.push(&io_rGlobalNamespace);
+    SetOwner_2CurNamespace();
+}
+
+ContextForAry::
+S_OwnerStack::~S_OwnerStack()
+{
+}
+
+inline void
+ContextForAry::
+S_OwnerStack::OpenNamespace( ary::cpp::Namespace & io_rOpenedNamespace )
+{
+    csv_assert( aStack_Namespaces.size() > 0  OR io_rOpenedNamespace.Parent() == 0 );
+    aStack_Namespaces.push(&io_rOpenedNamespace);
+    SetOwner_2CurNamespace();
+}
+
+inline void
+ContextForAry::
+S_OwnerStack::OpenExternC()
+{
+    ++nExternC;
+//    SetOwner_2None();
+}
+
+inline void
+ContextForAry::
+S_OwnerStack::SetCurProtection( ary::cpp::E_Protection i_eProtection )
+{
+    csv_assert( aStack_Classes.size() > 0 );
+    aStack_Classes.top().second = i_eProtection;
+}
+
+inline ary::cpp::Enum *
+ContextForAry::
+S_OwnerStack::CurEnum() const
+{
+    return pCurEnum;
+}
+
+
+inline ary::cpp::InputContext::Owner &
+ContextForAry::
+S_OwnerStack::CurOwner() const
+{
+    csv_assert( pOwner_Cur != 0 );
+    return *pOwner_Cur;
+}
+
+inline E_Protection
+ContextForAry::
+S_OwnerStack::CurProtection() const
+{
+    return aStack_Classes.size() > 0
+                ?   aStack_Classes.top().second
+                :   ary::cpp::PROTECT_global;
+}
+
+inline void
+ContextForAry::
+S_OwnerStack::SetOwner_2None()
+{
+    pOwner_Cur = 0;
+}
+
+void
+ContextForAry::
+S_OwnerStack::OpenClass( ary::cpp::Class & io_rOpenedClass )
+{
+    E_Protection eDefaultProtection
+            = io_rOpenedClass.ClassKey() == ary::cpp::CK_class
+                    ?   ary::cpp::PROTECT_private
+                    :   ary::cpp::PROTECT_public;
+    aStack_Classes.push( ClassEnv(&io_rOpenedClass, eDefaultProtection) );
+    SetOwner_2CurClass();
+}
+
+inline void
+ContextForAry::
+S_OwnerStack::OpenEnum( ary::cpp::Enum & io_rOpenedEnum )
+{
+    csv_assert( pCurEnum == 0 );
+    pCurEnum = &io_rOpenedEnum;
+    SetOwner_2None();
+}
+
+void
+ContextForAry::
+S_OwnerStack::CloseBlock()
+{
+    if (nExternC > 0)
+    {
+        --nExternC;
+    }
+    else
+    {
+        // csv_assert( aStack_Classes.size() == 0 );
+        if ( aStack_Classes.size() > 0 )
+            throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", String::Null_(), 0);
+
+        csv_assert( pCurEnum == 0 );
+        aStack_Namespaces.pop();
+
+        // csv_assert( aStack_Namespaces.size() > 0 );
+        if( aStack_Namespaces.size() == 0 )
+            throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", String::Null_(), 0);
+
+    }
+    SetOwner_2CurNamespace();
+}
+
+void
+ContextForAry::
+S_OwnerStack::CloseClass()
+{
+    // csv_assert( aStack_Classes.size() > 0 );
+    if ( aStack_Classes.size() == 0 )
+          throw X_Parser(X_Parser::x_UnspecifiedSyntaxError, "", String::Null_(), 0);
+
+    aStack_Classes.pop();
+    if ( aStack_Classes.size() > 0 )
+        SetOwner_2CurClass();
+    else
+        SetOwner_2CurNamespace();
+}
+
+void
+ContextForAry::
+S_OwnerStack::CloseEnum()
+{
+    csv_assert( pCurEnum != 0 );
+    pCurEnum = 0;
+    if ( aStack_Classes.size() > 0 )
+        SetOwner_2CurClass();
+    else
+        SetOwner_2CurNamespace();
+}
+
+
+}   // namespace cpp
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/srecover.hxx b/autodoc/source/parser/cpp/srecover.hxx
new file mode 100644
index 000000000000..8408604db3fd
--- /dev/null
+++ b/autodoc/source/parser/cpp/srecover.hxx
@@ -0,0 +1,134 @@
+/* -*- 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 ADC_CPP_SRECOVER_HXX
+#define ADC_CPP_SRECOVER_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include "cxt2ary.hxx"
+#include <ary/info/docstore.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace cpp
+{
+
+/** Implementation struct for cpp::ContextForAry.
+*/
+struct ContextForAry::S_RecoveryGuard
+{
+  public:
+                        S_RecoveryGuard();
+                        ~S_RecoveryGuard();
+
+    void                Reset()                 { bIsWithinRecovery = false; nBlockBracketsCounter = 0; }
+
+    void                StartWaitingFor_Recovery();
+
+    void                Hdl_SwBracketOpen();
+    void                Hdl_SwBracketClose();
+    void                Hdl_Semicolon();
+
+    bool                IsWithinRecovery() const;
+
+  private:
+    // DATA
+    bool                bIsWithinRecovery;
+    intt                nBlockBracketsCounter;
+};
+
+
+
+// IMPLEMENTATION
+
+/*  The implementation is in header, though not all inline, because this file
+    is included in cxt2ary.cxx only!
+*/
+
+ContextForAry::
+S_RecoveryGuard::S_RecoveryGuard()
+    :   bIsWithinRecovery(false),
+        nBlockBracketsCounter(0)
+{
+}
+
+ContextForAry::
+S_RecoveryGuard::~S_RecoveryGuard()
+{
+}
+
+inline void
+ContextForAry::
+S_RecoveryGuard::StartWaitingFor_Recovery()
+{
+    bIsWithinRecovery = true;
+    nBlockBracketsCounter = 0;
+}
+
+void
+ContextForAry::
+S_RecoveryGuard::Hdl_SwBracketOpen()
+{
+    if ( bIsWithinRecovery )
+        ++nBlockBracketsCounter;
+}
+
+void
+ContextForAry::
+S_RecoveryGuard::Hdl_SwBracketClose()
+{
+    if ( bIsWithinRecovery )
+        --nBlockBracketsCounter;
+}
+
+inline void
+ContextForAry::
+S_RecoveryGuard::Hdl_Semicolon()
+{
+    if (bIsWithinRecovery AND nBlockBracketsCounter == 0)
+       bIsWithinRecovery = false;
+}
+
+inline bool
+ContextForAry::
+S_RecoveryGuard::IsWithinRecovery() const
+{
+    return bIsWithinRecovery;
+}
+
+
+
+}   // namespace cpp
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/tkp_cpp.cxx b/autodoc/source/parser/cpp/tkp_cpp.cxx
new file mode 100644
index 000000000000..ffe0ca26dfdb
--- /dev/null
+++ b/autodoc/source/parser/cpp/tkp_cpp.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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "tkp_cpp.hxx"
+
+// NOT FULLY DECLARED SERVICES
+#include "cx_c_std.hxx"
+#include "c_dealer.hxx"
+
+
+namespace cpp {
+
+
+
+
+TokenParser_Cpp::TokenParser_Cpp( DYN autodoc::TkpDocuContext & let_drDocuContext )
+    :   pBaseContext( new Context_CppStd( let_drDocuContext ) ),
+        pCurContext(0),
+        pDealer(0),
+        pCharacterSource(0)
+{
+    SetStartContext();
+}
+
+TokenParser_Cpp::~TokenParser_Cpp()
+{
+}
+
+void
+TokenParser_Cpp::AssignPartners( CharacterSource &   io_rCharacterSource,
+                                 cpp::Distributor &  o_rDealer )
+{
+    pDealer = &o_rDealer;
+    pBaseContext->AssignDealer(o_rDealer);
+    pCharacterSource = &io_rCharacterSource;
+}
+
+void
+TokenParser_Cpp::StartNewFile( const csv::ploc::Path & i_file )
+{
+    csv_assert(pDealer != 0);
+    pDealer->StartNewFile(i_file);
+
+    csv_assert(pCharacterSource != 0);
+    Start(*pCharacterSource);
+}
+
+void
+TokenParser_Cpp::SetStartContext()
+{
+    pCurContext = pBaseContext.Ptr();
+}
+
+void
+TokenParser_Cpp::SetCurrentContext( TkpContext & io_rContext )
+{
+    pCurContext = &io_rContext;
+}
+
+TkpContext &
+TokenParser_Cpp::CurrentContext()
+{
+    return *pCurContext;
+}
+
+}   // namespace cpp
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/tkp_cpp.hxx b/autodoc/source/parser/cpp/tkp_cpp.hxx
new file mode 100644
index 000000000000..70dfab605c6f
--- /dev/null
+++ b/autodoc/source/parser/cpp/tkp_cpp.hxx
@@ -0,0 +1,101 @@
+/* -*- 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 ADC_TKP_CPP_HXX
+#define ADC_TKP_CPP_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkp.hxx>
+    // COMPONENTS
+    // PARAMETRS
+
+namespace autodoc
+{
+    class TkpDocuContext;
+}
+
+namespace csv
+{
+    namespace ploc
+    {
+        class Path;
+        class DirectoryChain;
+    }
+}
+
+
+namespace cpp {
+
+class Context_CppStd;
+class DefineDescription;
+class Distributor;
+
+
+/** This is a TokenParser which is able to parse tokens from
+    C++ source code.
+*/
+class TokenParser_Cpp : public TokenParser
+{
+  public:
+    typedef std::map< String, DefineDescription* >     MacroMap;
+
+    // LIFECYCLE
+                        TokenParser_Cpp(
+                            DYN autodoc::TkpDocuContext &
+                                                let_drDocuContext );
+    virtual             ~TokenParser_Cpp();
+
+    // OPERATIONS
+    void                AssignPartners(
+                            CharacterSource &   io_rCharacterSource,
+                            cpp::Distributor &  o_rDealer );
+    void                StartNewFile(
+                            const csv::ploc::Path &
+                                                i_file );
+  private:
+    virtual void        SetStartContext();
+    virtual void        SetCurrentContext(
+                            TkpContext &        io_rContext );
+    virtual TkpContext &
+                        CurrentContext();
+    // DATA
+    Dyn<Context_CppStd> pBaseContext;
+    TkpContext *        pCurContext;
+    Distributor *       pDealer;
+    CharacterSource *   pCharacterSource;
+};
+
+
+}   // namespace cpp
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/cpp/tokintpr.hxx b/autodoc/source/parser/cpp/tokintpr.hxx
new file mode 100644
index 000000000000..f526ba00ee06
--- /dev/null
+++ b/autodoc/source/parser/cpp/tokintpr.hxx
@@ -0,0 +1,120 @@
+/* -*- 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 ADC_CPP_TOKINTPR_HXX
+#define ADC_CPP_TOKINTPR_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <all_toks.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace cpp {
+
+
+
+#define DECL_TOK_HANDLER(token) \
+    void                Hdl_##token( \
+                            const Tok_##token & i_rTok ) { Call_Handler(i_rTok); }
+
+class TokenInterpreter
+{
+  public:
+    virtual             ~TokenInterpreter() {}
+
+                        DECL_TOK_HANDLER(Identifier)
+                        DECL_TOK_HANDLER(Operator)
+                        DECL_TOK_HANDLER(operator)
+                        DECL_TOK_HANDLER(class)
+                        DECL_TOK_HANDLER(struct)
+                        DECL_TOK_HANDLER(union)
+                        DECL_TOK_HANDLER(enum)
+                        DECL_TOK_HANDLER(typedef)
+                        DECL_TOK_HANDLER(public)
+                        DECL_TOK_HANDLER(protected)
+                        DECL_TOK_HANDLER(private)
+                        DECL_TOK_HANDLER(template)
+                        DECL_TOK_HANDLER(virtual)
+                        DECL_TOK_HANDLER(friend)
+                        DECL_TOK_HANDLER(Tilde)
+                        DECL_TOK_HANDLER(const)
+                        DECL_TOK_HANDLER(volatile)
+                        DECL_TOK_HANDLER(extern)
+                        DECL_TOK_HANDLER(static)
+                        DECL_TOK_HANDLER(mutable)
+                        DECL_TOK_HANDLER(register)
+                        DECL_TOK_HANDLER(inline)
+                        DECL_TOK_HANDLER(explicit)
+                        DECL_TOK_HANDLER(namespace)
+                        DECL_TOK_HANDLER(using)
+                        DECL_TOK_HANDLER(throw)
+                        DECL_TOK_HANDLER(SwBracket_Left)
+                        DECL_TOK_HANDLER(SwBracket_Right)
+                        DECL_TOK_HANDLER(ArrayBracket_Left)
+                        DECL_TOK_HANDLER(ArrayBracket_Right)
+                        DECL_TOK_HANDLER(Bracket_Left)
+                        DECL_TOK_HANDLER(Bracket_Right)
+                        DECL_TOK_HANDLER(DoubleColon)
+                        DECL_TOK_HANDLER(Semicolon)
+                        DECL_TOK_HANDLER(Comma)
+                        DECL_TOK_HANDLER(Colon)
+                        DECL_TOK_HANDLER(Assign)
+                        DECL_TOK_HANDLER(Less)
+                        DECL_TOK_HANDLER(Greater)
+                        DECL_TOK_HANDLER(Asterix)
+                        DECL_TOK_HANDLER(AmpersAnd)
+                        DECL_TOK_HANDLER(Ellipse)
+                        DECL_TOK_HANDLER(typename)
+                        DECL_TOK_HANDLER(DefineName)
+                        DECL_TOK_HANDLER(MacroName)
+                        DECL_TOK_HANDLER(MacroParameter)
+                        DECL_TOK_HANDLER(PreProDefinition)
+                        DECL_TOK_HANDLER(BuiltInType)
+                        DECL_TOK_HANDLER(TypeSpecializer)
+                        DECL_TOK_HANDLER(Constant)
+
+  protected:
+    virtual void        Call_Handler(
+                            const cpp::Token &  i_rTok ) = 0;
+};
+
+#undef DECL_TOK_HANDLER
+
+
+// IMPLEMENTATION
+
+
+}   // namespace cpp
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/adoc/a_rdocu.hxx b/autodoc/source/parser/inc/adoc/a_rdocu.hxx
new file mode 100644
index 000000000000..bf49609f29c4
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/a_rdocu.hxx
@@ -0,0 +1,73 @@
+/* -*- 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 ADC_ADOC_A_RDOCU_HXX
+#define ADC_ADOC_A_RDOCU_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+class DocuDealer;
+
+
+
+namespace adoc
+{
+
+class Token;
+class Adoc_PE;
+
+class DocuExplorer
+
+{
+  public:
+                        DocuExplorer();
+                        ~DocuExplorer();
+    void                StartNewFile(
+                            DocuDealer &        o_rDocuDistributor );
+
+    void                Process_Token(
+                            DYN adoc::Token &   let_drToken );
+  private:
+    DocuDealer *        pDocuDistributor;
+    Dyn<Adoc_PE>        pPE;
+    bool                bIsPassedFirstDocu;
+};
+
+
+}   // namespace adoc
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/adoc/adoc_tok.hxx b/autodoc/source/parser/inc/adoc/adoc_tok.hxx
new file mode 100644
index 000000000000..fa4a143eaf73
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/adoc_tok.hxx
@@ -0,0 +1,64 @@
+/* -*- 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 ADC_ADOC_ADOC_TOK_HXX
+#define ADC_ADOC_ADOC_TOK_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/token.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace adoc {
+
+
+class TokenInterpreter;
+
+
+class Token : public TextToken
+{
+  public:
+    // LIFECYCLE
+    virtual             ~Token() {}
+
+    // OPERATIONS
+    virtual void        DealOut(
+                            ::TokenDealer &     o_rDealer );
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const = 0;
+};
+
+
+}   // namespace adoc
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/adoc/atokdeal.hxx b/autodoc/source/parser/inc/adoc/atokdeal.hxx
new file mode 100644
index 000000000000..db2765f54e56
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/atokdeal.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 ADC_ADOC_ATOKDEAL_HXX
+#define ADC_ADOC_ATOKDEAL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tokdeal.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+
+namespace adoc
+{
+
+class Token;
+
+class TokenDealer : virtual public ::TokenDealer
+{
+  public:
+
+    virtual void        Deal_AdcDocu(
+                            adoc::Token &       let_drToken ) = 0;
+};
+
+
+} // namespace adoc
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/adoc/cx_a_std.hxx b/autodoc/source/parser/inc/adoc/cx_a_std.hxx
new file mode 100644
index 000000000000..c9a6c1443b12
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/cx_a_std.hxx
@@ -0,0 +1,107 @@
+/* -*- 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 ADC_ADOC_CX_A_STD_HXX
+#define ADC_ADOC_CX_A_STD_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcontx.hxx>
+    // COMPONENTS
+#include <tokens/tkpstama.hxx>
+    // PARAMETERS
+
+class TextToken;
+
+
+namespace adoc {
+
+class Cx_LineStart;
+class Cx_CheckStar;
+class Cx_AtTagCompletion;
+
+
+/**
+@descr
+*/
+class Context_AdocStd : public autodoc::TkpDocuContext,
+                        private StateMachineContext
+{
+  public:
+    //  LIFECYCLE
+                        Context_AdocStd();
+    virtual void        SetParentContext(
+                            TkpContext &        io_rParentContext,
+                            const char *        i_sMultiLineEndToken );
+                        ~Context_AdocStd();
+
+    //  OPERATIONS
+    virtual void        AssignDealer(
+                            TokenDealer &       o_rDealer );
+
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    virtual bool        PassNewToken();
+    virtual void        SetMode_IsMultiLine(
+                            bool                i_bTrue );
+    //  INQUIRY
+    virtual TkpContext &
+                        FollowUpContext();
+  private:
+    //  SERVICE FUNCTIONS
+    virtual void        PerformStatusFunction(
+                            uintt               i_nStatusSignal,
+                            F_CRTOK             i_fTokenCreateFunction,
+                            CharacterSource &   io_rText );
+
+    void                SetupStateMachine();
+
+    //  DATA
+    StateMachine        aStateMachine;
+    TokenDealer *       pDealer;
+
+        // Contexts
+    TkpContext *        pParentContext;
+    TkpContext *        pFollowUpContext;
+    Dyn<Cx_LineStart>   pCx_LineStart;
+    Dyn<Cx_CheckStar>   pCx_CheckStar;
+    Dyn<Cx_AtTagCompletion>
+                        pCx_AtTagCompletion;
+
+        // Temporary data, used during ReadCharChain()
+    Dyn<TextToken>      pNewToken;
+    bool                bIsMultiline;
+};
+
+
+}   // namespace adoc
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/adoc/cx_a_sub.hxx b/autodoc/source/parser/inc/adoc/cx_a_sub.hxx
new file mode 100644
index 000000000000..43fe2fca8449
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/cx_a_sub.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 ADC_ADOC_CX_A_SUB_HXX
+#define ADC_ADOC_CX_A_SUB_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcontx.hxx>
+    // COMPONENTS
+#include <tokens/tkpstama.hxx>
+    // PARAMETERS
+#include <tokens/token.hxx>
+
+
+namespace adoc {
+
+
+
+
+class Cx_LineStart : public TkpContext
+{
+  public:
+                        Cx_LineStart(
+                            TkpContext &        i_rFollowUpContext );
+
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    virtual bool        PassNewToken();
+    virtual TkpContext &
+                        FollowUpContext();
+
+    void                SetCurToken(
+                            TextToken::F_CRTOK  i_fTokenCreateFunction )
+                                                { fCur_TokenCreateFunction = i_fTokenCreateFunction; }
+    void                AssignDealer(
+                            TokenDealer &       o_rDealer )
+                                                { pDealer = &o_rDealer; }
+  private:
+    // DATA
+    TokenDealer *       pDealer;
+    TkpContext *        pFollowUpContext;
+
+    Dyn<TextToken>      pNewToken;
+
+    TextToken::F_CRTOK  fCur_TokenCreateFunction;
+};
+
+
+/**
+@descr
+*/
+
+class Cx_CheckStar : public TkpContext
+{
+  public:
+    // LIFECYCLE
+                        Cx_CheckStar(
+                            TkpContext &        i_rFollowUpContext );
+    void                Set_End_FollowUpContext(
+                            TkpContext &        i_rEnd_FollowUpContext )
+                                                { pEnd_FollowUpContext = &i_rEnd_FollowUpContext; }
+
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    virtual bool        PassNewToken();
+
+    void                SetCanBeEnd(
+                            bool                i_bCanBeEnd  )
+                                                { bCanBeEnd = i_bCanBeEnd; }
+    virtual TkpContext &
+                        FollowUpContext();
+    void                AssignDealer(
+                            TokenDealer &       o_rDealer )
+                                                { pDealer = &o_rDealer; }
+  private:
+    // DATA
+    TokenDealer *       pDealer;
+    TkpContext *        pFollowUpContext;
+    TkpContext *        pEnd_FollowUpContext;
+
+    Dyn<TextToken>      pNewToken;
+
+    bool                bCanBeEnd;
+    bool                bEndTokenFound;
+};
+
+
+class Cx_AtTagCompletion : public TkpContext
+{
+  public:
+                        Cx_AtTagCompletion(
+                            TkpContext &        i_rFollowUpContext );
+
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    virtual bool        PassNewToken();
+    virtual TkpContext &
+                        FollowUpContext();
+
+    void                SetCurToken(
+                            TextToken::F_CRTOK  i_fTokenCreateFunction )
+                                                { fCur_TokenCreateFunction = i_fTokenCreateFunction; }
+    void                AssignDealer(
+                            TokenDealer &       o_rDealer )
+                                                { pDealer = &o_rDealer; }
+  private:
+    // DATA
+    TokenDealer *       pDealer;
+    TkpContext *        pFollowUpContext;
+
+    Dyn<TextToken>      pNewToken;
+
+    TextToken::F_CRTOK  fCur_TokenCreateFunction;
+};
+
+
+}   // namespace adoc
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/adoc/docu_pe.hxx b/autodoc/source/parser/inc/adoc/docu_pe.hxx
new file mode 100644
index 000000000000..ef49b2594c79
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/docu_pe.hxx
@@ -0,0 +1,195 @@
+/* -*- 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 ADC_DOCU_PE_HXX
+#define ADC_DOCU_PE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <adoc/tokintpr.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+namespace doc
+{
+    class OldCppDocu;
+}
+namespace info
+{
+    class AtTag;
+}
+}
+
+
+
+namespace adoc
+{
+
+
+class Adoc_PE : public TokenInterpreter
+{
+  public:
+                        Adoc_PE();
+                        ~Adoc_PE();
+
+    virtual void        Hdl_at_std(
+                            const Tok_at_std &  i_rTok );
+    virtual void        Hdl_at_base(
+                            const Tok_at_base & i_rTok );
+    virtual void        Hdl_at_exception(
+                            const Tok_at_exception &
+                                                i_rTok );
+    virtual void        Hdl_at_impl(
+                            const Tok_at_impl & i_rTok );
+    virtual void        Hdl_at_key(
+                            const Tok_at_key &  i_rTok );
+    virtual void        Hdl_at_param(
+                            const Tok_at_param &
+                                                i_rTok );
+    virtual void        Hdl_at_see(
+                            const Tok_at_see &  i_rTok );
+    virtual void        Hdl_at_template(
+                            const Tok_at_template &
+                                                i_rTok );
+    virtual void        Hdl_at_interface(
+                            const Tok_at_interface &
+                                                i_rTok );
+    virtual void        Hdl_at_internal(
+                            const Tok_at_internal &
+                                                i_rTok );
+    virtual void        Hdl_at_obsolete(
+                            const Tok_at_obsolete &
+                                                i_rTok );
+    virtual void        Hdl_at_module(
+                            const Tok_at_module &
+                                                i_rTok );
+    virtual void        Hdl_at_file(
+                            const Tok_at_file & i_rTok );
+    virtual void        Hdl_at_gloss(
+                            const Tok_at_gloss &
+                                                i_rTok );
+    virtual void        Hdl_at_global(
+                            const Tok_at_global &
+                                                i_rTok );
+    virtual void        Hdl_at_include(
+                            const Tok_at_include &
+                                                i_rTok );
+    virtual void        Hdl_at_label(
+                            const Tok_at_label &
+                                                i_rTok );
+    virtual void        Hdl_at_since(
+                            const Tok_at_since &
+                                                i_rTok );
+    virtual void        Hdl_at_HTML(
+                            const Tok_at_HTML &
+                                                i_rTok );
+    virtual void        Hdl_at_NOHTML(
+                            const Tok_at_NOHTML &
+                                                i_rTok );
+
+    virtual void        Hdl_DocWord(
+                            const Tok_DocWord & i_rTok );
+
+    virtual void        Hdl_Whitespace(
+                            const Tok_Whitespace &
+                                                i_rTok );
+    virtual void        Hdl_LineStart(
+                            const Tok_LineStart &
+                                                i_rTok );
+    virtual void        Hdl_Eol(
+                            const Tok_Eol &     i_rTok );
+
+    virtual void        Hdl_EoDocu(
+                            const Tok_EoDocu &  i_rTok );
+
+
+    DYN ary::doc::OldCppDocu *
+                        ReleaseJustParsedDocu();
+
+    bool                IsComplete() const;
+
+  private:
+    void                InstallAtTag(
+                            DYN ary::info::AtTag *
+                                                let_dpTag,
+                            bool                i_bImplicit = false );  /// True for implicit @short and @descr.
+    ary::doc::OldCppDocu &
+                        CurDocu();
+    ary::info::AtTag &  CurAtTag();
+    bool                UsesHtmlInDocuText();
+
+    void                RenameCurShortTag();
+    void                FinishCurShortTag();
+
+
+    // DATA
+    enum E_TagState
+    {
+        ts_new,
+        ts_std
+    };
+    enum E_DocuState
+    {
+        ds_wait_for_short = 0,
+        ds_in_short,
+        ds_1newline_after_short,
+        ds_in_descr,
+        ds_std
+    };
+
+    Dyn<ary::doc::OldCppDocu>
+                        pCurDocu;
+    ary::info::AtTag *  pCurAtTag;
+    uintt               nLineCountInDocu;
+    UINT8               nCurSpecialMeaningTokens;
+    UINT8               nCurSubtractFromLineStart;
+    E_TagState          eCurTagState;
+    E_DocuState         eDocuState;
+    bool                bIsComplete;
+    bool                bUsesHtmlInDocuText;
+};
+
+
+// IMPLEMENTATION
+inline bool
+Adoc_PE::IsComplete() const
+{
+    return bIsComplete;
+}
+
+
+
+
+}   // namespace adoc
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/adoc/prs_adoc.hxx b/autodoc/source/parser/inc/adoc/prs_adoc.hxx
new file mode 100644
index 000000000000..5326552dd017
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/prs_adoc.hxx
@@ -0,0 +1,57 @@
+/* -*- 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 ADC_ADOC_PRS_ADOC_HXX
+#define ADC_ADOC_PRS_ADOC_HXX
+
+
+
+#include <autodoc/prs_docu.hxx>
+
+namespace adoc
+{
+
+
+class DocuParser_AutodocStyle : public autodoc::DocumentationParser_Ifc
+{
+  public:
+                        DocuParser_AutodocStyle();
+    virtual             ~DocuParser_AutodocStyle();
+
+    virtual DYN autodoc::TkpDocuContext *
+                        Create_DocuContext() const;
+};
+
+
+
+}   // namespace adoc
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/adoc/tk_attag.hxx b/autodoc/source/parser/inc/adoc/tk_attag.hxx
new file mode 100644
index 000000000000..11c21124e67d
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/tk_attag.hxx
@@ -0,0 +1,100 @@
+/* -*- 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 ADC_ADOC_TK_ATTAG_HXX
+#define ADC_ADOC_TK_ATTAG_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <adoc/adoc_tok.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/info/inftypes.hxx>
+
+namespace adoc {
+
+typedef ary::info::E_AtTagId E_AtTagId;
+
+
+class Tok_at_std : public Token
+{
+  public:
+                        Tok_at_std(
+                            E_AtTagId           i_nId )
+                                                : eId(i_nId) {}
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+    E_AtTagId           Id() const              { return eId; }
+
+  private:
+    E_AtTagId           eId;
+};
+
+
+#define DECL_TOKEN_CLASS(name) \
+class Tok_##name : public Token \
+{ public: \
+    virtual void        Trigger( \
+                            TokenInterpreter &  io_rInterpreter ) const; \
+    virtual const char * \
+                        Text() const; \
+}
+
+
+DECL_TOKEN_CLASS(at_base);
+DECL_TOKEN_CLASS(at_exception);
+DECL_TOKEN_CLASS(at_impl);
+DECL_TOKEN_CLASS(at_key);
+DECL_TOKEN_CLASS(at_param);
+DECL_TOKEN_CLASS(at_see);
+DECL_TOKEN_CLASS(at_template);
+DECL_TOKEN_CLASS(at_interface);
+DECL_TOKEN_CLASS(at_internal);
+DECL_TOKEN_CLASS(at_obsolete);
+DECL_TOKEN_CLASS(at_module);
+DECL_TOKEN_CLASS(at_file);
+DECL_TOKEN_CLASS(at_gloss);
+DECL_TOKEN_CLASS(at_global);
+DECL_TOKEN_CLASS(at_include);
+DECL_TOKEN_CLASS(at_label);
+DECL_TOKEN_CLASS(at_HTML);
+DECL_TOKEN_CLASS(at_NOHTML);
+DECL_TOKEN_CLASS(at_since);
+
+
+#undef DECL_TOKEN_CLASS
+
+
+
+}   // namespace adoc
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/adoc/tk_docw.hxx b/autodoc/source/parser/inc/adoc/tk_docw.hxx
new file mode 100644
index 000000000000..fa53d8968826
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/tk_docw.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 ADC_ADOC_TK_DOCW_HXX
+#define ADC_ADOC_TK_DOCW_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <adoc/adoc_tok.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace adoc {
+
+
+class Tok_DocWord : public Token
+{
+  public:
+    // Spring and Fall
+                        Tok_DocWord(
+                            const char *        i_sText )
+                                                :   sText(i_sText) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    uintt               Length() const          { return sText.length(); }
+
+  private:
+    // DATA
+    String              sText;
+};
+
+class Tok_Whitespace : public Token
+{
+  public:
+    // Spring and Fall
+                        Tok_Whitespace(
+                            UINT8               i_nSize )
+                                                :   nSize(i_nSize) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    UINT8               Size() const            { return nSize; }
+
+  private:
+    // DATA
+    UINT8               nSize;
+};
+
+class Tok_LineStart : public Token
+{
+  public:
+    // Spring and Fall
+                        Tok_LineStart(
+                            UINT8               i_nSize )
+                                                :   nSize(i_nSize) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    UINT8               Size() const            { return nSize; }
+
+  private:
+    // DATA
+    UINT8               nSize;
+};
+
+class Tok_Eol : public Token
+{ public:
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+};
+
+class Tok_EoDocu : public Token
+{ public:
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+};
+
+
+}   // namespace adoc
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/adoc/tokintpr.hxx b/autodoc/source/parser/inc/adoc/tokintpr.hxx
new file mode 100644
index 000000000000..f24b2ea80a97
--- /dev/null
+++ b/autodoc/source/parser/inc/adoc/tokintpr.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 ADC_ADOC_TOKINTPR_HXX
+#define ADC_ADOC_TOKINTPR_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+namespace adoc {
+
+
+class Tok_at_std;
+class Tok_at_base;
+class Tok_at_exception;
+class Tok_at_impl;
+class Tok_at_key;
+class Tok_at_param;
+class Tok_at_see;
+class Tok_at_template;
+class Tok_at_interface;
+class Tok_at_internal;
+class Tok_at_obsolete;
+class Tok_at_module;
+class Tok_at_file;
+class Tok_at_gloss;
+class Tok_at_global;
+class Tok_at_include;
+class Tok_at_label;
+class Tok_at_since;
+class Tok_at_HTML;          // Sets default to: Use HTML in DocuText
+class Tok_at_NOHTML;        // Sets default to: Don't use HTML in DocuText
+
+class Tok_DocWord;
+class Tok_LineStart;
+class Tok_Whitespace;
+class Tok_Eol;
+class Tok_EoDocu;
+
+
+#define DECL_TOK_HANDLER(token) \
+    virtual void        Hdl_##token( \
+                            const Tok_##token & i_rTok ) = 0
+
+
+
+class TokenInterpreter
+{
+  public:
+    virtual             ~TokenInterpreter() {}
+
+                        DECL_TOK_HANDLER(at_std);
+                        DECL_TOK_HANDLER(at_base);
+                        DECL_TOK_HANDLER(at_exception);
+                        DECL_TOK_HANDLER(at_impl);
+                        DECL_TOK_HANDLER(at_key);
+                        DECL_TOK_HANDLER(at_param);
+                        DECL_TOK_HANDLER(at_see);
+                        DECL_TOK_HANDLER(at_template);
+                        DECL_TOK_HANDLER(at_interface);
+                        DECL_TOK_HANDLER(at_internal);
+                        DECL_TOK_HANDLER(at_obsolete);
+                        DECL_TOK_HANDLER(at_module);
+                        DECL_TOK_HANDLER(at_file);
+                        DECL_TOK_HANDLER(at_gloss);
+                        DECL_TOK_HANDLER(at_global);
+                        DECL_TOK_HANDLER(at_include);
+                        DECL_TOK_HANDLER(at_label);
+                        DECL_TOK_HANDLER(at_since);
+                        DECL_TOK_HANDLER(at_HTML);
+                        DECL_TOK_HANDLER(at_NOHTML);
+                        DECL_TOK_HANDLER(DocWord);
+                        DECL_TOK_HANDLER(Whitespace);
+                        DECL_TOK_HANDLER(LineStart);
+                        DECL_TOK_HANDLER(Eol);
+                        DECL_TOK_HANDLER(EoDocu);
+};
+
+#undef DECL_TOK_HANDLER
+
+
+// IMPLEMENTATION
+
+
+}   // namespace adoc
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/cpp/ctokdeal.hxx b/autodoc/source/parser/inc/cpp/ctokdeal.hxx
new file mode 100644
index 000000000000..9d1f59c08e53
--- /dev/null
+++ b/autodoc/source/parser/inc/cpp/ctokdeal.hxx
@@ -0,0 +1,76 @@
+/* -*- 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 ADC_CPP_CTOKDEAL_HXX
+#define ADC_CPP_CTOKDEAL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tokdeal.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace cpp
+{
+
+class Token;
+class Tok_UnblockMacro;
+
+
+class TokenDealer : virtual public ::TokenDealer
+{
+  public:
+
+    virtual void        Deal_CppCode(
+                            cpp::Token &        let_drToken ) = 0;
+
+    /** This is to be used only by the internal macro expander
+        ( ::cpp::PreProcessor ).
+        These tokens are inserted into the source text temporary to make clear,
+        where a specific macro replacement ends and therefore the macro's name
+        becomes valid again.
+
+        @see ::cpp::Tok_UnblockMacro
+        @see ::cpp::PreProcessor
+    */
+    virtual void        Deal_Cpp_UnblockMacro(
+                            Tok_UnblockMacro &  let_drToken ) = 0;
+};
+
+
+
+} // namespace cpp
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/cpp/prs_cpp.hxx b/autodoc/source/parser/inc/cpp/prs_cpp.hxx
new file mode 100644
index 000000000000..61512f24b54f
--- /dev/null
+++ b/autodoc/source/parser/inc/cpp/prs_cpp.hxx
@@ -0,0 +1,70 @@
+/* -*- 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 ADC_CPP_PRS_CPP_HXX
+#define ADC_CPP_PRS_CPP_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <autodoc/prs_code.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace cpp
+{
+
+struct S_RunningData;
+
+class Cpluplus_Parser : public autodoc::CodeParser_Ifc
+{
+  public:
+                        Cpluplus_Parser();
+    virtual             ~Cpluplus_Parser();
+
+
+    virtual void        Setup(
+                            ary::Repository &   o_rRepository,
+                            const autodoc::DocumentationParser_Ifc &
+                                                i_rDocumentationInterpreter );
+
+    virtual void        Run(
+                            const autodoc::FileCollector_Ifc &
+                                                i_rFiles );
+  private:
+    Dyn<S_RunningData>  pRunningData;
+};
+
+
+
+
+}   // namespace cpp
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/doc_deal.hxx b/autodoc/source/parser/inc/doc_deal.hxx
new file mode 100644
index 000000000000..f9b12c8b2299
--- /dev/null
+++ b/autodoc/source/parser/inc/doc_deal.hxx
@@ -0,0 +1,92 @@
+/* -*- 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 ADC_DOC_DEAL_HXX
+#define ADC_DOC_DEAL_HXX
+
+// BASE CLASSES
+#include <tokens/tokproct.hxx>
+// USED SERVICES
+#include <ary/cpp/c_types4cpp.hxx>
+
+namespace ary
+{
+namespace doc
+{
+    class OldCppDocu;
+}
+}
+
+
+
+
+class DocuDealer
+{
+  public:
+    // INQUIRY
+    virtual             ~DocuDealer() {}
+
+    // OPERATIONS
+    /** @descr
+        This distributes the let_drDocu to the matching ary::RepositoryEntity .
+
+        If the docu is not inline, it will be saved and later given to the next
+        ary::CodeEntity. Or it will be discarded, if there does not come a matching
+        ary::CodeEntity .
+
+        If the docu is inline after a function header or after an enum value
+        or after a function parameter or after a base class, it will be stored
+        together with the matching function, enum value, parameter or base class.
+
+        If the documentation is @file or @project or @glos(sary) it will be
+        stored at the matching ary::cpp::FileGroup, ary::cpp::ProjectGroup
+        or ary::Glossary.
+    */
+    void                TakeDocu(
+                            DYN ary::doc::OldCppDocu &
+                                                let_drInfo );
+  private:
+    virtual void        do_TakeDocu(
+                            DYN ary::doc::OldCppDocu &
+                                                let_drInfo ) = 0;
+};
+
+
+
+
+// IMPLEMENTATION
+inline void
+DocuDealer::TakeDocu( DYN ary::doc::OldCppDocu & let_drInfo )
+    { do_TakeDocu(let_drInfo); }
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/semantic/callf.hxx b/autodoc/source/parser/inc/semantic/callf.hxx
new file mode 100644
index 000000000000..6a8c829e00ee
--- /dev/null
+++ b/autodoc/source/parser/inc/semantic/callf.hxx
@@ -0,0 +1,289 @@
+/* -*- 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 ADC_CPP_CALLF_HXX
+#define ADC_CPP_CALLF_HXX
+
+// USED SERVICES
+
+
+
+
+/** This represents a function to be called, if a specific kind of token
+    arrives in the semantic parser.
+
+    @descr This class is only to be used as member of PeStatus<PE>.
+    @template PE
+        The owning ParseEnvironment.
+    @see PeStatus, ParseEnvironment
+*/
+template <class PE>
+class CallFunction
+{
+  public:
+    typedef void (PE::*F_Tok)(const char *);
+
+                        CallFunction(
+                            F_Tok               i_f2Call,
+                            INT16               i_nTokType );
+
+    F_Tok               GetF() const;
+    INT16               TokType() const;
+
+  private:
+    // DATA
+    F_Tok               f2Call;
+    INT16               nTokType;
+};
+
+
+/** One state within a ParseEnvironment.
+
+    @template PE
+        The owning ParseEnvironment.
+*/
+template <class PE>
+class PeStatus
+{
+  public:
+    typedef typename CallFunction<PE>::F_Tok  F_Tok;
+
+                        PeStatus(
+                            PE &                i_rMyPE,
+                            uintt               i_nSize,
+                            F_Tok *             i_pFuncArray,
+                            INT16 *             i_pTokTypeArray,
+                            F_Tok               i_pDefault );
+    virtual             ~PeStatus();
+
+    virtual void        Call_Handler(
+                            INT16               i_nTokTypeId,
+                            const char *        i_sTokenText ) const;
+
+  private:
+    bool                CheckForCall(
+                            uintt               i_nPos,
+                            INT16               i_nTokTypeId,
+                            const char *        i_sTokenText ) const;
+
+    PE *                pMyPE;
+    std::vector< CallFunction<PE> >
+                        aBranches;
+    F_Tok               fDefault;
+};
+
+
+template <class PE>
+class PeStatusArray
+{
+  public:
+    typedef typename PE::E_State    State;
+
+                        PeStatusArray();
+    void                InsertState(
+                            State               i_ePosition,
+                            DYN PeStatus<PE> &  let_drState );
+                        ~PeStatusArray();
+
+    const PeStatus<PE> &
+                        operator[](
+                            State               i_ePosition ) const;
+
+    void                SetCur(
+                            State               i_eCurState );
+    const PeStatus<PE> &
+                        Cur() const;
+
+  private:
+    DYN PeStatus<PE> *  aStati[PE::size_of_states];
+    State               eState;
+};
+
+
+
+// IMPLEMENTATION
+
+
+// CallFunction
+
+template <class PE>
+CallFunction<PE>::CallFunction( F_Tok   i_f2Call,
+                                INT16   i_nTokType )
+    :   f2Call(i_f2Call),
+        nTokType(i_nTokType)
+{
+}
+
+template <class PE>
+inline typename CallFunction<PE>::F_Tok
+CallFunction<PE>::GetF() const
+{
+    return f2Call;
+}
+
+template <class PE>
+inline INT16
+CallFunction<PE>::TokType() const
+{
+    return nTokType;
+}
+
+
+
+// PeStatus
+
+template <class PE>
+PeStatus<PE>::PeStatus( PE &        i_rMyPE,
+                        uintt       i_nSize,
+                        F_Tok *     i_pFuncArray,
+                        INT16 *     i_pTokTypeArray,
+                        F_Tok       i_fDefault )
+    :   pMyPE(&i_rMyPE),
+        fDefault(i_fDefault)
+{
+    aBranches.reserve(i_nSize);
+    for ( uintt i = 0; i < i_nSize; ++i )
+    {
+//      csv_assert(i > 0 ? i_pTokTypeArray[i] > i_pTokTypeArray[i-1] : true);
+        aBranches.push_back( CallFunction<PE>( i_pFuncArray[i], i_pTokTypeArray[i]) );
+    }  // end for
+}
+
+template <class PE>
+PeStatus<PE>::~PeStatus()
+{
+
+}
+
+template <class PE>
+void
+PeStatus<PE>::Call_Handler( INT16               i_nTokTypeId,
+                            const char *        i_sTokenText ) const
+{
+    uintt nSize = aBranches.size();
+    uintt nPos = nSize / 2;
+
+    if ( i_nTokTypeId < aBranches[nPos].TokType() )
+    {
+        for ( --nPos; intt(nPos) >= 0; --nPos )
+        {
+            if (CheckForCall(nPos, i_nTokTypeId, i_sTokenText))
+                return;
+        }
+    }
+    else
+    {
+        for ( ; nPos < nSize; ++nPos )
+        {
+            if (CheckForCall(nPos, i_nTokTypeId, i_sTokenText))
+                return;
+        }
+    }
+
+    (pMyPE->*fDefault)(i_sTokenText);
+}
+
+template <class PE>
+bool
+PeStatus<PE>::CheckForCall( uintt               i_nPos,
+                            INT16               i_nTokTypeId,
+                            const char *        i_sTokenText ) const
+{
+    if ( aBranches[i_nPos].TokType() == i_nTokTypeId )
+    {
+        (pMyPE->*aBranches[i_nPos].GetF())(i_sTokenText);
+        return true;
+    }
+    return false;
+}
+
+// PeStatusArray
+
+template <class PE>
+PeStatusArray<PE>::PeStatusArray()
+    :   eState(PE::size_of_states)
+{
+    memset(aStati, 0, sizeof aStati);
+}
+
+template <class PE>
+void
+PeStatusArray<PE>::InsertState( State               i_ePosition,
+                                DYN PeStatus<PE> &  let_drState )
+{
+    csv_assert(aStati[i_ePosition] == 0);
+    aStati[i_ePosition] = &let_drState;
+}
+
+template <class PE>
+PeStatusArray<PE>::~PeStatusArray()
+{
+    int i_max = PE::size_of_states;
+    for (int i = 0; i < i_max; i++)
+    {
+        delete aStati[i];
+    }  // end for
+}
+
+template <class PE>
+inline const PeStatus<PE> &
+PeStatusArray<PE>::operator[]( State i_ePosition ) const
+{
+    csv_assert( uintt(i_ePosition) < PE::size_of_states );
+    csv_assert( aStati[i_ePosition] != 0 );
+    return *aStati[i_ePosition];
+}
+
+template <class PE>
+inline void
+PeStatusArray<PE>::SetCur( State i_eCurState )
+{
+    eState = i_eCurState;
+}
+
+
+template <class PE>
+const PeStatus<PE> &
+PeStatusArray<PE>::Cur() const
+{
+    return (*this)[eState];
+}
+
+#define SEMPARSE_CREATE_STATUS(penv, state, default_function) \
+    pStati->InsertState( state, \
+                        *new PeStatus<penv>( \
+        *this, \
+        sizeof( stateT_##state ) / sizeof (INT16), \
+        stateF_##state, \
+        stateT_##state, \
+        &penv::default_function ) )
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/semantic/parseenv.hxx b/autodoc/source/parser/inc/semantic/parseenv.hxx
new file mode 100644
index 000000000000..058989ea3739
--- /dev/null
+++ b/autodoc/source/parser/inc/semantic/parseenv.hxx
@@ -0,0 +1,112 @@
+/* -*- 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 ADC_PARSEENV_HXX
+#define ADC_PARSEENV_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tokproct.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace info
+{
+class CodeInfo;
+}   // namespace info
+}   // namespace ary)
+
+
+
+class SubPeUseIfc;
+
+
+class ParseEnvironment : protected TokenProcessing_Types
+{
+  public:
+    virtual             ~ParseEnvironment() {}
+
+    // Parsing
+    void                Enter(
+                            E_EnvStackAction    i_eWayOfEntering );
+    void                Leave(
+                            E_EnvStackAction    i_eWayOfLeaving );
+    void                SetCurSPU(
+                            const SubPeUseIfc * i_pCurSPU );
+
+    ParseEnvironment *  Parent() const;
+
+
+    // ACCESS
+  protected:
+                        ParseEnvironment(
+                            ParseEnvironment *  i_pParent );
+    const SubPeUseIfc * CurSubPeUse() const;
+  private:
+    virtual void        InitData() = 0;
+    virtual void        TransferData() = 0;
+
+    ParseEnvironment *  pParent;
+    const SubPeUseIfc * pCurSubPe;
+};
+
+class SubPeUseIfc
+{
+  public:
+    virtual             ~SubPeUseIfc() {}
+
+    virtual void        InitParse() const = 0;
+    virtual void        GetResults() const = 0;
+};
+
+
+
+// IMPLEMENTATION
+
+inline void
+ParseEnvironment::SetCurSPU( const SubPeUseIfc * i_pCurSPU )
+    { pCurSubPe = i_pCurSPU; }
+
+inline ParseEnvironment *
+ParseEnvironment::Parent() const
+    { return pParent; }
+
+inline const SubPeUseIfc *
+ParseEnvironment::CurSubPeUse() const
+    { return pCurSubPe; }
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/semantic/sub_pe.hxx b/autodoc/source/parser/inc/semantic/sub_pe.hxx
new file mode 100644
index 000000000000..0aef6804eafe
--- /dev/null
+++ b/autodoc/source/parser/inc/semantic/sub_pe.hxx
@@ -0,0 +1,114 @@
+/* -*- 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 ADC_CPP_SUB_PE_HXX
+#define ADC_CPP_SUB_PE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+class ParseEnvironment;
+
+template <class PE, class SUB>
+class SubPe
+{
+  public:
+    typedef SubPe< PE, SUB >    self;
+
+                        SubPe(
+                            PE &                i_rParent );
+    PE &                Parent() const;
+    SUB &               Child() const;
+
+    ParseEnvironment &  Get() const;
+
+  private:
+    SUB &               CreateChild() const;
+
+    PE &                rParent;
+    Dyn<SUB>            pChild;
+};
+
+
+
+// IMPLEMENTATION
+
+
+//  SubPe
+
+template <class PE, class SUB>
+SubPe<PE,SUB>::SubPe( PE & i_rParent )
+    :   rParent(i_rParent)
+{
+}
+
+template <class PE, class SUB>
+PE &
+SubPe<PE,SUB>::Parent() const
+{
+     return rParent;
+}
+
+template <class PE, class SUB>
+inline SUB &
+SubPe<PE,SUB>::Child() const
+{
+    return pChild ? *pChild.MutablePtr() : CreateChild();
+}
+
+template <class PE, class SUB>
+ParseEnvironment &
+SubPe<PE,SUB>::Get() const
+{
+    return Child();
+}
+
+template <class PE, class SUB>
+SUB &
+SubPe<PE,SUB>::CreateChild() const
+{
+    self * pThis = const_cast< self* >(this);
+
+    SUB * pNewChild = new SUB( &rParent);
+
+    pThis->pChild = pNewChild;
+
+    return *pChild.MutablePtr();
+}
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/semantic/sub_peu.hxx b/autodoc/source/parser/inc/semantic/sub_peu.hxx
new file mode 100644
index 000000000000..9960e3e751e2
--- /dev/null
+++ b/autodoc/source/parser/inc/semantic/sub_peu.hxx
@@ -0,0 +1,133 @@
+/* -*- 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 ADC_CPP_SUB_PEU_HXX
+#define ADC_CPP_SUB_PEU_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <semantic/parseenv.hxx>
+#include <tokens/tokproct.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <semantic/sub_pe.hxx>
+
+
+
+template <class PE, class SUB>
+class SubPeUse  : public SubPeUseIfc,
+                  private TokenProcessing_Types
+{
+  public:
+    typedef void (PE::*F_INIT)();
+    typedef void (PE::*F_RETURN)();
+
+                        SubPeUse(
+                            SubPe<PE,SUB> &     i_rSubPeCreator,
+                            F_INIT              i_fInit,
+                            F_RETURN            i_fReturn );
+                        ~SubPeUse();
+
+    void                Push(
+                            E_TokenDone         i_eDone );
+    virtual void        InitParse() const;
+    virtual void        GetResults() const;
+
+    PE &                Parent() const;
+    SUB &               Child() const;
+
+  private:
+    // DATA
+    SubPe<PE,SUB> &     rSubPeCreator;
+    F_INIT              fInit;
+    F_RETURN            fReturn;
+};
+
+
+// IMPLEMENTATION
+
+
+template <class PE, class SUB>
+SubPeUse<PE,SUB>::SubPeUse( SubPe<PE,SUB> &     i_rSubPeCreator,
+                        F_INIT              i_fInit,
+                        F_RETURN            i_fReturn )
+    :   rSubPeCreator(i_rSubPeCreator),
+        fInit(i_fInit),
+        fReturn(i_fReturn)
+{
+}
+
+template <class PE, class SUB>
+SubPeUse<PE,SUB>::~SubPeUse()
+{
+}
+
+template <class PE, class SUB>
+void
+SubPeUse<PE,SUB>::Push( E_TokenDone i_eDone )
+{
+    Parent().SetTokenResult( i_eDone, push, &rSubPeCreator.Get() );
+    Parent().SetCurSPU(this);
+}
+
+template <class PE, class SUB>
+void
+SubPeUse<PE,SUB>::InitParse() const
+{
+    if (fInit != 0)
+        (Parent().*fInit)();
+}
+
+template <class PE, class SUB>
+void
+SubPeUse<PE,SUB>::GetResults() const
+{
+    if (fReturn != 0)
+        (Parent().*fReturn)();
+}
+
+template <class PE, class SUB>
+inline PE &
+SubPeUse<PE,SUB>::Parent() const
+{
+     return rSubPeCreator.Parent();
+}
+
+template <class PE, class SUB>
+inline SUB &
+SubPeUse<PE,SUB>::Child() const
+{
+     return rSubPeCreator.Child();
+}
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/tokens/parseinc.hxx b/autodoc/source/parser/inc/tokens/parseinc.hxx
new file mode 100644
index 000000000000..0f01fab399c0
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/parseinc.hxx
@@ -0,0 +1,205 @@
+/* -*- 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 ADC_PARSEINC_HXX
+#define ADC_PARSEINC_HXX
+
+
+#include <tools/tkpchars.hxx>
+
+inline char
+jumpOver( CharacterSource & io_rText,
+          char in_c )
+{
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          cNext == in_c;
+          cNext = io_rText.MoveOn() )
+    { }
+
+    return cNext;
+}
+
+inline char
+jumpTo( CharacterSource & io_rText,
+        char              in_c )
+{
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          cNext != in_c AND cNext != 0;
+          cNext = io_rText.MoveOn() )
+    { }
+
+    return cNext;
+}
+
+inline char
+jumpTo( CharacterSource & io_rText,
+        char              in_c1,
+        char              in_c2 )
+{
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          cNext != in_c1 AND cNext != in_c2 AND cNext != 0;
+          cNext = io_rText.MoveOn() )
+    { }
+
+    return cNext;
+}
+
+inline char
+jumpTo( CharacterSource & io_rText,
+        char              in_c1,
+        char              in_c2,
+        char              in_c3 )
+{
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          cNext != in_c1 AND cNext != in_c2 AND cNext != in_c3 AND cNext != 0;
+          cNext = io_rText.MoveOn() )
+    { }
+
+    return cNext;
+}
+
+inline char
+jumpTo( CharacterSource & io_rText,
+        char              in_c1,
+        char              in_c2,
+        char              in_c3,
+        char              in_c4 )
+{
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          cNext != in_c1 AND cNext != in_c2 AND cNext != in_c3
+                         AND cNext != in_c4 AND cNext != 0;
+          cNext = io_rText.MoveOn() )
+    { }
+
+    return cNext;
+}
+
+inline char
+jumpOverWhite(CharacterSource & io_rText)
+{
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          static_cast<UINT8>(cNext) < 33
+              AND cNext != 0 AND cNext != 13 AND cNext != 10;
+          cNext = io_rText.MoveOn() )
+    { }
+
+    return cNext;
+}
+
+inline char
+jumpToWhite(CharacterSource & io_rText)
+{
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          static_cast<UINT8>(cNext) > 32;
+          cNext = io_rText.MoveOn() )
+    { }
+
+    return cNext;
+}
+
+inline char
+jumpToEol(CharacterSource & io_rText, int & o_rCount_BackslashedLineBreaks )
+{
+    o_rCount_BackslashedLineBreaks = 0;
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          cNext != 13 AND cNext != 10 AND cNext != NULCH;
+          cNext = io_rText.MoveOn() )
+    {
+        if ( cNext == '\\')
+        {
+            cNext = io_rText.MoveOn();
+            if ( cNext == 13 )
+                io_rText.MoveOn();
+            if ( cNext == 10 )
+                ++o_rCount_BackslashedLineBreaks;
+        }
+    }
+    return cNext;
+}
+
+inline char
+jumpToEol(CharacterSource & io_rText)
+{
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          cNext != 13 AND cNext != 10 AND cNext != NULCH;
+          cNext = io_rText.MoveOn() )
+    {
+        if ( cNext == '\\')
+            io_rText.MoveOn();
+    }
+    return cNext;
+}
+
+inline char
+jumpOverEol(CharacterSource & io_rText)
+{
+    char cNext = io_rText.CurChar();
+
+    if (cNext == 13)
+        io_rText.MoveOn();
+    if (cNext == 10)
+        io_rText.MoveOn();
+    return cNext;
+}
+
+
+inline char // Finds a matching closing bracket after the opening one is passed
+jumpToMatchingBracket( CharacterSource & io_rText,
+                       char              in_cBegin,
+                       char              in_cEnd )
+{
+    intt nCounter = 1;
+    char cNext;
+    for ( cNext = io_rText.CurChar();
+          nCounter - (cNext == in_cEnd ? 1 : 0) > 0 AND cNext != NULCH;
+          cNext = io_rText.MoveOn() )
+    {
+        if (cNext == in_cEnd)
+           nCounter++;
+        else if (cNext == in_cBegin)
+           nCounter--;
+    }
+
+    return cNext;
+}
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/tokens/stmstarr.hxx b/autodoc/source/parser/inc/tokens/stmstarr.hxx
new file mode 100644
index 000000000000..640177faf363
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/stmstarr.hxx
@@ -0,0 +1,87 @@
+/* -*- 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 ADC_STMSTARR_HXX
+#define ADC_STMSTARR_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/stmstate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <tokens/token.hxx>
+
+
+class StmArrayStatus : public StmStatus
+{
+  public:
+    typedef TextToken::F_CRTOK F_CRTOK;
+
+    // LIFECYCLE
+                        StmArrayStatus(
+                            intt                i_nStatusSize,
+                            const INT16 *       in_aArrayModel,
+                            F_CRTOK             i_fTokenCreateFunction,
+                            bool                in_bIsDefault );
+                        ~StmArrayStatus();
+
+    // INQUIRY
+    StmStatus::Branch   NextBy(
+                            intt                in_nFollowersIndex) const;
+    F_CRTOK             TokenCreateFunction() const
+                                                { return fTokenCreateFunction; }
+    virtual bool        IsADefault() const;
+
+    // ACCESS
+    virtual StmArrayStatus *
+                        AsArray();
+    bool                SetBranch(
+                            intt                in_nBranchIx,
+                            StmStatus::Branch   in_nBranch );
+    void                SetTokenCreateFunction(
+                            F_CRTOK             i_fTokenCreateFunction );
+  private:
+    StmStatus::Branch * dpBranches;
+    intt                nNrOfBranches;
+    F_CRTOK             fTokenCreateFunction;
+    bool                bIsADefault;
+};
+
+
+// IMPLEMENTATION
+
+inline void
+StmArrayStatus::SetTokenCreateFunction( F_CRTOK i_fTokenCreateFunction )
+    { fTokenCreateFunction = i_fTokenCreateFunction; }
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/tokens/stmstate.hxx b/autodoc/source/parser/inc/tokens/stmstate.hxx
new file mode 100644
index 000000000000..e966b4740b75
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/stmstate.hxx
@@ -0,0 +1,70 @@
+/* -*- 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 ADC_STMSTATE_HXX
+#define ADC_STMSTATE_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+class StmArrayStatus;
+class StmBoundsStatus;
+
+/** A StmStatus is a state within a StateMachine.
+    There are two kinds of it.  Either its an array of pointers to
+    other states within the state machine - an ArrayStatus.
+
+    Or it is a BoundsStatus, which shows, the token cannot be
+    followed further within the StateMachine.
+**/
+class StmStatus // := "State machine status"
+{
+  public:
+    typedef intt        Branch;         /// Values >= 0 give a next #Status' ID.
+                                        /// Values <= 0 tell, that a token is finished.
+                                        /// a value < 0 returns the status back to an upper level state machine.
+        // LIFECYCLE
+    virtual             ~StmStatus() {}
+
+        // OPERATIONS
+    virtual StmArrayStatus *
+                        AsArray();
+    virtual StmBoundsStatus *
+                        AsBounds();
+
+        // INQUIRY
+    virtual bool        IsADefault() const = 0;
+};
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/tokens/stmstfin.hxx b/autodoc/source/parser/inc/tokens/stmstfin.hxx
new file mode 100644
index 000000000000..7ded64933bb5
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/stmstfin.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 ADC_STMSTFIN_HXX
+#define ADC_STMSTFIN_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/stmstate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+class TkpContext;
+class StateMachineContext;
+
+/**
+**/
+class StmBoundsStatus : public StmStatus
+{
+  public:
+    // LIFECYCLE
+                        StmBoundsStatus(
+                            StateMachineContext &
+                                                o_rOwner,
+                            TkpContext &        i_rFollowUpContext,
+                            uintt               i_nStatusFunctionNr,
+                            bool                i_bIsDefault  );
+    // INQUIRY
+    TkpContext *        FollowUpContext();
+    uintt               StatusFunctionNr() const;
+    virtual bool        IsADefault() const;
+
+    // ACCESS
+    virtual StmBoundsStatus *
+                        AsBounds();
+
+  private:
+    StateMachineContext *
+                        pOwner;
+    TkpContext *        pFollowUpContext;
+    uintt               nStatusFunctionNr;
+    bool                bIsDefault;
+};
+
+inline TkpContext *
+StmBoundsStatus::FollowUpContext()
+    { return pFollowUpContext; }
+inline uintt
+StmBoundsStatus::StatusFunctionNr() const
+    { return nStatusFunctionNr; }
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/tokens/tkp.hxx b/autodoc/source/parser/inc/tokens/tkp.hxx
new file mode 100644
index 000000000000..97fc9578ae5c
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/tkp.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 ADC_TKP_HXX
+#define ADC_TKP_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+class CharacterSource;
+class TkpContext;
+    // PARAMETRS
+
+
+
+/** This is the interface for parser classes, which get a sequence of tokens from
+    a text.
+
+    Start() starts to parse the text from the given i_rSource.
+    GetNextToken() returns a Token on the heap as long as there are
+    still characters in the text left. This can be checked by
+    HasMore().
+
+    The algorithms for parsing tokens from the text are an issue of
+    the derived classes.
+*/
+
+class TokenParser
+{
+  public:
+    // LIFECYCLE
+                        TokenParser();
+    virtual             ~TokenParser() {}
+
+    // OPERATIONS
+    /** Start parsing a character source. Any previously parsed sources
+        are discarded.
+    */
+    virtual void        Start(
+                            CharacterSource &
+                                            i_rSource );
+
+    /** @short  Gets the next identifiable token out of the
+        source code.
+    */
+    void                GetNextToken();
+
+    /// @return true, if there are more tokens to parse.
+    bool                HasMore() const         { return bHasMore; }
+
+  private:
+    void                InitSource(
+                            CharacterSource &
+                                            i_rSource );
+
+    virtual void        SetStartContext() = 0;
+    virtual void        SetCurrentContext(
+                            TkpContext &        io_rContext ) = 0;
+    virtual TkpContext &
+                        CurrentContext() = 0;
+    // DATA
+    CharacterSource *   pChars;
+    bool                bHasMore;
+};
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/tokens/tkpcontx.hxx b/autodoc/source/parser/inc/tokens/tkpcontx.hxx
new file mode 100644
index 000000000000..c8818b4bfc20
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/tkpcontx.hxx
@@ -0,0 +1,142 @@
+/* -*- 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 ADC_TKPCONTX_HXX
+#define ADC_TKPCONTX_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <tokens/token.hxx>
+class CharacterSource;
+class TkpNullContext;
+
+/** @task
+    Specifies a context within which tokens are interpreted in a special
+    way. For example in parsing C++ there could be a context for code,
+    one for comments and a third one for preprocessor statements, because
+    each of these would give the same token different meanings.
+
+    The three functions
+            ReadCharChain()
+            PassNewToken()
+            FollowUpContext()
+    have to be called in this sequence.
+
+**/
+class TkpContext
+{
+  public:
+    // LIFECYCLE
+    virtual                 ~TkpContext() {}
+
+    // OPERATIONS
+    /** @descr
+        The functions starts to parse with the CurChar() of io_rText.
+        It leaves io_rText.CurChar() at the first char of the following Token or
+        the following Context.
+
+        This function returns, when a context has parsed some characterss
+        and completed a token OR left the context.
+        If the token is to be ignored, it is cut from io_rText.
+
+        If the token is to be parsed further in a different context,
+        it is NOT cut from io_rText.
+
+        After this function PassNewToken() has to be called.
+
+        If the function has found a valid and complete token, PassNewToken()
+        passes the parsed token to the internally known receiver and
+        returns true. The token is cut from io_rText.
+    **/
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText ) = 0;
+    /** Has to pass the parsed token to a known receiver.
+        If the token is to be parsed further in a different context,
+        PassNewToken() returns false, but the token is NOT cut from io_rText.
+
+        @return true, if a token was passed.
+                false, if the token was not parsed completely by this context
+                       or if the token is to be ignored.
+    */
+    virtual bool        PassNewToken() = 0;
+    virtual TkpContext &
+                        FollowUpContext() = 0;
+
+    static TkpNullContext &
+                        Null_();
+};
+
+class StateMachineContext
+{
+  public:
+    typedef TextToken::F_CRTOK F_CRTOK;
+
+    virtual ~StateMachineContext() {}
+
+    /// Is used by StmBoundsStatus only.
+    virtual void        PerformStatusFunction(
+                            uintt               i_nStatusSignal,
+                            F_CRTOK             i_fTokenCreateFunction,
+                            CharacterSource &   io_rText ) = 0;
+};
+
+class TkpNullContext : public TkpContext
+{
+  public:
+                        ~TkpNullContext();
+
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    virtual bool        PassNewToken();
+    virtual TkpContext &
+                        FollowUpContext();
+};
+
+namespace autodoc
+{
+
+class TkpDocuContext : public TkpContext
+{
+  public:
+    virtual void        SetParentContext(
+                            TkpContext &        io_rParentContext,
+                            const char *        i_sMultiLineEndToken ) = 0;
+    virtual void        AssignDealer(
+                            TokenDealer &       o_rDealer ) = 0;
+    virtual void        SetMode_IsMultiLine(
+                            bool                i_bTrue ) = 0;
+};
+
+} // namespace autodoc
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/tokens/tkpstama.hxx b/autodoc/source/parser/inc/tokens/tkpstama.hxx
new file mode 100644
index 000000000000..9c09ba6bc808
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/tkpstama.hxx
@@ -0,0 +1,125 @@
+/* -*- 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 ADC_TKPSTAMA_HXX
+#define ADC_TKPSTAMA_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcontx.hxx>
+    // COMPONENTS
+#include <tokens/stmstarr.hxx>
+#include <tokens/stmstfin.hxx>
+
+/** @descr
+    This state-machine models state transitions from one state to another
+    per indices of branches. If the indices represent ascii-char-values,
+    the state-machine can be used for recognising tokens of text.
+
+    The state-machine can be a status itself.
+
+    StateMachine needs the array-size of all stati as a guess, how many stati
+    the state machine will contain, when at work.
+
+
+**/
+class StateMachine
+{
+    public:
+        // Types
+        typedef StmStatus::Branch   Branch;
+        typedef StmStatus * *       StatusList;
+
+    //# Interface self
+        // LIFECYCLE
+                        StateMachine(
+                            intt            in_nStatusSize,
+                            intt            in_nInitial_StatusListSize );   /// The user of the constructor should guess
+                                                                            ///   the approximate number of stati here to
+                                                                            ///   avoid multiple reallocations.
+        /// @#AddStatus
+        intt            AddStatus(      /// @return the new #Status' ID
+                            DYN StmStatus * let_dpStatus);
+        /// @#AddToken
+        void            AddToken(
+                            const char *        in_sToken,
+                            TextToken::F_CRTOK  in_fTokenCreateFunction,
+                            const INT16 *       in_aBranches,
+                            INT16               in_nBoundsStatus );
+                        ~StateMachine();
+
+
+        // OPERATIONS
+        StmBoundsStatus &
+                        GetCharChain(
+                            TextToken::F_CRTOK &
+                                                o_nTokenCreateFunction,
+                            CharacterSource &   io_rText );
+    private:
+        // SERVICE FUNCTIONS
+        StmStatus &     Status(
+                            intt            in_nStatusNr) const;
+        StmArrayStatus &
+                        CurrentStatus() const;
+        StmBoundsStatus *
+                        BoundsStatus() const;
+
+        /// Sets the PeekedStatus.
+        void            Peek(
+                            intt            in_nBranch);
+
+        void            ResizeStati();      // Adds space for 32 stati.
+
+        // DATA
+        StatusList      pStati;             /// List of Status, implemented as simple C-array of length #nStatiSpace
+                                            /// with nStatiLength valid members (beginning from zero).
+        intt            nCurrentStatus;
+        intt            nPeekedStatus;
+
+        intt            nStatusSize;        /// Size of the branch array of a single status.
+
+        intt            nNrofStati;         /// Nr of Stati so far.
+        intt            nStatiSpace;        /// Size of allocated array for #pStati (size in items).
+};
+
+
+
+/** @#AddToken
+    @descr
+    Adds a token, which will be recogniszeds by the
+    statemachine.
+
+
+**/
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/tokens/tokdeal.hxx b/autodoc/source/parser/inc/tokens/tokdeal.hxx
new file mode 100644
index 000000000000..3d70cdd4ad03
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/tokdeal.hxx
@@ -0,0 +1,59 @@
+/* -*- 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 ADC_TOKDEAL_HXX
+#define ADC_TOKDEAL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+namespace cpp
+{
+    class Distributor;
+}
+
+
+class TokenDealer
+
+{
+  public:
+    virtual             ~TokenDealer() {}
+
+    virtual void        Deal_Eol() = 0;
+    virtual void        Deal_Eof() = 0;
+    virtual cpp::Distributor *
+                        AsDistributor() = 0;
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/tokens/token.hxx b/autodoc/source/parser/inc/tokens/token.hxx
new file mode 100644
index 000000000000..f44ca2917372
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/token.hxx
@@ -0,0 +1,68 @@
+/* -*- 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 ADC_TOKEN_HXX
+#define ADC_TOKEN_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETRS
+
+
+class TokenDealer;
+
+/**
+*/
+class TextToken
+{
+  public:
+    typedef TextToken * (*F_CRTOK)(const char*);
+
+    // LIFECYCLE
+    virtual             ~TextToken() {}
+
+
+    // INQUIRY
+    virtual const char* Text() const = 0;
+
+    virtual void        DealOut(
+                            ::TokenDealer &     o_rDealer ) = 0;
+};
+
+class Tok_Eof : public TextToken
+{
+    virtual void        DealOut(                // Implemented in tokdeal.cxx
+                            TokenDealer &       o_rDealer );
+    virtual const char* Text() const;
+};
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/tokens/tokproct.hxx b/autodoc/source/parser/inc/tokens/tokproct.hxx
new file mode 100644
index 000000000000..eb3bd8baeab1
--- /dev/null
+++ b/autodoc/source/parser/inc/tokens/tokproct.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 ADC_CPP_TOKPROCT_HXX
+#define ADC_CPP_TOKPROCT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+class ParseEnvironment;
+
+/** is a parent class for classes, which take part in parsing tokens semantically.
+    It provides some types for them.
+*/
+class TokenProcessing_Types
+{
+  public:
+    enum E_TokenDone
+    {
+        not_done = 0,
+        done = 1
+    };
+
+    enum E_EnvStackAction
+    {
+        stay,           // same parse environment
+        push,           // push sub environment
+        pop_success,    // return to parent environment, parsing was successful
+        pop_failure     // return to parent environment, but an error occurred.
+    };
+
+    struct TokenProcessing_Result
+    {
+        E_TokenDone         eDone;
+        E_EnvStackAction    eStackAction;
+        ParseEnvironment *  pEnv2Push;
+
+                            TokenProcessing_Result()
+                                                : eDone(not_done), eStackAction(stay), pEnv2Push(0) {}
+        void                Reset()             { eDone = not_done; eStackAction = stay; pEnv2Push = 0; }
+    };
+
+    enum E_ParseResult
+    {
+        res_error,
+        res_complete,
+        res_predeclaration
+    };
+};
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/x_docu.hxx b/autodoc/source/parser/inc/x_docu.hxx
new file mode 100644
index 000000000000..faf14b0591d2
--- /dev/null
+++ b/autodoc/source/parser/inc/x_docu.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 ADC_X_DOCU_HXX
+#define ADC_X_DOCU_HXX
+
+// BASE CLASSES
+#include <autodoc/x_parsing.hxx>
+
+
+
+
+class X_Docu : public autodoc::X_Parser_Ifc
+{
+  public:
+    // LIFECYCLE
+                        X_Docu(
+                            const char *        i_tag,
+                            const char *        i_explanation );
+                        ~X_Docu();
+    // INQUIRY
+    virtual E_Event     GetEvent() const;
+    virtual void        GetInfo(
+                            std::ostream &      o_rOutputMedium ) const;
+
+  private:
+    String              sTagName;
+    String              sExplanation;
+};
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/inc/x_parse.hxx b/autodoc/source/parser/inc/x_parse.hxx
new file mode 100644
index 000000000000..593c7661d9bc
--- /dev/null
+++ b/autodoc/source/parser/inc/x_parse.hxx
@@ -0,0 +1,66 @@
+/* -*- 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 ADC_X_PARSE_HXX
+#define ADC_X_PARSE_HXX
+
+// BASE CLASSES
+#include <autodoc/x_parsing.hxx>
+
+
+
+
+class X_Parser : public autodoc::X_Parser_Ifc
+{
+  public:
+    // LIFECYCLE
+                        X_Parser(
+                            E_Event             i_eEvent,
+                            const char *        i_sObject,
+                            const String &      i_sCausingFile_FullPath,
+                            uintt               i_nCausingLineNr );
+                        ~X_Parser();
+    // INQUIRY
+    virtual E_Event     GetEvent() const;
+    virtual void        GetInfo(
+                            std::ostream &      o_rOutputMedium ) const;
+
+  private:
+    E_Event             eEvent;
+    String              sObject;
+    String              sCausingFile_FullPath;
+    uintt               nCausingLineNr;
+
+};
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/kernel/makefile.mk b/autodoc/source/parser/kernel/makefile.mk
new file mode 100644
index 000000000000..9baf8ab1c6ef
--- /dev/null
+++ b/autodoc/source/parser/kernel/makefile.mk
@@ -0,0 +1,58 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=parser_kernel
+TARGETTYPE=CUI
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/parsefct.obj    \
+    $(OBJ)$/x_docu.obj      \
+    $(OBJ)$/x_parse.obj
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/parser/kernel/parsefct.cxx b/autodoc/source/parser/kernel/parsefct.cxx
new file mode 100644
index 000000000000..0f157a4159e6
--- /dev/null
+++ b/autodoc/source/parser/kernel/parsefct.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include "parsefct.hxx"
+
+
+// NOT FULLY DECLARED SERVICES
+#include <cpp/prs_cpp.hxx>
+#include <adoc/prs_adoc.hxx>
+#include <tools/filecoll.hxx>
+
+
+DYN ParseToolsFactory * ParseToolsFactory::dpTheInstance_ = 0;
+
+
+namespace autodoc
+{
+
+ParseToolsFactory_Ifc &
+ParseToolsFactory_Ifc::GetIt_()
+{
+    if ( ParseToolsFactory::dpTheInstance_ == 0 )
+        ParseToolsFactory::dpTheInstance_ = new ParseToolsFactory;
+    return *ParseToolsFactory::dpTheInstance_;
+}
+
+}   // namespace autodoc
+
+
+ParseToolsFactory::ParseToolsFactory()
+{
+}
+
+ParseToolsFactory::~ParseToolsFactory()
+{
+}
+
+DYN autodoc::CodeParser_Ifc *
+ParseToolsFactory::Create_Parser_Cplusplus() const
+{
+    return new cpp::Cpluplus_Parser;
+}
+
+DYN autodoc::DocumentationParser_Ifc *
+ParseToolsFactory::Create_DocuParser_AutodocStyle() const
+{
+    return new adoc::DocuParser_AutodocStyle;
+}
+
+DYN autodoc::FileCollector_Ifc *
+ParseToolsFactory::Create_FileCollector( uintt i_nEstimatedNrOfFiles ) const
+{
+    return new FileCollector(i_nEstimatedNrOfFiles);
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/kernel/parsefct.hxx b/autodoc/source/parser/kernel/parsefct.hxx
new file mode 100644
index 000000000000..b4cfa443f007
--- /dev/null
+++ b/autodoc/source/parser/kernel/parsefct.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 ADC_PARSER_PARSEFCT_HXX
+#define ADC_PARSER_PARSEFCT_HXX
+
+
+#include <autodoc/parsing.hxx>
+
+
+/** Interface for parsing code of a programming language and
+    delivering the information into an Autodoc Repository.
+**/
+class ParseToolsFactory : public autodoc::ParseToolsFactory_Ifc
+{
+  public:
+                        ParseToolsFactory();
+    virtual             ~ParseToolsFactory();
+
+    virtual DYN autodoc::CodeParser_Ifc *
+                        Create_Parser_Cplusplus() const;
+    virtual DYN autodoc::DocumentationParser_Ifc *
+                        Create_DocuParser_AutodocStyle() const;
+    virtual DYN autodoc::FileCollector_Ifc *
+                        Create_FileCollector(
+                            uintt               i_nEstimatedNrOfFiles ) const;
+  private:
+    static DYN ParseToolsFactory *
+                        dpTheInstance_;
+
+    friend class autodoc::ParseToolsFactory_Ifc;
+};
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/kernel/x_docu.cxx b/autodoc/source/parser/kernel/x_docu.cxx
new file mode 100644
index 000000000000..529073675810
--- /dev/null
+++ b/autodoc/source/parser/kernel/x_docu.cxx
@@ -0,0 +1,64 @@
+/* -*- 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 <precomp.h>
+#include <x_docu.hxx>
+
+// NOT FULLY DECLARED SERVICES
+
+
+
+X_Docu::X_Docu( const char *        i_tag,
+                const char *        i_explanation  )
+    :   sTagName(i_tag),
+        sExplanation(i_explanation)
+{
+}
+
+X_Docu::~X_Docu()
+{
+}
+
+X_Docu::E_Event
+X_Docu::GetEvent() const
+{
+     return x_Any;
+}
+
+void
+X_Docu::GetInfo( std::ostream & o_rOutputMedium ) const
+{
+    o_rOutputMedium
+        << "Error in tag '"
+        << sTagName
+        << "': "
+        << sExplanation
+        << Endl();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/kernel/x_parse.cxx b/autodoc/source/parser/kernel/x_parse.cxx
new file mode 100644
index 000000000000..f06de7f96f96
--- /dev/null
+++ b/autodoc/source/parser/kernel/x_parse.cxx
@@ -0,0 +1,101 @@
+/* -*- 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 <precomp.h>
+#include <x_parse.hxx>
+
+// NOT FULLY DECLARED SERVICES
+
+
+
+X_Parser::X_Parser( E_Event             i_eEvent,
+                    const char *        i_sObject,
+                    const String &      i_sCausingFile_FullPath,
+                    uintt               i_nCausingLineNr  )
+    :   eEvent(i_eEvent),
+        sObject(i_sObject),
+        sCausingFile_FullPath(i_sCausingFile_FullPath),
+        nCausingLineNr(i_nCausingLineNr)
+{
+}
+
+X_Parser::~X_Parser()
+{
+}
+
+X_Parser::E_Event
+X_Parser::GetEvent() const
+{
+     return eEvent;
+}
+
+void
+X_Parser::GetInfo( std::ostream & o_rOutputMedium ) const
+{
+    o_rOutputMedium << "Error in file "
+                    << sCausingFile_FullPath
+                    << " in line "
+                    << nCausingLineNr
+                    << ": ";
+
+
+    switch (eEvent)
+    {
+        case x_InvalidChar:
+            o_rOutputMedium << "Unknown character '"
+                            << sObject
+                            << "'";
+            break;
+        case x_UnexpectedToken:
+            o_rOutputMedium << "Unexpected token \""
+                            << sObject
+                            << "\"";
+            break;
+        case x_UnexpectedEOF:
+            o_rOutputMedium << "Unexpected end of file.";
+            break;
+        case x_UnspecifiedSyntaxError:
+            o_rOutputMedium << "Unspecified syntax problem in file.";
+            break;
+        case x_Any:
+        default:
+            o_rOutputMedium << "Unspecified parsing exception.";
+    }   // end switch
+    o_rOutputMedium << Endl();
+}
+
+
+std::ostream &
+operator<<( std::ostream &                  o_rOut,
+            const autodoc::X_Parser_Ifc &   i_rException )
+{
+    i_rException.GetInfo(o_rOut);
+     return o_rOut;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/semantic/makefile.mk b/autodoc/source/parser/semantic/makefile.mk
new file mode 100644
index 000000000000..da7e8f154b43
--- /dev/null
+++ b/autodoc/source/parser/semantic/makefile.mk
@@ -0,0 +1,58 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=parser_semantic
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/parseenv.obj
+
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/parser/semantic/parseenv.cxx b/autodoc/source/parser/semantic/parseenv.cxx
new file mode 100644
index 000000000000..aa998d038542
--- /dev/null
+++ b/autodoc/source/parser/semantic/parseenv.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <semantic/parseenv.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/doc/d_oldcppdocu.hxx>
+#include <x_parse.hxx>
+
+
+void
+ParseEnvironment::Enter( E_EnvStackAction   i_eWayOfEntering )
+{
+    switch (i_eWayOfEntering)
+    {
+        case push:
+                InitData();
+                if ( Parent() != 0 )
+                {
+                    csv_assert( Parent()->CurSubPeUse() != 0 );
+                    Parent()->CurSubPeUse()->InitParse();
+                }
+                break;
+        case pop_success:
+                break;
+        case pop_failure:
+                break;
+        default:
+            csv_assert(false);
+    }   // end switch
+}
+
+void
+ParseEnvironment::Leave( E_EnvStackAction   i_eWayOfLeaving )
+{
+    switch (i_eWayOfLeaving)
+    {
+        case push:
+                break;
+        case pop_success:
+                TransferData();
+                if ( Parent() != 0 )
+                {
+                    csv_assert( Parent()->CurSubPeUse() != 0 );
+                    Parent()->CurSubPeUse()->GetResults();
+                }
+                break;
+        case pop_failure:
+                break;
+        default:
+            csv_assert(false);
+    }   // end switch
+}
+
+ParseEnvironment::ParseEnvironment( ParseEnvironment *  i_pParent )
+    :   pParent(i_pParent),
+        // pDocu,
+        pCurSubPe(0)
+{
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/tokens/makefile.mk b/autodoc/source/parser/tokens/makefile.mk
new file mode 100644
index 000000000000..beb3207154fb
--- /dev/null
+++ b/autodoc/source/parser/tokens/makefile.mk
@@ -0,0 +1,62 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=garden
+TARGET=parser_tokens
+TARGETTYPE=CUI
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/stmstarr.obj	\
+    $(OBJ)$/stmstate.obj	\
+    $(OBJ)$/stmstfin.obj	\
+    $(OBJ)$/tkpstama.obj	\
+    $(OBJ)$/tkp.obj			\
+    $(OBJ)$/tkpcontx.obj	\
+    $(OBJ)$/tokdeal.obj		
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/parser/tokens/stmstarr.cxx b/autodoc/source/parser/tokens/stmstarr.cxx
new file mode 100644
index 000000000000..8070fae3a450
--- /dev/null
+++ b/autodoc/source/parser/tokens/stmstarr.cxx
@@ -0,0 +1,101 @@
+/* -*- 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 <precomp.h>
+#include <tokens/stmstarr.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <x_parse.hxx>
+
+
+
+StmArrayStatus::StmArrayStatus( intt            i_nStatusSize,
+                                const INT16 *   in_aArrayModel,
+                                F_CRTOK         i_fTokenCreateFunction,
+                                bool            in_bIsDefault )
+    :   dpBranches(new StmStatus::Branch[i_nStatusSize]),
+        nNrOfBranches(i_nStatusSize),
+        fTokenCreateFunction(i_fTokenCreateFunction),
+        bIsADefault(in_bIsDefault)
+{
+    if (in_aArrayModel != 0)
+    {
+        intt count = 0;
+        for (const INT16 * get = in_aArrayModel; count < nNrOfBranches; count++, get++)
+            dpBranches[count] = *get;
+    }
+    else //
+    {
+        memset(dpBranches, 0, nNrOfBranches);
+    }  // endif
+}
+
+StmArrayStatus::~StmArrayStatus()
+{
+    delete [] dpBranches;
+}
+
+bool
+StmArrayStatus::SetBranch( intt              in_nBranchIx,
+                           StmStatus::Branch in_nBranch )
+{
+    if ( csv::in_range(intt(0), in_nBranchIx, intt(nNrOfBranches) ) )
+    {
+        dpBranches[in_nBranchIx] = in_nBranch;
+        return true;
+    }
+    return false;
+}
+
+
+StmStatus::Branch
+StmArrayStatus::NextBy(intt in_nIndex) const
+{
+    if (in_nIndex < 0)
+        throw X_Parser(X_Parser::x_InvalidChar, "", String::Null_(), 0);
+
+    return in_nIndex < nNrOfBranches
+                ?   dpBranches[in_nIndex]
+                :   dpBranches[nNrOfBranches - 1];
+}
+
+
+bool
+StmArrayStatus::IsADefault() const
+{
+    return bIsADefault;
+}
+
+StmArrayStatus *
+StmArrayStatus::AsArray()
+{
+    return this;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/tokens/stmstate.cxx b/autodoc/source/parser/tokens/stmstate.cxx
new file mode 100644
index 000000000000..6530ebbbe838
--- /dev/null
+++ b/autodoc/source/parser/tokens/stmstate.cxx
@@ -0,0 +1,48 @@
+/* -*- 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 <precomp.h>
+#include <tokens/stmstate.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+
+StmArrayStatus *
+StmStatus::AsArray()
+{
+    return 0;
+}
+
+StmBoundsStatus *
+StmStatus::AsBounds()
+{
+    return 0;
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/tokens/stmstfin.cxx b/autodoc/source/parser/tokens/stmstfin.cxx
new file mode 100644
index 000000000000..84b7a9cf39e9
--- /dev/null
+++ b/autodoc/source/parser/tokens/stmstfin.cxx
@@ -0,0 +1,63 @@
+/* -*- 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 <precomp.h>
+#include <tokens/stmstfin.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <tokens/tkpcontx.hxx>
+
+
+StmBoundsStatus::StmBoundsStatus( StateMachineContext &
+                                                    o_rOwner,
+                                  TkpContext &      i_rFollowUpContext,
+                                  uintt             i_nStatusFunctionNr,
+                                  bool              i_bIsDefault )
+    :   pOwner(&o_rOwner),
+        pFollowUpContext(&i_rFollowUpContext),
+        nStatusFunctionNr(i_nStatusFunctionNr),
+        bIsDefault(i_bIsDefault)
+{
+}
+
+bool
+StmBoundsStatus::IsADefault() const
+{
+    return bIsDefault;
+}
+
+StmBoundsStatus *
+StmBoundsStatus::AsBounds()
+{
+    return this;
+}
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/tokens/tkp.cxx b/autodoc/source/parser/tokens/tkp.cxx
new file mode 100644
index 000000000000..7be7bcb55842
--- /dev/null
+++ b/autodoc/source/parser/tokens/tkp.cxx
@@ -0,0 +1,74 @@
+/* -*- 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 <precomp.h>
+#include <tokens/tkp.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <tools/tkpchars.hxx>
+#include <tokens/tkpcontx.hxx>
+
+
+
+TokenParser::TokenParser()
+    :   pChars(0),
+        bHasMore(false)
+{
+}
+
+void
+TokenParser::Start( CharacterSource & i_rSource )
+{
+    InitSource(i_rSource);
+}
+
+void
+TokenParser::GetNextToken()
+{
+    csv_assert(pChars != 0);
+
+    bHasMore = NOT pChars->IsFinished();
+
+    for ( bool bDone = NOT bHasMore; NOT bDone; )
+    {
+        CurrentContext().ReadCharChain(*pChars);
+        bDone = CurrentContext().PassNewToken();
+        SetCurrentContext(CurrentContext().FollowUpContext());
+    }
+}
+
+void
+TokenParser::InitSource( CharacterSource & i_rSource )
+{
+    pChars = &i_rSource;
+    bHasMore = true;
+    SetStartContext();
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/tokens/tkpcontx.cxx b/autodoc/source/parser/tokens/tkpcontx.cxx
new file mode 100644
index 000000000000..c1979bfe6c44
--- /dev/null
+++ b/autodoc/source/parser/tokens/tkpcontx.cxx
@@ -0,0 +1,70 @@
+/* -*- 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 <precomp.h>
+#include <tokens/tkpcontx.hxx>
+
+// NOT FULLY DECLARED SERVICES
+
+
+
+TkpNullContext G_aNullContext;
+
+TkpNullContext &
+TkpContext::Null_()
+{
+    return G_aNullContext;
+}
+
+TkpNullContext::~TkpNullContext()
+{
+}
+
+void
+TkpNullContext::ReadCharChain( CharacterSource & )
+{
+}
+
+bool
+TkpNullContext::PassNewToken()
+{
+    return false;
+}
+
+TkpContext &
+TkpNullContext::FollowUpContext()
+{
+     return *this;
+}
+
+
+
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/tokens/tkpstama.cxx b/autodoc/source/parser/tokens/tkpstama.cxx
new file mode 100644
index 000000000000..aefe72cac10b
--- /dev/null
+++ b/autodoc/source/parser/tokens/tkpstama.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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tokens/tkpstama.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <tokens/stmstarr.hxx>
+#include <tools/tkpchars.hxx>
+
+const intt  C_nStatuslistResizeValue = 32;
+const intt  C_nTopStatus = 0;
+
+StateMachine::StateMachine( intt            in_nStatusSize,
+                            intt            in_nInitial_StatusListSize )
+    :   pStati(new StmStatus*[in_nInitial_StatusListSize]),
+        nCurrentStatus(C_nTopStatus),
+        nPeekedStatus(C_nTopStatus),
+        nStatusSize(in_nStatusSize),
+        nNrofStati(0),
+        nStatiSpace(in_nInitial_StatusListSize)
+{
+    csv_assert(in_nStatusSize > 0);
+    csv_assert(in_nInitial_StatusListSize > 0);
+
+    memset(pStati, 0, sizeof(StmStatus*) * nStatiSpace);
+}
+
+intt
+StateMachine::AddStatus(StmStatus * let_dpStatus)
+{
+    if (nNrofStati == nStatiSpace)
+    {
+        ResizeStati();
+    }
+    pStati[nNrofStati] = let_dpStatus;
+    return nNrofStati++;
+}
+
+void
+StateMachine::AddToken( const char *        in_sToken,
+                        TextToken::F_CRTOK  in_fTokenCreateFunction,
+                        const INT16 *       in_aBranches,
+                        INT16               in_nBoundsStatus )
+{
+    if (csv::no_str(in_sToken))
+        return;
+
+    // Durch existierende Stati durchhangeln:
+    nCurrentStatus = 0;
+    nPeekedStatus = 0;
+
+    for ( const char * pChar = in_sToken;
+          *pChar != NULCH;
+          ++pChar )
+    {
+        Peek(*pChar);
+        StmStatus & rPst = Status(nPeekedStatus);
+        if ( rPst.IsADefault() OR rPst.AsBounds() != 0 )
+        {
+            nPeekedStatus = AddStatus( new StmArrayStatus(nStatusSize, in_aBranches, 0, false ) );
+            CurrentStatus().SetBranch( *pChar, nPeekedStatus );
+        }
+        nCurrentStatus = nPeekedStatus;
+    }   // end for
+    StmArrayStatus & rLastStatus = CurrentStatus();
+    rLastStatus.SetTokenCreateFunction(in_fTokenCreateFunction);
+    for (intt i = 0; i < nStatusSize; i++)
+    {
+        if (Status(rLastStatus.NextBy(i)).AsBounds() != 0)
+            rLastStatus.SetBranch(i,in_nBoundsStatus);
+    }   // end for
+}
+
+StateMachine::~StateMachine()
+{
+    for (intt i = 0; i < nNrofStati; i++)
+    {
+        delete pStati[i];
+    }
+    delete [] pStati;
+}
+
+StmBoundsStatus &
+StateMachine::GetCharChain( TextToken::F_CRTOK &    o_nTokenCreateFunction,
+                            CharacterSource &       io_rText )
+{
+    nCurrentStatus = C_nTopStatus;
+
+    Peek(io_rText.CurChar());
+    while (BoundsStatus() == 0)
+    {
+        nCurrentStatus = nPeekedStatus;
+        Peek(io_rText.MoveOn());
+    }
+    o_nTokenCreateFunction = CurrentStatus().TokenCreateFunction();
+
+    return *BoundsStatus();
+}
+
+void
+StateMachine::ResizeStati()
+{
+    intt nNewSize = nStatiSpace + C_nStatuslistResizeValue;
+    intt i = 0;
+    StatusList pNewStati = new StmStatus*[nNewSize];
+
+    for ( ; i < nNrofStati; i++)
+    {
+        pNewStati[i] = pStati[i];
+    }
+    memset( pNewStati+i,
+            0,
+            (nNewSize-i) * sizeof(StmStatus*) );
+
+    delete [] pStati;
+    pStati = pNewStati;
+    nStatiSpace = nNewSize;
+}
+
+StmStatus &
+StateMachine::Status(intt in_nStatusNr) const
+{
+    csv_assert( csv::in_range(intt(0), in_nStatusNr, intt(nNrofStati)) );
+    return *pStati[in_nStatusNr];
+}
+
+StmArrayStatus &
+StateMachine::CurrentStatus() const
+{
+    StmArrayStatus * pCurSt = Status(nCurrentStatus).AsArray();
+
+    csv_assert(pCurSt != 0);
+    return *pCurSt;
+}
+
+StmBoundsStatus *
+StateMachine::BoundsStatus() const
+{
+    return Status(nPeekedStatus).AsBounds();
+}
+
+void
+StateMachine::Peek(intt in_nBranch)
+{
+    StmArrayStatus & rSt = CurrentStatus();
+    nPeekedStatus = rSt.NextBy(in_nBranch);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser/tokens/tokdeal.cxx b/autodoc/source/parser/tokens/tokdeal.cxx
new file mode 100644
index 000000000000..561a638a3233
--- /dev/null
+++ b/autodoc/source/parser/tokens/tokdeal.cxx
@@ -0,0 +1,52 @@
+/* -*- 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 <precomp.h>
+#include <tokens/tokdeal.hxx>
+#include <tokens/token.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+
+
+
+void
+Tok_Eof::DealOut( TokenDealer & o_rDealer )
+{
+    o_rDealer.Deal_Eof();
+};
+
+const char *
+Tok_Eof::Text() const
+{
+    return "";
+}
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/cx_idlco.cxx b/autodoc/source/parser_i/idl/cx_idlco.cxx
new file mode 100644
index 000000000000..42ace9448462
--- /dev/null
+++ b/autodoc/source/parser_i/idl/cx_idlco.cxx
@@ -0,0 +1,547 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/cx_idlco.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <s2_luidl/cx_sub.hxx>
+#include <s2_dsapi/cx_dsapi.hxx>
+#include <tools/tkpchars.hxx>
+#include <tokens/tkpstam2.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <s2_luidl/tokrecv.hxx>
+#include <x_parse2.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+const intt C_nCppInitialNrOfStati = 400;
+const intt C_nStatusSize = 128;
+
+
+
+const uintt nF_fin_Error = 1;
+const uintt nF_fin_Ignore = 2;
+const uintt nF_fin_Identifier = 3;
+const uintt nF_fin_Keyword = 4;
+const uintt nF_fin_Punctuation = 5;
+const uintt nF_fin_EOL = 6;
+const uintt nF_fin_EOF = 7;
+
+const uintt nF_goto_MLDocu = 10;
+const uintt nF_goto_SLDocu = 11;
+const uintt nF_goto_MLComment = 12;
+const uintt nF_goto_SLComment = 13;
+const uintt nF_goto_Praeprocessor = 14;
+const uintt nF_goto_Assignment = 15;
+
+
+
+const UINT16 nTok_bty_any = 100 + TokBuiltInType::bty_any;
+const UINT16 nTok_bty_boolean = 100 + TokBuiltInType::bty_boolean;
+const UINT16 nTok_bty_byte = 100 + TokBuiltInType::bty_byte;
+const UINT16 nTok_bty_char = 100 + TokBuiltInType::bty_char;
+const UINT16 nTok_bty_double = 100 + TokBuiltInType::bty_double;
+const UINT16 nTok_bty_hyper = 100 + TokBuiltInType::bty_hyper;
+const UINT16 nTok_bty_long = 100 + TokBuiltInType::bty_long;
+const UINT16 nTok_bty_short = 100 + TokBuiltInType::bty_short;
+const UINT16 nTok_bty_string = 100 + TokBuiltInType::bty_string;
+const UINT16 nTok_bty_void = 100 + TokBuiltInType::bty_void;
+const UINT16 nTok_bty_ellipse = 100 + TokBuiltInType::bty_ellipse;
+
+const UINT16 nTok_tmod_unsigned = 200 + TokTypeModifier::tmod_unsigned;
+const UINT16 nTok_tmod_sequence = 200 + TokTypeModifier::tmod_sequence;
+
+const UINT16 nTok_ph_in = 250 + TokParameterHandling::ph_in;
+const UINT16 nTok_ph_out = 250 + TokParameterHandling::ph_out;
+const UINT16 nTok_ph_inout = 250 + TokParameterHandling::ph_inout;
+
+const UINT16 nTok_mt_attribute = 300 + TokMetaType::mt_attribute;
+const UINT16 nTok_mt_constants = 300 + TokMetaType::mt_constants;
+const UINT16 nTok_mt_enum = 300 + TokMetaType::mt_enum;
+const UINT16 nTok_mt_exception = 300 + TokMetaType::mt_exception;
+const UINT16 nTok_mt_ident = 300 + TokMetaType::mt_ident;
+const UINT16 nTok_mt_interface = 300 + TokMetaType::mt_interface;
+const UINT16 nTok_mt_module = 300 + TokMetaType::mt_module;
+const UINT16 nTok_mt_property = 300 + TokMetaType::mt_property;
+const UINT16 nTok_mt_service = 300 + TokMetaType::mt_service;
+const UINT16 nTok_mt_singleton = 300 + TokMetaType::mt_singleton;
+const UINT16 nTok_mt_struct = 300 + TokMetaType::mt_struct;
+const UINT16 nTok_mt_typedef = 300 + TokMetaType::mt_typedef;
+const UINT16 nTok_mt_uik = 300 + TokMetaType::mt_uik;
+
+const UINT16 nTok_ste_bound = 400 + TokStereotype::ste_bound;
+const UINT16 nTok_ste_constrained = 400 + TokStereotype::ste_constrained;
+const UINT16 nTok_ste_const = 400 + TokStereotype::ste_const;
+const UINT16 nTok_ste_maybeambiguous = 400 + TokStereotype::ste_maybeambiguous;
+const UINT16 nTok_ste_maybedefault = 400 + TokStereotype::ste_maybedefault;
+const UINT16 nTok_ste_maybevoid = 400 + TokStereotype::ste_maybevoid;
+const UINT16 nTok_ste_oneway = 400 + TokStereotype::ste_oneway;
+const UINT16 nTok_ste_optional = 400 + TokStereotype::ste_optional;
+const UINT16 nTok_ste_readonly = 400 + TokStereotype::ste_readonly;
+const UINT16 nTok_ste_removable = 400 + TokStereotype::ste_removable;
+const UINT16 nTok_ste_virtual = 400 + TokStereotype::ste_virtual;
+const UINT16 nTok_ste_transient = 400 + TokStereotype::ste_transient;
+const UINT16 nTok_ste_published = 400 + TokStereotype::ste_published;
+
+const UINT16 nTok_raises = 501;
+const UINT16 nTok_needs = 502;
+const UINT16 nTok_observes = 503;
+
+const UINT16 nTok_assignment = 550;
+
+const UINT16 nTok_ignore = 600;
+const UINT16 nTok_none_MLCommentBegin = 601;
+const UINT16 nTok_none_SLCommentBegin = 602;
+const UINT16 nTok_none_MLDocuBegin = 603;
+const UINT16 nTok_none_SLDocuBegin = 604;
+const UINT16 nTok_none_PraeprocessorBegin = 605;
+
+
+const UINT16 nTok_punct_BracketOpen = 700 + TokPunctuation::BracketOpen;
+const UINT16 nTok_punct_BracketClose = 700 + TokPunctuation::BracketClose;
+const UINT16 nTok_punct_ArrayBracketOpen = 700 + TokPunctuation::ArrayBracketOpen;
+const UINT16 nTok_punct_ArrayBracketClose = 700 + TokPunctuation::ArrayBracketClose;
+const UINT16 nTok_punct_CurledBracketOpen = 700 + TokPunctuation::CurledBracketOpen;
+const UINT16 nTok_punct_CurledBracketClose = 700 + TokPunctuation::CurledBracketClose;
+const UINT16 nTok_punct_Semicolon = 700 + TokPunctuation::Semicolon;
+const UINT16 nTok_punct_Colon = 700 + TokPunctuation::Colon;
+const UINT16 nTok_punct_DoubleColon = 700 + TokPunctuation::DoubleColon;
+const UINT16 nTok_punct_Comma = 700 + TokPunctuation::Comma;
+const UINT16 nTok_punct_Minus = 700 + TokPunctuation::Minus;
+const UINT16 nTok_punct_Fullstop = 700 + TokPunctuation::Fullstop;
+const UINT16 nTok_punct_Lesser = 700 + TokPunctuation::Lesser;
+const UINT16 nTok_punct_Greater = 700 + TokPunctuation::Greater;
+
+const UINT16 nTok_EOL = 801;
+const UINT16 nTok_EOF = 802;
+
+
+
+Context_UidlCode::Context_UidlCode( Token_Receiver &     o_rReceiver,
+                                    DYN TkpDocuContext & let_drContext_Docu )
+    :   aStateMachine(C_nStatusSize,C_nCppInitialNrOfStati),
+        pReceiver(&o_rReceiver),
+        pDocuContext(&let_drContext_Docu),
+        dpContext_MLComment(0),
+        dpContext_SLComment(0),
+        dpContext_Preprocessor(0),
+        dpContext_Assignment(0),
+        pNewToken(0),
+        pFollowUpContext(0)
+{
+    dpContext_MLComment = new Context_MLComment(o_rReceiver,*this),
+    dpContext_SLComment = new Context_SLComment(o_rReceiver,*this),
+    dpContext_Preprocessor = new Context_Praeprocessor(o_rReceiver,*this),
+    dpContext_Assignment = new Context_Assignment(o_rReceiver,*this),
+
+    pDocuContext->SetParentContext(*this,"*/");
+    SetupStateMachine();
+}
+
+Context_UidlCode::~Context_UidlCode()
+{
+}
+
+void
+Context_UidlCode::ReadCharChain( CharacterSource & io_rText )
+{
+    pNewToken = 0;
+
+    UINT16 nTokenId = 0;
+    StmBoundsStatu2 & rBound = aStateMachine.GetCharChain(nTokenId, io_rText);
+
+    // !!!
+    //   The order of the next two lines is essential, because
+    //   pFollowUpContext may be changed by PerformStatusFunction() also,
+    //   which then MUST override the previous assignment.
+    pFollowUpContext = rBound.FollowUpContext();
+    PerformStatusFunction(rBound.StatusFunctionNr(), nTokenId, io_rText);
+}
+
+bool
+Context_UidlCode::PassNewToken()
+{
+    if (pNewToken)
+    {
+        pReceiver->Receive(*pNewToken.Release());
+        return true;
+    }
+    return false;
+}
+
+TkpContext &
+Context_UidlCode::FollowUpContext()
+{
+    csv_assert(pFollowUpContext != 0);
+    return *pFollowUpContext;
+}
+
+void
+Context_UidlCode::PerformStatusFunction( uintt              i_nStatusSignal,
+                                         UINT16             i_nTokenId,
+                                         CharacterSource &  io_rText )
+{
+    switch (i_nStatusSignal)
+    {
+        case nF_fin_Error:
+            // KORR_FUTURE
+            throw X_AutodocParser(X_AutodocParser::x_InvalidChar);
+            // no break, because of throw
+        case nF_fin_Ignore:
+            pNewToken = 0;
+            io_rText.CutToken();
+            break;
+        case nF_fin_Identifier:
+            pNewToken = new TokIdentifier(io_rText.CutToken());
+            break;
+        case nF_fin_Keyword:
+            io_rText.CutToken();
+            switch ( i_nTokenId / 50 )
+            {
+                case 2:
+                    pNewToken = new TokBuiltInType(i_nTokenId - 100);
+                    break;
+                case 4:
+                    pNewToken = new TokTypeModifier(i_nTokenId - 200);
+                    break;
+                case 5:
+                    pNewToken = new TokParameterHandling(i_nTokenId - 250);
+                    break;
+                case 6:
+                    pNewToken = new TokMetaType(i_nTokenId - 300);
+                    break;
+                case 8:
+                    pNewToken = new TokStereotype(i_nTokenId - 400);
+                    break;
+                case 10:
+                    switch (i_nTokenId-500)
+                    {
+                        case 1:
+                            pNewToken = new TokRaises;
+                            break;
+                        case 2:
+                            pNewToken = new TokNeeds;
+                            break;
+                        case 3:
+                            pNewToken = new TokObserves;
+                            break;
+                        default:
+                            csv_assert(false);
+                    }
+                    break;
+                default:
+                    csv_assert(false);
+            }   // end switch ( i_nTokenId / 50 )
+            break;
+        case nF_fin_Punctuation:
+            io_rText.CutToken();
+            if (i_nTokenId == nTok_punct_DoubleColon)
+                pNewToken = new TokNameSeparator;
+            else
+                pNewToken = new TokPunctuation(i_nTokenId - 700);
+            break;
+        case nF_fin_EOL:
+            io_rText.CutToken();
+            pNewToken = new Tok_EOL;
+            pReceiver->Increment_CurLine();
+            break;
+        case nF_fin_EOF:
+            pNewToken = new Tok_EOF;
+            break;
+        case nF_goto_MLDocu:
+            while ( io_rText.CurChar() == '*')
+                io_rText.MoveOn();
+            io_rText.CutToken();
+            pDocuContext->SetMode_IsMultiLine(true);
+            break;
+        case nF_goto_SLDocu:
+            io_rText.CutToken();
+            pDocuContext->SetMode_IsMultiLine(false);
+            break;
+        case nF_goto_MLComment:
+            break;
+        case nF_goto_SLComment:
+            break;
+        case nF_goto_Praeprocessor:
+            break;
+        case nF_goto_Assignment:
+            break;
+        default:
+            csv_assert(false);
+    }   // end switch (i_nStatusSignal)
+}
+
+void
+Context_UidlCode::SetupStateMachine()
+{
+    // Besondere Array-Stati (kein Tokenabschluss oder Kontextwechsel):
+//  const INT16 top = 0;        // Top-Status
+    const INT16 wht = 1;        // Whitespace-�berlese-Status
+    const INT16 bez = 2;        // Bezeichner-lese-Status
+
+    // Tokenfinish-Stati:
+    const INT16 finErr = 3;
+    const INT16 finIgn = 4;
+    const INT16 finBez = 5;
+    const INT16 finKeyw = 6;
+    const INT16 finPunct = 7;
+    const INT16 finEOL = 8;
+    const INT16 finEOF = 9;
+
+    // Kontextwechsel-Stati:
+    const INT16 gotoMld = 10;
+    const INT16 gotoSld = 11;
+    const INT16 gotoMlc = 12;
+    const INT16 gotoSlc = 13;
+    const INT16 gotoPrp = 14;
+    const INT16 gotoAsg = 15;
+
+    // Konstanten zur Benutzung in der Tabelle:
+    const INT16 err = finErr;
+    const INT16 fbz = finBez;
+    const INT16 fig = finIgn;
+    const INT16 fof = finEOF;
+//  const INT16 fkw = finKeyw;
+//  const INT16 fpc = finPunct;
+
+    /// Die '0'en werden spaeter durch AddToken() ersetzt.
+
+    const INT16 A_nTopStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fof,err,err,err,err,err,err,err,err,wht,  0,wht,wht,  0,err,err,
+     err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // 16 ...
+     wht,err,wht,  0,err,err,err,err,  0,  0,err,err,  0,  0,  0,err,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,err,err,err,err,err,err, // 48 ...
+     err,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,  0,err,  0,err,bez, // 80 ...
+     err,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,  0,err,  0,err,err, // 112 ...
+    };
+
+    const INT16 A_nWhitespaceStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fof,err,err,err,err,err,err,err,err,wht,fig,wht,wht,fig,err,err,
+     err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // 16 ...
+     wht,fig,wht,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig, // 48 ...
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig, // 80 ...
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,
+     fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,err  // 112 ...
+    };
+
+    const INT16 A_nBezeichnerStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fbz,err,err,err,err,err,err,err,err,fbz,fbz,fbz,fbz,fbz,err,err,
+     err,err,err,err,err,err,err,err,err,err,fbz,err,err,err,err,err, // 16 ...
+     fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,fbz,fbz, // 48 ...
+     fbz,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,bez, // 80 ...
+     fbz,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,err  // 112 ...
+    };
+
+    const INT16 A_nPunctDefStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 16 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 48 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 80 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err  // 112 ...
+    };
+
+    const INT16 A_nKeywordDefStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fbz,err,err,err,err,err,err,err,err,fbz,fbz,fbz,fbz,fbz,err,err,
+     err,err,err,err,err,err,err,err,err,err,fbz,err,err,err,err,err, // 16 ...
+     fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,fbz,fbz, // 48 ...
+     fbz,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,bez, // 80 ...
+     fbz,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,
+     bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,bez,fbz,fbz,fbz,fbz,err  // 112 ...
+    };
+
+    DYN StmArrayStatu2 * dpStatusTop
+            = new StmArrayStatu2( C_nStatusSize, A_nTopStatus, 0, true);
+    DYN StmArrayStatu2 * dpStatusWhite
+            = new StmArrayStatu2( C_nStatusSize, A_nWhitespaceStatus, 0, true);
+    DYN StmArrayStatu2 * dpStatusBez
+            = new StmArrayStatu2( C_nStatusSize, A_nBezeichnerStatus, 0, true);
+
+    DYN StmBoundsStatu2 *   dpBst_finErr
+            = new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_Error, true );
+    DYN StmBoundsStatu2 *   dpBst_finIgn
+            = new StmBoundsStatu2( *this, *this, nF_fin_Ignore, true );
+    DYN StmBoundsStatu2 *   dpBst_finBez
+            = new StmBoundsStatu2( *this, *this, nF_fin_Identifier, true );
+    DYN StmBoundsStatu2 *   dpBst_finKeyw
+            = new StmBoundsStatu2( *this, *this, nF_fin_Keyword, false );
+    DYN StmBoundsStatu2 *   dpBst_finPunct
+            = new StmBoundsStatu2( *this, *this, nF_fin_Punctuation, false );
+    DYN StmBoundsStatu2 *   dpBst_finEOL
+            = new StmBoundsStatu2( *this, *this, nF_fin_EOL, false );
+    DYN StmBoundsStatu2 *   dpBst_finEOF
+            = new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_EOF, false );
+
+    DYN StmBoundsStatu2 *   dpBst_gotoMld
+            = new StmBoundsStatu2( *this, *pDocuContext, nF_goto_MLDocu, false );
+    DYN StmBoundsStatu2 *   dpBst_gotoSld
+            = new StmBoundsStatu2( *this, *pDocuContext, nF_goto_SLDocu, false );
+    DYN StmBoundsStatu2 *   dpBst_gotoMlc
+            = new StmBoundsStatu2( *this, *dpContext_MLComment, nF_goto_MLComment, false );
+    DYN StmBoundsStatu2 *   dpBst_gotoSlc
+            = new StmBoundsStatu2( *this, *dpContext_SLComment, nF_goto_SLComment, false );
+    DYN StmBoundsStatu2 *   dpBst_gotoPrp
+            = new StmBoundsStatu2( *this, *dpContext_Preprocessor, nF_goto_Praeprocessor, false );
+    DYN StmBoundsStatu2 *   dpBst_gotoAsg
+            = new StmBoundsStatu2( *this, *dpContext_Assignment, nF_goto_Assignment, false );
+
+    // dpMain aufbauen:
+    aStateMachine.AddStatus(dpStatusTop);
+
+    aStateMachine.AddStatus(dpStatusWhite);
+    aStateMachine.AddStatus(dpStatusBez);
+
+    aStateMachine.AddStatus(dpBst_finErr);
+    aStateMachine.AddStatus(dpBst_finIgn);
+    aStateMachine.AddStatus(dpBst_finBez);
+    aStateMachine.AddStatus(dpBst_finKeyw);
+    aStateMachine.AddStatus(dpBst_finPunct);
+    aStateMachine.AddStatus(dpBst_finEOL);
+    aStateMachine.AddStatus(dpBst_finEOF);
+
+    aStateMachine.AddStatus(dpBst_gotoMld);
+    aStateMachine.AddStatus(dpBst_gotoSld);
+    aStateMachine.AddStatus(dpBst_gotoMlc);
+    aStateMachine.AddStatus(dpBst_gotoSlc);
+    aStateMachine.AddStatus(dpBst_gotoPrp);
+    aStateMachine.AddStatus(dpBst_gotoAsg);
+
+    aStateMachine.AddToken("any",       nTok_bty_any,           A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("attribute", nTok_mt_attribute,      A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("boolean",   nTok_bty_boolean,       A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("bound",     nTok_ste_bound,         A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("byte",      nTok_bty_byte,          A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("char",      nTok_bty_char,          A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("const",     nTok_ste_const,         A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("constants", nTok_mt_constants,      A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("constrained",
+                                        nTok_ste_constrained,   A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("double",    nTok_bty_double,        A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("enum",      nTok_mt_enum,           A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("exception", nTok_mt_exception,      A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("hyper",     nTok_bty_hyper,         A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("ident",     nTok_mt_ident,          A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("in",        nTok_ph_in,             A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("inout",     nTok_ph_inout,          A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("interface", nTok_mt_interface,      A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("long",      nTok_bty_long,          A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("maybeambiguous",
+                                        nTok_ste_maybeambiguous,A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("maybedefault",
+                                        nTok_ste_maybedefault,  A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("maybevoid", nTok_ste_maybevoid,     A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("module",    nTok_mt_module,         A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("needs",     nTok_needs,             A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("observes",  nTok_observes,          A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("oneway",    nTok_ste_oneway,        A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("optional",  nTok_ste_optional,      A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("out",       nTok_ph_out,            A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("property",  nTok_mt_property,       A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("published", nTok_ste_published,     A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("raises",    nTok_raises,            A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("readonly",  nTok_ste_readonly,      A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("removable", nTok_ste_removable,     A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("sequence",  nTok_tmod_sequence,     A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("service",   nTok_mt_service,        A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("short",     nTok_bty_short,         A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("singleton", nTok_mt_singleton,      A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("string",    nTok_bty_string,        A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("struct",    nTok_mt_struct,         A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("transient", nTok_ste_transient,     A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("typedef",   nTok_mt_typedef,        A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("uik",       nTok_mt_uik,            A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("unsigned",  nTok_tmod_unsigned,     A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("virtual",   nTok_ste_virtual,       A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("void",      nTok_bty_void,          A_nKeywordDefStatus,    finKeyw);
+    aStateMachine.AddToken("...",       nTok_bty_ellipse,       A_nPunctDefStatus,      finKeyw);
+
+    aStateMachine.AddToken("=",         nTok_assignment,        A_nPunctDefStatus,      gotoAsg);
+
+    aStateMachine.AddToken("(",         nTok_punct_BracketOpen, A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken(")",         nTok_punct_BracketClose,A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken("[",         nTok_punct_ArrayBracketOpen,
+                                                                A_nPunctDefStatus,      finIgn);
+    aStateMachine.AddToken("]",         nTok_punct_ArrayBracketClose,
+                                                                A_nPunctDefStatus,      finIgn);
+    aStateMachine.AddToken("{",         nTok_punct_CurledBracketOpen,
+                                                                A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken("}",         nTok_punct_CurledBracketClose,
+                                                                A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken("<",         nTok_punct_Lesser,      A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken(">",         nTok_punct_Greater,     A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken(";",         nTok_punct_Semicolon,   A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken(":",         nTok_punct_Colon,       A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken("::",        nTok_punct_DoubleColon, A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken(",",         nTok_punct_Comma,       A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken("-",         nTok_punct_Minus,       A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken(".",         nTok_punct_Fullstop,    A_nPunctDefStatus,      finPunct);
+    aStateMachine.AddToken("/**",       nTok_none_MLDocuBegin,  A_nPunctDefStatus,      gotoMld);
+    aStateMachine.AddToken("///",       nTok_none_SLDocuBegin,  A_nPunctDefStatus,      gotoSld);
+    aStateMachine.AddToken("/*",        nTok_none_MLCommentBegin,
+                                                                A_nPunctDefStatus,      gotoMlc);
+    aStateMachine.AddToken("//",        nTok_none_SLCommentBegin,
+                                                                A_nPunctDefStatus,      gotoSlc);
+    aStateMachine.AddToken("/**/",      nTok_ignore,            A_nPunctDefStatus,      finIgn);
+    aStateMachine.AddToken("#",         nTok_none_PraeprocessorBegin,
+                                                                A_nPunctDefStatus,      gotoPrp);
+    aStateMachine.AddToken("\r\n",      nTok_EOL,               A_nPunctDefStatus,      finEOL);
+    aStateMachine.AddToken("\r",        nTok_EOL,               A_nPunctDefStatus,      finEOL);
+    aStateMachine.AddToken("\n",        nTok_EOL,               A_nPunctDefStatus,      finEOL);
+    aStateMachine.AddToken("\n\r",      nTok_EOL,               A_nPunctDefStatus,      finEOL);
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/cx_sub.cxx b/autodoc/source/parser_i/idl/cx_sub.cxx
new file mode 100644
index 000000000000..e098d6cc1c3c
--- /dev/null
+++ b/autodoc/source/parser_i/idl/cx_sub.cxx
@@ -0,0 +1,149 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/cx_sub.hxx>
+
+
+
+// NOT FULLY DECLARED SERVICES
+#include <s2_luidl/tokrecv.hxx>
+#include <../../parser/inc/tokens/parseinc.hxx>
+#include <x_parse2.hxx>
+#include <s2_luidl/tk_const.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+bool
+Cx_Base::PassNewToken()
+{
+    if (pNewToken)
+    {
+        rReceiver.Receive(*pNewToken.Release());
+        return true;
+    }
+    return false;
+}
+
+TkpContext &
+Cx_Base::FollowUpContext()
+{
+    csv_assert(pFollowUpContext != 0);
+    return *pFollowUpContext;
+}
+
+void
+Context_MLComment::ReadCharChain( CharacterSource & io_rText )
+{
+    char cNext = NULCH;
+
+    do {
+        do {
+            cNext = jumpTo(io_rText,'*','\n');
+            if (cNext == '\n')
+            {
+                Receiver().Increment_CurLine();
+                cNext = io_rText.MoveOn();
+            }
+            else if (cNext == NULCH)
+                throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
+        } while (cNext != '*');
+
+        cNext = jumpOver(io_rText,'*');
+        if (cNext == NULCH)
+            throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
+    } while (cNext != '/');
+    io_rText.MoveOn();
+    io_rText.CutToken();
+    SetToken(0);
+}
+
+void
+Context_SLComment::ReadCharChain( CharacterSource & io_rText )
+{
+    jumpToEol(io_rText);
+    if (io_rText.CurChar() != NULCH)
+        jumpOverEol(io_rText);
+    io_rText.CutToken();
+    SetToken(0);
+
+    Receiver().Increment_CurLine();
+}
+
+void
+Context_Praeprocessor::ReadCharChain( CharacterSource & io_rText )
+{
+    jumpToEol(io_rText);
+    if (io_rText.CurChar() != NULCH)
+        jumpOverEol(io_rText);
+    io_rText.CutToken();
+    SetToken(0);
+
+    Receiver().Increment_CurLine();
+}
+
+void
+Context_Assignment::ReadCharChain( CharacterSource &    io_rText )
+{
+    // KORR_FUTURE
+    // How to handle new lines within this, so he y get realised by
+    //  ParserInfo?
+
+    char cNext = NULCH;
+    do {
+        if ( (cNext = jumpTo(io_rText,';',',','"','}')) == NULCH )
+            throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
+        if (cNext == '"')
+        {
+            cNext = io_rText.MoveOn();
+            while (cNext != '"')
+            {
+                if ( (cNext = jumpTo(io_rText,'"','\\')) == NULCH )
+                    throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
+                if (cNext == '\\')
+                    io_rText.MoveOn();
+            }
+            cNext = io_rText.MoveOn();
+        }   // endif (cNext == '"')
+    } while (cNext != ';' AND cNext != ',' AND cNext != '}');
+
+    if (cNext == ',' OR cNext == ';')
+        io_rText.MoveOn();
+    SetToken(new TokAssignment(io_rText.CutToken()));
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/distrib.cxx b/autodoc/source/parser_i/idl/distrib.cxx
new file mode 100644
index 000000000000..75c245bfa96e
--- /dev/null
+++ b/autodoc/source/parser_i/idl/distrib.cxx
@@ -0,0 +1,266 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/distrib.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/doc/d_oldidldocu.hxx>
+#include <parser/parserinfo.hxx>
+#include <s2_luidl/tkp_uidl.hxx>
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <s2_dsapi/docu_pe2.hxx>
+#include <adc_cl.hxx>
+#include <x_parse2.hxx>
+
+
+
+const uintt C_nNO_TRY = uintt(-1);
+
+
+namespace csi
+{
+namespace uidl
+{
+
+TokenDistributor::TokenDistributor( ary::Repository & io_rRepository,
+                                    ParserInfo &      io_rParserInfo )
+    :   pTokenSource(0),
+        aDocumentation(io_rParserInfo),
+        aProcessingData( io_rRepository, aDocumentation, io_rParserInfo )
+{
+}
+
+TokenDistributor::~TokenDistributor()
+{
+}
+
+void
+TokenDistributor::TradeToken()
+{
+    bool bGoon = true;
+    while (bGoon AND NOT aProcessingData.NextTokenExists())
+    {
+        bGoon = pTokenSource->GetNextToken();
+    }
+    if (bGoon)
+        aProcessingData.ProcessCurToken();
+}
+
+TokenDistributor::ProcessingData::ProcessingData(
+                                        ary::Repository &   io_rRepository,
+                                        Documentation &         i_rDocuProcessor,
+                                        ParserInfo &            io_rParserInfo )
+    :   // aEnvironments
+        // aTokenQueue
+        // itCurToken
+        // aCurResult
+        nTryCount(0),
+        bFinished(false),
+        rRepository(io_rRepository),
+        rParserInfo(io_rParserInfo),
+        pDocuProcessor(&i_rDocuProcessor),
+        bPublishedRecentlyOn(false)
+{
+    itCurToken = aTokenQueue.end();
+}
+
+TokenDistributor::ProcessingData::~ProcessingData()
+{
+}
+
+void
+TokenDistributor::ProcessingData::SetTopParseEnvironment( UnoIDL_PE & io_pTopParseEnvironment )
+{
+    csv::erase_container(aEnvironments);
+    aEnvironments.push_back( EnvironmentInfo( &io_pTopParseEnvironment, 0 ) );
+    io_pTopParseEnvironment.EstablishContacts(0,rRepository,aCurResult);
+}
+
+void
+TokenDistributor::ProcessingData::Receive( DYN csi::uidl::Token & let_drToken )
+{
+    aTokenQueue.push_back( &let_drToken );
+    itCurToken = aTokenQueue.end()-1;
+}
+
+void
+TokenDistributor::ProcessingData::Increment_CurLine()
+{
+    rParserInfo.Increment_CurLine();
+}
+
+void
+TokenDistributor::ProcessingData::ProcessCurToken()
+{
+
+if (DEBUG_ShowTokens())
+{
+    Cout() << (*itCurToken)->Text() << Endl();
+}
+
+    aCurResult.reset();
+
+    CurEnvironment().ProcessToken( CurToken() );
+    AcknowledgeResult();
+}
+
+
+UnoIDL_PE &
+TokenDistributor::ProcessingData::CurEnvironment() const
+{
+    csv_assert(aEnvironments.size() > 0);
+    csv_assert(aEnvironments.back().first != 0);
+
+    return *aEnvironments.back().first;
+}
+
+bool
+TokenDistributor::ProcessingData::NextTokenExists() const
+{
+    return itCurToken != aTokenQueue.end();
+}
+
+void
+TokenDistributor::ProcessingData::AcknowledgeResult()
+{
+    if (aCurResult.eDone == done)
+        ++itCurToken;
+
+    switch ( aCurResult.eStackAction )
+    {
+        case stay:
+                if (aCurResult.eDone != done)
+                {
+                    csv_assert(false);
+                }
+                break;
+        case push_sure:
+                CurEnv().Leave(push_sure);
+                aEnvironments.push_back( EnvironmentInfo(&PushEnv(), C_nNO_TRY) );
+                PushEnv().Enter(push_sure);
+                PushEnv().SetDocu(pDocuProcessor->ReleaseLastParsedDocu());
+                if (bPublishedRecentlyOn)
+                {
+                    PushEnv().SetPublished();
+                    bPublishedRecentlyOn = false;
+                }
+
+                break;
+        case push_try:
+                Cout() << "TestInfo: Environment tried." << Endl();
+                CurEnv().Leave(push_try);
+                aEnvironments.push_back( EnvironmentInfo(&PushEnv(), CurTokenPosition()) );
+                nTryCount++;
+                PushEnv().Enter(push_try);
+                break;
+        case pop_success:
+                CurEnv().Leave(pop_success);
+                if ( CurEnv_TriedTokenPosition() > 0 )
+                    DecrementTryCount();
+                aEnvironments.pop_back();
+                CurEnv().Enter(pop_success);
+                break;
+        case pop_failure:
+        {
+                CurEnv().Leave(pop_failure);
+                if (aCurResult.eDone == done)
+                {
+                    csv_assert(false);
+                }
+
+                if ( CurEnv_TriedTokenPosition() == C_nNO_TRY )
+                    throw X_AutodocParser( X_AutodocParser::x_UnexpectedToken, (*itCurToken)->Text() );
+
+                itCurToken = aTokenQueue.begin() + CurEnv_TriedTokenPosition();
+                DecrementTryCount();
+                aEnvironments.pop_back();
+                CurEnv().Enter(pop_failure);
+        }       break;
+        default:
+            csv_assert(false);
+    }   // end switch(aCurResult.eStackAction)
+}
+
+void
+TokenDistributor::ProcessingData::DecrementTryCount()
+{
+    nTryCount--;
+    if (nTryCount == 0)
+    {
+        aTokenQueue.erase(aTokenQueue.begin(), itCurToken);
+        itCurToken = aTokenQueue.begin();
+    }
+}
+
+TokenDistributor::
+Documentation::Documentation(ParserInfo & io_rParserInfo)
+    :   pDocuParseEnv(new csi::dsapi::SapiDocu_PE(io_rParserInfo)),
+        rParserInfo(io_rParserInfo),
+        pMostRecentDocu(0),
+        bIsPassedFirstDocu(false)
+{
+}
+
+TokenDistributor::
+Documentation::~Documentation()
+{
+}
+
+void
+TokenDistributor::
+Documentation::Receive( DYN csi::dsapi::Token & let_drToken )
+{
+    csv_assert(pDocuParseEnv);
+
+    pDocuParseEnv->ProcessToken(let_drToken);
+    if ( pDocuParseEnv->IsComplete() )
+    {
+        pMostRecentDocu = pDocuParseEnv->ReleaseJustParsedDocu();
+        if (NOT bIsPassedFirstDocu)
+        {
+            pMostRecentDocu = 0;            // Deletes the most recent docu.
+            bIsPassedFirstDocu = true;
+        }
+    }
+}
+
+void
+TokenDistributor::
+Documentation::Increment_CurLine()
+{
+    rParserInfo.Increment_CurLine();
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/makefile.mk b/autodoc/source/parser_i/idl/makefile.mk
new file mode 100644
index 000000000000..7449548742b6
--- /dev/null
+++ b/autodoc/source/parser_i/idl/makefile.mk
@@ -0,0 +1,84 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=parser2_s2_luidl
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+
+OBJFILES= \
+    $(OBJ)$/cx_idlco.obj		\
+    $(OBJ)$/cx_sub.obj		    \
+    $(OBJ)$/distrib.obj		    \
+    $(OBJ)$/parsenv2.obj		\
+    $(OBJ)$/pe_attri.obj	    \
+    $(OBJ)$/pe_const.obj	    \
+    $(OBJ)$/pe_enum2.obj    	\
+    $(OBJ)$/pe_evalu.obj	    \
+    $(OBJ)$/pe_excp.obj		    \
+    $(OBJ)$/pe_file2.obj	    \
+    $(OBJ)$/pe_func2.obj	    \
+    $(OBJ)$/pe_iface.obj	    \
+    $(OBJ)$/pe_property.obj	    \
+    $(OBJ)$/pe_selem.obj	    \
+    $(OBJ)$/pe_servi.obj	    \
+    $(OBJ)$/pe_singl.obj	    \
+    $(OBJ)$/pe_struc.obj 	    \
+    $(OBJ)$/pe_tydf2.obj 	    \
+    $(OBJ)$/pe_type2.obj 	    \
+    $(OBJ)$/pe_vari2.obj 	    \
+    $(OBJ)$/pestate.obj 	    \
+    $(OBJ)$/semnode.obj		    \
+    $(OBJ)$/tk_const.obj		\
+    $(OBJ)$/tk_ident.obj		\
+    $(OBJ)$/tk_keyw.obj			\
+    $(OBJ)$/tk_punct.obj		\
+    $(OBJ)$/tkp_uidl.obj		\
+    $(OBJ)$/unoidl.obj
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/parser_i/idl/parsenv2.cxx b/autodoc/source/parser_i/idl/parsenv2.cxx
new file mode 100644
index 000000000000..4327ae1e3cbd
--- /dev/null
+++ b/autodoc/source/parser_i/idl/parsenv2.cxx
@@ -0,0 +1,215 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/parsenv2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/ary.hxx>
+#include <ary/getncast.hxx>
+#include <ary/qualiname.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_ce.hxx>
+#include <ary/idl/i_enum.hxx>
+#include <ary/idl/i_enumvalue.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <parser/parserinfo.hxx>
+#include <adc_msg.hxx>
+#include <s2_luidl/uidl_tok.hxx>
+#include <x_parse2.hxx>
+
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+UnoIDL_PE::~UnoIDL_PE()
+{
+}
+
+void
+UnoIDL_PE::EstablishContacts( UnoIDL_PE *               io_pParentPE,
+                              ary::Repository &         io_rRepository,
+                              TokenProcessing_Result &  o_rResult )
+{
+    pRepository = &io_rRepository;
+    aMyNode.EstablishContacts(io_pParentPE, io_rRepository.Gate_Idl(), o_rResult);
+}
+
+//void
+//UnoIDL_PE::EstablishContacts( UnoIDL_PE *             io_pParentPE,
+//                            ary::idl::Gate &          io_rGate,
+//                            TokenProcessing_Result &  o_rResult )
+//{
+//  aMyNode.EstablishContacts(io_pParentPE, io_rGate, o_rResult);
+//}
+
+void
+UnoIDL_PE::Enter( E_EnvStackAction  i_eWayOfEntering )
+{
+    switch (i_eWayOfEntering)
+    {
+        case push_sure:
+                InitData();
+                break;
+        case push_try:
+                csv_assert(false);
+                break;
+        case pop_success:
+                ReceiveData();
+                break;
+        case pop_failure:
+                throw X_AutodocParser(X_AutodocParser::x_Any);
+                // no break because of throw
+        default:
+            csv_assert(false);
+    }   // end switch
+}
+
+void
+UnoIDL_PE::Leave( E_EnvStackAction  i_eWayOfLeaving )
+{
+    switch (i_eWayOfLeaving)
+    {
+        case push_sure:
+                break;
+        case push_try:
+                csv_assert(false);
+                break;
+        case pop_success:
+                TransferData();
+                break;
+        case pop_failure:
+                throw X_AutodocParser(X_AutodocParser::x_Any);
+                // no break because of throw
+        default:
+            csv_assert(false);
+    }   // end switch
+}
+
+void
+UnoIDL_PE::SetDocu( DYN ary::doc::OldIdlDocu * let_dpDocu )
+{
+    pDocu = let_dpDocu;
+}
+
+void
+UnoIDL_PE::SetPublished()
+{
+    if (NOT pDocu)
+    {
+        pDocu = new ary::doc::OldIdlDocu;
+    }
+    pDocu->SetPublished();
+}
+
+void
+UnoIDL_PE::SetOptional()
+{
+    if (NOT pDocu)
+    {
+        pDocu = new ary::doc::OldIdlDocu;
+    }
+    pDocu->SetOptional();
+}
+
+void
+UnoIDL_PE::PassDocuAt( ary::idl::CodeEntity & io_rCe )
+{
+    if (pDocu)
+    {
+        io_rCe.Set_Docu(*pDocu.Release());
+    }
+    else if // KORR_FUTURE
+            // Re-enable doc-warning for Enum Values, as soon as there is a
+            //   @option -no-doc-for-enumvalues.
+            (     NOT ary::is_type<ary::idl::Module>(io_rCe)
+              AND NOT ary::is_type<ary::idl::Enum>(io_rCe)  )
+    {
+        TheMessages().Out_MissingDoc(
+                        io_rCe.LocalName(),
+                        ParseInfo().CurFile(),
+                        ParseInfo().CurLine() );
+    }
+}
+
+void
+UnoIDL_PE::InitData()
+{
+    // Needs not anything to do.
+}
+
+void
+UnoIDL_PE::ReceiveData()
+{
+    // Needs not anything to do.
+}
+
+const ary::idl::Module &
+UnoIDL_PE::CurNamespace() const
+{
+    if ( Parent() != 0 )
+        return Parent()->CurNamespace();
+    else
+    {
+        csv_assert(false);
+        return *(const ary::idl::Module*)0;
+    }
+}
+
+const ParserInfo &
+UnoIDL_PE::ParseInfo() const
+{
+    if ( Parent() != 0 )
+        return Parent()->ParseInfo();
+    else
+    {
+        csv_assert(false);
+        return *(const ParserInfo*)0;
+    }
+}
+
+UnoIDL_PE::UnoIDL_PE()
+    :   aMyNode(),
+        pDocu(),
+        pRepository(0)
+{
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/pe_attri.cxx b/autodoc/source/parser_i/idl/pe_attri.cxx
new file mode 100644
index 000000000000..31fe8063ea6c
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_attri.cxx
@@ -0,0 +1,297 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/pe_attri.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_attribute.hxx>
+#include <ary/idl/i_service.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/pe_vari2.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+
+PE_Attribute::PE_Attribute( const Ce_id & i_rCurOwner )
+    :   eState(e_none),
+        pCurOwner(&i_rCurOwner),
+        pPE_Variable(0),
+        pPE_Exception(0),
+        pCurAttribute(0),
+        nCurParsedType(0),
+        sCurParsedName(),
+        bReadOnly(false),
+        bBound(false)
+{
+    pPE_Variable    = new PE_Variable(nCurParsedType, sCurParsedName);
+    pPE_Exception   = new PE_Type(nCurParsedType);
+}
+
+void
+PE_Attribute::EstablishContacts( UnoIDL_PE *                io_pParentPE,
+                                 ary::Repository &      io_rRepository,
+                                 TokenProcessing_Result &   o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Variable->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Exception->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Attribute::~PE_Attribute()
+{
+}
+
+void
+PE_Attribute::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_Attribute::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    switch (eState)
+    {
+        case e_start:
+            SetResult(not_done, push_sure, pPE_Variable.Ptr());
+            eState = in_variable;
+            break;
+        case in_raise_std:
+            if (strcmp(i_rToken.Text(),"get") == 0)
+            {
+                SetResult(done, stay);
+                eState = in_get;
+            }
+            else if (strcmp(i_rToken.Text(),"set") == 0)
+            {
+                SetResult(done, stay);
+                eState = in_set;
+            }
+            else
+            {
+                SetResult(not_done, pop_failure);
+                eState = e_none;
+            }
+            break;
+        case in_get:
+        case in_set:
+            SetResult(not_done, push_sure, pPE_Exception.Ptr());
+            break;
+        default:
+            SetResult(not_done, pop_failure);
+    }   // end switch
+}
+
+void
+PE_Attribute::Process_Stereotype( const TokStereotype & i_rToken )
+{
+    if (eState != e_start)
+    {
+        SetResult(not_done, pop_failure);
+        eState = e_none;
+        return;
+    }
+
+    switch (i_rToken.Id())
+    {
+        case TokStereotype::ste_readonly:
+            bReadOnly = true;
+            break;
+        case TokStereotype::ste_bound:
+            bBound = true;
+            break;
+        default:
+            SetResult(not_done, pop_failure);
+            eState = e_none;
+            return;
+    }   // end switch
+
+    SetResult(done, stay);
+}
+
+void
+PE_Attribute::Process_MetaType( const TokMetaType & i_rToken )
+{
+    if (eState != e_start OR i_rToken.Id() != TokMetaType::mt_attribute)
+    {
+        SetResult(not_done, pop_failure);
+        eState = e_none;
+        return;
+    }
+
+    SetResult(done, stay);
+}
+
+void
+PE_Attribute::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    switch (eState)
+    {
+        case e_start:
+            SetResult(done, stay);
+            break;
+        case expect_end:
+            switch(i_rToken.Id())
+            {
+                case TokPunctuation::Semicolon:
+                    SetResult(done, pop_success);
+                    eState = e_none;
+                    break;
+                case TokPunctuation::Comma:
+                    SetResult(not_done, pop_failure);
+                    Cerr() << "Autodoc does not support comma separated attributes, because those are discouraged by IDL policies." << Endl();
+                    break;
+                case TokPunctuation::CurledBracketOpen:
+                    SetResult(done, stay);
+                    eState = in_raise_std;
+                    break;
+                default:
+                    SetResult(not_done, pop_failure);
+            }   // end switch
+            break;
+        case in_raise_std:
+            SetResult(done, stay);
+            if (i_rToken.Id() == TokPunctuation::CurledBracketClose)
+            {
+                eState = expect_end;
+            }
+            break;
+        case in_get:
+        case in_set:
+            SetResult(done, stay);
+            if (i_rToken.Id() == TokPunctuation::Semicolon)
+            {
+                eState = in_raise_std;
+            }
+            break;
+        default:
+            csv_assert(false);
+    }
+}
+
+void
+PE_Attribute::Process_Raises()
+{
+    if (eState == in_get OR eState == in_set)
+    {
+        SetResult(done, stay);
+    }
+    else
+        SetResult(not_done, pop_failure);
+}
+
+void
+PE_Attribute::Process_Default()
+{
+    if (eState == e_start)
+    {
+        SetResult(not_done, push_sure, pPE_Variable.Ptr());
+        eState = in_variable;
+    }
+    else if (eState == in_get OR eState == in_set)
+        SetResult(not_done, push_sure, pPE_Exception.Ptr());
+    else
+        SetResult(not_done, pop_failure);
+}
+
+void
+PE_Attribute::InitData()
+{
+    eState = e_start;
+
+    pCurAttribute = 0;
+    nCurParsedType = 0;
+    sCurParsedName = "";
+    bReadOnly = false;
+    bBound = false;
+}
+
+void
+PE_Attribute::TransferData()
+{
+    eState = e_none;
+}
+
+void
+PE_Attribute::ReceiveData()
+{
+    switch (eState)
+    {
+        case in_variable:
+            csv_assert(pCurOwner->IsValid());
+            pCurAttribute = &Gate().Ces().Store_Attribute(
+                                                    *pCurOwner,
+                                                    sCurParsedName,
+                                                    nCurParsedType,
+                                                    bReadOnly,
+                                                    bBound );
+            PassDocuAt(*pCurAttribute);
+            nCurParsedType = 0;
+            eState = expect_end;
+            break;
+        case in_get:
+            csv_assert(pCurAttribute != 0);
+            pCurAttribute->Add_GetException(nCurParsedType);
+            nCurParsedType = 0;
+            break;
+        case in_set:
+            csv_assert(pCurAttribute != 0);
+            pCurAttribute->Add_SetException(nCurParsedType);
+            nCurParsedType = 0;
+            break;
+        default:
+            csv_assert(false);
+    }   // end switch
+}
+
+
+UnoIDL_PE &
+PE_Attribute::MyPE()
+{
+    return *this;
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/pe_const.cxx b/autodoc/source/parser_i/idl/pe_const.cxx
new file mode 100644
index 000000000000..4013f33d02d7
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_const.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_const.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_constant.hxx>
+#include <ary/idl/i_constgroup.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/pe_evalu.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+#ifdef DF
+#undef DF
+#endif
+#define DF  &PE_Constant::On_Default
+
+PE_Constant::F_TOK
+PE_Constant::aDispatcher[PE_Constant::e_STATES_MAX][PE_Constant::tt_MAX] =
+        {   { DF, DF, DF },  // e_none
+            { DF, &PE_Constant::On_expect_name_Identifier,
+                      DF },  // expect_name
+            { DF, DF, &PE_Constant::On_expect_curl_bracket_open_Punctuation },  // expect_curl_bracket_open
+            { &PE_Constant::On_expect_const_Stereotype,
+                  DF, &PE_Constant::On_expect_const_Punctuation },  // expect_const
+            { DF, &PE_Constant::On_expect_value_Identifier,
+                      DF },  // expect_value
+            { DF, DF, &PE_Constant::On_expect_finish_Punctuation }  // expect_finish
+        };
+
+
+
+inline void
+PE_Constant::CallHandler( const char *      i_sTokenText,
+                          E_TokenType       i_eTokenType )
+    { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); }
+
+
+
+
+PE_Constant::PE_Constant()
+    :   eState(e_none),
+        sData_Name(),
+        nDataId(0),
+        pPE_Type(0),
+        nType(0),
+        pPE_Value(0),
+        sName(),
+        sAssignment()
+{
+    pPE_Type = new PE_Type(nType);
+    pPE_Value = new PE_Value(sName, sAssignment, true);
+}
+
+void
+PE_Constant::EstablishContacts( UnoIDL_PE *                 io_pParentPE,
+                                ary::Repository &       io_rRepository,
+                                TokenProcessing_Result &    o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Value->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Constant::~PE_Constant()
+{
+}
+
+void
+PE_Constant::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_Constant::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_identifier);
+}
+
+void
+PE_Constant::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_punctuation);
+}
+
+void
+PE_Constant::Process_Stereotype( const TokStereotype & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_stereotype);
+}
+
+void
+PE_Constant::On_expect_name_Identifier(const char * i_sText)
+{
+    sName = i_sText;
+
+    SetResult(done,stay);
+    eState = expect_curl_bracket_open;
+}
+
+void
+PE_Constant::On_expect_curl_bracket_open_Punctuation(const char * i_sText)
+{
+    if ( i_sText[0] == '{')
+    {
+        sData_Name = sName;
+
+        ary::idl::ConstantsGroup &
+        rCe = Gate().Ces().
+                    Store_ConstantsGroup(CurNamespace().CeId(),sData_Name);
+        PassDocuAt(rCe);
+        nDataId = rCe.CeId();
+
+        SetResult(done,stay);
+        eState = expect_const;
+    }
+    else
+    {
+        On_Default(i_sText);
+    }
+}
+
+void
+PE_Constant::On_expect_const_Stereotype(const char *)
+{
+    SetResult( done, push_sure, pPE_Type.Ptr() );
+}
+
+void
+PE_Constant::On_expect_const_Punctuation(const char * i_sText)
+{
+    if ( i_sText[0] == '}')
+    {
+        SetResult(done,stay);
+        eState = expect_finish;
+    }
+    else
+    {
+        On_Default(i_sText);
+    }
+}
+
+void
+PE_Constant::On_expect_value_Identifier(const char *)
+{
+    SetResult( not_done, push_sure, pPE_Value.Ptr() );
+}
+
+void
+PE_Constant::On_expect_finish_Punctuation(const char * i_sText)
+{
+    if ( i_sText[0] == ';')
+    {
+        SetResult(done,pop_success);
+        eState = e_none;
+    }
+    else
+    {
+        On_Default(i_sText);
+    }
+}
+
+void
+PE_Constant::On_Default(const char * )
+{
+    SetResult(not_done,pop_failure);
+    eState = e_none;
+}
+
+void
+PE_Constant::EmptySingleConstData()
+{
+    nType = 0;
+    sName = "";
+    sAssignment = "";
+}
+
+void
+PE_Constant::CreateSingleConstant()
+{
+    ary::idl::Constant &
+        rCe = Gate().Ces().Store_Constant( nDataId,
+                                           sName,
+                                           nType,
+                                           sAssignment );
+    pPE_Type->PassDocuAt(rCe);
+}
+
+void
+PE_Constant::InitData()
+{
+    eState = expect_name;
+
+    sData_Name.clear();
+    nDataId = 0;
+
+    EmptySingleConstData();
+}
+
+void
+PE_Constant::ReceiveData()
+{
+    switch (eState)
+    {
+        case expect_const:
+                    eState = expect_value;
+                    break;
+        case expect_value:
+        {
+                    if (sName.length() == 0 OR sAssignment.length() == 0 OR NOT nType.IsValid())
+                    {
+                        Cerr() << "Constant without value found." << Endl();
+                        eState = expect_const;
+                        break;
+                    }
+
+                    CreateSingleConstant();
+                    EmptySingleConstData();
+                    eState = expect_const;
+        }           break;
+        default:
+                    SetResult(not_done, pop_failure);
+                    eState = e_none;
+    }   // end switch
+}
+
+void
+PE_Constant::TransferData()
+{
+    csv_assert(nDataId.IsValid());
+    eState = e_none;
+}
+
+UnoIDL_PE &
+PE_Constant::MyPE()
+{
+    return *this;
+}
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/pe_enum2.cxx b/autodoc/source/parser_i/idl/pe_enum2.cxx
new file mode 100644
index 000000000000..68fb46d48a56
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_enum2.cxx
@@ -0,0 +1,253 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/pe_enum2.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/idl/i_enum.hxx>
+#include <ary/idl/i_enumvalue.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_evalu.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+#ifdef DF
+#undef DF
+#endif
+#define DF  &PE_Enum::On_Default
+
+PE_Enum::F_TOK
+PE_Enum::aDispatcher[PE_Enum::e_STATES_MAX][PE_Enum::tt_MAX] =
+        {   {  DF, DF },  // e_none
+            {  &PE_Enum::On_expect_name_Identifier,
+                   DF },  // expect_name
+            {  DF, &PE_Enum::On_expect_curl_bracket_open_Punctuation },  // expect_curl_bracket_open
+            {  &PE_Enum::On_expect_value_Identifier,
+                   &PE_Enum::On_expect_value_Punctuation },  // expect_value
+            {  DF, &PE_Enum::On_expect_finish_Punctuation }  // expect_finish
+        };
+
+
+
+inline void
+PE_Enum::CallHandler( const char *      i_sTokenText,
+                          E_TokenType       i_eTokenType )
+    { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); }
+
+
+
+
+PE_Enum::PE_Enum()
+    :   eState(e_none),
+        sData_Name(),
+        nDataId(0),
+        pPE_Value(0),
+        sName(),
+        sAssignment()
+{
+    pPE_Value = new PE_Value(sName, sAssignment, false);
+}
+
+void
+PE_Enum::EstablishContacts( UnoIDL_PE *                 io_pParentPE,
+                            ary::Repository &       io_rRepository,
+                            TokenProcessing_Result &    o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Value->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Enum::~PE_Enum()
+{
+}
+
+void
+PE_Enum::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_Enum::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_identifier);
+}
+
+void
+PE_Enum::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_punctuation);
+}
+
+void
+PE_Enum::On_expect_name_Identifier(const char * i_sText)
+{
+    sName = i_sText;
+
+    SetResult(done,stay);
+    eState = expect_curl_bracket_open;
+}
+
+void
+PE_Enum::On_expect_curl_bracket_open_Punctuation(const char * i_sText)
+{
+    if ( i_sText[0] == '{')
+    {
+        sData_Name = sName;
+        ary::idl::Enum &
+            rCe = Gate().Ces().Store_Enum(CurNamespace().CeId(), sData_Name);
+        PassDocuAt(rCe);
+        nDataId = rCe.CeId();
+
+        SetResult(done,stay);
+        eState = expect_value;
+    }
+    else
+    {
+        On_Default(i_sText);
+    }
+}
+
+void
+PE_Enum::On_expect_value_Punctuation(const char * i_sText)
+{
+    if ( i_sText[0] == '}' )
+    {
+        SetResult(done,stay);
+        eState = expect_finish;
+    }
+    else
+    {
+        On_Default(i_sText);
+    }
+}
+
+void
+PE_Enum::On_expect_value_Identifier(const char *)
+{
+    SetResult( not_done, push_sure, pPE_Value.Ptr() );
+}
+
+void
+PE_Enum::On_expect_finish_Punctuation(const char * i_sText)
+{
+    if ( i_sText[0] == ';')
+    {
+        SetResult(done,pop_success);
+        eState = e_none;
+    }
+    else
+    {
+        On_Default(i_sText);
+    }
+}
+
+void
+PE_Enum::On_Default(const char * )
+{
+    SetResult(not_done,pop_failure);
+    eState = e_none;
+}
+
+void
+PE_Enum::EmptySingleValueData()
+{
+    sName = "";
+    sAssignment = "";
+}
+
+void
+PE_Enum::CreateSingleValue()
+{
+    ary::idl::EnumValue &
+        rCe = Gate().Ces().Store_EnumValue( nDataId, sName, sAssignment );
+    pPE_Value->PassDocuAt(rCe);
+}
+
+void
+PE_Enum::InitData()
+{
+    eState = expect_name;
+
+    sData_Name.clear();
+    nDataId = 0;
+
+    EmptySingleValueData();
+}
+
+void
+PE_Enum::ReceiveData()
+{
+    switch (eState)
+    {
+        case expect_value:
+        {
+                    if (sName.length() == 0)
+                    {
+                        On_Default("");
+                        break;
+                    }
+
+                    CreateSingleValue();
+                    EmptySingleValueData();
+        }           break;
+        default:
+                    SetResult(not_done, pop_failure);
+                    eState = e_none;
+    }   // end switch
+}
+
+void
+PE_Enum::TransferData()
+{
+    csv_assert(sData_Name.length() > 0);
+    eState = e_none;
+}
+
+UnoIDL_PE &
+PE_Enum::MyPE()
+{
+    return *this;
+}
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/pe_evalu.cxx b/autodoc/source/parser_i/idl/pe_evalu.cxx
new file mode 100644
index 000000000000..4e1aafabb10b
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_evalu.cxx
@@ -0,0 +1,184 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/pe_evalu.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/idl/i_enumvalue.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <s2_luidl/tk_const.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+#ifdef DF
+#undef DF
+#endif
+#define DF  &PE_Value::On_Default
+
+PE_Value::F_TOK
+PE_Value::aDispatcher[PE_Value::e_STATES_MAX][PE_Value::tt_MAX] =
+        {   { DF, DF, DF },  // e_none
+            { &PE_Value::On_expect_name_Identifier,
+                  DF, DF },  // expect_name
+            { DF, &PE_Value::On_got_name_Punctuation,
+                      &PE_Value::On_got_name_Assignment }  // got_name
+        };
+
+
+
+inline void
+PE_Value::CallHandler( const char *     i_sTokenText,
+                       E_TokenType      i_eTokenType )
+    { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); }
+
+
+
+
+
+PE_Value::PE_Value( String  &   o_rName,
+                    String  &   o_rAssignment,
+                    bool        i_bIsConst )
+    :   eState(e_none),
+        pName(&o_rName),
+        pAssignment(&o_rAssignment),
+        bIsConst(i_bIsConst)
+{
+}
+
+void
+PE_Value::EstablishContacts( UnoIDL_PE *                io_pParentPE,
+                             ary::Repository &          io_rRepository,
+                             TokenProcessing_Result &   o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+}
+
+PE_Value::~PE_Value()
+{
+}
+
+void
+PE_Value::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_Value::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_identifier);
+}
+
+void
+PE_Value::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_punctuation);
+}
+
+void
+PE_Value::Process_Assignment( const TokAssignment & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_assignment);
+}
+
+void
+PE_Value::On_expect_name_Identifier(const char * i_sText)
+{
+    *pName = i_sText;
+    SetResult(done,stay);
+    eState = got_name;
+}
+
+void
+PE_Value::On_got_name_Punctuation(const char * i_sText)
+{
+    if ( (i_sText[0] == ',' AND NOT IsConst())
+         OR (i_sText[0] == ';' AND IsConst()) )
+    {
+        SetResult(done,pop_success);
+        eState = e_none;
+    }
+    else if (i_sText[0] == '}' AND NOT IsConst())
+    {
+        SetResult(not_done,pop_success);
+        eState = e_none;
+    }
+    else
+        On_Default(i_sText);
+}
+
+void
+PE_Value::On_got_name_Assignment(const char * i_sText)
+{
+    *pAssignment = i_sText;
+    SetResult(done,pop_success);
+    eState = e_none;
+}
+
+void
+PE_Value::On_Default(const char * )
+{
+    SetResult(not_done,pop_failure);
+}
+
+void
+PE_Value::InitData()
+{
+    eState = expect_name;
+
+    *pName = "";
+    *pAssignment = "";
+}
+
+void
+PE_Value::TransferData()
+{
+    csv_assert(pName->length() > 0);
+    eState = e_none;
+}
+
+UnoIDL_PE &
+PE_Value::MyPE()
+{
+    return *this;
+}
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/pe_excp.cxx b/autodoc/source/parser_i/idl/pe_excp.cxx
new file mode 100644
index 000000000000..23d3843583bb
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_excp.cxx
@@ -0,0 +1,301 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/pe_excp.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/idl/i_exception.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_structelem.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/pe_selem.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+PE_Exception::PE_Exception()
+    // :    aWork,
+    //      pStati
+{
+    pStati = new S_Stati(*this);
+}
+
+void
+PE_Exception::EstablishContacts( UnoIDL_PE *                io_pParentPE,
+                              ary::Repository &         io_rRepository,
+                              TokenProcessing_Result &  o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    Work().pPE_Element->EstablishContacts(this,io_rRepository,o_rResult);
+    Work().pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Exception::~PE_Exception()
+{
+}
+
+void
+PE_Exception::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*Stati().pCurStatus);
+}
+
+
+void
+PE_Exception::InitData()
+{
+    Work().InitData();
+    Stati().pCurStatus = &Stati().aWaitForName;
+}
+
+void
+PE_Exception::TransferData()
+{
+    if (NOT Work().bIsPreDeclaration)
+    {
+        csv_assert(Work().sData_Name.size() > 0);
+        csv_assert(Work().nCurStruct.IsValid());
+    }
+    Stati().pCurStatus = &Stati().aNone;
+}
+
+void
+PE_Exception::ReceiveData()
+{
+    Stati().pCurStatus->On_SubPE_Left();
+}
+
+PE_Exception::S_Work::S_Work()
+    :   sData_Name(),
+        bIsPreDeclaration(false),
+        nCurStruct(0),
+        pPE_Element(0),
+        nCurParsed_ElementRef(0),
+        pPE_Type(0),
+        nCurParsed_Base(0)
+
+{
+    pPE_Element = new PE_StructElement(nCurParsed_ElementRef,nCurStruct);
+    pPE_Type = new PE_Type(nCurParsed_Base);
+}
+
+void
+PE_Exception::S_Work::InitData()
+{
+    sData_Name.clear();
+    bIsPreDeclaration = false;
+    nCurStruct = 0;
+
+    nCurParsed_ElementRef = 0;
+    nCurParsed_Base = 0;
+}
+
+void
+PE_Exception::S_Work::Prepare_PE_QualifiedName()
+{
+    nCurParsed_ElementRef = 0;
+}
+
+void
+PE_Exception::S_Work::Prepare_PE_Element()
+{
+    nCurParsed_Base = 0;
+}
+
+void
+PE_Exception::S_Work::Data_Set_Name( const char * i_sName )
+{
+    sData_Name = i_sName;
+}
+
+PE_Exception::S_Stati::S_Stati(PE_Exception & io_rStruct)
+    :   aNone(io_rStruct),
+        aWaitForName(io_rStruct),
+        aGotName(io_rStruct),
+        aWaitForBase(io_rStruct),
+        aGotBase(io_rStruct),
+        aWaitForElement(io_rStruct),
+        aWaitForFinish(io_rStruct),
+        pCurStatus(0)
+{
+    pCurStatus = &aNone;
+}
+
+
+//***********************       Stati       ***************************//
+
+
+UnoIDL_PE &
+PE_Exception::PE_StructState::MyPE()
+{
+    return rStruct;
+}
+
+
+void
+PE_Exception::State_WaitForName::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    Work().Data_Set_Name(i_rToken.Text());
+    MoveState( Stati().aGotName );
+    SetResult(done,stay);
+}
+
+void
+PE_Exception::State_GotName::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    if ( i_rToken.Id() != TokPunctuation::Semicolon )
+    {
+        switch (i_rToken.Id())
+        {
+            case TokPunctuation::Colon:
+                MoveState( Stati().aWaitForBase );
+                SetResult(done,push_sure,Work().pPE_Type.Ptr());
+                Work().Prepare_PE_QualifiedName();
+                break;
+            case TokPunctuation::CurledBracketOpen:
+                PE().store_Exception();
+                MoveState( Stati().aWaitForElement );
+                SetResult(done,stay);
+                break;
+            default:
+                SetResult(not_done,pop_failure);
+        }   // end switch
+    }
+    else
+    {
+        Work().sData_Name.clear();
+        SetResult(done,pop_success);
+    }
+}
+
+void
+PE_Exception::State_WaitForBase::On_SubPE_Left()
+{
+    MoveState(Stati().aGotBase);
+}
+
+void
+PE_Exception::State_GotBase::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    if ( i_rToken.Id() == TokPunctuation::CurledBracketOpen )
+    {
+        PE().store_Exception();
+        MoveState( Stati().aWaitForElement );
+        SetResult(done,stay);
+    }
+    else
+    {
+        SetResult(not_done,pop_failure);
+    }
+}
+
+void
+PE_Exception::State_WaitForElement::Process_Identifier( const TokIdentifier & )
+{
+    SetResult( not_done, push_sure, Work().pPE_Element.Ptr() );
+    Work().Prepare_PE_Element();
+}
+
+void
+PE_Exception::State_WaitForElement::Process_NameSeparator()
+{
+    SetResult( not_done, push_sure, Work().pPE_Element.Ptr());
+    Work().Prepare_PE_Element();
+}
+
+void
+PE_Exception::State_WaitForElement::Process_BuiltInType( const TokBuiltInType & )
+{
+    SetResult( not_done, push_sure, Work().pPE_Element.Ptr());
+    Work().Prepare_PE_Element();
+}
+
+void
+PE_Exception::State_WaitForElement::Process_TypeModifier(const TokTypeModifier & )
+{
+    SetResult( not_done, push_sure, Work().pPE_Element.Ptr());
+    Work().Prepare_PE_Element();
+}
+
+void
+PE_Exception::State_WaitForElement::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    if ( i_rToken.Id() == TokPunctuation::CurledBracketClose )
+    {
+        MoveState( Stati().aWaitForFinish );
+        SetResult( done, stay );
+    }
+    else
+    {
+        SetResult( not_done, pop_failure );
+    }
+}
+
+void
+PE_Exception::State_WaitForFinish::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    if (i_rToken.Id() == TokPunctuation::Semicolon)
+    {
+        MoveState( Stati().aNone );
+        SetResult( done, pop_success );
+    }
+    else
+    {
+        SetResult( not_done, pop_failure );
+    }
+}
+
+void
+PE_Exception::store_Exception()
+{
+    ary::idl::Exception &
+        rCe = Gate().Ces().Store_Exception(
+                            CurNamespace().CeId(),
+                            Work().sData_Name,
+                            Work().nCurParsed_Base );
+    PassDocuAt(rCe);
+    Work().nCurStruct = rCe.Id();
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/pe_file2.cxx b/autodoc/source/parser_i/idl/pe_file2.cxx
new file mode 100644
index 000000000000..144470f8945e
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_file2.cxx
@@ -0,0 +1,320 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/pe_file2.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/distrib.hxx>
+#include <s2_luidl/pe_servi.hxx>
+#include <s2_luidl/pe_iface.hxx>
+#include <s2_luidl/pe_singl.hxx>
+#include <s2_luidl/pe_struc.hxx>
+#include <s2_luidl/pe_excp.hxx>
+#include <s2_luidl/pe_const.hxx>
+#include <s2_luidl/pe_enum2.hxx>
+#include <s2_luidl/pe_tydf2.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+PE_File::PE_File( TokenDistributor & i_rTokenAdmin,
+                  const ParserInfo & i_parseInfo )
+    :   pTokenAdmin(&i_rTokenAdmin),
+        pPE_Service(new PE_Service),
+        pPE_Singleton(new PE_Singleton),
+        pPE_Interface(new PE_Interface),
+        pPE_Struct(new PE_Struct),
+        pPE_Exception(new PE_Exception),
+        pPE_Constant(new PE_Constant),
+        pPE_Enum(new PE_Enum),
+        pPE_Typedef(new PE_Typedef),
+        pCurNamespace(0),
+        pParseInfo(&i_parseInfo),
+        eState(e_none),
+        nBracketCount_inDefMode(0)
+{
+}
+
+void
+PE_File::EstablishContacts( UnoIDL_PE *                 io_pParentPE,
+                            ary::Repository &       io_rRepository,
+                            TokenProcessing_Result &    o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Service->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Singleton->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Interface->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Struct->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Exception->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Constant->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Enum->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Typedef->EstablishContacts(this,io_rRepository,o_rResult);
+
+    pCurNamespace = &Gate().Ces().GlobalNamespace();
+}
+
+PE_File::~PE_File()
+{
+}
+
+void
+PE_File::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_File::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    switch (eState)
+    {
+        case wait_for_module:
+        {
+                csv_assert(pCurNamespace != 0);
+
+                ary::idl::Module & rCe = Gate().Ces().CheckIn_Module(pCurNamespace->CeId(), i_rToken.Text());
+                pCurNamespace = &rCe;
+
+                // Get docu out of normal:
+                SetDocu(pTokenAdmin->ReleaseLastParsedDocu());
+                PassDocuAt(rCe);
+
+                csv_assert(pCurNamespace != 0);
+
+                SetResult(done, stay);
+                eState = wait_for_module_bracket;
+        }       break;
+        case on_default:
+                SetResult(done, stay);
+                break;
+        default:
+            csv_assert(false);
+    }
+}
+
+void
+PE_File::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    switch (eState)
+    {
+        case e_std:
+                if (i_rToken.Id() == TokPunctuation::CurledBracketClose)
+                {
+                    csv_assert(pCurNamespace != 0);
+
+                    pCurNamespace = &Gate().Ces().Find_Module(pCurNamespace->Owner());
+
+                    SetResult(done, stay);
+                    eState = wait_for_module_semicolon;
+                }
+                else
+                {
+                    csv_assert(false);
+                }
+                break;
+        case wait_for_module_bracket:
+                if (i_rToken.Id() == TokPunctuation::CurledBracketOpen)
+                {
+                    SetResult(done, stay);
+                    eState = e_std;
+                }
+                else
+                {
+                    csv_assert(false);
+                }
+                break;
+        case wait_for_module_semicolon:
+                if (i_rToken.Id() == TokPunctuation::Semicolon)
+                {
+                    SetResult(done, stay);
+                    eState = e_std;
+                }
+                else
+                {
+                    csv_assert(false);
+                }
+                break;
+        case on_default:
+                if (i_rToken.Id() == TokPunctuation::CurledBracketClose)
+                {
+                    nBracketCount_inDefMode--;
+                }
+                else if (i_rToken.Id() == TokPunctuation::CurledBracketOpen)
+                {
+                    nBracketCount_inDefMode++;
+                }
+                else if (i_rToken.Id() == TokPunctuation::Semicolon)
+                {
+                    if (nBracketCount_inDefMode <= 0)
+                    {
+                        eState = e_std;
+                    }
+                }
+                SetResult(done, stay);
+                break;
+        default:
+            csv_assert(false);
+    }
+}
+
+void
+PE_File::Process_MetaType( const TokMetaType &  i_rToken )
+{
+    switch (i_rToken.Id())
+    {
+        case TokMetaType::mt_service:
+                eState = in_sub_pe;
+                SetResult( not_done, push_sure, pPE_Service.Ptr());
+                break;
+        case TokMetaType::mt_singleton:
+                eState = in_sub_pe;
+                SetResult( not_done, push_sure, pPE_Singleton.Ptr());
+                break;
+        case TokMetaType::mt_uik:
+                Cerr() << "Syntax error: [uik ....] is obsolete now." << Endl();
+                SetResult( not_done, pop_failure);
+                break;
+        case TokMetaType::mt_interface:
+                eState = in_sub_pe;
+                SetResult( not_done, push_sure, pPE_Interface.Ptr());
+                break;
+        case TokMetaType::mt_module:
+                eState = wait_for_module;
+                SetResult( done, stay );
+                break;
+        case TokMetaType::mt_struct:
+                eState = in_sub_pe;
+                SetResult( done, push_sure, pPE_Struct.Ptr());
+                break;
+        case TokMetaType::mt_exception:
+                eState = in_sub_pe;
+                SetResult( done, push_sure, pPE_Exception.Ptr());
+                break;
+        case TokMetaType::mt_constants:
+                eState = in_sub_pe;
+                SetResult( done, push_sure, pPE_Constant.Ptr());
+                break;
+        case TokMetaType::mt_enum:
+                eState = in_sub_pe;
+                SetResult( done, push_sure, pPE_Enum.Ptr());
+                break;
+        case TokMetaType::mt_typedef:
+                eState = in_sub_pe;
+                SetResult( done, push_sure, pPE_Typedef.Ptr());
+                break;
+
+        default:
+                Process_Default();
+    }   // end switch
+}
+
+void
+PE_File::Process_Stereotype( const TokStereotype & i_rToken )
+{
+    if (i_rToken.Id() == TokStereotype::ste_published)
+    {
+        pTokenAdmin->Set_PublishedOn();
+
+        SetResult(done, stay);
+    }
+    else
+    {
+        Process_Default();
+    }
+}
+
+void
+PE_File::Process_Default()
+{
+    if (eState != on_default)
+    {
+        eState = on_default;
+        nBracketCount_inDefMode = 0;
+    }
+    SetResult(done, stay);
+}
+
+const ary::idl::Module &
+PE_File::CurNamespace() const
+{
+    csv_assert(pCurNamespace);
+    return *pCurNamespace;
+}
+
+const ParserInfo &
+PE_File::ParseInfo() const
+{
+    csv_assert(pParseInfo);
+    return *pParseInfo;
+}
+
+void
+PE_File::InitData()
+{
+    eState = e_std;
+}
+
+void
+PE_File::TransferData()
+{
+    eState = e_none;
+}
+
+void
+PE_File::ReceiveData()
+{
+    eState = e_std;
+}
+
+
+UnoIDL_PE &
+PE_File::MyPE()
+{
+     return *this;
+}
+
+}   // namespace uidl
+}   // namespace csi
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/pe_func2.cxx b/autodoc/source/parser_i/idl/pe_func2.cxx
new file mode 100644
index 000000000000..64a0c6d65736
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_func2.cxx
@@ -0,0 +1,447 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/pe_func2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_function.hxx>
+#include <ary/idl/i_type.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/idl/ip_type.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/pe_vari2.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <x_parse2.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+PE_Function::PE_Function( const RParent &       i_rCurInterface )
+    :   eState(e_none),
+        sData_Name(),
+        nData_ReturnType(0),
+        bData_Oneway(false),
+        pCurFunction(0),
+        pCurParent(&i_rCurInterface),
+        pPE_Type(0),
+        nCurParsedType(0),
+        sName(),
+        pPE_Variable(0),
+        eCurParsedParam_Direction(ary::idl::param_in),
+        nCurParsedParam_Type(0),
+        sCurParsedParam_Name(),
+        bIsForConstructors(false)
+{
+    pPE_Type        = new PE_Type(nCurParsedType);
+    pPE_Variable    = new PE_Variable(nCurParsedParam_Type, sCurParsedParam_Name);
+}
+
+PE_Function::PE_Function( const RParent &     i_rCurService,
+                          E_Constructor        )
+    :   eState(expect_name),
+        sData_Name(),
+        nData_ReturnType(0),
+        bData_Oneway(false),
+        pCurFunction(0),
+        pCurParent(&i_rCurService),
+        pPE_Type(0),
+        nCurParsedType(0),
+        sName(),
+        pPE_Variable(0),
+        eCurParsedParam_Direction(ary::idl::param_in),
+        nCurParsedParam_Type(0),
+        sCurParsedParam_Name(),
+        bIsForConstructors(true)
+{
+    pPE_Type        = new PE_Type(nCurParsedType);
+    pPE_Variable    = new PE_Variable(nCurParsedParam_Type, sCurParsedParam_Name);
+}
+
+void
+PE_Function::EstablishContacts( UnoIDL_PE *              io_pParentPE,
+                                ary::Repository &        io_rRepository,
+                                TokenProcessing_Result & o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Variable->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Function::~PE_Function()
+{
+}
+
+void
+PE_Function::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_Function::Process_Stereotype( const TokStereotype & i_rToken )
+{
+    if (eState == e_start)
+    {
+        switch (i_rToken.Id())
+        {
+            case TokStereotype::ste_oneway:
+                        bData_Oneway = true;
+                        SetResult(done, stay);
+                        break;
+            default:
+                        OnDefault();
+        }   // end switch
+    }
+    else
+        OnDefault();
+}
+
+void
+PE_Function::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    switch (eState)
+    {
+        case e_start:
+                    GoIntoReturnType();
+                    break;
+        case expect_name:
+                    sData_Name = i_rToken.Text();
+                    SetResult(done,stay);
+                    eState = expect_params_list;
+
+                    if (NOT bIsForConstructors)
+                    {
+                        pCurFunction = &Gate().Ces().Store_Function(
+                                                        *pCurParent,
+                                                        sData_Name,
+                                                        nData_ReturnType,
+                                                        bData_Oneway );
+                    }
+                    else
+                    {
+                        pCurFunction = &Gate().Ces().Store_ServiceConstructor(
+                                                        *pCurParent,
+                                                        sData_Name );
+                    }
+                    PassDocuAt(*pCurFunction);
+                    break;
+        case expect_parameter_variable:
+                    GoIntoParameterVariable();
+                    break;
+        case expect_exception:
+                    GoIntoException();
+                    break;
+        default:
+                    OnDefault();
+    }
+}
+
+void
+PE_Function::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    switch (eState)
+    {
+        case e_start:
+                    SetResult(done,stay);
+                    break;
+        case expect_params_list:
+                    if (i_rToken.Id() != TokPunctuation::BracketOpen)
+                    {
+                        OnDefault();
+                        return;
+                    }
+                    SetResult(done,stay);
+                    eState = expect_parameter;
+                    break;
+        case expect_parameter:
+                    if (i_rToken.Id() == TokPunctuation::BracketClose)
+                    {
+                        SetResult(done,stay);
+                        eState = params_finished;
+                    }
+                    else
+                    {
+                        OnDefault();
+                        return;
+                    }
+                    break;
+        case expect_parameter_separator:
+                    if (i_rToken.Id() == TokPunctuation::Comma)
+                    {
+                        SetResult(done,stay);
+                        eState = expect_parameter;
+                    }
+                    else if (i_rToken.Id() == TokPunctuation::BracketClose)
+                    {
+                        SetResult(done,stay);
+                        eState = params_finished;
+                    }
+                    else
+                    {
+                        OnDefault();
+                        return;
+                    }
+                    break;
+        case params_finished:
+        case exceptions_finished:
+                    if (i_rToken.Id() != TokPunctuation::Semicolon)
+                    {
+                        OnDefault();
+                        return;
+                    }
+                    SetResult(done,pop_success);
+                    eState = e_none;
+                    break;
+        case expect_exceptions_list:
+                    if (i_rToken.Id() != TokPunctuation::BracketOpen)
+                    {
+                        OnDefault();
+                        return;
+                    }
+                    SetResult(done,stay);
+                    eState = expect_exception;
+                    break;
+        case expect_exception_separator:
+                    if (i_rToken.Id() == TokPunctuation::Comma)
+                    {
+                        SetResult(done,stay);
+                        eState = expect_exception;
+                    }
+                    else if (i_rToken.Id() == TokPunctuation::BracketClose)
+                    {
+                        SetResult(done,stay);
+                        eState = exceptions_finished;
+                    }
+                    else
+                    {
+                        OnDefault();
+                        return;
+                    }
+                    break;
+        default:
+                    OnDefault();
+    }
+}
+
+void
+PE_Function::Process_BuiltInType( const TokBuiltInType & i_rToken )
+{
+    switch (eState)
+    {
+        case e_start:
+                GoIntoReturnType();
+                break;
+        case expect_parameter_variable:
+                   GoIntoParameterVariable();
+                break;
+        case expect_parameter_separator:
+                if (i_rToken.Id() != TokBuiltInType::bty_ellipse)
+                {
+                    OnDefault();
+                }
+                else
+                {
+                    pCurFunction->Set_Ellipse();
+                       SetResult(done,stay);
+                    // eState stays the same, because we wait for the closing ")" now.
+                }
+                break;
+        case expect_exception:
+                GoIntoException();
+                break;
+        default:
+            OnDefault();
+    }   // end switch
+}
+
+void
+PE_Function::Process_ParameterHandling( const TokParameterHandling & i_rToken )
+{
+    if (eState != expect_parameter)
+    {
+        OnDefault();
+        return;
+    }
+
+    switch (i_rToken.Id())
+    {
+        case TokParameterHandling::ph_in:
+                    eCurParsedParam_Direction = ary::idl::param_in;
+                    break;
+        case TokParameterHandling::ph_out:
+                    eCurParsedParam_Direction = ary::idl::param_out;
+                    break;
+        case TokParameterHandling::ph_inout:
+                    eCurParsedParam_Direction = ary::idl::param_inout;
+                    break;
+        default:
+                    csv_assert(false);
+    }
+    SetResult(done,stay);
+    eState = expect_parameter_variable;
+}
+
+void
+PE_Function::Process_Raises()
+{
+    if (eState != params_finished)
+    {
+        OnDefault();
+        return;
+    }
+    SetResult(done,stay);
+    eState = expect_exceptions_list;
+}
+
+void
+PE_Function::Process_Default()
+{
+    switch (eState)
+    {
+        case e_start:
+                GoIntoReturnType();
+                break;
+        case expect_parameter_variable:
+                GoIntoParameterVariable();
+                break;
+        case expect_exception:
+                GoIntoException();
+                break;
+        default:
+            OnDefault();
+    }   // end switch
+}
+
+void
+PE_Function::GoIntoReturnType()
+{
+    SetResult(not_done, push_sure, pPE_Type.Ptr());
+    eState = in_return_type;
+}
+
+void
+PE_Function::GoIntoParameterVariable()
+{
+    SetResult(not_done, push_sure, pPE_Variable.Ptr());
+    eState = in_parameter_variable;
+}
+
+void
+PE_Function::GoIntoException()
+{
+    SetResult(not_done, push_sure, pPE_Type.Ptr());
+    eState = in_exception;
+}
+
+void
+PE_Function::OnDefault()
+{
+    throw X_AutodocParser(X_AutodocParser::x_Any);
+}
+
+void
+PE_Function::InitData()
+{
+    eState = e_start;
+
+    sData_Name.clear();
+    nData_ReturnType = 0;
+    bData_Oneway = false;
+    pCurFunction = 0;
+
+    nCurParsedType = 0;
+    eCurParsedParam_Direction = ary::idl::param_in;
+    nCurParsedParam_Type = 0;
+    sCurParsedParam_Name.clear();
+
+    if (bIsForConstructors)
+    {
+        eState = expect_name;
+    }
+}
+
+void
+PE_Function::ReceiveData()
+{
+    switch (eState)
+    {
+        case in_return_type:
+                nData_ReturnType = nCurParsedType;
+                nCurParsedType = 0;
+                eState = expect_name;
+                break;
+        case in_parameter_variable:
+                csv_assert(pCurFunction != 0);
+                pCurFunction->Add_Parameter(
+                                    sCurParsedParam_Name,
+                                    nCurParsedParam_Type,
+                                    eCurParsedParam_Direction );
+                sCurParsedParam_Name = "";
+                nCurParsedParam_Type = 0;
+                eCurParsedParam_Direction = ary::idl::param_in;
+                eState = expect_parameter_separator;
+                break;
+        case in_exception:
+                csv_assert(pCurFunction != 0);
+                pCurFunction->Add_Exception(nCurParsedType);
+                eState = expect_exception_separator;
+                break;
+        default:
+            csv_assert(false);
+    }   // end switch
+}
+
+void
+PE_Function::TransferData()
+{
+    pCurFunction = 0;
+    eState = e_none;
+}
+
+UnoIDL_PE &
+PE_Function::MyPE()
+{
+    return *this;
+}
+
+
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/pe_iface.cxx b/autodoc/source/parser_i/idl/pe_iface.cxx
new file mode 100644
index 000000000000..404c303d2c04
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_iface.cxx
@@ -0,0 +1,470 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/pe_iface.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_interface.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_func2.hxx>
+#include <s2_luidl/pe_attri.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <adc_cl.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+#ifdef DF
+#undef DF
+#endif
+#define DF  &PE_Interface::On_Default
+
+PE_Interface::F_TOK
+PE_Interface::aDispatcher[PE_Interface::e_STATES_MAX][PE_Interface::tt_MAX] =
+        {   { DF, DF, DF, DF, DF },  // e_none
+            { &PE_Interface::On_need_uik_MetaType,
+                 DF, DF, DF, DF },  // need_uik
+            { DF, &PE_Interface::On_uik_Identifier,
+                     &PE_Interface::On_uik_Punctuation,
+                         DF, DF },  // uik
+            { &PE_Interface::On_need_ident_MetaType,
+                 DF, DF, DF, DF },  // need_ident
+            { DF, &PE_Interface::On_ident_Identifier,
+                     &PE_Interface::On_ident_Punctuation,
+                         DF, DF },  // ident
+            { &PE_Interface::On_need_interface_MetaType,
+                 DF, DF, DF, DF },  // need_interface
+            { DF, &PE_Interface::On_need_name_Identifer,
+                    DF, DF, DF },  // need_name
+            { DF, DF, &PE_Interface::On_wait_for_base_Punctuation,
+                        DF, DF },  // wait_for_base
+            { DF, DF, DF, DF, DF },  // in_base
+            { DF, DF, &PE_Interface::On_need_curlbr_open_Punctuation,
+                          DF, DF },  // need_curlbr_open
+            { &PE_Interface::On_std_Metatype,
+                  &PE_Interface::On_std_GotoFunction,
+                      &PE_Interface::On_std_Punctuation,
+                          &PE_Interface::On_std_GotoFunction,
+                              &PE_Interface::On_std_Stereotype },  // e_std
+            { DF, DF, DF, DF, DF },  // in_function
+            { DF, DF, DF, DF, DF },  // in_attribute
+            { DF, DF, &PE_Interface::On_need_finish_Punctuation,
+                          DF, DF },  // need_finish
+            { DF, DF, DF, DF, DF }   // in_base_interface
+        };
+
+
+
+inline void
+PE_Interface::CallHandler( const char *     i_sTokenText,
+                           E_TokenType      i_eTokenType )
+    { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); }
+
+
+
+PE_Interface::PE_Interface()
+    :   eState(e_none),
+        sData_Name(),
+        bIsPreDeclaration(false),
+        pCurInterface(0),
+        nCurInterface(0),
+        pPE_Function(0),
+        pPE_Attribute(0),
+        pPE_Type(0),
+        nCurParsed_Base(0),
+        bOptionalMember(false)
+{
+    pPE_Function    = new PE_Function(nCurInterface);
+    pPE_Type        = new PE_Type(nCurParsed_Base);
+    pPE_Attribute   = new PE_Attribute(nCurInterface);
+}
+
+void
+PE_Interface::EstablishContacts( UnoIDL_PE *                io_pParentPE,
+                                 ary::Repository &      io_rRepository,
+                                 TokenProcessing_Result &   o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Function->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Attribute->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Interface::~PE_Interface()
+{
+}
+
+void
+PE_Interface::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+
+void
+PE_Interface::Process_MetaType( const TokMetaType & i_rToken )
+{
+    CallHandler( i_rToken.Text(), tt_metatype );
+}
+
+void
+PE_Interface::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    CallHandler( i_rToken.Text(), tt_identifier );
+}
+
+void
+PE_Interface::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    CallHandler( i_rToken.Text(), tt_punctuation );
+}
+
+void
+PE_Interface::Process_NameSeparator()
+{
+    CallHandler( "", tt_startoftype );
+}
+
+void
+PE_Interface::Process_BuiltInType( const TokBuiltInType & i_rToken )
+{
+    CallHandler( i_rToken.Text(), tt_startoftype );
+}
+
+void
+PE_Interface::Process_TypeModifier( const TokTypeModifier & i_rToken )
+{
+    CallHandler( i_rToken.Text(), tt_startoftype );
+}
+
+void
+PE_Interface::Process_Stereotype( const TokStereotype & i_rToken )
+{
+    CallHandler( i_rToken.Text(), tt_stereotype );
+}
+
+void
+PE_Interface::Process_Default()
+{
+    SetResult(done, stay);
+}
+
+
+void
+PE_Interface::On_need_uik_MetaType(const char *)
+{
+    // Deprecated, data will be ignored
+    SetResult(done, stay);
+    eState = uik;
+}
+
+void
+PE_Interface::On_uik_Identifier(const char *)
+{
+    // Deprecated, data will be ignored
+    SetResult(done, stay);
+}
+
+void
+PE_Interface::On_uik_Punctuation(const char * i_sText)
+{
+    // Deprecated, data will be ignored
+    SetResult(done, stay);
+    if (strcmp(",",i_sText) == 0)
+    {
+        eState = need_ident;
+    }
+}
+
+void
+PE_Interface::On_need_ident_MetaType(const char *)
+{
+    SetResult(done, stay);
+    eState = ident;
+}
+
+void
+PE_Interface::On_ident_Identifier(const char *)
+{
+    SetResult(done, stay);
+}
+
+void
+PE_Interface::On_ident_Punctuation(const char * i_sText)
+{
+    SetResult(done, stay);
+    if (strcmp(")",i_sText) == 0)
+    {
+        eState = need_interface;
+    }
+}
+
+void
+PE_Interface::On_need_interface_MetaType(const char *)
+{
+    SetResult(done, stay);
+    eState = need_name;
+}
+
+void
+PE_Interface::On_need_name_Identifer(const char * i_sText)
+{
+    SetResult(done, stay);
+    sData_Name = i_sText;
+    eState = wait_for_base;
+}
+
+void
+PE_Interface::On_wait_for_base_Punctuation(const char * i_sText)
+{
+    if (i_sText[0] != ';')
+    {
+        switch (i_sText[0])
+        {
+            case ':':
+                SetResult(done, push_sure, pPE_Type.Ptr());
+                eState = in_base;
+                break;
+            case '{':
+                store_Interface();
+
+                SetResult(done,stay);
+                eState = e_std;
+                break;
+            default:
+                SetResult(not_done, pop_failure);
+                eState = e_none;
+        }   // end switch
+    }
+    else
+    {
+        bIsPreDeclaration = true;
+        SetResult(done, pop_success);
+        eState = e_none;
+    }
+}
+
+void
+PE_Interface::On_need_curlbr_open_Punctuation(const char * i_sText)
+{
+    if (i_sText[0] == '{')
+    {
+        store_Interface();
+
+        SetResult(done, stay);
+        eState = e_std;
+    }
+    else {
+        csv_assert(false);
+    }
+}
+
+
+void
+PE_Interface::On_std_Metatype(const char * i_sText)
+{
+    if (strcmp(i_sText,"attribute") ==  0)
+        On_std_GotoAttribute(i_sText);
+    else if (strcmp(i_sText,"interface") ==  0)
+        On_std_GotoBaseInterface(i_sText);
+    else
+        On_std_GotoFunction(i_sText);
+}
+
+void
+PE_Interface::On_std_Punctuation(const char * i_sText)
+{
+    switch (i_sText[0])
+    {
+        case '}':
+            SetResult(done, stay);
+            eState = need_finish;
+            break;
+        case ';':   // Appears after base interface declarations.
+            SetResult(done, stay);
+            break;
+        default:
+            SetResult(not_done, pop_failure);
+            eState = e_none;
+    }   // end switch
+}
+
+void
+PE_Interface::On_std_Stereotype(const char * i_sText)
+{
+    if (strcmp(i_sText,"oneway") ==  0)
+        On_std_GotoFunction(i_sText);
+    else if (    strcmp(i_sText,"readonly") ==  0
+              OR strcmp(i_sText,"bound") ==  0 )
+        On_std_GotoAttribute(i_sText);
+    else if (strcmp(i_sText,"optional") ==  0)
+    {
+        bOptionalMember = true;
+        SetResult(done, stay);
+    }
+    else
+        SetResult(not_done, pop_failure);
+}
+
+void
+PE_Interface::On_std_GotoFunction(const char * )
+{
+    SetResult(not_done, push_sure, pPE_Function.Ptr());
+    eState = in_function;
+}
+
+void
+PE_Interface::On_std_GotoAttribute(const char * )
+{
+        SetResult(not_done, push_sure, pPE_Attribute.Ptr());
+        eState = in_attribute;
+}
+
+void
+PE_Interface::On_std_GotoBaseInterface(const char * )
+{
+       SetResult(done, push_sure, pPE_Type.Ptr());
+    eState = in_base_interface;
+}
+
+void
+PE_Interface::On_need_finish_Punctuation(const char * i_sText)
+{
+    switch (i_sText[0])
+    {
+        case ';':
+            SetResult(done, pop_success);
+            eState = e_none;
+            break;
+        default:
+            SetResult(not_done, pop_failure);
+            eState = e_none;
+    }   // end switch
+}
+
+void
+PE_Interface::On_Default(const char *)
+{
+    SetResult(not_done, pop_failure);
+}
+
+void
+PE_Interface::InitData()
+{
+    eState = need_interface;
+
+    sData_Name.clear();
+    bIsPreDeclaration = false;
+    pCurInterface = 0;
+    nCurInterface = 0;
+    nCurParsed_Base = 0;
+    bOptionalMember = false;
+}
+
+void
+PE_Interface::TransferData()
+{
+    if (NOT bIsPreDeclaration)
+    {
+        csv_assert(sData_Name.size() > 0);
+        csv_assert(nCurInterface.IsValid());
+    }
+    else
+    {
+         sData_Name.clear();
+         pCurInterface = 0;
+        nCurInterface = 0;
+    }
+
+    eState = e_none;
+}
+
+void
+PE_Interface::ReceiveData()
+{
+    switch (eState)
+    {
+        case in_base:
+                eState = need_curlbr_open;
+                break;
+        case in_function:
+                eState = e_std;
+                break;
+        case in_attribute:
+                eState = e_std;
+                break;
+        case in_base_interface:
+                if (bOptionalMember)
+                {
+                    pPE_Type->SetOptional();
+                    bOptionalMember = false;
+                }
+                pCurInterface->Add_Base(
+                                    nCurParsed_Base,
+                                    pPE_Type->ReleaseDocu());
+                nCurParsed_Base = 0;
+                eState = e_std;
+                break;
+        default:
+            csv_assert(false);
+    }
+}
+
+UnoIDL_PE &
+PE_Interface::MyPE()
+{
+     return *this;
+}
+
+void
+PE_Interface::store_Interface()
+{
+    pCurInterface = & Gate().Ces().Store_Interface(
+                                        CurNamespace().CeId(),
+                                        sData_Name,
+                                        nCurParsed_Base );
+    nCurInterface = pCurInterface->CeId();
+    PassDocuAt(*pCurInterface);
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/pe_property.cxx b/autodoc/source/parser_i/idl/pe_property.cxx
new file mode 100644
index 000000000000..fc138b3c9d27
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_property.cxx
@@ -0,0 +1,240 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/pe_property.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_property.hxx>
+#include <ary/idl/i_service.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_vari2.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+
+PE_Property::PE_Property( const Ce_id & i_rCurOwner )
+    :   eState(e_none),
+        pCurOwner(&i_rCurOwner),
+        pPE_Variable(0),
+        nCurParsedType(0),
+        sCurParsedName(),
+        bIsOptional(false),
+        aStereotypes()
+{
+    pPE_Variable    = new PE_Variable(nCurParsedType, sCurParsedName);
+}
+
+void
+PE_Property::EstablishContacts( UnoIDL_PE *                io_pParentPE,
+                                ary::Repository &       io_rRepository,
+                                TokenProcessing_Result &    o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Variable->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Property::~PE_Property()
+{
+}
+
+void
+PE_Property::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_Property::Process_Stereotype( const TokStereotype & i_rToken )
+{
+    switch (i_rToken.Id())
+    {
+        case TokStereotype::ste_optional:
+            bIsOptional = true;
+            break;
+        case TokStereotype::ste_readonly:
+            aStereotypes.Set_Flag(Stereotypes::readonly);
+            break;
+        case TokStereotype::ste_bound:
+            aStereotypes.Set_Flag(Stereotypes::bound);
+            break;
+        case TokStereotype::ste_constrained:
+            aStereotypes.Set_Flag(Stereotypes::constrained);
+            break;
+        case TokStereotype::ste_maybeambiguous:
+            aStereotypes.Set_Flag(Stereotypes::maybeambiguous);
+            break;
+        case TokStereotype::ste_maybedefault:
+            aStereotypes.Set_Flag(Stereotypes::maybedefault);
+            break;
+        case TokStereotype::ste_maybevoid:
+            aStereotypes.Set_Flag(Stereotypes::maybevoid);
+            break;
+        case TokStereotype::ste_removable:
+            aStereotypes.Set_Flag(Stereotypes::removable);
+            break;
+        case TokStereotype::ste_transient:
+            aStereotypes.Set_Flag(Stereotypes::transient);
+            break;
+
+        default:
+            SetResult(not_done, pop_failure);
+            eState = e_none;
+            return;
+    }
+
+    SetResult(done, stay);
+}
+
+void
+PE_Property::Process_MetaType( const TokMetaType & i_rToken )
+{
+    if (eState == e_start)
+    {
+        if ( i_rToken.Id() == TokMetaType::mt_property )
+        {
+            SetResult(done, stay);
+            eState = expect_variable;
+            return;
+        }
+    }   // endif (eState == e_start)
+
+    SetResult(not_done, pop_failure);
+    eState = e_none;
+}
+
+void
+PE_Property::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    switch (eState)
+    {
+        case e_start:
+            SetResult(done, stay);
+            break;
+        case expect_variable:
+            if (i_rToken.Id() == TokPunctuation::Semicolon)
+            {
+                SetResult(done, pop_success);
+                eState = e_none;
+            }
+            else if (i_rToken.Id() == TokPunctuation::Comma)
+                SetResult(done, stay);
+            else
+                SetResult(not_done, pop_failure);
+            break;
+        default:
+            csv_assert(false);
+    }
+}
+
+void
+PE_Property::Process_Default()
+{
+    if (eState == expect_variable)
+    {
+        SetResult(not_done, push_sure, pPE_Variable.Ptr());
+        eState = in_variable;
+    }
+    else
+        SetResult(not_done, pop_failure);
+}
+
+void
+PE_Property::InitData()
+{
+    eState = e_start;
+
+    nCurParsedType = 0;
+    sCurParsedName = "";
+
+    // bIsOptional and
+    // aStereotypes
+    //   may be preset by the PE_Service-(or PE_Interface-)parent
+    //   with PresetOptional() or
+    //   PresetStereotype()
+    //   - therefore it must not be set here!
+}
+
+void
+PE_Property::TransferData()
+{
+    if (bIsOptional)
+    {
+        SetOptional();
+        bIsOptional = false;
+    }
+
+    ary::idl::CodeEntity *
+        pCe = 0;
+    csv_assert(pCurOwner->IsValid());
+
+    pCe = &Gate().Ces().Store_Property( *pCurOwner,
+                                        sCurParsedName,
+                                        nCurParsedType,
+                                        aStereotypes );
+
+    csv_assert(pCe != 0);
+    PassDocuAt(*pCe);
+
+    nCurParsedType = 0;
+    sCurParsedName.clear();
+    aStereotypes = Stereotypes();
+
+    eState = e_none;
+}
+
+void
+PE_Property::ReceiveData()
+{
+    eState = expect_variable;
+}
+
+
+UnoIDL_PE &
+PE_Property::MyPE()
+{
+    return *this;
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/pe_selem.cxx b/autodoc/source/parser_i/idl/pe_selem.cxx
new file mode 100644
index 000000000000..7dabd57b8205
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_selem.cxx
@@ -0,0 +1,208 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/pe_selem.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_struct.hxx>
+#include <ary/idl/i_structelem.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+namespace
+{
+    const String  C_sNone;
+}
+
+PE_StructElement::PE_StructElement( RStructElement &    o_rResult,
+                                    const RStruct &     i_rCurStruct,
+                                    const String &      i_rCurStructTemplateParam )
+    :   eState(e_none),
+        pResult(&o_rResult),
+        pCurStruct(&i_rCurStruct),
+        bIsExceptionElement(false),
+        pPE_Type(0),
+        nType(0),
+        sName(),
+        pCurStructTemplateParam(&i_rCurStructTemplateParam)
+{
+    pPE_Type = new PE_Type(nType);
+}
+
+PE_StructElement::PE_StructElement( RStructElement &    o_rResult,
+                                    const RStruct &     i_rCurExc )
+    :   eState(e_none),
+        pResult(&o_rResult),
+        pCurStruct(&i_rCurExc),
+        bIsExceptionElement(true),
+        pPE_Type(0),
+        nType(0),
+        sName(),
+        pCurStructTemplateParam(&C_sNone)
+{
+    pPE_Type = new PE_Type(nType);
+}
+
+void
+PE_StructElement::EstablishContacts( UnoIDL_PE *                io_pParentPE,
+                                     ary::Repository &      io_rRepository,
+                                     TokenProcessing_Result &   o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_StructElement::~PE_StructElement()
+{
+}
+
+void
+PE_StructElement::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_StructElement::Process_Default()
+{
+    if (eState == expect_type)
+    {
+        SetResult( not_done, push_sure, pPE_Type.Ptr() );
+        eState = expect_name;
+    }
+    else {
+        csv_assert(false);
+    }
+}
+
+void
+PE_StructElement::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    csv_assert(*i_rToken.Text() != 0);
+
+    if (eState == expect_type)
+    {
+        if ( *pCurStructTemplateParam == i_rToken.Text() )
+        {
+            nType = lhf_FindTemplateParamType();
+               SetResult( done, stay );
+            eState = expect_name;
+        }
+        else    // No template parameter type existing, or not matching:
+        {
+               SetResult( not_done, push_sure, pPE_Type.Ptr() );
+            eState = expect_name;
+        }
+    }
+    else if (eState == expect_name)
+    {
+        sName = i_rToken.Text();
+        SetResult( done, stay );
+        eState = expect_finish;
+    }
+    else {
+        csv_assert(false);
+    }
+}
+
+void
+PE_StructElement::Process_Punctuation( const TokPunctuation &)
+{
+    csv_assert(eState == expect_finish);
+
+    SetResult( done, pop_success );
+}
+
+void
+PE_StructElement::InitData()
+{
+    eState = expect_type;
+
+    nType = 0;
+    sName = "";
+}
+
+void
+PE_StructElement::TransferData()
+{
+    csv_assert(pResult != 0 AND pCurStruct != 0);
+
+    ary::idl::StructElement *
+        pCe = 0;
+    if (bIsExceptionElement)
+    {
+        pCe = & Gate().Ces().Store_ExceptionMember(
+                                            *pCurStruct,
+                                            sName,
+                                            nType );
+    }
+    else
+    {
+        pCe = & Gate().Ces().Store_StructMember(
+                                            *pCurStruct,
+                                            sName,
+                                            nType );
+    }
+    *pResult = pCe->CeId();
+    PassDocuAt(*pCe);
+
+    eState = e_none;
+}
+
+UnoIDL_PE &
+PE_StructElement::MyPE()
+{
+    return *this;
+}
+
+ary::idl::Type_id
+PE_StructElement::lhf_FindTemplateParamType() const
+{
+    const ary::idl::CodeEntity &
+        rCe = Gate().Ces().Find_Ce(*pCurStruct);
+    const ary::idl::Struct &
+        rStruct = static_cast< const ary::idl::Struct& >(rCe);
+    return rStruct.TemplateParameterType();
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/pe_servi.cxx b/autodoc/source/parser_i/idl/pe_servi.cxx
new file mode 100644
index 000000000000..a4209c58f7be
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_servi.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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_servi.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_service.hxx>
+#include <ary/idl/i_siservice.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_func2.hxx>
+#include <s2_luidl/pe_property.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+
+PE_Service::PE_Service()
+    :   eState(e_none),
+        sData_Name(),
+        bIsPreDeclaration(false),
+        pCurService(0),
+        pCurSiService(0),
+        nCurService(0),
+        pPE_Property(0),
+        nCurParsed_Property(0),
+        pPE_Type(0),
+        nCurParsed_Type(0),
+        pPE_Constructor(0),
+        bOptionalMember(false)
+{
+    pPE_Property    = new PE_Property(nCurService);
+    pPE_Type        = new PE_Type(nCurParsed_Type);
+    pPE_Constructor = new PE_Function(nCurService, PE_Function::constructor);
+}
+
+void
+PE_Service::EstablishContacts( UnoIDL_PE *              io_pParentPE,
+                               ary::Repository &        io_rRepository,
+                               TokenProcessing_Result & o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Property->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+    pPE_Constructor->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Service::~PE_Service()
+{
+}
+
+void
+PE_Service::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+
+void
+PE_Service::Process_MetaType( const TokMetaType &   i_rToken )
+{
+    switch ( i_rToken.Id() )
+    {
+        case TokMetaType::mt_service:
+                    if (eState == need_name)
+                        SetResult(done, stay );
+                    else if (eState == e_std)
+                    {
+                        SetResult(done, push_sure, pPE_Type.Ptr());
+                        eState = in_service_type;
+                    }
+                    else
+                        On_Default();
+                    break;
+        case TokMetaType::mt_interface:
+                    if (eState == e_std)
+                    {
+                        SetResult(done, push_sure, pPE_Type.Ptr());
+                        eState = in_ifc_type;
+                    }
+                    else
+                        On_Default();
+                    break;
+        case TokMetaType::mt_property:
+                    if (eState == e_std)
+                    {
+                        StartProperty();
+                    }
+                    else
+                        On_Default();
+                    break;
+        default:
+            // KORR_FUTURE:
+            // Should throw syntax error warning.
+                    ;
+    }   // end switch
+}
+
+void
+PE_Service::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    if (eState == need_name)
+    {
+        sData_Name = i_rToken.Text();
+        SetResult(done, stay);
+        eState = need_curlbr_open;
+    }
+    else if (eState == e_std_sib)
+    {
+        SetResult(not_done, push_sure, pPE_Constructor.Ptr());
+    }
+    else
+        On_Default();
+}
+
+void
+PE_Service::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    switch (i_rToken.Id())
+    {
+        case TokPunctuation::Colon:
+                    if (eState == need_curlbr_open)
+                    {
+                        SetResult(done, push_sure, pPE_Type.Ptr());
+                        eState = need_base_interface;
+                    }
+                    else
+                        On_Default();
+                    break;
+
+        case TokPunctuation::CurledBracketOpen:
+                    if (eState == need_curlbr_open)
+                    {
+                        pCurService = &Gate().Ces().Store_Service(
+                                                        CurNamespace().CeId(),
+                                                        sData_Name );
+                        nCurService = pCurService->CeId();
+                        PassDocuAt(*pCurService);
+                        SetResult(done, stay);
+                        eState = e_std;
+                    }
+                    else if (eState == need_curlbr_open_sib)
+                    {
+                        SetResult(done, stay);
+                        eState = e_std_sib;
+                    }
+                    else
+                        On_Default();
+                    break;
+        case TokPunctuation::CurledBracketClose:
+                    if (eState == e_std OR eState == e_std_sib)
+                    {
+                        SetResult(done, stay);
+                        eState = need_finish;
+                    }
+                    else
+                        On_Default();
+                    break;
+        case TokPunctuation::Comma:
+                    if (eState == expect_ifc_separator)
+                    {
+                        SetResult(done, push_sure, pPE_Type.Ptr());
+                        eState = in_ifc_type;
+                    }
+                    else if (eState == expect_service_separator)
+                    {
+                        SetResult(done, push_sure, pPE_Type.Ptr());
+                        eState = in_service_type;
+                    }
+                    else if (eState == e_std)
+                    {
+                        SetResult(done, stay);
+                    }
+                    else
+                        On_Default();
+                    break;
+        case TokPunctuation::Semicolon:
+                    switch (eState)
+                    {
+                       case need_curlbr_open:
+                                    sData_Name.clear();
+                                    bIsPreDeclaration = true;
+                                    SetResult(done, pop_success);
+                                    eState = e_none;
+                                    break;
+                       case need_curlbr_open_sib:
+                                    SetResult(done, pop_success);
+                                    eState = e_none;
+                                    break;
+                       case expect_ifc_separator:
+                       case expect_service_separator:
+                                    SetResult(done, stay);
+                                    eState = e_std;
+                                    break;
+                       case need_finish:
+                                    SetResult(done, pop_success);
+                                    eState = e_none;
+                                    break;
+                       case at_ignore:
+                                    SetResult(done, stay);
+                                    eState = e_std;
+                                    break;
+                       default:
+                                    On_Default();
+                    }   // end switch
+                    break;
+        default:
+                    On_Default();
+    }   // end switch
+}
+
+void
+PE_Service::Process_Stereotype( const TokStereotype & i_rToken )
+{
+    if (i_rToken.Id() == TokStereotype::ste_optional)
+    {
+        bOptionalMember = true;
+        SetResult(done, stay);
+    }
+    else if ( eState == e_std )
+    {
+        StartProperty();
+    }
+    else
+        On_Default();
+}
+
+void
+PE_Service::Process_Needs()
+{
+    SetResult(done,stay);
+    eState = at_ignore;
+}
+
+void
+PE_Service::Process_Observes()
+{
+    SetResult(done,stay);
+    eState = at_ignore;
+}
+
+void
+PE_Service::Process_Default()
+{
+    On_Default();
+}
+
+
+void
+PE_Service::On_Default()
+{
+    if (eState == at_ignore)
+        SetResult(done, stay);
+    else
+        SetResult(not_done, pop_failure);
+}
+
+void
+PE_Service::InitData()
+{
+    eState = need_name;
+    sData_Name.clear();
+    bIsPreDeclaration = false;
+    pCurService = 0;
+    pCurSiService = 0;
+    nCurService = 0;
+    nCurParsed_Property = 0;
+    nCurParsed_Type = 0;
+    bOptionalMember = false;
+}
+
+void
+PE_Service::TransferData()
+{
+    if (NOT bIsPreDeclaration)
+    {
+        csv_assert(sData_Name.size() > 0);
+        csv_assert( (pCurService != 0) != (pCurSiService != 0) );
+    }
+
+    eState = e_none;
+}
+
+void
+PE_Service::ReceiveData()
+{
+    switch (eState)
+    {
+        case in_property:
+                eState = e_std;
+                break;
+        case in_ifc_type:
+                if (bOptionalMember)
+                {
+                    pPE_Type->SetOptional();
+                }
+                pCurService->AddRef_SupportedInterface(
+                                    nCurParsed_Type,
+                                    pPE_Type->ReleaseDocu());
+                nCurParsed_Type = 0;
+                eState = expect_ifc_separator;
+                break;
+        case in_service_type:
+                if (bOptionalMember)
+                {
+                    pPE_Type->SetOptional();
+                }
+                pCurService->AddRef_IncludedService(
+                                    nCurParsed_Type,
+                                    pPE_Type->ReleaseDocu());
+                nCurParsed_Type = 0;
+                eState = expect_service_separator;
+                break;
+        case need_base_interface:
+                pCurSiService = &Gate().Ces().Store_SglIfcService(
+                                                CurNamespace().CeId(),
+                                                sData_Name,
+                                                nCurParsed_Type );
+                nCurService = pCurSiService->CeId();
+                PassDocuAt(*pCurSiService);
+
+                nCurParsed_Type = 0;
+                eState = need_curlbr_open_sib;
+                break;
+        case e_std_sib:
+                break;
+        default:
+            csv_assert(false);
+    }
+
+    bOptionalMember = false;
+}
+
+
+UnoIDL_PE &
+PE_Service::MyPE()
+{
+    return *this;
+}
+
+void
+PE_Service::StartProperty()
+{
+    SetResult(not_done, push_sure, pPE_Property.Ptr());
+    eState = in_property;
+
+    if (bOptionalMember)
+    {
+        pPE_Property->PresetOptional();
+        bOptionalMember = false;
+    }
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/pe_singl.cxx b/autodoc/source/parser_i/idl/pe_singl.cxx
new file mode 100644
index 000000000000..292d380323ac
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_singl.cxx
@@ -0,0 +1,250 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/pe_singl.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_singleton.hxx>
+#include <ary/idl/i_sisingleton.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+PE_Singleton::PE_Singleton()
+    :   eState(e_none),
+        sData_Name(),
+        bIsPreDeclaration(false),
+        pCurSingleton(0),
+        pCurSiSingleton(0),
+        pPE_Type(0),
+        nCurParsed_Type(0)
+{
+    pPE_Type        = new PE_Type(nCurParsed_Type);
+}
+
+void
+PE_Singleton::EstablishContacts( UnoIDL_PE *                io_pParentPE,
+                               ary::Repository &        io_rRepository,
+                               TokenProcessing_Result & o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Singleton::~PE_Singleton()
+{
+}
+
+void
+PE_Singleton::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+
+void
+PE_Singleton::Process_MetaType( const TokMetaType & i_rToken )
+{
+    switch ( i_rToken.Id() )
+    {
+        case TokMetaType::mt_service:
+                    if (eState == e_std)
+                    {
+                        SetResult(done, push_sure, pPE_Type.Ptr());
+                        eState = in_service;
+                    }
+                    else
+                        On_Default();
+                    break;
+        case TokMetaType::mt_singleton:
+                    if (eState == need_name)
+                        SetResult(done, stay);
+                    else
+                        On_Default();
+                    break;
+        default:
+            // KORR_FUTURE
+            // Should throw syntax error warning
+                    ;
+
+    }   // end switch
+}
+
+void
+PE_Singleton::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    if (eState == need_name)
+    {
+        sData_Name = i_rToken.Text();
+        SetResult(done, stay);
+        eState = need_curlbr_open;
+    }
+    else
+        On_Default();
+}
+
+void
+PE_Singleton::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    switch (i_rToken.Id())
+    {
+        case TokPunctuation::CurledBracketOpen:
+                    if (eState == need_curlbr_open)
+                    {
+                        pCurSingleton = &Gate().Ces().Store_Singleton(
+                                                        CurNamespace().CeId(),
+                                                        sData_Name );
+                        PassDocuAt(*pCurSingleton);
+                        SetResult(done, stay);
+                        eState = e_std;
+                    }
+                    else
+                        On_Default();
+                    break;
+        case TokPunctuation::CurledBracketClose:
+                    if (eState == e_std)
+                    {
+                        SetResult(done, stay);
+                        eState = need_finish;
+                    }
+                    else
+                        On_Default();
+                    break;
+        case TokPunctuation::Semicolon:
+                    switch (eState)
+                    {
+                       case e_std:  SetResult(done, stay);
+                                    break;
+                       case need_finish:
+                                    SetResult(done, pop_success);
+                                    eState = e_none;
+                                    break;
+                       default:
+                                    On_Default();
+                    }   // end switch
+                    break;
+        case TokPunctuation::Colon:
+                    switch (eState)
+                    {
+                       case need_curlbr_open:
+                                    SetResult(done, push_sure, pPE_Type.Ptr());
+                                    eState = in_base_interface;
+                                    break;
+                       default:
+                                    On_Default();
+                    }   // end switch
+                    break;
+        default:
+                    On_Default();
+    }   // end switch
+}
+
+void
+PE_Singleton::Process_Default()
+{
+    On_Default();
+}
+
+
+void
+PE_Singleton::On_Default()
+{
+    SetResult(not_done, pop_failure);
+}
+
+void
+PE_Singleton::InitData()
+{
+    eState = need_name;
+    sData_Name.clear();
+    bIsPreDeclaration = false;
+    pCurSingleton = 0;
+    pCurSiSingleton = 0;
+    nCurParsed_Type = 0;
+}
+
+void
+PE_Singleton::TransferData()
+{
+    if (NOT bIsPreDeclaration)
+    {
+        csv_assert(sData_Name.size() > 0);
+        csv_assert( (pCurSingleton != 0) != (pCurSiSingleton != 0) );
+    }
+
+    eState = e_none;
+}
+
+void
+PE_Singleton::ReceiveData()
+{
+    switch (eState)
+    {
+        case in_service:
+                    pCurSingleton->Set_Service(nCurParsed_Type);
+                    nCurParsed_Type = 0;
+                    eState = e_std;
+                    break;
+        case in_base_interface:
+                    pCurSiSingleton = &Gate().Ces().Store_SglIfcSingleton(
+                                                    CurNamespace().CeId(),
+                                                    sData_Name,
+                                                    nCurParsed_Type );
+                    PassDocuAt(*pCurSiSingleton);
+                    nCurParsed_Type = 0;
+                    eState = need_finish;
+                    break;
+        default:
+            csv_assert(false);
+    }   // end switch
+}
+
+UnoIDL_PE &
+PE_Singleton::MyPE()
+{
+    return *this;
+}
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/pe_struc.cxx b/autodoc/source/parser_i/idl/pe_struc.cxx
new file mode 100644
index 000000000000..a9dc68448ee3
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_struc.cxx
@@ -0,0 +1,330 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/pe_struc.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_struct.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/pe_selem.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+PE_Struct::PE_Struct()
+    // :    aWork,
+    //      pStati
+{
+    pStati = new S_Stati(*this);
+}
+
+void
+PE_Struct::EstablishContacts( UnoIDL_PE *               io_pParentPE,
+                              ary::Repository &         io_rRepository,
+                              TokenProcessing_Result &  o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    Work().pPE_Element->EstablishContacts(this,io_rRepository,o_rResult);
+    Work().pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Struct::~PE_Struct()
+{
+}
+
+void
+PE_Struct::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*Stati().pCurStatus);
+}
+
+
+void
+PE_Struct::InitData()
+{
+    Work().InitData();
+    Stati().pCurStatus = &Stati().aWaitForName;
+}
+
+void
+PE_Struct::TransferData()
+{
+    if (NOT Work().bIsPreDeclaration)
+    {
+        csv_assert(Work().sData_Name.size() > 0);
+        csv_assert(Work().nCurStruct.IsValid());
+    }
+    Stati().pCurStatus = &Stati().aNone;
+}
+
+void
+PE_Struct::ReceiveData()
+{
+    Stati().pCurStatus->On_SubPE_Left();
+}
+
+PE_Struct::S_Work::S_Work()
+    :   sData_Name(),
+        sData_TemplateParam(),
+        bIsPreDeclaration(false),
+        nCurStruct(0),
+        pPE_Element(0),
+        nCurParsed_ElementRef(0),
+        pPE_Type(0),
+        nCurParsed_Base(0)
+
+{
+    pPE_Element = new PE_StructElement(nCurParsed_ElementRef,nCurStruct,sData_TemplateParam);
+    pPE_Type = new PE_Type(nCurParsed_Base);
+}
+
+void
+PE_Struct::S_Work::InitData()
+{
+    sData_Name.clear();
+    sData_TemplateParam.clear();
+    bIsPreDeclaration = false;
+    nCurStruct = 0;
+    nCurParsed_ElementRef = 0;
+    nCurParsed_Base = 0;
+}
+
+void
+PE_Struct::S_Work::Prepare_PE_QualifiedName()
+{
+    nCurParsed_ElementRef = 0;
+}
+
+void
+PE_Struct::S_Work::Prepare_PE_Element()
+{
+    nCurParsed_Base = 0;
+}
+
+void
+PE_Struct::S_Work::Data_Set_Name( const char * i_sName )
+{
+    sData_Name = i_sName;
+}
+
+void
+PE_Struct::S_Work::Data_Set_TemplateParam( const char * i_sTemplateParam )
+{
+    sData_TemplateParam = i_sTemplateParam;
+}
+
+PE_Struct::S_Stati::S_Stati(PE_Struct & io_rStruct)
+    :   aNone(io_rStruct),
+        aWaitForName(io_rStruct),
+        aGotName(io_rStruct),
+        aWaitForTemplateParam(io_rStruct),
+        aWaitForTemplateEnd(io_rStruct),
+        aWaitForBase(io_rStruct),
+        aGotBase(io_rStruct),
+        aWaitForElement(io_rStruct),
+        aWaitForFinish(io_rStruct),
+        pCurStatus(0)
+{
+    pCurStatus = &aNone;
+}
+
+
+//***********************       Stati       ***************************//
+
+
+UnoIDL_PE &
+PE_Struct::PE_StructState::MyPE()
+{
+    return rStruct;
+}
+
+
+void
+PE_Struct::State_WaitForName::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    Work().Data_Set_Name(i_rToken.Text());
+    MoveState( Stati().aGotName );
+    SetResult(done,stay);
+}
+
+void
+PE_Struct::State_GotName::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    if ( i_rToken.Id() != TokPunctuation::Semicolon )
+    {
+        switch (i_rToken.Id())
+        {
+            case TokPunctuation::Colon:
+                MoveState( Stati().aWaitForBase );
+                SetResult(done,push_sure,Work().pPE_Type.Ptr());
+                Work().Prepare_PE_QualifiedName();
+                break;
+            case TokPunctuation::CurledBracketOpen:
+                PE().store_Struct();
+                MoveState( Stati().aWaitForElement );
+                SetResult(done,stay);
+                break;
+            case TokPunctuation::Lesser:
+                MoveState( Stati().aWaitForTemplateParam );
+                SetResult(done,stay);
+                break;
+            default:
+                SetResult(not_done,pop_failure);
+        }   // end switch
+    }
+    else
+    {
+        Work().sData_Name.clear();
+        SetResult(done,pop_success);
+    }
+}
+
+void
+PE_Struct::State_WaitForTemplateParam::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    Work().Data_Set_TemplateParam(i_rToken.Text());
+    MoveState( Stati().aWaitForTemplateEnd );
+    SetResult(done,stay);
+}
+
+void
+PE_Struct::State_WaitForTemplateEnd::Process_Punctuation( const TokPunctuation & )
+{
+    // Assume:  TokPunctuation::Greater
+    MoveState( Stati().aGotName );
+    SetResult(done,stay);
+}
+
+void
+PE_Struct::State_WaitForBase::On_SubPE_Left()
+{
+    MoveState(Stati().aGotBase);
+}
+
+void
+PE_Struct::State_GotBase::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    if ( i_rToken.Id() == TokPunctuation::CurledBracketOpen )
+    {
+        PE().store_Struct();
+        MoveState( Stati().aWaitForElement );
+        SetResult(done,stay);
+    }
+    else
+    {
+        SetResult(not_done,pop_failure);
+    }
+}
+
+void
+PE_Struct::State_WaitForElement::Process_Identifier( const TokIdentifier & )
+{
+    SetResult( not_done, push_sure, Work().pPE_Element.Ptr() );
+    Work().Prepare_PE_Element();
+}
+
+void
+PE_Struct::State_WaitForElement::Process_NameSeparator()
+{
+    SetResult( not_done, push_sure, Work().pPE_Element.Ptr());
+    Work().Prepare_PE_Element();
+}
+
+void
+PE_Struct::State_WaitForElement::Process_BuiltInType( const TokBuiltInType & )
+{
+    SetResult( not_done, push_sure, Work().pPE_Element.Ptr());
+    Work().Prepare_PE_Element();
+}
+
+void
+PE_Struct::State_WaitForElement::Process_TypeModifier(const TokTypeModifier & )
+{
+    SetResult( not_done, push_sure, Work().pPE_Element.Ptr());
+    Work().Prepare_PE_Element();
+}
+
+void
+PE_Struct::State_WaitForElement::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    if ( i_rToken.Id() == TokPunctuation::CurledBracketClose )
+    {
+        MoveState( Stati().aWaitForFinish );
+        SetResult( done, stay );
+    }
+    else
+    {
+        SetResult( not_done, pop_failure );
+    }
+}
+
+void
+PE_Struct::State_WaitForFinish::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    if (i_rToken.Id() == TokPunctuation::Semicolon)
+    {
+        MoveState( Stati().aNone );
+        SetResult( done, pop_success );
+    }
+    else
+    {
+        SetResult( not_done, pop_failure );
+    }
+}
+
+void
+PE_Struct::store_Struct()
+{
+    ary::idl::Struct &
+        rCe = Gate().Ces().Store_Struct(
+                        CurNamespace().CeId(),
+                        Work().sData_Name,
+                        Work().nCurParsed_Base,
+                        Work().sData_TemplateParam );
+    PassDocuAt(rCe);
+    Work().nCurStruct = rCe.CeId();
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/pe_tydf2.cxx b/autodoc/source/parser_i/idl/pe_tydf2.cxx
new file mode 100644
index 000000000000..310a8f57327b
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_tydf2.cxx
@@ -0,0 +1,186 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/pe_tydf2.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_typedef.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+#include <s2_luidl/tk_const.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+#ifdef DF
+#undef DF
+#endif
+#define DF  &PE_Typedef::On_Default
+
+PE_Typedef::F_TOK
+PE_Typedef::aDispatcher[PE_Typedef::e_STATES_MAX][PE_Typedef::tt_MAX] =
+        {   { DF, DF, DF },  // e_none
+            { &PE_Typedef::On_expect_description_Any,
+                  &PE_Typedef::On_expect_description_Any,
+                      DF },  // expect_description
+            { DF, &PE_Typedef::On_expect_name_Identifier,
+                      DF },  // expect_name
+            { DF, DF, &PE_Typedef::On_got_name_Punctuation }  // got_name
+        };
+
+
+
+inline void
+PE_Typedef::CallHandler( const char *       i_sTokenText,
+                         E_TokenType        i_eTokenType )
+    { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); }
+
+
+
+
+
+PE_Typedef::PE_Typedef()
+    :   eState(e_none),
+        pPE_Type(0),
+        nType(0),
+        sName()
+{
+    pPE_Type = new PE_Type(nType);
+}
+
+void
+PE_Typedef::EstablishContacts( UnoIDL_PE *              io_pParentPE,
+                               ary::Repository &    io_rRepository,
+                               TokenProcessing_Result & o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Typedef::~PE_Typedef()
+{
+}
+
+void
+PE_Typedef::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_Typedef::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_identifier);
+}
+
+void
+PE_Typedef::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    CallHandler(i_rToken.Text(), tt_punctuation);
+}
+
+void
+PE_Typedef::Process_Default()
+{
+    CallHandler("", tt_any);
+}
+
+void
+PE_Typedef::On_expect_description_Any(const char *)
+{
+    SetResult(not_done,push_sure, pPE_Type.Ptr());
+}
+
+void
+PE_Typedef::On_expect_name_Identifier(const char * i_sText)
+{
+    sName = i_sText;
+    SetResult(done,stay);
+    eState = got_name;
+}
+
+void
+PE_Typedef::On_got_name_Punctuation(const char * i_sText)
+{
+    if ( i_sText[0] == ';' )
+    {
+        SetResult(done,pop_success);
+        eState = e_none;
+    }
+    else
+        On_Default(i_sText);
+}
+
+void
+PE_Typedef::On_Default(const char * )
+{
+    SetResult(not_done,pop_failure);
+}
+
+void
+PE_Typedef::InitData()
+{
+    eState = expect_description;
+    nType = 0;
+    sName = "";
+}
+
+void
+PE_Typedef::ReceiveData()
+{
+    eState = expect_name;
+}
+
+void
+PE_Typedef::TransferData()
+{
+    ary::idl::Typedef &
+        rCe = Gate().Ces().Store_Typedef(CurNamespace().CeId(), sName, nType);
+    PassDocuAt(rCe);
+    eState = e_none;
+}
+
+UnoIDL_PE &
+PE_Typedef::MyPE()
+{
+    return *this;
+}
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/pe_type2.cxx b/autodoc/source/parser_i/idl/pe_type2.cxx
new file mode 100644
index 000000000000..fe73ce04bdca
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_type2.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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_type2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_type.hxx>
+#include <ary/idl/ip_type.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/uidl_tok.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_punct.hxx>
+
+
+
+/** Implementation Concept for Parsing a Type
+
+Example Type:
+    sequence < ::abc::TName< TplType > >  AnyName;
+
+Status Changes:
+
+expect_type:
+    sequence        -> expect_type
+    <               -> expect_type
+    ::              -> expect_quname_part
+    abc             -> expect_quname_separator
+    ::              -> expect_quname_part
+    TName           -> expect_quname_separator
+    <               -> in_template_type (process in nested PE_Type instance)
+
+        expect_type:
+            TplType         ->expect_quname_separator
+            >               -> e_none (finish, '>' not handled)
+
+    >               -> expect_quname_separator
+    >               -> expect_quname_separator (not finish, because sequencecounter > 0)
+    AnyName         -> e_none  (finish)
+*/
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+PE_Type::PE_Type( ary::idl::Type_id & o_rResult )
+    :   pResult(&o_rResult),
+        nIsSequenceCounter(0),
+        nSequenceDownCounter(0),
+        bIsUnsigned(false),
+        sFullType(),
+        eState(e_none),
+        sLastPart(),
+        pPE_TemplateType(0), // @attention Recursion, only initiate, if needed!
+        nTemplateType(0),
+        aTemplateParameters()
+{
+}
+
+PE_Type::~PE_Type()
+{
+}
+
+void
+PE_Type::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+void
+PE_Type::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    if (eState == expect_type)
+    {
+        sLastPart = i_rToken.Text();
+        eState = expect_quname_separator;
+        SetResult(done, stay);
+    }
+    else if (eState == expect_quname_part)
+    {
+        sLastPart = i_rToken.Text();
+        eState = expect_quname_separator;
+        SetResult(done, stay);
+    }
+    else if (eState == expect_quname_separator)
+    {
+        Finish();
+    }
+}
+
+void
+PE_Type::Process_NameSeparator()
+{
+    if (eState == expect_type)
+    {
+        sFullType.Init(true);
+        eState = expect_quname_part;
+        SetResult(done, stay);
+    }
+    else if (eState == expect_quname_separator)
+    {
+        sFullType += sLastPart;
+        eState = expect_quname_part;
+        SetResult(done, stay);
+    }
+}
+
+void
+PE_Type::Process_Punctuation( const TokPunctuation & i_rToken )
+{
+    if (eState == expect_type)
+    {
+        csv_assert(i_rToken.Id() == TokPunctuation::Lesser);
+           SetResult(done, stay);
+    }
+    else if (eState == expect_quname_separator)
+    {
+        switch (i_rToken.Id())
+        {
+            case TokPunctuation::Lesser:
+                eState = in_template_type;
+                SetResult( done, push_sure, &MyTemplateType() );
+                break;
+
+            case TokPunctuation::Greater:
+                if (nSequenceDownCounter > 0)
+                {
+                    nSequenceDownCounter--;
+                    SetResult(done, stay);
+                }
+                else
+                {
+                    Finish();
+                }
+                break;
+
+            default:
+                Finish();
+        }   // end switch
+    }
+    else if (eState == in_template_type)
+    {
+        aTemplateParameters.push_back(nTemplateType);
+        nTemplateType = 0;
+
+        if (i_rToken.Id() == TokPunctuation::Greater)
+        {
+        eState = expect_quname_separator;
+        SetResult(done, stay);
+    }
+        else if (i_rToken.Id() == TokPunctuation::Comma)
+        {
+              SetResult(done, push_sure, &MyTemplateType());
+        }
+        else
+        {
+            csv_assert(false);
+            Finish();
+        }
+    }
+}
+
+void
+PE_Type::Process_BuiltInType( const TokBuiltInType & i_rToken )
+{
+    if (eState == expect_type)
+    {
+        sLastPart = i_rToken.Text();
+        eState = expect_quname_separator;
+        SetResult(done, stay);
+    }
+    else if (eState == expect_quname_part)
+    {
+        // Can this happen?
+
+        sLastPart = i_rToken.Text();
+        eState = expect_quname_separator;
+        SetResult(done, stay);
+    }
+    else if (eState == expect_quname_separator)
+    {
+        // Can this happen?
+
+        Finish();
+    }
+}
+
+void
+PE_Type::Process_TypeModifier( const TokTypeModifier & i_rToken )
+{
+    if (eState == expect_type)
+    {
+        switch ( i_rToken.Id() )
+        {
+            case TokTypeModifier::tmod_unsigned:
+                    bIsUnsigned = true;
+                    break;
+            case TokTypeModifier::tmod_sequence:
+                    nIsSequenceCounter++;
+                    nSequenceDownCounter++;
+                    break;
+            default:
+                csv_assert(false);
+        }
+        SetResult(done, stay);
+    }
+    else if (eState == expect_quname_separator)
+    {
+        // Can this happen?
+
+        Finish();
+    }
+}
+
+void
+PE_Type::Process_Default()
+{
+    Finish();
+}
+
+void
+PE_Type::Finish()
+{
+    csv_assert(nSequenceDownCounter == 0);
+
+    sFullType.SetLocalName(sLastPart);
+    SetResult(not_done, pop_success);
+}
+
+PE_Type &
+PE_Type::MyTemplateType()
+{
+    if (NOT pPE_TemplateType)
+    {
+        pPE_TemplateType = new PE_Type(nTemplateType);
+        pPE_TemplateType->EstablishContacts( this,
+                                             MyRepository(),
+                                             TokenResult() );
+    }
+    return *pPE_TemplateType;
+}
+
+void
+PE_Type::InitData()
+{
+    eState = expect_type;
+
+    nIsSequenceCounter = 0;
+    nSequenceDownCounter = 0;
+    bIsUnsigned = false;
+    sFullType.Empty();
+    sLastPart.clear();
+    nTemplateType = 0;
+    csv::erase_container(aTemplateParameters);
+}
+
+void
+PE_Type::TransferData()
+{
+    if (bIsUnsigned)
+    {
+        StreamLock sl(40);
+        String sName( sl() << "unsigned " << sFullType.LocalName() << c_str );
+        sFullType.SetLocalName(sName);
+    }
+
+    const ary::idl::Type &
+        result = Gate().Types().CheckIn_Type( sFullType,
+                                              nIsSequenceCounter,
+                                              CurNamespace().CeId(),
+                                              &aTemplateParameters );
+    *pResult = result.TypeId();
+    eState = e_none;
+}
+
+UnoIDL_PE &
+PE_Type::MyPE()
+{
+     return *this;
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/pe_vari2.cxx b/autodoc/source/parser_i/idl/pe_vari2.cxx
new file mode 100644
index 000000000000..8491d831c9b8
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pe_vari2.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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/pe_vari2.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_property.hxx>
+#include <ary/idl/ip_ce.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/pe_type2.hxx>
+#include <s2_luidl/tk_keyw.hxx>
+#include <s2_luidl/tk_ident.hxx>
+#include <s2_luidl/tk_punct.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+PE_Variable::PE_Variable( ary::idl::Type_id &   i_rResult_Type,
+                          String &              i_rResult_Name )
+    :   eState(e_none),
+        pResult_Type(&i_rResult_Type),
+        pResult_Name(&i_rResult_Name),
+        pPE_Type(0)
+{
+    pPE_Type = new PE_Type(i_rResult_Type);
+}
+
+void
+PE_Variable::EstablishContacts( UnoIDL_PE *                 io_pParentPE,
+                                ary::Repository &           io_rRepository,
+                                TokenProcessing_Result &    o_rResult )
+{
+    UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult);
+    pPE_Type->EstablishContacts(this,io_rRepository,o_rResult);
+}
+
+PE_Variable::~PE_Variable()
+{
+}
+
+void
+PE_Variable::ProcessToken( const Token & i_rToken )
+{
+    i_rToken.Trigger(*this);
+}
+
+
+void
+PE_Variable::Process_Default()
+{
+    if (eState == expect_type)
+    {
+        SetResult( not_done, push_sure, pPE_Type.Ptr() );
+    }
+    else{
+        csv_assert(false);
+    }
+}
+
+void
+PE_Variable::Process_Identifier( const TokIdentifier & i_rToken )
+{
+    if (eState == expect_type)
+    {
+        SetResult( not_done, push_sure, pPE_Type.Ptr() );
+    }
+    else if (eState == expect_name)
+    {
+        *pResult_Name = i_rToken.Text();
+        SetResult( done, stay );
+        eState = expect_finish;
+    }
+    else {
+        csv_assert(false);
+    }
+}
+
+void
+PE_Variable::Process_Punctuation( const TokPunctuation & )
+{
+    if (eState == expect_finish)
+    {
+        SetResult( not_done, pop_success );
+        eState = e_none;
+    }
+    else if (eState == expect_name)
+    {
+        SetResult( not_done, pop_success );
+        eState = e_none;
+    }
+    else {
+        csv_assert(false);
+    }
+}
+
+void
+PE_Variable::Process_BuiltInType( const TokBuiltInType & i_rToken )
+{
+    if (eState == expect_type)
+    {
+        SetResult( not_done, push_sure, pPE_Type.Ptr() );
+    }
+    else if (eState == expect_name AND i_rToken.Id() == TokBuiltInType::bty_ellipse)
+    {
+        SetResult( not_done, pop_success );
+        eState = e_none;
+    }
+    else {
+        csv_assert(false);
+    }
+}
+
+void
+PE_Variable::InitData()
+{
+    eState = expect_type;
+
+    *pResult_Type = 0;
+    *pResult_Name = "";
+}
+
+void
+PE_Variable::ReceiveData()
+{
+    eState = expect_name;
+}
+
+void
+PE_Variable::TransferData()
+{
+    eState = e_none;
+}
+
+UnoIDL_PE &
+PE_Variable::MyPE()
+{
+    return *this;
+}
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/pestate.cxx b/autodoc/source/parser_i/idl/pestate.cxx
new file mode 100644
index 000000000000..2799e2029783
--- /dev/null
+++ b/autodoc/source/parser_i/idl/pestate.cxx
@@ -0,0 +1,142 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/pestate.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/parsenv2.hxx>
+
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+void
+ParseEnvState::Process_Identifier( const TokIdentifier & )
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_NameSeparator()
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_Punctuation( const TokPunctuation & )
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_BuiltInType( const TokBuiltInType & )
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_TypeModifier( const TokTypeModifier & )
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_MetaType( const TokMetaType &    )
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_Stereotype( const TokStereotype & )
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_ParameterHandling( const TokParameterHandling & )
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_Raises()
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_Needs()
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_Observes()
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_Assignment( const TokAssignment & )
+{
+    Process_Default();
+}
+
+void
+ParseEnvState::Process_EOL()
+{
+    MyPE().SetResult(done,stay);
+}
+
+
+void
+ParseEnvState::On_SubPE_Left()
+{
+}
+
+void
+ParseEnvState::Process_Default()
+{
+    if (bDefaultIsError)
+        MyPE().SetResult(not_done, pop_failure);
+    else    // ignore:
+        MyPE().SetResult(done, stay);
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/semnode.cxx b/autodoc/source/parser_i/idl/semnode.cxx
new file mode 100644
index 000000000000..f2e38a291e87
--- /dev/null
+++ b/autodoc/source/parser_i/idl/semnode.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/semnode.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <ary/ary.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/idl/i_module.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <s2_luidl/parsenv2.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+
+SemanticNode::SemanticNode()
+    :   pParentPE(0),
+        pAryGate(0),
+        pTokenResult(0)
+{
+}
+
+void
+SemanticNode::EstablishContacts( UnoIDL_PE *                io_pParentPE,
+                                 ary::idl::Gate &           io_rGate,
+                                 TokenProcessing_Result &   o_rResult )
+{
+    pParentPE       =  io_pParentPE;
+    pAryGate        = &io_rGate;
+    pTokenResult    = &o_rResult;
+}
+
+SemanticNode::~SemanticNode()
+{
+}
+
+void
+SemanticNode::SetTokenResult( E_TokenDone       i_eDone,
+                              E_EnvStackAction  i_eWhat2DoWithEnvStack,
+                              UnoIDL_PE *       i_pParseEnv2Push )
+{
+    csv_assert(pTokenResult != 0);
+
+    pTokenResult->eDone         = i_eDone;
+    pTokenResult->eStackAction  = i_eWhat2DoWithEnvStack;
+    pTokenResult->pEnv2Push     = i_pParseEnv2Push;
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/tk_const.cxx b/autodoc/source/parser_i/idl/tk_const.cxx
new file mode 100644
index 000000000000..98b418b3f679
--- /dev/null
+++ b/autodoc/source/parser_i/idl/tk_const.cxx
@@ -0,0 +1,59 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/tk_const.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <s2_luidl/tokintpr.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+void
+TokAssignment::Trigger( TokenInterpreter &  io_rInterpreter ) const
+{
+    io_rInterpreter.Process_Assignment(*this);
+}
+
+const char *
+TokAssignment::Text() const
+{
+    return sText;
+}
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/tk_ident.cxx b/autodoc/source/parser_i/idl/tk_ident.cxx
new file mode 100644
index 000000000000..13f5571d5e05
--- /dev/null
+++ b/autodoc/source/parser_i/idl/tk_ident.cxx
@@ -0,0 +1,70 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/tk_ident.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <s2_luidl/tokintpr.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+void
+TokIdentifier::Trigger( TokenInterpreter &  io_rInterpreter ) const
+{
+    io_rInterpreter.Process_Identifier(*this);
+}
+
+const char *
+TokIdentifier::Text() const
+{
+    return sText;
+}
+
+void
+TokNameSeparator::Trigger( TokenInterpreter &   io_rInterpreter ) const
+{
+    io_rInterpreter.Process_NameSeparator();
+}
+
+const char *
+TokNameSeparator::Text() const
+{
+    return "::";
+}
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/tk_keyw.cxx b/autodoc/source/parser_i/idl/tk_keyw.cxx
new file mode 100644
index 000000000000..408f83dc4b58
--- /dev/null
+++ b/autodoc/source/parser_i/idl/tk_keyw.cxx
@@ -0,0 +1,227 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/tk_keyw.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <s2_luidl/tokintpr.hxx>
+
+
+using csi::uidl::TokBuiltInType;
+using csi::uidl::TokTypeModifier;
+using csi::uidl::TokMetaType;
+using csi::uidl::TokStereotype;
+using csi::uidl::TokParameterHandling;
+
+
+lux::EnumValueMap           G_aTokBuiltInType_EV_TokenId_Values;
+TokBuiltInType::EV_TokenId  ev_bty_none(TokBuiltInType::e_none,"");
+TokBuiltInType::EV_TokenId  ev_bty_any(TokBuiltInType::bty_any,"any");
+TokBuiltInType::EV_TokenId  ev_bty_boolean(TokBuiltInType::bty_boolean,"boolean");
+TokBuiltInType::EV_TokenId  ev_bty_byte(TokBuiltInType::bty_byte,"byte");
+TokBuiltInType::EV_TokenId  ev_bty_char(TokBuiltInType::bty_char,"char");
+TokBuiltInType::EV_TokenId  ev_bty_double(TokBuiltInType::bty_double,"double");
+TokBuiltInType::EV_TokenId  ev_bty_hyper(TokBuiltInType::bty_hyper,"hyper");
+TokBuiltInType::EV_TokenId  ev_bty_long(TokBuiltInType::bty_long,"long");
+TokBuiltInType::EV_TokenId  ev_bty_short(TokBuiltInType::bty_short,"short");
+TokBuiltInType::EV_TokenId  ev_bty_string(TokBuiltInType::bty_string,"string");
+TokBuiltInType::EV_TokenId  ev_bty_void(TokBuiltInType::bty_void,"void");
+TokBuiltInType::EV_TokenId  ev_bty_ellipse(TokBuiltInType::bty_ellipse,"...");
+
+
+lux::EnumValueMap           G_aTokTypeModifier_EV_TokenId_Values;
+TokTypeModifier::EV_TokenId ev_tmod_none(TokTypeModifier::e_none,"");
+TokTypeModifier::EV_TokenId ev_tmod_unsigned(TokTypeModifier::tmod_unsigned,"unsigned");
+TokTypeModifier::EV_TokenId ev_tmod_sequence(TokTypeModifier::tmod_sequence,"sequence");
+
+
+lux::EnumValueMap           G_aTokMetaType_EV_TokenId_Values;
+TokMetaType::EV_TokenId     ev_mt_none(TokMetaType::e_none,"");
+TokMetaType::EV_TokenId     ev_mt_attribute(TokMetaType::mt_attribute,"attribute");
+TokMetaType::EV_TokenId     ev_mt_constants(TokMetaType::mt_constants,"constants");
+TokMetaType::EV_TokenId     ev_mt_enum(TokMetaType::mt_enum,"enum");
+TokMetaType::EV_TokenId     ev_mt_exception(TokMetaType::mt_exception,"exception");
+TokMetaType::EV_TokenId     ev_mt_ident(TokMetaType::mt_ident,"ident");
+TokMetaType::EV_TokenId     ev_mt_interface(TokMetaType::mt_interface,"interface");
+TokMetaType::EV_TokenId     ev_mt_module(TokMetaType::mt_module,"module");
+TokMetaType::EV_TokenId     ev_mt_property(TokMetaType::mt_property,"property");
+TokMetaType::EV_TokenId     ev_mt_service(TokMetaType::mt_service,"service");
+TokMetaType::EV_TokenId     ev_mt_singleton(TokMetaType::mt_singleton,"singleton");
+TokMetaType::EV_TokenId     ev_mt_struct(TokMetaType::mt_struct,"struct");
+TokMetaType::EV_TokenId     ev_mt_typedef(TokMetaType::mt_typedef,"typedef");
+TokMetaType::EV_TokenId     ev_mt_uik(TokMetaType::mt_uik,"uik");
+
+
+lux::EnumValueMap           G_aTokStereotype_EV_TokenId_Values;
+TokStereotype::EV_TokenId   ev_ste_none(TokStereotype::e_none,"");
+TokStereotype::EV_TokenId   ev_ste_bound(TokStereotype::ste_bound,"bound");
+TokStereotype::EV_TokenId   ev_ste_const(TokStereotype::ste_const,"const");
+TokStereotype::EV_TokenId   ev_ste_constrained(TokStereotype::ste_constrained,"constrained");
+TokStereotype::EV_TokenId   ev_ste_maybeambiguous(TokStereotype::ste_maybeambiguous,"maybeambiguous");
+TokStereotype::EV_TokenId   ev_ste_maybedefault(TokStereotype::ste_maybedefault,"maybedefault");
+TokStereotype::EV_TokenId   ev_ste_maybevoid(TokStereotype::ste_maybevoid,"maybevoid");
+TokStereotype::EV_TokenId   ev_ste_oneway(TokStereotype::ste_oneway,"oneway");
+TokStereotype::EV_TokenId   ev_ste_optional(TokStereotype::ste_optional,"optional");
+TokStereotype::EV_TokenId   ev_ste_readonly(TokStereotype::ste_readonly,"readonly");
+TokStereotype::EV_TokenId   ev_ste_removable(TokStereotype::ste_removable,"removable");
+TokStereotype::EV_TokenId   ev_ste_virtual(TokStereotype::ste_virtual,"virtual");
+TokStereotype::EV_TokenId   ev_ste_transient(TokStereotype::ste_transient,"transient");
+TokStereotype::EV_TokenId   ev_ste_published(TokStereotype::ste_published,"published");
+
+
+lux::EnumValueMap                   G_aTokParameterHandling_EV_TokenId_Values;
+TokParameterHandling::EV_TokenId    ev_ph_none(TokParameterHandling::e_none,"");
+TokParameterHandling::EV_TokenId    ev_ph_in(TokParameterHandling::ph_in,"in");
+TokParameterHandling::EV_TokenId    ev_ph_out(TokParameterHandling::ph_out,"out");
+TokParameterHandling::EV_TokenId    ev_ph_inout(TokParameterHandling::ph_inout,"inout");
+
+
+namespace lux
+{
+
+template<> EnumValueMap &
+TokBuiltInType::EV_TokenId::Values_()       { return G_aTokBuiltInType_EV_TokenId_Values; }
+template<> EnumValueMap &
+TokTypeModifier::EV_TokenId::Values_()      { return G_aTokTypeModifier_EV_TokenId_Values; }
+template<> EnumValueMap &
+TokMetaType::EV_TokenId::Values_()          { return G_aTokMetaType_EV_TokenId_Values; }
+template<> EnumValueMap &
+TokStereotype::EV_TokenId::Values_()        { return G_aTokStereotype_EV_TokenId_Values; }
+template<> EnumValueMap &
+TokParameterHandling::EV_TokenId::Values_() { return G_aTokParameterHandling_EV_TokenId_Values; }
+
+}   // namespace lux
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+void
+TokBuiltInType::Trigger( TokenInterpreter & io_rInterpreter ) const
+{
+    io_rInterpreter.Process_BuiltInType(*this);
+}
+
+const char *
+TokBuiltInType::Text() const
+{
+    return eTag.Text();
+}
+
+void
+TokTypeModifier::Trigger( TokenInterpreter &    io_rInterpreter ) const
+{
+    io_rInterpreter.Process_TypeModifier(*this);
+}
+
+const char *
+TokTypeModifier::Text() const
+{
+    return eTag.Text();
+}
+
+void
+TokMetaType::Trigger( TokenInterpreter &    io_rInterpreter ) const
+{
+    io_rInterpreter.Process_MetaType(*this);
+}
+
+const char *
+TokMetaType::Text() const
+{
+    return eTag.Text();
+}
+
+void
+TokStereotype::Trigger( TokenInterpreter &  io_rInterpreter ) const
+{
+    io_rInterpreter.Process_Stereotype(*this);
+}
+
+const char *
+TokStereotype::Text() const
+{
+    return eTag.Text();
+}
+
+void
+TokParameterHandling::Trigger( TokenInterpreter &   io_rInterpreter ) const
+{
+    io_rInterpreter.Process_ParameterHandling(*this);
+}
+
+const char *
+TokParameterHandling::Text() const
+{
+    return eTag.Text();
+}
+
+void
+TokRaises::Trigger( TokenInterpreter &  io_rInterpreter ) const
+{
+    io_rInterpreter.Process_Raises();
+}
+
+const char *
+TokRaises::Text() const
+{
+    return "raises";
+}
+
+void
+TokNeeds::Trigger( TokenInterpreter &   io_rInterpreter ) const
+{
+    io_rInterpreter.Process_Needs();
+}
+
+const char *
+TokNeeds::Text() const
+{
+    return "needs";
+}
+void
+TokObserves::Trigger( TokenInterpreter &    io_rInterpreter ) const
+{
+    io_rInterpreter.Process_Observes();
+}
+
+const char *
+TokObserves::Text() const
+{
+    return "observes";
+}
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/tk_punct.cxx b/autodoc/source/parser_i/idl/tk_punct.cxx
new file mode 100644
index 000000000000..e617473fcd1b
--- /dev/null
+++ b/autodoc/source/parser_i/idl/tk_punct.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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_luidl/tk_punct.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <parser/parserinfo.hxx>
+#include <s2_luidl/tokintpr.hxx>
+
+
+using csi::uidl::TokPunctuation;
+
+
+lux::EnumValueMap           G_aTokPunctuation_EV_TokenId_Values;
+TokPunctuation::EV_TokenId  ev_none(TokPunctuation::e_none,"");
+TokPunctuation::EV_TokenId  BracketOpen(TokPunctuation::BracketOpen,"(");
+TokPunctuation::EV_TokenId  BracketClose(TokPunctuation::BracketClose,")");
+TokPunctuation::EV_TokenId  ArrayBracketOpen(TokPunctuation::ArrayBracketOpen,"[");
+TokPunctuation::EV_TokenId  ArrayBracketClose(TokPunctuation::ArrayBracketClose,"]");
+TokPunctuation::EV_TokenId  CurledBracketOpen(TokPunctuation::CurledBracketOpen,"{");
+TokPunctuation::EV_TokenId  CurledBracketClose(TokPunctuation::CurledBracketClose,"}");
+TokPunctuation::EV_TokenId  Semicolon(TokPunctuation::Semicolon,";");
+TokPunctuation::EV_TokenId  Colon(TokPunctuation::Colon,":");
+TokPunctuation::EV_TokenId  DoubleColon(TokPunctuation::DoubleColon,"::");
+TokPunctuation::EV_TokenId  Comma(TokPunctuation::Comma,",");
+TokPunctuation::EV_TokenId  Minus(TokPunctuation::Minus,"-");
+TokPunctuation::EV_TokenId  Fullstop(TokPunctuation::Fullstop,".");
+TokPunctuation::EV_TokenId  Lesser(TokPunctuation::Lesser,"<");
+TokPunctuation::EV_TokenId  Greater(TokPunctuation::Greater,">");
+
+
+
+
+namespace lux
+{
+template<> EnumValueMap &
+TokPunctuation::EV_TokenId::Values_()       { return G_aTokPunctuation_EV_TokenId_Values; }
+}
+
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+void
+TokPunctuation::Trigger( TokenInterpreter & io_rInterpreter ) const
+{
+    io_rInterpreter.Process_Punctuation(*this);
+}
+
+const char *
+TokPunctuation::Text() const
+{
+    return eTag.Text();
+}
+
+void
+Tok_EOL::Trigger( TokenInterpreter &    io_rInterpreter ) const
+{
+    io_rInterpreter.Process_EOL();
+}
+
+const char *
+Tok_EOL::Text() const
+{
+    return "\r\n";
+}
+
+void
+Tok_EOF::Trigger( TokenInterpreter & ) const
+{
+    csv_assert(false);
+//  io_rInterpreter.Process_EOF();
+}
+
+const char *
+Tok_EOF::Text() const
+{
+    return "";
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/tkp_uidl.cxx b/autodoc/source/parser_i/idl/tkp_uidl.cxx
new file mode 100644
index 000000000000..66f8c556cdbf
--- /dev/null
+++ b/autodoc/source/parser_i/idl/tkp_uidl.cxx
@@ -0,0 +1,76 @@
+/* -*- 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 <precomp.h>
+#include <s2_luidl/tkp_uidl.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <s2_luidl/cx_idlco.hxx>
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+TokenParser_Uidl::TokenParser_Uidl( Token_Receiver &        o_rUidlReceiver,
+                                    DYN ::TkpDocuContext &  let_drDocuContext )
+    :   pBaseContext(new Context_UidlCode(o_rUidlReceiver, let_drDocuContext)),
+        pCurContext(0)
+{
+    SetStartContext();
+}
+
+TokenParser_Uidl::~TokenParser_Uidl()
+{
+}
+
+void
+TokenParser_Uidl::SetStartContext()
+{
+    pCurContext = pBaseContext.Ptr();
+}
+
+void
+TokenParser_Uidl::SetCurrentContext( TkpContext & io_rContext )
+{
+    pCurContext = &io_rContext;
+}
+
+TkpContext &
+TokenParser_Uidl::CurrentContext()
+{
+    return *pCurContext;
+}
+
+}   // namespace uidl
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idl/unoidl.cxx b/autodoc/source/parser_i/idl/unoidl.cxx
new file mode 100644
index 000000000000..740a4ecab1ad
--- /dev/null
+++ b/autodoc/source/parser_i/idl/unoidl.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <parser/unoidl.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <stdlib.h>
+#include <cosv/file.hxx>
+#include <ary/ary.hxx>
+#include <ary/idl/i_gate.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <../parser/inc/x_docu.hxx>
+#include <parser/parserinfo.hxx>
+#include <tools/filecoll.hxx>
+#include <tools/tkpchars.hxx>
+#include <s2_luidl/tkp_uidl.hxx>
+#include <s2_luidl/distrib.hxx>
+#include <s2_luidl/pe_file2.hxx>
+#include <s2_dsapi/cx_dsapi.hxx>
+#include <adc_msg.hxx>
+#include <x_parse2.hxx>
+
+
+
+namespace autodoc
+{
+
+
+class FileParsePerformers
+{
+  public:
+                        FileParsePerformers(
+                            ary::Repository &
+                                                io_rRepository,
+                            ParserInfo &        io_rParserInfo );
+
+    void                ParseFile(
+                            const char *        i_sFullPath );
+
+  private:
+    CharacterSource     aFileLoader;
+    Dyn<csi::uidl::TokenParser_Uidl>
+                        pTokens;
+    csi::uidl::TokenDistributor
+                        aDistributor;
+    Dyn<csi::uidl::PE_File>
+                        pFileParseEnvironment;
+    ary::Repository &
+                        rRepository;
+    ParserInfo &        rParserInfo;
+};
+
+
+IdlParser::IdlParser( ary::Repository & io_rRepository )
+    :   pRepository(&io_rRepository)
+{
+}
+
+void
+IdlParser::Run( const autodoc::FileCollector_Ifc & i_rFiles )
+{
+    Dyn<FileParsePerformers>
+        pFileParsePerformers(
+            new FileParsePerformers(*pRepository,
+                                    static_cast< ParserInfo& >(*this)) );
+
+    FileCollector::const_iterator iEnd = i_rFiles.End();
+    for ( FileCollector::const_iterator iter = i_rFiles.Begin();
+          iter != iEnd;
+          ++iter )
+    {
+        Cout() << (*iter) << " ..."<< Endl();
+
+        try
+        {
+            pFileParsePerformers->ParseFile(*iter);
+        }
+        catch (X_AutodocParser &)
+        {
+            /// Ignore and goon
+            TheMessages().Out_ParseError(CurFile(), CurLine());
+            pFileParsePerformers
+                = new FileParsePerformers(*pRepository,
+                                          static_cast< ParserInfo& >(*this));
+        }
+        catch (X_Docu & xd)
+        {
+            // Currently thic catches only wrong since tags, while since tags are
+            // transformed. In this case the program shall be terminated.
+            Cerr() << xd << Endl();
+            exit(1);
+        }
+        catch (...)
+        {
+            Cout() << "Unknown error." << Endl();
+            exit(0);
+//          pFileParsePerformers = new FileParsePerformers( *pRepository );
+        }
+    }
+}
+
+FileParsePerformers::FileParsePerformers( ary::Repository & io_rRepository,
+                                          ParserInfo &           io_rParserInfo )
+    :   pTokens(0),
+        aDistributor(io_rRepository, io_rParserInfo),
+        rRepository( io_rRepository ),
+        rParserInfo(io_rParserInfo)
+{
+    DYN csi::dsapi::Context_Docu *
+        dpDocuContext
+            = new csi::dsapi::Context_Docu( aDistributor.DocuTokens_Receiver() );
+    pTokens = new csi::uidl::TokenParser_Uidl( aDistributor.CodeTokens_Receiver(), *dpDocuContext );
+    pFileParseEnvironment
+            = new csi::uidl::PE_File(aDistributor,rParserInfo);
+
+    aDistributor.SetTokenProvider(*pTokens);
+    aDistributor.SetTopParseEnvironment(*pFileParseEnvironment);
+}
+
+void
+FileParsePerformers::ParseFile( const char * i_sFullPath )
+{
+    csv::File aFile(i_sFullPath);
+
+    aFile.open( csv::CFM_READ );
+    csv_assert( aFile.is_open() );
+    aFileLoader.LoadText(aFile);
+    aFile.close();
+
+    rParserInfo.Set_CurFile(i_sFullPath, true); // true = count lines
+    pTokens->Start(aFileLoader);
+    aDistributor.Reset();
+
+    do {
+        aDistributor.TradeToken();
+    } while ( NOT aFileLoader.IsFinished() );
+}
+
+}   // namespace autodoc
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idoc/cx_docu2.cxx b/autodoc/source/parser_i/idoc/cx_docu2.cxx
new file mode 100644
index 000000000000..c39a1aa0f49a
--- /dev/null
+++ b/autodoc/source/parser_i/idoc/cx_docu2.cxx
@@ -0,0 +1,269 @@
+/* -*- 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 <precomp.h>
+#include <s2_dsapi/cx_docu2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <../../parser/inc/tokens/parseinc.hxx>
+#include <s2_dsapi/tokrecv.hxx>
+#include <s2_dsapi/tk_html.hxx>
+#include <s2_dsapi/tk_xml.hxx>
+#include <s2_dsapi/tk_docw2.hxx>
+#include <x_parse2.hxx>
+
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+
+bool
+Cx_Base::PassNewToken()
+{
+    if (pNewToken)
+    {
+        rReceiver.Receive(*pNewToken.Release());
+
+        return true;
+    }
+    return false;
+}
+
+TkpContext &
+Cx_Base::FollowUpContext()
+{
+    csv_assert(pFollowUpContext != 0);
+    return *pFollowUpContext;
+}
+
+void
+Cx_Base::Handle_DocuSyntaxError( CharacterSource & io_rText )
+{
+    // KORR_FUTURE
+    // Put this into Error Log File
+
+    Cerr() << "Error:  Syntax error in documentation within "
+              << "this text:\n\""
+              << io_rText.CutToken()
+              << "\"."
+              << Endl();
+    SetToken( new Tok_Word(io_rText.CurToken()) );
+}
+
+void
+Cx_EoHtml::ReadCharChain( CharacterSource & io_rText )
+{
+    if ( NULCH == jumpTo(io_rText,'>') )
+        throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
+    io_rText.MoveOn();
+    SetToken(new Tok_HtmlTag(io_rText.CutToken(),bToken_IsStartOfParagraph));
+}
+
+void
+Cx_EoXmlConst::ReadCharChain( CharacterSource & io_rText )
+{
+    char c = jumpTo(io_rText,'>','*');
+    if ( NULCH == c OR '*' == c )
+    {
+        Handle_DocuSyntaxError(io_rText);
+        return;
+    }
+
+    io_rText.MoveOn();
+    io_rText.CutToken();
+    SetToken(new Tok_XmlConst(eTokenId));
+}
+
+void
+Cx_EoXmlLink_BeginTag::ReadCharChain( CharacterSource & io_rText )
+{
+    String  sScope;
+    String  sDim;
+
+    do {
+        char cReached = jumpTo(io_rText,'"','>','*');
+        switch (cReached)
+        {
+            case '"':
+            {
+                io_rText.MoveOn();
+                io_rText.CutToken();
+                char c = jumpTo(io_rText,'"','*', '>');
+                if ( NULCH == c OR '*' == c OR '>' == c)
+                {
+                    if ( '>' == c )
+                        io_rText.MoveOn();
+                    Handle_DocuSyntaxError(io_rText);
+                    return;
+                }
+
+                const char * pAttribute = io_rText.CutToken();
+                if ( *pAttribute != '[' )
+                    sScope = pAttribute;
+                else
+                    sDim = pAttribute;
+
+                io_rText.MoveOn();
+                break;
+            }
+            case '>':
+                break;
+            case '*':
+                Handle_DocuSyntaxError(io_rText);
+                return;
+            default:
+                throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
+        }   // end switch
+    }   while ( io_rText.CurChar() != '>' );
+
+    io_rText.MoveOn();
+    io_rText.CutToken();
+    SetToken( new Tok_XmlLink_BeginTag(eTokenId, sScope.c_str(), sDim.c_str()) );
+}
+
+void
+Cx_EoXmlLink_EndTag::ReadCharChain( CharacterSource & io_rText )
+{
+    char c = jumpTo(io_rText,'>','*');
+    if ( NULCH == c OR '*' == c )
+    {
+        Handle_DocuSyntaxError(io_rText);
+        return;
+    }
+
+    io_rText.MoveOn();
+    io_rText.CutToken();
+    SetToken(new Tok_XmlLink_EndTag(eTokenId));
+}
+
+void
+Cx_EoXmlFormat_BeginTag::ReadCharChain( CharacterSource & io_rText )
+{
+    String  sDim;
+
+    char cReached = jumpTo(io_rText,'"','>','*');
+    switch (cReached)
+    {
+        case '"':
+        {
+            io_rText.MoveOn();
+            io_rText.CutToken();
+
+            char c = jumpTo(io_rText,'"','*','>');
+            if ( NULCH == c OR '*' == c OR '>' == c )
+            {
+                if ('>' == c )
+                    io_rText.MoveOn();
+                Handle_DocuSyntaxError(io_rText);
+                return;
+            }
+
+            sDim = io_rText.CutToken();
+
+            c = jumpTo(io_rText,'>','*');
+            if ( NULCH == c OR '*' == c )
+            {
+                Handle_DocuSyntaxError(io_rText);
+                return;
+            }
+            break;
+        }
+        case '>':
+               break;
+        case '*':
+            Handle_DocuSyntaxError(io_rText);
+            return;
+        default:
+            throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
+    }   // end switch
+
+    io_rText.MoveOn();
+    io_rText.CutToken();
+    SetToken(new Tok_XmlFormat_BeginTag(eTokenId, sDim));
+}
+
+void
+Cx_EoXmlFormat_EndTag::ReadCharChain( CharacterSource & io_rText )
+{
+    char c = jumpTo(io_rText,'>','*');
+    if ( NULCH == c OR '*' == c )
+    {
+        Handle_DocuSyntaxError(io_rText);
+        return;
+    }
+
+    io_rText.MoveOn();
+    io_rText.CutToken();
+    SetToken(new Tok_XmlFormat_EndTag(eTokenId));
+}
+
+void
+Cx_CheckStar::ReadCharChain( CharacterSource & io_rText )
+{
+    bEndTokenFound = false;
+    if (bIsEnd)
+    {
+        char cNext = jumpOver(io_rText,'*');
+        if ( NULCH == cNext )
+            throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
+        if (cNext == '/')
+        {
+            io_rText.MoveOn();
+            SetToken(new Tok_DocuEnd);
+            bEndTokenFound = true;
+        }
+        else
+        {
+            SetToken( new Tok_Word(io_rText.CutToken()) );
+        }
+    }
+    else
+    {
+        jumpToWhite(io_rText);
+        SetToken( new Tok_Word(io_rText.CutToken()) );
+    }
+}
+
+TkpContext &
+Cx_CheckStar::FollowUpContext()
+{
+    if (bEndTokenFound)
+        return *pEnd_FollowUpContext;
+    else
+        return Cx_Base::FollowUpContext();
+}
+
+}   // namespace dsapi
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idoc/cx_dsapi.cxx b/autodoc/source/parser_i/idoc/cx_dsapi.cxx
new file mode 100644
index 000000000000..b1cf5fddcc63
--- /dev/null
+++ b/autodoc/source/parser_i/idoc/cx_dsapi.cxx
@@ -0,0 +1,535 @@
+/* -*- 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 <precomp.h>
+#include <s2_dsapi/cx_dsapi.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <x_parse2.hxx>
+#include <tools/tkpchars.hxx>
+#include <s2_dsapi/tk_atag2.hxx>
+#include <s2_dsapi/tk_docw2.hxx>
+#include <s2_dsapi/tk_xml.hxx>
+#include <s2_dsapi/cx_docu2.hxx>
+#include <s2_dsapi/tokrecv.hxx>
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+const intt C_nStatusSize = 128;
+const intt C_nCppInitialNrOfStati = 400;
+
+
+const uintt nF_fin_Error = 1;
+const uintt nF_fin_Ignore = 2;
+const uintt nF_fin_Eof = 3;
+const uintt nF_fin_AnyWord = 4;
+const uintt nF_fin_AtTag = 5;
+const uintt nF_fin_EndSign = 6;
+const uintt nF_goto_EoHtml = 7;
+const uintt nF_goto_EoXmlConst = 8;
+const uintt nF_goto_EoXmlLink_BeginTag = 9;
+const uintt nF_goto_EoXmlLink_EndTag = 10;
+const uintt nF_goto_EoXmlFormat_BeginTag = 11;
+const uintt nF_goto_EoXmlFormat_EndTag = 12;
+const uintt nF_goto_CheckStar = 13;
+const uintt nF_fin_Comma = 14;
+const uintt nF_fin_White = 15;
+
+const UINT16 nTok_at_author = 100 + Tok_AtTag::author;
+const UINT16 nTok_at_see = 100 + Tok_AtTag::see;
+const UINT16 nTok_at_param = 100 + Tok_AtTag::param;
+const UINT16 nTok_at_return = 100 + Tok_AtTag::e_return;
+const UINT16 nTok_at_throws = 100 + Tok_AtTag::e_throw;
+const UINT16 nTok_at_example = 100 + Tok_AtTag::example;
+const UINT16 nTok_at_deprecated = 100 + Tok_AtTag::deprecated;
+const UINT16 nTok_at_suspicious = 100 + Tok_AtTag::suspicious;
+const UINT16 nTok_at_missing = 100 + Tok_AtTag::missing;
+const UINT16 nTok_at_incomplete = 100 + Tok_AtTag::incomplete;
+const UINT16 nTok_at_version = 100 + Tok_AtTag::version;
+const UINT16 nTok_at_guarantees = 100 + Tok_AtTag::guarantees;
+const UINT16 nTok_at_exception = 100 + Tok_AtTag::exception;
+const UINT16 nTok_at_since = 100 + Tok_AtTag::since;
+
+const UINT16 nTok_const_TRUE = 200 + Tok_XmlConst::e_true;
+const UINT16 nTok_const_FALSE = 200 + Tok_XmlConst::e_false;
+const UINT16 nTok_const_NULL = 200 + Tok_XmlConst::e_null;
+const UINT16 nTok_const_void = 200 + Tok_XmlConst::e_void;
+
+const UINT16 nTok_link_typeB = 300 + Tok_XmlLink_BeginTag::type;
+const UINT16 nTok_link_typeE = 325 + Tok_XmlLink_EndTag::type;
+const UINT16 nTok_link_memberB = 300 + Tok_XmlLink_BeginTag::member;
+const UINT16 nTok_link_membeE = 325 + Tok_XmlLink_EndTag::member;
+const UINT16 nTok_link_constB = 300 + Tok_XmlLink_BeginTag::e_const;
+const UINT16 nTok_link_constE = 325 + Tok_XmlLink_EndTag::e_const;
+
+const UINT16 nTok_format_listingB = 350 + Tok_XmlFormat_BeginTag::listing;
+const UINT16 nTok_format_listingE = 375 + Tok_XmlFormat_EndTag::listing;
+const UINT16 nTok_format_codeB = 350 + Tok_XmlFormat_BeginTag::code;
+const UINT16 nTok_format_codeE = 375 + Tok_XmlFormat_EndTag::code;
+const UINT16 nTok_format_atomB = 350 + Tok_XmlFormat_BeginTag::atom;
+const UINT16 nTok_format_atomE = 375 + Tok_XmlFormat_EndTag::atom;
+
+
+const UINT16 nTok_html_parastart = 400;
+
+const UINT16 nTok_MLDocuEnd = 501;
+const UINT16 nTok_EOL = 502;
+
+
+Context_Docu::Context_Docu( Token_Receiver & o_rReceiver )
+    :   aStateMachine(C_nStatusSize, C_nCppInitialNrOfStati),
+        pReceiver(&o_rReceiver),
+        pParentContext(0),
+        pCx_EoHtml(0),
+        pCx_EoXmlConst(0),
+        pCx_EoXmlLink_BeginTag(0),
+        pCx_EoXmlLink_EndTag(0),
+        pCx_EoXmlFormat_BeginTag(0),
+        pCx_EoXmlFormat_EndTag(0),
+        pCx_CheckStar(0),
+        pNewToken(0),
+        pFollowUpContext(0),
+        bIsMultiline(false)
+{
+    pCx_EoHtml = new Cx_EoHtml(o_rReceiver, *this);
+    pCx_EoXmlConst = new Cx_EoXmlConst(o_rReceiver, *this);
+    pCx_EoXmlLink_BeginTag = new Cx_EoXmlLink_BeginTag(o_rReceiver, *this);
+    pCx_EoXmlLink_EndTag = new Cx_EoXmlLink_EndTag(o_rReceiver, *this);
+    pCx_EoXmlFormat_BeginTag = new Cx_EoXmlFormat_BeginTag(o_rReceiver, *this);
+    pCx_EoXmlFormat_EndTag = new Cx_EoXmlFormat_EndTag(o_rReceiver, *this);
+    pCx_CheckStar = new Cx_CheckStar(*pReceiver,*this);
+
+    SetupStateMachine();
+}
+
+void
+Context_Docu::SetParentContext( TkpContext & io_rParentContext,
+                                const char * )
+{
+    pFollowUpContext = pParentContext = &io_rParentContext;
+    pCx_CheckStar->Set_End_FolloUpContext(io_rParentContext);
+}
+
+Context_Docu::~Context_Docu()
+{
+}
+
+void
+Context_Docu::ReadCharChain( CharacterSource & io_rText )
+{
+    csv_assert(pParentContext != 0);
+
+    pNewToken = 0;
+
+    UINT16 nTokenId = 0;
+    StmBoundsStatu2 & rBound = aStateMachine.GetCharChain(nTokenId, io_rText);
+
+    // !!!
+    //   The order of the next two lines is essential, because
+    //   pFollowUpContext may be changed by PerformStatusFunction() also,
+    //   which then MUST override the previous assignment.
+    pFollowUpContext = rBound.FollowUpContext();
+    PerformStatusFunction(rBound.StatusFunctionNr(), nTokenId, io_rText);
+}
+
+bool
+Context_Docu::PassNewToken()
+{
+    if (pNewToken)
+    {
+        pReceiver->Receive(*pNewToken.Release());
+        return true;
+    }
+    return false;
+}
+
+TkpContext &
+Context_Docu::FollowUpContext()
+{
+    csv_assert(pFollowUpContext != 0);
+    return *pFollowUpContext;
+}
+
+void
+Context_Docu::PerformStatusFunction( uintt              i_nStatusSignal,
+                                     UINT16             i_nTokenId,
+                                     CharacterSource &  io_rText )
+{
+    switch (i_nStatusSignal)
+    {
+        case nF_fin_White:
+            io_rText.CutToken();
+            pNewToken = new Tok_White;
+            break;
+        case nF_fin_Error:
+            throw X_AutodocParser(X_AutodocParser::x_InvalidChar);
+            // no break because of throw
+        case nF_fin_Ignore:
+            pNewToken = 0;
+            io_rText.CutToken();
+            break;
+        case nF_fin_Eof:
+            if (bIsMultiline)
+                throw X_AutodocParser(X_AutodocParser::x_UnexpectedEOF);
+            else
+                io_rText.CutToken();
+                pNewToken = new Tok_EOF;
+            break;
+        case nF_fin_AnyWord:
+            pNewToken = new Tok_Word(io_rText.CutToken());
+            break;
+        case nF_fin_AtTag:
+            io_rText.CutToken();
+            pNewToken = new Tok_AtTag( i_nTokenId - 100 );
+            break;
+        case nF_fin_Comma:
+            io_rText.CutToken();
+            pNewToken = new Tok_Comma;
+            break;
+        case nF_fin_EndSign:
+            io_rText.CutToken();
+            switch (i_nTokenId)
+            {
+                case nTok_MLDocuEnd:
+                    if (bIsMultiline)
+                    {
+                        pNewToken = new Tok_DocuEnd;
+                        pFollowUpContext = pParentContext;
+                    }
+                    else
+                    {
+                        pNewToken = new Tok_Word(io_rText.CutToken());
+                        pFollowUpContext = this;
+                    }
+                    break;
+                case nTok_EOL:
+                    if (bIsMultiline)
+                    {
+                        pNewToken = new Tok_EOL;
+                        pFollowUpContext = this;
+                    }
+                    else
+                    {
+                        pNewToken = new Tok_DocuEnd;
+                        pFollowUpContext = pParentContext;
+                    }
+                    pReceiver->Increment_CurLine();
+                    break;
+                default:
+                    csv_assert(false);
+            }
+            break;
+        case nF_goto_EoHtml:
+            pCx_EoHtml->SetIfIsStartOfParagraph(i_nTokenId == nTok_html_parastart);
+            break;
+        case nF_goto_EoXmlConst:
+            pCx_EoXmlConst->SetTokenId(i_nTokenId - 200);
+            break;
+        case nF_goto_EoXmlLink_BeginTag:
+            pCx_EoXmlLink_BeginTag->SetTokenId(i_nTokenId - 300);
+            break;
+        case nF_goto_EoXmlLink_EndTag:
+            pCx_EoXmlLink_EndTag->SetTokenId(i_nTokenId - 325);
+            break;
+        case nF_goto_EoXmlFormat_BeginTag:
+            pCx_EoXmlFormat_BeginTag->SetTokenId(i_nTokenId - 350);
+            break;
+        case nF_goto_EoXmlFormat_EndTag:
+            pCx_EoXmlFormat_EndTag->SetTokenId(i_nTokenId - 375);
+            break;
+        case nF_goto_CheckStar:
+            pCx_CheckStar->SetIsEnd( bIsMultiline );
+            break;
+        default:
+            csv_assert(false);
+    }   // end switch (i_nStatusSignal)
+}
+
+void
+Context_Docu::SetupStateMachine()
+{
+    // Besondere Array-Stati (kein Tokenabschluss oder Kontextwechsel):
+//  const INT16 bas = 0;        // Base-Status
+    const INT16 wht = 1;        // Whitespace-overlook-Status
+    const INT16 awd = 2;        // Any-Word-Read-Status
+
+    // Kontextwechsel-Stati:
+    const INT16 goto_EoHtml = 3;
+    const INT16 goto_EoXmlConst = 4;
+    const INT16 goto_EoXmlLink_BeginTag = 5;
+    const INT16 goto_EoXmlLink_EndTag = 6;
+    const INT16 goto_EoXmlFormat_BeginTag = 7;
+    const INT16 goto_EoXmlFormat_EndTag = 8;
+    const INT16 goto_CheckStar = 9;
+
+    // Tokenfinish-Stati:
+    const INT16 finError = 10;
+//  const INT16 finIgnore = 11;
+    const INT16 finEof = 12;
+    const INT16 finAnyWord = 13;
+    const INT16 finAtTag = 14;
+    const INT16 finEndSign = 15;
+//  const INT16 finComma = 16;
+    const INT16 finWhite = 17;
+
+    // Konstanten zur Benutzung in der Tabelle:
+    const INT16 ght = goto_EoHtml;
+/*
+    const INT16 gxc = goto_EoXmlConst;
+    const INT16 glb = goto_EoXmlLink_TagBegin;
+    const INT16 gle = goto_EoXmlLink_TagEnd;
+    const INT16 gfb = goto_EoXmlFormat_TagBegin;
+    const INT16 gfe = goto_EoXmlFormat_TagEnd;
+*/
+    const INT16 err = finError;
+    const INT16 faw = finAnyWord;
+//  const INT16 fig = finIgnore;
+//  const INT16 fes = finEndSign;
+    const INT16 fof = finEof;
+//  const INT16 fat = finAtTag;
+    const INT16 fwh = finWhite;
+
+    /// The '0's  will be replaced by calls of AddToken().
+
+    const INT16 A_nTopStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fof,err,err,err,err,err,err,err,err,wht,  0,wht,wht,  0,err,err,
+     err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // ... 31
+     wht,awd,awd,awd,awd,awd,awd,awd,awd,awd,  0,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,  0,awd,awd,awd, // ... 63
+       0,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd, // ... 95
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd  // ... 127
+    };
+
+    const INT16 A_nWhitespaceStatus[C_nStatusSize] =
+  //   0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {fof,err,err,err,err,err,err,err,err,wht,fwh,wht,wht,fwh,err,err,
+     err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // ... 31
+     wht,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh, // ... 63
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh, // ... 95
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,
+     fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh  // ... 127
+    };
+
+    const INT16 A_nWordStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {faw,err,err,err,err,err,err,err,err,faw,faw,faw,faw,faw,err,err,
+     err,err,err,err,err,err,err,err,err,err,faw,err,err,err,err,err, // ... 31
+     faw,awd,awd,awd,awd,awd,awd,awd,awd,awd,faw,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,faw,awd,awd,awd, // ... 63
+     faw,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd, // ... 95
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd  // ... 127
+    };
+
+    const INT16 A_nAtTagDefStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {faw,err,err,err,err,err,err,err,err,faw,faw,faw,faw,faw,err,err,
+     err,err,err,err,err,err,err,err,err,err,faw,err,err,err,err,err, // ... 31
+     faw,awd,awd,awd,awd,awd,awd,awd,awd,awd,faw,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,faw,awd,faw,awd,awd,awd, // ... 63
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd, // ... 95
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,
+     awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd,awd  // ... 127
+    };
+
+    const INT16 A_nHtmlDefStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {ght,err,err,err,err,err,err,err,err,ght,ght,ght,ght,ght,err,err,
+     err,err,err,err,err,err,err,err,err,err,ght,err,err,err,err,err, // ... 31
+     ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,
+     ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght, // ... 63
+     ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,
+     ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght, // ... 95
+     ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,
+     ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght  // ... 127
+    };
+
+    const INT16 A_nPunctDefStatus[C_nStatusSize] =
+    //  0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    {err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 16 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 48 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 80 ...
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,
+     err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err  // 112 ...
+    };
+
+    DYN StmArrayStatu2 * dpStatusTop
+            = new StmArrayStatu2( C_nStatusSize, A_nTopStatus, 0, true);
+    DYN StmArrayStatu2 * dpStatusWhite
+            = new StmArrayStatu2( C_nStatusSize, A_nWhitespaceStatus, 0, true);
+    DYN StmArrayStatu2 * dpStatusWord
+            = new StmArrayStatu2( C_nStatusSize, A_nWordStatus, 0, true);
+
+    DYN StmBoundsStatu2 *   dpBst_goto_EoHtml
+            = new StmBoundsStatu2( *this, *pCx_EoHtml, nF_goto_EoHtml, true );
+    DYN StmBoundsStatu2 *   dpBst_goto_EoXmlConst
+            = new StmBoundsStatu2( *this, *pCx_EoXmlConst, nF_goto_EoXmlConst, true );
+    DYN StmBoundsStatu2 *   dpBst_goto_EoXmlLink_BeginTag
+            = new StmBoundsStatu2( *this, *pCx_EoXmlLink_BeginTag, nF_goto_EoXmlLink_BeginTag, true );
+    DYN StmBoundsStatu2 *   dpBst_goto_EoXmlLink_EndTag
+            = new StmBoundsStatu2( *this, *pCx_EoXmlLink_EndTag, nF_goto_EoXmlLink_EndTag, true );
+    DYN StmBoundsStatu2 *   dpBst_goto_EoXmlFormat_BeginTag
+            = new StmBoundsStatu2( *this, *pCx_EoXmlFormat_BeginTag, nF_goto_EoXmlFormat_BeginTag, true );
+    DYN StmBoundsStatu2 *   dpBst_goto_EoXmlFormat_EndTag
+            = new StmBoundsStatu2( *this, *pCx_EoXmlFormat_EndTag, nF_goto_EoXmlFormat_EndTag, true );
+    DYN StmBoundsStatu2 *   dpBst_goto_CheckStar
+            = new StmBoundsStatu2( *this, *pCx_CheckStar, nF_goto_CheckStar, true );
+
+
+    DYN StmBoundsStatu2 *   dpBst_finError
+            = new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_Error, true );
+    DYN StmBoundsStatu2 *   dpBst_finIgnore
+            = new StmBoundsStatu2( *this, *this, nF_fin_Ignore, true);
+    DYN StmBoundsStatu2 *   dpBst_finEof
+            = new StmBoundsStatu2(  *this, TkpContext_Null2_(), nF_fin_Eof, false);
+    DYN StmBoundsStatu2 *   dpBst_finAnyWord
+            = new StmBoundsStatu2( *this, *this, nF_fin_AnyWord, true);
+    DYN StmBoundsStatu2 *   dpBst_finAtTag
+            = new StmBoundsStatu2( *this, *this, nF_fin_AtTag, false);
+    DYN StmBoundsStatu2 *   dpBst_finEndSign
+            = new StmBoundsStatu2( *this, *pParentContext, nF_fin_EndSign, false);
+    DYN StmBoundsStatu2 *   dpBst_fin_Comma
+            = new StmBoundsStatu2( *this, *this, nF_fin_Comma, false );
+    DYN StmBoundsStatu2 *   dpBst_finWhite
+            = new StmBoundsStatu2( *this, *this, nF_fin_White, false);
+
+
+    // dpMain aufbauen:
+    aStateMachine.AddStatus(dpStatusTop);
+    aStateMachine.AddStatus(dpStatusWhite);
+    aStateMachine.AddStatus(dpStatusWord);
+
+    aStateMachine.AddStatus(dpBst_goto_EoHtml);
+    aStateMachine.AddStatus(dpBst_goto_EoXmlConst);
+    aStateMachine.AddStatus(dpBst_goto_EoXmlLink_BeginTag);
+    aStateMachine.AddStatus(dpBst_goto_EoXmlLink_EndTag);
+    aStateMachine.AddStatus(dpBst_goto_EoXmlFormat_BeginTag);
+    aStateMachine.AddStatus(dpBst_goto_EoXmlFormat_EndTag);
+    aStateMachine.AddStatus(dpBst_goto_CheckStar);
+
+    aStateMachine.AddStatus(dpBst_finError);
+    aStateMachine.AddStatus(dpBst_finIgnore);
+    aStateMachine.AddStatus(dpBst_finEof);
+    aStateMachine.AddStatus(dpBst_finAnyWord);
+    aStateMachine.AddStatus(dpBst_finAtTag);
+    aStateMachine.AddStatus(dpBst_finEndSign);
+    aStateMachine.AddStatus(dpBst_fin_Comma);
+    aStateMachine.AddStatus(dpBst_finWhite);
+
+
+    aStateMachine.AddToken( "@author",  nTok_at_author,      A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@param",   nTok_at_param,       A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@throws",  nTok_at_throws,      A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@see",     nTok_at_see,         A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@since",   nTok_at_since,       A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@example", nTok_at_example,     A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@return",  nTok_at_return,      A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@returns", nTok_at_return,      A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@deprecated",
+                                        nTok_at_deprecated,  A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@suspicious",
+                                        nTok_at_suspicious,  A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@missing", nTok_at_missing,     A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@incomplete",
+                                        nTok_at_incomplete,  A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@version", nTok_at_version,     A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@guarantees",
+                                        nTok_at_guarantees,  A_nAtTagDefStatus, finAtTag );
+    aStateMachine.AddToken( "@exception",
+                                        nTok_at_exception,   A_nAtTagDefStatus, finAtTag );
+
+    aStateMachine.AddToken( "<",        0,                   A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "*",        0,                   A_nPunctDefStatus, goto_CheckStar );
+//  aStateMachine.AddToken( ",",        0,                   A_nPunctDefStatus, finComma );
+
+    aStateMachine.AddToken( "<type",    nTok_link_typeB,     A_nHtmlDefStatus,  goto_EoXmlLink_BeginTag );
+    aStateMachine.AddToken( "</type",   nTok_link_typeE,     A_nHtmlDefStatus,  goto_EoXmlLink_EndTag );
+    aStateMachine.AddToken( "<member",  nTok_link_memberB,   A_nHtmlDefStatus,  goto_EoXmlLink_BeginTag );
+    aStateMachine.AddToken( "</member", nTok_link_membeE,    A_nHtmlDefStatus,  goto_EoXmlLink_EndTag );
+    aStateMachine.AddToken( "<const",   nTok_link_constB,    A_nHtmlDefStatus,  goto_EoXmlLink_BeginTag );
+    aStateMachine.AddToken( "</const",  nTok_link_constE,    A_nHtmlDefStatus,  goto_EoXmlLink_EndTag );
+
+    aStateMachine.AddToken( "<listing", nTok_format_listingB,A_nHtmlDefStatus,  goto_EoXmlFormat_BeginTag );
+    aStateMachine.AddToken( "</listing",nTok_format_listingE,A_nHtmlDefStatus,  goto_EoXmlFormat_EndTag );
+    aStateMachine.AddToken( "<code",    nTok_format_codeB,   A_nHtmlDefStatus,  goto_EoXmlFormat_BeginTag  );
+    aStateMachine.AddToken( "</code",   nTok_format_codeE,   A_nHtmlDefStatus,  goto_EoXmlFormat_EndTag );
+    aStateMachine.AddToken( "<atom",    nTok_format_atomB,   A_nHtmlDefStatus,  goto_EoXmlFormat_BeginTag  );
+    aStateMachine.AddToken( "</atom",   nTok_format_atomE,   A_nHtmlDefStatus,  goto_EoXmlFormat_EndTag );
+
+    aStateMachine.AddToken( "<TRUE/",   nTok_const_TRUE,     A_nHtmlDefStatus,  goto_EoXmlConst );
+    aStateMachine.AddToken( "<true/",   nTok_const_TRUE,     A_nHtmlDefStatus,  goto_EoXmlConst );
+    aStateMachine.AddToken( "<FALSE/",  nTok_const_FALSE,    A_nHtmlDefStatus,  goto_EoXmlConst );
+    aStateMachine.AddToken( "<false/",  nTok_const_FALSE,    A_nHtmlDefStatus,  goto_EoXmlConst );
+    aStateMachine.AddToken( "<NULL/",   nTok_const_NULL,     A_nHtmlDefStatus,  goto_EoXmlConst );
+    aStateMachine.AddToken( "<void/",   nTok_const_void,     A_nHtmlDefStatus,  goto_EoXmlConst );
+
+    aStateMachine.AddToken( "<p",       nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<pre",     nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<dl",      nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<ul",      nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<ol",      nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<table",   nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<P",       nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<PRE",     nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<DL",      nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<UL",      nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<OL",      nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+    aStateMachine.AddToken( "<TABLE",   nTok_html_parastart, A_nHtmlDefStatus,  goto_EoHtml );
+
+    aStateMachine.AddToken( "\r\n",     nTok_EOL,            A_nPunctDefStatus, finEndSign );
+    aStateMachine.AddToken( "\n",       nTok_EOL,            A_nPunctDefStatus, finEndSign );
+    aStateMachine.AddToken( "\r",       nTok_EOL,            A_nPunctDefStatus, finEndSign );
+};
+
+void
+Context_Docu::SetMode_IsMultiLine( bool i_bTrue )
+{
+    bIsMultiline = i_bTrue;
+}
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idoc/docu_pe2.cxx b/autodoc/source/parser_i/idoc/docu_pe2.cxx
new file mode 100644
index 000000000000..2f1af7f68ba3
--- /dev/null
+++ b/autodoc/source/parser_i/idoc/docu_pe2.cxx
@@ -0,0 +1,694 @@
+/* -*- 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 <precomp.h>
+#include <s2_dsapi/docu_pe2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cctype>
+#include <ary/doc/d_oldidldocu.hxx>
+#include <ary_i/d_token.hxx>
+#include <parser/parserinfo.hxx>
+#include <adc_cl.hxx>
+#include <adc_msg.hxx>
+#include <../parser/inc/x_docu.hxx>
+#include <s2_dsapi/dsapitok.hxx>
+#include <s2_dsapi/tk_atag2.hxx>
+#include <s2_dsapi/tk_html.hxx>
+#include <s2_dsapi/tk_docw2.hxx>
+#include <s2_dsapi/tk_xml.hxx>
+
+
+#ifdef UNX
+#define strnicmp strncasecmp
+#endif
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+const char *        AtTagTitle(
+                        const Tok_AtTag &   i_rToken );
+
+
+SapiDocu_PE::SapiDocu_PE(ParserInfo & io_rPositionInfo)
+    :   pDocu(0),
+        eState(e_none),
+        pPositionInfo(&io_rPositionInfo),
+        fCurTokenAddFunction(&SapiDocu_PE::AddDocuToken2Void),
+        pCurAtTag(0),
+        sCurDimAttribute(),
+        sCurAtSeeType_byXML(200)
+{
+}
+
+SapiDocu_PE::~SapiDocu_PE()
+{
+}
+
+void
+SapiDocu_PE::ProcessToken( DYN csi::dsapi::Token & let_drToken )
+{
+    if (IsComplete())
+    {
+        pDocu = 0;
+        eState = e_none;
+    }
+
+    if ( eState == e_none )
+    {
+        pDocu = new ary::doc::OldIdlDocu;
+        eState = st_short;
+        fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2Short;
+    }
+
+    csv_assert(pDocu);
+
+    let_drToken.Trigger(*this);
+    delete &let_drToken;
+}
+
+void
+SapiDocu_PE::Process_AtTag( const Tok_AtTag & i_rToken )
+{
+    if (NOT pCurAtTag)
+    {
+        eState = st_attags;
+        fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2CurAtTag;
+    }
+    else
+    {
+        csv_assert(eState == st_attags);
+        pDocu->AddAtTag(*pCurAtTag.Release());
+    }
+
+    if (i_rToken.Id() == Tok_AtTag::param)
+    {
+        pCurAtTag = new DT_ParameterAtTag;
+        fCurTokenAddFunction = &SapiDocu_PE::SetCurParameterAtTagName;
+    }
+    else if (i_rToken.Id() == Tok_AtTag::see)
+    {
+        pCurAtTag = new DT_SeeAlsoAtTag;
+        fCurTokenAddFunction = &SapiDocu_PE::SetCurSeeAlsoAtTagLinkText;
+    }
+    else if (i_rToken.Id() == Tok_AtTag::deprecated)
+    {
+        pDocu->SetDeprecated();
+        pCurAtTag = new DT_StdAtTag("");    // Dummy that will not be used.
+        fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2Deprecated;
+    }
+    else if (i_rToken.Id() == Tok_AtTag::since)
+    {
+        pCurAtTag = new DT_SinceAtTag;
+        fCurTokenAddFunction = &SapiDocu_PE::SetCurSinceAtTagVersion_OOo;
+    }
+    else
+    {
+        pCurAtTag = new DT_StdAtTag( AtTagTitle(i_rToken) );
+        fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2CurAtTag;
+    }
+}
+
+void
+SapiDocu_PE::Process_HtmlTag( const Tok_HtmlTag & i_rToken )
+{
+    if (eState == st_short AND i_rToken.IsParagraphStarter())
+    {
+        eState = st_description;
+        fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2Description;
+    }
+
+    // Workaround special for some errors in API docu:
+    if ( strnicmp("<true",i_rToken.Text(),5 ) == 0 )
+    {
+        if ( strcmp("<TRUE/>",i_rToken.Text()) != 0 )
+            TheMessages().Out_InvalidConstSymbol( i_rToken.Text(),
+                                              pPositionInfo->CurFile(),
+                                              pPositionInfo->CurLine() );
+        (this->*fCurTokenAddFunction)( *new DT_TextToken("<b>true</b>") );
+        return;
+    }
+    else if ( strnicmp("<false",i_rToken.Text(),6 ) == 0 )
+    {
+        if ( strcmp("<FALSE/>",i_rToken.Text()) != 0 )
+            TheMessages().Out_InvalidConstSymbol( i_rToken.Text(),
+                                              pPositionInfo->CurFile(),
+                                              pPositionInfo->CurLine() );
+        (this->*fCurTokenAddFunction)( *new DT_TextToken("<b>false</b>") );
+        return;
+    }
+    else if ( strnicmp("<NULL",i_rToken.Text(),5 ) == 0 )
+    {
+        if ( strcmp("<NULL/>",i_rToken.Text()) != 0 )
+            TheMessages().Out_InvalidConstSymbol( i_rToken.Text(),
+                                              pPositionInfo->CurFile(),
+                                              pPositionInfo->CurLine() );
+        (this->*fCurTokenAddFunction)( *new DT_TextToken("<b>null</b>") );
+        return;
+    }
+    else if ( strnicmp("<void",i_rToken.Text(),5 ) == 0 )
+    {
+        if ( strcmp("<void/>",i_rToken.Text()) != 0 )
+            TheMessages().Out_InvalidConstSymbol( i_rToken.Text(),
+                                              pPositionInfo->CurFile(),
+                                              pPositionInfo->CurLine() );
+        (this->*fCurTokenAddFunction)( *new DT_TextToken("<b>void</b>") );
+        return;
+    }
+
+    (this->*fCurTokenAddFunction)( *new DT_Style(i_rToken.Text(),false) );
+}
+
+void
+SapiDocu_PE::Process_XmlConst( const Tok_XmlConst & i_rToken )
+{
+    (this->*fCurTokenAddFunction)(*new DT_MupConst(i_rToken.Text()));
+}
+
+void
+SapiDocu_PE::Process_XmlLink_BeginTag( const Tok_XmlLink_BeginTag & i_rToken )
+{
+    switch (i_rToken.Id())
+    {
+        case Tok_XmlLink_Tag::e_const:
+            (this->*fCurTokenAddFunction)(*new DT_Style("<b>",false));
+            break;
+        case Tok_XmlLink_Tag::member:
+            (this->*fCurTokenAddFunction)(*new DT_MupMember(i_rToken.Scope()));
+            break;
+        case Tok_XmlLink_Tag::type:
+            (this->*fCurTokenAddFunction)(*new DT_MupType(i_rToken.Scope()));
+            break;
+        default:
+            //  Do nothing.
+            ;
+    }
+
+    if ( i_rToken.Dim().length() > 0 )
+        sCurDimAttribute = i_rToken.Dim();
+    else
+        sCurDimAttribute.clear();
+}
+
+void
+SapiDocu_PE::Process_XmlLink_EndTag( const Tok_XmlLink_EndTag & i_rToken )
+{
+    switch (i_rToken.Id())
+    {
+        case Tok_XmlLink_Tag::e_const:
+            (this->*fCurTokenAddFunction)(*new DT_Style("</b>",false));
+            break;
+        case Tok_XmlLink_Tag::member:
+            (this->*fCurTokenAddFunction)(*new DT_MupMember(true));
+            break;
+        case Tok_XmlLink_Tag::type:
+            (this->*fCurTokenAddFunction)(*new DT_MupType(true));
+            break;
+        default:
+            //  Do nothing.
+            ;
+    }
+    if ( sCurDimAttribute.length() > 0 )
+    {
+        (this->*fCurTokenAddFunction)( *new DT_TextToken(sCurDimAttribute.c_str()) );
+        sCurDimAttribute.clear();
+    }
+}
+
+void
+SapiDocu_PE::Process_XmlFormat_BeginTag( const Tok_XmlFormat_BeginTag & i_rToken )
+{
+    switch (i_rToken.Id())
+    {
+        case Tok_XmlFormat_Tag::code:
+            (this->*fCurTokenAddFunction)(*new DT_Style("<code>",false));
+            break;
+        case Tok_XmlFormat_Tag::listing:
+            (this->*fCurTokenAddFunction)(*new DT_Style("<pre>",true));
+            break;
+        case Tok_XmlFormat_Tag::atom:
+            (this->*fCurTokenAddFunction)(*new DT_Style("<code>",true));
+            break;
+        default:
+            //  Do nothing.
+            ;
+    }
+    if ( i_rToken.Dim().length() > 0 )
+        sCurDimAttribute = i_rToken.Dim();
+    else
+        sCurDimAttribute.clear();
+}
+
+void
+SapiDocu_PE::Process_XmlFormat_EndTag( const Tok_XmlFormat_EndTag & i_rToken )
+{
+    switch (i_rToken.Id())
+    {
+        case Tok_XmlFormat_Tag::code:
+            (this->*fCurTokenAddFunction)(*new DT_Style("</code>",false));
+            break;
+        case Tok_XmlFormat_Tag::listing:
+            (this->*fCurTokenAddFunction)(*new DT_Style("</pre>",true));
+            break;
+        case Tok_XmlFormat_Tag::atom:
+            (this->*fCurTokenAddFunction)(*new DT_Style("</code>",true));
+            break;
+        default:
+            //  Do nothing.
+            ;
+    }
+    if ( sCurDimAttribute.length() > 0 )
+    {
+        (this->*fCurTokenAddFunction)( *new DT_TextToken(sCurDimAttribute.c_str()) );
+        sCurDimAttribute.clear();
+    }
+}
+
+void
+SapiDocu_PE::Process_Word( const Tok_Word & i_rToken )
+{
+    (this->*fCurTokenAddFunction)(*new DT_TextToken(i_rToken.Text()));
+}
+
+void
+SapiDocu_PE::Process_Comma()
+{
+    csv_assert(1==7);
+//  (this->*fCurTokenAddFunction)(*new DT_Comma(i_rToken.Text()));
+}
+
+void
+SapiDocu_PE::Process_DocuEnd()
+{
+    eState = st_complete;
+    if (pCurAtTag)
+        pDocu->AddAtTag(*pCurAtTag.Release());
+    fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2Void;
+}
+
+void
+SapiDocu_PE::Process_EOL()
+{
+    (this->*fCurTokenAddFunction)(*new DT_EOL);
+}
+
+void
+SapiDocu_PE::Process_White()
+{
+    (this->*fCurTokenAddFunction)(*new DT_White);
+}
+
+DYN ary::doc::OldIdlDocu *
+SapiDocu_PE::ReleaseJustParsedDocu()
+{
+    if (IsComplete())
+    {
+        eState = e_none;
+        return pDocu.Release();
+    }
+    return 0;
+}
+
+
+bool
+SapiDocu_PE::IsComplete() const
+{
+    return eState == st_complete;
+}
+
+void
+SapiDocu_PE::AddDocuToken2Void( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    delete &let_drNewToken;
+}
+
+void
+SapiDocu_PE::AddDocuToken2Short( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pDocu);
+    pDocu->AddToken2Short(let_drNewToken);
+}
+
+void
+SapiDocu_PE::AddDocuToken2Description( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pDocu);
+    pDocu->AddToken2Description(let_drNewToken);
+}
+
+void
+SapiDocu_PE::AddDocuToken2Deprecated( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pDocu);
+    pDocu->AddToken2DeprecatedText(let_drNewToken);
+}
+
+void
+SapiDocu_PE::AddDocuToken2CurAtTag( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pCurAtTag);
+    pCurAtTag->AddToken(let_drNewToken);
+}
+
+void
+SapiDocu_PE::SetCurParameterAtTagName( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    if (let_drNewToken.IsWhiteOnly())
+    {
+        delete &let_drNewToken;
+        return;
+    }
+
+    csv_assert(pCurAtTag);
+    DT_TextToken * dpText = dynamic_cast< DT_TextToken* >(&let_drNewToken);
+    if (dpText != 0)
+        pCurAtTag->SetName(dpText->GetText());
+    else
+        pCurAtTag->SetName("parameter ?");
+    delete &let_drNewToken;
+    fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2CurAtTag;
+}
+
+void
+SapiDocu_PE::SetCurSeeAlsoAtTagLinkText( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pCurAtTag);
+
+    if (let_drNewToken.IsWhiteOnly())
+    {
+        delete &let_drNewToken;
+        return;
+    }
+
+    DT_TextToken * pText = dynamic_cast< DT_TextToken* >(&let_drNewToken);
+    if (pText != 0)
+        pCurAtTag->SetName(pText->GetText());
+    else
+    {
+        DT_MupType *
+            pTypeBegin = dynamic_cast< DT_MupType* >(&let_drNewToken);
+        DT_MupMember *
+            pMemberBegin = dynamic_cast< DT_MupMember* >(&let_drNewToken);
+        if (pTypeBegin != 0 OR pMemberBegin != 0)
+        {
+            sCurAtSeeType_byXML.reset();
+
+            sCurAtSeeType_byXML
+                << ( pTypeBegin != 0
+                        ?   pTypeBegin->Scope()
+                        :   pMemberBegin->Scope() );
+
+            if (sCurAtSeeType_byXML.tellp() > 0)
+            {
+                sCurAtSeeType_byXML
+                    << "::";
+            }
+            delete &let_drNewToken;
+            fCurTokenAddFunction = &SapiDocu_PE::SetCurSeeAlsoAtTagLinkText_2;
+            return;
+        }
+        else
+        {
+            pCurAtTag->SetName("? (no identifier found)");
+        }
+    }
+    delete &let_drNewToken;
+    fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2CurAtTag;
+}
+
+void
+SapiDocu_PE::SetCurSeeAlsoAtTagLinkText_2( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pCurAtTag);
+
+    if (let_drNewToken.IsWhiteOnly())
+    {
+        delete &let_drNewToken;
+        return;
+    }
+
+    DT_TextToken *
+        pText = dynamic_cast< DT_TextToken* >(&let_drNewToken);
+    if (pText != 0)
+    {
+        sCurAtSeeType_byXML
+            << pText->GetText();
+        pCurAtTag->SetName(sCurAtSeeType_byXML.c_str());
+    }
+    else
+    {
+        pCurAtTag->SetName("? (no identifier found)");
+    }
+    sCurAtSeeType_byXML.reset();
+    delete &let_drNewToken;
+    fCurTokenAddFunction = &SapiDocu_PE::SetCurSeeAlsoAtTagLinkText_3;
+}
+
+void
+SapiDocu_PE::SetCurSeeAlsoAtTagLinkText_3( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pCurAtTag);
+
+    if (let_drNewToken.IsWhiteOnly())
+    {
+        delete &let_drNewToken;
+        return;
+    }
+
+    /// Could emit warning, but don't because this parser is obsolete.
+//  Tok_XmlLink_BeginTag *
+//      pLinkEnd = dynamic_cast< Tok_XmlLink_EndTag* >(&let_drNewToken);
+//  if (pLinkEnd == 0)
+//  {
+//      warn_aboutMissingClosingTag();
+//  }
+
+    delete &let_drNewToken;
+    fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2CurAtTag;
+}
+
+const String
+    C_sSinceFormat("Correct version format: \"OOo <major>.<minor>[.<micro> if micro is not 0]\".");
+
+void
+SapiDocu_PE::SetCurSinceAtTagVersion_OOo( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pCurAtTag);
+
+    DT_TextToken * pToken = dynamic_cast< DT_TextToken* >(&let_drNewToken);
+    if (pToken == 0)
+    {
+        delete &let_drNewToken;
+        return;
+    }
+
+    const String
+        sVersion(pToken->GetText());
+    if (NOT CheckVersionSyntax_OOo(sVersion))
+    {
+        Cerr() << "Version information in @since tag has incorrect format.\n"
+               << "Found: \"" << sVersion << "\"\n"
+               << C_sSinceFormat
+               << Endl();
+        exit(1);
+    }
+
+    const autodoc::CommandLine &
+        rCommandLine = autodoc::CommandLine::Get_();
+    if (NOT rCommandLine.DoesTransform_SinceTag())
+        pCurAtTag->AddToken(let_drNewToken);
+
+    fCurTokenAddFunction = &SapiDocu_PE::SetCurSinceAtTagVersion_Number;
+}
+
+void
+SapiDocu_PE::SetCurSinceAtTagVersion_Number( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pCurAtTag);
+
+    DT_TextToken * pToken = dynamic_cast< DT_TextToken* >(&let_drNewToken);
+    if (pToken == 0)
+    {
+        if (dynamic_cast< DT_White* >(&let_drNewToken) != 0)
+        {
+            String &
+                sValue = pCurAtTag->Access_Text().Access_TextOfFirstToken();
+            StreamLock
+                sHelp(1000);
+            sValue = sHelp() << sValue << " " << c_str;
+        }
+
+        delete &let_drNewToken;
+        return;
+    }
+
+    const String
+        sVersion(pToken->GetText());
+    if (NOT CheckVersionSyntax_Number(sVersion))
+    {
+        Cerr() << "Version information in @since tag has incorrect format.\n"
+               << "Found: \"" << sVersion << "\"\n"
+               << C_sSinceFormat
+               << Endl();
+        exit(1);
+    }
+
+    const autodoc::CommandLine &
+        rCommandLine = autodoc::CommandLine::Get_();
+    if ( rCommandLine.DoesTransform_SinceTag())
+    {
+        pCurAtTag->AddToken(let_drNewToken);
+
+        if (rCommandLine.DisplayOf_SinceTagValue(sVersion).empty())
+        {
+            // This is the numbered part, but we don't know it.
+            delete &let_drNewToken;
+
+            StreamLock
+                sl(200);
+            sl()
+                << "Since-value '"
+                << sVersion
+                << "' not found in translation table.";
+            throw X_Docu("since", sl().c_str());
+        }
+    }
+    else
+    {
+        AddDocuToken2SinceAtTag(let_drNewToken);
+    }
+    fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2SinceAtTag;
+}
+
+void
+SapiDocu_PE::AddDocuToken2SinceAtTag( DYN ary::inf::DocuToken & let_drNewToken )
+{
+    csv_assert(pCurAtTag);
+    String &
+        sValue = pCurAtTag->Access_Text().Access_TextOfFirstToken();
+    StreamLock
+        sHelp(1000);
+
+    DT_TextToken *
+        pToken = dynamic_cast< DT_TextToken* >(&let_drNewToken);
+    if (pToken != 0)
+    {
+        sValue = sHelp() << sValue << pToken->GetText() << c_str;
+    }
+    else if (dynamic_cast< DT_White* >(&let_drNewToken) != 0)
+    {
+        sValue = sHelp() << sValue << " " << c_str;
+    }
+      delete &let_drNewToken;
+}
+
+bool
+SapiDocu_PE::CheckVersionSyntax_OOo(const String & i_versionPart1)
+{
+    return      i_versionPart1 == "OOo"
+            OR  i_versionPart1 == "OpenOffice.org";
+}
+
+bool
+SapiDocu_PE::CheckVersionSyntax_Number(const String & i_versionPart2)
+{
+    if (i_versionPart2.length () == 0)
+        return false;
+
+    const char
+        pt = '.';
+    unsigned int countDigit = 0;
+    unsigned int countPoint = 0;
+    const char *
+        pFirstPoint = 0;
+    const char *
+        pLastPoint = 0;
+
+    for ( const char * p = i_versionPart2.begin();
+          *p != 0;
+          ++p )
+    {
+        if ( std::isdigit(*p) )
+            ++countDigit;
+        else if (*p == pt)
+        {
+            if (countPoint == 0)
+                pFirstPoint = p;
+            pLastPoint = p;
+            ++countPoint;
+        }
+    }
+
+    if (    countDigit + countPoint == i_versionPart2.length()         // only digits and points
+        AND pFirstPoint != 0 AND countPoint < 3                         // 1 or 2 points
+        AND pFirstPoint + 1 != pLastPoint                               // there are digits between two points
+        AND *i_versionPart2.begin() != pt AND *(pLastPoint + 1) != 0    // points are surrounded by digits
+        AND (*(pLastPoint + 1) != '0' OR pLastPoint == pFirstPoint) )   // the first micro-digit is not 0
+    {
+        return true;
+    }
+    return false;
+}
+
+const char *
+AtTagTitle( const Tok_AtTag & i_rToken )
+{
+    switch (i_rToken.Id())
+    {
+        case Tok_AtTag::author:     return "";
+        case Tok_AtTag::see:        return "See also";
+        case Tok_AtTag::param:      return "Parameters";
+        case Tok_AtTag::e_return:   return "Returns";
+        case Tok_AtTag::e_throw:    return "Throws";
+        case Tok_AtTag::example:    return "Example";
+        case Tok_AtTag::deprecated: return "Deprecated";
+        case Tok_AtTag::suspicious: return "";
+        case Tok_AtTag::missing:    return "";
+        case Tok_AtTag::incomplete: return "";
+        case Tok_AtTag::version:    return "";
+        case Tok_AtTag::guarantees: return "Guarantees";
+        case Tok_AtTag::exception:  return "Exception";
+        case Tok_AtTag::since:      return "Since version";
+        default:
+            //  See below.
+            ;
+    }
+    return i_rToken.Text();
+}
+
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idoc/makefile.mk b/autodoc/source/parser_i/idoc/makefile.mk
new file mode 100644
index 000000000000..c4e760bd2973
--- /dev/null
+++ b/autodoc/source/parser_i/idoc/makefile.mk
@@ -0,0 +1,62 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=autodoc
+TARGET=parser2_s2_dsapi
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/cx_docu2.obj	\
+    $(OBJ)$/cx_dsapi.obj	\
+    $(OBJ)$/docu_pe2.obj	\
+    $(OBJ)$/tk_atag2.obj  	\
+    $(OBJ)$/tk_docw2.obj   	\
+    $(OBJ)$/tk_html.obj   	\
+    $(OBJ)$/tk_xml.obj
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/parser_i/idoc/tk_atag2.cxx b/autodoc/source/parser_i/idoc/tk_atag2.cxx
new file mode 100644
index 000000000000..30264f68f1f0
--- /dev/null
+++ b/autodoc/source/parser_i/idoc/tk_atag2.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_dsapi/tk_atag2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <s2_dsapi/tokintpr.hxx>
+
+
+
+using csi::dsapi::Tok_AtTag;
+
+lux::EnumValueMap   G_aTokAtTag_EV_TokenId_Values;
+Tok_AtTag::EV_TokenId ev_none2(Tok_AtTag::e_none,"");
+Tok_AtTag::EV_TokenId ev_author(Tok_AtTag::author,"@author");
+Tok_AtTag::EV_TokenId ev_see(Tok_AtTag::see,"@see");
+Tok_AtTag::EV_TokenId ev_param(Tok_AtTag::param,"@param");
+Tok_AtTag::EV_TokenId ev_e_return(Tok_AtTag::e_return,"@return");
+Tok_AtTag::EV_TokenId ev_e_throw(Tok_AtTag::e_throw,"@throws");
+Tok_AtTag::EV_TokenId ev_example(Tok_AtTag::example,"@example");
+Tok_AtTag::EV_TokenId ev_deprecated(Tok_AtTag::deprecated,"@deprecated");
+Tok_AtTag::EV_TokenId ev_suspicious(Tok_AtTag::suspicious,"@suspicious");
+Tok_AtTag::EV_TokenId ev_missing(Tok_AtTag::missing,"@missing");
+Tok_AtTag::EV_TokenId ev_incomplete(Tok_AtTag::incomplete,"@incomplete");
+Tok_AtTag::EV_TokenId ev_version(Tok_AtTag::version,"@version");
+Tok_AtTag::EV_TokenId ev_guarantees(Tok_AtTag::guarantees,"@guarantees");
+Tok_AtTag::EV_TokenId ev_exception(Tok_AtTag::exception,"@exception");
+Tok_AtTag::EV_TokenId ev_since(Tok_AtTag::since,"@since");
+
+
+namespace lux
+{
+template<> EnumValueMap &
+Tok_AtTag::EV_TokenId::Values_()    { return G_aTokAtTag_EV_TokenId_Values; }
+}
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+void
+Tok_AtTag::Trigger( TokenInterpreter &  io_rInterpreter ) const
+{
+    io_rInterpreter.Process_AtTag(*this);
+}
+
+const char *
+Tok_AtTag::Text() const
+{
+    return eTag.Text();
+}
+
+}   // namespace dsapi
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idoc/tk_docw2.cxx b/autodoc/source/parser_i/idoc/tk_docw2.cxx
new file mode 100644
index 000000000000..097214a9c838
--- /dev/null
+++ b/autodoc/source/parser_i/idoc/tk_docw2.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <s2_dsapi/tk_docw2.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <s2_dsapi/tokintpr.hxx>
+
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+void
+Tok_Word::Trigger( TokenInterpreter &   io_rInterpreter ) const
+{
+    io_rInterpreter.Process_Word(*this);
+}
+
+const char *
+Tok_Word::Text() const
+{
+    return sText;
+}
+
+void
+Tok_Comma::Trigger( TokenInterpreter &  io_rInterpreter ) const
+{
+    io_rInterpreter.Process_Comma();
+}
+
+const char *
+Tok_Comma::Text() const
+{
+    return ",";
+}
+
+void
+Tok_DocuEnd::Trigger( TokenInterpreter &    io_rInterpreter ) const
+{
+    io_rInterpreter.Process_DocuEnd();
+}
+
+const char *
+Tok_DocuEnd::Text() const
+{
+    return "*/";
+}
+
+void
+Tok_EOL::Trigger( TokenInterpreter &    io_rInterpreter ) const
+{
+    io_rInterpreter.Process_EOL();
+}
+
+const char *
+Tok_EOL::Text() const
+{
+    return "\r\n";
+}
+
+void
+Tok_EOF::Trigger( TokenInterpreter & ) const
+{
+    csv_assert(false);
+}
+
+const char *
+Tok_EOF::Text() const
+{
+    return "";
+}
+
+void
+Tok_White::Trigger( TokenInterpreter &  io_rInterpreter ) const
+{
+    io_rInterpreter.Process_White();
+}
+
+const char *
+Tok_White::Text() const
+{
+    return " ";
+}
+
+
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idoc/tk_html.cxx b/autodoc/source/parser_i/idoc/tk_html.cxx
new file mode 100644
index 000000000000..d26720bd9b0d
--- /dev/null
+++ b/autodoc/source/parser_i/idoc/tk_html.cxx
@@ -0,0 +1,60 @@
+/* -*- 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 <precomp.h>
+#include <s2_dsapi/tk_html.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <s2_dsapi/tokintpr.hxx>
+
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+void
+Tok_HtmlTag::Trigger( TokenInterpreter &    io_rInterpreter ) const
+{
+    io_rInterpreter.Process_HtmlTag(*this);
+}
+
+const char *
+Tok_HtmlTag::Text() const
+{
+    return sTag;
+}
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/idoc/tk_xml.cxx b/autodoc/source/parser_i/idoc/tk_xml.cxx
new file mode 100644
index 000000000000..a1f60d0ef98a
--- /dev/null
+++ b/autodoc/source/parser_i/idoc/tk_xml.cxx
@@ -0,0 +1,176 @@
+/* -*- 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 <precomp.h>
+#include <s2_dsapi/tk_xml.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <s2_dsapi/tokintpr.hxx>
+
+using csi::dsapi::Tok_XmlConst;
+using csi::dsapi::Tok_XmlLink_Tag;
+using csi::dsapi::Tok_XmlFormat_Tag;
+
+
+lux::EnumValueMap           G_aTok_XmlConst_EV_TokenId_Values;
+Tok_XmlConst::EV_TokenId    ev_consts_none(Tok_XmlConst::e_none,"");
+Tok_XmlConst::EV_TokenId    ev_e_true(Tok_XmlConst::e_true,"true");
+Tok_XmlConst::EV_TokenId    ev_e_false(Tok_XmlConst::e_false,"false");
+Tok_XmlConst::EV_TokenId    ev_e_null(Tok_XmlConst::e_null,"NULL");
+Tok_XmlConst::EV_TokenId    ev_e_void(Tok_XmlConst::e_void,"void");
+
+lux::EnumValueMap           G_aTok_XmlLink_Tag_EV_TokenId_Values;
+Tok_XmlLink_Tag::EV_TokenId ev_linktags_none(Tok_XmlLink_Tag::e_none,"");
+Tok_XmlLink_Tag::EV_TokenId ev_e_const(Tok_XmlLink_Tag::e_const,"const");
+Tok_XmlLink_Tag::EV_TokenId ev_member(Tok_XmlLink_Tag::member,"member");
+Tok_XmlLink_Tag::EV_TokenId ev_type(Tok_XmlLink_Tag::type,"type");
+
+lux::EnumValueMap               G_aTok_XmlFormat_Tag_EV_TokenId_Values;
+Tok_XmlFormat_Tag::EV_TokenId   ev_formattags_none(Tok_XmlFormat_Tag::e_none,"");
+Tok_XmlFormat_Tag::EV_TokenId   ev_code(Tok_XmlFormat_Tag::code,"code");
+Tok_XmlFormat_Tag::EV_TokenId   ev_listing(Tok_XmlFormat_Tag::listing,"listing");
+Tok_XmlFormat_Tag::EV_TokenId   ev_atom(Tok_XmlFormat_Tag::atom,"code");
+
+
+namespace lux
+{
+
+template<> EnumValueMap &
+Tok_XmlConst::EV_TokenId::Values_()         { return G_aTok_XmlConst_EV_TokenId_Values; }
+template<> EnumValueMap &
+Tok_XmlLink_Tag::EV_TokenId::Values_()      { return G_aTok_XmlLink_Tag_EV_TokenId_Values; }
+template<> EnumValueMap &
+Tok_XmlFormat_Tag::EV_TokenId::Values_()    { return G_aTok_XmlFormat_Tag_EV_TokenId_Values; }
+
+}   // namespace lux
+
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+void
+Tok_XmlConst::Trigger( TokenInterpreter &   io_rInterpreter ) const
+{
+    io_rInterpreter.Process_XmlConst(*this);
+}
+
+const char *
+Tok_XmlConst::Text() const
+{
+    return eTag.Text();
+}
+
+void
+Tok_XmlLink_BeginTag::Trigger( TokenInterpreter &   io_rInterpreter ) const
+{
+    io_rInterpreter.Process_XmlLink_BeginTag(*this);
+}
+
+const char *
+Tok_XmlLink_BeginTag::Text() const
+{
+    static StreamStr ret(120);
+    ret.seekp(0);
+    if (sScope.length() > 0)
+    {
+        ret << "<"
+            << eTag.Text()
+            << " scope=\""
+            << sScope
+            << "\">";
+    }
+    else
+    {
+        ret << "<"
+            << eTag.Text()
+            << ">";
+    }
+    return ret.c_str();
+}
+
+void
+Tok_XmlLink_EndTag::Trigger( TokenInterpreter & io_rInterpreter ) const
+{
+    io_rInterpreter.Process_XmlLink_EndTag(*this);
+}
+
+const char *
+Tok_XmlLink_EndTag::Text() const
+{
+    static StreamStr ret(120);
+    ret.seekp(0);
+    ret << "</"
+        << eTag.Text()
+        << ">";
+    return ret.c_str();
+}
+
+void
+Tok_XmlFormat_BeginTag::Trigger( TokenInterpreter & io_rInterpreter ) const
+{
+    io_rInterpreter.Process_XmlFormat_BeginTag(*this);
+}
+
+const char *
+Tok_XmlFormat_BeginTag::Text() const
+{
+    static StreamStr ret(120);
+    ret.seekp(0);
+    ret << "<"
+        << eTag.Text()
+        << ">";
+    return ret.c_str();
+}
+
+void
+Tok_XmlFormat_EndTag::Trigger( TokenInterpreter &   io_rInterpreter ) const
+{
+    io_rInterpreter.Process_XmlFormat_EndTag(*this);
+}
+
+const char *
+Tok_XmlFormat_EndTag::Text() const
+{
+    static StreamStr ret(120);
+    ret.seekp(0);
+    ret << "</"
+        << eTag.Text()
+        << ">";
+    return ret.c_str();
+}
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx
new file mode 100644
index 000000000000..b8a08fa987b4
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx
@@ -0,0 +1,235 @@
+/* -*- 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 DSAPI_CX_DOCU2_HXX
+#define DSAPI_CX_DOCU2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcont2.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <s2_dsapi/tk_xml.hxx>
+
+namespace csi
+{
+namespace dsapi
+{
+
+class Token_Receiver;
+
+
+/**
+@descr
+*/
+
+class Cx_Base : public ::TkpContext
+{
+  public:
+    virtual bool        PassNewToken();
+    virtual TkpContext &
+                        FollowUpContext();
+  protected:
+    // LIFECYCLE
+                        Cx_Base(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   rReceiver(o_rReceiver),
+                                                    pFollowUpContext(&i_rFollowUpContext)
+                                                    // pNewToken
+                                                { }
+  protected:
+    void                SetToken(
+                            DYN Token *         let_dpToken )
+                                                { pNewToken = let_dpToken; }
+    void                Handle_DocuSyntaxError(
+                            CharacterSource &   io_rText );
+
+  private:
+    // DATA
+    Token_Receiver &    rReceiver;
+    TkpContext *        pFollowUpContext;
+    Dyn<Token>          pNewToken;
+};
+
+
+class Cx_EoHtml : public Cx_Base
+{
+  public:
+    // LIFECYCLE
+                        Cx_EoHtml(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    //  OPERATIONS
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    void                SetIfIsStartOfParagraph(
+                            bool                i_bNextTokenProperty )
+                                                { bToken_IsStartOfParagraph = i_bNextTokenProperty; }
+
+  private:
+    bool                bToken_IsStartOfParagraph;
+};
+
+class Cx_EoXmlConst : public Cx_Base
+{
+  public:
+    // LIFECYCLE
+                        Cx_EoXmlConst(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    //  OPERATIONS
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    void                SetTokenId(
+                            lux::Enum< Tok_XmlConst::E_TokenId >
+                                                i_eTokenId )
+                                                { eTokenId = i_eTokenId; }
+  private:
+    Tok_XmlConst::EV_TokenId
+                        eTokenId;
+};
+
+class Cx_EoXmlLink_BeginTag : public Cx_Base
+{
+  public:
+    // LIFECYCLE
+                        Cx_EoXmlLink_BeginTag(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    //  OPERATIONS
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    void                SetTokenId(
+                            Tok_XmlLink_BeginTag::EV_TokenId
+                                                i_eTokenId )
+                                                { eTokenId = i_eTokenId; }
+  private:
+    Tok_XmlLink_BeginTag::EV_TokenId
+                        eTokenId;
+};
+
+class Cx_EoXmlLink_EndTag : public Cx_Base
+{
+  public:
+    // LIFECYCLE
+                        Cx_EoXmlLink_EndTag(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    //  OPERATIONS
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    void                SetTokenId(
+                            Tok_XmlLink_EndTag::EV_TokenId
+                                                i_eTokenId )
+                                                { eTokenId = i_eTokenId; }
+  private:
+    Tok_XmlLink_EndTag::E_TokenId
+                        eTokenId;
+};
+
+class Cx_EoXmlFormat_BeginTag : public Cx_Base
+{
+  public:
+    // LIFECYCLE
+                        Cx_EoXmlFormat_BeginTag(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    //  OPERATIONS
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    void                SetTokenId(
+                            lux::Enum< Tok_XmlFormat_BeginTag::E_TokenId >
+                                                i_eTokenId )
+                                                { eTokenId = i_eTokenId; }
+  private:
+    lux::Enum< Tok_XmlFormat_BeginTag::E_TokenId >
+                        eTokenId;
+};
+
+class Cx_EoXmlFormat_EndTag : public Cx_Base
+{
+  public:
+    // LIFECYCLE
+                        Cx_EoXmlFormat_EndTag(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    //  OPERATIONS
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    void                SetTokenId(
+                            lux::Enum< Tok_XmlFormat_EndTag::E_TokenId >
+                                                i_eTokenId )
+                                                { eTokenId = i_eTokenId; }
+  private:
+    lux::Enum< Tok_XmlFormat_EndTag::E_TokenId >
+                        eTokenId;
+};
+
+class Cx_CheckStar : public Cx_Base
+{
+  public:
+    // LIFECYCLE
+                        Cx_CheckStar(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext),
+                                                    bIsEnd(false), bEndTokenFound(false)
+                                                 { }
+    void                Set_End_FolloUpContext(
+                            TkpContext &        i_rEnd_FollowUpContext )
+                                                { pEnd_FollowUpContext = &i_rEnd_FollowUpContext; }
+
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    void                SetIsEnd(
+                            bool                i_bIsEnd  )
+                                                { bIsEnd = i_bIsEnd; }
+    virtual TkpContext &
+                        FollowUpContext();
+  private:
+    TkpContext *        pEnd_FollowUpContext;
+    bool                bIsEnd;
+    bool                bEndTokenFound;
+};
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.hxx b/autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.hxx
new file mode 100644
index 000000000000..6e229c0af51b
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.hxx
@@ -0,0 +1,125 @@
+/* -*- 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 ADC_CX_DSAPI_HXX
+#define ADC_CX_DSAPI_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcont2.hxx>
+    // COMPONENTS
+#include <cosv/tpl/dyn.hxx>
+#include <tokens/tkpstam2.hxx>
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+class Token_Receiver;
+class Token;
+
+class Cx_EoHtml;
+class Cx_EoXmlConst;
+class Cx_EoXmlLink_BeginTag;
+class Cx_EoXmlLink_EndTag;
+class Cx_EoXmlFormat_BeginTag;
+class Cx_EoXmlFormat_EndTag;
+class Cx_CheckStar;
+
+/**
+@descr
+*/
+class Context_Docu : public TkpDocuContext,
+                     private StateMachineContext
+{
+  public:
+    //  LIFECYCLE
+                        Context_Docu(
+                            Token_Receiver &    o_rReceiver );
+    virtual void        SetParentContext(
+                            TkpContext &        io_rParentContext,
+                            const char *        i_sMultiLineEndToken );
+
+                        ~Context_Docu();
+    //  OPERATIONS
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+
+    virtual bool        PassNewToken();
+    virtual void        SetMode_IsMultiLine(
+                            bool                i_bTrue );
+
+    //  INQUIRY
+    virtual TkpContext &
+                        FollowUpContext();
+  private:
+    //  SERVICE FUNCTIONS
+    virtual void        PerformStatusFunction(
+                            uintt               i_nStatusSignal,
+                            UINT16              i_nTokenId,
+                            CharacterSource &   io_rText );
+
+    void                SetupStateMachine();
+
+    //  DATA
+    StateMachin2        aStateMachine;
+    Token_Receiver *    pReceiver;
+
+        // Contexts
+    TkpContext *        pParentContext;
+    String              sMultiLineEndToken;
+
+    Dyn<Cx_EoHtml>      pCx_EoHtml;
+    Dyn<Cx_EoXmlConst>  pCx_EoXmlConst;
+    Dyn<Cx_EoXmlLink_BeginTag>
+                        pCx_EoXmlLink_BeginTag;
+    Dyn<Cx_EoXmlLink_EndTag>
+                        pCx_EoXmlLink_EndTag;
+    Dyn<Cx_EoXmlFormat_BeginTag>
+                        pCx_EoXmlFormat_BeginTag;
+    Dyn<Cx_EoXmlFormat_EndTag>
+                        pCx_EoXmlFormat_EndTag;
+    Dyn<Cx_CheckStar>   pCx_CheckStar;
+
+        // Temporary data, used during ReadCharChain()
+    Dyn<Token>          pNewToken;
+    ::TkpContext *      pFollowUpContext;
+    bool                bIsMultiline;
+};
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx
new file mode 100644
index 000000000000..4b6723dce82f
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx
@@ -0,0 +1,183 @@
+/* -*- 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 ADC_DSAPI_DOCU_PE2_HXX
+#define ADC_DSAPI_DOCU_PE2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_dsapi/tokintpr.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+class ParserInfo;
+
+namespace ary
+{
+namespace doc
+{
+    class OldIdlDocu;
+}
+
+namespace inf
+{
+    class DocuToken;
+}   // namespace info
+}   // namespace ary
+
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+class Token;
+class DT_AtTag;
+
+class SapiDocu_PE : public TokenInterpreter
+{
+  public:
+                        SapiDocu_PE(
+                            ParserInfo &        io_rPositionInfo );
+                        ~SapiDocu_PE();
+
+    void                ProcessToken(
+                            DYN csi::dsapi::Token &
+                                                let_drToken );
+
+    virtual void        Process_AtTag(
+                            const Tok_AtTag &   i_rToken );
+    virtual void        Process_HtmlTag(
+                            const Tok_HtmlTag & i_rToken );
+    virtual void        Process_XmlConst(
+                            const Tok_XmlConst &
+                                                i_rToken );
+    virtual void        Process_XmlLink_BeginTag(
+                            const Tok_XmlLink_BeginTag &
+                                                i_rToken );
+    virtual void        Process_XmlLink_EndTag(
+                            const Tok_XmlLink_EndTag &
+                                                i_rToken );
+    virtual void        Process_XmlFormat_BeginTag(
+                            const Tok_XmlFormat_BeginTag &
+                                                i_rToken );
+    virtual void        Process_XmlFormat_EndTag(
+                            const Tok_XmlFormat_EndTag &
+                                                i_rToken );
+    virtual void        Process_Word(
+                            const Tok_Word &    i_rToken );
+    virtual void        Process_Comma();
+    virtual void        Process_DocuEnd();
+    virtual void        Process_EOL();
+    virtual void        Process_White();
+
+
+    DYN ary::doc::OldIdlDocu *
+                            ReleaseJustParsedDocu();
+
+    bool                IsComplete() const;
+
+  private:
+    enum E_State
+    {
+        e_none = 0,
+        st_short,
+        st_description,
+        st_attags,
+        st_complete
+    };
+
+    typedef void ( SapiDocu_PE::*F_TokenAdder )( DYN ary::inf::DocuToken & let_drNewToken );
+
+    void                AddDocuToken2Void(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                AddDocuToken2Short(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                AddDocuToken2Description(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                AddDocuToken2Deprecated(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                AddDocuToken2CurAtTag(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                SetCurParameterAtTagName(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                SetCurSeeAlsoAtTagLinkText(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                SetCurSeeAlsoAtTagLinkText_2(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                SetCurSeeAlsoAtTagLinkText_3(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                SetCurSinceAtTagVersion_OOo(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                SetCurSinceAtTagVersion_Number(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+    void                AddDocuToken2SinceAtTag(
+                            DYN ary::inf::DocuToken &
+                                                let_drNewToken );
+
+    bool                CheckVersionSyntax_OOo(
+                            const String &      i_versionPart1 );
+    bool                CheckVersionSyntax_Number(
+                            const String &      i_versionPart2 );
+    // DATA
+    Dyn<ary::doc::OldIdlDocu>
+                        pDocu;
+    E_State             eState;
+    ParserInfo *        pPositionInfo;
+    F_TokenAdder        fCurTokenAddFunction;
+
+    Dyn<DT_AtTag>       pCurAtTag;
+    String              sCurDimAttribute;
+    StreamStr           sCurAtSeeType_byXML;
+};
+
+}   // namespace dsapi
+}   // namespace csi
+
+
+// IMPLEMENTATION
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/dsapitok.hxx b/autodoc/source/parser_i/inc/s2_dsapi/dsapitok.hxx
new file mode 100644
index 000000000000..9ccccee02ef8
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/dsapitok.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 DSAPI_DSAPITOK_HXX
+#define DSAPI_DSAPITOK_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/token2.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+class TokenInterpreter;
+
+
+class Token : public TextToken
+{
+  public:
+    // LIFECYCLE
+    virtual             ~Token() {}
+
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const = 0;
+};
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx
new file mode 100644
index 000000000000..57bf561ffdce
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx
@@ -0,0 +1,90 @@
+/* -*- 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 DSAPI_TK_ATAG2_HXX
+#define DSAPI_TK_ATAG2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_dsapi/dsapitok.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <luxenum.hxx>
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+class Tok_AtTag : public Token
+{
+  public:
+    // TYPE
+    enum E_TokenId
+    {
+        e_none = 0,
+        author =  1,
+        see = 2,
+        param = 3,
+        e_return = 4,
+        e_throw = 5,
+        example = 6,
+        deprecated = 7,
+        suspicious = 8,
+        missing = 9,
+        incomplete = 10,
+        version = 11,
+        guarantees = 12,
+        exception = 13,
+        since = 14
+    };
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+
+    // Spring and Fall
+                        Tok_AtTag(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    E_TokenId           Id() const              { return eTag; }
+
+  private:
+    EV_TokenId          eTag;
+};
+
+}   // namespace dsapi
+}   // namespace csi
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.hxx
new file mode 100644
index 000000000000..5ee763969ad6
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.hxx
@@ -0,0 +1,123 @@
+/* -*- 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 DSAPI_TK_DOCW2_HXX
+#define DSAPI_TK_DOCW2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_dsapi/dsapitok.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+class Tok_Word : public Token
+{
+  public:
+    // Spring and Fall
+                        Tok_Word(
+                            const char *        i_sText )
+                                                :   sText(i_sText) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+
+  private:
+    // DATA
+    String              sText;
+};
+
+class Tok_Comma : public Token
+{
+  public:
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+};
+
+class Tok_DocuEnd : public Token
+{
+  public:
+    // Spring and Fall
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+};
+
+class Tok_EOL : public Token
+{
+  public:
+    // Spring and Fall
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+};
+
+class Tok_EOF : public Token
+{
+  public:
+    // Spring and Fall
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+};
+
+class Tok_White : public Token
+{
+  public:
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+};
+
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_html.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_html.hxx
new file mode 100644
index 000000000000..3d69c13d296c
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_html.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 DSAPI_TK_HTML_HXX
+#define DSAPI_TK_HTML_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_dsapi/dsapitok.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+class Tok_HtmlTag : public Token
+{
+  public:
+    // Spring and Fall
+                        Tok_HtmlTag(
+                            const char *        i_sTag,
+                            bool                i_bIsParagraphStarter )
+                                                :   sTag(i_sTag),
+                                                    bIsParagraphStarter(i_bIsParagraphStarter)
+                                                {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    bool                IsParagraphStarter() const
+                                                { return bIsParagraphStarter; }
+
+  private:
+    String              sTag;
+    bool                bIsParagraphStarter;
+};
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx
new file mode 100644
index 000000000000..7bb8db52a27f
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx
@@ -0,0 +1,203 @@
+/* -*- 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 DSAPI_TK_XML_HXX
+#define DSAPI_TK_XML_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_dsapi/dsapitok.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <luxenum.hxx>
+
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+class Tok_XmlTag : public Token
+{
+  public:
+};
+
+class Tok_XmlConst : public Tok_XmlTag
+{
+  public:
+    // TYPE
+    enum  E_TokenId
+    {
+        e_none = 0,
+        e_true = 1,
+        e_false = 2,
+        e_null = 3,
+        e_void = 4
+    };
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+
+    // Spring and Fall
+                        Tok_XmlConst(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    E_TokenId           Id() const              { return eTag; }
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+};
+
+class Tok_XmlLink_Tag : public Tok_XmlTag
+{
+  public:
+    // TYPE
+    enum E_TokenId
+    {
+        e_none = 0,
+        e_const = 1,
+        member = 2,
+        type = 3
+    };
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+};
+
+class Tok_XmlLink_BeginTag : public Tok_XmlLink_Tag
+{
+  public:
+    // Spring and Fall
+                        Tok_XmlLink_BeginTag(
+                            EV_TokenId          i_eTag,
+                            const String  &     i_sScope,
+                            const String  &     i_sDim )
+                                                :   eTag(i_eTag),
+                                                    sScope(i_sScope),
+                                                    sDim(i_sDim) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    E_TokenId           Id() const              { return eTag; }
+    const String  &     Scope() const           { return sScope; }
+    const String  &     Dim() const             { return sDim; }
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+    String              sScope;
+    String              sDim;
+};
+
+class Tok_XmlLink_EndTag : public Tok_XmlLink_Tag
+{
+  public:
+    // Spring and Fall
+                        Tok_XmlLink_EndTag(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    E_TokenId           Id() const              { return eTag; }
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+};
+
+class Tok_XmlFormat_Tag : public Tok_XmlTag
+{
+  public:
+    // TYPE
+    enum E_TokenId
+    {
+        e_none = 0,
+        code = 1,
+        listing = 2,
+        atom = 3
+    };
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+};
+
+class Tok_XmlFormat_BeginTag : public Tok_XmlFormat_Tag
+{
+  public:
+    // Spring and Fall
+                        Tok_XmlFormat_BeginTag(
+                            EV_TokenId          i_eTag,
+                            const String  &     i_sDim )
+                                                :   eTag(i_eTag),
+                                                    sDim(i_sDim) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    E_TokenId           Id() const              { return eTag; }
+    const String  &     Dim() const             { return sDim; }
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+    String              sDim;
+};
+
+class Tok_XmlFormat_EndTag : public Tok_XmlFormat_Tag
+{
+  public:
+    // Spring and Fall
+                        Tok_XmlFormat_EndTag(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char* Text() const;
+    E_TokenId           Id() const              { return eTag; }
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+};
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tokintpr.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tokintpr.hxx
new file mode 100644
index 000000000000..fed4c0e25121
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/tokintpr.hxx
@@ -0,0 +1,96 @@
+/* -*- 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 ADC_DSAPI_TOKINTPR_HXX
+#define ADC_DSAPI_TOKINTPR_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+class Tok_AtTag;
+class Tok_XmlConst;
+class Tok_XmlLink_BeginTag;
+class Tok_XmlLink_EndTag;
+class Tok_XmlFormat_BeginTag;
+class Tok_XmlFormat_EndTag;
+class Tok_Word;
+class Tok_HtmlTag;
+
+class TokenInterpreter
+{
+  public:
+    virtual             ~TokenInterpreter() {}
+
+    virtual void        Process_AtTag(
+                            const Tok_AtTag &   i_rToken ) = 0;
+    virtual void        Process_HtmlTag(
+                            const Tok_HtmlTag & i_rToken ) = 0;
+    virtual void        Process_XmlConst(
+                            const Tok_XmlConst &
+                                                i_rToken ) = 0;
+    virtual void        Process_XmlLink_BeginTag(
+                            const Tok_XmlLink_BeginTag &
+                                                i_rToken ) = 0;
+    virtual void        Process_XmlLink_EndTag(
+                            const Tok_XmlLink_EndTag &
+                                                i_rToken ) = 0;
+    virtual void        Process_XmlFormat_BeginTag(
+                            const Tok_XmlFormat_BeginTag &
+                                                i_rToken ) = 0;
+    virtual void        Process_XmlFormat_EndTag(
+                            const Tok_XmlFormat_EndTag &
+                                                i_rToken ) = 0;
+    virtual void        Process_Word(
+                            const Tok_Word &    i_rToken ) = 0;
+    virtual void        Process_Comma() = 0;
+    virtual void        Process_DocuEnd() = 0;
+    virtual void        Process_EOL() = 0;
+    virtual void        Process_White() = 0;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tokrecv.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tokrecv.hxx
new file mode 100644
index 000000000000..14ef872d4306
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_dsapi/tokrecv.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 DSAPI_TOKRECV_HXX
+#define DSAPI_TOKRECV_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+namespace csi
+{
+namespace dsapi
+{
+
+
+class Token;
+/**
+@descr
+*/
+class Token_Receiver
+{
+  public:
+      virtual               ~Token_Receiver() {}
+    virtual void        Receive(
+                              DYN Token &           let_drToken ) = 0;
+    virtual void        Increment_CurLine() = 0;
+};
+
+
+}   // namespace dsapi
+}   // namespace csi
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx b/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx
new file mode 100644
index 000000000000..07d325846238
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx
@@ -0,0 +1,101 @@
+/* -*- 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 LUIDL_CX_IDLCO_HXX
+#define LUIDL_CX_IDLCO_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcont2.hxx>
+    // COMPONENTS
+#include <tokens/tkpstam2.hxx>
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace uidl
+{
+
+class Token_Receiver;
+class Token;
+
+/**
+*/
+class Context_UidlCode : public TkpContext,
+                         private StateMachineContext
+{
+  public:
+    //  LIFECYCLE
+                        Context_UidlCode(
+                            Token_Receiver &    o_rReceiver,
+                            DYN TkpDocuContext &
+                                                let_drContext_Docu  );
+                        ~Context_UidlCode();
+    //  OPERATORS
+
+    //  OPERATIONS
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    virtual bool        PassNewToken();
+
+    //  INQUIRY
+    virtual TkpContext &
+                        FollowUpContext();
+  private:
+    //  SERVICE FUNCTIONS
+    void                PerformStatusFunction(
+                            uintt               i_nStatusSignal,
+                            UINT16              i_nTokenId,
+                            CharacterSource &   io_rText );
+    void                SetupStateMachine();
+
+    //  DATA
+    StateMachin2        aStateMachine;
+    Token_Receiver *    pReceiver;
+
+        // Contexts
+    Dyn<TkpDocuContext> pDocuContext;
+
+    Dyn<TkpContext>    dpContext_MLComment;
+    Dyn<TkpContext>    dpContext_SLComment;
+    Dyn<TkpContext>    dpContext_Preprocessor;
+    Dyn<TkpContext>    dpContext_Assignment;
+
+        // Temporary data, used during ReadCharChain()
+    Dyn<Token>          pNewToken;
+    ::TkpContext *      pFollowUpContext;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx b/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx
new file mode 100644
index 000000000000..0113a87c11e7
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx
@@ -0,0 +1,133 @@
+/* -*- 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 ADC_LUIDL_CX_SUB_HXX
+#define ADC_LUIDL_CX_SUB_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcont2.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+#include "uidl_tok.hxx"
+
+namespace csi
+{
+namespace uidl
+{
+
+class Token_Receiver;
+class Token;
+
+
+class Cx_Base : public ::TkpContext
+{
+  public:
+    virtual bool        PassNewToken();
+    virtual TkpContext &
+                        FollowUpContext();
+  protected:
+    // LIFECYCLE
+                        Cx_Base(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   rReceiver(o_rReceiver),
+                                                    pFollowUpContext(&i_rFollowUpContext),
+                                                    pNewToken()
+                                                    {}
+  protected:
+    void                SetToken(
+                            DYN Token *         let_dpToken )
+                                                { pNewToken = let_dpToken; }
+    Token_Receiver &    Receiver()              { return rReceiver; }
+
+  private:
+    // DATA
+    Token_Receiver &    rReceiver;
+    TkpContext *        pFollowUpContext;
+    Dyn<Token>          pNewToken;
+};
+
+
+
+/**
+@descr
+*/
+
+class Context_MLComment : public Cx_Base
+{
+  public:
+                        Context_MLComment(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+};
+
+class Context_SLComment : public Cx_Base
+{
+  public:
+                        Context_SLComment(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+};
+
+class Context_Praeprocessor : public Cx_Base
+{
+  public:
+                        Context_Praeprocessor(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+};
+
+class Context_Assignment : public Cx_Base
+{
+  public:
+                        Context_Assignment(
+                            Token_Receiver &    o_rReceiver,
+                            TkpContext &        i_rFollowUpContext )
+                                                :   Cx_Base(o_rReceiver, i_rFollowUpContext) {}
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx b/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx
new file mode 100644
index 000000000000..411fc402eb42
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx
@@ -0,0 +1,274 @@
+/* -*- 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 LUIDL_DISTRIB_HXX
+#define LUIDL_DISTRIB_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/tokrecv.hxx>
+#include <s2_dsapi/tokrecv.hxx>
+#include <s2_luidl/tokproct.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+class ParserInfo;
+
+namespace ary
+{
+    class Repository;
+
+namespace doc
+{
+    class OldIdlDocu;
+}   // namespace inf
+}   // namespace ary)
+
+
+
+namespace csi
+{
+namespace dsapi
+{
+    class Token_Receiver;
+    class SapiDocu_PE;
+}
+
+
+
+namespace uidl
+{
+
+
+typedef std::vector< DYN Token * >  TokenQueue;
+typedef TokenQueue::iterator        TokenIterator;
+
+class TokenParser_Uidl;
+class UnoIDL_PE;
+class Token;
+
+
+class TokenDistributor : private TokenProcessing_Types
+
+{
+  public:
+                        TokenDistributor(
+                            ary::Repository &   io_rRepository,
+                            ParserInfo &            io_rParserInfo );
+    void                SetTokenProvider(
+                            TokenParser_Uidl &  io_rTokenSource );
+    void                SetTopParseEnvironment(
+                            UnoIDL_PE &         io_pTopParseEnvironment );
+                        ~TokenDistributor();
+
+
+    void                Reset()                 { aDocumentation.Reset(); }
+    /** calls pTokenSource->GetNextToken() and checks the incoming tokens, until a
+        usable token is found. This token will be forwarded to
+        pTopParseEnv;
+    */
+    void                TradeToken();
+
+    csi::uidl::Token_Receiver &
+                        CodeTokens_Receiver();
+    csi::dsapi::Token_Receiver &
+                        DocuTokens_Receiver();
+
+    /** Used from PE_File, if there is a docu to get without
+        an environment to push (this is the case for modules).
+    */
+    DYN ary::doc::OldIdlDocu *
+                        ReleaseLastParsedDocu()
+                            { return aDocumentation.ReleaseLastParsedDocu(); }
+
+    /** Used from PE_File, if the term "published" was parsed.
+        The next opened parse environment will be set to be published
+        (call ->UnoIDL_PE::SetPublished()).
+    */
+    void                Set_PublishedOn()
+                            { aProcessingData.Set_PublishedOn(); }
+
+
+  private:
+    class Documentation;
+    class ProcessingData;
+    friend class ProcessingData;
+
+    class  ProcessingData : public  csi::uidl::Token_Receiver,
+                            private TokenProcessing_Types
+    {
+      public:
+                            ProcessingData(
+                                ary::Repository &   io_rRepository,
+                                Documentation &         i_rDocuProcessor,
+                                ParserInfo &            io_rParserInfo );
+                            ~ProcessingData();
+        void                SetTopParseEnvironment(
+                                UnoIDL_PE &         io_pTopParseEnvironment );
+
+
+        /** is called from pTokenSource before finishing a ::TokenParse2::GetNextToken()
+            call and passes the just parsed token to this class.
+        */
+        virtual void        Receive(
+                                DYN csi::uidl::Token &
+                                                let_drToken );
+        virtual void        Increment_CurLine();
+
+        void                ProcessCurToken();
+
+        UnoIDL_PE &         CurEnvironment() const;
+        bool                NextTokenExists() const;
+        void                Set_PublishedOn()
+                                { bPublishedRecentlyOn = true; }
+
+      private:
+        typedef uintt   TokenQ_Position;
+        typedef std::pair< UnoIDL_PE *, TokenQ_Position >   EnvironmentInfo;
+        typedef std::vector< EnvironmentInfo >              EnvironmentStack;
+
+        void                AcknowledgeResult();
+        const csi::uidl::Token &
+                            CurToken() const;
+        UnoIDL_PE &         CurEnv() const;
+        UnoIDL_PE &         PushEnv() const;
+        uintt               CurTokenPosition() const;
+        uintt               CurEnv_TriedTokenPosition() const;
+        void                DecrementTryCount();
+
+        EnvironmentStack    aEnvironments;
+        TokenQueue          aTokenQueue;
+        TokenIterator       itCurToken;
+        TokenProcessing_Result
+                            aCurResult;
+        uintt               nTryCount;
+        bool                bFinished;
+        ary::Repository &
+                            rRepository;
+        ParserInfo &        rParserInfo;
+        Documentation *     pDocuProcessor;
+        bool                bPublishedRecentlyOn;
+    };
+
+    class Documentation : public csi::dsapi::Token_Receiver
+    {
+      public:
+                            Documentation(
+                                ParserInfo &    io_rParserInfo);
+                            ~Documentation();
+
+        void                Reset()             { bIsPassedFirstDocu = false; }
+
+        virtual void        Receive(
+                                DYN csi::dsapi::Token &
+                                                let_drToken );
+        virtual void        Increment_CurLine();
+        DYN ary::doc::OldIdlDocu *
+                            ReleaseLastParsedDocu()
+                                                { return pMostRecentDocu.Release(); }
+      private:
+        Dyn<csi::dsapi::SapiDocu_PE>
+                            pDocuParseEnv;
+        ParserInfo &        rParserInfo;
+        Dyn<ary::doc::OldIdlDocu>
+                            pMostRecentDocu;
+        bool                bIsPassedFirstDocu;
+    };
+
+    // DATA
+    TokenParser_Uidl *  pTokenSource;
+    Documentation       aDocumentation;
+    ProcessingData      aProcessingData;
+};
+
+
+
+// IMPLEMENTATION
+
+inline void
+TokenDistributor::SetTokenProvider( TokenParser_Uidl &  io_rTokenSource )
+    { pTokenSource = &io_rTokenSource; }
+
+inline void
+TokenDistributor::SetTopParseEnvironment( UnoIDL_PE & io_pTopParseEnvironment )
+    { aProcessingData.SetTopParseEnvironment(io_pTopParseEnvironment); }
+
+inline csi::uidl::Token_Receiver &
+TokenDistributor::CodeTokens_Receiver()
+    { return aProcessingData; }
+
+inline csi::dsapi::Token_Receiver &
+TokenDistributor::DocuTokens_Receiver()
+    { return aDocumentation; }
+
+inline const csi::uidl::Token &
+TokenDistributor::ProcessingData::CurToken() const
+{
+    csv_assert( itCurToken != aTokenQueue.end() );
+    csv_assert( *itCurToken != 0 );
+    return *(*itCurToken);
+}
+
+inline UnoIDL_PE &
+TokenDistributor::ProcessingData::CurEnv() const
+{
+    csv_assert( aEnvironments.size() > 0 );
+    csv_assert( aEnvironments.back().first != 0 );
+    return *aEnvironments.back().first;
+}
+
+inline UnoIDL_PE &
+TokenDistributor::ProcessingData::PushEnv() const
+{
+    csv_assert( aCurResult.pEnv2Push != 0 );
+    return *aCurResult.pEnv2Push;
+}
+
+inline uintt
+TokenDistributor::ProcessingData::CurTokenPosition() const
+{
+    return itCurToken - aTokenQueue.begin();
+}
+
+inline uintt
+TokenDistributor::ProcessingData::CurEnv_TriedTokenPosition() const
+{
+    csv_assert( aEnvironments.size() > 0 );
+    return aEnvironments.back().second;
+}
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx b/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx
new file mode 100644
index 000000000000..7708ac66775e
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/parsenv2.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 LUIDL_PARSENV2_HXX
+#define LUIDL_PARSENV2_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/tokproct.hxx>
+    // COMPONENTS
+#include <s2_luidl/semnode.hxx>
+    // PARAMETERS
+#include <ary/idl/i_types4idl.hxx>
+#include <ary/idl/i_module.hxx>
+
+
+
+class ParserInfo;
+
+namespace ary
+{
+    class QualifiedName;
+    class Repository;
+
+namespace doc
+{
+    class OldIdlDocu;
+}
+
+namespace idl
+{
+    class CodeEntity;
+}
+}
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class Token;
+class SemanticNode;
+
+
+class UnoIDL_PE : virtual protected TokenProcessing_Types
+{
+  public:
+    virtual             ~UnoIDL_PE();
+
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &
+                                                io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+//  virtual void        EstablishContacts(
+//                          UnoIDL_PE *         io_pParentPE,
+//                          ary::idl::Gate &
+//                                                io_rGate,
+//                          TokenProcessing_Result &
+//                                              o_rResult );
+    virtual void        Enter(
+                            E_EnvStackAction    i_eWayOfEntering );
+    virtual void        Leave(
+                            E_EnvStackAction    i_eWayOfLeaving );
+    virtual void        ProcessToken(
+                            const Token &       i_rToken ) = 0;
+
+    void                SetDocu(
+                            DYN ary::doc::OldIdlDocu *
+                                                let_dpDocu );
+    void                SetPublished();
+    void                SetOptional();
+    void                PassDocuAt(
+                            ary::idl::CodeEntity &
+                                                io_rCe );
+
+    UnoIDL_PE *         Parent() const          { return aMyNode.Parent(); }
+
+    void                SetResult(
+                            E_TokenDone         i_eDone,
+                            E_EnvStackAction    i_eWhat2DoWithEnvStack,
+                            UnoIDL_PE *         i_pParseEnv2Push = 0 )
+                                                { aMyNode.SetTokenResult( i_eDone, i_eWhat2DoWithEnvStack, i_pParseEnv2Push ); }
+    virtual const ary::idl::Module &
+                        CurNamespace() const;
+    virtual const ParserInfo &
+                        ParseInfo() const;
+    ary::idl::Gate &    Gate() const            { return aMyNode.AryGate(); }
+    TokenProcessing_Result &
+                        TokenResult() const     { return aMyNode.TokenResult(); }
+    DYN ary::doc::OldIdlDocu *
+                        ReleaseDocu()           { return pDocu.Release(); }
+  protected:
+                        UnoIDL_PE();
+    ary::Repository &   MyRepository()          { csv_assert(pRepository != 0);
+                                                  return *pRepository;  }
+  private:
+    virtual void        InitData();
+    virtual void        TransferData() = 0;
+    virtual void        ReceiveData();
+
+    SemanticNode        aMyNode;
+    Dyn<ary::doc::OldIdlDocu>
+                        pDocu;
+    ary::Repository *   pRepository;
+};
+
+
+
+
+}   // namespace uidl
+}   // namespace csi
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx
new file mode 100644
index 000000000000..222fcdf43b7a
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx
@@ -0,0 +1,137 @@
+/* -*- 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 ADC_UIDL_PE_ATTRI_HXX
+#define ADC_UIDL_PE_ATTRI_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+#include <ary/idl/i_property.hxx>
+    // PARAMETERS
+#include <ary/idl/i_gate.hxx>
+
+
+namespace ary
+{
+     namespace idl
+    {
+         class Attribute;
+    }
+}
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class PE_Variable;
+class PE_Type;
+
+class PE_Attribute : public UnoIDL_PE,
+                     public ParseEnvState
+{
+  public:
+    typedef ary::idl::Ce_id                     Ce_id;
+    typedef ary::idl::Type_id                   Type_id;
+
+                        PE_Attribute(
+                            const Ce_id &       i_rCurOwner );
+
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &
+                                                io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+    virtual             ~PE_Attribute();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Stereotype(
+                            const TokStereotype &
+                                                i_rToken );
+    virtual void        Process_MetaType(
+                            const TokMetaType & i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_Raises();
+    virtual void        Process_Default();
+
+  private:
+    enum E_State
+    {
+        e_none,
+        e_start,
+        in_variable,
+        expect_end,
+        in_raise_std,   /// before 'get', 'set', ';' or '}'
+        in_get,
+        in_set
+    };
+
+    virtual void        InitData();
+    virtual void        ReceiveData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+    // DATA
+    E_State             eState;
+    const Ce_id *       pCurOwner;
+
+    Dyn<PE_Variable>    pPE_Variable;
+    Dyn<PE_Type>        pPE_Exception;
+
+        // object-data
+    ary::idl::Attribute *
+                        pCurAttribute;
+    Type_id             nCurParsedType;
+    String              sCurParsedName;
+    bool                bReadOnly;
+    bool                bBound;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_const.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_const.hxx
new file mode 100644
index 000000000000..397a235e4748
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_const.hxx
@@ -0,0 +1,147 @@
+/* -*- 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 LUIDL_PE_CONST_HXX
+#define LUIDL_PE_CONST_HXX
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace udm {
+class Agent_Struct;
+}   // namespace udm
+
+
+namespace csi
+{
+namespace uidl
+{
+
+class ConstantsGroup;
+
+class PE_Type;
+class PE_Value;
+
+class PE_Constant : public UnoIDL_PE,
+                    public ParseEnvState
+{
+  public:
+                        PE_Constant();
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &
+                                                io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+                        ~PE_Constant();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_Stereotype(
+                            const TokStereotype &
+                                                i_rToken );
+
+  private:
+    enum E_State
+    {
+        e_none,
+        expect_name,
+        expect_curl_bracket_open,
+        expect_const,
+        expect_value,
+        expect_finish,
+        e_STATES_MAX
+    };
+    enum E_TokenType
+    {
+        tt_stereotype,
+        tt_identifier,
+        tt_punctuation,
+        tt_MAX
+    };
+    typedef void (PE_Constant::*F_TOK)(const char *);
+
+
+    void                CallHandler(
+                            const char *        i_sTokenText,
+                            E_TokenType         i_eTokenType );
+
+    void                On_expect_name_Identifier(const char * i_sText);
+    void                On_expect_curl_bracket_open_Punctuation(const char * i_sText);
+    void                On_expect_const_Stereotype(const char * i_sText);
+    void                On_expect_const_Punctuation(const char * i_sText);
+    void                On_expect_value_Identifier(const char * i_sText);
+    void                On_expect_finish_Punctuation(const char * i_sText);
+    void                On_Default(const char * );
+
+    void                EmptySingleConstData();
+    void                CreateSingleConstant();
+
+    virtual void        InitData();
+    virtual void        ReceiveData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+  // DATA
+    static F_TOK        aDispatcher[e_STATES_MAX][tt_MAX];
+
+    E_State             eState;
+
+    String              sData_Name;
+    ary::idl::Ce_id     nDataId;
+
+    Dyn<PE_Type>        pPE_Type;
+    ary::idl::Type_id   nType;
+
+    Dyn<PE_Value>       pPE_Value;
+    String              sName;
+    String              sAssignment;
+};
+
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_enum2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_enum2.hxx
new file mode 100644
index 000000000000..2fef65658d9b
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_enum2.hxx
@@ -0,0 +1,133 @@
+/* -*- 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 ADC_UIDL_PE_ENUM2_HXX
+#define ADC_UIDL_PE_ENUM2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+// class Enum;
+
+class PE_Value;
+
+class PE_Enum : public UnoIDL_PE,
+                    public ParseEnvState
+{
+  public:
+                        PE_Enum();
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+                        ~PE_Enum();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+
+  private:
+    enum E_State
+    {
+        e_none,
+        expect_name,
+        expect_curl_bracket_open,
+        expect_value,
+        expect_finish,
+        e_STATES_MAX
+    };
+    enum E_TokenType
+    {
+        tt_identifier,
+        tt_punctuation,
+        tt_MAX
+    };
+    typedef void (PE_Enum::*F_TOK)(const char *);
+
+
+    void                CallHandler(
+                            const char *        i_sTokenText,
+                            E_TokenType         i_eTokenType );
+
+    void                On_expect_name_Identifier(const char * i_sText);
+    void                On_expect_curl_bracket_open_Punctuation(const char * i_sText);
+    void                On_expect_value_Punctuation(const char * i_sText);
+    void                On_expect_value_Identifier(const char * i_sText);
+    void                On_expect_finish_Punctuation(const char * i_sText);
+    void                On_Default(const char * );
+
+    void                EmptySingleValueData();
+    void                CreateSingleValue();
+
+    virtual void        InitData();
+    virtual void        ReceiveData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+  // DATA
+    static F_TOK        aDispatcher[e_STATES_MAX][tt_MAX];
+
+    E_State             eState;
+
+    String              sData_Name;
+    ary::idl::Ce_id     nDataId;
+
+    Dyn<PE_Value>       pPE_Value;
+    String              sName;
+    String              sAssignment;
+};
+
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_evalu.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_evalu.hxx
new file mode 100644
index 000000000000..13bb996e6380
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_evalu.hxx
@@ -0,0 +1,129 @@
+/* -*- 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 LUIDL_PE_EVALU_HXX
+#define LUIDL_PE_EVALU_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace udm {
+class Agent_Struct;
+}   // namespace udm
+
+
+namespace csi
+{
+namespace uidl
+{
+
+class PE_Value : public UnoIDL_PE,
+                 public ParseEnvState
+{
+  public:
+                        PE_Value(
+                            String &            o_rName,
+                            String &            o_rAssignment,
+                            bool                i_bIsConst );
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &
+                                                io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+                        ~PE_Value();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_Assignment(
+                            const TokAssignment &
+                                                i_rToken );
+  private:
+    enum E_State
+    {
+        e_none = 0,
+        expect_name,
+        got_name,
+        e_STATES_MAX
+    };
+    enum E_TokenType    /// @ATTENTION  Do not change existing values (except of tt_MAX) !!! Else array-indices will break.
+    {
+        tt_identifier = 0,
+        tt_punctuation = 1,
+        tt_assignment = 2,
+        tt_MAX
+    };
+    typedef void (PE_Value::*F_TOK)(const char *);
+
+
+    void                CallHandler(
+                            const char *        i_sTokenText,
+                            E_TokenType         i_eTokenType );
+
+    void                On_expect_name_Identifier(const char * i_sText);
+    void                On_got_name_Punctuation(const char * i_sText);
+    void                On_got_name_Assignment(const char * i_sText);
+    void                On_Default(const char * );
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+    bool                IsConst() const         { return bIsConst; }
+
+    static F_TOK        aDispatcher[e_STATES_MAX][tt_MAX];
+
+    E_State             eState;
+    String  *           pName;
+    String  *           pAssignment;
+    bool                bIsConst;
+};
+
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx
new file mode 100644
index 000000000000..4d6a9bd96872
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx
@@ -0,0 +1,261 @@
+/* -*- 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 LUIDL_PE_EXCP_HXX
+#define LUIDL_PE_EXCP_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+#include <s2_luidl/semnode.hxx>
+#include <ary/qualiname.hxx>
+    // PARAMETERS
+
+
+
+namespace csi
+{
+namespace prl
+{
+    class TNamespace;
+}
+}
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class Exception;
+class StructElement;
+class PE_StructElement;
+class PE_Type;
+
+
+class PE_Exception : public UnoIDL_PE
+{
+  public:
+                        PE_Exception();
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+                        ~PE_Exception();
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+  private:
+    struct S_Work
+    {
+                            S_Work();
+
+        void                InitData();
+        void                Prepare_PE_QualifiedName();
+        void                Prepare_PE_Element();
+        void                Data_Set_Name(
+                                const char *        i_sName );
+        // DATA
+        String              sData_Name;
+        bool                bIsPreDeclaration;
+        ary::idl::Ce_id     nCurStruct;
+
+        Dyn<PE_StructElement>
+                            pPE_Element;
+        ary::idl::Ce_id     nCurParsed_ElementRef;
+        Dyn<PE_Type>        pPE_Type;
+        ary::idl::Type_id   nCurParsed_Base;
+    };
+
+    struct S_Stati;
+    class PE_StructState;
+    friend struct S_Stati;
+    friend class PE_StructState;
+
+
+    class PE_StructState : public ParseEnvState
+    {
+      public:
+
+      protected:
+                            PE_StructState(
+                                PE_Exception &          i_rStruct )
+                                                    :   rStruct(i_rStruct) {}
+        void                MoveState(
+                                ParseEnvState &     i_rState ) const;
+        void                SetResult(
+                                E_TokenDone         i_eDone,
+                                E_EnvStackAction    i_eWhat2DoWithEnvStack,
+                                UnoIDL_PE *         i_pParseEnv2Push = 0 ) const
+                                                    { rStruct.SetResult(i_eDone, i_eWhat2DoWithEnvStack, i_pParseEnv2Push); }
+
+        S_Stati &           Stati() const           { return *rStruct.pStati; }
+        S_Work &            Work() const            { return rStruct.aWork; }
+        PE_Exception &      PE() const              { return rStruct; }
+
+      private:
+        virtual UnoIDL_PE & MyPE();
+        // DATA
+        PE_Exception &          rStruct;
+    };
+
+    class State_None : public PE_StructState
+    {
+        public:
+                            State_None(
+                                PE_Exception &          i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+    };
+    class State_WaitForName : public PE_StructState
+    {   // -> Name
+      public:
+                            State_WaitForName(
+                                PE_Exception &          i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Identifier(
+                                const TokIdentifier &
+                                                    i_rToken );
+    };
+    class State_GotName : public PE_StructState
+    {   // -> : { ;
+      public:
+                            State_GotName(
+                                PE_Exception &          i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Punctuation(
+                                const TokPunctuation &
+                                                    i_rToken );
+    };
+    class State_WaitForBase : public PE_StructState
+    {   // -> Base
+      public:
+                            State_WaitForBase(
+                                PE_Exception &          i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        On_SubPE_Left();
+    };
+    class State_GotBase : public PE_StructState
+    {   // -> {
+      public:
+                            State_GotBase(
+                                PE_Exception &          i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Punctuation(
+                                const TokPunctuation &
+                                                    i_rToken );
+    };
+    class State_WaitForElement : public PE_StructState
+    {   // -> Typ }
+      public:
+                            State_WaitForElement(
+                                PE_Exception &          i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Identifier(
+                                const TokIdentifier &
+                                                i_rToken );
+        virtual void        Process_NameSeparator();
+        virtual void        Process_BuiltInType(
+                                const TokBuiltInType &
+                                                i_rToken );
+        virtual void        Process_TypeModifier(
+                                const TokTypeModifier &
+                                                    i_rToken );
+        virtual void        Process_Punctuation(
+                                const TokPunctuation &
+                                                    i_rToken );
+//      virtual void        On_SubPE_Left();
+    };
+    class State_WaitForFinish : public PE_StructState
+    { // -> ;
+      public:
+                            State_WaitForFinish(
+                                PE_Exception &          i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Punctuation(
+                                const TokPunctuation &
+                                                    i_rToken );
+    };
+
+    struct S_Stati
+    {
+                            S_Stati(
+                                PE_Exception &          io_rStruct );
+        void                SetState(
+                                ParseEnvState &     i_rNextState )
+                                                    { pCurStatus = &i_rNextState; }
+
+        State_None          aNone;
+        State_WaitForName   aWaitForName;
+        State_GotName       aGotName;
+        State_WaitForBase   aWaitForBase;
+        State_GotBase       aGotBase;
+        State_WaitForElement
+                            aWaitForElement;
+        State_WaitForFinish aWaitForFinish;
+
+        ParseEnvState *     pCurStatus;
+    };
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    virtual void        ReceiveData();
+
+    public:
+
+    void        store_Exception();
+
+    private:
+
+    S_Stati &           Stati()                 { return *pStati; }
+    S_Work &            Work()                  { return aWork; }
+
+    // DATA
+    S_Work              aWork;
+    Dyn<S_Stati>        pStati;
+};
+
+
+inline void
+PE_Exception::PE_StructState::MoveState(
+                                ParseEnvState &     i_rState ) const
+                                                    { rStruct.Stati().SetState(i_rState); }
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx
new file mode 100644
index 000000000000..e499565e466a
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx
@@ -0,0 +1,142 @@
+/* -*- 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 LUIDL_PE_FILE2_HXX
+#define LUIDL_PE_FILE2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace ary
+{
+namespace idl
+{
+class Module;
+}   // namespace idl
+}   // namespace ary
+
+
+namespace csi
+{
+namespace uidl
+{
+
+class TokenDistributor;
+class PE_Service;
+class PE_Singleton;
+class PE_Interface;
+class PE_Struct;
+class PE_Exception;
+class PE_Constant;
+class PE_Enum;
+class PE_Typedef;
+
+
+class PE_File : public UnoIDL_PE,
+                public ParseEnvState
+{
+  public:
+                        PE_File(
+                            TokenDistributor &  i_rTokenAdmin,
+                            const ParserInfo &  i_parseInfo );
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+                        ~PE_File();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_MetaType(
+                            const TokMetaType & i_rToken );
+    virtual void        Process_Stereotype(
+                            const TokStereotype &
+                                                i_rToken );
+    virtual void        Process_Default();
+
+  private:
+    enum E_State
+    {
+        e_none,
+        e_std,
+        wait_for_module,
+        wait_for_module_bracket,
+        wait_for_module_semicolon,
+        in_sub_pe,
+        on_default
+    };
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    virtual void        ReceiveData();
+    virtual UnoIDL_PE & MyPE();
+    virtual const ary::idl::Module &
+                        CurNamespace() const;
+    virtual const ParserInfo &
+                        ParseInfo() const;
+    // DATA
+    TokenDistributor *  pTokenAdmin;
+    Dyn<PE_Service>     pPE_Service;
+    Dyn<PE_Singleton>   pPE_Singleton;
+    Dyn<PE_Interface>   pPE_Interface;
+    Dyn<PE_Struct>      pPE_Struct;
+    Dyn<PE_Exception>   pPE_Exception;
+    Dyn<PE_Constant>    pPE_Constant;
+    Dyn<PE_Enum>        pPE_Enum;
+    Dyn<PE_Typedef>     pPE_Typedef;
+
+    const ary::idl::Module *
+                        pCurNamespace;
+    const ParserInfo *  pParseInfo;
+
+    E_State             eState;
+    uintt               nBracketCount_inDefMode;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx
new file mode 100644
index 000000000000..c39d4f553073
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx
@@ -0,0 +1,165 @@
+/* -*- 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 ADC_UIDL_PE_FUNC2_HXX
+#define ADC_UIDL_PE_FUNC2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+#include <ary/idl/i_param.hxx>
+    // PARAMETERS
+
+namespace ary
+{
+     namespace idl
+    {
+         class Function;
+    }
+}
+
+
+namespace csi
+{
+namespace uidl
+{
+
+class PE_Type;
+class PE_Variable;
+
+class PE_Function : public UnoIDL_PE,
+                    public ParseEnvState
+{
+  public:
+    typedef ary::idl::Ce_id     RParent;
+    typedef ary::idl::Ce_id     RFunction;
+
+    enum E_Constructor { constructor };
+
+    /// Constructor for interfaces.
+                        PE_Function(
+                            const RParent &     i_rCurInterface );
+
+    /// Constructor for single interface based services.
+                        PE_Function(
+                            const RParent &     i_rCurService,
+                            E_Constructor       i_eCtorMarker );
+
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+    virtual             ~PE_Function();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Stereotype(
+                            const TokStereotype &
+                                                i_rToken );
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_BuiltInType(
+                            const TokBuiltInType &
+                                                i_rToken );
+    virtual void        Process_ParameterHandling(
+                            const TokParameterHandling &
+                                                i_rToken );
+    virtual void        Process_Raises();
+    virtual void        Process_Default();
+
+  private:
+    enum E_State
+    {
+        e_none,
+        e_start,
+        in_return_type,
+        expect_name,
+        expect_params_list,
+        expect_parameter,
+        expect_parameter_variable,
+        in_parameter_variable,
+        expect_parameter_separator,
+        params_finished,
+        expect_exceptions_list,
+        expect_exception,
+        in_exception,
+        expect_exception_separator,
+        exceptions_finished
+    };
+
+    void                GoIntoReturnType();
+    void                GoIntoParameterVariable();
+    void                GoIntoException();
+    void                OnDefault();
+
+    virtual void        InitData();
+    virtual void        ReceiveData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+    // DATA
+    E_State             eState;
+
+    String              sData_Name;
+    ary::idl::Type_id   nData_ReturnType;
+    bool                bData_Oneway;
+    ary::idl::Function *
+                        pCurFunction;
+
+    const RParent *     pCurParent;
+
+    Dyn<PE_Type>        pPE_Type;
+    ary::idl::Type_id   nCurParsedType;     // ReturnType or Exception
+
+    String              sName;
+
+    Dyn<PE_Variable>    pPE_Variable;
+    ary::idl::E_ParameterDirection
+                        eCurParsedParam_Direction;
+    ary::idl::Type_id   nCurParsedParam_Type;
+    String              sCurParsedParam_Name;
+    bool                bIsForConstructors;
+};
+
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_iface.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_iface.hxx
new file mode 100644
index 000000000000..37f33cf8a73a
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_iface.hxx
@@ -0,0 +1,186 @@
+/* -*- 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 ADC_UIDL_PE_IFACE_HXX
+#define ADC_UIDL_PE_IFACE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+namespace idl
+{
+    class Interface;
+}
+}
+
+namespace csi
+{
+namespace uidl
+{
+
+
+
+class PE_Function;
+class PE_Attribute;
+class PE_Type;
+
+class PE_Interface : public UnoIDL_PE,
+                     public ParseEnvState
+{
+  public:
+                        PE_Interface();
+    virtual             ~PE_Interface();
+
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_MetaType(
+                            const TokMetaType & i_rToken );
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_NameSeparator();
+    virtual void        Process_BuiltInType(
+                            const TokBuiltInType &
+                                                i_rToken );
+    virtual void        Process_TypeModifier(
+                            const TokTypeModifier &
+                                                i_rToken );
+    virtual void        Process_Stereotype(
+                            const TokStereotype &
+                                                i_rToken );
+    virtual void        Process_Default();
+
+  private:
+    enum E_State        /// @ATTENTION  Do not change existing values (except of e_STATES_MAX) !!! Else array-indices will break.
+    {
+        e_none = 0,
+        need_uik,
+        uik,
+        need_ident,
+        ident,
+        need_interface,
+        need_name,
+        wait_for_base,
+        in_base,            // in header, after ":"
+        need_curlbr_open,
+        e_std,
+        in_function,
+        in_attribute,
+        need_finish,
+        in_base_interface,  // in body, after "interface"
+        e_STATES_MAX
+    };
+    enum E_TokenType    /// @ATTENTION  Do not change existing values (except of tt_MAX) !!! Else array-indices will break.
+    {
+        tt_metatype = 0,
+        tt_identifier = 1,
+        tt_punctuation = 2,
+        tt_startoftype = 3,
+        tt_stereotype = 4,
+        tt_MAX
+    };
+    typedef void (PE_Interface::*F_TOK)(const char *);
+
+
+    void                On_need_uik_MetaType(const char * i_sText);
+    void                On_uik_Identifier(const char * i_sText);
+    void                On_uik_Punctuation(const char * i_sText);
+    void                On_need_ident_MetaType(const char * i_sText);
+    void                On_ident_Identifier(const char * i_sText);
+    void                On_ident_Punctuation(const char * i_sText);
+    void                On_need_interface_MetaType(const char * i_sText);
+    void                On_need_name_Identifer(const char * i_sText);
+    void                On_wait_for_base_Punctuation(const char * i_sText);
+    void                On_need_curlbr_open_Punctuation(const char * i_sText);
+    void                On_std_Metatype(const char * i_sText);
+    void                On_std_Punctuation(const char * i_sText);
+    void                On_std_Stereotype(const char * i_sText);
+    void                On_std_GotoFunction(const char * i_sText);
+    void                On_std_GotoAttribute(const char * i_sText);
+    void                On_std_GotoBaseInterface(const char * i_sText);
+    void                On_need_finish_Punctuation(const char * i_sText);
+    void                On_Default(const char * i_sText);
+
+    void                CallHandler(
+                            const char *        i_sTokenText,
+                            E_TokenType         i_eTokenType );
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    virtual void        ReceiveData();
+    virtual UnoIDL_PE & MyPE();
+
+    void                store_Interface();
+
+    // DATA
+    static F_TOK        aDispatcher[e_STATES_MAX][tt_MAX];
+
+    E_State             eState;
+    String              sData_Name;
+    bool                bIsPreDeclaration;
+    ary::idl::Interface *
+                        pCurInterface;
+    ary::idl::Ce_id     nCurInterface;
+
+    Dyn<PE_Function>    pPE_Function;
+    Dyn<PE_Attribute>   pPE_Attribute;
+
+    Dyn<PE_Type>        pPE_Type;
+    ary::idl::Type_id   nCurParsed_Base;
+    bool                bOptionalMember;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx
new file mode 100644
index 000000000000..1c75d25203d1
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_modul.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 LUIDL_PE_MODUL_HXX
+#define LUIDL_PE_MODUL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <semantic/semnode.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+
+class PE_Module : public ::ParseEnvironment
+{
+  public:
+
+    virtual void        Enter(
+                            E_EnvStackAction    i_eWayOfEntering );
+    virtual void        Leave(
+                            E_EnvStackAction    i_eWayOfLeaving );
+
+  private:
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_property.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_property.hxx
new file mode 100644
index 000000000000..15aa52b7c31a
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_property.hxx
@@ -0,0 +1,125 @@
+/* -*- 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 ADC_UIDL_PE_PROPERTY_HXX
+#define ADC_UIDL_PE_PROPERTY_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+#include <ary/idl/i_property.hxx>
+    // PARAMETERS
+#include <ary/idl/i_gate.hxx>
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class PE_Variable;
+
+class PE_Property : public UnoIDL_PE,
+                    public ParseEnvState
+{
+  public:
+    typedef ary::idl::Ce_id                     Ce_id;
+    typedef ary::idl::Type_id                   Type_id;
+    typedef ary::idl::Property::Stereotypes     Stereotypes;
+
+
+                        PE_Property(
+                            const Ce_id &       i_rCurOwner );
+
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &
+                                                io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+    virtual             ~PE_Property();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Stereotype(
+                            const TokStereotype &
+                                                i_rToken );
+    virtual void        Process_MetaType(
+                            const TokMetaType & i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_Default();
+
+    void                PresetOptional()        { bIsOptional = true; }
+    void                PresetStereotypes(
+                            Stereotypes::E_Flags
+                                                i_eFlag )
+                                                { aStereotypes.Set_Flag(i_eFlag); }
+  private:
+    enum E_State
+    {
+        e_none,
+        e_start,
+        expect_variable,
+        in_variable
+    };
+
+    virtual void        InitData();
+    virtual void        ReceiveData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+    // DATA
+    E_State             eState;
+    const Ce_id *       pCurOwner;
+
+    Dyn<PE_Variable>    pPE_Variable;
+
+        // object-data
+    Type_id             nCurParsedType;
+    String              sCurParsedName;
+    bool                bIsOptional;
+    Stereotypes         aStereotypes;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_selem.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_selem.hxx
new file mode 100644
index 000000000000..54088fdbdd9c
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_selem.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 LUIDL_PE_SELEM_HXX
+#define LUIDL_PE_SELEM_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/idl/i_gate.hxx>
+
+
+namespace udm {
+class Agent_Struct;
+}   // namespace udm
+
+
+namespace csi
+{
+namespace uidl
+{
+
+class PE_Type;
+class StructElement;
+class Struct;
+
+class PE_StructElement : public UnoIDL_PE,
+                         public ParseEnvState
+{
+  public:
+    typedef ary::idl::Ce_id       RStructElement;
+    typedef ary::idl::Ce_id       RStruct;
+
+                        PE_StructElement(       /// Use for Struct-elements
+                            RStructElement &    o_rResult,
+                            const RStruct &     i_rCurStruct,
+                            const String &      i_rCurStructTemplateParam );
+                        PE_StructElement(       /// Use for Exception-elements
+                            RStructElement &    o_rResult,
+                            const RStruct &     i_rCurExc );
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+                        ~PE_StructElement();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Default();
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+
+  private:
+    enum E_State
+    {
+        e_none,
+        expect_type,
+        expect_name,
+        expect_finish
+    };
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+    ary::idl::Type_id   lhf_FindTemplateParamType() const;
+
+    // DATA
+    E_State             eState;
+    RStructElement *    pResult;
+    const RStruct *     pCurStruct;
+    bool                bIsExceptionElement;
+
+    Dyn<PE_Type>        pPE_Type;
+    ary::idl::Type_id   nType;
+    String              sName;
+    const String *      pCurStructTemplateParam;
+};
+
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_servi.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_servi.hxx
new file mode 100644
index 000000000000..691b97d5a432
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_servi.hxx
@@ -0,0 +1,151 @@
+/* -*- 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 ADC_UIDL_PE_SERVI_HXX
+#define ADC_UIDL_PE_SERVI_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+     namespace idl
+    {
+         class Service;
+         class SglIfcService;
+    }
+}
+
+namespace csi
+{
+namespace uidl
+{
+
+class PE_Property;
+class PE_Type;
+class PE_Function;
+
+
+class PE_Service : public UnoIDL_PE,
+                   public ParseEnvState
+{
+  public:
+                        PE_Service();
+    virtual             ~PE_Service();
+
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_MetaType(
+                            const TokMetaType & i_rToken );
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_Stereotype(
+                            const TokStereotype &
+                                                i_rToken );
+    virtual void        Process_Needs();
+    virtual void        Process_Observes();
+    virtual void        Process_Default();
+
+  private:
+    void                On_Default();
+
+    enum E_State
+    {
+        e_none = 0,
+        need_name,
+        need_curlbr_open,
+        e_std,
+        in_property,
+        in_ifc_type,
+        in_service_type,
+        expect_ifc_separator,
+        expect_service_separator,
+        at_ignore,
+        need_finish,
+        need_base_interface,    /// After ":".
+        need_curlbr_open_sib,   /// After base interface in single interface based service.
+        e_std_sib,              /// Standard in single interface based service.
+        e_STATES_MAX
+    };
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    virtual void        ReceiveData();
+    virtual UnoIDL_PE & MyPE();
+
+    void                StartProperty();
+
+
+    // DATA
+    E_State             eState;
+    String              sData_Name;
+    bool                bIsPreDeclaration;
+    ary::idl::Service * pCurService;
+    ary::idl::SglIfcService *
+                        pCurSiService;
+    ary::idl::Ce_id     nCurService;  // Needed for PE_Attribute.
+
+    Dyn<PE_Property>    pPE_Property;
+    ary::idl::Ce_id     nCurParsed_Property;
+
+    Dyn<PE_Type>        pPE_Type;
+    ary::idl::Type_id   nCurParsed_Type;
+
+    Dyn<PE_Function>    pPE_Constructor;
+
+    bool                bOptionalMember;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx
new file mode 100644
index 000000000000..5affacaa925e
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_singl.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 LUIDL_PE_SINGL_HXX
+#define LUIDL_PE_SINGL_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace ary
+{
+    namespace idl
+    {
+        class Singleton;
+        class SglIfcSingleton;
+    }
+}
+
+
+namespace csi
+{
+namespace uidl
+{
+
+class PE_Type;
+
+
+class PE_Singleton : public UnoIDL_PE,
+                     public ParseEnvState
+{
+  public:
+                        PE_Singleton();
+    virtual             ~PE_Singleton();
+
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_MetaType(
+                            const TokMetaType & i_rToken );
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_Default();
+
+  private:
+    enum E_State
+    {
+        e_none = 0,
+        need_name,
+        need_curlbr_open,
+        e_std,
+        in_service,
+        need_finish,
+        in_base_interface,
+        e_STATES_MAX
+    };
+
+    void                On_Default();
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    virtual void        ReceiveData();
+    virtual UnoIDL_PE & MyPE();
+
+    // DATA
+//  static F_TOK        aDispatcher[e_STATES_MAX][tt_MAX];
+
+    E_State             eState;
+    String              sData_Name;
+    bool                bIsPreDeclaration;
+    ary::idl::Singleton *
+                        pCurSingleton;
+    ary::idl::SglIfcSingleton *
+                        pCurSiSingleton;
+
+    Dyn<PE_Type>        pPE_Type;
+    ary::idl::Type_id   nCurParsed_Type;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx
new file mode 100644
index 000000000000..3746d74e4144
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx
@@ -0,0 +1,287 @@
+/* -*- 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 LUIDL_PE_STRUC_HXX
+#define LUIDL_PE_STRUC_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+#include <s2_luidl/semnode.hxx>
+#include <ary/qualiname.hxx>
+    // PARAMETERS
+
+
+
+namespace csi
+{
+namespace prl
+{
+    class TNamespace;
+}
+}
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class Struct;
+class StructElement;
+class PE_StructElement;
+class PE_Type;
+
+
+class PE_Struct : public UnoIDL_PE
+{
+  public:
+                        PE_Struct();
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+                        ~PE_Struct();
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+  private:
+    struct S_Work
+    {
+                            S_Work();
+
+        void                InitData();
+        void                Prepare_PE_QualifiedName();
+        void                Prepare_PE_Element();
+        void                Data_Set_Name(
+                                const char *        i_sName );
+        void                Data_Set_TemplateParam(
+                                const char *        i_sTemplateParam );
+
+        String              sData_Name;
+        String              sData_TemplateParam;
+        bool                bIsPreDeclaration;
+        ary::idl::Ce_id     nCurStruct;
+
+        Dyn<PE_StructElement>
+                            pPE_Element;
+        ary::idl::Ce_id     nCurParsed_ElementRef;
+        Dyn<PE_Type>        pPE_Type;
+        ary::idl::Type_id   nCurParsed_Base;
+    };
+
+    struct S_Stati;
+    class PE_StructState;
+    friend struct S_Stati;
+    friend class PE_StructState;
+
+
+    class PE_StructState : public ParseEnvState
+    {
+      public:
+
+      protected:
+                            PE_StructState(
+                                PE_Struct &         i_rStruct )
+                                                    :   rStruct(i_rStruct) {}
+        void                MoveState(
+                                ParseEnvState &     i_rState ) const;
+        void                SetResult(
+                                E_TokenDone         i_eDone,
+                                E_EnvStackAction    i_eWhat2DoWithEnvStack,
+                                UnoIDL_PE *         i_pParseEnv2Push = 0 ) const
+                                                    { rStruct.SetResult(i_eDone, i_eWhat2DoWithEnvStack, i_pParseEnv2Push); }
+
+        S_Stati &           Stati() const           { return *rStruct.pStati; }
+        S_Work &            Work() const            { return rStruct.aWork; }
+        PE_Struct &         PE() const              { return rStruct; }
+
+      private:
+        virtual UnoIDL_PE & MyPE();
+        // DATA
+        PE_Struct &         rStruct;
+    };
+
+    class State_None : public PE_StructState
+    {
+        public:
+                            State_None(
+                                PE_Struct &         i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+    };
+    class State_WaitForName : public PE_StructState
+    {   // -> Name
+      public:
+                            State_WaitForName(
+                                PE_Struct &         i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Identifier(
+                                const TokIdentifier &
+                                                    i_rToken );
+    };
+    class State_GotName : public PE_StructState
+    {   // -> : { ; <
+      public:
+                            State_GotName(
+                                PE_Struct &         i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Punctuation(
+                                const TokPunctuation &
+                                                    i_rToken );
+    };
+    class State_WaitForTemplateParam : public PE_StructState
+    {   // -> Template parameter identifier
+      public:
+                            State_WaitForTemplateParam(
+                                PE_Struct &         i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Identifier(
+                                const TokIdentifier &
+                                                    i_rToken );
+    };
+    class State_WaitForTemplateEnd : public PE_StructState
+    {   // -> >
+      public:
+                            State_WaitForTemplateEnd(
+                                PE_Struct &         i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Punctuation(
+                                const TokPunctuation &
+                                                    i_rToken );
+    };
+    class State_WaitForBase : public PE_StructState
+    {   // -> Base
+      public:
+                            State_WaitForBase(
+                                PE_Struct &         i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        On_SubPE_Left();
+    };
+    class State_GotBase : public PE_StructState
+    {   // -> {
+      public:
+                            State_GotBase(
+                                PE_Struct &         i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Punctuation(
+                                const TokPunctuation &
+                                                    i_rToken );
+    };
+    class State_WaitForElement : public PE_StructState
+    {   // -> Typ }
+      public:
+                            State_WaitForElement(
+                                PE_Struct &         i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Identifier(
+                                const TokIdentifier &
+                                                    i_rToken );
+        virtual void        Process_NameSeparator();
+        virtual void        Process_BuiltInType(
+                                const TokBuiltInType &
+                                                    i_rToken );
+        virtual void        Process_TypeModifier(
+                                const TokTypeModifier &
+                                                    i_rToken );
+        virtual void        Process_Punctuation(
+                                const TokPunctuation &
+                                                    i_rToken );
+    };
+    class State_WaitForFinish : public PE_StructState
+    { // -> ;
+      public:
+                            State_WaitForFinish(
+                                PE_Struct &         i_rStruct )
+                                                    :   PE_StructState(i_rStruct) {}
+        virtual void        Process_Punctuation(
+                                const TokPunctuation &
+                                                    i_rToken );
+    };
+
+    struct S_Stati
+    {
+                            S_Stati(
+                                PE_Struct &         io_rStruct );
+        void                SetState(
+                                ParseEnvState &     i_rNextState )
+                                                    { pCurStatus = &i_rNextState; }
+
+        State_None          aNone;
+        State_WaitForName   aWaitForName;
+        State_GotName       aGotName;
+        State_WaitForTemplateParam
+                            aWaitForTemplateParam;
+        State_WaitForTemplateEnd
+                            aWaitForTemplateEnd;
+        State_WaitForBase   aWaitForBase;
+        State_GotBase       aGotBase;
+        State_WaitForElement
+                            aWaitForElement;
+        State_WaitForFinish aWaitForFinish;
+
+        ParseEnvState *     pCurStatus;
+    };
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    virtual void        ReceiveData();
+
+    public:
+
+    void        store_Struct();
+
+    private:
+
+    S_Stati &           Stati()                 { return *pStati; }
+    S_Work &            Work()                  { return aWork; }
+
+    // DATA
+    S_Work              aWork;
+    Dyn<S_Stati>        pStati;
+};
+
+
+inline void
+PE_Struct::PE_StructState::MoveState(
+                                ParseEnvState &     i_rState ) const
+                                                    { rStruct.Stati().SetState(i_rState); }
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.hxx
new file mode 100644
index 000000000000..ea8228fecbae
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.hxx
@@ -0,0 +1,126 @@
+/* -*- 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 LUIDL_PE_TYDF2_HXX
+#define LUIDL_PE_TYDF2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+
+
+namespace csi
+{
+namespace uidl
+{
+
+class PE_Type;
+
+
+class PE_Typedef : public UnoIDL_PE,
+                   public ParseEnvState
+{
+  public:
+                        PE_Typedef();
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &   io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+                        ~PE_Typedef();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_Default();
+
+  private:
+    enum E_State
+    {
+        e_none = 0,
+        expect_description,
+        expect_name,
+        got_name,
+        e_STATES_MAX
+    };
+    enum E_TokenType    /// @ATTENTION  Do not change existing values (except of tt_MAX) !!! Else array-indices will break.
+    {
+        tt_any = 0,
+        tt_identifier,
+        tt_punctuation,
+        tt_MAX
+    };
+    typedef void (PE_Typedef::*F_TOK)(const char *);
+
+
+    void                CallHandler(
+                            const char *        i_sTokenText,
+                            E_TokenType         i_eTokenType );
+
+    void                On_expect_description_Any(const char * i_sText);
+    void                On_expect_name_Identifier(const char * i_sText);
+    void                On_got_name_Punctuation(const char * i_sText);
+    void                On_Default(const char * );
+
+    virtual void        InitData();
+    virtual void        ReceiveData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+    // DATA
+    static F_TOK        aDispatcher[e_STATES_MAX][tt_MAX];
+
+    E_State             eState;
+    Dyn<PE_Type>        pPE_Type;
+    ary::idl::Type_id   nType;
+    String              sName;
+};
+
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_type2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_type2.hxx
new file mode 100644
index 000000000000..2d6367528672
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_type2.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 ADC_PE_TYPE2_HXX
+#define ADC_PE_TYPE2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include<s2_luidl/parsenv2.hxx>
+#include<s2_luidl/pestate.hxx>
+    // COMPONENTS
+#include<ary/qualiname.hxx>
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class PE_Type : public UnoIDL_PE,
+                public ParseEnvState
+{
+  public:
+                         PE_Type(
+                            ary::idl::Type_id & o_rResult );
+    virtual             ~PE_Type();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_NameSeparator();
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_BuiltInType(
+                            const TokBuiltInType &
+                                                i_rToken );
+    virtual void        Process_TypeModifier(
+                            const TokTypeModifier &
+                                                i_rToken );
+    virtual void        Process_Default();
+
+  private:
+    enum E_State
+    {
+        e_none = 0,
+        expect_type,
+        expect_quname_part,
+        expect_quname_separator,
+        in_template_type
+    };
+
+    void                Finish();
+    PE_Type &           MyTemplateType();
+
+    virtual void        InitData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+    // DATA
+    ary::idl::Type_id * pResult;
+
+    uintt               nIsSequenceCounter;
+    uintt               nSequenceDownCounter;
+    bool                bIsUnsigned;
+    ary::QualifiedName  sFullType;
+
+    E_State             eState;
+    String              sLastPart;
+
+    Dyn<PE_Type>        pPE_TemplateType;   /// @attention Recursion, only initiate, if needed!
+    ary::idl::Type_id   nTemplateType;
+    std::vector<ary::idl::Type_id>
+                        aTemplateParameters;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_vari2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_vari2.hxx
new file mode 100644
index 000000000000..961539c57abd
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pe_vari2.hxx
@@ -0,0 +1,109 @@
+/* -*- 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 ADC_UIDL_PE_VARI2_HXX
+#define ADC_UIDL_PE_VARI2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/parsenv2.hxx>
+#include <s2_luidl/pestate.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class PE_Type;
+
+
+class PE_Variable : public UnoIDL_PE,
+                    public ParseEnvState
+{
+  public:
+                        PE_Variable(
+                            ary::idl::Type_id & i_rResult_Type,
+                            String &            i_rResult_Name );
+    virtual void        EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::Repository &
+                                                io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+    virtual             ~PE_Variable();
+
+    virtual void        ProcessToken(
+                            const Token &       i_rToken );
+
+    virtual void        Process_Default();
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_BuiltInType(
+                            const TokBuiltInType &
+                                                i_rToken );
+  private:
+    enum E_State
+    {
+        e_none,
+        expect_type,
+        expect_name,
+        expect_finish
+    };
+
+    virtual void        InitData();
+    virtual void        ReceiveData();
+    virtual void        TransferData();
+    virtual UnoIDL_PE & MyPE();
+
+    // DATA
+    E_State             eState;
+    ary::idl::Type_id * pResult_Type;
+    String *            pResult_Name;
+
+    Dyn<PE_Type>        pPE_Type;
+};
+
+
+
+}   // namespace uidl
+}   // namespace csi
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/pestate.hxx b/autodoc/source/parser_i/inc/s2_luidl/pestate.hxx
new file mode 100644
index 000000000000..78582ab0abae
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/pestate.hxx
@@ -0,0 +1,108 @@
+/* -*- 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 ADC_PESTATE_HXX
+#define ADC_PESTATE_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include<s2_luidl/tokintpr.hxx>
+#include<s2_luidl/tokproct.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class TokIdentifier;
+class TokBuiltInType;
+class TokPunctuation;
+class Tok_Documentation;
+
+class ParseEnvState : public    TokenInterpreter,
+                      virtual protected TokenProcessing_Types
+{
+  public:
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken );
+    virtual void        Process_NameSeparator();
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken );
+    virtual void        Process_BuiltInType(
+                            const TokBuiltInType &
+                                                i_rToken );
+    virtual void        Process_TypeModifier(
+                            const TokTypeModifier &
+                                                i_rToken );
+    virtual void        Process_MetaType(
+                            const TokMetaType & i_rToken );
+    virtual void        Process_Stereotype(
+                            const TokStereotype &
+                                                i_rToken );
+    virtual void        Process_ParameterHandling(
+                            const TokParameterHandling &
+                                                i_rToken );
+    virtual void        Process_Raises();
+    virtual void        Process_Needs();
+    virtual void        Process_Observes();
+    virtual void        Process_Assignment(
+                            const TokAssignment &
+                                                i_rToken );
+    virtual void        Process_EOL();
+
+    virtual void        On_SubPE_Left();
+
+    virtual void        Process_Default();
+
+  protected:
+                        ParseEnvState()         :   bDefaultIsError(true) {}
+    void                SetDefault2Ignore()     { bDefaultIsError = false; }
+
+  private:
+    virtual UnoIDL_PE & MyPE() = 0;
+    bool                bDefaultIsError;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/semnode.hxx b/autodoc/source/parser_i/inc/s2_luidl/semnode.hxx
new file mode 100644
index 000000000000..b734fd9f72f4
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/semnode.hxx
@@ -0,0 +1,99 @@
+/* -*- 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 ADC_SEMNODE_HXX
+#define ADC_SEMNODE_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/tokproct.hxx>
+    // COMPONENTS
+    // PARAMETERS
+#include <ary/qualiname.hxx>
+
+
+namespace ary
+{
+    class QualifiedName;
+    class Repository;
+
+namespace idl
+{
+    class Gate;
+    class Module;
+}   // namespace idl
+}   // namespace ary
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class Struct;
+class Token;
+
+
+/** is an implementation class for UnoIDL_PE s
+*/
+class SemanticNode : private TokenProcessing_Types
+{
+  public:
+                        SemanticNode();
+    void                EstablishContacts(
+                            UnoIDL_PE *         io_pParentPE,
+                            ary::idl::Gate &    io_rRepository,
+                            TokenProcessing_Result &
+                                                o_rResult );
+                        ~SemanticNode();
+
+    void                SetTokenResult(
+                            E_TokenDone         i_eDone,
+                            E_EnvStackAction    i_eWhat2DoWithEnvStack,
+                            UnoIDL_PE *         i_pParseEnv2Push = 0 );
+    UnoIDL_PE *         Parent() const          { return pParentPE; }
+    ary::idl::Gate &    AryGate() const         { return *pAryGate; }
+    TokenProcessing_Result &
+                        TokenResult() const     { return *pTokenResult; }
+
+  private:
+    // DATA
+    UnoIDL_PE *         pParentPE;
+    ary::idl::Gate *    pAryGate;
+    TokenProcessing_Result *
+                        pTokenResult;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx b/autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx
new file mode 100644
index 000000000000..c29f7297c181
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx
@@ -0,0 +1,84 @@
+/* -*- 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 ADC_SMP_HXX
+#define ADC_SMP_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/tok_recv.hxx>
+#include <s2_dsapi/tok_recv.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace csi
+{
+namespace uidl
+{
+
+
+
+/** is an implementation class for ParseEnvironment
+*/
+class SemanticParser : public csi::uidl::Token_Receiver,
+                       public csi::dsapi::Token_Receiver
+{
+  public:
+  typedef std::deque< DYN TextToken * > TokenQueue;
+
+                        ~SemanticParser();
+
+
+    void                Receive(
+                            DYN csi::uidl::Token &
+                                                let_drToken );
+    void                Receive(
+                            DYN csi::dsapi::Token &
+                                                let_drToken );
+
+  private:
+    // DATA
+    TokenQueue          aTokenQueue;
+
+
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_const.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_const.hxx
new file mode 100644
index 000000000000..e423a8130b0d
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/tk_const.hxx
@@ -0,0 +1,66 @@
+/* -*- 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 ADC_UIDL_TK_CONST_HXX
+#define ADC_UIDL_TK_CONST_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/uidl_tok.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class TokAssignment : public Token
+{
+  public:
+                        TokAssignment(
+                            const char *        i_sText )
+                                                :   sText(i_sText) {}
+
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+  private:
+    // DATA
+    String              sText;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_ident.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_ident.hxx
new file mode 100644
index 000000000000..1abc3cf77a46
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/tk_ident.hxx
@@ -0,0 +1,77 @@
+/* -*- 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 ADC_UIDL_TK_IDENT_HXX
+#define ADC_UIDL_TK_IDENT_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/uidl_tok.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class TokIdentifier : public Token
+{
+  public:
+                        TokIdentifier(
+                            const char *        i_sText )
+                                                :   sText(i_sText) {}
+
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+  private:
+    // DATA
+    String              sText;
+};
+
+class TokNameSeparator : public Token
+{
+  public:
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx
new file mode 100644
index 000000000000..ac0120c7582d
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx
@@ -0,0 +1,253 @@
+/* -*- 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 ADC_UIDL_TK_KEYW_HXX
+#define ADC_UIDL_TK_KEYW_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/uidl_tok.hxx>
+    // COMPONENTS
+#include <luxenum.hxx>
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class TokKeyword : public Token
+{
+};
+
+
+class TokBuiltInType : public TokKeyword
+{
+  public:
+    enum E_TokenId
+    {
+        e_none = 0,
+        bty_any = 1,
+        bty_boolean = 2,
+        bty_byte = 3,
+        bty_char = 4,
+        bty_double = 5,
+        bty_hyper = 6,
+        bty_long = 7,
+        bty_short = 8,
+        bty_string = 9,
+        bty_void = 10,
+        bty_ellipse = 11
+    };
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+
+                        TokBuiltInType(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+    E_TokenId           Id() const              { return eTag; }
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+};
+
+
+class TokTypeModifier : public TokKeyword
+{
+  public:
+    enum E_TokenId
+    {
+        e_none = 0,
+        tmod_unsigned = 1,
+        tmod_sequence
+    };
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+
+                        TokTypeModifier(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+    E_TokenId           Id() const              { return eTag; }
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+};
+
+class TokMetaType : public TokKeyword
+{
+  public:
+    enum E_TokenId
+    {
+        e_none = 0,
+        mt_attribute = 1,
+        mt_constants,
+        mt_enum,
+        mt_exception,
+        mt_ident,
+        mt_interface,
+        mt_module,
+        mt_property,
+        mt_service,
+        mt_singleton,
+        mt_struct,
+        mt_typedef,
+        mt_uik
+    };
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+
+                        TokMetaType(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+    E_TokenId           Id() const              { return eTag; }
+
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+};
+
+class TokStereotype : public TokKeyword
+{
+  public:
+    // TYPES
+    enum E_TokenId
+    {
+        e_none = 0,
+        ste_bound = 1,
+        ste_const,
+        ste_constrained,
+        ste_maybeambiguous,
+        ste_maybedefault,
+        ste_maybevoid,
+        ste_oneway,
+        ste_optional,
+        ste_readonly,
+        ste_removable,
+        ste_virtual,
+        ste_transient,
+        ste_published
+    };
+
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+
+                        TokStereotype(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char *
+                        Text() const;
+    E_TokenId           Id() const              { return eTag; }
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+};
+
+class TokParameterHandling : public TokKeyword
+{
+  public:
+    // TYPES
+    enum E_TokenId
+    {
+        e_none = 0,
+        ph_in,
+        ph_out,
+        ph_inout
+    };
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+
+                        TokParameterHandling(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char *
+                        Text() const;
+    E_TokenId           Id() const              { return eTag; }
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+};
+
+class TokRaises : public TokKeyword
+{
+  public:
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+};
+
+class TokNeeds : public TokKeyword
+{
+  public:
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+};
+
+class TokObserves : public TokKeyword
+{
+  public:
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    virtual const char *
+                        Text() const;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx
new file mode 100644
index 000000000000..043256ef27e5
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/tk_punct.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 ADC_UIDL_TK_PUNCT_HXX
+#define ADC_UIDL_TK_PUNCT_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <s2_luidl/uidl_tok.hxx>
+    // COMPONENTS
+#include <luxenum.hxx>
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class TokPunctuation : public Token
+{
+  public:
+    // TYPES
+    enum E_TokenId
+    {
+        e_none = 0,
+        BracketOpen =  1,           // (
+        BracketClose = 2,           // )
+        ArrayBracketOpen = 3,       // [
+        ArrayBracketClose = 4,      // ]
+        CurledBracketOpen = 5,      // {
+        CurledBracketClose = 6,     // }
+        Semicolon = 7,              // ;
+        Colon = 8,                  // :
+        DoubleColon = 9,            // ::
+        Comma = 10,                 // ,
+        Minus = 11,                 // -
+        Fullstop = 12,              // .
+        Lesser = 13,                // <
+        Greater = 14                // >
+    };
+    typedef lux::Enum<E_TokenId> EV_TokenId;
+
+
+                        TokPunctuation(
+                            EV_TokenId          i_eTag )
+                                                :   eTag(i_eTag) {}
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char *
+                        Text() const;
+    EV_TokenId          Id() const              { return eTag; }
+
+
+  private:
+    // DATA
+    EV_TokenId          eTag;
+};
+
+class Tok_EOL : public Token
+{
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char *
+                        Text() const;
+};
+
+class Tok_EOF : public Token
+{
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const;
+    // INQUIRY
+    virtual const char *
+                        Text() const;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.hxx b/autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.hxx
new file mode 100644
index 000000000000..02c35e2fd871
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.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 ADC_TKP_UIDL_HXX
+#define ADC_TKP_UIDL_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkp2.hxx>
+    // COMPONENTS
+    // PARAMETRS
+
+class TkpDocuContext;
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+
+class Token_Receiver;
+class Context_UidlCode;
+
+
+/** This is a TokenParser which is able to parse tokens from
+    C++ source code.
+*/
+class TokenParser_Uidl : public TokenParse2
+{
+  public:
+    // LIFECYCLE
+                        TokenParser_Uidl(
+                            Token_Receiver &    o_rUidlReceiver,
+                            DYN TkpDocuContext &
+                                                let_drDocuContext );
+    virtual             ~TokenParser_Uidl();
+
+    // OPERATIONS
+  private:
+    virtual ::TkpContext &
+                        CurrentContext();
+
+    virtual void        SetStartContext();
+    virtual void        SetCurrentContext(
+                            TkpContext &        io_rContext );
+    // DATA
+    Dyn<Context_UidlCode>
+                        pBaseContext;
+    ::TkpContext *      pCurContext;
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/tokintpr.hxx b/autodoc/source/parser_i/inc/s2_luidl/tokintpr.hxx
new file mode 100644
index 000000000000..fcfd1972ce1b
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/tokintpr.hxx
@@ -0,0 +1,101 @@
+/* -*- 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 ADC_LUIDL_TOKINTPR_HXX
+#define ADC_LUIDL_TOKINTPR_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class TokIdentifier;
+class TokPunctuation;
+class TokBuiltInType;
+class TokTypeModifier;
+class TokMetaType;
+class TokStereotype;
+class TokParameterHandling;
+class TokAssignment;
+class Tok_Documentation;
+
+
+class TokenInterpreter
+{
+  public:
+    virtual             ~TokenInterpreter() {}
+
+    virtual void        Process_Identifier(
+                            const TokIdentifier &
+                                                i_rToken ) = 0;
+    virtual void        Process_NameSeparator() = 0;      // ::
+    virtual void        Process_Punctuation(
+                            const TokPunctuation &
+                                                i_rToken ) = 0;
+    virtual void        Process_BuiltInType(
+                            const TokBuiltInType &
+                                                i_rToken ) = 0;
+    virtual void        Process_TypeModifier(
+                            const TokTypeModifier &
+                                                i_rToken ) = 0;
+    virtual void        Process_MetaType(
+                            const TokMetaType & i_rToken ) = 0;
+    virtual void        Process_Stereotype(
+                            const TokStereotype &
+                                                i_rToken ) = 0;
+    virtual void        Process_ParameterHandling(
+                            const TokParameterHandling &
+                                                i_rToken ) = 0;
+    virtual void        Process_Raises() = 0;
+    virtual void        Process_Needs() = 0;
+    virtual void        Process_Observes() = 0;
+    virtual void        Process_Assignment(
+                            const TokAssignment &
+                                                i_rToken ) = 0;
+    virtual void        Process_EOL() = 0;
+};
+
+
+
+// IMPLEMENTATION
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx b/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx
new file mode 100644
index 000000000000..ad996ecd1359
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/tokproct.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 ADC_TOKPROCT_HXX
+#define ADC_TOKPROCT_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class UnoIDL_PE;
+
+
+/** is a parent class for classes, which take part in parsing tokens semantically.
+    It provides some types for them.
+*/
+class TokenProcessing_Types
+{
+  public:
+    enum E_TokenDone
+    {
+        not_done = 0,
+        done = 1
+    };
+
+    enum E_EnvStackAction
+    {
+        stay,           // same parse environment
+        push_sure,      // push sub environment, which must be the correct one
+        push_try,       // push sub environment, which is tried, if it may be the right one
+        pop_success,    // return to parent environment, parsing was successful
+        pop_failure     // return to parent environment, but an error occurred.
+    };
+
+    struct TokenProcessing_Result
+    {
+        E_TokenDone         eDone;
+        E_EnvStackAction    eStackAction;
+        UnoIDL_PE *         pEnv2Push;
+
+                            TokenProcessing_Result()
+                                                : eDone(not_done), eStackAction(stay), pEnv2Push(0) {}
+        void                reset()             { eDone = not_done; eStackAction = stay; pEnv2Push = 0; }
+    };
+
+    enum E_ParseResult
+    {
+        res_error,
+        res_complete,
+        res_predeclaration
+    };
+};
+
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/tokrecv.hxx b/autodoc/source/parser_i/inc/s2_luidl/tokrecv.hxx
new file mode 100644
index 000000000000..f1d43dd5a435
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/tokrecv.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 LUIDL_TOKRECV_HXX
+#define LUIDL_TOKRECV_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class Token;
+
+/**
+@descr
+*/
+class Token_Receiver
+{
+  public:
+    virtual             ~Token_Receiver() {}
+    virtual void        Receive(
+                            DYN Token &         let_drToken ) = 0;
+    virtual void        Increment_CurLine() = 0;
+};
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/s2_luidl/uidl_tok.hxx b/autodoc/source/parser_i/inc/s2_luidl/uidl_tok.hxx
new file mode 100644
index 000000000000..a316582b381b
--- /dev/null
+++ b/autodoc/source/parser_i/inc/s2_luidl/uidl_tok.hxx
@@ -0,0 +1,66 @@
+/* -*- 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 ADC_UIDL_TOK_HXX
+#define ADC_UIDL_TOK_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/token2.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+class ParserInfo;
+
+namespace csi
+{
+namespace uidl
+{
+
+
+class TokenInterpreter;
+
+class Token : public TextToken
+{
+  public:
+    // LIFECYCLE
+    virtual             ~Token() {}
+
+    // OPERATIONS
+    virtual void        Trigger(
+                            TokenInterpreter &  io_rInterpreter ) const = 0;
+};
+
+}   // namespace uidl
+}   // namespace csi
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/semantic/parsenv2.hxx b/autodoc/source/parser_i/inc/semantic/parsenv2.hxx
new file mode 100644
index 000000000000..75facea675ce
--- /dev/null
+++ b/autodoc/source/parser_i/inc/semantic/parsenv2.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 ADC_PARSEENV2_HXX
+#define ADC_PARSEENV2_HXX
+
+
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+#include <queue>
+
+
+
+class ParseEnvironment
+{
+  public:
+    virtual             ~ParseEnvironment();
+
+    virtual void        Enter() = 0;
+};
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/tokens/stmstar2.hxx b/autodoc/source/parser_i/inc/tokens/stmstar2.hxx
new file mode 100644
index 000000000000..1555cde5e0d6
--- /dev/null
+++ b/autodoc/source/parser_i/inc/tokens/stmstar2.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 ADC_STMSTAR2_HXX
+#define ADC_STMSTAR2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/stmstat2.hxx>
+    // COMPONENTS
+    // PARAMETERS
+    // SERVICES
+
+
+class StmArrayStatu2 : public StmStatu2
+{
+  public:
+    // LIFECYCLE
+                        StmArrayStatu2(
+                            intt            i_nStatusSize,
+                            const INT16 *   in_aArrayModel,
+                            uintt           i_nTokenId,
+                            bool            in_bIsDefault );
+                        ~StmArrayStatu2();
+
+    // INQUIRY
+    StmStatu2::Branch   NextBy(
+                            intt            in_nFollowersIndex) const;
+    UINT16              TokenId() const     { return nTokenId; }
+    virtual bool        IsADefault() const;
+
+    // ACCESS
+    virtual StmArrayStatu2 *
+                        AsArray();
+    bool                SetBranch(
+                            intt            in_nBranchIx,
+                            StmStatu2::Branch
+                                            in_nBranch );
+    void                SetTokenId(
+                            UINT16          in_nTokenId );
+  private:
+    StmStatu2::Branch * dpBranches;
+    intt                nNrOfBranches;
+    UINT16              nTokenId;
+    bool                bIsADefault;
+};
+
+
+// IMPLEMENTATION
+
+inline void
+StmArrayStatu2::SetTokenId( UINT16 in_nTokenId )
+    { nTokenId = in_nTokenId; }
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/tokens/stmstat2.hxx b/autodoc/source/parser_i/inc/tokens/stmstat2.hxx
new file mode 100644
index 000000000000..3d83bb0f77fb
--- /dev/null
+++ b/autodoc/source/parser_i/inc/tokens/stmstat2.hxx
@@ -0,0 +1,70 @@
+/* -*- 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 ADC_STMSTAT2_HXX
+#define ADC_STMSTAT2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+class StmArrayStatu2;
+class StmBoundsStatu2;
+
+/** A StmStatu2 is a state within a StateMachin2.
+    There are two kinds of it.  Either its an array of pointers to
+    other states within the state machine - an ArrayStatus.
+
+    Or it is a BoundsStatus, which shows, the token cannot be
+    followed further within the StateMachin2.
+**/
+class StmStatu2 // := "State machine status"
+{
+  public:
+    typedef intt        Branch;         /// Values >= 0 give a next #Status' ID.
+                                        /// Values <= 0 tell, that a token is finished.
+                                        /// a value < 0 returns the status back to an upper level state machine.
+        // LIFECYCLE
+    virtual             ~StmStatu2() {}
+
+        // OPERATIONS
+    virtual StmArrayStatu2 *
+                        AsArray();
+    virtual StmBoundsStatu2 *
+                        AsBounds();
+
+        // INQUIRY
+    virtual bool        IsADefault() const = 0;
+};
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx b/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx
new file mode 100644
index 000000000000..d5550752e6a3
--- /dev/null
+++ b/autodoc/source/parser_i/inc/tokens/stmstfi2.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 ADC_STMSTFI2_HXX
+#define ADC_STMSTFI2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/stmstat2.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+class TkpContext;
+class StateMachineContext;
+
+/**
+**/
+class StmBoundsStatu2 : public StmStatu2
+{
+  public:
+    // LIFECYCLE
+                        StmBoundsStatu2(
+                            StateMachineContext &
+                                                o_rOwner,
+                            TkpContext &        i_rFollowUpContext,
+                            uintt               i_nStatusFunctionNr,
+                            bool                i_bIsDefault  );
+    // INQUIRY
+    TkpContext *        FollowUpContext();
+    uintt               StatusFunctionNr() const;
+    virtual bool        IsADefault() const;
+
+    // ACCESS
+    virtual StmBoundsStatu2 *
+                        AsBounds();
+
+  private:
+    StateMachineContext *
+                        pOwner;
+    TkpContext *        pFollowUpContext;
+    uintt               nStatusFunctionNr;
+    bool                bIsDefault;
+};
+
+inline TkpContext *
+StmBoundsStatu2::FollowUpContext()
+    { return pFollowUpContext; }
+inline uintt
+StmBoundsStatu2::StatusFunctionNr() const
+    { return nStatusFunctionNr; }
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/tokens/tkp2.hxx b/autodoc/source/parser_i/inc/tokens/tkp2.hxx
new file mode 100644
index 000000000000..21b0e2bc4895
--- /dev/null
+++ b/autodoc/source/parser_i/inc/tokens/tkp2.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 ADC_TKP2_HXX
+#define ADC_TKP2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+class CharacterSource;
+class TkpContext;
+    // PARAMETRS
+
+
+
+/** This is the interface for parser classes, which get a sequence of Token s from
+    a text.
+
+    Start() starts to parse the text from the given i_rSource.
+    GetNextToken() returns a Token on the heap as long as there are
+    still characters in the text left. The last time GetNextToken()
+    returns NULL.
+
+    The algorithms for parsing tokens from the text are an issue of
+    the derived classes.
+*/
+class TokenParse2
+{
+  public:
+    // LIFECYCLE
+                        TokenParse2();
+    virtual             ~TokenParse2() {}
+
+    // OPERATIONS
+    virtual void        Start(
+                            CharacterSource &
+                                            i_rSource );
+
+    /** @short  Gets the next identifiable token out of the
+        source code.
+        @return true, if there was passed a valid token.
+                false, if the parsed stream is finished or
+                       an error occurred.
+    */
+    bool                GetNextToken();
+
+  private:
+    virtual void        SetStartContext() = 0;
+    virtual void        SetCurrentContext(
+                            TkpContext &        io_rContext ) = 0;
+    virtual TkpContext &
+                        CurrentContext() = 0;
+    // DATA
+    CharacterSource *   pChars;
+};
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/tokens/tkpcont2.hxx b/autodoc/source/parser_i/inc/tokens/tkpcont2.hxx
new file mode 100644
index 000000000000..fc7991ae1832
--- /dev/null
+++ b/autodoc/source/parser_i/inc/tokens/tkpcont2.hxx
@@ -0,0 +1,125 @@
+/* -*- 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 ADC_TKPCONT2_HXX
+#define ADC_TKPCONT2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETERS
+class CharacterSource;
+class TkpNullContext;
+class TkpNullContex2;
+
+/** @task
+    Specifies a context within which tokens are interpreted in a special
+    way. For example in parsing C++ there could be a context for code,
+    one for comments and a third one for preprocessor statements, because
+    each of these would give the same token different meanings.
+**/
+class TkpContext
+{
+  public:
+    // LIFECYCLE
+    virtual                 ~TkpContext() {}
+
+    // OPERATIONS
+    /** @descr
+        The functions starts to parse with the CurToken() of io_rText.
+        It leaves io_rText at the first char of the following Token or
+        the following Context.
+
+        This function returns, when a context has parsed some characterss
+        and completed a token OR left the context.
+        If the token is to be ignored, PassNewToken() returns false
+        and cuts the token from io_rText.
+        If the token is to be parsed further in a different context,
+        PassNewToken() returns false, but the token is
+        NOT cut from io_rText.
+
+        If the function has found a valid and complete token, PassNewToken()
+        passes the parsed token to the internally known receiver and
+        returns true. The token is cut from io_rText.
+    **/
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText ) = 0;
+    /** Has to pass the parsed token to a known receiver.
+        @return true, if a token was passed.
+                false, if no token was parsed complete by this context.
+    */
+    virtual bool        PassNewToken() = 0;
+    virtual TkpContext &
+                        FollowUpContext() = 0;
+
+    static TkpNullContext &
+                        Null_();
+};
+
+TkpNullContex2 &    TkpContext_Null2_();
+
+class StateMachineContext
+{
+  public:
+    virtual ~StateMachineContext() {}
+
+    /// Is used by StmBoundsStatu2 only.
+    virtual void        PerformStatusFunction(
+                            uintt               i_nStatusSignal,
+                            UINT16              i_nTokenId,
+                            CharacterSource &   io_rText ) = 0;
+};
+
+class TkpNullContex2 : public TkpContext
+{
+  public:
+                        ~TkpNullContex2();
+
+    virtual void        ReadCharChain(
+                            CharacterSource &   io_rText );
+    virtual bool        PassNewToken();
+    virtual TkpContext &
+                        FollowUpContext();
+};
+
+class TkpDocuContext : public TkpContext
+{
+  public:
+    virtual void        SetParentContext(
+                            TkpContext &        io_rParentContext,
+                            const char *        i_sMultiLineEndToken ) = 0;
+    virtual void        SetMode_IsMultiLine(
+                            bool                i_bTrue ) = 0;
+};
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx b/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx
new file mode 100644
index 000000000000..a23da72f2c1e
--- /dev/null
+++ b/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx
@@ -0,0 +1,123 @@
+/* -*- 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 ADC_TKPSTAM2_HXX
+#define ADC_TKPSTAM2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <tokens/tkpcont2.hxx>
+    // COMPONENTS
+#include <tokens/stmstar2.hxx>
+#include <tokens/stmstfi2.hxx>
+
+/** @descr
+    This state-machine models state transitions from one state to another
+    per indices of branches. If the indices represent ascii-char-values,
+    the state-machine can be used for recognising tokens of text.
+
+    The state-machine can be a status itself.
+
+    StateMachin2 needs the array-size of all stati as a guess, how many stati
+    the state machine will contain, when at work.
+
+
+**/
+class StateMachin2
+{
+    public:
+        // Types
+        typedef StmStatu2::Branch   Branch;
+        typedef StmStatu2 * *       StatusList;
+
+    //# Interface self
+        // LIFECYCLE
+                        StateMachin2(
+                            intt            in_nStatusSize,
+                            intt            in_nInitial_StatusListSize );   /// The user of the constructor should guess
+                                                                            ///   the approximate number of stati here to
+                                                                            ///   avoid multiple reallocations.
+        /// @#AddStatus
+        intt            AddStatus(      /// @return the new #Status' ID
+                            DYN StmStatu2 * let_dpStatus);
+        /// @#AddToken
+        void            AddToken(
+                            const char *        in_sToken,
+                            UINT16              in_nTokenId,
+                            const INT16 *       in_aBranches,
+                            INT16               in_nBoundsStatus );
+                        ~StateMachin2();
+
+        // OPERATIONS
+        StmBoundsStatu2 &
+                        GetCharChain(
+                            UINT16 &            o_nTokenId,
+                            CharacterSource &   io_rText );
+    private:
+        // SERVICE FUNCTIONS
+        StmStatu2 &     Status(
+                            intt            in_nStatusNr) const;
+        StmArrayStatu2 &
+                        CurrentStatus() const;
+        StmBoundsStatu2 *
+                        BoundsStatus() const;
+
+        /// Sets the PeekedStatus.
+        void            Peek(
+                            intt            in_nBranch);
+
+        void            ResizeStati();      // Adds space for 32 stati.
+
+        // DATA
+        StatusList      pStati;             /// List of Status, implemented as simple C-array of length #nStatiSpace
+                                            /// with nStatiLength valid members (beginning from zero).
+        intt            nCurrentStatus;
+        intt            nPeekedStatus;
+
+        intt            nStatusSize;        /// Size of the branch array of a single status.
+
+        intt            nNrofStati;         /// Nr of Stati so far.
+        intt            nStatiSpace;        /// Size of allocated array for #pStati (size in items).
+};
+
+
+
+/** @#AddToken
+    @descr
+    Adds a token, which will be recogniszeds by the
+    statemachine.
+
+
+**/
+
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/tokens/token2.hxx b/autodoc/source/parser_i/inc/tokens/token2.hxx
new file mode 100644
index 000000000000..d1a4ac3b275c
--- /dev/null
+++ b/autodoc/source/parser_i/inc/tokens/token2.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 ADC_TOKEN2_HXX
+#define ADC_TOKEN2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+    // COMPONENTS
+    // PARAMETRS
+
+
+
+/** This is the interface for parser classes, which get a sequence of Token s from
+    a text.
+
+    Start() starts to parse the text from the given i_rSource.
+    GetNextToken() returns a Token on the heap as long as there are
+    still characters in the text left. The last time GetNextToken()
+    returns NULL.
+
+    The algorithms for parsing tokens from the text are an issue of
+    the derived classes.
+*/
+class TextToken
+{
+  public:
+    // LIFECYCLE
+    virtual             ~TextToken() {}
+
+
+    // INQUIRY
+    virtual const char* Text() const = 0;
+};
+
+
+#endif
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/inc/x_parse2.hxx b/autodoc/source/parser_i/inc/x_parse2.hxx
new file mode 100644
index 000000000000..0301dc74f5a4
--- /dev/null
+++ b/autodoc/source/parser_i/inc/x_parse2.hxx
@@ -0,0 +1,70 @@
+/* -*- 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 ADC_X_PARSE2_HXX
+#define ADC_X_PARSE2_HXX
+
+// USED SERVICES
+    // BASE CLASSES
+#include <cosv/x.hxx>
+    // COMPONENTS
+    // PARAMETERS
+
+
+class X_AutodocParser : public csv::Exception
+{
+  public:
+    // TYPES
+    enum E_Type
+    {
+        x_Any                       = 0,
+        x_InvalidChar,
+        x_UnexpectedToken,
+        x_UnexpectedEOF
+    };
+    // LIFECYCLE
+                        X_AutodocParser(
+                            E_Type              i_eType,
+                            const char *        i_sName = "" )
+                                                :   eType(i_eType), sName(i_sName) {}
+    // INQUIRY
+    virtual void        GetInfo(
+                            std::ostream &      o_rOutputMedium ) const;
+
+  private:
+    E_Type              eType;
+    String              sName;
+
+};
+
+
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/tokens/makefile.mk b/autodoc/source/parser_i/tokens/makefile.mk
new file mode 100644
index 000000000000..9674e6684827
--- /dev/null
+++ b/autodoc/source/parser_i/tokens/makefile.mk
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=garden
+TARGET=parser2_tokens
+TARGETTYPE=CUI
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/stmstar2.obj	\
+    $(OBJ)$/stmstat2.obj	\
+    $(OBJ)$/stmstfi2.obj	\
+    $(OBJ)$/tkpstam2.obj	\
+    $(OBJ)$/tkp2.obj  		\
+    $(OBJ)$/tkpcont2.obj	\
+    $(OBJ)$/x_parse2.obj
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/parser_i/tokens/stmstar2.cxx b/autodoc/source/parser_i/tokens/stmstar2.cxx
new file mode 100644
index 000000000000..1cc135fa63e1
--- /dev/null
+++ b/autodoc/source/parser_i/tokens/stmstar2.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tokens/stmstar2.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <x_parse2.hxx>
+
+
+
+StmArrayStatu2::StmArrayStatu2( intt            i_nStatusSize,
+                                const INT16 *   in_aArrayModel,
+                                uintt           i_nTokenId,
+                                bool            in_bIsDefault )
+    :   dpBranches(new StmStatu2::Branch[i_nStatusSize]),
+        nNrOfBranches(i_nStatusSize),
+        nTokenId(UINT16(i_nTokenId)),
+        bIsADefault(in_bIsDefault)
+{
+    // KORR_FUTURE: Interface of StmArrayStatu2() has to be changed.
+    csv_assert(i_nTokenId < 64536);
+
+    if (in_aArrayModel != 0)
+    {
+        intt count = 0;
+        for (const INT16 * get = in_aArrayModel; count < nNrOfBranches; count++, get++)
+            dpBranches[count] = *get;
+    }
+    else //
+    {
+        memset(dpBranches, 0, nNrOfBranches);
+    }  // endif
+}
+
+StmArrayStatu2::~StmArrayStatu2()
+{
+    delete [] dpBranches;
+}
+
+bool
+StmArrayStatu2::SetBranch( intt              in_nBranchIx,
+                           StmStatu2::Branch in_nBranch )
+{
+    if ( csv::in_range(intt(0), in_nBranchIx, intt(nNrOfBranches) ) )
+    {
+        dpBranches[in_nBranchIx] = in_nBranch;
+        return true;
+    }
+    return false;
+}
+
+
+StmStatu2::Branch
+StmArrayStatu2::NextBy(intt in_nIndex) const
+{
+    if (in_nIndex < 0)
+        throw X_AutodocParser(X_AutodocParser::x_InvalidChar);
+
+    return in_nIndex < nNrOfBranches
+                ?   dpBranches[in_nIndex]
+                :   dpBranches[nNrOfBranches - 1];
+}
+
+
+bool
+StmArrayStatu2::IsADefault() const
+{
+    return bIsADefault;
+}
+
+StmArrayStatu2 *
+StmArrayStatu2::AsArray()
+{
+    return this;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/tokens/stmstat2.cxx b/autodoc/source/parser_i/tokens/stmstat2.cxx
new file mode 100644
index 000000000000..4d0cf62c4ed2
--- /dev/null
+++ b/autodoc/source/parser_i/tokens/stmstat2.cxx
@@ -0,0 +1,48 @@
+/* -*- 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 <precomp.h>
+#include <tokens/stmstat2.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+
+StmArrayStatu2 *
+StmStatu2::AsArray()
+{
+    return 0;
+}
+
+StmBoundsStatu2 *
+StmStatu2::AsBounds()
+{
+    return 0;
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/tokens/stmstfi2.cxx b/autodoc/source/parser_i/tokens/stmstfi2.cxx
new file mode 100644
index 000000000000..15bffb0bf937
--- /dev/null
+++ b/autodoc/source/parser_i/tokens/stmstfi2.cxx
@@ -0,0 +1,63 @@
+/* -*- 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 <precomp.h>
+#include <tokens/stmstfi2.hxx>
+
+
+// NOT FULLY DECLARED SERVICES
+#include <tokens/tkpcont2.hxx>
+
+
+StmBoundsStatu2::StmBoundsStatu2( StateMachineContext &
+                                                    o_rOwner,
+                                  TkpContext &      i_rFollowUpContext,
+                                  uintt             i_nStatusFunctionNr,
+                                  bool              i_bIsDefault )
+    :   pOwner(&o_rOwner),
+        pFollowUpContext(&i_rFollowUpContext),
+        nStatusFunctionNr(i_nStatusFunctionNr),
+        bIsDefault(i_bIsDefault)
+{
+}
+
+bool
+StmBoundsStatu2::IsADefault() const
+{
+    return bIsDefault;
+}
+
+StmBoundsStatu2 *
+StmBoundsStatu2::AsBounds()
+{
+    return this;
+}
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/tokens/tkp2.cxx b/autodoc/source/parser_i/tokens/tkp2.cxx
new file mode 100644
index 000000000000..58f740d871e0
--- /dev/null
+++ b/autodoc/source/parser_i/tokens/tkp2.cxx
@@ -0,0 +1,64 @@
+/* -*- 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 <precomp.h>
+#include <tokens/tkp2.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <tools/tkpchars.hxx>
+#include <tokens/tkpcont2.hxx>
+
+TokenParse2::TokenParse2()
+    :   pChars(0)
+{
+}
+
+void
+TokenParse2::Start( CharacterSource & i_rSource )
+{
+    pChars = &i_rSource;
+    SetStartContext();
+}
+
+bool
+TokenParse2::GetNextToken()
+{
+    csv_assert(pChars != 0);
+
+    bool bDone = false;
+    while ( NOT bDone AND NOT pChars->IsFinished() )
+    {
+        CurrentContext().ReadCharChain(*pChars);
+        bDone = CurrentContext().PassNewToken();
+        SetCurrentContext(CurrentContext().FollowUpContext());
+    }
+    return bDone;
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/tokens/tkpcont2.cxx b/autodoc/source/parser_i/tokens/tkpcont2.cxx
new file mode 100644
index 000000000000..4ccef4df4b12
--- /dev/null
+++ b/autodoc/source/parser_i/tokens/tkpcont2.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tokens/tkpcont2.hxx>
+
+// NOT FULLY DECLARED SERVICES
+
+
+
+TkpNullContex2 G_aNullContex2;
+
+TkpNullContex2 &
+TkpContext_Null2_()
+{
+    return G_aNullContex2;
+}
+
+TkpNullContex2::~TkpNullContex2()
+{
+}
+
+void
+TkpNullContex2::ReadCharChain( CharacterSource & )
+{
+}
+
+bool
+TkpNullContex2::PassNewToken()
+{
+    return false;
+}
+
+TkpContext &
+TkpNullContex2::FollowUpContext()
+{
+     return *this;
+}
+
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/tokens/tkpstam2.cxx b/autodoc/source/parser_i/tokens/tkpstam2.cxx
new file mode 100644
index 000000000000..90978c10ae2b
--- /dev/null
+++ b/autodoc/source/parser_i/tokens/tkpstam2.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+#include <tokens/tkpstam2.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <tokens/stmstar2.hxx>
+#include <tools/tkpchars.hxx>
+
+
+const intt  C_nStatuslistResizeValue = 32;
+const intt  C_nTopStatus = 0;
+
+StateMachin2::StateMachin2( intt            in_nStatusSize,
+                            intt            in_nInitial_StatusListSize )
+    :   pStati(new StmStatu2*[in_nInitial_StatusListSize]),
+        nCurrentStatus(C_nTopStatus),
+        nPeekedStatus(C_nTopStatus),
+        nStatusSize(in_nStatusSize),
+        nNrofStati(0),
+        nStatiSpace(in_nInitial_StatusListSize)
+{
+    csv_assert(in_nStatusSize > 0);
+    csv_assert(in_nInitial_StatusListSize > 0);
+
+    memset(pStati, 0, sizeof(StmStatu2*) * nStatiSpace);
+}
+
+intt
+StateMachin2::AddStatus(StmStatu2 * let_dpStatus)
+{
+    if (nNrofStati == nStatiSpace)
+    {
+        ResizeStati();
+    }
+    pStati[nNrofStati] = let_dpStatus;
+    return nNrofStati++;
+}
+
+void
+StateMachin2::AddToken( const char *        in_sToken,
+                        UINT16              in_nTokenId,
+                        const INT16 *       in_aBranches,
+                        INT16               in_nBoundsStatus )
+{
+    if (csv::no_str(in_sToken))
+        return;
+
+    // Durch existierende Stati durchhangeln:
+    nCurrentStatus = 0;
+    nPeekedStatus = 0;
+
+    for ( const char * pChar = in_sToken;
+          *pChar != NULCH;
+          ++pChar )
+    {
+        Peek(*pChar);
+        StmStatu2 & rPst = Status(nPeekedStatus);
+        if ( rPst.IsADefault() OR rPst.AsBounds() != 0 )
+        {
+            nPeekedStatus = AddStatus( new StmArrayStatu2(nStatusSize, in_aBranches, 0, false ) );
+            CurrentStatus().SetBranch( *pChar, nPeekedStatus );
+        }
+        nCurrentStatus = nPeekedStatus;
+    }   // end for
+    StmArrayStatu2 & rLastStatus = CurrentStatus();
+    rLastStatus.SetTokenId(in_nTokenId);
+    for (intt i = 0; i < nStatusSize; i++)
+    {
+        if (Status(rLastStatus.NextBy(i)).AsBounds() != 0)
+            rLastStatus.SetBranch(i,in_nBoundsStatus);
+    }   // end for
+}
+
+StateMachin2::~StateMachin2()
+{
+    for (intt i = 0; i < nNrofStati; i++)
+    {
+        delete pStati[i];
+    }
+    delete [] pStati;
+}
+
+StmBoundsStatu2 &
+StateMachin2::GetCharChain( UINT16 &           o_nTokenId,
+                            CharacterSource &  io_rText )
+{
+    nCurrentStatus = C_nTopStatus;
+    Peek(io_rText.CurChar());
+    while (BoundsStatus() == 0)
+    {
+        nCurrentStatus = nPeekedStatus;
+        Peek(io_rText.MoveOn());
+    }
+    o_nTokenId = CurrentStatus().TokenId();
+
+    return *BoundsStatus();
+}
+
+void
+StateMachin2::ResizeStati()
+{
+    intt nNewSize = nStatiSpace + C_nStatuslistResizeValue;
+    intt i = 0;
+    StatusList pNewStati = new StmStatu2*[nNewSize];
+
+    for ( ; i < nNrofStati; i++)
+    {
+        pNewStati[i] = pStati[i];
+    }
+    memset( pNewStati+i,
+            0,
+            (nNewSize-i) * sizeof(StmStatu2*) );
+
+    delete [] pStati;
+    pStati = pNewStati;
+    nStatiSpace = nNewSize;
+}
+
+StmStatu2 &
+StateMachin2::Status(intt in_nStatusNr) const
+{
+    csv_assert( csv::in_range(intt(0), in_nStatusNr, intt(nNrofStati)) );
+    return *pStati[in_nStatusNr];
+}
+
+StmArrayStatu2 &
+StateMachin2::CurrentStatus() const
+{
+    StmArrayStatu2 * pCurSt = Status(nCurrentStatus).AsArray();
+    if (pCurSt == 0)
+    {
+        csv_assert(false);
+    }
+    return *pCurSt;
+}
+
+StmBoundsStatu2 *
+StateMachin2::BoundsStatus() const
+{
+    return Status(nPeekedStatus).AsBounds();
+}
+
+void
+StateMachin2::Peek(intt in_nBranch)
+{
+    StmArrayStatu2 & rSt = CurrentStatus();
+    nPeekedStatus = rSt.NextBy(in_nBranch);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/parser_i/tokens/x_parse2.cxx b/autodoc/source/parser_i/tokens/x_parse2.cxx
new file mode 100644
index 000000000000..8194985388e0
--- /dev/null
+++ b/autodoc/source/parser_i/tokens/x_parse2.cxx
@@ -0,0 +1,63 @@
+/* -*- 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 <precomp.h>
+#include <x_parse2.hxx>
+
+// NOT FULLY DECLARED SERVICES
+
+    enum E_Type
+    {
+        x_Any                       = 0,
+        x_InvalidChar,
+        x_UnexpectedEOF
+    };
+void
+X_AutodocParser::GetInfo( std::ostream &        o_rOutputMedium ) const
+{
+    switch (eType)
+    {
+        case x_Any:
+            o_rOutputMedium << "Unspecified parsing exception ." << Endl();
+            break;
+        case x_InvalidChar:
+            o_rOutputMedium << "Unknown character during parsing." << Endl();
+            break;
+        case x_UnexpectedToken:
+            o_rOutputMedium << "Unexpected token " << sName << " found." << Endl();
+            break;
+        case x_UnexpectedEOF:
+            o_rOutputMedium << "Unexpected end of file found." << Endl();
+            break;
+        default:
+            o_rOutputMedium << "Unknown exception during parsing." << Endl();
+    }
+}
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/tools/filecoll.cxx b/autodoc/source/tools/filecoll.cxx
new file mode 100644
index 000000000000..0e0a8ba5962b
--- /dev/null
+++ b/autodoc/source/tools/filecoll.cxx
@@ -0,0 +1,134 @@
+/* -*- 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 <precomp.h>
+#include <tools/filecoll.hxx>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <cosv/ploc_dir.hxx>
+
+#include <stdio.h>
+
+
+FileCollector::FileCollector( uintt i_nRoughNrOfFiles )
+    // :    aFoundFiles
+{
+    if (i_nRoughNrOfFiles > 0)
+        aFoundFiles.reserve(i_nRoughNrOfFiles);
+}
+
+uintt
+FileCollector::AddFilesFrom( const char *                 i_sRootDir,
+                             const char *                 i_sFilter,
+                             E_SearchMode                 i_eSearchMode )
+{
+    uintt nSizeAtStart = aFoundFiles.size();
+
+    if (csv::no_str(i_sFilter) OR csv::no_str(i_sRootDir))
+    {
+        Cout() << "Warning: The filter contains no files." <<  Endl();
+        return 0;
+    }
+
+    csv::ploc::Directory aDir(i_sRootDir);
+    if (NOT aDir.Exists())
+    {
+        Cerr() << "Warning: The path for the files to be parsed could not be found:\n"
+               << i_sRootDir
+               << Endl();
+        return 0;
+    }
+
+    Cout() << "." << Flush();
+    aDir.GetContainedFiles(aFoundFiles, i_sFilter);
+
+    if (i_eSearchMode == recursive)
+    {
+        StreamStr aPath(1020);
+        aPath << i_sRootDir << csv::ploc::Delimiter();
+        uintt nSubDirStart = aPath.tellp();
+
+        StringVector aSubDirs;
+        aDir.GetContainedDirectories(aSubDirs);
+
+        for ( const_iterator iter = aSubDirs.begin();
+              iter != aSubDirs.end();
+              ++iter )
+        {
+            aPath.seekp(nSubDirStart);
+            aPath << (*iter);
+            AddFilesFrom( aPath.c_str(), i_sFilter, i_eSearchMode );
+        }
+    }
+
+    return aFoundFiles.size() - nSizeAtStart;
+}
+
+uintt
+FileCollector::AddFile( const char * i_sFilePath )
+{
+    FILE * pFile = fopen( i_sFilePath, "r" );
+    if ( pFile == 0 )
+    {
+        Cerr() << "Warning: The path for the file to be parsed could not be found:\n"
+               << i_sFilePath
+               << Endl();
+        return 0;
+    }
+
+    fclose(pFile);
+    aFoundFiles.push_back(i_sFilePath);
+    return 1;
+}
+
+void
+FileCollector::EraseAll()
+{
+    csv::erase_container(aFoundFiles);
+}
+
+FileCollector::const_iterator
+FileCollector::Begin() const
+{
+    return aFoundFiles.begin();
+}
+
+FileCollector::const_iterator
+FileCollector::End() const
+{
+    return aFoundFiles.end();
+}
+
+uintt
+FileCollector::Size() const
+{
+    return aFoundFiles.size();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autodoc/source/tools/makefile.mk b/autodoc/source/tools/makefile.mk
new file mode 100644
index 000000000000..31d48edc0898
--- /dev/null
+++ b/autodoc/source/tools/makefile.mk
@@ -0,0 +1,58 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=autodoc
+TARGET=autodoc_tools
+TARGETTYPE=CUI
+
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+
+.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+    $(OBJ)$/filecoll.obj	\
+    $(OBJ)$/tkpchars.obj 
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/autodoc/source/tools/tkpchars.cxx b/autodoc/source/tools/tkpchars.cxx
new file mode 100644
index 000000000000..ad5d3f0b3727
--- /dev/null
+++ b/autodoc/source/tools/tkpchars.cxx
@@ -0,0 +1,161 @@
+/* -*- 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 <precomp.h>
+#include <tools/tkpchars.hxx>
+
+// NOT FULLY DECLARED SERVICES
+#include <cosv/bstream.hxx>
+#include <cosv/x.hxx>
+
+
+
+CharacterSource::CharacterSource()
+    :   dpSource(new char[2]),
+        nSourceSize(0),
+        nCurPos(0),
+        nLastCut(0),
+        nLastTokenStart(0),
+        cCharAtLastCut(0)
+{
+    dpSource[nSourceSize] = NULCH;
+    dpSource[nSourceSize+1] = NULCH;
+}
+
+CharacterSource::~CharacterSource()
+{
+    delete [] dpSource;
+}
+
+void
+CharacterSource::LoadText(csv::bstream & io_rSource)
+{
+    if (dpSource != 0)
+        delete [] dpSource;
+
+    io_rSource.seek(0, csv::end);
+    nSourceSize = intt(io_rSource.position());
+    io_rSource.seek(0);
+
+    dpSource = new char[nSourceSize+1];
+
+    intt nCount = (intt) io_rSource.read(dpSource,nSourceSize);
+    if (nCount != nSourceSize)
+        throw csv::X_Default("IO-Error: Could not load file completely.");
+
+    dpSource[nSourceSize] = NULCH;
+
+    BeginSource();
+}
+
+///  KORR_FUTURE:  So far, this works only when tokens do not cross inserted text boundaries.
+void
+CharacterSource::InsertTextAtCurPos( const char * i_sText2Insert )
+{
+    if ( !i_sText2Insert || !i_sText2Insert[0] )
+        return;
+
+    aSourcesStack.push( S_SourceState(
+                            dpSource,
+                            nSourceSize,
+                            nCurPos,
+                            nLastCut,
+                            nLastTokenStart,
+                            cCharAtLastCut ) );
+
+    nSourceSize = strlen(i_sText2Insert);
+    dpSource = new char[nSourceSize+1];
+    strcpy( dpSource,  i_sText2Insert);     // SAFE STRCPY (#100211# - checked)
+
+    BeginSource();
+}
+
+const char *
+CharacterSource::CutToken()
+{
+    dpSource[nLastCut] = cCharAtLastCut;
+    nLastTokenStart = nLastCut;
+    nLastCut = CurPos();
+    cCharAtLastCut = dpSource[nLastCut];
+    dpSource[nLastCut] = NULCH;
+
+    return &dpSource[nLastTokenStart];
+}
+
+void
+CharacterSource::BeginSource()
+{
+    nCurPos = 0;
+    nLastCut = 0;
+    nLastTokenStart = 0;
+    cCharAtLastCut = dpSource[nLastCut];
+    dpSource[nLastCut] = NULCH;
+}
+
+//  KORR_FUTURE:  So far, this works only when tokens do not cross inserted text boundaries.
+char
+CharacterSource::MoveOn_OverStack()
+{
+    while ( aSourcesStack.size() > 0 AND nCurPos >= nSourceSize-1 )
+    {
+        S_SourceState & aState = aSourcesStack.top();
+        delete [] dpSource;
+
+        dpSource = aState.dpSource;
+        nSourceSize = aState.nSourceSize;
+        nCurPos = aState.nCurPos;
+        nLastCut = aState.nLastCut;
+        nLastTokenStart = aState.nLastTokenStart;
+        cCharAtLastCut = aState.cCharAtLastCut;
+
+        aSourcesStack.pop();
+    }
+
+    if ( nLastCut < nCurPos )
+        CutToken();
+
+    return CurChar();
+}
+
+CharacterSource::
+S_SourceState::S_SourceState( DYN char *    dpSource_,
+                              intt          nSourceSize_,
+                              intt          nCurPos_,
+                              intt          nLastCut_,
+                              intt          nLastTokenStart_,
+                              char          cCharAtLastCut_ )
+    :   dpSource(dpSource_),
+        nSourceSize(nSourceSize_),
+        nCurPos(nCurPos_),
+        nLastCut(nLastCut_),
+        nLastTokenStart(nLastTokenStart_),
+        cCharAtLastCut(cCharAtLastCut_)
+{
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 000000000000..7df437bddcdb
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,161 @@
+:
+    eval 'exec perl -S $0 ${1+"$@"}'
+        if 0;
+
+use strict;
+
+sub clean()
+{
+    system ("rm -Rf autom4te.cache");
+    system ("rm -f missing install-sh mkinstalldirs libtool ltmain.sh");
+    print "cleaned the build tree\n";
+}
+
+my $aclocal;
+
+# check we have various vital tools
+sub sanity_checks($)
+{
+    my $system = shift;
+    my @path = split (':', $ENV{'PATH'});
+    my %required =
+      (
+       'pkg-config' => "pkg-config is required to be installed",
+       'autoconf'   => "autoconf is required",
+       $aclocal     => "$aclocal is required",
+      );
+
+    for my $elem (@path) {
+        for my $app (keys %required) {
+            if (-f "$elem/$app") {
+                delete $required{$app};
+            }
+        }
+    }
+    if ((keys %required) > 0) {
+        print ("Various low-level dependencies are missing, please install them:\n");
+        for my $app (keys %required) {
+            print "\t $app: " . $required{$app} . "\n";
+        }
+        exit (1);
+    }
+}
+
+# one argument per line
+sub read_args($)
+{
+    my $file = shift;
+    my $fh;
+    my @lst;
+    open ($fh, $file) || die "can't open file: $file";
+    while (<$fh>) {
+        chomp();
+        # migrate from the old system
+        if ( substr($_, 0, 1) eq "'" ) {
+            print "Migrating options from the old autogen.lastrun format, using:\n";
+            my @opts;
+            @opts = split(/'/);
+            foreach my $opt (@opts) {
+                if ( substr($opt, 0, 1) eq "-" ) {
+                    push @lst, $opt;
+                    print "  $opt\n";
+                }
+            }
+        } else {
+            push @lst, $_;
+        }
+    }
+    close ($fh);
+    # print "read args from file '$file': @lst\n";
+    return @lst;
+}
+
+sub invalid_distro($$)
+{
+    my ($config, $distro) = @_;
+    print STDERR "Can't find distro option set: $config\nThis is not necessarily a problem.\n";
+    print STDERR "Distros with distro option sets are:\n";
+    my $dirh;
+    opendir ($dirh, "distro-configs");
+    while (($_ = readdir ($dirh))) {
+        /(.*)\.conf$/ || next;
+        print STDERR "\t$1\n";
+    }
+    closedir ($dirh);
+}
+
+my @cmdline_args = ();
+if (!@ARGV) {
+    my $lastrun = "autogen.lastrun";
+    @cmdline_args = read_args ($lastrun) if (-f $lastrun);
+} else {
+    @cmdline_args = @ARGV;
+}
+
+my @args;
+for my $arg (@cmdline_args) {
+    if ($arg eq '--clean') {
+        clean();
+    } elsif ($arg =~ m/--with-distro=(.*)$/) {
+        my $config = "distro-configs/$1.conf";
+        if (! -f $config) {
+            invalid_distro ($config, $1);
+            } else {
+                push @args, read_args ($config);
+            }
+        } else {
+        push @args, $arg;
+    }
+}
+for my $arg (@args) {
+    if ($arg =~ /^([A-Z]+)=(.*)/) {
+        $ENV{$1} = $2;
+    }
+}
+
+# Alloc $ACLOCAL to specify which aclocal to use
+$aclocal = $ENV{ACLOCAL} ? $ENV{ACLOCAL} : 'aclocal';
+
+my $system = `uname -s`;
+chomp $system;
+
+sanity_checks ($system) unless($system eq 'Darwin');
+
+my $aclocal_flags = $ENV{ACLOCAL_FLAGS};
+
+$aclocal_flags = "-I ./m4/mac" if (($aclocal_flags eq "") && ($system eq 'Darwin'));
+
+$ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq 'Darwin'));
+
+system ("$aclocal $aclocal_flags") && die "Failed to run aclocal";
+unlink ("configure");
+system ("autoconf") && die "Failed to run autoconf";
+die "failed to generate configure" if (! -x "configure");
+
+if (defined $ENV{NOCONFIGURE}) {
+    print "Skipping configure process.";
+} else {
+    # Save autogen.lastrun only if we did get some arguments on the command-line
+    if (@ARGV) {
+        if ($#cmdline_args > 0) {
+            # print "writing args to autogen.lastrun\n";
+            my $fh;
+            open ($fh, ">autogen.lastrun") || die "can't open autogen.lastrun: $!";
+            for my $arg (@cmdline_args) {
+                print $fh "$arg\n";
+            }
+            close ($fh);
+        }
+    }
+    print "running ./configure with '" . join ("' '", @args), "'\n";
+    system ("./configure", @args) && die "Error running configure";
+}
+
+# Local Variables:
+# mode: perl
+# cperl-indent-level: 4
+# tab-width: 4
+# indent-tabs-mode: nil
+# End:
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab: #
diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx
index 2c8ac15b6bd8..68cb3cbeaf21 100644
--- a/automation/inc/automation/communi.hxx
+++ b/automation/inc/automation/communi.hxx
@@ -164,7 +164,6 @@ class CommunicationManagerClientViaSocket : public CommunicationManagerClient, C
 public:
     using CommunicationManager::StartCommunication;
 
-    CommunicationManagerClientViaSocket( ByteString aHost, sal_uLong nPort, sal_Bool bUseMultiChannel = sal_False );
     CommunicationManagerClientViaSocket( sal_Bool bUseMultiChannel = sal_False );
     virtual ~CommunicationManagerClientViaSocket();
 
diff --git a/automation/inc/automation/simplecm.hxx b/automation/inc/automation/simplecm.hxx
index dd522cb3beeb..9a5211b1ad37 100644
--- a/automation/inc/automation/simplecm.hxx
+++ b/automation/inc/automation/simplecm.hxx
@@ -114,14 +114,12 @@ private:
 
 class PacketHandler;
 class CommunicationManager;
-class SingleCommunicationManager;
 class MultiCommunicationManager;
 class CommunicationManagerServerAcceptThread;
 class CommunicationLink : public SvRefBase
 {
 protected:
     friend class CommunicationManager;
-    friend class SingleCommunicationManager;
     friend class MultiCommunicationManager;
     friend class CommunicationManagerServerAcceptThread;
     // Darf nicht abger�umt werden zwischen Empfang des Streams und ende des Callbacks
@@ -287,24 +285,6 @@ private:
     sal_Bool bIsMultiChannel;
 };
 
-class SingleCommunicationManager : public CommunicationManager
-{
-public:
-    SingleCommunicationManager( sal_Bool bUseMultiChannel = sal_False );
-    virtual ~SingleCommunicationManager();
-    virtual sal_Bool StopCommunication();       // H�lt alle CommunicationLinks an
-    virtual sal_Bool IsLinkValid( CommunicationLink* pCL );
-    virtual sal_uInt16 GetCommunicationLinkCount();
-    virtual CommunicationLinkRef GetCommunicationLink( sal_uInt16 nNr );
-
-protected:
-    virtual void CallConnectionOpened( CommunicationLink* pCL );
-    virtual void CallConnectionClosed( CommunicationLink* pCL );
-    CommunicationLinkRef xActiveLink;
-    CommunicationLink *pInactiveLink;
-    virtual void DestroyingLink( CommunicationLink *pCL );  // Link tr�gt sich im Destruktor aus
-};
-
 class ICommunicationManagerClient
 {
     friend class CommonSocketFunctions;
@@ -341,23 +321,11 @@ protected:
     SvStream *pReceiveStream;
     sal_Bool DoReceiveDataStream();             /// Recieve DataPacket from Socket
     virtual sal_Bool SendHandshake( HandshakeType aHandshakeType, SvStream* pData = NULL);
-    bool IsReceiveReady();
     sal_Bool bIsRequestShutdownPending;
     virtual void WaitForShutdown()=0;
     void SetNewPacketAsCurrent();
 };
 
-class SimpleCommunicationLinkViaSocketWithReceiveCallbacks : public SimpleCommunicationLinkViaSocket
-{
-public:
-    SimpleCommunicationLinkViaSocketWithReceiveCallbacks( CommunicationManager *pMan, osl::StreamSocket* pSocket );
-    ~SimpleCommunicationLinkViaSocketWithReceiveCallbacks();
-    virtual sal_Bool ReceiveDataStream();
-protected:
-    virtual sal_Bool ShutdownCommunication();   /// Really stop the Communication
-    virtual void WaitForShutdown();
-};
-
 class CommonSocketFunctions
 {
 public:
@@ -366,22 +334,6 @@ protected:
     virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, osl::ConnectorSocket* pCS )=0;
 };
 
-class SingleCommunicationManagerClientViaSocket : public SingleCommunicationManager, public ICommunicationManagerClient, CommonSocketFunctions
-{
-public:
-    using CommunicationManager::StartCommunication;
-
-    SingleCommunicationManagerClientViaSocket( ByteString aHost, sal_uLong nPort, sal_Bool bUseMultiChannel = sal_False );
-    SingleCommunicationManagerClientViaSocket( sal_Bool bUseMultiChannel = sal_False );
-    virtual sal_Bool StartCommunication(){ return DoStartCommunication( this, (ICommunicationManagerClient*) this, aHostToTalk, nPortToTalk );}
-    virtual sal_Bool StartCommunication( ByteString aHost, sal_uLong nPort ){ return DoStartCommunication( this, (ICommunicationManagerClient*) this, aHost, nPort );}
-private:
-    ByteString aHostToTalk;
-    sal_uLong nPortToTalk;
-protected:
-    virtual CommunicationLink *CreateCommunicationLink( CommunicationManager *pCM, osl::ConnectorSocket* pCS ){ return new SimpleCommunicationLinkViaSocketWithReceiveCallbacks( pCM, pCS ); }
-};
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/communi/communi.cxx b/automation/source/communi/communi.cxx
index 10aa6f8e9107..db319e206411 100644
--- a/automation/source/communi/communi.cxx
+++ b/automation/source/communi/communi.cxx
@@ -567,13 +567,6 @@ IMPL_LINK( CommunicationManagerServerAcceptThread, AddConnection, void*, EMPTYAR
     return 1;
 }
 
-CommunicationManagerClientViaSocket::CommunicationManagerClientViaSocket( ByteString aHost, sal_uLong nPort, sal_Bool bUseMultiChannel )
-: CommunicationManagerClient( bUseMultiChannel )
-, aHostToTalk( aHost )
-, nPortToTalk( nPort )
-{
-}
-
 CommunicationManagerClientViaSocket::CommunicationManagerClientViaSocket( sal_Bool bUseMultiChannel )
 : CommunicationManagerClient( bUseMultiChannel )
 , aHostToTalk( "" )
diff --git a/automation/source/inc/cmdbasestream.hxx b/automation/source/inc/cmdbasestream.hxx
index ce3ee45e095f..71666cebafc3 100644
--- a/automation/source/inc/cmdbasestream.hxx
+++ b/automation/source/inc/cmdbasestream.hxx
@@ -63,11 +63,10 @@ public:
     void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_USHORT nNr );
 
 // MacroRecorder
-    void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod ); // also used outside MacroRecorder
-    void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString );
-    void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool );
-    void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_BOOL bBool );
-    void GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_ULONG nNr );
+    void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod ); // also used outside MacroRecorder
+    void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_String *pString );
+    void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_String *pString, comm_BOOL bBool );
+    void GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_UINT32 nNr );
 
     void Read ( comm_USHORT &nNr );
     void Read ( comm_ULONG &nNr );
diff --git a/automation/source/inc/ittresid.hxx b/automation/source/inc/ittresid.hxx
new file mode 100644
index 000000000000..1a1e321e3f0f
--- /dev/null
+++ b/automation/source/inc/ittresid.hxx
@@ -0,0 +1,45 @@
+/* -*- 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 _ITTRESID_HXX_
+#define _ITTRESID_HXX_
+
+#include <tools/resmgr.hxx>
+#include <tools/resid.hxx>
+
+class IttResId : public ResId
+{
+    static ResMgr* getIttResMgr();
+    public:
+    IttResId( sal_uInt32 nId ) : ResId( nId, *getIttResMgr() ) {}
+};
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/inc/sttresid.hxx b/automation/source/inc/sttresid.hxx
deleted file mode 100644
index 3ccfe483a8f4..000000000000
--- a/automation/source/inc/sttresid.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- 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 _STTRESID_HXX_
-#define _STTRESID_HXX_
-
-#include <tools/resmgr.hxx>
-#include <tools/resid.hxx>
-
-class SttResId : public ResId
-{
-    static ResMgr* getSttResMgr();
-    public:
-    SttResId( sal_uInt32 nId ) : ResId( nId, *getSttResMgr() ) {}
-};
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/miniapp/editwin.cxx b/automation/source/miniapp/editwin.cxx
index 395c9deb350a..e0b3ee023dd4 100644
--- a/automation/source/miniapp/editwin.cxx
+++ b/automation/source/miniapp/editwin.cxx
@@ -59,11 +59,6 @@ GHEditWindow::GHEditWindow(Window * pParent, String aName, WinBits iWstyle)
     SetText(aName);
 }
 
-void GHEditWindow::Clear()
-{
-    aInhalt.SetText(String());
-}
-
 void GHEditWindow::AddText( String aNew, sal_Bool bMoveToEnd)
 {
     String aOld = aInhalt.GetText();
diff --git a/automation/source/miniapp/editwin.hxx b/automation/source/miniapp/editwin.hxx
index ed10acec2646..3181efaefea3 100644
--- a/automation/source/miniapp/editwin.hxx
+++ b/automation/source/miniapp/editwin.hxx
@@ -47,7 +47,6 @@ public:
     GHEditWindow();
     GHEditWindow(Window * pParent, String aName = CUniString("Neues Fenster"), WinBits iWstyle = WB_STDWORK);
 
-    void Clear();
     void AddText( String aNew, sal_Bool bMoveToEnd = sal_True);
 };
 
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index 3988bcbab154..1144cde41a68 100644
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@ -184,17 +184,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT
     Write(bBool);
 }
 
-void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_BOOL bBool )
-{
-    Write(comm_USHORT(SIReturn));
-    Write(nRet);
-    Write(pUId);
-    Write(comm_USHORT(PARAM_USHORT_1|PARAM_BOOL_1));        // Typ der folgenden Parameter
-    Write(nMethod);
-    Write(bBool);
-}
-
-void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_ULONG nNr )
+void CmdBaseStream::GenReturn( comm_UINT16 nRet, rtl::OString *pUId, comm_UINT16 nMethod, comm_UINT32 nNr )
 {
     Write(comm_USHORT(SIReturn));
     Write(nRet);
diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx
index d21650898933..19ee23f66b62 100644
--- a/automation/source/server/retstrm.hxx
+++ b/automation/source/server/retstrm.hxx
@@ -49,9 +49,8 @@ public:
     void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );}
 
 // MacroRecorder
-    void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );} // also used outside MacroRecorder
-    void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );}
-    void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
+    void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_UINT16 nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );} // also used outside MacroRecorder
+    void GenReturn( comm_UINT16 nRet, rtl::OString aUId, comm_UINT16 nMethod, comm_UINT32 nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
 
     void GenReturn( sal_uInt16 nRet, rtl::OString aUId, String aString );
     void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_ULONG nNr, String aString, sal_Bool bBool );
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index ccf0e7ffb840..44c2c0de423e 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -216,17 +216,17 @@ sal_uLong RemoteControlCommunicationManager::GetPort()
                 aConf.WriteKey( aNoTesttoolKey, "something" );
         }
 
-        nPortIs = aConf.ReadKey("TTPort","0").ToInt32();
+        nPortIs = aConf.ReadKey("TTPort","0").toInt32();
 
         // noch pr�fen ob dieses Office getestet werden soll.
         if ( !bAutomate || aConf.ReadKey( aNoTesttoolKey, "" ) != "" )
             nPortIs = 0;
 
-        nComm = (sal_uInt16)aConf.ReadKey("Comm","0").ToInt32();
+        nComm = (sal_uInt16)aConf.ReadKey("Comm","0").toInt32();
         if ( nComm )
             aConf.DeleteKey("Comm");
 
-        bQuiet = ( aConf.ReadKey("Quiet","no").CompareIgnoreCaseToAscii("yes") == COMPARE_EQUAL );
+        bQuiet = aConf.ReadKey("Quiet","no").equalsIgnoreAsciiCase("yes");
     }
     return nPortIs;
 }
diff --git a/automation/source/simplecm/simplecm.cxx b/automation/source/simplecm/simplecm.cxx
index 01c37e99e26b..39f86436a9a3 100644
--- a/automation/source/simplecm/simplecm.cxx
+++ b/automation/source/simplecm/simplecm.cxx
@@ -343,72 +343,6 @@ sal_Bool SimpleCommunicationLinkViaSocket::SendHandshake( HandshakeType aHandsha
     return !bWasError;
 }
 
-SimpleCommunicationLinkViaSocketWithReceiveCallbacks::SimpleCommunicationLinkViaSocketWithReceiveCallbacks( CommunicationManager *pMan, osl::StreamSocket* pSocket )
-: SimpleCommunicationLinkViaSocket( pMan, pSocket )
-{
-}
-
-SimpleCommunicationLinkViaSocketWithReceiveCallbacks::~SimpleCommunicationLinkViaSocketWithReceiveCallbacks()
-{
-    if ( pMyManager && pMyManager->IsLinkValid( this ) && !bIsRequestShutdownPending )
-        StopCommunication();
-}
-
-bool SimpleCommunicationLinkViaSocket::IsReceiveReady()
-{
-    if ( !IsCommunicationError() )
-    {
-        TimeValue aTime = {30, 0};   // 30 seconds
-        return pStreamSocket->isRecvReady( &aTime );
-    }
-
-    return false;
-}
-
-void SimpleCommunicationLinkViaSocketWithReceiveCallbacks::WaitForShutdown()
-{
-    CommunicationLinkRef rHold(this);       // avoid deleting this link before the end of the method
-
-    while( pMyManager && !IsCommunicationError() && IsReceiveReady())
-        ReceiveDataStream();
-}
-
-sal_Bool SimpleCommunicationLinkViaSocketWithReceiveCallbacks::ReceiveDataStream()
-{
-    if ( DoReceiveDataStream() )
-    {
-        SetNewPacketAsCurrent();
-        StartCallback();
-        DataReceived();
-        return sal_True;
-    }
-    else
-    {
-        StartCallback();
-        ShutdownCommunication();
-        return sal_False;
-    }
-}
-
-sal_Bool SimpleCommunicationLinkViaSocketWithReceiveCallbacks::ShutdownCommunication()
-{
-    if ( GetStreamSocket() )
-        GetStreamSocket()->shutdown();
-
-    if ( GetStreamSocket() )
-        GetStreamSocket()->close();
-
-    osl::StreamSocket* pTempSocket = GetStreamSocket();
-    SetStreamSocket( NULL );
-    delete pTempSocket;
-
-    ConnectionClosed();
-
-    return sal_True;
-}
-
-
-
 CommunicationManager::CommunicationManager( sal_Bool bUseMultiChannel )
 : nInfoType( CM_NONE )
 , bIsCommunicationRunning( sal_False )
@@ -577,100 +511,6 @@ void CommunicationManager::SetApplication( const ByteString& aApp, sal_Bool bRun
     }
 }
 
-
-
-SingleCommunicationManager::SingleCommunicationManager( sal_Bool bUseMultiChannel )
-: CommunicationManager( bUseMultiChannel )
-{
-    xActiveLink = NULL;
-    pInactiveLink = NULL;
-}
-
-SingleCommunicationManager::~SingleCommunicationManager()
-{
-    StopCommunication();
-    if ( pInactiveLink )
-        pInactiveLink->InvalidateManager();
-}
-
-sal_Bool SingleCommunicationManager::StopCommunication()
-{
-    if ( xActiveLink.Is() )
-    {
-        sal_Bool bSuccess = xActiveLink->StopCommunication();
-        if ( pInactiveLink )
-            pInactiveLink->InvalidateManager();
-        pInactiveLink = xActiveLink;
-        xActiveLink.Clear();
-        return bSuccess;
-    }
-    return sal_True;
-}
-
-sal_Bool SingleCommunicationManager::IsLinkValid( CommunicationLink* pCL )
-{
-    return &xActiveLink == pCL;
-}
-
-sal_uInt16 SingleCommunicationManager::GetCommunicationLinkCount()
-{
-    return IsCommunicationRunning()?1:0;
-}
-
-CommunicationLinkRef SingleCommunicationManager::GetCommunicationLink( sal_uInt16 )
-{
-    return xActiveLink;
-}
-
-void SingleCommunicationManager::CallConnectionOpened( CommunicationLink* pCL )
-{
-    DBG_ASSERT( !xActiveLink.Is(), "Es ist bereits ein CommunicationLink aktiv");
-    if ( xActiveLink.Is() )
-    {
-        if ( pInactiveLink )
-            pInactiveLink->InvalidateManager();
-        pInactiveLink = xActiveLink;
-        xActiveLink->StopCommunication();   // Den alten Link brutal abw�rgen
-    }
-    xActiveLink = pCL;
-    CommunicationManager::CallConnectionOpened( pCL );
-}
-
-void SingleCommunicationManager::CallConnectionClosed( CommunicationLink* pCL )
-{
-    CommunicationManager::CallConnectionClosed( pCL );
-
-    DBG_ASSERT( pCL == xActiveLink, "SingleCommunicationManager::CallConnectionClosed mit fremdem Link");
-    if ( pInactiveLink )
-        pInactiveLink->InvalidateManager();
-    pInactiveLink = xActiveLink;
-    xActiveLink.Clear();
-    bIsCommunicationRunning = sal_False;
-}
-
-void SingleCommunicationManager::DestroyingLink( CommunicationLink *pCL )
-{
-    pInactiveLink = NULL;
-    pCL->InvalidateManager();
-}
-
-
-SingleCommunicationManagerClientViaSocket::SingleCommunicationManagerClientViaSocket( ByteString aHost, sal_uLong nPort, sal_Bool bUseMultiChannel )
-: SingleCommunicationManager( bUseMultiChannel )
-, aHostToTalk( aHost )
-, nPortToTalk( nPort )
-{
-}
-
-
-SingleCommunicationManagerClientViaSocket::SingleCommunicationManagerClientViaSocket( sal_Bool bUseMultiChannel )
-: SingleCommunicationManager( bUseMultiChannel )
-, aHostToTalk()
-, nPortToTalk( 0 )
-{
-}
-
-
 sal_Bool CommonSocketFunctions::DoStartCommunication( CommunicationManager *pCM, ICommunicationManagerClient *pCMC, ByteString aHost, sal_uLong nPort )
 {
     osl::SocketAddr Addr( rtl::OUString( UniString( aHost, RTL_TEXTENCODING_UTF8 ) ), nPort );
diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx
index d24fa7f232b0..8153b6505373 100644
--- a/automation/source/testtool/cmdstrm.cxx
+++ b/automation/source/testtool/cmdstrm.cxx
@@ -35,7 +35,7 @@
 #include "cmdstrm.hxx"
 #include "rcontrol.hxx"
 #include "objtest.hxx"
-#include "sttresid.hxx"
+#include "ittresid.hxx"
 #include "svcommstream.hxx"
 #include <basic/testtool.hrc>
 
@@ -43,7 +43,7 @@ ControlDefLoad const CmdStream::arKeyCodes [] =
 #include <keycodes.hxx>
 CNames *CmdStream::pKeyCodes = NULL;
 
-ResMgr* SttResId::getSttResMgr()
+ResMgr* IttResId::getIttResMgr()
 {
     static ResMgr* pMgr = NULL;
     if( ! pMgr )
@@ -153,7 +153,7 @@ String CmdStream::WandleKeyEventString( String aKeys )
                     Result += '<';
                     Result += Token;
                     Result += ' ';
-                    Result += String( SttResId( S_INVALID_KEYCODE ) );
+                    Result += String( IttResId( S_INVALID_KEYCODE ) );
                     Result += '>';
                 }
             }
@@ -422,15 +422,7 @@ void CmdStream::GenCmdFlow( sal_uInt16 nArt )
     Write(sal_uInt16(PARAM_NONE));              // Typ der folgenden Parameter
 }
 
-void CmdStream::GenCmdFlow( sal_uInt16 nArt, sal_uInt16 nNr1 )
-{
-    Write(sal_uInt16(SIFlow));
-    Write(nArt);
-    Write(sal_uInt16(PARAM_USHORT_1));          // Typ der folgenden Parameter
-    Write(nNr1);
-}
-
-void CmdStream::GenCmdFlow( sal_uInt16 nArt, comm_ULONG nNr1 )
+void CmdStream::GenCmdFlow( sal_uInt16 nArt, comm_UINT32 nNr1 )
 {
     Write(sal_uInt16(SIFlow));
     Write(nArt);
@@ -438,14 +430,6 @@ void CmdStream::GenCmdFlow( sal_uInt16 nArt, comm_ULONG nNr1 )
     Write(nNr1);
 }
 
-void CmdStream::GenCmdFlow( sal_uInt16 nArt, String aString1 )
-{
-    Write(sal_uInt16(SIFlow));
-    Write(nArt);
-    Write(sal_uInt16(PARAM_STR_1));             // Typ der folgenden Parameter
-    Write(aString1);
-}
-
 void CmdStream::Write( String aString, sal_Bool IsKeyString )
 {
     if ( IsKeyString )
diff --git a/automation/source/testtool/cmdstrm.hxx b/automation/source/testtool/cmdstrm.hxx
index d9c3cec49c73..a3997fa480f2 100644
--- a/automation/source/testtool/cmdstrm.hxx
+++ b/automation/source/testtool/cmdstrm.hxx
@@ -51,9 +51,7 @@ public:
 
 
     void GenCmdFlow( sal_uInt16 nArt );
-    void GenCmdFlow( sal_uInt16 nArt, sal_uInt16 nNr1 );
-    void GenCmdFlow( sal_uInt16 nArt, comm_ULONG nNr1 );
-    void GenCmdFlow( sal_uInt16 nArt, String aString1 );
+    void GenCmdFlow( sal_uInt16 nArt, comm_UINT32 nNr1 );
 
     void Reset(comm_ULONG nSequence);
 
diff --git a/automation/source/testtool/httprequest.cxx b/automation/source/testtool/httprequest.cxx
index 1fb2f1ee276e..4ec2f6471c2a 100644
--- a/automation/source/testtool/httprequest.cxx
+++ b/automation/source/testtool/httprequest.cxx
@@ -53,10 +53,7 @@ HttpRequest::HttpRequest()
 HttpRequest::~HttpRequest()
 {
     delete pStream;
-    pStream = NULL;
-
     delete pOutSocket;
-    pOutSocket = NULL;
 }
 
 void HttpRequest::SetRequest( rtl::OString aHost, rtl::OString aPath, sal_uInt16 nPort )
@@ -215,24 +212,9 @@ sal_Bool HttpRequest::IsItem( rtl::OString aItem, rtl::OString aLine )
 }
 
 
-void HttpRequest::Abort()
-{
-    if ( pOutSocket )
-    {
-        nStatus = HTTP_REQUEST_ERROR;
-        pOutSocket->shutdown();
-        pOutSocket->close();
-    }
-}
-
 SvMemoryStream* HttpRequest::GetBody()
 {
     return pStream;
 }
 
-sal_uInt16 HttpRequest::GetStatus()
-{
-    return nStatus;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/testtool/httprequest.hxx b/automation/source/testtool/httprequest.hxx
index f6240507a99f..a8f333718db5 100644
--- a/automation/source/testtool/httprequest.hxx
+++ b/automation/source/testtool/httprequest.hxx
@@ -71,16 +71,12 @@ public:
     void SetProxy( rtl::OString aHost, sal_uInt16 nPort );
 
     sal_Bool Execute();
-    void Abort();
 
     rtl::OString GetHeader() const { return aHeader; }
     SvMemoryStream* GetBody();
 
     rtl::OString GetContentType() const { return aContentType; }
     sal_uInt16 GetResultId() const { return nResultId; }
-
-    sal_uInt16 GetStatus();
-
 };
 
 #endif
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 050458e8980a..75d0a8338752 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -31,7 +31,7 @@
 
 #include "sysdir_win.hxx"
 #include "registry_win.hxx"
-#include "sttresid.hxx"
+#include "ittresid.hxx"
 #include <osl/file.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/sound.hxx>
@@ -362,11 +362,11 @@ void TestToolObj::LoadIniFile()				// Laden der IniEinstellungen, die durch den
         aVar = UniString( __##aVar##__, RTL_TEXTENCODING_UTF8 );\
     }
 
-#define NEWOLD( NewKey, OldKey )                                                                \
-    {                                                                                           \
-        ByteString aValue;                                                                      \
-        if ( ( (aValue = aConf.ReadKey( OldKey )).Len() ) && !aConf.ReadKey( NewKey ).Len() )   \
-            aConf.WriteKey( NewKey, aValue );                                                   \
+#define NEWOLD( NewKey, OldKey ) \
+    {                            \
+        rtl::OString aValue;     \
+        if ( ( (aValue = aConf.ReadKey( OldKey )).getLength() ) && !aConf.ReadKey( NewKey ).getLength() )   \
+            aConf.WriteKey( NewKey, aValue );  \
     }
 
 
@@ -381,8 +381,8 @@ void TestToolObj::LoadIniFile()				// Laden der IniEinstellungen, die durch den
     pImpl->aFileBase = DirEntry(aFB);
 
     // remove old keys
-    if ( aConf.ReadKey("KeyCodes + Classes").Len() != 0 ||
-         aConf.ReadKey("KeyCodes + Classes + Res_Type").Len() != 0 )
+    if ( aConf.ReadKey("KeyCodes + Classes").getLength() != 0 ||
+         aConf.ReadKey("KeyCodes + Classes + Res_Type").getLength() != 0 )
     {
         aConf.DeleteKey("KeyCodes + Classes + Res_Type");
         aConf.DeleteKey("KeyCodes + Classes");
@@ -445,8 +445,8 @@ void TestToolObj::LoadIniFile()				// Laden der IniEinstellungen, die durch den
         if (i >= 0)
         {
             sPath = sPath.copy(0, i);
-            ByteString bsPath( sPath.getStr(), sPath.getLength(),
-                               RTL_TEXTENCODING_UTF8 );
+            ByteString bsPath( rtl::OUStringToOString(sPath,
+                               RTL_TEXTENCODING_UTF8) );
 
             aConf.SetGroup( "OOoProgramDir" );
             String aOPD;
@@ -714,31 +714,28 @@ TestToolObj::~TestToolObj()
         pImpl->pMyVars[i].Clear();
     }
 
-    if (m_pControls)
-        delete m_pControls;
-    if (m_pReverseSlots)
-        delete m_pReverseSlots;
-    if (m_pReverseControls)
-        delete m_pReverseControls;
-    if (m_pReverseControlsSon)
-        delete m_pReverseControlsSon;
-    if (m_pReverseUIds)
-        delete m_pReverseUIds;
-    if (m_pSIds)
-        delete m_pSIds;
+    delete m_pControls;
+    delete m_pReverseSlots;
+    delete m_pReverseControls;
+    delete m_pReverseControlsSon;
+    delete m_pReverseUIds;
+    delete m_pSIds;
+
     if (pFehlerListe)
     {
         delete pFehlerListe;
         pFehlerListe = NULL;    // da pFehlerListe static ist!!
     }
+
     if ( pCommunicationManager )
     {
         pCommunicationManager->StopCommunication();
         delete pCommunicationManager;
     }
+
     delete In;
-    if ( pImpl->pTTSfxBroadcaster )
-        delete pImpl->pTTSfxBroadcaster;
+    delete pImpl->pTTSfxBroadcaster;
+    delete pImpl->pHttpRequest;
     delete pImpl->pChildEnv;
 
     pImpl->xErrorList.Clear();
@@ -786,7 +783,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, s
     {
         String aFileName = (pImpl->aHIDDir + DirEntry(CUniString("hid.lst"))).GetFull();
         {
-            TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(SttResId(S_READING_LONGNAMES)), aFileName );
+            TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(IttResId(S_READING_LONGNAMES)), aFileName );
             GetTTBroadcaster().Broadcast( aHint );
         }
         ReadFlat( aFileName ,pUIds, sal_True );
@@ -813,12 +810,12 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, s
 
     if ( bIsFlat && !pNames )
     {
-        TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(SttResId(S_READING_SLOT_IDS)), Filename );
+        TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(IttResId(S_READING_SLOT_IDS)), Filename );
         GetTTBroadcaster().Broadcast( aHint );
     }
     else
     {
-        TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(SttResId(S_READING_CONTROLS)), Filename );
+        TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(IttResId(S_READING_CONTROLS)), Filename );
         GetTTBroadcaster().Broadcast( aHint );
     }
 
@@ -1589,7 +1586,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                         aTmpStr += ' ';
                         aTmpStr += pImpl->ProgParam;
                         {
-                            TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(SttResId(S_STARTING_APPLICATION)), aTmpStr );
+                            TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(IttResId(S_STARTING_APPLICATION)), aTmpStr );
                             GetTTBroadcaster().Broadcast( aHint );
                         }
 
@@ -1786,7 +1783,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
                         else if ( Ext.CompareIgnoreCaseToAscii("Inc") == COMPARE_EQUAL )
                         {
                             {
-                                TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(SttResId(S_READING_BASIC_MODULE)), FilePath.GetFull() );
+                                TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(IttResId(S_READING_BASIC_MODULE)), FilePath.GetFull() );
                                 GetTTBroadcaster().Broadcast( aHint );
                             }
                             String aFullPathname = FilePath.GetFull();
@@ -3084,7 +3081,7 @@ void TestToolObj::ReadHidLstByNumber()
         String aName = (pImpl->aHIDDir + DirEntry(CUniString("hid.lst"))).GetFull();
 
         {
-            TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(SttResId(S_READING_LONGNAMES)), aName );
+            TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(IttResId(S_READING_LONGNAMES)), aName );
             GetTTBroadcaster().Broadcast( aHint );
         }
 
diff --git a/automation/source/testtool/tcommuni.cxx b/automation/source/testtool/tcommuni.cxx
index 2fb5092763bc..f7fc729ff76f 100644
--- a/automation/source/testtool/tcommuni.cxx
+++ b/automation/source/testtool/tcommuni.cxx
@@ -170,7 +170,7 @@ sal_uLong GetTTPortConfig()
 
     GETSET( abPortToTalk, "TTPort",
         rtl::OString::valueOf(static_cast<sal_Int32>(TESTTOOL_DEFAULT_PORT)) );
-    return (sal_uLong)abPortToTalk.ToInt64();
+    return (sal_uLong)abPortToTalk.ToInt32();
 }
 
 
@@ -197,7 +197,7 @@ sal_uLong GetUnoPortConfig()
 
     GETSET( abPortToTalk, "UnoPort",
         rtl::OString::valueOf(static_cast<sal_Int32>(UNO_DEFAULT_PORT)) );
-    return (sal_uLong)abPortToTalk.ToInt64();
+    return (sal_uLong)abPortToTalk.ToInt32();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk
index 046f6e043dea..fbbe47454717 100644
--- a/automation/util/makefile.mk
+++ b/automation/util/makefile.mk
@@ -49,18 +49,18 @@ SHL1TARGET= sts$(DLLPOSTFIX)
 SHL1IMPLIB= ists
 
 SHL1STDLIBS= \
-            $(TOOLSLIB) \
-            $(UNOTOOLSLIB) \
-            $(SVTOOLLIB) \
-            $(SVLLIB)       \
-            $(VCLLIB) \
             $(BASICLIB) \
-            $(SALLIB) \
+            $(COMPHELPERLIB) \
             $(CPPUHELPERLIB) \
             $(CPPULIB) \
-            $(COMPHELPERLIB) \
-            $(SOTLIB)
-
+            $(SALLIB) \
+            $(SOTLIB) \
+            $(SVLLIB) \
+            $(SVTLIB) \
+            $(SVTOOLLIB) \
+            $(TOOLSLIB) \
+            $(UNOTOOLSLIB) \
+            $(VCLLIB) \
 
 .IF "$(GUI)"=="WNT"
 SHL1STDLIBS+= \
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
new file mode 100644
index 000000000000..4ae504fc58c9
--- /dev/null
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -0,0 +1,134 @@
+/* -*- 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 _AVMEDIA_MEDIAITEM_HXX
+#define _AVMEDIA_MEDIAITEM_HXX
+
+#include <tools/rtti.hxx>
+#include <svl/poolitem.hxx>
+#include <com/sun/star/media/ZoomLevel.hpp>
+
+#define AVMEDIA_SETMASK_NONE        ((sal_uInt32)(0x00000000))
+#define AVMEDIA_SETMASK_STATE       ((sal_uInt32)(0x00000001))
+#define AVMEDIA_SETMASK_DURATION    ((sal_uInt32)(0x00000002))
+#define AVMEDIA_SETMASK_TIME        ((sal_uInt32)(0x00000004))
+#define AVMEDIA_SETMASK_LOOP        ((sal_uInt32)(0x00000008))
+#define AVMEDIA_SETMASK_MUTE        ((sal_uInt32)(0x00000010))
+#define AVMEDIA_SETMASK_VOLUMEDB    ((sal_uInt32)(0x00000020))
+#define AVMEDIA_SETMASK_ZOOM        ((sal_uInt32)(0x00000040))
+#define AVMEDIA_SETMASK_URL         ((sal_uInt32)(0x00000080))
+#define AVMEDIA_SETMASK_ALL         ((sal_uInt32)(0xffffffff))
+
+class SvStream;
+
+namespace avmedia
+{
+
+//---------------
+// - MediaState -
+// --------------
+
+enum MediaState
+{
+    MEDIASTATE_STOP = 0,
+    MEDIASTATE_PLAY = 1,
+    MEDIASTATE_PLAYFFW = 2,
+    MEDIASTATE_PAUSE = 3
+};
+
+// -------------
+// - MediaItem -
+// -------------
+
+class MediaItem : public SfxPoolItem
+{
+public:
+                            TYPEINFO();
+
+                            MediaItem( sal_uInt16 nWhich = 0, sal_uInt32 nMaskSet = AVMEDIA_SETMASK_NONE );
+                            MediaItem( const MediaItem& rMediaItem );
+    virtual                 ~MediaItem();
+
+    virtual int             operator==( const SfxPoolItem& ) const;
+    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
+    virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
+                                                 SfxMapUnit eCoreUnit,
+                                                 SfxMapUnit ePresUnit,
+                                                 XubString& rText,
+                                                 const IntlWrapper *pIntl ) const;
+    virtual bool            QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+    virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+
+    void                    merge( const MediaItem& rMediaItem );
+
+    sal_uInt32              getMaskSet() const;
+
+    void                    setState( MediaState eState );
+    MediaState              getState() const;
+
+    void                    setDuration( double fDuration );
+    double                  getDuration() const;
+
+    void                    setTime( double fTime );
+    double                  getTime() const;
+
+    void                    setLoop( sal_Bool bLoop );
+    sal_Bool                isLoop() const;
+
+    void                    setMute( sal_Bool bMute );
+    sal_Bool                isMute() const;
+
+    void                    setVolumeDB( sal_Int16 nDB );
+    sal_Int16               getVolumeDB() const;
+
+    void                    setZoom( ::com::sun::star::media::ZoomLevel eZoom );
+    ::com::sun::star::media::ZoomLevel  getZoom() const;
+
+    void                    setURL( const ::rtl::OUString& rURL );
+    const ::rtl::OUString&  getURL() const;
+
+private:
+
+    ::rtl::OUString         maURL;
+    sal_uInt32              mnMaskSet;
+    MediaState              meState;
+    double                  mfTime;
+    double                  mfDuration;
+    sal_Int16               mnVolumeDB;
+    sal_Bool                mbLoop;
+    sal_Bool                mbMute;
+    ::com::sun::star::media::ZoomLevel meZoom;
+};
+
+typedef ::avmedia::MediaItem avmedia_MediaItem;
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx
new file mode 100644
index 000000000000..2d49f80e2af7
--- /dev/null
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -0,0 +1,99 @@
+/* -*- 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 _AVMEDIA_MEDIACHILD_HXX
+#define _AVMEDIA_MEDIACHILD_HXX
+
+#include <sfx2/ctrlitem.hxx>
+#include <sfx2/dockwin.hxx>
+#include <tools/urlobj.hxx>
+
+// -----------
+// - Defines -
+// -----------
+
+#define AVMEDIA_MEDIAWINDOW()                                                                                           \
+(static_cast< ::avmedia::MediaFloater* >( (                                                                             \
+SfxViewFrame::Current() && SfxViewFrame::Current()->GetChildWindow(::avmedia::MediaPlayer::GetChildWindowId())) ?   \
+SfxViewFrame::Current()->GetChildWindow(::avmedia::MediaPlayer::GetChildWindowId())->GetWindow() :              \
+NULL))
+
+namespace avmedia
+{
+
+// ---------------
+// - MediaPlayer -
+// ---------------
+
+class MediaPlayer : public SfxChildWindow
+{
+public:
+                        MediaPlayer( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
+                        ~MediaPlayer();
+
+                        SFX_DECL_CHILDWINDOW( MediaPlayer );
+};
+
+// ----------------
+// - MediaFloater -
+// ----------------
+
+class MediaWindow;
+
+class MediaFloater : public SfxDockingWindow
+{
+public:
+
+                            MediaFloater( SfxBindings* pBindings, SfxChildWindow* pCW, Window* pParent );
+                            ~MediaFloater();
+
+    void                    setURL( const ::rtl::OUString& rURL, bool bPlayImmediately );
+    const ::rtl::OUString&  getURL() const;
+
+    void                    dispatchCurrentURL();
+
+protected:
+
+    virtual void            Resize();
+    virtual void            ToggleFloatingMode();
+
+private:
+
+    MediaWindow*            mpMediaWindow;
+    Size                    maLastSize;
+    long                    mnDummy1;
+    long                    mnDummy2;
+
+    void                    implInit();
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx
new file mode 100644
index 000000000000..3b5023a4c908
--- /dev/null
+++ b/avmedia/inc/avmedia/mediatoolbox.hxx
@@ -0,0 +1,68 @@
+/* -*- 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 _AVMEDIA_MEDIATOOLBOX_HXX
+#define _AVMEDIA_MEDIATOOLBOX_HXX
+
+#include <svl/lstner.hxx>
+#include <sfx2/tbxctrl.hxx>
+
+namespace avmedia
+{
+
+// -------------------------------
+// - SvxGrafFilterToolBoxControl -
+// -------------------------------
+
+class MediaItem;
+
+class MediaToolBoxControl : public SfxToolBoxControl
+{
+     friend class MediaToolBoxControl_Impl;
+
+public:
+
+                                SFX_DECL_TOOLBOX_CONTROL();
+
+                                MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbX );
+                                ~MediaToolBoxControl();
+
+    virtual void                StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual Window*             CreateItemWindow( Window* pParent );
+
+private:
+
+    void                        implUpdateMediaControl();
+    void                        implExecuteMediaControl( const MediaItem& rItem );
+};
+
+}
+
+#endif // _AVMEDIA_MEDIATOOLBOX_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx
new file mode 100644
index 000000000000..aee3397c8a8f
--- /dev/null
+++ b/avmedia/inc/avmedia/mediawindow.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 _AVMEDIA_MEDIAWINDOW_HXX
+#define _AVMEDIA_MEDIAWINDOW_HXX
+
+#include <memory>
+#include <vector>
+#include <tools/gen.hxx>
+#include <com/sun/star/media/ZoomLevel.hpp>
+#include <com/sun/star/media/XPlayer.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
+#include <com/sun/star/uno/XInterface.hpp>
+
+// -----------
+// - Defines -
+// -----------
+
+#define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME -1.0
+
+// ------------------------
+// - Forward Declarations -
+// ------------------------
+
+class Window;
+class KeyEvent;
+class MouseEvent;
+class CommandEvent;
+class PopupMenu;
+class Pointer;
+struct AcceptDropEvent;
+struct ExecuteDropEvent;
+
+namespace rtl { class OUString; }
+
+/* Declaration of MediaWindow class */
+
+namespace avmedia
+{
+    typedef ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > FilterNameVector;
+
+    class MediaItem;
+
+    namespace priv { class MediaWindowImpl; }
+
+    // ---------------
+    // - MediaWindow -
+    // ---------------
+
+    class MediaWindow
+    {
+    public:
+                            MediaWindow( Window* parent, bool bInternalMediaControl );
+        virtual             ~MediaWindow();
+
+        void                setURL( const ::rtl::OUString& rURL );
+        const ::rtl::OUString&  getURL() const;
+
+        bool                isValid() const;
+        bool                hasPreferredSize() const;
+        Size                getPreferredSize() const;
+
+        Window*             getWindow() const;
+
+        void                setPosSize( const Rectangle& rNewRect );
+
+        void                setPointer( const Pointer& rPointer );
+
+        bool                start();
+
+        void                updateMediaItem( MediaItem& rItem ) const;
+        void                executeMediaItem( const MediaItem& rItem );
+
+        void                show();
+        void                hide();
+
+    public:
+
+        virtual void        MouseMove( const MouseEvent& rMEvt );
+        virtual void        MouseButtonDown( const MouseEvent& rMEvt );
+        virtual void        MouseButtonUp( const MouseEvent& rMEvt );
+
+        virtual void        KeyInput( const KeyEvent& rKEvt );
+        virtual void        KeyUp( const KeyEvent& rKEvt );
+
+        virtual void        Command( const CommandEvent& rCEvt );
+
+        virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
+        virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& rEvt );
+
+        virtual void        StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+
+    public:
+
+        static void         getMediaFilters( FilterNameVector& rFilterNameVector );
+        static bool         executeMediaURLDialog( Window* pParent, ::rtl::OUString& rURL, bool bInsertDialog = true );
+        static void         executeFormatErrorBox( Window* pParent );
+        static bool         isMediaURL( const ::rtl::OUString& rURL, bool bDeep = false, Size* pPreferredSizePixel = NULL );
+
+        static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const ::rtl::OUString& rURL );
+
+        static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > grabFrame( const ::rtl::OUString& rURL,
+                                                                                                  bool bAllowToCreateReplacementGraphic = false,
+                                                                                                  double fMediaTime = AVMEDIA_FRAMEGRABBER_DEFAULTFRAME );
+
+    private:
+
+                    // default: disabled copy/assignment
+        MediaWindow(const MediaWindow&);
+        MediaWindow& operator =( const MediaWindow& );
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >   mxIFace;
+        priv::MediaWindowImpl*                                                  mpImpl;
+    };
+}
+
+#endif // _AVMEDIA_MEDIAWINDOW_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc
new file mode 100755
index 000000000000..4b1d2e04d628
--- /dev/null
+++ b/avmedia/inc/helpids.hrc
@@ -0,0 +1,44 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _AVMEDIA_HELPIDS_HRC
+#define _AVMEDIA_HELPIDS_HRC
+
+#define HID_AVMEDIA_TOOLBOXITEM_PLAY                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY"
+#define HID_AVMEDIA_TOOLBOXITEM_PAUSE                      "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE"
+#define HID_AVMEDIA_TOOLBOXITEM_STOP                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP"
+#define HID_AVMEDIA_TOOLBOXITEM_MUTE                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_MUTE"
+#define HID_AVMEDIA_TOOLBOXITEM_LOOP                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_LOOP"
+#define HID_AVMEDIA_TOOLBOXITEM_OPEN                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN"
+#define HID_AVMEDIA_TOOLBOXITEM_INSERT                     "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT"
+#define HID_AVMEDIA_ZOOMLISTBOX                            "AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX"
+#define HID_AVMEDIA_TIMESLIDER                             "AVMEDIA_HID_AVMEDIA_TIMESLIDER"
+#define HID_AVMEDIA_TIMEEDIT                               "AVMEDIA_HID_AVMEDIA_TIMEEDIT"
+#define HID_AVMEDIA_VOLUMESLIDER                           "AVMEDIA_HID_AVMEDIA_VOLUMESLIDER"
+#define HID_AVMEDIA_PLAYERWINDOW                           "AVMEDIA_HID_AVMEDIA_PLAYERWINDOW"
+
+#endif // _AVMEDIA_HELPIDS_HRC
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
new file mode 100644
index 000000000000..45f0fdf55f88
--- /dev/null
+++ b/avmedia/inc/mediacontrol.hxx
@@ -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.
+ *
+ ************************************************************************/
+
+#ifndef _AVMEDIA_MEDIACONTROL_HXX
+#define _AVMEDIA_MEDIACONTROL_HXX
+
+#include <avmedia/mediaitem.hxx>
+
+#include <vcl/timer.hxx>
+#include <vcl/slider.hxx>
+#include <vcl/toolbox.hxx>
+#include <vcl/edit.hxx>
+#include <vcl/image.hxx>
+
+#define AVMEDIA_CONTROLOFFSET 6
+
+class ListBox;
+
+namespace avmedia
+{
+
+// ---------------------
+// - MediaControlStyle -
+// ---------------------
+
+enum MediaControlStyle
+{
+    MEDIACONTROLSTYLE_SINGLELINE = 0,
+    MEDIACONTROLSTYLE_MULTILINE = 1
+};
+
+// ----------------
+// - MediaControl -
+// ---------------
+
+class MediaItem;
+
+class MediaControl : public Control
+{
+public:
+
+                        MediaControl( Window* pParent, MediaControlStyle eControlStyle );
+    virtual             ~MediaControl();
+
+    const Size&         getMinSizePixel() const;
+
+    void                setState( const MediaItem& rItem );
+
+protected:
+
+    virtual void        update() = 0;
+    virtual void        execute( const MediaItem& rItem ) = 0;
+
+    virtual void        Resize();
+
+private:
+
+    void                implUpdateToolboxes();
+    void                implUpdateTimeSlider();
+    void                implUpdateVolumeSlider();
+    void                implUpdateTimeField( double fCurTime );
+    Image               implGetImage( sal_Int32 nImageId ) const;
+
+                        DECL_LINK( implTimeHdl, Slider* );
+                        DECL_LINK( implTimeEndHdl, Slider* );
+                        DECL_LINK( implVolumeHdl, Slider* );
+                        DECL_LINK( implVolumeEndHdl, Slider* );
+                        DECL_LINK( implSelectHdl, ToolBox* );
+                        DECL_LINK( implZoomSelectHdl, ListBox* );
+                        DECL_LINK( implTimeoutHdl, Timer* );
+
+    ImageList           maImageList;
+    Timer               maTimer;
+    MediaItem           maItem;
+    ToolBox             maPlayToolBox;
+    Slider              maTimeSlider;
+    ToolBox             maMuteToolBox;
+    Slider              maVolumeSlider;
+    ToolBox             maZoomToolBox;
+    ListBox*            mpZoomListBox;
+    Edit                maTimeEdit;
+    Size                maMinSize;
+    MediaControlStyle   meControlStyle;
+    bool                mbLocked;
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/prj/build.lst b/avmedia/prj/build.lst
new file mode 100644
index 000000000000..78397f235b93
--- /dev/null
+++ b/avmedia/prj/build.lst
@@ -0,0 +1,11 @@
+av	avmedia	:    TRANSLATIONS:translations tools sfx2 LIBXSLT:libxslt NULL
+av	avmedia                 	usr1	-	all	av_mkout												NULL
+av	avmedia\prj					get		-	all	av_prj													NULL
+av	avmedia\inc					get		-	all	av_inv													NULL
+av  avmedia\source\viewer		nmake	-	all	av_viewer	        									NULL
+av  avmedia\source\framework	nmake	-	all	av_framework	        								NULL
+av  avmedia\source\win	    	nmake	-	all	av_win	            									NULL
+av	avmedia\source\java			nmake	-	all	av_java	            									NULL
+av	avmedia\source\quicktime	nmake	-	all	av_quicktime											NULL
+av	avmedia\source\gstreamer	nmake	-	all	av_gstreamer	            							NULL
+av	avmedia\util				nmake	-	all	av_util av_viewer av_framework av_win av_java av_quicktime av_gstreamer	NULL
diff --git a/avmedia/prj/d.lst b/avmedia/prj/d.lst
new file mode 100644
index 000000000000..12fea5524801
--- /dev/null
+++ b/avmedia/prj/d.lst
@@ -0,0 +1,23 @@
+mkdir: %COMMON_DEST%\bin\hid
+mkdir: %COMMON_DEST%\res
+
+..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
+..\%__SRC%\bin\avmedia*.dll %_DEST%\bin\avmedia*.dll
+..\source\java\avmedia.jar %_DEST%\bin\avmedia.jar
+..\%__SRC%\lib\lib*.* %_DEST%\lib\lib*.*
+..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
+..\%__SRC%\bin\avmedia*.res %_DEST%\bin\avmedia*.res
+
+mkdir: %_DEST%\inc\avmedia
+
+..\inc\avmedia\mediawindow.hxx %_DEST%\inc\avmedia\mediawindow.hxx
+..\inc\avmedia\mediaitem.hxx %_DEST%\inc\avmedia\mediaitem.hxx
+..\inc\avmedia\mediaplayer.hxx %_DEST%\inc\avmedia\mediaplayer.hxx
+..\inc\avmedia\mediatoolbox.hxx %_DEST%\inc\avmedia\mediatoolbox.hxx
+
+..\%__SRC%\class\avmedia.jar %_DEST%\bin\avmedia.jar
+..\%__SRC%\misc\avmedia.component %_DEST%\xml\avmedia.component
+..\%__SRC%\misc\avmedia.jar.component %_DEST%\xml\avmedia.jar.component
+..\%__SRC%\misc\avmediaQuickTime.component %_DEST%\xml\avmediaQuickTime.component
+..\%__SRC%\misc\avmediagstreamer.component %_DEST%\xml\avmediagstreamer.component
+..\%__SRC%\misc\avmediawin.component %_DEST%\xml\avmediawin.component
diff --git a/avmedia/source/framework/makefile.mk b/avmedia/source/framework/makefile.mk
new file mode 100755
index 000000000000..4c814c534844
--- /dev/null
+++ b/avmedia/source/framework/makefile.mk
@@ -0,0 +1,57 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=avmedia
+TARGET=framework
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  settings.mk
+
+# --- Resources ---------------------------------
+
+SRS1NAME=$(TARGET)
+SRC1FILES =\
+        mediacontrol.src
+
+# --- Files -------------------------------------
+
+SLOFILES= \
+	$(EXCEPTIONSFILES)	 \
+        $(SLO)$/mediaitem.obj	 \
+
+EXCEPTIONSFILES = \
+        $(SLO)$/mediacontrol.obj \
+        $(SLO)$/mediamisc.obj 	 \
+        $(SLO)$/mediaplayer.obj  \
+        $(SLO)$/mediatoolbox.obj \
+        $(SLO)$/soundhandler.obj
+
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
new file mode 100644
index 000000000000..e56550505219
--- /dev/null
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -0,0 +1,615 @@
+/* -*- 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 "mediacontrol.hxx"
+#include "mediacontrol.hrc"
+#include "mediamisc.hxx"
+#include <avmedia/mediawindow.hxx>
+#include <avmedia/mediaplayer.hxx>
+#include "helpids.hrc"
+#include <tools/time.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/lstbox.hxx>
+#include <unotools/syslocale.hxx>
+#include <sfx2/viewfrm.hxx>
+#include <math.h>
+#include <algorithm>
+
+#define AVMEDIA_TIMEOUT             100
+#define AVMEDIA_TIME_RANGE          2048
+#define AVMEDIA_DB_RANGE            -40
+#define AVMEDIA_LINEINCREMENT       1.0
+#define AVMEDIA_PAGEINCREMENT       10.0
+
+#define AVMEDIA_TOOLBOXITEM_PLAY    0x0001
+#define AVMEDIA_TOOLBOXITEM_PLAYFFW 0x0002
+#define AVMEDIA_TOOLBOXITEM_PAUSE   0x0004
+#define AVMEDIA_TOOLBOXITEM_STOP    0x0008
+#define AVMEDIA_TOOLBOXITEM_MUTE    0x0010
+#define AVMEDIA_TOOLBOXITEM_LOOP    0x0011
+#define AVMEDIA_TOOLBOXITEM_ZOOM    0x0012
+#define AVMEDIA_TOOLBOXITEM_OPEN    0x0014
+#define AVMEDIA_TOOLBOXITEM_INSERT  0x0018
+
+#define AVMEDIA_ZOOMLEVEL_50        0
+#define AVMEDIA_ZOOMLEVEL_100       1
+#define AVMEDIA_ZOOMLEVEL_200       2
+#define AVMEDIA_ZOOMLEVEL_FIT       3
+#define AVMEDIA_ZOOMLEVEL_SCALED    4
+#define AVMEDIA_ZOOMLEVEL_INVALID   65535
+
+namespace avmedia
+{
+
+// ----------------
+// - MediaControl -
+// ---------------
+
+MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
+    Control( pParent ),
+    maImageList( AVMEDIA_RESID( AVMEDIA_IMGLST ) ),
+    maItem( 0, AVMEDIA_SETMASK_ALL ),
+    maPlayToolBox( this, WB_3DLOOK ),
+    maTimeSlider( this, WB_HORZ | WB_DRAG | WB_3DLOOK | WB_SLIDERSET ),
+    maMuteToolBox( this, WB_3DLOOK ),
+    maVolumeSlider( this, WB_HORZ | WB_DRAG | WB_SLIDERSET ),
+    maZoomToolBox( this, WB_3DLOOK ),
+    mpZoomListBox( new ListBox( &maZoomToolBox, WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL | WB_3DLOOK ) ),
+    maTimeEdit( this, WB_CENTER | WB_READONLY | WB_BORDER | WB_3DLOOK | WB_READONLY ),
+    meControlStyle( eControlStyle ),
+    mbLocked( false )
+{
+    const String aTimeText( RTL_CONSTASCII_USTRINGPARAM( " 00:00:00/00:00:00 " ) );
+
+    SetBackground();
+    SetPaintTransparent( sal_True );
+    SetParentClipMode( PARENTCLIPMODE_NOCLIP );
+
+    if( MEDIACONTROLSTYLE_SINGLELINE != meControlStyle )
+    {
+        maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage( AVMEDIA_IMG_OPEN ), String( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) );
+        maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, HID_AVMEDIA_TOOLBOXITEM_OPEN );
+
+        maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_INSERT, implGetImage( AVMEDIA_IMG_INSERT ), String( AVMEDIA_RESID( AVMEDIA_STR_INSERT ) ) );
+        maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_INSERT, HID_AVMEDIA_TOOLBOXITEM_INSERT );
+
+        maPlayToolBox.InsertSeparator();
+    }
+    else
+    {
+        mpZoomListBox->SetBackground();
+
+        maZoomToolBox.SetBackground();
+        maZoomToolBox.SetPaintTransparent( sal_True );
+        maPlayToolBox.SetBackground();
+        maPlayToolBox.SetPaintTransparent( sal_True );
+        maMuteToolBox.SetBackground();
+        maMuteToolBox.SetPaintTransparent( sal_True );
+
+    }
+
+    maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PLAY, implGetImage( AVMEDIA_IMG_PLAY ), String( AVMEDIA_RESID( AVMEDIA_STR_PLAY ) ), TIB_CHECKABLE );
+       maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PLAY, HID_AVMEDIA_TOOLBOXITEM_PLAY );
+
+    maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PAUSE, implGetImage( AVMEDIA_IMG_PAUSE ), String( AVMEDIA_RESID( AVMEDIA_STR_PAUSE ) ), TIB_CHECKABLE );
+       maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PAUSE, HID_AVMEDIA_TOOLBOXITEM_PAUSE );
+
+    maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_STOP, implGetImage( AVMEDIA_IMG_STOP ), String( AVMEDIA_RESID( AVMEDIA_STR_STOP ) ), TIB_CHECKABLE );
+       maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_STOP, HID_AVMEDIA_TOOLBOXITEM_STOP );
+
+    maPlayToolBox.InsertSeparator();
+
+    maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_LOOP, implGetImage( AVMEDIA_IMG_ENDLESS ), String( AVMEDIA_RESID( AVMEDIA_STR_ENDLESS ) ) );
+       maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_LOOP, HID_AVMEDIA_TOOLBOXITEM_LOOP );
+
+    if( MEDIACONTROLSTYLE_SINGLELINE == meControlStyle )
+        maPlayToolBox.InsertSeparator();
+
+    maPlayToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) );
+    maPlayToolBox.SetSizePixel( maPlayToolBox.CalcWindowSizePixel() );
+    maPlayToolBox.Show();
+    maMinSize = maPlayToolBox.GetSizePixel();
+
+    maTimeSlider.SetSlideHdl( LINK( this, MediaControl, implTimeHdl ) );
+    maTimeSlider.SetEndSlideHdl( LINK( this, MediaControl, implTimeEndHdl ) );
+    maTimeSlider.SetRange( Range( 0, AVMEDIA_TIME_RANGE ) );
+    maTimeSlider.SetHelpId( HID_AVMEDIA_TIMESLIDER );
+    maTimeSlider.SetUpdateMode( true );
+    maTimeSlider.SetSizePixel( Size( 128, maPlayToolBox.GetSizePixel().Height() ) );
+    maTimeSlider.Show();
+    maMinSize.Width() += maTimeSlider.GetSizePixel().Width();
+
+    maTimeEdit.SetText( aTimeText );
+    maTimeEdit.SetUpdateMode( true );
+    maTimeEdit.SetSizePixel( Size( maTimeEdit.GetTextWidth( aTimeText ) + 8, maPlayToolBox.GetSizePixel().Height() ) );
+    maTimeEdit.SetControlBackground( Application::GetSettings().GetStyleSettings().GetWindowColor() );
+    maTimeEdit.SetHelpId( HID_AVMEDIA_TIMEEDIT );
+    maTimeEdit.Disable();
+    maTimeEdit.Show();
+    maMinSize.Width() += maTimeEdit.GetSizePixel().Width();
+
+    if( MEDIACONTROLSTYLE_SINGLELINE == meControlStyle )
+        maMuteToolBox.InsertSeparator();
+
+    maMuteToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_MUTE, implGetImage( AVMEDIA_IMG_MUTE ), String( AVMEDIA_RESID( AVMEDIA_STR_MUTE ) ) );
+       maMuteToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_MUTE, HID_AVMEDIA_TOOLBOXITEM_MUTE );
+
+    maMuteToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) );
+    maMuteToolBox.SetSizePixel( maMuteToolBox.CalcWindowSizePixel() );
+    maMuteToolBox.Show();
+    maMinSize.Width() += maMuteToolBox.GetSizePixel().Width();
+
+    maVolumeSlider.SetSlideHdl( LINK( this, MediaControl, implVolumeHdl ) );
+    maVolumeSlider.SetEndSlideHdl( LINK( this, MediaControl, implVolumeEndHdl ) );
+    maVolumeSlider.SetRange( Range( AVMEDIA_DB_RANGE, 0 ) );
+    maVolumeSlider.SetUpdateMode( true );
+    maVolumeSlider.SetHelpId( HID_AVMEDIA_VOLUMESLIDER );
+    maVolumeSlider.SetSizePixel( Size( 48, maPlayToolBox.GetSizePixel().Height() ) );
+    maVolumeSlider.Show();
+    maMinSize.Width() += maVolumeSlider.GetSizePixel().Width();
+
+    mpZoomListBox->SetSizePixel( Size( maTimeEdit.GetSizePixel().Width(), 260 ) );
+    mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_50 ) ), AVMEDIA_ZOOMLEVEL_50 );
+    mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_100 ) ), AVMEDIA_ZOOMLEVEL_100 );
+    mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_200 ) ), AVMEDIA_ZOOMLEVEL_200 );
+    mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_FIT ) ), AVMEDIA_ZOOMLEVEL_FIT );
+    mpZoomListBox->SetSelectHdl( LINK( this, MediaControl, implZoomSelectHdl ) );
+    mpZoomListBox->SetHelpId( HID_AVMEDIA_ZOOMLISTBOX );
+
+    maZoomToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_ZOOM, String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM ) ) );
+    maZoomToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_ZOOM, HID_AVMEDIA_ZOOMLISTBOX );
+
+    maZoomToolBox.SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, mpZoomListBox );
+    maZoomToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) );
+    maZoomToolBox.SetSizePixel( maZoomToolBox.CalcWindowSizePixel() );
+    maZoomToolBox.Show();
+    maMinSize.Width() += maZoomToolBox.GetSizePixel().Width();
+
+    if( MEDIACONTROLSTYLE_MULTILINE == meControlStyle )
+    {
+        maMinSize.Width() = 256;
+        maMinSize.Height() = ( maMinSize.Height() << 1 ) + AVMEDIA_CONTROLOFFSET;
+    }
+
+    maTimer.SetTimeout( AVMEDIA_TIMEOUT );
+    maTimer.SetTimeoutHdl( LINK( this, MediaControl, implTimeoutHdl ) );
+    maTimer.Start();
+}
+
+// ------------------------------------------------------------------------------
+
+MediaControl::~MediaControl()
+{
+    maZoomToolBox.SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, NULL );
+    delete mpZoomListBox;
+}
+
+// ------------------------------------------------------------------------------
+
+const Size& MediaControl::getMinSizePixel() const
+{
+    return maMinSize;
+}
+
+// ------------------------------------------------------------------------------
+
+void MediaControl::Resize()
+{
+    Point           aPos( 0, 0 );
+    const sal_Int32 nPlayToolBoxWidth = maPlayToolBox.GetSizePixel().Width();
+    const sal_Int32 nMuteToolBoxWidth = maMuteToolBox.GetSizePixel().Width();
+    const sal_Int32 nVolumeSliderWidth = maVolumeSlider.GetSizePixel().Width();
+    const sal_Int32 nZoomToolBoxWidth = maZoomToolBox.GetSizePixel().Width();
+    const sal_Int32 nTimeEditWidth = maTimeEdit.GetSizePixel().Width();
+    const sal_Int32 nTimeSliderHeight = maTimeSlider.GetSizePixel().Height();
+
+    if( MEDIACONTROLSTYLE_SINGLELINE == meControlStyle )
+    {
+        const sal_Int32 nTimeSliderWidth = GetSizePixel().Width() - ( AVMEDIA_CONTROLOFFSET * 3 ) -
+                                           nPlayToolBoxWidth - nMuteToolBoxWidth - nVolumeSliderWidth - nTimeEditWidth - nZoomToolBoxWidth;
+
+        maPlayToolBox.SetPosSizePixel( aPos, maPlayToolBox.GetSizePixel() );
+
+        aPos.X() += nPlayToolBoxWidth;
+        maTimeSlider.SetPosSizePixel( aPos, Size( nTimeSliderWidth, nTimeSliderHeight ) );
+
+        aPos.X() += nTimeSliderWidth + AVMEDIA_CONTROLOFFSET;
+        maTimeEdit.SetPosSizePixel( aPos, maTimeEdit.GetSizePixel() );
+
+        aPos.X() += nTimeEditWidth + AVMEDIA_CONTROLOFFSET;
+        maMuteToolBox.SetPosSizePixel( aPos, maMuteToolBox.GetSizePixel() );
+
+        aPos.X() += nMuteToolBoxWidth;
+        maVolumeSlider.SetPosSizePixel( aPos, maVolumeSlider.GetSizePixel() );
+
+        aPos.X() += nVolumeSliderWidth + AVMEDIA_CONTROLOFFSET;
+        maZoomToolBox.SetPosSizePixel( aPos, maZoomToolBox.GetSizePixel() );
+    }
+    else
+    {
+        const sal_Int32 nTimeSliderWidth = GetSizePixel().Width() - AVMEDIA_CONTROLOFFSET - nTimeEditWidth;
+
+        maTimeSlider.SetPosSizePixel( aPos, Size( nTimeSliderWidth, nTimeSliderHeight ) );
+
+        aPos.X() += nTimeSliderWidth + AVMEDIA_CONTROLOFFSET;
+        maTimeEdit.SetPosSizePixel( aPos, maTimeEdit.GetSizePixel() );
+
+        aPos.X() = 0;
+        aPos.Y() += nTimeSliderHeight + AVMEDIA_CONTROLOFFSET;
+        maPlayToolBox.SetPosSizePixel( aPos, maPlayToolBox.GetSizePixel() );
+
+        aPos.X() = GetSizePixel().Width() - nVolumeSliderWidth - nMuteToolBoxWidth - nZoomToolBoxWidth - AVMEDIA_CONTROLOFFSET;
+        maMuteToolBox.SetPosSizePixel( aPos, maMuteToolBox.GetSizePixel() );
+
+        aPos.X() += nMuteToolBoxWidth;
+        maVolumeSlider.SetPosSizePixel( aPos, maVolumeSlider.GetSizePixel() );
+
+        aPos.X() = GetSizePixel().Width() - nZoomToolBoxWidth;
+        maZoomToolBox.SetPosSizePixel( aPos, maZoomToolBox.GetSizePixel() );
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+void MediaControl::setState( const MediaItem& rItem )
+{
+    if( !mbLocked )
+    {
+        maItem.merge( rItem );
+
+        implUpdateToolboxes();
+        implUpdateTimeSlider();
+        implUpdateVolumeSlider();
+        implUpdateTimeField( maItem.getTime() );
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+void MediaControl::implUpdateToolboxes()
+{
+    const bool bValidURL = ( maItem.getURL().getLength() > 0 );
+
+    maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_INSERT, bValidURL );
+    maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_PLAY, bValidURL );
+    maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_PLAYFFW, bValidURL );
+    maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_PAUSE, bValidURL );
+    maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_STOP, bValidURL );
+    maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_LOOP, bValidURL );
+    maMuteToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_MUTE, bValidURL );
+
+    if( !bValidURL || !IsEnabled() )
+    {
+        mpZoomListBox->Disable();
+
+        if( MEDIACONTROLSTYLE_SINGLELINE == meControlStyle )
+            maPlayToolBox.Disable();
+
+        maMuteToolBox.Disable();
+    }
+    else
+    {
+        maPlayToolBox.Enable();
+        maMuteToolBox.Enable();
+
+        if( MEDIASTATE_PLAY == maItem.getState() || MEDIASTATE_PLAYFFW == maItem.getState() )
+        {
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PLAY, true );
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PLAYFFW, MEDIASTATE_PLAYFFW == maItem.getState() );
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PAUSE, false );
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_STOP, false );
+        }
+        else if( maItem.getTime() > 0.0 && ( maItem.getTime() < maItem.getDuration() ) )
+        {
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PLAY, false );
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PLAYFFW, false );
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PAUSE, true );
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_STOP, false );
+        }
+        else
+        {
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PLAY, false );
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PLAYFFW, false );
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PAUSE, false );
+            maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_STOP, true );
+        }
+
+        maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_LOOP, maItem.isLoop() );
+        maMuteToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_MUTE, maItem.isMute() );
+
+        if( !mpZoomListBox->IsTravelSelect() && !mpZoomListBox->IsInDropDown() )
+        {
+            sal_uInt16 nSelectEntryPos ;
+
+            switch( maItem.getZoom() )
+            {
+                case( ::com::sun::star::media::ZoomLevel_ZOOM_1_TO_2 ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_50; break;
+                case( ::com::sun::star::media::ZoomLevel_ORIGINAL ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_100; break;
+                case( ::com::sun::star::media::ZoomLevel_ZOOM_2_TO_1 ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_200; break;
+                case( ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_FIT; break;
+                case( ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW ): nSelectEntryPos = AVMEDIA_ZOOMLEVEL_SCALED; break;
+
+                default: nSelectEntryPos = AVMEDIA_ZOOMLEVEL_INVALID; break;
+            }
+
+            if( nSelectEntryPos != AVMEDIA_ZOOMLEVEL_INVALID )
+            {
+                mpZoomListBox->Enable();
+                mpZoomListBox->SelectEntryPos( nSelectEntryPos );
+            }
+            else
+                mpZoomListBox->Disable();
+        }
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+void MediaControl::implUpdateTimeSlider()
+{
+    if( !maItem.getURL().getLength() || !IsEnabled() )
+        maTimeSlider.Disable();
+    else
+    {
+        maTimeSlider.Enable();
+
+        const double fDuration = maItem.getDuration();
+
+        if( fDuration > 0.0 )
+        {
+            const double fTime = ::std::min( maItem.getTime(), fDuration );
+
+            if( !maTimeSlider.GetLineSize() )
+                maTimeSlider.SetLineSize( static_cast< sal_uInt32 >( AVMEDIA_TIME_RANGE * AVMEDIA_LINEINCREMENT / fDuration ) );
+
+            if( !maTimeSlider.GetPageSize() )
+                maTimeSlider.SetPageSize( static_cast< sal_uInt32 >( AVMEDIA_TIME_RANGE * AVMEDIA_PAGEINCREMENT / fDuration ) );
+
+            maTimeSlider.SetThumbPos( static_cast< sal_Int32 >( fTime / fDuration * AVMEDIA_TIME_RANGE ) );
+        }
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+void MediaControl::implUpdateVolumeSlider()
+{
+    if( !maItem.getURL().getLength() || !IsEnabled() )
+        maVolumeSlider.Disable();
+    else
+    {
+        maVolumeSlider.Enable();
+
+        const sal_Int32 nVolumeDB = maItem.getVolumeDB();
+
+        maVolumeSlider.SetThumbPos( ::std::min( ::std::max( nVolumeDB, static_cast< sal_Int32 >( AVMEDIA_DB_RANGE ) ),
+                                                static_cast< sal_Int32 >( 0 ) ) );
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+void MediaControl::implUpdateTimeField( double fCurTime )
+{
+    if( maItem.getURL().getLength() > 0 )
+    {
+        String              aTimeString;
+
+        SvtSysLocale aSysLocale;
+        const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData();
+
+        aTimeString += rLocaleData.getDuration( Time( 0, 0, static_cast< sal_uInt32 >( floor( fCurTime ) ) ) );
+        aTimeString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " / " ));
+        aTimeString += rLocaleData.getDuration( Time( 0, 0, static_cast< sal_uInt32 >( floor( maItem.getDuration() ) )) );
+
+        if( maTimeEdit.GetText() != aTimeString )
+            maTimeEdit.SetText( aTimeString );
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+Image MediaControl::implGetImage( sal_Int32 nImageId ) const
+{
+    return maImageList.GetImage( static_cast< sal_uInt16 >( nImageId ) );
+}
+
+// ------------------------------------------------------------------------------
+
+IMPL_LINK( MediaControl, implTimeHdl, Slider*, p )
+{
+    mbLocked = true;
+    maTimer.Stop();
+    implUpdateTimeField( p->GetThumbPos() * maItem.getDuration() / AVMEDIA_TIME_RANGE );
+
+    return 0;
+}
+
+// ------------------------------------------------------------------------------
+
+IMPL_LINK( MediaControl, implTimeEndHdl, Slider*, p )
+{
+    MediaItem aExecItem;
+
+    aExecItem.setTime( p->GetThumbPos() * maItem.getDuration() / AVMEDIA_TIME_RANGE );
+    execute( aExecItem );
+    update();
+    maTimer.Start();
+    mbLocked = false;
+
+    return 0;
+}
+
+// ------------------------------------------------------------------------------
+
+IMPL_LINK( MediaControl, implVolumeHdl, Slider*, p )
+{
+    MediaItem aExecItem;
+
+    aExecItem.setVolumeDB( static_cast< sal_Int16 >( p->GetThumbPos() ) );
+    execute( aExecItem );
+    update();
+
+    return 0;
+}
+
+// ------------------------------------------------------------------------------
+
+IMPL_LINK( MediaControl, implVolumeEndHdl, Slider*, EMPTYARG )
+{
+    return 0;
+}
+
+// ------------------------------------------------------------------------------
+
+IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p )
+{
+    if( p )
+    {
+        MediaItem aExecItem;
+
+        switch( p->GetCurItemId() )
+        {
+            case( AVMEDIA_TOOLBOXITEM_OPEN ):
+            {
+                ::rtl::OUString aURL;
+
+                 if( ::avmedia::MediaWindow::executeMediaURLDialog( GetParent(), aURL, false ) )
+                 {
+                     if( !::avmedia::MediaWindow::isMediaURL( aURL, true ) )
+                        ::avmedia::MediaWindow::executeFormatErrorBox( this );
+                    else
+                    {
+                        aExecItem.setURL( aURL );
+                        aExecItem.setState( MEDIASTATE_PLAY );
+                    }
+                }
+            }
+            break;
+
+            case( AVMEDIA_TOOLBOXITEM_INSERT ):
+            {
+                MediaFloater* pFloater = AVMEDIA_MEDIAWINDOW();
+
+                if( pFloater )
+                    pFloater->dispatchCurrentURL();
+            }
+            break;
+
+            case( AVMEDIA_TOOLBOXITEM_PLAY ):
+            case( AVMEDIA_TOOLBOXITEM_PLAYFFW ):
+            {
+                aExecItem.setState( ( AVMEDIA_TOOLBOXITEM_PLAYFFW == p->GetCurItemId() ) ? MEDIASTATE_PLAYFFW : MEDIASTATE_PLAY );
+
+                if( maItem.getTime() == maItem.getDuration() )
+                    aExecItem.setTime( 0.0 );
+                else
+                    aExecItem.setTime( maItem.getTime() );
+            }
+            break;
+
+            case( AVMEDIA_TOOLBOXITEM_PAUSE ):
+            {
+                aExecItem.setState( MEDIASTATE_PAUSE );
+            }
+            break;
+
+            case( AVMEDIA_TOOLBOXITEM_STOP ):
+            {
+                aExecItem.setState( MEDIASTATE_STOP );
+                aExecItem.setTime( 0.0 );
+            }
+            break;
+
+            case( AVMEDIA_TOOLBOXITEM_MUTE ):
+            {
+                aExecItem.setMute( !maMuteToolBox.IsItemChecked( AVMEDIA_TOOLBOXITEM_MUTE ) );
+            }
+            break;
+
+            case( AVMEDIA_TOOLBOXITEM_LOOP ):
+            {
+                aExecItem.setLoop( !maPlayToolBox.IsItemChecked( AVMEDIA_TOOLBOXITEM_LOOP ) );
+            }
+            break;
+
+            default:
+            break;
+        }
+
+        if( aExecItem.getMaskSet() != AVMEDIA_SETMASK_NONE )
+            execute( aExecItem );
+    }
+
+    update();
+    p->Invalidate( INVALIDATE_UPDATE );
+
+    return 0;
+}
+
+// ------------------------------------------------------------------------------
+
+IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox*, p )
+{
+    if( p )
+    {
+        MediaItem aExecItem;
+        ::com::sun::star::media::ZoomLevel eLevel;
+
+        switch( p->GetSelectEntryPos() )
+        {
+            case( AVMEDIA_ZOOMLEVEL_50 ): eLevel = ::com::sun::star::media::ZoomLevel_ZOOM_1_TO_2; break;
+            case( AVMEDIA_ZOOMLEVEL_100 ): eLevel = ::com::sun::star::media::ZoomLevel_ORIGINAL; break;
+            case( AVMEDIA_ZOOMLEVEL_200 ): eLevel = ::com::sun::star::media::ZoomLevel_ZOOM_2_TO_1; break;
+            case( AVMEDIA_ZOOMLEVEL_FIT ): eLevel = ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT; break;
+            case( AVMEDIA_ZOOMLEVEL_SCALED ): eLevel = ::com::sun::star::media::ZoomLevel_FIT_TO_WINDOW; break;
+
+            default: eLevel = ::com::sun::star::media::ZoomLevel_NOT_AVAILABLE; break;
+        }
+
+        aExecItem.setZoom( eLevel );
+        execute( aExecItem );
+        update();
+    }
+
+    return 0;
+}
+
+// ------------------------------------------------------------------------------
+
+IMPL_LINK( MediaControl, implTimeoutHdl, Timer*, EMPTYARG )
+{
+    update();
+    maTimer.Start();
+
+    return 0;
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediacontrol.hrc b/avmedia/source/framework/mediacontrol.hrc
new file mode 100755
index 000000000000..f69ab937f5f5
--- /dev/null
+++ b/avmedia/source/framework/mediacontrol.hrc
@@ -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.
+ *
+ ************************************************************************/
+
+#define AVMEDIA_STR_PLAY        1024
+#define AVMEDIA_STR_PAUSE       1025
+#define AVMEDIA_STR_STOP        1026
+#define AVMEDIA_STR_ENDLESS     1027
+#define AVMEDIA_STR_ZOOM        1028
+#define AVMEDIA_STR_ZOOM_50     1029
+#define AVMEDIA_STR_ZOOM_100    1030
+#define AVMEDIA_STR_ZOOM_200    1031
+#define AVMEDIA_STR_ZOOM_FIT    1032
+#define AVMEDIA_STR_MUTE        1033
+#define AVMEDIA_STR_OPEN        1034
+#define AVMEDIA_STR_INSERT      1035
+#define AVMEDIA_STR_MEDIAPLAYER 1036
+
+#define AVMEDIA_IMG_OPEN        2048
+#define AVMEDIA_IMG_PLAY        2049
+#define AVMEDIA_IMG_PAUSE       2050
+#define AVMEDIA_IMG_STOP        2051
+#define AVMEDIA_IMG_ENDLESS     2052
+#define AVMEDIA_IMG_INSERT      2053
+#define AVMEDIA_IMG_MUTE        2054
+
+#define AVMEDIA_IMGLST          3072
+#define AVMEDIA_IMGLST_L        3074
diff --git a/avmedia/source/framework/mediacontrol.src b/avmedia/source/framework/mediacontrol.src
new file mode 100644
index 000000000000..22ddc29b3550
--- /dev/null
+++ b/avmedia/source/framework/mediacontrol.src
@@ -0,0 +1,127 @@
+ /*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "mediacontrol.hrc"
+
+String AVMEDIA_STR_OPEN
+{
+    Text[en-US] = "Open";
+};
+
+String AVMEDIA_STR_INSERT
+{
+    Text [ en-US ] = "Apply" ;
+};
+
+String AVMEDIA_STR_PLAY
+{
+    Text[en-US] = "Play";
+};
+
+String AVMEDIA_STR_PAUSE
+{
+    Text[en-US] = "Pause";
+};
+
+String AVMEDIA_STR_STOP
+{
+    Text[en-US] = "Stop";
+};
+
+String AVMEDIA_STR_ENDLESS
+{
+    Text[en-US] = "Repeat";
+};
+
+String AVMEDIA_STR_MUTE
+{
+    Text[en-US] = "Mute";
+};
+
+String AVMEDIA_STR_ZOOM
+{
+    Text[en-US] = "View";
+};
+
+String AVMEDIA_STR_ZOOM_50
+{
+    Text[en-US] = "50%";
+};
+
+String AVMEDIA_STR_ZOOM_100
+{
+    Text[en-US] = "100%";
+};
+
+String AVMEDIA_STR_ZOOM_200
+{
+    Text[en-US] = "200%";
+};
+
+String AVMEDIA_STR_ZOOM_FIT
+{
+    Text[en-US] = "Scaled";
+};
+
+String AVMEDIA_STR_MEDIAPLAYER
+{
+    Text[en-US] = "Media Player";
+};
+
+ImageList AVMEDIA_IMGLST
+{
+    Prefix = "av";
+    MaskColor = Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; };
+    IdList =
+    {
+        AVMEDIA_IMG_OPEN;
+        AVMEDIA_IMG_PLAY;
+        AVMEDIA_IMG_PAUSE;
+        AVMEDIA_IMG_STOP;
+        AVMEDIA_IMG_ENDLESS;
+        AVMEDIA_IMG_INSERT;
+        AVMEDIA_IMG_MUTE;
+    };
+    IdCount = 7;
+};
+
+ImageList AVMEDIA_IMGLST_L
+{
+    Prefix = "avl";
+    MaskColor = Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; };
+    IdList =
+    {
+        AVMEDIA_IMG_OPEN;
+        AVMEDIA_IMG_PLAY;
+        AVMEDIA_IMG_PAUSE;
+        AVMEDIA_IMG_STOP;
+        AVMEDIA_IMG_ENDLESS;
+        AVMEDIA_IMG_INSERT;
+        AVMEDIA_IMG_MUTE;
+    };
+    IdCount = 7;
+};
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
new file mode 100644
index 000000000000..babaa39b427c
--- /dev/null
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -0,0 +1,332 @@
+/* -*- 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 <avmedia/mediaitem.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+
+using namespace ::com::sun::star;
+
+namespace avmedia
+{
+
+// -------------
+// - MediaItem -
+// -------------
+
+TYPEINIT1_AUTOFACTORY( MediaItem, ::SfxPoolItem );
+    ::rtl::OUString         maURL;
+    sal_uInt32              mnMaskSet;
+    MediaState              meState;
+    double                  mfTime;
+    double                  mfDuration;
+    sal_Int16               mnVolumeDB;
+    sal_Bool                mbLoop;
+    sal_Bool                mbMute;
+    ::com::sun::star::media::ZoomLevel meZoom;
+
+// ------------------------------------------------------------------------------
+
+MediaItem::MediaItem( sal_uInt16 _nWhich, sal_uInt32 nMaskSet ) :
+    SfxPoolItem( _nWhich ),
+    mnMaskSet( nMaskSet ),
+    meState( MEDIASTATE_STOP ),
+    mfTime( 0.0 ),
+    mfDuration( 0.0 ),
+    mnVolumeDB( 0 ),
+    mbLoop( false ),
+    mbMute( false ),
+    meZoom( ::com::sun::star::media::ZoomLevel_NOT_AVAILABLE )
+{
+}
+
+// ------------------------------------------------------------------------------
+
+MediaItem::MediaItem( const MediaItem& rItem ) :
+    SfxPoolItem( rItem ),
+    maURL( rItem.maURL ),
+    mnMaskSet( rItem.mnMaskSet ),
+    meState( rItem.meState ),
+    mfTime( rItem.mfTime ),
+    mfDuration( rItem.mfDuration ),
+    mnVolumeDB( rItem.mnVolumeDB ),
+    mbLoop( rItem.mbLoop ),
+    mbMute( rItem.mbMute ),
+    meZoom( rItem.meZoom )
+{
+}
+
+// ------------------------------------------------------------------------------
+
+MediaItem::~MediaItem()
+{
+}
+
+// ------------------------------------------------------------------------------
+
+int MediaItem::operator==( const SfxPoolItem& rItem ) const
+{
+    DBG_ASSERT( SfxPoolItem::operator==(rItem), "unequal types" );
+    return( mnMaskSet == static_cast< const MediaItem& >( rItem ).mnMaskSet &&
+            maURL == static_cast< const MediaItem& >( rItem ).maURL &&
+            meState == static_cast< const MediaItem& >( rItem ).meState &&
+            mfDuration == static_cast< const MediaItem& >( rItem ).mfDuration &&
+            mfTime == static_cast< const MediaItem& >( rItem ).mfTime &&
+            mnVolumeDB == static_cast< const MediaItem& >( rItem ).mnVolumeDB &&
+            mbLoop == static_cast< const MediaItem& >( rItem ).mbLoop &&
+            mbMute == static_cast< const MediaItem& >( rItem ).mbMute &&
+            meZoom == static_cast< const MediaItem& >( rItem ).meZoom );
+}
+
+// ------------------------------------------------------------------------------
+
+SfxPoolItem* MediaItem::Clone( SfxItemPool* ) const
+{
+    return new MediaItem( *this );
+}
+
+//------------------------------------------------------------------------
+
+SfxItemPresentation MediaItem::GetPresentation( SfxItemPresentation,
+                                                  SfxMapUnit,
+                                                  SfxMapUnit,
+                                                  XubString& rText,
+                                                  const IntlWrapper * ) const
+{
+    rText.Erase();
+    return SFX_ITEM_PRESENTATION_NONE;
+}
+
+//------------------------------------------------------------------------
+
+bool MediaItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const
+{
+    uno::Sequence< uno::Any > aSeq( 9 );
+
+    aSeq[ 0 ] <<= maURL;
+    aSeq[ 1 ] <<= mnMaskSet;
+    aSeq[ 2 ] <<= static_cast< sal_Int32 >( meState );
+    aSeq[ 3 ] <<= mfTime;
+    aSeq[ 4 ] <<= mfDuration;
+    aSeq[ 5 ] <<= mnVolumeDB;
+    aSeq[ 6 ] <<= mbLoop;
+    aSeq[ 7 ] <<= mbMute;
+    aSeq[ 8 ] <<= meZoom;
+
+    rVal <<= aSeq;
+
+    return true;
+}
+
+//------------------------------------------------------------------------
+
+bool MediaItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 )
+{
+    uno::Sequence< uno::Any >   aSeq;
+    bool                        bRet = false;
+
+    if( ( rVal >>= aSeq ) && ( aSeq.getLength() == 9 ) )
+    {
+        sal_Int32 nInt32 = 0;
+
+        aSeq[ 0 ] >>= maURL;
+        aSeq[ 1 ] >>= mnMaskSet;
+        aSeq[ 2 ] >>= nInt32; meState = static_cast< MediaState >( nInt32 );
+        aSeq[ 3 ] >>= mfTime;
+        aSeq[ 4 ] >>= mfDuration;
+        aSeq[ 5 ] >>= mnVolumeDB;
+        aSeq[ 6 ] >>= mbLoop;
+        aSeq[ 7 ] >>= mbMute;
+        aSeq[ 8 ] >>= meZoom;
+
+        bRet = true;
+    }
+
+    return bRet;
+}
+
+//------------------------------------------------------------------------
+
+void MediaItem::merge( const MediaItem& rMediaItem )
+{
+    const sal_uInt32 nMaskSet = rMediaItem.getMaskSet();
+
+    if( AVMEDIA_SETMASK_URL & nMaskSet )
+        setURL( rMediaItem.getURL() );
+
+    if( AVMEDIA_SETMASK_STATE & nMaskSet )
+        setState( rMediaItem.getState() );
+
+    if( AVMEDIA_SETMASK_DURATION & nMaskSet )
+        setDuration( rMediaItem.getDuration() );
+
+    if( AVMEDIA_SETMASK_TIME & nMaskSet )
+        setTime( rMediaItem.getTime() );
+
+    if( AVMEDIA_SETMASK_LOOP & nMaskSet )
+        setLoop( rMediaItem.isLoop() );
+
+    if( AVMEDIA_SETMASK_MUTE & nMaskSet )
+        setMute( rMediaItem.isMute() );
+
+    if( AVMEDIA_SETMASK_VOLUMEDB & nMaskSet )
+        setVolumeDB( rMediaItem.getVolumeDB() );
+
+    if( AVMEDIA_SETMASK_ZOOM & nMaskSet )
+        setZoom( rMediaItem.getZoom() );
+}
+
+//------------------------------------------------------------------------
+
+sal_uInt32 MediaItem::getMaskSet() const
+{
+    return mnMaskSet;
+}
+
+//------------------------------------------------------------------------
+
+void MediaItem::setURL( const ::rtl::OUString& rURL )
+{
+    maURL = rURL;
+    mnMaskSet |= AVMEDIA_SETMASK_URL;
+}
+
+//------------------------------------------------------------------------
+
+const ::rtl::OUString& MediaItem::getURL() const
+{
+    return maURL;
+}
+
+//------------------------------------------------------------------------
+
+void MediaItem::setState( MediaState eState )
+{
+    meState = eState;
+    mnMaskSet |= AVMEDIA_SETMASK_STATE;
+}
+
+//------------------------------------------------------------------------
+
+MediaState MediaItem::getState() const
+{
+    return meState;
+}
+
+//------------------------------------------------------------------------
+
+void MediaItem::setDuration( double fDuration )
+{
+    mfDuration = fDuration;
+    mnMaskSet |= AVMEDIA_SETMASK_DURATION;
+}
+
+//------------------------------------------------------------------------
+
+double MediaItem::getDuration() const
+{
+    return mfDuration;
+}
+
+//------------------------------------------------------------------------
+
+void MediaItem::setTime( double fTime )
+{
+    mfTime = fTime;
+    mnMaskSet |= AVMEDIA_SETMASK_TIME;
+}
+
+//------------------------------------------------------------------------
+
+double MediaItem::getTime() const
+{
+    return mfTime;
+}
+
+//------------------------------------------------------------------------
+
+void MediaItem::setLoop( sal_Bool bLoop )
+{
+    mbLoop = bLoop;
+    mnMaskSet |= AVMEDIA_SETMASK_LOOP;
+}
+
+//------------------------------------------------------------------------
+
+sal_Bool MediaItem::isLoop() const
+{
+    return mbLoop;
+}
+
+//------------------------------------------------------------------------
+
+void MediaItem::setMute( sal_Bool bMute )
+{
+    mbMute = bMute;
+    mnMaskSet |= AVMEDIA_SETMASK_MUTE;
+}
+
+//------------------------------------------------------------------------
+
+sal_Bool MediaItem::isMute() const
+{
+    return mbMute;
+}
+
+//------------------------------------------------------------------------
+
+void MediaItem::setVolumeDB( sal_Int16 nDB )
+{
+    mnVolumeDB = nDB;
+    mnMaskSet |= AVMEDIA_SETMASK_VOLUMEDB;
+}
+
+//------------------------------------------------------------------------
+
+sal_Int16 MediaItem::getVolumeDB() const
+{
+    return mnVolumeDB;
+}
+
+//------------------------------------------------------------------------
+
+void MediaItem::setZoom( ::com::sun::star::media::ZoomLevel eZoom )
+{
+    meZoom = eZoom;
+    mnMaskSet |= AVMEDIA_SETMASK_ZOOM;
+}
+
+//------------------------------------------------------------------------
+
+::com::sun::star::media::ZoomLevel MediaItem::getZoom() const
+{
+    return meZoom;
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx
new file mode 100644
index 000000000000..f9fd65298d83
--- /dev/null
+++ b/avmedia/source/framework/mediamisc.cxx
@@ -0,0 +1,49 @@
+/* -*- 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 <tools/resmgr.hxx>
+#include <svl/solar.hrc>
+#include <vcl/svapp.hxx>
+
+namespace avmedia {
+
+ResMgr* GetResMgr()
+{
+    static ResMgr* pResMgr = NULL;
+
+    if( !pResMgr )
+    {
+        pResMgr = ResMgr::CreateResMgr("avmedia", Application::GetSettings().GetUILocale());
+    }
+
+    return pResMgr;
+}
+
+} // namespace avemdia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
new file mode 100644
index 000000000000..350e4e92bbe2
--- /dev/null
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -0,0 +1,169 @@
+/* -*- 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 <avmedia/mediaplayer.hxx>
+#include <avmedia/mediawindow.hxx>
+#include <avmedia/mediaitem.hxx>
+#include "mediamisc.hxx"
+#include "mediacontrol.hrc"
+#include "helpids.hrc"
+
+#include <svl/stritem.hxx>
+#include <sfx2/app.hxx>
+#include <sfx2/sfxsids.hrc>
+#include <sfx2/bindings.hxx>
+#include <sfx2/dispatch.hxx>
+
+namespace avmedia
+{
+
+// ---------------
+// - MediaPlayer -
+// ---------------
+
+MediaPlayer::MediaPlayer( Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) :
+    SfxChildWindow( _pParent, nId )
+{
+    pWindow = new MediaFloater( _pBindings, this, _pParent );
+    eChildAlignment = SFX_ALIGN_NOALIGNMENT;
+    static_cast< MediaFloater* >( pWindow )->Initialize( pInfo );
+};
+
+// -----------------------------------------------------------------------------
+
+MediaPlayer::~MediaPlayer()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+SFX_IMPL_DOCKINGWINDOW( MediaPlayer, SID_AVMEDIA_PLAYER )
+
+// ----------------
+// - MediaFloater -
+// ----------------
+
+MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, Window* pParent ) :
+    SfxDockingWindow( _pBindings, pCW, pParent, WB_CLOSEABLE | WB_MOVEABLE | WB_SIZEABLE | WB_DOCKABLE ),
+    mpMediaWindow( new MediaWindow( this, true ) )
+{
+    const Size aSize( 378, 256 );
+
+    SetPosSizePixel( Point( 0, 0 ), aSize );
+    SetMinOutputSizePixel( aSize );
+    SetText( String( AVMEDIA_RESID( AVMEDIA_STR_MEDIAPLAYER ) ) );
+    implInit();
+    mpMediaWindow->show();
+}
+
+// -----------------------------------------------------------------------------
+
+MediaFloater::~MediaFloater()
+{
+    delete mpMediaWindow;
+    mpMediaWindow = NULL;
+}
+
+// -----------------------------------------------------------------------------
+
+void MediaFloater::implInit()
+{
+}
+
+// -------------------------------------------------------------------------
+
+void MediaFloater::Resize()
+{
+    SfxDockingWindow::Resize();
+
+    if( mpMediaWindow )
+        mpMediaWindow->setPosSize( Rectangle( Point(), GetOutputSizePixel() ) );
+}
+
+// -----------------------------------------------------------------------------
+
+void MediaFloater::ToggleFloatingMode()
+{
+    ::avmedia::MediaItem aRestoreItem;
+
+    mpMediaWindow->updateMediaItem( aRestoreItem );
+    delete mpMediaWindow;
+    mpMediaWindow = NULL;
+
+    SfxDockingWindow::ToggleFloatingMode();
+
+    mpMediaWindow = new MediaWindow( this, true );
+
+    mpMediaWindow->setPosSize( Rectangle( Point(), GetOutputSizePixel() ) );
+    mpMediaWindow->executeMediaItem( aRestoreItem );
+
+    Window* pWindow = mpMediaWindow->getWindow();
+
+    if( pWindow )
+        pWindow->SetHelpId( HID_AVMEDIA_PLAYERWINDOW );
+
+    mpMediaWindow->show();
+}
+
+// -----------------------------------------------------------------------------
+
+void MediaFloater::setURL( const ::rtl::OUString& rURL, bool bPlayImmediately )
+{
+    if( mpMediaWindow )
+    {
+        mpMediaWindow->setURL( rURL );
+
+        if( mpMediaWindow->isValid() && bPlayImmediately )
+            mpMediaWindow->start();
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+const ::rtl::OUString& MediaFloater::getURL() const
+{
+    static const ::rtl::OUString aEmptyStr;
+    return( mpMediaWindow ? mpMediaWindow->getURL() : aEmptyStr );
+}
+
+// -----------------------------------------------------------------------------
+
+void MediaFloater::dispatchCurrentURL()
+{
+    SfxDispatcher* pDispatcher = GetBindings().GetDispatcher();
+
+    if( pDispatcher )
+    {
+        const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, getURL() );
+        pDispatcher->Execute( SID_INSERT_AVMEDIA, SFX_CALLMODE_RECORD, &aMediaURLItem, 0L );
+    }
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
new file mode 100644
index 000000000000..cb795692011b
--- /dev/null
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -0,0 +1,171 @@
+/* -*- 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 <avmedia/mediatoolbox.hxx>
+#include <avmedia/mediaitem.hxx>
+#include "mediacontrol.hxx"
+
+#include <sfx2/app.hxx>
+#include <sfx2/bindings.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/sfxsids.hrc>
+
+using namespace ::com::sun::star;
+
+namespace avmedia
+{
+
+// -----------------------
+// - MediaToolboxControl -
+// -----------------------
+
+class MediaToolBoxControl_Impl : public MediaControl
+{
+public:
+
+                            MediaToolBoxControl_Impl( Window& rParent, MediaToolBoxControl& rControl );
+                            ~MediaToolBoxControl_Impl();
+
+    void                    update();
+    void                    execute( const MediaItem& rItem );
+
+private:
+
+    MediaToolBoxControl*    mpToolBoxControl;
+};
+
+// ---------------------------------------------------------------------
+
+MediaToolBoxControl_Impl::MediaToolBoxControl_Impl( Window& rParent, MediaToolBoxControl& rControl ) :
+    MediaControl( &rParent, MEDIACONTROLSTYLE_SINGLELINE ),
+    mpToolBoxControl( &rControl )
+{
+    SetSizePixel( getMinSizePixel() );
+}
+
+// ---------------------------------------------------------------------
+
+MediaToolBoxControl_Impl::~MediaToolBoxControl_Impl()
+{
+}
+
+// ---------------------------------------------------------------------
+
+void MediaToolBoxControl_Impl::update()
+{
+    mpToolBoxControl->implUpdateMediaControl();
+}
+
+// ---------------------------------------------------------------------
+
+void MediaToolBoxControl_Impl::execute( const MediaItem& rItem )
+{
+    mpToolBoxControl->implExecuteMediaControl( rItem );
+}
+
+// -----------------------
+// - MediaToolBoxControl -
+// -----------------------
+
+SFX_IMPL_TOOLBOX_CONTROL( ::avmedia::MediaToolBoxControl, ::avmedia::MediaItem );
+
+// -----------------------------------------------------------------------------
+
+MediaToolBoxControl::MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
+    SfxToolBoxControl( nSlotId, nId, rTbx )
+{
+        rTbx.Invalidate();
+}
+
+// -----------------------------------------------------------------------------
+
+MediaToolBoxControl::~MediaToolBoxControl()
+{
+}
+
+// -----------------------------------------------------------------------------
+
+void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, const SfxPoolItem* pState )
+
+{
+    MediaToolBoxControl_Impl* pCtrl = static_cast< MediaToolBoxControl_Impl* >( GetToolBox().GetItemWindow( GetId() ) );
+
+    DBG_ASSERT( pCtrl, "MediaToolBoxControl::StateChanged: media control not found" );
+
+    if( eState == SFX_ITEM_DISABLED )
+    {
+        pCtrl->Enable( false, false );
+        pCtrl->SetText( String() );
+
+        const MediaItem aEmptyMediaItem( 0, AVMEDIA_SETMASK_ALL );
+        pCtrl->setState( aEmptyMediaItem );
+    }
+    else
+    {
+        pCtrl->Enable( true, false );
+
+        const MediaItem* pMediaItem = PTR_CAST( MediaItem, pState );
+
+        if( pMediaItem && ( SFX_ITEM_AVAILABLE == eState ) )
+            pCtrl->setState( *pMediaItem );
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+Window* MediaToolBoxControl::CreateItemWindow( Window *pParent )
+{
+    return( pParent ? new MediaToolBoxControl_Impl( *pParent, *this ) : NULL );
+}
+
+// -----------------------------------------------------------------------------
+
+void MediaToolBoxControl::implUpdateMediaControl()
+{
+    updateStatus( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AVMediaToolBox" ) ) );
+}
+
+// -----------------------------------------------------------------------------
+
+void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem )
+{
+    MediaItem                               aExecItem( SID_AVMEDIA_TOOLBOX );
+    uno::Sequence< beans::PropertyValue >   aArgs( 1 );
+    uno::Any                                aAny;
+
+    aExecItem.merge( rItem );
+    aExecItem.QueryValue( aAny );
+    aArgs[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AVMediaToolBox" ) );
+    aArgs[ 0 ].Value = aAny;
+
+    Dispatch( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AVMediaToolBox" ) ), aArgs );
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
new file mode 100644
index 000000000000..f5403136ab3f
--- /dev/null
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -0,0 +1,510 @@
+/* -*- 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 "soundhandler.hxx"
+
+#include <comphelper/mediadescriptor.hxx>
+
+//_________________________________________________________________________________________________________________
+//  interface includes
+//_________________________________________________________________________________________________________________
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/frame/DispatchResultState.hpp>
+
+//_________________________________________________________________________________________________________________
+//  includes of other projects
+//_________________________________________________________________________________________________________________
+#include <comphelper/sequenceashashmap.hxx>
+#include <rtl/ustrbuf.hxx>
+
+#include <cppuhelper/typeprovider.hxx>
+#include <cppuhelper/factory.hxx>
+
+//_________________________________________________________________________________________________________________
+//  namespace
+//_________________________________________________________________________________________________________________
+
+namespace avmedia{
+
+//_________________________________________________________________________________________________________________
+//  non exported const
+//_________________________________________________________________________________________________________________
+
+//_________________________________________________________________________________________________________________
+//  non exported definitions
+//_________________________________________________________________________________________________________________
+
+//_________________________________________________________________________________________________________________
+//  declarations
+//_________________________________________________________________________________________________________________
+
+//*****************************************************************************************************************
+//  XInterface, XTypeProvider, XServiceInfo
+//*****************************************************************************************************************
+
+void SAL_CALL SoundHandler::acquire() throw()
+{
+       /* Don't use mutex in methods of XInterface! */
+       OWeakObject::acquire();
+}
+
+void SAL_CALL SoundHandler::release() throw()
+{
+       /* Don't use mutex in methods of XInterface! */
+       OWeakObject::release();
+}
+
+css::uno::Any SAL_CALL SoundHandler::queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException )
+{
+       /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface.     */
+        /* Ask for my own supported interfaces ...*/
+       css::uno::Any aReturn( ::cppu::queryInterface( aType,
+               static_cast< css::lang::XTypeProvider* >(this),
+               static_cast< css::lang::XServiceInfo* >(this),
+               static_cast< css::frame::XNotifyingDispatch* >(this),
+               static_cast< css::frame::XDispatch* >(this),
+               static_cast< css::document::XExtendedFilterDetection* >(this)));
+       /* If searched interface not supported by this class ... */
+       if ( aReturn.hasValue() == sal_False )
+       {
+               /* ... ask baseclass for interfaces! */
+               aReturn = OWeakObject::queryInterface( aType );
+       }
+        /* Return result of this search. */
+       return aReturn;
+}
+
+css::uno::Sequence< sal_Int8 > SAL_CALL SoundHandler::getImplementationId() throw( css::uno::RuntimeException )
+{
+    /* Create one Id for all instances of this class.                                               */
+    /* Use ethernet address to do this! (sal_True)                                                  */
+    /* Optimize this method                                                                         */
+    /* We initialize a static variable only one time. And we don't must use a mutex at every call!  */
+    /* For the first call; pID is NULL - for the second call pID is different from NULL!            */
+    static ::cppu::OImplementationId* pID = NULL ;
+    if ( pID == NULL )
+    {
+        /* Ready for multithreading; get global mutex for first call of this method only! see before   */
+        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+        /* Control these pointer again ... it can be, that another instance will be faster then these! */
+        if ( pID == NULL )
+        {
+            /* Create a new static ID ... */
+            static ::cppu::OImplementationId aID( sal_False );
+            /* ... and set his address to static pointer! */
+            pID = &aID ;
+        }
+    }
+    return pID->getImplementationId();
+}
+
+css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( css::uno::RuntimeException )
+{
+    /* Optimize this method !                                       */
+    /* We initialize a static variable only one time.               */
+    /* And we don't must use a mutex at every call!                 */
+    /* For the first call; pTypeCollection is NULL -                */
+    /* for the second call pTypeCollection is different from NULL!  */
+    static ::cppu::OTypeCollection* pTypeCollection = NULL ;
+    if ( pTypeCollection == NULL )
+    {
+        /* Ready for multithreading; get global mutex for first call of this method only! see before   */
+        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+        /* Control these pointer again ... it can be, that another instance will be faster then these! */
+        if ( pTypeCollection == NULL )
+        {
+            /* Create a static typecollection ...           */
+            static ::cppu::OTypeCollection aTypeCollection
+                (
+                    ::getCppuType(( const ::com::sun::star::uno::Reference< css::lang::XTypeProvider >*)NULL ),
+                    ::getCppuType(( const ::com::sun::star::uno::Reference< css::lang::XServiceInfo >*)NULL ),
+                    ::getCppuType(( const ::com::sun::star::uno::Reference< css::frame::XNotifyingDispatch >*)NULL ),
+                    ::getCppuType(( const ::com::sun::star::uno::Reference< css::frame::XDispatch >*)NULL ),
+                    ::getCppuType(( const ::com::sun::star::uno::Reference< css::document::XExtendedFilterDetection >*)NULL )
+                );
+            /* ... and set his address to static pointer! */
+            pTypeCollection = &aTypeCollection ;
+        }
+    }
+    return pTypeCollection->getTypes();
+}
+
+#define DECLARE_ASCII( SASCIIVALUE ) \
+        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SASCIIVALUE ) )
+
+#define IMPLEMENTATIONNAME_SOUNDHANDLER DECLARE_ASCII("com.sun.star.comp.framework.SoundHandler")
+#define SERVICENAME_CONTENTHANDLER DECLARE_ASCII("com.sun.star.frame.ContentHandler")
+
+/*===========================================================================================================*/
+/* XServiceInfo */
+/*===========================================================================================================*/
+::rtl::OUString SAL_CALL SoundHandler::getImplementationName() throw( css::uno::RuntimeException )
+{
+    return impl_getStaticImplementationName();
+}
+
+/*===========================================================================================================*/
+/* XServiceInfo */
+/*===========================================================================================================*/
+sal_Bool SAL_CALL SoundHandler::supportsService( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException )
+{
+    /* Set default return value. */
+    sal_Bool bReturn = sal_False ;
+    /* Get names of all supported servicenames. */
+    css::uno::Sequence< ::rtl::OUString >  seqServiceNames =   getSupportedServiceNames();
+    const ::rtl::OUString*                 pArray          =   seqServiceNames.getConstArray();
+    sal_Int32                              nCounter        =   0;
+    sal_Int32                              nLength         =   seqServiceNames.getLength();
+    /* Search for right name in list. */
+    while   (
+              ( nCounter      <       nLength         )       &&
+              ( bReturn       ==      sal_False       )
+            )
+    {
+        /* Is name was found, say "YES, SERVICE IS SUPPORTED." and break loop. */
+        if ( pArray[nCounter] == sServiceName )
+        {
+            bReturn = sal_True ;
+        }
+        /* Else step to next element in list. */
+        ++nCounter;
+    }
+    /* Return state of search. */
+    return bReturn;
+}
+
+/*===========================================================================================================*/
+/* XServiceInfo */
+/*===========================================================================================================*/
+css::uno::Sequence< ::rtl::OUString > SAL_CALL SoundHandler::getSupportedServiceNames() throw( css::uno::RuntimeException )
+{
+    return impl_getStaticSupportedServiceNames();
+}
+
+/*===========================================================================================================*/
+/* Helper for XServiceInfo                                                                                   */
+/*===========================================================================================================*/
+css::uno::Sequence< ::rtl::OUString > SoundHandler::impl_getStaticSupportedServiceNames()
+{
+    css::uno::Sequence< ::rtl::OUString > seqServiceNames( 1 );
+    seqServiceNames.getArray() [0] = SERVICENAME_CONTENTHANDLER;
+    return seqServiceNames;
+}
+
+/*===========================================================================================================*/
+/* Helper for XServiceInfo */
+/*===========================================================================================================*/
+::rtl::OUString SoundHandler::impl_getStaticImplementationName()
+{
+    return IMPLEMENTATIONNAME_SOUNDHANDLER;
+}
+
+css::uno::Reference< css::uno::XInterface > SAL_CALL SoundHandler::impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception )
+{
+    /* create new instance of service */
+    SoundHandler* pClass = new SoundHandler( xServiceManager );
+    /* hold it alive by increasing his ref count!!! */
+    css::uno::Reference< css::uno::XInterface > xService( static_cast< ::cppu::OWeakObject* >(pClass), css::uno::UNO_QUERY );
+    /* initialize new service instance ... he can use his own refcount ... we hold it! */
+    pClass->impl_initService();
+    /* return new created service as reference */
+    return xService;
+}
+
+css::uno::Reference< css::lang::XSingleServiceFactory > SoundHandler::impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager )
+{
+    css::uno::Reference< css::lang::XSingleServiceFactory > xReturn ( cppu::createSingleFactory (
+       xServiceManager,
+        SoundHandler::impl_getStaticImplementationName(),
+        SoundHandler::impl_createInstance,
+        SoundHandler::impl_getStaticSupportedServiceNames()
+        )
+    );
+    return xReturn;
+}
+
+void SAL_CALL SoundHandler::impl_initService()
+{
+}
+
+/*-************************************************************************************************************//**
+    @short      standard ctor
+    @descr      These initialize a new instance of this class with needed informations for work.
+
+    @seealso    using at owner
+
+    @param      "xFactory", reference to service manager for creation of new services
+    @return     -
+
+    @onerror    Show an assertion and do nothing else.
+    @threadsafe yes
+*//*-*************************************************************************************************************/
+SoundHandler::SoundHandler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory )
+        //  Init baseclasses first
+        :   ThreadHelpBase      (          )
+        ,   ::cppu::OWeakObject (          )
+        // Init member
+    ,   m_bError        ( false    )
+        ,   m_xFactory          ( xFactory )
+{
+    m_aUpdateTimer.SetTimeoutHdl(LINK(this, SoundHandler, implts_PlayerNotify));
+}
+
+/*-************************************************************************************************************//**
+    @short      standard dtor
+    @descr      -
+
+    @seealso    -
+
+    @param      -
+    @return     -
+
+    @onerror    -
+    @threadsafe -
+*//*-*************************************************************************************************************/
+SoundHandler::~SoundHandler()
+{
+    if (m_xListener.is())
+    {
+        css::frame::DispatchResultEvent aEvent;
+        aEvent.State = css::frame::DispatchResultState::FAILURE;
+        m_xListener->dispatchFinished(aEvent);
+        m_xListener = css::uno::Reference< css::frame::XDispatchResultListener >();
+    }
+}
+
+/*-************************************************************************************************************//**
+    @interface  ::com::sun::star::frame::XDispatch
+
+    @short      try to load audio file
+    @descr      This method try to load given audio file by URL and play it. We use vcl/Sound class to do that.
+                Playing of sound is asynchron everytime.
+
+    @attention  We must hold us alive by ourself ... because we use async. vcl sound player ... but playing is started
+                in async interface call "dispatch()" too. And caller forget us imediatly. But then our uno ref count
+                will decreased to 0 and will die. The only solution is to use own reference to our implementation.
+                But we do it for realy started jobs only and release it during call back of vcl.
+
+    @seealso    class vcl/Sound
+    @seealso    method implts_PlayerNotify()
+
+    @param      "aURL"      , URL to dispatch.
+    @param      "lArguments", list of optional arguments.
+    @return     -
+
+    @onerror    We do nothing.
+    @threadsafe yes
+*//*-*************************************************************************************************************/
+void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL&                                             aURL      ,
+                                                     const css::uno::Sequence< css::beans::PropertyValue >&            lDescriptor,
+                                                     const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException)
+{
+    // SAFE {
+    const ::osl::MutexGuard aLock( m_aLock );
+
+    {
+    //close streams otherwise on windows we can't reopen the file in the
+    //media player when we pass the url to directx as it'll already be open
+        ::comphelper::MediaDescriptor aDescriptor(lDescriptor);
+
+    css::uno::Reference< css::io::XInputStream > xInputStream =
+        aDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_INPUTSTREAM(),
+        css::uno::Reference< css::io::XInputStream >());
+    if (xInputStream.is()) xInputStream->closeInput();
+    }
+
+    // If player currently used for other dispatch() requests ...
+    // cancel it by calling stop()!
+    m_aUpdateTimer.Stop();
+    if (m_xPlayer.is())
+    {
+        if (m_xPlayer->isPlaying())
+            m_xPlayer->stop();
+        m_xPlayer.clear();
+    }
+
+    // Try to initialize player.
+    m_xListener = xListener;
+    try
+    {
+        m_bError = false;
+        m_xPlayer.set( avmedia::MediaWindow::createPlayer( aURL.Complete ), css::uno::UNO_QUERY_THROW );
+        // OK- we can start async playing ...
+        // Count this request and initialize self-holder against dieing by uno ref count ...
+        m_xSelfHold = css::uno::Reference< css::uno::XInterface >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
+        m_xPlayer->start();
+        m_aUpdateTimer.SetTimeout( 200 );
+        m_aUpdateTimer.Start();
+    }
+    catch( css::uno::Exception& e )
+    {
+        m_bError = true;
+        (void)e;
+        m_xPlayer.clear();
+    }
+
+    // } SAFE
+}
+
+void SAL_CALL SoundHandler::dispatch( const css::util::URL&                                  aURL       ,
+                                      const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException )
+{
+    dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >());
+}
+
+/*-************************************************************************************************************//**
+    @interface  ::com::sun::star::document::XExtendedFilterDetection
+
+    @short      try to detect file (given as argument included in "lDescriptor")
+    @descr      We try to detect, if given file could be handled by this class and is a well known one.
+                If it is - we return right internal type name - otherwise we return nothing!
+                So call can search for another detect service and ask him too.
+
+    @attention  a) We don't need any mutex here ... because we don't use any member!
+                b) Dont' use internal player instance "m_pPlayer" to detect given sound file!
+                   It's not neccessary to do that ... and we can use temp. variable to do the same.
+                   This way is easy - we don't must synchronize it with currently played sounds!
+                   Another reason to do so ... We are a listener on our internal ma_Player object.
+                   If you would call "IsSoundFile()" on this instance, he would call us back and
+                   we make some uneccssary things ...
+
+    @seealso    -
+
+    @param      "lDescriptor", description of file to detect
+    @return     Internal type name which match this file ... or nothing if it is unknown.
+
+    @onerror    We return nothing.
+    @threadsafe yes
+*//*-*************************************************************************************************************/
+::rtl::OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException )
+{
+    // Our default is "nothing". So we can return it, if detection failed or fily type is realy unknown.
+    ::rtl::OUString sTypeName;
+
+    // Analyze given descriptor to find filename or input stream or ...
+    ::comphelper::MediaDescriptor aDescriptor(lDescriptor);
+    ::rtl::OUString               sURL       = aDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString());
+
+    if (
+        (sURL.getLength()           ) &&
+        (avmedia::MediaWindow::isMediaURL(sURL))
+       )
+    {
+        // If the file type is supported depends on the OS, so...
+        // I think we can the following ones:
+        //  a) look for given extension of url to map our type decision HARD CODED!!!
+        //  b) return preferred type every time... it's easy :-)
+        sTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wav_Wave_Audio_File"));
+        aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
+        aDescriptor >> lDescriptor;
+    }
+
+    // Return our decision.
+    return sTypeName;
+}
+
+/*-************************************************************************************************************//**
+    @short      call back of sound player
+    @descr      Our player call us back to give us some informations.
+                We use this informations to callback our might existing listener.
+
+    @seealso    method dispatchWithNotification()
+
+    @param      -
+    @return     0 everytime ... it doesnt matter for us.
+
+    @onerror    -
+    @threadsafe yes
+*//*-*************************************************************************************************************/
+IMPL_LINK( SoundHandler, implts_PlayerNotify, void*, EMPTYARG )
+{
+    // SAFE {
+    ::osl::ClearableMutexGuard aLock( m_aLock );
+
+    if (m_xPlayer.is() && m_xPlayer->isPlaying() && m_xPlayer->getMediaTime() < m_xPlayer->getDuration())
+    {
+        m_aUpdateTimer.Start();
+        return 0L;
+    }
+    m_xPlayer.clear();
+
+    // We use m_xSelfHold to let us die ... but we must live till real finishing of this method too!!!
+    // So we SHOULD use another "self-holder" temp. to provide that ...
+    css::uno::Reference< css::uno::XInterface > xOperationHold = m_xSelfHold;
+    m_xSelfHold = css::uno::Reference< css::uno::XInterface >();
+
+    // notify might existing listener
+    // And forget this listener!
+    // Because the corresponding dispatch was finished.
+    if (m_xListener.is())
+    {
+        css::frame::DispatchResultEvent aEvent;
+        if (!m_bError)
+            aEvent.State = css::frame::DispatchResultState::SUCCESS;
+        else
+            aEvent.State = css::frame::DispatchResultState::FAILURE;
+        m_xListener->dispatchFinished(aEvent);
+        m_xListener = css::uno::Reference< css::frame::XDispatchResultListener >();
+    }
+
+    // } SAFE
+    //release aLock before end of method at which point xOperationHold goes out of scope and pThis dies
+    aLock.clear();
+    return 0;
+}
+
+} // namespace framework
+
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ )
+{
+    void* pReturn = NULL;
+    if  (pServiceManager !=  NULL )
+    {
+        /* Define variables which are used in following macros. */
+        css::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > xFactory;
+        css::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager;
+            xServiceManager = reinterpret_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager )  ;
+
+        if ( avmedia::SoundHandler::impl_getStaticImplementationName().equals( ::rtl::OUString::createFromAscii( pImplementationName ) ) )
+            xFactory = avmedia::SoundHandler::impl_createFactory( xServiceManager );
+
+        if ( xFactory.is() == sal_True )
+        {
+            xFactory->acquire();
+            pReturn = xFactory.get();
+        }
+    }
+    /* Return with result of this operation. */
+    return pReturn;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
new file mode 100644
index 000000000000..d76bd13df5b7
--- /dev/null
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -0,0 +1,189 @@
+/* -*- 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 __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
+#define __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
+
+//_________________________________________________________________________________________________________________
+//  interface includes
+//_________________________________________________________________________________________________________________
+
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/frame/XNotifyingDispatch.hpp>
+#include <com/sun/star/frame/XStatusListener.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/document/XExtendedFilterDetection.hpp>
+#include <com/sun/star/media/XPlayer.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/util/URL.hpp>
+
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+
+//_________________________________________________________________________________________________________________
+//  other includes
+//_________________________________________________________________________________________________________________
+#include <cppuhelper/weak.hxx>
+
+#include <vcl/timer.hxx>
+#include <tools/link.hxx>
+#include <avmedia/mediawindow.hxx>
+#include <osl/mutex.hxx>
+
+namespace css = ::com::sun::star;
+
+//_________________________________________________________________________________________________________________
+//  namespace
+//_________________________________________________________________________________________________________________
+
+namespace avmedia{
+
+//_________________________________________________________________________________________________________________
+//  exported const
+//_________________________________________________________________________________________________________________
+
+//_________________________________________________________________________________________________________________
+//  exported definitions
+//_________________________________________________________________________________________________________________
+
+struct ThreadHelpBase
+{
+    public:
+        mutable ::osl::Mutex m_aLock;
+};
+
+/*-************************************************************************************************************//**
+    @short          handler to detect and play sounds ("wav" and "au" only!)
+    @descr          Register this implementation as a content handler to detect and/or play wav- and au-sounds.
+                    It doesn't depend from the target platform. But one instance of this class
+                    can play one sound at the same time only. Means every new dispatch request will stop the
+                    might still running one. So we support one operation/one URL/one listener at the same time
+                    only.
+
+    @devstatus      ready
+    @threadsafe     yes
+*//*-*************************************************************************************************************/
+class SoundHandler  :   // interfaces
+                        public  css::lang::XTypeProvider
+                    ,   public  css::lang::XServiceInfo
+                    ,   public  css::frame::XNotifyingDispatch // => XDispatch
+                    ,   public  css::document::XExtendedFilterDetection
+                        // baseclasses
+                        // Order is neccessary for right initialization!
+                    ,   private ThreadHelpBase
+                    ,   public  ::cppu::OWeakObject
+{
+    //-------------------------------------------------------------------------------------------------------------
+    //  public methods
+    //-------------------------------------------------------------------------------------------------------------
+    public:
+
+        //---------------------------------------------------------------------------------------------------------
+        //  constructor / destructor
+        //---------------------------------------------------------------------------------------------------------
+                 SoundHandler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
+        virtual ~SoundHandler(                                                                        );
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XInterface, XTypeProvider, XServiceInfo
+        //---------------------------------------------------------------------------------------------------------
+        virtual css::uno::Any  SAL_CALL queryInterface( const css::uno::Type& aType   ) throw( css::uno::RuntimeException );
+        virtual void SAL_CALL acquire() throw();
+        virtual void SAL_CALL release() throw();
+        virtual css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes () throw( css::uno::RuntimeException );
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException );
+
+    /* interface XServiceInfo */
+       virtual ::rtl::OUString                                        SAL_CALL getImplementationName              (                                                                               ) throw( css::uno::RuntimeException );
+       virtual sal_Bool                                               SAL_CALL supportsService                    ( const ::rtl::OUString&                                        sServiceName    ) throw( css::uno::RuntimeException );
+       virtual css::uno::Sequence< ::rtl::OUString >                  SAL_CALL getSupportedServiceNames           (                                                                               ) throw( css::uno::RuntimeException );
+    /* Helper for XServiceInfo */
+       static css::uno::Sequence< ::rtl::OUString >                   SAL_CALL impl_getStaticSupportedServiceNames(                                                                               );
+       static ::rtl::OUString                                         SAL_CALL impl_getStaticImplementationName   (                                                                               );
+    /* Helper for registry */
+       static css::uno::Reference< css::uno::XInterface >             SAL_CALL impl_createInstance                ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+       static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
+    /* Helper for initialization of service by using own reference! */
+       virtual void                                                   SAL_CALL impl_initService                   (                                                                               );
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XNotifyingDispatch
+        //---------------------------------------------------------------------------------------------------------
+        virtual void SAL_CALL dispatchWithNotification(const css::util::URL&                                             aURL      ,
+                                                       const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
+                                                       const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException);
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XDispatch
+        //---------------------------------------------------------------------------------------------------------
+        virtual void SAL_CALL dispatch              (   const   css::util::URL&                                     aURL        ,
+                                                        const   css::uno::Sequence< css::beans::PropertyValue >&    lArguments  ) throw( css::uno::RuntimeException );
+        // not supported !
+        virtual void SAL_CALL addStatusListener     (   const   css::uno::Reference< css::frame::XStatusListener >& /*xListener*/   ,
+                                                        const   css::util::URL&                                     /*aURL*/        ) throw( css::uno::RuntimeException ) {};
+        virtual void SAL_CALL removeStatusListener  (   const   css::uno::Reference< css::frame::XStatusListener >& /*xListener*/   ,
+                                                        const   css::util::URL&                                     /*aURL*/        ) throw( css::uno::RuntimeException ) {};
+
+        //---------------------------------------------------------------------------------------------------------
+        //  XExtendedFilterDetection
+        //---------------------------------------------------------------------------------------------------------
+        virtual ::rtl::OUString SAL_CALL detect     (           css::uno::Sequence< css::beans::PropertyValue >&    lDescriptor ) throw( css::uno::RuntimeException );
+
+    //-------------------------------------------------------------------------------------------------------------
+    //  protected methods
+    //-------------------------------------------------------------------------------------------------------------
+    protected:
+
+    //-------------------------------------------------------------------------------------------------------------
+    //  private methods
+    //-------------------------------------------------------------------------------------------------------------
+    private:
+        DECL_LINK( implts_PlayerNotify, void* );
+
+    //-------------------------------------------------------------------------------------------------------------
+    //  variables
+    //  (should be private everyway!)
+    //-------------------------------------------------------------------------------------------------------------
+    private:
+
+        bool m_bError;
+        css::uno::Reference< css::lang::XMultiServiceFactory >     m_xFactory          ;   /// global uno service factory to create new services
+        css::uno::Reference< css::uno::XInterface >                m_xSelfHold         ;   /// we must protect us against dieing during async(!) dispatch() call!
+        css::uno::Reference< css::media::XPlayer >                 m_xPlayer           ;   /// uses avmedia player to play sounds ...
+
+        css::uno::Reference< css::frame::XDispatchResultListener > m_xListener         ;
+        Timer m_aUpdateTimer;
+
+};      //  class SoundHandler
+
+}       //  namespace avmedia
+
+#endif  //  #ifndef __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/framework/soundhandler.xml b/avmedia/source/framework/soundhandler.xml
new file mode 100755
index 000000000000..065b31a2c402
--- /dev/null
+++ b/avmedia/source/framework/soundhandler.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+
+     <module-name> avmedia </module-name>
+
+    <component-description>
+        <author> Andreas Schluens </author>
+        <name> com.sun.star.comp.framework.SoundHandler </name>
+        <description>
+            Implements a handler service to detect and/or play audio files.
+            supported formats: wav/au
+        </description>
+        <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+        <language> c++ </language>
+        <status value="final"/>
+        <supported-service> com.sun.star.frame.ContentHandler </supported-service>
+    </component-description>
+
+    <project-build-dependency>  cppu        </project-build-dependency>
+    <project-build-dependency>  cppuhelper  </project-build-dependency>
+    <project-build-dependency>  sal         </project-build-dependency>
+    <project-build-dependency>  tools       </project-build-dependency>
+    <project-build-dependency>  svtools     </project-build-dependency>
+    <project-build-dependency>  toolkit     </project-build-dependency>
+    <project-build-dependency>  sv          </project-build-dependency>
+    <project-build-dependency>  comphelper  </project-build-dependency>
+    <project-build-dependency>  unotools    </project-build-dependency>
+    <project-build-dependency>  ucbhelper   </project-build-dependency>
+    <project-build-dependency>  svl         </project-build-dependency>
+    <project-build-dependency>  sot         </project-build-dependency>
+
+    <runtime-module-dependency> cppu2       </runtime-module-dependency>
+    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
+    <runtime-module-dependency> sal2        </runtime-module-dependency>
+    <runtime-module-dependency> tl          </runtime-module-dependency>
+    <runtime-module-dependency> svt         </runtime-module-dependency>
+    <runtime-module-dependency> svl         </runtime-module-dependency>
+    <runtime-module-dependency> tk          </runtime-module-dependency>
+    <runtime-module-dependency> sv          </runtime-module-dependency>
+    <runtime-module-dependency> comphelp2   </runtime-module-dependency>
+    <runtime-module-dependency> utl         </runtime-module-dependency>
+    <runtime-module-dependency> ucb         </runtime-module-dependency>
+    <runtime-module-dependency> sot         </runtime-module-dependency>
+
+</module-description>
diff --git a/avmedia/source/gstreamer/avmediagstreamer.component b/avmedia/source/gstreamer/avmediagstreamer.component
new file mode 100644
index 000000000000..cd25a6b0cc26
--- /dev/null
+++ b/avmedia/source/gstreamer/avmediagstreamer.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component loader="com.sun.star.loader.SharedLibrary" xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.media.Manager_GStreamer">
+    <service name="com.sun.star.media.Manager_GStreamer"/>
+  </implementation>
+</component>
diff --git a/avmedia/source/gstreamer/exports.dxp b/avmedia/source/gstreamer/exports.dxp
new file mode 100755
index 000000000000..70033078921a
--- /dev/null
+++ b/avmedia/source/gstreamer/exports.dxp
@@ -0,0 +1 @@
+component_getFactory
diff --git a/avmedia/source/gstreamer/gstcommon.hxx b/avmedia/source/gstreamer/gstcommon.hxx
new file mode 100644
index 000000000000..1d9b5caaff96
--- /dev/null
+++ b/avmedia/source/gstreamer/gstcommon.hxx
@@ -0,0 +1,60 @@
+/* -*- 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 2010 Novell, 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.
+ *
+ ************************************************************************/
+
+#ifndef _GSTCOMMON_HXX
+#define _GSTCOMMON_HXX
+
+#include <gst/gst.h>
+
+#include <osl/mutex.hxx>
+#include <tools/debug.hxx>
+#include <tools/stream.hxx>
+#include <tools/string.hxx>
+#include <tools/urlobj.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/factory.hxx>
+
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/KeyModifier.hpp>
+#include <com/sun/star/awt/MouseButton.hpp>
+#include <com/sun/star/media/XManager.hpp>
+
+#define WM_GRAPHNOTIFY (WM_USER + 567)
+
+#endif // _GSTCOMMOM_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
new file mode 100644
index 000000000000..fc775fe01287
--- /dev/null
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -0,0 +1,236 @@
+/* -*- 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 2010 Novell, 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.
+ *
+ ************************************************************************/
+
+#include <objbase.h>
+#include <strmif.h>
+#include <Amvideo.h>
+#include <Qedit.h>
+#include <uuids.h>
+
+#include "framegrabber.hxx"
+#include "player.hxx"
+
+#include <tools/stream.hxx>
+#include <vcl/graph.hxx>
+#include <unotools/localfilehelper.hxx>
+
+#define AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.FrameGrabber_GStreamer"
+#define AVMEDIA_GST_FRAMEGRABBER_SERVICENAME "com.sun.star.media.FrameGrabber_GStreamer"
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace gstreamer {
+
+// ----------------
+// - FrameGrabber -
+// ----------------
+
+FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
+    mxMgr( rxMgr )
+{
+    ::CoInitialize( NULL );
+}
+
+// ------------------------------------------------------------------------------
+
+FrameGrabber::~FrameGrabber()
+{
+    ::CoUninitialize();
+}
+
+// ------------------------------------------------------------------------------
+
+IMediaDet* FrameGrabber::implCreateMediaDet( const ::rtl::OUString& rURL ) const
+{
+    IMediaDet* pDet = NULL;
+
+    if( SUCCEEDED( CoCreateInstance( CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, IID_IMediaDet, (void**) &pDet ) ) )
+    {
+        String aLocalStr;
+
+        if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( rURL, aLocalStr ) && aLocalStr.Len() )
+        {
+            if( !SUCCEEDED( pDet->put_Filename( ::SysAllocString( aLocalStr.GetBuffer() ) ) ) )
+            {
+                pDet->Release();
+                pDet = NULL;
+            }
+        }
+    }
+
+    return pDet;
+}
+
+// ------------------------------------------------------------------------------
+
+bool FrameGrabber::create( const ::rtl::OUString& rURL )
+{
+    // just check if a MediaDet interface can be created with the given URL
+    IMediaDet*  pDet = implCreateMediaDet( rURL );
+
+    if( pDet )
+    {
+        maURL = rURL;
+        pDet->Release();
+        pDet = NULL;
+    }
+    else
+        maURL = ::rtl::OUString();
+
+    return( maURL.getLength() > 0 );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
+    throw (uno::RuntimeException)
+{
+    uno::Reference< graphic::XGraphic > xRet;
+    IMediaDet*                          pDet = implCreateMediaDet( maURL );
+
+    if( pDet )
+    {
+        double  fLength;
+        long    nStreamCount;
+        bool    bFound = false;
+
+        if( SUCCEEDED( pDet->get_OutputStreams( &nStreamCount ) ) )
+        {
+            for( long n = 0; ( n < nStreamCount ) && !bFound; ++n )
+            {
+                GUID aMajorType;
+
+                if( SUCCEEDED( pDet->put_CurrentStream( n ) )  &&
+                    SUCCEEDED( pDet->get_StreamType( &aMajorType ) ) &&
+                    ( aMajorType == MEDIATYPE_Video ) )
+                {
+                    bFound = true;
+                }
+            }
+        }
+
+        if( bFound &&
+            ( S_OK == pDet->get_StreamLength( &fLength ) ) &&
+            ( fLength > 0.0 ) && ( fMediaTime >= 0.0 ) && ( fMediaTime <= fLength ) )
+        {
+            AM_MEDIA_TYPE   aMediaType;
+            long            nWidth = 0, nHeight = 0, nSize = 0;
+
+            if( SUCCEEDED( pDet->get_StreamMediaType( &aMediaType ) ) )
+            {
+                if( ( aMediaType.formattype == FORMAT_VideoInfo ) &&
+                    ( aMediaType.cbFormat >= sizeof( VIDEOINFOHEADER ) ) )
+                {
+                    VIDEOINFOHEADER* pVih = reinterpret_cast< VIDEOINFOHEADER* >( aMediaType.pbFormat );
+
+                    nWidth = pVih->bmiHeader.biWidth;
+                    nHeight = pVih->bmiHeader.biHeight;
+
+                    if( nHeight < 0 )
+                        nHeight *= -1;
+                }
+
+                if( aMediaType.cbFormat != 0 )
+                {
+                    ::CoTaskMemFree( (PVOID) aMediaType.pbFormat );
+                    aMediaType.cbFormat = 0;
+                    aMediaType.pbFormat = NULL;
+                }
+
+                if( aMediaType.pUnk != NULL )
+                {
+                    aMediaType.pUnk->Release();
+                    aMediaType.pUnk = NULL;
+                }
+            }
+
+            if( ( nWidth > 0 ) && ( nHeight > 0 ) &&
+                SUCCEEDED( pDet->GetBitmapBits( 0, &nSize, NULL, nWidth, nHeight ) ) &&
+                ( nSize > 0  ) )
+            {
+                char* pBuffer = new char[ nSize ];
+
+                try
+                {
+                    if( SUCCEEDED( pDet->GetBitmapBits( fMediaTime, NULL, pBuffer, nWidth, nHeight ) ) )
+                    {
+                        SvMemoryStream  aMemStm( pBuffer, nSize, STREAM_READ | STREAM_WRITE );
+                        Bitmap          aBmp;
+
+                        if( aBmp.Read( aMemStm, false ) && !aBmp.IsEmpty() )
+                        {
+                            const Graphic aGraphic( aBmp );
+                            xRet = aGraphic.GetXGraphic();
+                        }
+                    }
+                }
+                catch( ... )
+                {
+                }
+
+                delete [] pBuffer;
+            }
+        }
+
+        pDet->Release();
+    }
+
+    return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL FrameGrabber::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_GST_FRAMEGRABBER_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_GST_FRAMEGRABBER_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace gstreamer
+} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
new file mode 100644
index 000000000000..fc0795221a88
--- /dev/null
+++ b/avmedia/source/gstreamer/gstframegrabber.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 2010 Novell, 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.
+ *
+ ************************************************************************/
+
+#ifndef _FRAMEGRABBER_HXX
+#define _FRAMEGRABBER_HXX
+
+#include "gstcommon.hxx"
+
+#include "com/sun/star/media/XFrameGrabber.hdl"
+
+namespace avmedia { namespace gstreamer {
+
+// ----------------
+// - FrameGrabber -
+// ----------------
+
+class FrameGrabber : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XFrameGrabber,
+                                                      ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+            FrameGrabber( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+            ~FrameGrabber();
+
+    bool    create( const ::rtl::OUString& rURL );
+
+    // XFrameGrabber
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+
+private:
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    mxMgr;
+    ::rtl::OUString                                                                     maURL;
+};
+
+} // namespace gstreamer
+} // namespace avmedia
+
+#endif // _FRAMEGRABBER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx
new file mode 100644
index 000000000000..e3b2c158c1b9
--- /dev/null
+++ b/avmedia/source/gstreamer/gstmanager.cxx
@@ -0,0 +1,109 @@
+/* -*- 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 2010 Novell, 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.
+ *
+ ************************************************************************/
+
+#include "gstmanager.hxx"
+#include "gstplayer.hxx"
+
+#include <tools/urlobj.hxx>
+
+#define AVMEDIA_GST_MANAGER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Manager_GStreamer"
+#define AVMEDIA_GST_MANAGER_SERVICENAME "com.sun.star.media.Manager"
+
+#if OSL_DEBUG_LEVEL > 2
+#define DBG OSL_TRACE
+#else
+#define DBG(...)
+#endif
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace gstreamer {
+// ----------------
+// - Manager -
+// ----------------
+
+Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
+    mxMgr( rxMgr )
+{
+    DBG( "avmediagst: Manager::Manager" );
+}
+
+// ------------------------------------------------------------------------------
+
+Manager::~Manager()
+{
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
+    throw (uno::RuntimeException)
+{
+    Player*                             pPlayer( new Player( mxMgr ) );
+    uno::Reference< media::XPlayer >    xRet( pPlayer );
+    const INetURLObject                 aURL( rURL );
+
+    DBG( "avmediagst: Manager::createPlayer" );
+
+    if( !pPlayer->create( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) )  )
+        xRet = uno::Reference< media::XPlayer >();
+
+    return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL Manager::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_GST_MANAGER_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_GST_MANAGER_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_GST_MANAGER_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace gstreamer
+} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
new file mode 100644
index 000000000000..2d83215402df
--- /dev/null
+++ b/avmedia/source/gstreamer/gstmanager.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 2010 Novell, 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.
+ *
+ ************************************************************************/
+
+#ifndef _MANAGER_HXX
+#define _MANAGER_HXX
+
+#include "gstcommon.hxx"
+
+#include "com/sun/star/media/XManager.hdl"
+
+// -----------
+// - Manager -
+// -----------
+
+namespace avmedia { namespace gstreamer {
+
+class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManager,
+                                                 ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+    Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+    ~Manager();
+
+    // XManager
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+private:
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+};
+
+} // namespace gstreamer
+} // namespace avmedia
+
+#endif // _MANAGER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
new file mode 100644
index 000000000000..14cdbb579af4
--- /dev/null
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -0,0 +1,633 @@
+/* -*- 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 2010 Novell, 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.
+ *
+ ************************************************************************/
+
+#include <math.h>
+
+#include <rtl/string.hxx>
+
+#include <vcl/syschild.hxx>
+#include <vcl/sysdata.hxx>
+
+
+#include "gstplayer.hxx"
+#include "gstframegrabber.hxx"
+#include "gstwindow.hxx"
+
+#include <gst/interfaces/xoverlay.h>
+
+#define AVMEDIA_GST_PLAYER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Player_GStreamer"
+#define AVMEDIA_GST_PLAYER_SERVICENAME "com.sun.star.media.Player_GStreamer"
+
+#if OSL_DEBUG_LEVEL > 2
+#define DBG OSL_TRACE
+#else
+#define DBG(...)
+#endif
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace gstreamer {
+
+// ----------------
+// - Player -
+// ----------------
+
+Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
+    mxMgr( rxMgr ),
+    mpPlaybin( NULL ),
+    mbFakeVideo (sal_False ),
+    mnUnmutedVolume( 0 ),
+    mbPlayPending ( false ),
+    mbMuted( false ),
+    mbLooping( false ),
+    mbInitialized( false ),
+    mnWindowID( 0 ),
+    mpXOverlay( NULL ),
+    mnDuration( 0 ),
+    mnWidth( 0 ),
+    mnHeight( 0 )
+{
+    // Initialize GStreamer library
+    int argc = 1;
+    char name[] = "libreoffice";
+    char *arguments[] = { name };
+    char** argv = arguments;
+    GError* pError = NULL;
+
+    mbInitialized = gst_init_check( &argc, &argv, &pError );
+
+    if (pError != NULL)
+        // TODO: thow an exception?
+        g_error_free (pError);
+}
+
+// ------------------------------------------------------------------------------
+
+Player::~Player()
+{
+    // Release the elements and pipeline
+    if( mbInitialized )
+    {
+        if( mpPlaybin )
+        {
+            gst_element_set_state( mpPlaybin, GST_STATE_NULL );
+            gst_object_unref( GST_OBJECT( mpPlaybin ) );
+
+            mpPlaybin = NULL;
+        }
+
+        if( mpXOverlay ) {
+            g_object_unref( G_OBJECT ( mpXOverlay ) );
+            mpXOverlay = NULL;
+        }
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+static gboolean gst_pipeline_bus_callback( GstBus *, GstMessage *message, gpointer data )
+{
+    Player* pPlayer = (Player *) data;
+
+    pPlayer->processMessage( message );
+
+    return TRUE;
+}
+
+static GstBusSyncReply gst_pipeline_bus_sync_handler( GstBus *, GstMessage * message, gpointer data )
+{
+    Player* pPlayer = (Player *) data;
+
+    return pPlayer->processSyncMessage( message );
+}
+
+void Player::processMessage( GstMessage *message )
+{
+    switch( GST_MESSAGE_TYPE( message ) ) {
+    case GST_MESSAGE_EOS:
+        gst_element_set_state( mpPlaybin, GST_STATE_READY );
+        mbPlayPending = false;
+        if (mbLooping)
+            start();
+        break;
+    case GST_MESSAGE_STATE_CHANGED:
+        if( message->src == GST_OBJECT( mpPlaybin ) ) {
+            GstState newstate, pendingstate;
+
+            gst_message_parse_state_changed (message, NULL, &newstate, &pendingstate);
+
+            if( newstate == GST_STATE_PAUSED &&
+                pendingstate == GST_STATE_VOID_PENDING &&
+                mpXOverlay )
+                gst_x_overlay_expose( mpXOverlay );
+
+        if (mbPlayPending)
+            mbPlayPending = ((newstate == GST_STATE_READY) || (newstate == GST_STATE_PAUSED));
+        }
+    default:
+        break;
+    }
+}
+
+GstBusSyncReply Player::processSyncMessage( GstMessage *message )
+{
+    DBG( "%p processSyncMessage: %s", this, GST_MESSAGE_TYPE_NAME( message ) );
+
+#if OSL_DEBUG_LEVEL > 0
+    if ( GST_MESSAGE_TYPE( message ) == GST_MESSAGE_ERROR )
+    {
+        GError* error;
+        gchar* error_debug;
+
+        gst_message_parse_error( message, &error, &error_debug );
+        OSL_TRACE("gstreamer error: '%s' debug: '%s'", error->message, error_debug);
+    }
+#endif
+
+    if (message->structure) {
+        if( !strcmp( gst_structure_get_name( message->structure ), "prepare-xwindow-id" ) && mnWindowID != 0 ) {
+            if( mpXOverlay )
+                g_object_unref( G_OBJECT ( mpXOverlay ) );
+            mpXOverlay = GST_X_OVERLAY( GST_MESSAGE_SRC( message ) );
+            g_object_ref( G_OBJECT ( mpXOverlay ) );
+            gst_x_overlay_set_xwindow_id( mpXOverlay, mnWindowID );
+            return GST_BUS_DROP;
+        }
+    }
+
+    if( GST_MESSAGE_TYPE( message ) == GST_MESSAGE_STATE_CHANGED ) {
+        if( message->src == GST_OBJECT( mpPlaybin ) ) {
+            GstState newstate, pendingstate;
+
+            gst_message_parse_state_changed (message, NULL, &newstate, &pendingstate);
+
+            DBG( "%p state change received, new state %d", this, newstate );
+            if( newstate == GST_STATE_PAUSED &&
+                pendingstate == GST_STATE_VOID_PENDING ) {
+
+                DBG( "%p change to paused received", this );
+
+                if( mnDuration == 0) {
+                    GstFormat format = GST_FORMAT_TIME;
+                    gint64 gst_duration = 0L;
+
+                    if( gst_element_query_duration( mpPlaybin, &format, &gst_duration) && format == GST_FORMAT_TIME && gst_duration > 0L )
+                        mnDuration = gst_duration;
+                }
+
+                if( mnWidth == 0 ) {
+                    GList *pStreamInfo = NULL;
+
+                    g_object_get( G_OBJECT( mpPlaybin ), "stream-info", &pStreamInfo, NULL );
+
+                    for ( ; pStreamInfo != NULL; pStreamInfo = pStreamInfo->next) {
+                        GObject *pInfo = G_OBJECT( pStreamInfo->data );
+
+                        if( !pInfo )
+                            continue;
+
+                        int nType;
+                        g_object_get( pInfo, "type", &nType, NULL );
+                        GEnumValue *pValue = g_enum_get_value( G_PARAM_SPEC_ENUM( g_object_class_find_property( G_OBJECT_GET_CLASS( pInfo ), "type" ) )->enum_class,
+                                                               nType );
+
+                        if( !g_strcasecmp( pValue->value_nick, "video" ) ) {
+                            GstStructure *pStructure;
+                            GstPad *pPad;
+
+                            g_object_get( pInfo, "object", &pPad, NULL );
+                            pStructure = gst_caps_get_structure( GST_PAD_CAPS( pPad ), 0 );
+                            if( pStructure ) {
+                                gst_structure_get_int( pStructure, "width", &mnWidth );
+                                gst_structure_get_int( pStructure, "height", &mnHeight );
+                                DBG( "queried size: %d x %d", mnWidth, mnHeight );
+                            }
+                        }
+                    }
+
+#if OSL_DEBUG_LEVEL > 2
+                    sal_Bool aSuccess =
+#endif
+                                          maSizeCondition.set();
+                    DBG( "%p set condition result: %d", this, aSuccess );
+                }
+            }
+        }
+    } else if( GST_MESSAGE_TYPE( message ) == GST_MESSAGE_ERROR ) {
+        if( mnWidth == 0 ) {
+            // an error occurred, set condition so that OOo thread doesn't wait for us
+#if OSL_DEBUG_LEVEL > 2
+            sal_Bool aSuccess =
+#endif
+                                maSizeCondition.set();
+            DBG( "%p set condition result: %d", this, aSuccess );
+        }
+    }
+
+    return GST_BUS_PASS;
+}
+
+void Player::preparePlaybin( const ::rtl::OUString& rURL, bool bFakeVideo )
+{
+        GstBus *pBus;
+
+        if( mpPlaybin != NULL ) {
+            gst_element_set_state( mpPlaybin, GST_STATE_NULL );
+            mbPlayPending = false;
+            g_object_unref( mpPlaybin );
+        }
+
+        mpPlaybin = gst_element_factory_make( "playbin", NULL );
+
+        if( bFakeVideo )
+            g_object_set( G_OBJECT( mpPlaybin ), "video-sink", gst_element_factory_make( "fakesink", NULL ), NULL );
+
+        mbFakeVideo = bFakeVideo;
+
+        rtl::OString ascURL = OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 );
+        g_object_set( G_OBJECT( mpPlaybin ), "uri", ascURL.getStr() , NULL );
+
+        pBus = gst_element_get_bus( mpPlaybin );
+        gst_bus_add_watch( pBus, gst_pipeline_bus_callback, this );
+        DBG( "%p set sync handler", this );
+        gst_bus_set_sync_handler( pBus, gst_pipeline_bus_sync_handler, this );
+        g_object_unref( pBus );
+}
+
+bool Player::create( const ::rtl::OUString& rURL )
+{
+    bool    bRet = false;
+
+    // create all the elements and link them
+
+    DBG("create player, URL: %s", OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr());
+
+    if( mbInitialized )
+    {
+        preparePlaybin( rURL, true );
+
+        gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
+        mbPlayPending = false;
+
+        bRet = true;
+    }
+
+    if( bRet )
+        maURL = rURL;
+    else
+        maURL = ::rtl::OUString();
+
+    return bRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::start(  )
+    throw (uno::RuntimeException)
+{
+    // set the pipeline state to READY and run the loop
+    if( mbInitialized && NULL != mpPlaybin )
+    {
+        gst_element_set_state( mpPlaybin, GST_STATE_PLAYING );
+        mbPlayPending = true;
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::stop(  )
+    throw (uno::RuntimeException)
+{
+    // set the pipeline in PAUSED STATE
+    if( mpPlaybin )
+        gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
+
+    mbPlayPending = false;
+    DBG( "stop %p", mpPlaybin );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::isPlaying()
+    throw (uno::RuntimeException)
+{
+    bool            bRet = mbPlayPending;
+
+    // return whether the pipeline is in PLAYING STATE or not
+    if( !mbPlayPending && mbInitialized && mpPlaybin )
+    {
+        bRet = GST_STATE_PLAYING == GST_STATE( mpPlaybin );
+    }
+
+    DBG( "isPlaying %d", bRet );
+
+    return bRet;
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getDuration(  )
+    throw (uno::RuntimeException)
+{
+    // slideshow checks for non-zero duration, so cheat here
+    double duration = 0.01;
+
+    if( mpPlaybin && mnDuration > 0 ) {
+        duration = mnDuration / 1E9;
+    }
+
+    return duration;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setMediaTime( double fTime )
+    throw (uno::RuntimeException)
+{
+    if( mpPlaybin ) {
+        gint64 gst_position = llround (fTime * 1E9);
+
+        gst_element_seek( mpPlaybin, 1.0,
+                          GST_FORMAT_TIME,
+                          GST_SEEK_FLAG_FLUSH,
+                          GST_SEEK_TYPE_SET, gst_position,
+                          GST_SEEK_TYPE_NONE, 0 );
+        if( !isPlaying() )
+            gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
+
+        DBG( "seek to: %"SAL_PRIdINT64" ns original: %lf s", gst_position, fTime );
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getMediaTime(  )
+    throw (uno::RuntimeException)
+{
+    double position = 0.0;
+
+    if( mpPlaybin ) {
+        // get current position in the stream
+        GstFormat format = GST_FORMAT_TIME;
+        gint64 gst_position;
+        if( gst_element_query_position( mpPlaybin, &format, &gst_position ) && format == GST_FORMAT_TIME && gst_position > 0L )
+            position = gst_position / 1E9;
+    }
+
+    return position;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setStopTime( double /*fTime*/ )
+    throw (uno::RuntimeException)
+{
+    // TODO implement
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getStopTime(  )
+    throw (uno::RuntimeException)
+{
+    // Get the time at which to stop
+
+    return 0;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setRate( double /*fRate*/ )
+    throw (uno::RuntimeException)
+{
+    // TODO set the window rate
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getRate(  )
+    throw (uno::RuntimeException)
+{
+    double rate = 0.0;
+
+    // TODO get the window rate
+    if( mbInitialized )
+    {
+
+    }
+
+    return rate;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
+    throw (uno::RuntimeException)
+{
+    // TODO check how to do with GST
+    mbLooping = bSet;
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::isPlaybackLoop(  )
+    throw (uno::RuntimeException)
+{
+    // TODO check how to do with GST
+    return mbLooping;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setMute( sal_Bool bSet )
+    throw (uno::RuntimeException)
+{
+    DBG( "set mute: %d muted: %d unmuted volume: %lf", bSet, mbMuted, mnUnmutedVolume );
+
+    // change the volume to 0 or the unmuted volume
+    if(  mpPlaybin && mbMuted != bSet )
+    {
+        double nVolume = mnUnmutedVolume;
+        if( bSet )
+        {
+            nVolume = 0.0;
+        }
+
+        g_object_set( G_OBJECT( mpPlaybin ), "volume", nVolume, NULL );
+
+        mbMuted = bSet;
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::isMute(  )
+    throw (uno::RuntimeException)
+{
+    return mbMuted;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
+    throw (uno::RuntimeException)
+{
+    mnUnmutedVolume = pow( 10.0, nVolumeDB / 20.0 );
+
+    DBG( "set volume: %d gst volume: %lf", nVolumeDB, mnUnmutedVolume );
+
+    // change volume
+     if( !mbMuted && mpPlaybin )
+     {
+         g_object_set( G_OBJECT( mpPlaybin ), "volume", (gdouble) mnUnmutedVolume, NULL );
+     }
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Int16 SAL_CALL Player::getVolumeDB(  )
+    throw (uno::RuntimeException)
+{
+    sal_Int16 nVolumeDB(0);
+
+    if( mpPlaybin ) {
+        double nGstVolume = 0.0;
+
+        g_object_get( G_OBJECT( mpPlaybin ), "volume", &nGstVolume, NULL );
+
+        nVolumeDB = (sal_Int16) ( 20.0*log10 ( nGstVolume ) );
+    }
+
+    return nVolumeDB;
+}
+
+// ------------------------------------------------------------------------------
+
+awt::Size SAL_CALL Player::getPreferredPlayerWindowSize(  )
+    throw (uno::RuntimeException)
+{
+    awt::Size aSize( 0, 0 );
+
+    DBG( "%p Player::getPreferredPlayerWindowSize, member %d x %d", this, mnWidth, mnHeight );
+
+    TimeValue aTimeout = { 10, 0 };
+#if OSL_DEBUG_LEVEL > 2
+    oslConditionResult aResult =
+#endif
+                                 maSizeCondition.wait( &aTimeout );
+
+    if( mbFakeVideo ) {
+        mbFakeVideo = sal_False;
+
+         g_object_set( G_OBJECT( mpPlaybin ), "video-sink", NULL, NULL );
+         gst_element_set_state( mpPlaybin, GST_STATE_READY );
+         gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
+    }
+
+    DBG( "%p Player::getPreferredPlayerWindowSize after waitCondition %d, member %d x %d", this, aResult, mnWidth, mnHeight );
+
+    if( mnWidth != 0 && mnHeight != 0 ) {
+        aSize.Width = mnWidth;
+        aSize.Height = mnHeight;
+    }
+
+    return aSize;
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& rArguments )
+    throw (uno::RuntimeException)
+{
+    uno::Reference< ::media::XPlayerWindow >    xRet;
+    awt::Size                                   aSize( getPreferredPlayerWindowSize() );
+
+    DBG( "Player::createPlayerWindow %d %d length: %d", aSize.Width, aSize.Height, rArguments.getLength() );
+
+    if( aSize.Width > 0 && aSize.Height > 0 )
+    {
+        ::avmedia::gstreamer::Window* pWindow = new ::avmedia::gstreamer::Window( mxMgr, *this );
+
+        xRet = pWindow;
+
+        if( rArguments.getLength() > 2 )
+        {
+            sal_IntPtr pIntPtr = 0;
+            rArguments[ 2 ] >>= pIntPtr;
+            SystemChildWindow *pParentWindow = reinterpret_cast< SystemChildWindow* >( pIntPtr );
+            const SystemEnvData* pEnvData = pParentWindow ? pParentWindow->GetSystemData() : NULL;
+            OSL_ASSERT(pEnvData);
+            if (pEnvData)
+                mnWindowID = pEnvData->aWindow;
+        }
+    }
+
+    return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber(  )
+    throw (uno::RuntimeException)
+{
+    uno::Reference< media::XFrameGrabber > xRet;
+
+    return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL Player::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_GST_PLAYER_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_GST_PLAYER_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_GST_PLAYER_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace gstreamer
+} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
new file mode 100644
index 000000000000..0e04d67d7f91
--- /dev/null
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -0,0 +1,114 @@
+/* -*- 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 2010 Novell, 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.
+ *
+ ************************************************************************/
+
+#ifndef _PLAYER_HXX
+#define _PLAYER_HXX
+
+#include <osl/conditn.hxx>
+#include "gstcommon.hxx"
+
+#include "com/sun/star/media/XPlayer.hdl"
+
+typedef struct _GstXOverlay GstXOverlay;
+
+namespace avmedia { namespace gstreamer {
+
+// ----------
+// - Player -
+// ----------
+
+class Player : public ::cppu::WeakImplHelper2< ::com::sun::star::media::XPlayer,
+                                               ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+    Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+    ~Player();
+
+    void preparePlaybin( const ::rtl::OUString& rURL, bool bFakeVideo );
+    bool create( const ::rtl::OUString& rURL );
+    void processMessage( GstMessage *message );
+    GstBusSyncReply processSyncMessage( GstMessage *message );
+
+    // XPlayer
+    virtual void SAL_CALL start(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL stop(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isPlaying(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getDuration(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getMediaTime(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setStopTime( double fTime ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getStopTime(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setRate( double fRate ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getRate(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isPlaybackLoop(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isMute(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getVolumeDB(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+
+private:
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+
+    ::rtl::OUString         maURL;
+
+    // Add elements and pipeline here
+    GstElement*             mpPlaybin;  // the playbin is also a pipeline
+    sal_Bool                mbFakeVideo;
+
+    gdouble                 mnUnmutedVolume;
+    sal_Bool                mbPlayPending;
+    sal_Bool                mbMuted;
+    sal_Bool                mbLooping;
+    sal_Bool                mbInitialized;
+
+    long                    mnWindowID;
+    GstXOverlay*            mpXOverlay;
+    gint64                  mnDuration;
+    int                     mnWidth;
+    int                     mnHeight;
+
+    osl::Condition          maSizeCondition;
+};
+
+} // namespace gstreamer
+} // namespace avmedia
+
+#endif // _PLAYER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx
new file mode 100644
index 000000000000..4bd4f9f1b83d
--- /dev/null
+++ b/avmedia/source/gstreamer/gstuno.cxx
@@ -0,0 +1,66 @@
+/* -*- 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 2010 Novell, 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.
+ *
+ ************************************************************************/
+
+#include "gstmanager.hxx"
+
+using namespace ::com::sun::star;
+
+// -------------------
+// - factory methods -
+// -------------------
+
+static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact )
+{
+    return uno::Reference< uno::XInterface >( *new ::avmedia::gstreamer::Manager( rxFact ) );
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
+{
+    uno::Reference< lang::XSingleServiceFactory > xFactory;
+    void*                                   pRet = 0;
+
+    if( rtl_str_compare( pImplName, "com.sun.star.comp.media.Manager_GStreamer" ) == 0 )
+    {
+        const ::rtl::OUString aServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.media.Manager_GStreamer" )) );
+
+        xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
+                        reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.media.Manager_GStreamer" )),
+                        create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
+    }
+
+    if( xFactory.is() )
+    {
+        xFactory->acquire();
+        pRet = xFactory.get();
+    }
+
+    return pRet;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
new file mode 100644
index 000000000000..9228f9e6c9a0
--- /dev/null
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -0,0 +1,326 @@
+/* -*- 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 2010 Novell, 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.
+ *
+ ************************************************************************/
+
+#include <com/sun/star/awt/SystemPointer.hdl>
+
+#include "gstwindow.hxx"
+#include "gstplayer.hxx"
+
+#define AVMEDIA_GST_WINDOW_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Window_GStreamer"
+#define AVMEDIA_GST_WINDOW_SERVICENAME "com.sun.star.media.Window_GStreamer"
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace gstreamer {
+
+// -----------
+// - statics -
+// -----------
+
+static ::osl::Mutex& ImplGetOwnStaticMutex()
+{
+    static ::osl::Mutex* pMutex = NULL;
+
+    if( pMutex == NULL )
+    {
+        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+
+        if( pMutex == NULL )
+        {
+            static ::osl::Mutex aMutex;
+            pMutex = &aMutex;
+        }
+    }
+
+    return *pMutex;
+}
+
+// ---------------
+// - Window -
+// ---------------
+
+// ------------------------------------------------------------------------------
+
+Window::Window( const uno::Reference< lang::XMultiServiceFactory >& rxMgr, Player& rPlayer ) :
+    mxMgr( rxMgr ),
+    maListeners( maMutex ),
+    meZoomLevel( media::ZoomLevel_NOT_AVAILABLE ),
+    mrPlayer( rPlayer ),
+    mnPointerType( awt::SystemPointer::ARROW )
+{
+    ::osl::MutexGuard aGuard( ImplGetOwnStaticMutex() );
+
+}
+
+// ------------------------------------------------------------------------------
+
+Window::~Window()
+{
+}
+
+// XPlayerWindow
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::update(  )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
+    throw (uno::RuntimeException)
+{
+        sal_Bool bRet = false;
+
+        if( media::ZoomLevel_NOT_AVAILABLE != meZoomLevel &&
+            media::ZoomLevel_NOT_AVAILABLE != eZoomLevel )
+        {
+            if( eZoomLevel != meZoomLevel )
+            {
+                meZoomLevel = eZoomLevel;
+            }
+
+            bRet = true;
+        }
+
+        return bRet;
+}
+
+// ------------------------------------------------------------------------------
+
+media::ZoomLevel SAL_CALL Window::getZoomLevel(  )
+    throw (uno::RuntimeException)
+{
+    return meZoomLevel;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
+    throw (uno::RuntimeException)
+{
+    mnPointerType = nPointerType;
+}
+
+// XWindow
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setPosSize( sal_Int32 /*X*/, sal_Int32 /*Y*/, sal_Int32 /*Width*/, sal_Int32 /*Height*/, sal_Int16 /*Flags*/ )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+awt::Rectangle SAL_CALL Window::getPosSize()
+    throw (uno::RuntimeException)
+{
+    awt::Rectangle aRet;
+
+    aRet.X = aRet.Y = 0;
+    aRet.Width = 320;
+    aRet.Height = 240;
+
+    return aRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setVisible( sal_Bool /*bVisible*/ )
+    throw (uno::RuntimeException)
+{
+
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setEnable( sal_Bool /*bEnable*/ )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setFocus(  )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// XComponent
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::dispose(  )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// XServiceInfo
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL Window::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_GST_WINDOW_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_GST_WINDOW_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_GST_WINDOW_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace gstreamer
+} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
new file mode 100644
index 000000000000..18b9a7dbd0ae
--- /dev/null
+++ b/avmedia/source/gstreamer/gstwindow.hxx
@@ -0,0 +1,111 @@
+/* -*- 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 2010 Novell, 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.
+ *
+ ************************************************************************/
+
+#ifndef _WINDOW_HXX
+#define _WINDOW_HXX
+
+#include "gstcommon.hxx"
+#include <cppuhelper/interfacecontainer.h>
+
+#include "com/sun/star/media/XPlayerWindow.hdl"
+
+namespace avmedia { namespace gstreamer {
+
+// ---------------
+// - Window -
+// ---------------
+
+class Player;
+
+class Window : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XPlayerWindow,
+                                                ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+            Window( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr,
+                    Player& rPlayer );
+            ~Window();
+
+    bool    create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments );
+    void    processGraphEvent();
+    void    updatePointer();
+
+    // XPlayerWindow
+    virtual void SAL_CALL update(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ZoomLevel ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XWindow
+    virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setFocus(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XComponent
+    virtual void SAL_CALL dispose(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+
+private:
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+
+    ::osl::Mutex                                maMutex;
+    ::cppu::OMultiTypeInterfaceContainerHelper  maListeners;
+    ::com::sun::star::media::ZoomLevel          meZoomLevel;
+    Player&                                     mrPlayer;
+    int                                         mnPointerType;
+
+    void                                        ImplLayoutVideoWindow();
+};
+
+} // namespace gstreamer
+} // namespace avmedia
+
+#endif // _WINDOW_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/makefile.mk b/avmedia/source/gstreamer/makefile.mk
new file mode 100755
index 000000000000..c87d43afb24a
--- /dev/null
+++ b/avmedia/source/gstreamer/makefile.mk
@@ -0,0 +1,90 @@
+#*************************************************************************
+#
+#   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+#   Copyright 2010 Novell, 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.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=avmedia
+TARGET=avmediagst
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+
+.IF "$(ENABLE_GSTREAMER)" == "TRUE"
+
+.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
+CDEFS+= -DVERBOSE
+.ENDIF
+
+PKGCONFIG_MODULES=gstreamer-0.10, gstreamer-plugins-base-0.10
+.INCLUDE: pkg_config.mk
+PKGCONFIG_LIBS+=-lgstinterfaces-0.10
+
+# --- Files ----------------------------------
+
+.IF "$(GUI)" == "UNX" || "$(GUI)" == "WNT"
+
+.IF "$(GUI)" == "WNT"
+CDEFS+= -DWINNT
+.ENDIF
+
+SLOFILES= \
+        $(SLO)$/gstuno.obj      \
+        $(SLO)$/gstmanager.obj  \
+        $(SLO)$/gstplayer.obj	\
+        $(SLO)$/gstwindow.obj
+
+
+EXCEPTIONSFILES= \
+        $(SLO)$/gstuno.obj      \
+
+SHL1TARGET=$(TARGET)
+SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(PKGCONFIG_LIBS) $(TOOLSLIB) $(VCLLIB)
+SHL1IMPLIB=i$(TARGET)
+SHL1LIBS=$(SLB)$/$(TARGET).lib
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+# on Solaris checkdll does not work: LD_LIBRARY_PATH breaks the 2 libxml2.so.2
+SHL1NOCHECK=t
+
+DEF1NAME=$(SHL1TARGET)
+DEF1EXPORTFILE=exports.dxp
+
+.ENDIF # UNX / WNT
+.ENDIF # ENABLE_GSTREAMER
+
+.INCLUDE :  	target.mk
+
+.IF "$(ENABLE_GSTREAMER)" == "TRUE"
+.IF "$(GUI)" == "UNX" || "$(GUI)" == "WNT"
+
+ALLTAR : $(MISC)/avmediagstreamer.component
+$(MISC)/avmediagstreamer.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt avmediagstreamer.component
+    $(XSLTPROC) --nonet \
+	--stringparam uri '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' \
+	-o $@ $(SOLARENV)/bin/createcomponent.xslt avmediagstreamer.component
+
+.ENDIF # UNX / WNT
+.ENDIF # ENABLE_GSTREAMER
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
new file mode 100644
index 000000000000..f7bf8de83df1
--- /dev/null
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -0,0 +1,58 @@
+/* -*- 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.
+ *
+ ************************************************************************/
+
+class ResMgr;
+
+#define AVMEDIA_RESID( nId ) ResId( nId, * ::avmedia::GetResMgr() )
+
+#ifdef GSTREAMER
+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
+#else
+#ifdef WNT
+
+#define AVMEDIA_MANAGER_SERVICE_NAME                    "com.sun.star.comp.avmedia.Manager_DirectX"
+
+#else
+#ifdef QUARTZ
+
+#define AVMEDIA_MANAGER_SERVICE_NAME                    "com.sun.star.comp.avmedia.Manager_QuickTime"
+
+#else
+
+#define AVMEDIA_MANAGER_SERVICE_NAME                    "com.sun.star.comp.avmedia.Manager_GStreamer"
+
+#endif
+#endif
+#endif
+
+namespace avmedia
+{
+    ResMgr* GetResMgr();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/java/FrameGrabber.java b/avmedia/source/java/FrameGrabber.java
new file mode 100755
index 000000000000..1a0deda4ce57
--- /dev/null
+++ b/avmedia/source/java/FrameGrabber.java
@@ -0,0 +1,190 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.IQueryInterface;
+import com.sun.star.lang.XInitialization;
+import com.sun.star.lang.XEventListener;
+import com.sun.star.awt.*;
+import com.sun.star.media.*;
+import com.sun.star.graphic.*;
+
+// -----------------
+// - Player Window -
+// -----------------
+
+public class FrameGrabber implements com.sun.star.lang.XServiceInfo,
+                                     com.sun.star.media.XFrameGrabber
+{
+    private com.sun.star.lang.XMultiServiceFactory maFactory = null;
+    private javax.media.Player maPlayer = null;
+    private javax.media.control.FrameGrabbingControl maFrameGrabbingControl = null;
+
+    // -------------------------------------------------------------------------
+
+    public FrameGrabber( com.sun.star.lang.XMultiServiceFactory aFactory, String aURL )
+    {
+        maFactory = aFactory;
+
+        try
+        {
+            maPlayer = javax.media.Manager.createRealizedPlayer( new java.net.URL( aURL ) );
+        }
+        catch( java.net.MalformedURLException e )
+        {
+        }
+        catch( java.io.IOException e )
+        {
+        }
+        catch( javax.media.NoPlayerException e )
+        {
+        }
+        catch( javax.media.CannotRealizeException e )
+        {
+        }
+        catch( java.lang.Exception e )
+        {
+        }
+
+        if( maPlayer != null )
+        {
+            maFrameGrabbingControl = (javax.media.control.FrameGrabbingControl) maPlayer.getControl(
+                                        "javax.media.control.FrameGrabbingControl" );
+        }
+    }
+
+    // -------------------------------------------------------------------------
+
+    public com.sun.star.graphic.XGraphic implImageToXGraphic( java.awt.Image aImage )
+    {
+        com.sun.star.graphic.XGraphic aRet = null;
+
+        if( maFactory != null && aImage != null )
+        {
+            if( aImage instanceof java.awt.image.BufferedImage )
+            {
+                java.io.File aTempFile = null;
+
+                try
+                {
+                    aTempFile = java.io.File.createTempFile( "sv0", ".png" );
+
+                    if( aTempFile.canWrite() )
+                    {
+                        javax.imageio.ImageIO.write( (java.awt.image.BufferedImage) aImage, "png", aTempFile );
+
+                        com.sun.star.graphic.XGraphicProvider aProvider =
+                            (com.sun.star.graphic.XGraphicProvider) UnoRuntime.queryInterface(
+                                com.sun.star.graphic.XGraphicProvider.class,
+                                maFactory.createInstance("com.sun.star.graphic.GraphicProvider") );
+
+                        if( aProvider != null )
+                        {
+                            com.sun.star.beans.PropertyValue[] aArgs = new com.sun.star.beans.PropertyValue[ 1 ];
+
+                            aArgs[ 0 ] = new com.sun.star.beans.PropertyValue();
+                            aArgs[ 0 ].Name = "URL";
+                            aArgs[ 0 ].Value = "file://" + aTempFile.toString();
+
+                            aRet = aProvider.queryGraphic( aArgs );
+                        }
+                    }
+                }
+                catch( java.lang.IllegalArgumentException aExcp )
+                {
+                }
+                catch( java.io.IOException aExcp )
+                {
+                }
+                catch( com.sun.star.uno.Exception aExcp )
+                {
+                }
+
+                if( aTempFile != null )
+                    aTempFile.delete();
+            }
+        }
+
+        return aRet;
+    }
+
+    // -----------------
+    // - XFrameGrabber -
+    // -----------------
+
+    public synchronized com.sun.star.graphic.XGraphic grabFrame( double fMediaTime )
+    {
+        com.sun.star.graphic.XGraphic aRet = null;
+
+        if( maFrameGrabbingControl != null )
+        {
+            if( fMediaTime >= 0.0 && fMediaTime <= maPlayer.getDuration().getSeconds() )
+            {
+                maPlayer.setMediaTime( new javax.media.Time( fMediaTime ) );
+
+                javax.media.Buffer aBuffer = maFrameGrabbingControl.grabFrame();
+
+                if( aBuffer != null && aBuffer.getFormat() instanceof javax.media.format.VideoFormat )
+                {
+                    aRet = implImageToXGraphic( new javax.media.util.BufferToImage(
+                                                    (javax.media.format.VideoFormat) aBuffer.getFormat() ).
+                                                        createImage( aBuffer ) );
+                }
+            }
+        }
+
+        return aRet;
+    }
+
+    // ----------------
+    // - XServiceInfo -
+    // ----------------
+
+    private static final String s_implName = "com.sun.star.comp.FrameGrabber_Java";
+    private static final String s_serviceName = "com.sun.star.media.FrameGrabber_Java";
+
+    public synchronized String getImplementationName()
+    {
+        return s_implName;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized String [] getSupportedServiceNames()
+    {
+        return new String [] { s_serviceName };
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized boolean supportsService( String serviceName )
+    {
+        return serviceName.equals( s_serviceName );
+    }
+}
diff --git a/avmedia/source/java/Manager.java b/avmedia/source/java/Manager.java
new file mode 100755
index 000000000000..47707478fd5b
--- /dev/null
+++ b/avmedia/source/java/Manager.java
@@ -0,0 +1,148 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// UNO
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.IQueryInterface;
+import com.sun.star.lang.XInitialization;
+
+// media
+import com.sun.star.media.*;
+
+public class Manager implements com.sun.star.lang.XServiceInfo,
+                                com.sun.star.lang.XTypeProvider,
+                                com.sun.star.media.XManager
+
+{
+    private com.sun.star.lang.XMultiServiceFactory maFactory;
+
+    // -------------------------------------------------------------------------
+
+    public Manager( com.sun.star.lang.XMultiServiceFactory aFactory )
+    {
+        maFactory = aFactory;
+    }
+
+    // ------------
+    // - XManager -
+    // ------------
+
+    public com.sun.star.media.XPlayer createPlayer( String aURL )
+    {
+        javax.media.Player aPlayer = null;
+
+        try
+        {
+            aPlayer = javax.media.Manager.createRealizedPlayer( new java.net.URL( aURL ) );
+        }
+        catch( java.net.MalformedURLException e )
+        {
+        }
+        catch( java.io.IOException e )
+        {
+        }
+        catch( javax.media.NoPlayerException e )
+        {
+        }
+        catch( javax.media.CannotRealizeException e )
+        {
+        }
+        catch( java.lang.Exception e )
+        {
+        }
+
+        if( aPlayer != null )
+        {
+            return new Player( maFactory, aPlayer, aURL );
+        }
+        else
+            return null;
+    }
+
+    // ----------------
+    // - XServiceInfo -
+    // ----------------
+
+    private static final String s_implName = "com.sun.star.comp.media.Manager_Java";
+    private static final String s_serviceName = "com.sun.star.media.Manager_Java";
+
+    public synchronized String getImplementationName()
+    {
+        return s_implName;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized String [] getSupportedServiceNames()
+    {
+        return new String [] { s_serviceName };
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized boolean supportsService( String serviceName )
+    {
+        return serviceName.equals( s_serviceName );
+    }
+
+    // -----------------
+    // - XTypeProvider -
+    // -----------------
+    protected byte[] maImplementationId;
+
+    public com.sun.star.uno.Type[] getTypes()
+    {
+        com.sun.star.uno.Type[] retValue = new com.sun.star.uno.Type[ 3 ];
+
+        retValue[ 0 ]= new com.sun.star.uno.Type( com.sun.star.lang.XServiceInfo.class );
+        retValue[ 1 ]= new com.sun.star.uno.Type( com.sun.star.lang.XTypeProvider.class );
+        retValue[ 2 ]= new com.sun.star.uno.Type( com.sun.star.media.XManager.class );
+
+        return retValue;
+    }
+
+    // -------------------------------------------------------------------------
+
+    synchronized public byte[] getImplementationId()
+    {
+        if( maImplementationId == null)
+        {
+            maImplementationId = new byte[ 16 ];
+
+            int hash = hashCode();
+
+            maImplementationId[ 0 ] = (byte)(hash & 0xff);
+            maImplementationId[ 1 ] = (byte)((hash >>> 8) & 0xff);
+            maImplementationId[ 2 ] = (byte)((hash >>> 16) & 0xff);
+            maImplementationId[ 3 ] = (byte)((hash >>>24) & 0xff);
+        }
+
+        return maImplementationId;
+    }
+}
diff --git a/avmedia/source/java/MediaUno.java b/avmedia/source/java/MediaUno.java
new file mode 100755
index 000000000000..3e4387840741
--- /dev/null
+++ b/avmedia/source/java/MediaUno.java
@@ -0,0 +1,67 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// UNO
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.IQueryInterface;
+import com.sun.star.lang.XInitialization;
+
+public class MediaUno
+{
+    private static final String s_implName = "com.sun.star.comp.media.Manager_Java";
+    private static final String s_serviceName = "com.sun.star.media.Manager_Java";
+
+    // -------------------------------------------------------------------------
+
+    public MediaUno()
+    {
+    }
+
+    // -------------------------------------------------------------------------
+
+    public static com.sun.star.lang.XSingleServiceFactory __getServiceFactory(
+        String implName,
+        com.sun.star.lang.XMultiServiceFactory multiFactory,
+        com.sun.star.registry.XRegistryKey regKey )
+    {
+        if (implName.equals( s_implName ))
+        {
+            try
+            {
+                return com.sun.star.comp.loader.FactoryHelper.getServiceFactory(
+                    Class.forName( "Manager" ), s_serviceName, multiFactory, regKey );
+            }
+            catch( java.lang.ClassNotFoundException exception )
+            {
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/avmedia/source/java/Player.java b/avmedia/source/java/Player.java
new file mode 100755
index 000000000000..be3b3d62d367
--- /dev/null
+++ b/avmedia/source/java/Player.java
@@ -0,0 +1,325 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// UNO
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.IQueryInterface;
+import com.sun.star.lang.XInitialization;
+
+// awt
+import com.sun.star.awt.*;
+
+// media
+import com.sun.star.media.*;
+
+public class Player implements javax.media.ControllerListener,
+                               com.sun.star.lang.XServiceInfo,
+                               com.sun.star.media.XPlayer,
+                               com.sun.star.lang.XComponent
+
+
+{
+    private com.sun.star.lang.XMultiServiceFactory maFactory;
+    private String maURL;
+    private javax.media.Player maPlayer;
+    private javax.media.GainControl maGainControl;
+    private boolean mbStarted = false;
+    private boolean mbLooping = false;
+
+    // -------------------------------------------------------------------------
+
+    public Player( com.sun.star.lang.XMultiServiceFactory aFactory,
+                   javax.media.Player aPlayer, String aURL )
+    {
+        maFactory = aFactory;
+        maURL = aURL;
+        maPlayer = aPlayer;
+        maPlayer.addControllerListener( this );
+        maGainControl = maPlayer.getGainControl();
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void controllerUpdate( javax.media.ControllerEvent aEvt )
+    {
+        if( aEvt instanceof javax.media.EndOfMediaEvent ||
+            aEvt instanceof javax.media.StopAtTimeEvent )
+        {
+            mbStarted = false;
+
+            if( mbLooping )
+            {
+                setMediaTime( 0.0 );
+                start();
+            }
+            else if( aEvt instanceof javax.media.EndOfMediaEvent )
+                setMediaTime( getDuration() );
+        }
+    }
+
+    // -----------
+    // - XPlayer -
+    // -----------
+
+    public synchronized void start()
+    {
+        if( !mbStarted )
+        {
+            maPlayer.start();
+            mbStarted = true;
+        }
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void stop()
+    {
+        if( mbStarted )
+        {
+            maPlayer.stop();
+            mbStarted = false;
+        }
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized boolean isPlaying()
+    {
+        return mbStarted;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized double getDuration()
+    {
+        return maPlayer.getDuration().getSeconds();
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setMediaTime( double fTime )
+    {
+        if( fTime >= 0.0 && fTime <= getDuration() )
+            maPlayer.setMediaTime( new javax.media.Time( fTime ) );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized double getMediaTime()
+    {
+        return maPlayer.getMediaTime().getSeconds();
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setStopTime( double fTime )
+    {
+        boolean bOldStarted = mbStarted;
+
+        if( mbStarted )
+            stop();
+
+        maPlayer.setStopTime( new javax.media.Time( fTime ) );
+
+        if( bOldStarted )
+            start();
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized double getStopTime()
+    {
+        return maPlayer.getStopTime().getSeconds();
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setRate( double fRate )
+    {
+        boolean bOldStarted = mbStarted;
+
+        if( mbStarted )
+            stop();
+
+        maPlayer.setRate( (float) fRate );
+
+        if( bOldStarted )
+            start();
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized double getRate()
+    {
+        return (double) maPlayer.getRate();
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setPlaybackLoop( boolean bSet )
+    {
+        mbLooping = bSet;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized boolean isPlaybackLoop()
+    {
+        return mbLooping;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setVolumeDB( short nVolumeDB )
+    {
+        if( maGainControl != null )
+            maGainControl.setDB( nVolumeDB );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized short getVolumeDB()
+    {
+        return( maGainControl != null ? (short) maGainControl.getDB() : 0 );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setMute( boolean bSet )
+    {
+        if( maGainControl != null )
+            maGainControl.setMute( bSet );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized boolean isMute()
+    {
+        return( maGainControl != null ? maGainControl.getMute() : false );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized com.sun.star.awt.Size getPreferredPlayerWindowSize()
+    {
+        java.awt.Component      aVisualComponent = maPlayer.getVisualComponent();
+        com.sun.star.awt.Size   aSize = new com.sun.star.awt.Size( 0, 0 );
+
+        if( aVisualComponent != null )
+        {
+            java.awt.Dimension aDim = aVisualComponent.getPreferredSize();
+
+            aSize.Width = Math.max( aDim.width, 0 );
+            aSize.Height = Math.max( aDim.height, 0 );
+        }
+
+        return aSize;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized com.sun.star.media.XPlayerWindow createPlayerWindow( java.lang.Object[] aArgs )
+    {
+        try
+        {
+            com.sun.star.media.XPlayerWindow xPlayerWindow = ( ( ( aArgs.length > 1 ) && ( AnyConverter.toInt( aArgs[ 0 ] ) > 0 ) ) ?
+                                                             new PlayerWindow( maFactory, aArgs, maPlayer ) :
+                                                             null );
+
+            // check if it is a real player window (video window)
+            if( xPlayerWindow != null && xPlayerWindow.getZoomLevel() == com.sun.star.media.ZoomLevel.NOT_AVAILABLE )
+                xPlayerWindow = null;
+
+            return xPlayerWindow;
+        }
+        catch( com.sun.star.lang.IllegalArgumentException e )
+        {
+            return null;
+        }
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized com.sun.star.media.XFrameGrabber createFrameGrabber()
+    {
+        return( (com.sun.star.media.XFrameGrabber) new FrameGrabber( maFactory, maURL ) );
+    }
+
+    // --------------
+    // - XComponent -
+    // --------------
+
+    public synchronized void addEventListener( com.sun.star.lang.XEventListener xListener )
+    {
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void removeEventListener( com.sun.star.lang.XEventListener xListener )
+    {
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void dispose()
+    {
+        if( maPlayer != null )
+        {
+            maPlayer.stop();
+            maPlayer.close();
+            maPlayer = null;
+        }
+    }
+
+    // ----------------
+    // - XServiceInfo -
+    // ----------------
+
+    private static final String s_implName = "com.sun.star.comp.Player_Java";
+    private static final String s_serviceName = "com.sun.star.media.Player_Java";
+
+    public synchronized String getImplementationName()
+    {
+        return s_implName;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized String [] getSupportedServiceNames()
+    {
+        return new String [] { s_serviceName };
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized boolean supportsService( String serviceName )
+    {
+        return serviceName.equals( s_serviceName );
+    }
+}
diff --git a/avmedia/source/java/PlayerWindow.java b/avmedia/source/java/PlayerWindow.java
new file mode 100755
index 000000000000..2229e4f1644b
--- /dev/null
+++ b/avmedia/source/java/PlayerWindow.java
@@ -0,0 +1,600 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.uno.IQueryInterface;
+import com.sun.star.lang.XInitialization;
+import com.sun.star.lang.XEventListener;
+import com.sun.star.awt.*;
+import com.sun.star.media.*;
+
+// -----------------
+// - Player Window -
+// -----------------
+
+public class PlayerWindow implements java.awt.event.KeyListener,
+                                     java.awt.event.MouseListener,
+                                     java.awt.event.MouseMotionListener,
+                                     java.awt.event.FocusListener,
+                                     com.sun.star.lang.XServiceInfo,
+                                     com.sun.star.media.XPlayerWindow
+{
+    private com.sun.star.lang.XMultiServiceFactory maFactory;
+    private WindowAdapter maFrame;
+    private javax.media.Player maPlayer;
+    private com.sun.star.media.ZoomLevel meZoomLevel = com.sun.star.media.ZoomLevel.ORIGINAL;
+    private boolean mbShowControls = false;
+
+
+    // -------------------------------------------------------------------------
+
+    public PlayerWindow( com.sun.star.lang.XMultiServiceFactory aFactory,
+                         java.lang.Object[] aArgs, javax.media.Player aPlayer )
+    {
+        maFactory = aFactory;
+
+        try
+        {
+            if( aArgs.length > 1 )
+            {
+                com.sun.star.awt.Rectangle aBoundRect = (com.sun.star.awt.Rectangle) aArgs[ 1 ];
+
+                maFrame = new WindowAdapter( AnyConverter.toInt( aArgs[ 0 ] ) );
+                maFrame.setPosSize( aBoundRect.X, aBoundRect.Y, aBoundRect.Width, aBoundRect.Height, (short) 0 );
+                mbShowControls = false;
+
+                java.awt.Panel aPanel = new java.awt.Panel( new java.awt.BorderLayout() );
+
+                aPanel.setLayout( null );
+                aPanel.setBackground( java.awt.Color.black );
+                aPanel.addKeyListener( this );
+                aPanel.addMouseListener( this );
+                aPanel.addMouseMotionListener( this );
+
+                if( mbShowControls )
+                {
+                    java.awt.Component aControlComponent = aPlayer.getControlPanelComponent();
+
+                    if( aControlComponent != null )
+                        aPanel.add( aControlComponent );
+                    else
+                        mbShowControls = false;
+                }
+
+                java.awt.Component aVisualComponent = aPlayer.getVisualComponent();
+
+                if( aVisualComponent != null )
+                {
+                    aVisualComponent.addKeyListener( this );
+                    aVisualComponent.addMouseListener( this );
+                    aVisualComponent.addMouseMotionListener( this );
+                    aVisualComponent.addFocusListener( this );
+                    aPanel.add( aVisualComponent );
+                }
+                else
+                    meZoomLevel = com.sun.star.media.ZoomLevel.NOT_AVAILABLE;
+
+                if( maFrame.getJavaFrame() != null )
+                    maFrame.getJavaFrame().add( aPanel );
+
+                LayoutComponents();
+            }
+        }
+        catch( com.sun.star.lang.IllegalArgumentException e )
+        {
+        }
+    }
+
+    // -------------------------------------------------------------------------
+
+    protected synchronized void LayoutComponents()
+    {
+        if( maFrame.getJavaFrame() != null )
+        {
+            java.awt.Panel  aPanel = (java.awt.Panel) maFrame.getJavaFrame().getComponent( 0 );
+            int             nW = maFrame.getJavaFrame().getWidth();
+            int             nH = maFrame.getJavaFrame().getHeight();
+            int             nControlH = 0;
+
+            aPanel.setBounds( 0, 0, nW, nH );
+
+            if( mbShowControls )
+            {
+                java.awt.Component aControlComponent = aPanel.getComponent( 0 );
+
+                if( aControlComponent != null )
+                {
+                    java.awt.Dimension aControlDimension = aControlComponent.getPreferredSize();
+
+                    nControlH = Math.min( nH, aControlDimension.height );
+                    aControlComponent.setBounds( 0, nH - nControlH, nW, nControlH );
+                }
+            }
+
+            if( com.sun.star.media.ZoomLevel.NOT_AVAILABLE != meZoomLevel )
+            {
+                java.awt.Component aVisualComponent = aPanel.getComponent( mbShowControls ? 1 : 0 );
+
+                if( aVisualComponent != null )
+                {
+                    java.awt.Dimension  aPrefDim = aVisualComponent.getPreferredSize();
+                    int                 nVideoW = nW, nVideoH = ( nH - nControlH );
+                    int                 nX = 0, nY = 0, nWidth = 0, nHeight = 0;
+                    boolean             bDone = false, bZoom = false;
+
+                    if( com.sun.star.media.ZoomLevel.ORIGINAL == meZoomLevel )
+                    {
+                        bZoom = true;
+                    }
+                    else if( com.sun.star.media.ZoomLevel.ZOOM_1_TO_4 == meZoomLevel )
+                    {
+                        aPrefDim.width >>= 2;
+                        aPrefDim.height >>= 2;
+                        bZoom = true;
+                    }
+                    else if( com.sun.star.media.ZoomLevel.ZOOM_1_TO_2 == meZoomLevel )
+                    {
+                        aPrefDim.width >>= 1;
+                        aPrefDim.height >>= 1;
+                        bZoom = true;
+                    }
+                    else if( com.sun.star.media.ZoomLevel.ZOOM_2_TO_1 == meZoomLevel )
+                    {
+                        aPrefDim.width <<= 1;
+                        aPrefDim.height <<= 1;
+                        bZoom = true;
+                    }
+                    else if( com.sun.star.media.ZoomLevel.ZOOM_4_TO_1 == meZoomLevel )
+                    {
+                        aPrefDim.width <<= 2;
+                        aPrefDim.height <<= 2;
+                        bZoom = true;
+                    }
+                    else if( com.sun.star.media.ZoomLevel.FIT_TO_WINDOW == meZoomLevel )
+                    {
+                        nWidth = nVideoW;
+                        nHeight = nVideoH;
+                        bDone = true;
+                    }
+
+                    if( bZoom )
+                    {
+                        if( ( aPrefDim.width <= nVideoW ) && ( aPrefDim.height <= nVideoH ) )
+                        {
+                            nX = ( nVideoW - aPrefDim.width ) >> 1;
+                            nY = ( nVideoH - aPrefDim.height ) >> 1;
+                            nWidth = aPrefDim.width;
+                            nHeight = aPrefDim.height;
+                            bDone = true;
+                        }
+                    }
+
+                    if( !bDone )
+                    {
+                        if( aPrefDim.width > 0 && aPrefDim.height > 0 && nVideoW > 0 && nVideoH > 0 )
+                        {
+                            double fPrefWH = (double) aPrefDim.width / aPrefDim.height;
+
+                            if( fPrefWH < ( (double) nVideoW / nVideoH ) )
+                                nVideoW = (int)( nVideoH * fPrefWH );
+                            else
+                                nVideoH = (int)( nVideoW / fPrefWH );
+
+                            nX = ( nW - nVideoW ) >> 1;
+                            nY = ( nH - nControlH - nVideoH ) >> 1;
+                            nWidth = nVideoW;
+                            nHeight = nVideoH;
+                        }
+                        else
+                            nX = nY = nWidth = nHeight = 0;
+                    }
+
+                    aVisualComponent.setBounds( nX, nY, nWidth, nHeight );
+                    aVisualComponent.requestFocus();
+                }
+                else
+                    aPanel.requestFocus();
+            }
+            else
+                aPanel.requestFocus();
+        }
+    }
+
+    // -------------------------------------------------------------------------
+
+    private void implFireMouseEvent( java.awt.event.MouseEvent aEvt )
+    {
+        if( aEvt.getSource() != null &&
+            aEvt.getSource() instanceof java.awt.Component )
+        {
+            aEvt.translatePoint( ( (java.awt.Component) aEvt.getSource() ).getX(),
+                                 ( (java.awt.Component) aEvt.getSource() ).getY() );
+        }
+
+        maFrame.fireMouseEvent( aEvt );
+    }
+
+    // ---------------
+    // - KeyListener -
+    // ---------------
+
+    public void keyPressed( java.awt.event.KeyEvent aEvt )
+    {
+        maFrame.fireKeyEvent( aEvt );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public void keyReleased( java.awt.event.KeyEvent aEvt )
+    {
+        maFrame.fireKeyEvent( aEvt );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public void keyTyped( java.awt.event.KeyEvent aEvt )
+    {
+        maFrame.fireKeyEvent( aEvt );
+    }
+
+    // -----------------
+    // - MouseListener -
+    // -----------------
+
+    public void mousePressed( java.awt.event.MouseEvent aEvt )
+    {
+        implFireMouseEvent( aEvt );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public void mouseClicked( java.awt.event.MouseEvent aEvt )
+    {
+        implFireMouseEvent( aEvt );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public void mouseEntered( java.awt.event.MouseEvent aEvt )
+    {
+        implFireMouseEvent( aEvt );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public void mouseExited( java.awt.event.MouseEvent aEvt )
+    {
+        implFireMouseEvent( aEvt );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public void mouseReleased( java.awt.event.MouseEvent aEvt )
+    {
+        implFireMouseEvent( aEvt );
+    }
+
+    // -----------------------
+    // - MouseMotionListener -
+    // -----------------------
+
+    public void mouseDragged( java.awt.event.MouseEvent aEvt )
+    {
+        implFireMouseEvent( aEvt );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public void mouseMoved( java.awt.event.MouseEvent aEvt )
+    {
+        implFireMouseEvent( aEvt );
+    }
+
+    // -----------------------
+    // - FocusListener -
+    // -----------------------
+
+    public void focusGained( java.awt.event.FocusEvent aEvt )
+    {
+        if( maFrame.getJavaFrame() != null )
+            maFrame.fireFocusEvent( aEvt );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public void focusLost( java.awt.event.FocusEvent aEvt )
+    {
+        if( maFrame.getJavaFrame() != null )
+            maFrame.fireFocusEvent( aEvt );
+    }
+
+    // -----------------
+    // - XPlayerWindow -
+    // -----------------
+
+    public synchronized void update()
+    {
+        if( maFrame.getJavaFrame() != null )
+            maFrame.getJavaFrame().repaint();
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized boolean setZoomLevel( com.sun.star.media.ZoomLevel eZoomLevel )
+    {
+        boolean bRet = false;
+
+        if( com.sun.star.media.ZoomLevel.NOT_AVAILABLE != meZoomLevel &&
+            com.sun.star.media.ZoomLevel.NOT_AVAILABLE != eZoomLevel )
+        {
+            if( eZoomLevel != meZoomLevel )
+            {
+                meZoomLevel = eZoomLevel;
+                LayoutComponents();
+            }
+
+            bRet = true;
+        }
+
+        return bRet;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized com.sun.star.media.ZoomLevel getZoomLevel()
+    {
+        return meZoomLevel;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setPointerType( int nPointerType )
+    {
+        if( maFrame.getJavaFrame() != null )
+        {
+            int nCursor;
+
+            switch( nPointerType )
+            {
+                case( com.sun.star.awt.SystemPointer.CROSS ): nCursor = java.awt.Cursor.CROSSHAIR_CURSOR; break;
+                case( com.sun.star.awt.SystemPointer.HAND ): nCursor = java.awt.Cursor.HAND_CURSOR; break;
+                case( com.sun.star.awt.SystemPointer.MOVE ): nCursor = java.awt.Cursor.MOVE_CURSOR; break;
+                case( com.sun.star.awt.SystemPointer.WAIT ): nCursor = java.awt.Cursor.WAIT_CURSOR; break;
+
+                default: nCursor = java.awt.Cursor.DEFAULT_CURSOR; break;
+            }
+
+            maFrame.getJavaFrame().setCursor( java.awt.Cursor.getPredefinedCursor( nCursor ) );
+        }
+    }
+
+    // --------------
+    // - XComponent -
+    // --------------
+
+    public synchronized void dispose()
+    {
+        if( maFrame != null )
+        {
+            java.awt.Panel aPanel = (java.awt.Panel) maFrame.getJavaFrame().getComponent( 0 );
+
+            if( aPanel != null && aPanel.getComponent( 0 ) != null )
+                aPanel.getComponent( 0 ).removeFocusListener( this );
+
+            if( maFrame.getJavaFrame() != null )
+                maFrame.getJavaFrame().dispose();
+
+            maFrame.fireDisposingEvent();
+        }
+
+        maFrame = null;
+    }
+
+    // -----------
+    // - XWindow -
+    // -----------
+
+    public synchronized void setPosSize( int X, int Y, int Width, int Height, short Flags )
+    {
+        if( maFrame != null )
+        {
+            maFrame.setPosSize( X, Y, Width, Height, Flags );
+            LayoutComponents();
+        }
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized com.sun.star.awt.Rectangle getPosSize()
+    {
+        return( ( maFrame != null ) ? maFrame.getPosSize() : new com.sun.star.awt.Rectangle() );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setVisible( boolean visible )
+    {
+        if( maFrame != null )
+            maFrame.setVisible( visible );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setEnable( boolean enable )
+    {
+        if( maFrame != null )
+            maFrame.setEnable( enable );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void setFocus()
+    {
+        if( maFrame != null )
+            maFrame.setFocus();
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void addEventListener( com.sun.star.lang.XEventListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.addEventListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void removeEventListener( com.sun.star.lang.XEventListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.removeEventListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void addWindowListener( XWindowListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.addWindowListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void removeWindowListener( XWindowListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.removeWindowListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void addFocusListener( XFocusListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.addFocusListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void removeFocusListener( XFocusListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.removeFocusListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void addKeyListener( XKeyListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.addKeyListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void removeKeyListener( XKeyListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.removeKeyListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void addMouseListener( XMouseListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.addMouseListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void removeMouseListener( XMouseListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.removeMouseListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void addMouseMotionListener( XMouseMotionListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.addMouseMotionListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void removeMouseMotionListener( XMouseMotionListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.removeMouseMotionListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void addPaintListener( XPaintListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.addPaintListener( xListener );
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized void removePaintListener( XPaintListener xListener )
+    {
+        if( maFrame != null )
+            maFrame.removePaintListener( xListener );
+    }
+
+    // ----------------
+    // - XServiceInfo -
+    // ----------------
+
+    private static final String s_implName = "com.sun.star.comp.PlayerWindow_Java";
+    private static final String s_serviceName = "com.sun.star.media.PlayerWindow_Java";
+
+    public synchronized String getImplementationName()
+    {
+        return s_implName;
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized String [] getSupportedServiceNames()
+    {
+        return new String [] { s_serviceName };
+    }
+
+    // -------------------------------------------------------------------------
+
+    public synchronized boolean supportsService( String serviceName )
+    {
+        return serviceName.equals( s_serviceName );
+    }
+}
diff --git a/avmedia/source/java/WindowAdapter.java b/avmedia/source/java/WindowAdapter.java
new file mode 100755
index 000000000000..e44d9e4c9c0b
--- /dev/null
+++ b/avmedia/source/java/WindowAdapter.java
@@ -0,0 +1,496 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+import sun.awt.*;
+import com.sun.star.awt.*;
+import com.sun.star.lang.*;
+import java.util.*;
+import javax.swing.*;
+
+public class WindowAdapter
+{
+    private java.awt.Frame  maFrame;
+    private LinkedList      maEventListeners = new LinkedList();
+    private LinkedList      maWindowListeners = new LinkedList();
+    private LinkedList      maFocusListeners = new LinkedList();
+    private LinkedList      maKeyListeners = new LinkedList();
+    private LinkedList      maMouseListeners = new LinkedList();
+    private LinkedList      maMouseMotionListeners = new LinkedList();
+    private LinkedList      maPaintListeners = new LinkedList();
+    private boolean         mbShift = false, mbMod1 = false, mbMod2 = false;
+
+    // -----------------
+    // - WindowAdapter -
+    // -----------------
+
+    public WindowAdapter( int windowHandle )
+    {
+        maFrame = SystemWindowAdapter.createFrame( windowHandle );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public java.awt.Frame getJavaFrame()
+    {
+        return maFrame;
+    }
+
+    //----------------------------------------------------------------------------------
+
+    private short implGetUNOKeyCode( int nJavaKeyCode )
+    {
+        short nRet = 0;
+
+        switch( nJavaKeyCode )
+        {
+            case( java.awt.event.KeyEvent.VK_NUMPAD0 ):
+            case( java.awt.event.KeyEvent.VK_0 ):       nRet = com.sun.star.awt.Key.NUM0; break;
+            case( java.awt.event.KeyEvent.VK_NUMPAD1 ):
+            case( java.awt.event.KeyEvent.VK_1 ):       nRet = com.sun.star.awt.Key.NUM1; break;
+            case( java.awt.event.KeyEvent.VK_NUMPAD2 ):
+            case( java.awt.event.KeyEvent.VK_2 ):       nRet = com.sun.star.awt.Key.NUM2; break;
+            case( java.awt.event.KeyEvent.VK_NUMPAD3 ):
+            case( java.awt.event.KeyEvent.VK_3 ):       nRet = com.sun.star.awt.Key.NUM3; break;
+            case( java.awt.event.KeyEvent.VK_NUMPAD4 ):
+            case( java.awt.event.KeyEvent.VK_4 ):       nRet = com.sun.star.awt.Key.NUM4; break;
+            case( java.awt.event.KeyEvent.VK_NUMPAD5 ):
+            case( java.awt.event.KeyEvent.VK_5 ):       nRet = com.sun.star.awt.Key.NUM5; break;
+            case( java.awt.event.KeyEvent.VK_NUMPAD6 ):
+            case( java.awt.event.KeyEvent.VK_6 ):       nRet = com.sun.star.awt.Key.NUM6; break;
+            case( java.awt.event.KeyEvent.VK_NUMPAD7 ):
+            case( java.awt.event.KeyEvent.VK_7 ):       nRet = com.sun.star.awt.Key.NUM7; break;
+            case( java.awt.event.KeyEvent.VK_NUMPAD8 ):
+            case( java.awt.event.KeyEvent.VK_8 ):       nRet = com.sun.star.awt.Key.NUM8; break;
+            case( java.awt.event.KeyEvent.VK_NUMPAD9 ):
+            case( java.awt.event.KeyEvent.VK_9 ):       nRet = com.sun.star.awt.Key.NUM9; break;
+
+            case( java.awt.event.KeyEvent.VK_A ): nRet = com.sun.star.awt.Key.A; break;
+            case( java.awt.event.KeyEvent.VK_B ): nRet = com.sun.star.awt.Key.B; break;
+            case( java.awt.event.KeyEvent.VK_C ): nRet = com.sun.star.awt.Key.C; break;
+            case( java.awt.event.KeyEvent.VK_D ): nRet = com.sun.star.awt.Key.D; break;
+            case( java.awt.event.KeyEvent.VK_E ): nRet = com.sun.star.awt.Key.E; break;
+            case( java.awt.event.KeyEvent.VK_F ): nRet = com.sun.star.awt.Key.F; break;
+            case( java.awt.event.KeyEvent.VK_G ): nRet = com.sun.star.awt.Key.G; break;
+            case( java.awt.event.KeyEvent.VK_H ): nRet = com.sun.star.awt.Key.H; break;
+            case( java.awt.event.KeyEvent.VK_I ): nRet = com.sun.star.awt.Key.I; break;
+            case( java.awt.event.KeyEvent.VK_J ): nRet = com.sun.star.awt.Key.J; break;
+            case( java.awt.event.KeyEvent.VK_K ): nRet = com.sun.star.awt.Key.K; break;
+            case( java.awt.event.KeyEvent.VK_L ): nRet = com.sun.star.awt.Key.L; break;
+            case( java.awt.event.KeyEvent.VK_M ): nRet = com.sun.star.awt.Key.M; break;
+            case( java.awt.event.KeyEvent.VK_N ): nRet = com.sun.star.awt.Key.N; break;
+            case( java.awt.event.KeyEvent.VK_O ): nRet = com.sun.star.awt.Key.O; break;
+            case( java.awt.event.KeyEvent.VK_P ): nRet = com.sun.star.awt.Key.P; break;
+            case( java.awt.event.KeyEvent.VK_Q ): nRet = com.sun.star.awt.Key.Q; break;
+            case( java.awt.event.KeyEvent.VK_R ): nRet = com.sun.star.awt.Key.R; break;
+            case( java.awt.event.KeyEvent.VK_S ): nRet = com.sun.star.awt.Key.S; break;
+            case( java.awt.event.KeyEvent.VK_T ): nRet = com.sun.star.awt.Key.T; break;
+            case( java.awt.event.KeyEvent.VK_U ): nRet = com.sun.star.awt.Key.U; break;
+            case( java.awt.event.KeyEvent.VK_V ): nRet = com.sun.star.awt.Key.V; break;
+            case( java.awt.event.KeyEvent.VK_W ): nRet = com.sun.star.awt.Key.W; break;
+            case( java.awt.event.KeyEvent.VK_X ): nRet = com.sun.star.awt.Key.X; break;
+            case( java.awt.event.KeyEvent.VK_Y ): nRet = com.sun.star.awt.Key.Y; break;
+            case( java.awt.event.KeyEvent.VK_Z ): nRet = com.sun.star.awt.Key.Z; break;
+
+            case( java.awt.event.KeyEvent.VK_F1 ): nRet = com.sun.star.awt.Key.F1; break;
+            case( java.awt.event.KeyEvent.VK_F2 ): nRet = com.sun.star.awt.Key.F2; break;
+            case( java.awt.event.KeyEvent.VK_F3 ): nRet = com.sun.star.awt.Key.F3; break;
+            case( java.awt.event.KeyEvent.VK_F4 ): nRet = com.sun.star.awt.Key.F4; break;
+            case( java.awt.event.KeyEvent.VK_F5 ): nRet = com.sun.star.awt.Key.F5; break;
+            case( java.awt.event.KeyEvent.VK_F6 ): nRet = com.sun.star.awt.Key.F6; break;
+            case( java.awt.event.KeyEvent.VK_F7 ): nRet = com.sun.star.awt.Key.F7; break;
+            case( java.awt.event.KeyEvent.VK_F8 ): nRet = com.sun.star.awt.Key.F8; break;
+            case( java.awt.event.KeyEvent.VK_F9 ): nRet = com.sun.star.awt.Key.F9; break;
+            case( java.awt.event.KeyEvent.VK_F10 ): nRet = com.sun.star.awt.Key.F10; break;
+            case( java.awt.event.KeyEvent.VK_F11 ): nRet = com.sun.star.awt.Key.F11; break;
+            case( java.awt.event.KeyEvent.VK_F12 ): nRet = com.sun.star.awt.Key.F12; break;
+            case( java.awt.event.KeyEvent.VK_F13 ): nRet = com.sun.star.awt.Key.F13; break;
+            case( java.awt.event.KeyEvent.VK_F14 ): nRet = com.sun.star.awt.Key.F14; break;
+            case( java.awt.event.KeyEvent.VK_F15 ): nRet = com.sun.star.awt.Key.F15; break;
+            case( java.awt.event.KeyEvent.VK_F16 ): nRet = com.sun.star.awt.Key.F16; break;
+            case( java.awt.event.KeyEvent.VK_F17 ): nRet = com.sun.star.awt.Key.F17; break;
+            case( java.awt.event.KeyEvent.VK_F18 ): nRet = com.sun.star.awt.Key.F18; break;
+            case( java.awt.event.KeyEvent.VK_F19 ): nRet = com.sun.star.awt.Key.F19; break;
+            case( java.awt.event.KeyEvent.VK_F20 ): nRet = com.sun.star.awt.Key.F20; break;
+            case( java.awt.event.KeyEvent.VK_F21 ): nRet = com.sun.star.awt.Key.F21; break;
+            case( java.awt.event.KeyEvent.VK_F22 ): nRet = com.sun.star.awt.Key.F22; break;
+            case( java.awt.event.KeyEvent.VK_F23 ): nRet = com.sun.star.awt.Key.F23; break;
+            case( java.awt.event.KeyEvent.VK_F24 ): nRet = com.sun.star.awt.Key.F24; break;
+
+            case( java.awt.event.KeyEvent.VK_UP ):          nRet = com.sun.star.awt.Key.UP; break;
+            case( java.awt.event.KeyEvent.VK_DOWN):         nRet = com.sun.star.awt.Key.DOWN; break;
+            case( java.awt.event.KeyEvent.VK_LEFT ):        nRet = com.sun.star.awt.Key.LEFT; break;
+            case( java.awt.event.KeyEvent.VK_RIGHT ):       nRet = com.sun.star.awt.Key.RIGHT; break;
+
+            case( java.awt.event.KeyEvent.VK_HOME ):        nRet = com.sun.star.awt.Key.HOME; break;
+            case( java.awt.event.KeyEvent.VK_END ):         nRet = com.sun.star.awt.Key.END; break;
+
+            case( java.awt.event.KeyEvent.VK_PAGE_UP ):     nRet = com.sun.star.awt.Key.PAGEUP; break;
+            case( java.awt.event.KeyEvent.VK_PAGE_DOWN ):   nRet = com.sun.star.awt.Key.PAGEDOWN; break;
+
+            case( java.awt.event.KeyEvent.VK_ENTER ):       nRet = com.sun.star.awt.Key.RETURN; break;
+            case( java.awt.event.KeyEvent.VK_ESCAPE ):      nRet = com.sun.star.awt.Key.ESCAPE; break;
+
+            case( java.awt.event.KeyEvent.VK_TAB ):         nRet = com.sun.star.awt.Key.TAB; break;
+            case( java.awt.event.KeyEvent.VK_BACK_SPACE ):  nRet = com.sun.star.awt.Key.BACKSPACE; break;
+            case( java.awt.event.KeyEvent.VK_SPACE ):       nRet = com.sun.star.awt.Key.SPACE; break;
+            case( java.awt.event.KeyEvent.VK_INSERT):       nRet = com.sun.star.awt.Key.INSERT; break;
+            case( java.awt.event.KeyEvent.VK_DELETE):       nRet = com.sun.star.awt.Key.DELETE; break;
+            case( java.awt.event.KeyEvent.VK_ADD ):         nRet = com.sun.star.awt.Key.ADD; break;
+            case( java.awt.event.KeyEvent.VK_SUBTRACT ):    nRet = com.sun.star.awt.Key.SUBTRACT; break;
+            case( java.awt.event.KeyEvent.VK_MULTIPLY ):    nRet = com.sun.star.awt.Key.MULTIPLY; break;
+            case( java.awt.event.KeyEvent.VK_DIVIDE ):      nRet = com.sun.star.awt.Key.DIVIDE; break;
+            case( java.awt.event.KeyEvent.VK_DECIMAL ):     nRet = com.sun.star.awt.Key.POINT; break;
+            case( java.awt.event.KeyEvent.VK_LESS ):        nRet = com.sun.star.awt.Key.LESS; break;
+            case( java.awt.event.KeyEvent.VK_GREATER ):     nRet = com.sun.star.awt.Key.GREATER; break;
+            case( java.awt.event.KeyEvent.VK_EQUALS ):      nRet = com.sun.star.awt.Key.EQUAL; break;
+
+            default:
+            break;
+         }
+
+         return nRet;
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void fireKeyEvent( java.awt.event.KeyEvent aEvt )
+    {
+        if( maKeyListeners.size() > 0 )
+        {
+            boolean bProcess = false, bPressed = false;
+
+            if( java.awt.event.KeyEvent.KEY_PRESSED == aEvt.getID() )
+            {
+                switch( aEvt.getKeyCode() )
+                {
+                    case( java.awt.event.KeyEvent.VK_SHIFT ): mbShift = true; break;
+                    case( java.awt.event.KeyEvent.VK_CONTROL ): mbMod1 = true; break;
+                    case( java.awt.event.KeyEvent.VK_ALT ): mbMod2 = true; break;
+
+                    default:
+                    {
+                        bProcess = bPressed = true;
+                    }
+                    break;
+                }
+            }
+            else if( java.awt.event.KeyEvent.KEY_RELEASED == aEvt.getID() )
+            {
+                switch( aEvt.getKeyCode() )
+                {
+                    case( java.awt.event.KeyEvent.VK_SHIFT ): mbShift = false; break;
+                    case( java.awt.event.KeyEvent.VK_CONTROL ): mbMod1 = false; break;
+                    case( java.awt.event.KeyEvent.VK_ALT ): mbMod2 = false; break;
+
+                    default:
+                    {
+                        bProcess = true;
+                    }
+                    break;
+                }
+            }
+
+            if( bProcess )
+            {
+                KeyEvent aUNOEvt = new KeyEvent();
+
+                aUNOEvt.Modifiers = 0;
+
+                if( mbShift )
+                    aUNOEvt.Modifiers |= com.sun.star.awt.KeyModifier.SHIFT;
+
+                if( mbMod1 )
+                    aUNOEvt.Modifiers |= com.sun.star.awt.KeyModifier.MOD1;
+
+                if( mbMod2 )
+                    aUNOEvt.Modifiers |= com.sun.star.awt.KeyModifier.MOD2;
+
+                aUNOEvt.KeyCode = implGetUNOKeyCode( aEvt.getKeyCode() );
+                aUNOEvt.KeyChar = aEvt.getKeyChar();
+                aUNOEvt.KeyFunc = com.sun.star.awt.KeyFunction.DONTKNOW;
+
+                ListIterator aIter = maKeyListeners.listIterator( 0 );
+
+                while( aIter.hasNext() )
+                {
+                    if( bPressed )
+                        ( (XKeyListener) aIter.next() ).keyPressed( aUNOEvt );
+                    else
+                        ( (XKeyListener) aIter.next() ).keyReleased( aUNOEvt );
+                }
+            }
+        }
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void fireMouseEvent( java.awt.event.MouseEvent aEvt )
+    {
+        MouseEvent aUNOEvt = new MouseEvent();
+
+        aUNOEvt.Modifiers = 0;
+        aUNOEvt.Buttons = 0;
+        aUNOEvt.X = aEvt.getX();
+        aUNOEvt.Y = aEvt.getY();
+         aUNOEvt.PopupTrigger = false;
+
+        // Modifiers
+        if( aEvt.isShiftDown() )
+            aUNOEvt.Modifiers |= com.sun.star.awt.KeyModifier.SHIFT;
+
+        if( aEvt.isControlDown() )
+            aUNOEvt.Modifiers |= com.sun.star.awt.KeyModifier.MOD1;
+
+        if( aEvt.isAltDown() )
+            aUNOEvt.Modifiers |= com.sun.star.awt.KeyModifier.MOD2;
+
+        // Buttons
+        if( SwingUtilities.isLeftMouseButton( aEvt ) )
+            aUNOEvt.Buttons |= com.sun.star.awt.MouseButton.LEFT;
+
+        if( SwingUtilities.isMiddleMouseButton( aEvt ) )
+            aUNOEvt.Buttons |= com.sun.star.awt.MouseButton.MIDDLE;
+
+        if( SwingUtilities.isRightMouseButton( aEvt ) )
+            aUNOEvt.Buttons |= com.sun.star.awt.MouseButton.RIGHT;
+
+        // event type
+        if( java.awt.event.MouseEvent.MOUSE_PRESSED == aEvt.getID() )
+        {
+            ListIterator aIter = maMouseListeners.listIterator( 0 );
+
+            aUNOEvt.ClickCount = 1;
+
+            while( aIter.hasNext() )
+                ( (XMouseListener) aIter.next() ).mousePressed( aUNOEvt );
+        }
+        else if( java.awt.event.MouseEvent.MOUSE_RELEASED == aEvt.getID() )
+        {
+            ListIterator aIter = maMouseListeners.listIterator( 0 );
+
+            aUNOEvt.ClickCount = 1;
+
+            while( aIter.hasNext() )
+                ( (XMouseListener) aIter.next() ).mouseReleased( aUNOEvt );
+        }
+        else if( java.awt.event.MouseEvent.MOUSE_DRAGGED == aEvt.getID() )
+        {
+            ListIterator aIter = maMouseMotionListeners.listIterator( 0 );
+
+            aUNOEvt.ClickCount = 0;
+
+            while( aIter.hasNext() )
+                ( (XMouseMotionListener) aIter.next() ).mouseDragged( aUNOEvt );
+        }
+        else if( java.awt.event.MouseEvent.MOUSE_MOVED == aEvt.getID() )
+        {
+            ListIterator aIter = maMouseMotionListeners.listIterator( 0 );
+
+            aUNOEvt.ClickCount = 0;
+
+            while( aIter.hasNext() )
+                ( (XMouseMotionListener) aIter.next() ).mouseMoved( aUNOEvt );
+        }
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void fireFocusEvent( java.awt.event.FocusEvent aEvt )
+    {
+        if( java.awt.event.FocusEvent.FOCUS_GAINED == aEvt.getID() )
+        {
+            ListIterator aIter = maFocusListeners.listIterator( 0 );
+            FocusEvent   aUNOEvt = new FocusEvent();
+
+            while( aIter.hasNext() )
+            {
+                ( (XFocusListener) aIter.next() ).focusGained( aUNOEvt );
+            }
+        }
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void fireDisposingEvent()
+    {
+        ListIterator aIter = maEventListeners.listIterator( 0 );
+
+        while( aIter.hasNext() )
+        {
+            ( (XEventListener) aIter.next() ).disposing( new com.sun.star.lang.EventObject() );
+        }
+    }
+
+    // --------------------
+    // - XWindow methods  -
+    // --------------------
+
+    public void setPosSize( int X, int Y, int Width, int Height, short Flags )
+    {
+        maFrame.setBounds( X, Y, Width, Height );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public com.sun.star.awt.Rectangle getPosSize(  )
+    {
+        java.awt.Rectangle bounds = maFrame.getBounds();
+        return new com.sun.star.awt.Rectangle( bounds.x, bounds.y, bounds.width, bounds.height );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void setVisible( boolean visible )
+    {
+         maFrame.setVisible( visible );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void setEnable( boolean enable )
+    {
+        maFrame.setEnabled( enable );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void setFocus()
+    {
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void addEventListener( XEventListener xListener )
+    {
+        if( xListener != null )
+            maEventListeners.add( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void removeEventListener( XEventListener xListener )
+    {
+        if( xListener != null )
+            maEventListeners.remove( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void addWindowListener( XWindowListener xListener )
+    {
+        if( xListener != null )
+            maWindowListeners.add( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void removeWindowListener( XWindowListener xListener )
+    {
+        if( xListener != null )
+            maWindowListeners.remove( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void addFocusListener( XFocusListener xListener )
+    {
+        if( xListener != null )
+            maFocusListeners.add( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void removeFocusListener( XFocusListener xListener )
+    {
+        if( xListener != null )
+            maFocusListeners.remove( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void addKeyListener( XKeyListener xListener )
+    {
+        if( xListener != null )
+            maKeyListeners.add( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void removeKeyListener( XKeyListener xListener )
+    {
+        if( xListener != null )
+            maKeyListeners.remove( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void addMouseListener( XMouseListener xListener )
+    {
+        if( xListener != null )
+            maMouseListeners.add( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void removeMouseListener( XMouseListener xListener )
+    {
+        if( xListener != null )
+            maMouseListeners.remove( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void addMouseMotionListener( XMouseMotionListener xListener )
+    {
+        if( xListener != null )
+            maMouseMotionListeners.add( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void removeMouseMotionListener( XMouseMotionListener xListener )
+    {
+        if( xListener != null )
+            maMouseMotionListeners.remove( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void addPaintListener( XPaintListener xListener )
+    {
+        if( xListener != null )
+            maPaintListeners.add( xListener );
+    }
+
+    //----------------------------------------------------------------------------------
+
+    public void removePaintListener( XPaintListener xListener )
+    {
+        if( xListener != null )
+            maPaintListeners.remove( xListener );
+    }
+}
diff --git a/avmedia/source/java/avmedia.jar b/avmedia/source/java/avmedia.jar
new file mode 100755
index 000000000000..85a98bbcf33c
--- /dev/null
+++ b/avmedia/source/java/avmedia.jar
diff --git a/avmedia/source/java/avmedia.jar.component b/avmedia/source/java/avmedia.jar.component
new file mode 100755
index 000000000000..d7cc160bd7d0
--- /dev/null
+++ b/avmedia/source/java/avmedia.jar.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="com.sun.star.comp.media.Manager_Java">
+    <service name="com.sun.star.media.Manager_Java"/>
+  </implementation>
+</component>
diff --git a/avmedia/source/java/makefile.mk b/avmedia/source/java/makefile.mk
new file mode 100755
index 000000000000..1fe771c117f2
--- /dev/null
+++ b/avmedia/source/java/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.
+#
+#**************************************************************************
+
+# Builds the Java Canvas implementation.
+
+PRJNAME = avmedia
+PRJ     = ..$/..
+TARGET  = avmedia
+PACKAGE = avmedia
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE: settings.mk
+
+.IF "$(GUIBASE)"=="javamedia"
+
+JAVAFILES  = \
+    Manager.java            \
+    Player.java             \
+    PlayerWindow.java       \
+    WindowAdapter.java      \
+    MediaUno.java           \
+    FrameGrabber.java       \
+    x11$/SystemWindowAdapter.java   
+
+JARFILES        = jurt.jar unoil.jar ridl.jar juh.jar java_uno.jar jmf.jar
+JAVACLASSFILES  = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java//).class)
+
+JARTARGET               = $(TARGET).jar
+JARCOMPRESS             = TRUE
+CUSTOMMANIFESTFILE      = manifest
+
+.ENDIF     # "$(GUIBASE)"=="javamedia" 
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE: target.mk
+
+ALLTAR : $(MISC)/avmedia.jar.component
+
+$(MISC)/avmedia.jar.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt avmedia.jar.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)avmedia.jar' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt avmedia.jar.component
diff --git a/avmedia/source/java/manifest b/avmedia/source/java/manifest
new file mode 100755
index 000000000000..fa9c2500d385
--- /dev/null
+++ b/avmedia/source/java/manifest
@@ -0,0 +1,2 @@
+RegistrationClassName: MediaUno
+UNO-Type-Path: 
diff --git a/avmedia/source/java/win/SystemWindowAdapter.java b/avmedia/source/java/win/SystemWindowAdapter.java
new file mode 100755
index 000000000000..ebf3cac99307
--- /dev/null
+++ b/avmedia/source/java/win/SystemWindowAdapter.java
@@ -0,0 +1,53 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+import sun.awt.*;
+import com.sun.star.awt.*;
+
+public class SystemWindowAdapter
+{
+    static public java.awt.Frame createFrame( int windowHandle )
+    {
+        java.awt.Frame aFrame;
+
+        // we're initialized with the operating system window handle
+        // as the parameter. We then generate a dummy Java frame with
+        // that window as the parent, to fake a root window for the
+        // Java implementation.
+
+         // now, we're getting slightly system dependent here.
+         String os = (String) System.getProperty( "os.name" );
+
+         // create the embedded frame
+         if( os.startsWith( "Windows" ) )
+             aFrame = new sun.awt.windows.WEmbeddedFrame( windowHandle );
+         else
+             throw new com.sun.star.uno.RuntimeException();
+
+        return aFrame;
+    }
+}
diff --git a/avmedia/source/java/x11/SystemWindowAdapter.java b/avmedia/source/java/x11/SystemWindowAdapter.java
new file mode 100755
index 000000000000..4292dabe6775
--- /dev/null
+++ b/avmedia/source/java/x11/SystemWindowAdapter.java
@@ -0,0 +1,123 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+import java.awt.*;
+import java.lang.reflect.*;
+
+public class SystemWindowAdapter
+{
+    static public java.awt.Frame createFrame( int windowHandle )
+    {
+        String          aOS = (String) System.getProperty( "os.name" );
+        java.awt.Frame  aFrame = null;
+
+        if( aOS.startsWith( "SunOS" ) )
+        {
+            try
+            {
+                Class aClass = Class.forName( "sun.awt.motif.MEmbeddedFrame" );
+
+                if( aClass != null )
+                {
+                    try
+                    {
+                        Constructor aCtor = aClass.getConstructor( new Class[] { long.class, boolean.class } );
+
+                        if( aCtor != null )
+                        {
+                            aFrame = (java.awt.Frame) aCtor.newInstance( new Object[] { new Long( windowHandle ),
+                                                                                    new Boolean( false ) } );
+                        }
+                    }
+                    catch( Exception e )
+                    {
+                    }
+
+                    if( aFrame == null )
+                    {
+                        try
+                        {
+                            Constructor aCtor = aClass.getConstructor( new Class[] { long.class } );
+
+                            if( aCtor != null )
+                            {
+                                 aFrame = (java.awt.Frame) aCtor.newInstance( new Object[] { new Long( windowHandle ) } );
+                            }
+                        }
+                        catch( Exception e )
+                        {
+                        }
+                    }
+                }
+            }
+            catch( Exception e )
+            {
+            }
+        }
+        else
+        {
+            try
+            {
+                Class aClass = Class.forName( "sun.awt.motif.MEmbeddedFrame" );
+
+                if( aClass != null )
+                {
+                    Constructor aCtor = aClass.getConstructor( new Class[] { long.class } );
+
+                    if( aCtor != null )
+                    {
+                        aFrame = (java.awt.Frame) aCtor.newInstance( new Object[] { new Long( windowHandle ) } );
+                    }
+                }
+            }
+            catch( Exception e )
+            {
+            }
+
+            if( aFrame == null )
+            {
+                try
+                {
+                    Class aClass = Class.forName( "sun.awt.X11.XEmbeddedFrame" );
+
+                    if( aClass != null )
+                    {
+                        Constructor aCtor = aClass.getConstructor( new Class[] { long.class } );
+
+                        if( aCtor != null )
+                            aFrame = (java.awt.Frame) aCtor.newInstance( new Object[] { new Long( windowHandle ) } );
+                    }
+                }
+                catch( Exception e )
+                {
+                }
+            }
+        }
+
+        return aFrame;
+    }
+}
diff --git a/avmedia/source/quicktime/avmediaQuickTime.component b/avmedia/source/quicktime/avmediaQuickTime.component
new file mode 100755
index 000000000000..aa0251d74c9d
--- /dev/null
+++ b/avmedia/source/quicktime/avmediaQuickTime.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.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.avmedia.Manager_QuickTime">
+    <service name="com.sun.star.media.Manager_QuickTime"/>
+  </implementation>
+</component>
diff --git a/avmedia/source/quicktime/framegrabber.cxx b/avmedia/source/quicktime/framegrabber.cxx
new file mode 100644
index 000000000000..5da2aa2f2836
--- /dev/null
+++ b/avmedia/source/quicktime/framegrabber.cxx
@@ -0,0 +1,155 @@
+/* -*- 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 "framegrabber.hxx"
+#include "player.hxx"
+
+#include <tools/stream.hxx>
+#include <vcl/graph.hxx>
+#include <vcl/cvtgrf.hxx>
+#include <unotools/localfilehelper.hxx>
+
+#define AVMEDIA_QUICKTIME_FRAMEGRABBER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.FrameGrabber_Quicktime"
+#define AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME "com.sun.star.media.FrameGrabber_Quicktime"
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace quicktime {
+
+// ----------------
+// - FrameGrabber -
+// ----------------
+
+FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
+    mxMgr( rxMgr )
+{
+    OSErr result;
+
+    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+    // check the version of QuickTime installed
+    result = Gestalt(gestaltQuickTime,&mnVersion);
+     if ((result == noErr) && (mnVersion >= QT701))
+    {
+      // we have version 7.01 or later, initialize
+      mpMovie = [QTMovie movie];
+      [mpMovie retain];
+      mbInitialized = true;
+    }
+    [pool release];
+}
+
+// ------------------------------------------------------------------------------
+
+FrameGrabber::~FrameGrabber()
+{
+    if( mbInitialized )
+    {
+        if( mpMovie )
+        {
+            [mpMovie release];
+            mpMovie = nil;
+        }
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+bool FrameGrabber::create( const ::rtl::OUString& rURL )
+{
+    bool bRet = false;
+    maURL = rURL;
+    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+    NSString* aNSStr = [[[NSString alloc] initWithCharacters: rURL.getStr() length: rURL.getLength()]stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] ;
+    NSURL* aURL = [NSURL URLWithString:aNSStr ];
+
+    // create the Movie
+
+        mpMovie = [mpMovie initWithURL:aURL error:nil];
+        if(mpMovie)
+        {
+            [mpMovie retain];
+            bRet = true;
+        }
+
+    [pool release];
+
+    return( bRet );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
+    throw (uno::RuntimeException)
+{
+    uno::Reference< graphic::XGraphic > xRet;
+
+    NSImage* pImage = [mpMovie frameImageAtTime: QTMakeTimeWithTimeInterval(fMediaTime)];
+    NSData *pBitmap = [pImage TIFFRepresentation];
+    long nSize = [pBitmap length];
+    const void* pBitmapData = [pBitmap bytes];
+    SvMemoryStream  aMemStm( (char *)pBitmapData, nSize, STREAM_READ | STREAM_WRITE );
+    Graphic aGraphic;
+    if ( GraphicConverter::Import( aMemStm, aGraphic, CVT_TIF ) == ERRCODE_NONE )
+    {
+        xRet = aGraphic.GetXGraphic();
+    }
+
+    return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL FrameGrabber::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_FRAMEGRABBER_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace quicktime
+} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
new file mode 100644
index 000000000000..8fa2b5b5fc95
--- /dev/null
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -0,0 +1,74 @@
+/* -*- 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 _FRAMEGRABBER_HXX
+#define _FRAMEGRABBER_HXX
+
+#include "quicktimecommon.hxx"
+
+#include "com/sun/star/media/XFrameGrabber.hdl"
+
+namespace avmedia { namespace quicktime {
+
+// ----------------
+// - FrameGrabber -
+// ----------------
+
+class FrameGrabber : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XFrameGrabber,
+                                                      ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+            FrameGrabber( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+            ~FrameGrabber();
+
+    bool    create( const ::rtl::OUString& rURL );
+
+    // XFrameGrabber
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+
+private:
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    mxMgr;
+    ::rtl::OUString                                                                     maURL;
+    QTMovie*                                                                            mpMovie;
+    sal_Bool                                                                            mbInitialized;
+    long                                                                                mnVersion;
+};
+
+} // namespace quicktime
+} // namespace avmedia
+
+#endif // _FRAMEGRABBER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/makefile.mk b/avmedia/source/quicktime/makefile.mk
new file mode 100755
index 000000000000..358fce491847
--- /dev/null
+++ b/avmedia/source/quicktime/makefile.mk
@@ -0,0 +1,93 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=avmedia
+TARGET=avmediaQuickTime
+
+.IF "$(GUIBASE)"=="aqua"
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  	settings.mk
+
+.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
+CDEFS+= -DVERBOSE
+.ENDIF
+
+# --- Files ----------------------------------
+
+CFLAGSCXX+=$(OBJCXXFLAGS)
+
+SLOFILES= \
+        $(SLO)$/quicktimeuno.obj  \
+        $(SLO)$/manager.obj       \
+        $(SLO)$/window.obj        \
+        $(SLO)$/framegrabber.obj        \
+        $(SLO)$/player.obj
+
+EXCEPTIONSFILES= \
+        $(SLO)$/quicktimeuno.obj
+
+SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
+
+SHL1STDLIBS= \
+             $(CPPULIB) \
+             $(SALLIB)  \
+             $(COMPHELPERLIB) \
+             $(CPPUHELPERLIB) \
+             $(TOOLSLIB) \
+             $(VCLLIB) 
+
+SHL1STDLIBS+= \
+             -framework Cocoa \
+             -framework QTKit \
+             -framework QuickTime
+
+# build DLL
+SHL1LIBS=$(SLB)$/$(TARGET).lib
+SHL1IMPLIB=i$(TARGET)
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
+
+.ELSE
+dummy:
+    @echo " Nothing to build for GUIBASE=$(GUIBASE)"
+.ENDIF
+
+ALLTAR : $(MISC)/avmediaQuickTime.component
+
+$(MISC)/avmediaQuickTime.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component
diff --git a/avmedia/source/quicktime/manager.cxx b/avmedia/source/quicktime/manager.cxx
new file mode 100644
index 000000000000..ca8da8e5d8b4
--- /dev/null
+++ b/avmedia/source/quicktime/manager.cxx
@@ -0,0 +1,99 @@
+/* -*- 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 "manager.hxx"
+#include "player.hxx"
+#include <tools/urlobj.hxx>
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace quicktime {
+// ----------------
+// - Manager -
+// ----------------
+
+Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
+    mxMgr( rxMgr )
+{
+    OSL_TRACE( "avmediaquicktime: Manager::Manager" );
+}
+
+// ------------------------------------------------------------------------------
+
+Manager::~Manager()
+{
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
+    throw (uno::RuntimeException)
+{
+    Player*                             pPlayer( new Player( mxMgr ) );
+    uno::Reference< media::XPlayer >    xRet( pPlayer );
+    INetURLObject                       aURL( rURL );
+
+    OSL_TRACE( "avmediaquicktime: Manager::createPlayer" );
+
+    if( !pPlayer->create( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) )  )
+        xRet = uno::Reference< media::XPlayer >();
+
+    return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL Manager::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace quicktime
+} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
new file mode 100644
index 000000000000..8c8749683ce7
--- /dev/null
+++ b/avmedia/source/quicktime/manager.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 _MANAGER_HXX
+#define _MANAGER_HXX
+
+#include "quicktimecommon.hxx"
+
+#include "com/sun/star/media/XManager.hdl"
+
+// -----------
+// - Manager -
+// -----------
+
+namespace avmedia { namespace quicktime {
+
+class Manager : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XManager,
+                                                 ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+    Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+    ~Manager();
+
+    // XManager
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+private:
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+};
+
+} // namespace quicktime
+} // namespace avmedia
+
+#endif // _MANAGER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/player.cxx b/avmedia/source/quicktime/player.cxx
new file mode 100644
index 000000000000..8b623e93c8ce
--- /dev/null
+++ b/avmedia/source/quicktime/player.cxx
@@ -0,0 +1,502 @@
+/* -*- 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 <math.h>
+
+#include "player.hxx"
+#include "framegrabber.hxx"
+#include "window.hxx"
+
+// dbg_dump for development
+#if OSL_DEBUG_LEVEL > 1
+#include <rtl/strbuf.hxx>
+#include <rtl/ustring.hxx>
+
+const sal_Char *dbg_dump(const rtl::OString &rStr)
+{
+    static rtl::OStringBuffer aStr;
+
+    aStr = rtl::OStringBuffer(rStr);
+    aStr.append(static_cast<char>(0));
+    return aStr.getStr();
+}
+
+const sal_Char *dbg_dump(const rtl::OUString &rStr)
+{
+    return dbg_dump(rtl::OUStringToOString(rStr, RTL_TEXTENCODING_UTF8));
+}
+
+const sal_Char *dbg_dump(rtl_String *pStr)
+{
+    return dbg_dump(rtl::OString(pStr));
+}
+
+const sal_Char *dbg_dump(rtl_uString *pStr)
+{
+    return dbg_dump(rtl::OUString(pStr));
+}
+
+#endif
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace quicktime {
+
+// ----------------
+// - Player -
+// ----------------
+
+Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
+    mxMgr( rxMgr ),
+    mpMovie( nil ),
+    /* GST
+    mbFakeVideo (sal_False ),
+    */
+    mnUnmutedVolume( 0 ),
+    mnStopTime( DBL_MAX ),  //max double
+    mbMuted( false ),
+    mbLooping( false ),
+    mbInitialized( false ),
+    mnWindowID( 0 ),
+    mnDuration( 0 ),
+    mnWidth( 0 ),
+    mnHeight( 0 ),
+    mnVersion( 0 ),
+    maSizeCondition( osl_createCondition() )
+{
+    OSErr result;
+
+    NSApplicationLoad();
+    NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+    // check the version of QuickTime installed
+    result = Gestalt(gestaltQuickTime,&mnVersion);
+    if ((result == noErr) && (mnVersion >= QT701))
+    {
+      // we have version 7.01 or later, initialize
+      mbInitialized = true;
+    }
+    [pool release];
+}
+
+// ------------------------------------------------------------------------------
+
+Player::~Player()
+{
+    if( mpMovie )
+    {
+        [mpMovie release];
+        mpMovie = nil;
+    }
+}
+// ------------------------------------------------------------------------------
+
+QTMovie* Player::getMovie()
+{
+    OSL_ASSERT( mpMovie );
+    return mpMovie;
+}
+
+// ------------------------------------------------------------------------------
+
+bool Player::create( const ::rtl::OUString& rURL )
+{
+    bool    bRet = false;
+    // create the Movie
+    if( mbInitialized )
+    {
+        NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+
+        if( mpMovie )
+        {
+            [mpMovie release];
+            mpMovie = nil;
+        }
+
+        NSString* aNSStr = [[[NSString alloc] initWithCharacters: rURL.getStr() length: rURL.getLength()]stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] ;
+        NSURL* aURL = [NSURL URLWithString:aNSStr ];
+
+        NSError* pErr = nil;
+        mpMovie = [QTMovie movieWithURL:aURL error:&pErr];
+        if(mpMovie)
+        {
+            [mpMovie retain];
+            maURL = rURL;
+            bRet = true;
+        }
+        if( pErr )
+        {
+            OSL_TRACE( "NSMovie create failed with error %ld (%s)",
+                       (long)[pErr code],
+                       [[pErr localizedDescription] cString]
+                       );
+        }
+        [pool release];
+    }
+
+    return bRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::start(  )
+    throw (uno::RuntimeException)
+{
+  OSL_TRACE ("Player::start");
+
+  if( mpMovie )
+  {
+      [mpMovie play];
+  }
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::stop(  )
+    throw (uno::RuntimeException)
+{
+    OSL_TRACE ("Player::stop");
+    if( mpMovie )
+    {
+        [mpMovie stop];
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::isPlaying()
+    throw (uno::RuntimeException)
+{
+    bool bRet = false;
+
+    if ( mpMovie )
+    {
+        if ([mpMovie rate] != 0)
+        {
+            bRet = true;
+        }
+    }
+
+    return bRet;
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getDuration(  )
+    throw (uno::RuntimeException)
+{
+    // slideshow checks for non-zero duration, so cheat here
+    double duration = 0.01;
+
+    if ( mpMovie ) // && mnDuration > 0 ) {
+    {
+        QTTime structDuration =  [mpMovie duration] ;
+        duration = (double)structDuration.timeValue / (double)structDuration.timeScale;
+    }
+
+    return duration;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setMediaTime( double fTime )
+    throw (uno::RuntimeException)
+{
+    OSL_TRACE ("Player::setMediaTime");
+
+    if ( mpMovie )
+    {
+        [mpMovie setCurrentTime: QTMakeTimeWithTimeInterval(fTime)];
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getMediaTime(  )
+    throw (uno::RuntimeException)
+{
+  double position = 0.0;
+
+  if ( mpMovie )
+  {
+      QTTime structDuration =  [mpMovie currentTime] ;
+      position = (double)structDuration.timeValue / (double)structDuration.timeScale;
+  }
+
+  if(isPlaying() && position>mnStopTime)
+  {
+      stop();
+  }
+
+  return position;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setStopTime( double fTime )
+    throw (uno::RuntimeException)
+{
+    OSL_TRACE ("Player::setStopTime %f", fTime);
+
+    mnStopTime = fTime;
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getStopTime(  )
+    throw (uno::RuntimeException)
+{
+    double fRet = mnStopTime;
+
+    return fRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setRate( double fRate )
+    throw (uno::RuntimeException)
+{
+    OSL_TRACE ("Player::setRate");
+
+    // Quicktime: 0 = stop, 1 = normal speed, 2 = double speed, -1 = normal speed backwards
+    if ( mpMovie )
+    {
+        [mpMovie setRate: fRate];
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+double SAL_CALL Player::getRate(  )
+    throw (uno::RuntimeException)
+{
+    // Quicktime: 0 = stop, 1 = normal speed, 2 = double speed, -1 = normal speed backwards
+    double rate = 1.0;
+
+    OSL_TRACE ("Player::getRate");
+
+    if ( mpMovie )
+    {
+        rate = (double) [mpMovie rate];
+    }
+
+    return rate;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
+    throw (uno::RuntimeException)
+{
+    OSL_TRACE ("Player::setPlaybackLoop? %s", bSet?"True":"False" );
+
+    if(bSet)
+    {
+        [mpMovie setAttribute:[NSNumber numberWithBool:YES] forKey: QTMovieLoopsAttribute]  ;
+    }
+    else
+    {
+         [mpMovie setAttribute:[NSNumber numberWithBool:NO] forKey: QTMovieLoopsAttribute]  ;
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::isPlaybackLoop(  )
+    throw (uno::RuntimeException)
+{
+    bool bRet = [[mpMovie attributeForKey:QTMovieLoopsAttribute] boolValue];
+
+    OSL_TRACE ("Player::isPlaybackLoop ? %s", bRet?"True":"False" );
+
+    return bRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setMute( sal_Bool bSet )
+    throw (uno::RuntimeException)
+{
+    OSL_TRACE( "set mute: %d muted: %d unmuted volume: %lf", bSet, mbMuted, mnUnmutedVolume );
+
+    // change the volume to 0 or the unmuted volume
+    if(  mpMovie && mbMuted != bSet )
+    {
+        [mpMovie setMuted: bSet ];
+        mbMuted = bSet;
+    }
+
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::isMute(  )
+    throw (uno::RuntimeException)
+{
+    OSL_TRACE ("Player::isMuted");
+
+    return mbMuted;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
+    throw (uno::RuntimeException)
+{
+    // OOo db volume -40 = QTVolume 0
+    // OOo db volume 0   = QTvolume 1
+    if(nVolumeDB==-40)
+    {
+        mnUnmutedVolume = 0;
+    }
+    else
+    {
+        mnUnmutedVolume = pow( 10.0, nVolumeDB / 20.0 );
+    }
+
+    OSL_TRACE( "set volume: %d gst volume: %f", nVolumeDB, mnUnmutedVolume );
+
+    // change volume
+    if( !mbMuted && mpMovie )
+    {
+        [mpMovie setVolume: mnUnmutedVolume ];
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Int16 SAL_CALL Player::getVolumeDB(  )
+    throw (uno::RuntimeException)
+{
+    sal_Int16 nVolumeDB = 0.0;
+
+    if( mpMovie )
+      {
+          float volume = 0.0;
+
+          volume = [mpMovie volume];
+          if(volume>0)            //protect from log10(0)
+          {
+              nVolumeDB = (sal_Int16) ( 20.0*log10 ( volume ) );
+          }
+          else
+          {
+              nVolumeDB = -40 ;  // QT zero volume is no volume, -40db
+          }
+      }
+
+    return nVolumeDB;
+}
+
+// ------------------------------------------------------------------------------
+
+awt::Size SAL_CALL Player::getPreferredPlayerWindowSize(  )
+    throw (uno::RuntimeException)
+{
+    NSSize  nsSize = [[mpMovie attributeForKey:QTMovieNaturalSizeAttribute] sizeValue];
+    awt::Size aSize( nsSize.width, nsSize.height );
+    return aSize;
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
+    throw (uno::RuntimeException)
+{
+    uno::Reference< ::media::XPlayerWindow >    xRet;
+    awt::Size                                   aSize( getPreferredPlayerWindowSize() );
+    NSSize                                      nsSize( NSMakeSize(aSize.Width, aSize.Height) );
+
+    OSL_TRACE( "Player::createPlayerWindow %d %d length: %d", aSize.Width, aSize.Height, aArguments.getLength() );
+
+    if( aSize.Width > 0 && aSize.Height > 0 )
+    {
+        sal_IntPtr nPtr = NULL;
+        aArguments[0] >>= nPtr;
+        NSView* pParentView = reinterpret_cast< NSView * >(nPtr);
+
+        ::avmedia::quicktime::Window* pWindow = new ::avmedia::quicktime::Window( mxMgr, *this, pParentView );
+        xRet = pWindow;
+    }
+
+    return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber(  )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+  uno::Reference< media::XFrameGrabber > xRet;
+  OSL_TRACE ("Player::createFrameGrabber");
+
+  if( maURL.getLength() > 0 )
+  {
+      FrameGrabber* pGrabber = new FrameGrabber( mxMgr );
+
+      xRet = pGrabber;
+
+      if( !pGrabber->create( maURL ) )
+      {
+          xRet.clear();
+      }
+  }
+
+  return xRet;
+}
+
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL Player::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_PLAYER_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_QUICKTIME_PLAYER_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_QUICKTIME_PLAYER_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace quicktime
+} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
new file mode 100644
index 000000000000..da9bbfc8ec8b
--- /dev/null
+++ b/avmedia/source/quicktime/player.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 _PLAYER_HXX
+#define _PLAYER_HXX
+
+#include <osl/conditn.h>
+#include "quicktimecommon.hxx"
+
+#include "com/sun/star/media/XPlayer.hdl"
+
+namespace avmedia { namespace quicktime {
+
+/*
+// ----------
+// - Player -
+// ----------
+*/
+
+class Player : public ::cppu::WeakImplHelper2< ::com::sun::star::media::XPlayer,
+                                               ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+    Player( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr );
+    ~Player();
+
+    bool create( const ::rtl::OUString& rURL );
+
+    // XPlayer
+    virtual void SAL_CALL start(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL stop(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isPlaying(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getDuration(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getMediaTime(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setStopTime( double fTime ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getStopTime(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setRate( double fRate ) throw (::com::sun::star::uno::RuntimeException);
+    virtual double SAL_CALL getRate(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isPlaybackLoop(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isMute(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Int16 SAL_CALL getVolumeDB(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber(  ) throw (::com::sun::star::uno::RuntimeException);
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+
+    QTMovie* getMovie();
+
+private:
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+
+    ::rtl::OUString         maURL;
+
+    QTMovie                 *mpMovie;      // the Movie object
+
+    float                   mnUnmutedVolume;
+    double                  mnStopTime;
+
+    sal_Bool                mbMuted;
+    sal_Bool                mbLooping;
+    sal_Bool                mbInitialized;
+
+    long                    mnWindowID;
+    long                    mnDuration;
+    int                     mnWidth;
+    int                     mnHeight;
+
+    long                    mnVersion;
+    oslCondition            maSizeCondition;
+};
+
+} // namespace quicktime
+} // namespace avmedia
+
+#endif // _PLAYER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx
new file mode 100644
index 000000000000..1c22377efe9a
--- /dev/null
+++ b/avmedia/source/quicktime/quicktimecommon.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 _QUICKTIMECOMMON_HXX
+#define _QUICKTIMECOMMON_HXX
+
+#ifdef MACOSX
+#include <premac.h>
+#import <Cocoa/Cocoa.h>
+#import <QTKit/QTKit.h>
+#import <QuickTime/QuickTime.h>
+#include <postmac.h>
+#endif
+#include <osl/mutex.hxx>
+#ifndef __RTL_USTRING_
+#include <rtl/ustring.hxx>
+#endif
+#include <tools/debug.hxx>
+#include <tools/stream.hxx>
+#include <tools/string.hxx>
+#include <tools/urlobj.hxx>
+#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/factory.hxx>
+
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/KeyModifier.hpp>
+#include <com/sun/star/awt/MouseButton.hpp>
+#include <com/sun/star/media/XManager.hpp>
+
+#define AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Manager_QuickTime"
+#define AVMEDIA_QUICKTIME_MANAGER_SERVICENAME "com.sun.star.media.Manager_QuickTime"
+
+#define AVMEDIA_QUICKTIME_PLAYER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Player_QuickTime"
+#define AVMEDIA_QUICKTIME_PLAYER_SERVICENAME "com.sun.star.media.Player_QuickTime"
+
+#define AVMEDIA_QUICKTIME_WINDOW_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Window_QuickTime"
+#define AVMEDIA_QUICKTIME_WINDOW_SERVICENAME "com.sun.star.media.Window_QuickTime"
+
+#define WM_GRAPHNOTIFY (WM_USER + 567)
+
+// Quicktime 7+ in Mac OS X 10.4
+#define QT701 0x07010000
+
+// Quicktime 6.4+ in Mac OS X 10.3
+#define QT64 0x06400000
+
+#endif // _QUICKTIMECOMMOM_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/quicktimeuno.cxx b/avmedia/source/quicktime/quicktimeuno.cxx
new file mode 100644
index 000000000000..0a927d650bd8
--- /dev/null
+++ b/avmedia/source/quicktime/quicktimeuno.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include "quicktimecommon.hxx"
+#include "manager.hxx"
+
+using namespace ::com::sun::star;
+
+// -------------------
+// - factory methods -
+// -------------------
+
+static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact )
+{
+    return uno::Reference< uno::XInterface >( *new ::avmedia::quicktime::Manager( rxFact ) );
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+{
+    uno::Reference< lang::XSingleServiceFactory > xFactory;
+    void*                                   pRet = 0;
+
+    if( rtl_str_compare( pImplName, AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ) == 0 )
+    {
+        const ::rtl::OUString aServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME )) );
+
+        xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
+                        reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME )),
+                        create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
+    }
+
+    if( xFactory.is() )
+    {
+        xFactory->acquire();
+        pRet = xFactory.get();
+    }
+
+    return pRet;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/window.cxx b/avmedia/source/quicktime/window.cxx
new file mode 100644
index 000000000000..9b9c14ae2622
--- /dev/null
+++ b/avmedia/source/quicktime/window.cxx
@@ -0,0 +1,354 @@
+/* -*- 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 <com/sun/star/awt/SystemPointer.hpp>
+#include <com/sun/star/awt/PosSize.hpp>
+
+#include "window.hxx"
+#include "player.hxx"
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace quicktime {
+
+// -----------
+// - statics -
+// -----------
+
+static ::osl::Mutex& ImplGetOwnStaticMutex()
+{
+    static ::osl::Mutex* pMutex = NULL;
+
+    if( pMutex == NULL )
+    {
+        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
+
+        if( pMutex == NULL )
+        {
+            static ::osl::Mutex aMutex;
+            pMutex = &aMutex;
+        }
+    }
+
+    return *pMutex;
+}
+
+// ---------------
+// - Window -
+// ---------------
+
+// ------------------------------------------------------------------------------
+
+Window::Window( const uno::Reference< lang::XMultiServiceFactory >& i_rxMgr, Player& i_rPlayer, NSView* i_pParentView ) :
+    mxMgr( i_rxMgr ),
+    maListeners( maMutex ),
+    meZoomLevel( media::ZoomLevel_NOT_AVAILABLE ),
+    mrPlayer( i_rPlayer ),
+    mnPointerType( awt::SystemPointer::ARROW ),
+    mpParentView( i_pParentView ),
+    mpMovieView( nil )
+{
+
+    ::osl::MutexGuard aGuard( ImplGetOwnStaticMutex() );
+
+    if( mpParentView ) // sanity check
+    {
+
+        NSRect aViewRect = [mpParentView frame];
+        aViewRect.origin.x = aViewRect.origin.y = 0;
+        mpMovieView = [[QTMovieView alloc] initWithFrame: aViewRect];
+        [mpMovieView setMovie: mrPlayer.getMovie() ];
+        [mpMovieView setControllerVisible: NO];
+        [mpMovieView setPreservesAspectRatio: YES];
+        [mpMovieView setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
+        [mpParentView addSubview: mpMovieView];
+        [mpParentView setAutoresizesSubviews: YES];
+    }
+
+    OSL_TRACE ("Window::Window");
+}
+
+// ------------------------------------------------------------------------------
+
+Window::~Window()
+{
+    if( mpMovieView )
+    {
+        [mpMovieView removeFromSuperview];
+        [mpMovieView setMovie:nil];
+        [mpMovieView release];
+        mpMovieView = nil;
+    }
+}
+
+bool Window::create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
+{
+    return true;
+}
+
+// XPlayerWindow
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::update(  )
+    throw (uno::RuntimeException)
+{
+    ;
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
+    throw (uno::RuntimeException)
+{
+        return false;
+}
+
+// ------------------------------------------------------------------------------
+
+media::ZoomLevel SAL_CALL Window::getZoomLevel(  )
+    throw (uno::RuntimeException)
+{
+    return meZoomLevel;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
+    throw (uno::RuntimeException)
+{
+    mnPointerType = nPointerType;
+}
+
+// XWindow
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
+    throw (uno::RuntimeException)
+{
+    if( mpParentView && mpMovieView )
+    {
+        NSRect aRect = [mpMovieView frame];
+        if( (Flags & awt::PosSize::WIDTH) )
+            aRect.size.width = Width;
+        if( (Flags & awt::PosSize::HEIGHT) )
+            aRect.size.height = Height;
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+awt::Rectangle SAL_CALL Window::getPosSize()
+    throw (uno::RuntimeException)
+{
+    awt::Rectangle aRet;
+
+    NSRect aRect = [mpMovieView frame];
+    aRet.X = aRet.Y = 0;
+    aRet.Width = aRect.size.width;
+    aRet.Height = aRect.size.height;
+
+    return aRet;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setVisible( sal_Bool bVisible )
+    throw (uno::RuntimeException)
+{
+    OSL_TRACE ("Window::setVisible");
+
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setEnable( sal_Bool bEnable )
+    throw (uno::RuntimeException)
+{
+    ;
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::setFocus(  )
+    throw (uno::RuntimeException)
+{
+    OSL_TRACE ("Window::setFocus");
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// XComponent
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::dispose(  )
+    throw (uno::RuntimeException)
+{
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.addInterface( getCppuType( &xListener ), xListener );
+}
+
+// ------------------------------------------------------------------------------
+
+void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
+    throw (uno::RuntimeException)
+{
+    maListeners.removeInterface( getCppuType( &xListener ), xListener );
+}
+
+// XServiceInfo
+// ------------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL Window::getImplementationName(  )
+    throw (uno::RuntimeException)
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_WINDOW_IMPLEMENTATIONNAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
+    throw (uno::RuntimeException)
+{
+    return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( AVMEDIA_QUICKTIME_WINDOW_SERVICENAME ) );
+}
+
+// ------------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames(  )
+    throw (uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aRet(1);
+    aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_QUICKTIME_WINDOW_SERVICENAME ) );
+
+    return aRet;
+}
+
+} // namespace quicktime
+} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
new file mode 100644
index 000000000000..e782e6367af9
--- /dev/null
+++ b/avmedia/source/quicktime/window.hxx
@@ -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.
+ *
+ ************************************************************************/
+
+#ifndef _WINDOW_HXX
+#define _WINDOW_HXX
+
+#include "quicktimecommon.hxx"
+#include <cppuhelper/interfacecontainer.h>
+
+#include "com/sun/star/media/XPlayerWindow.hdl"
+
+namespace avmedia { namespace quicktime {
+
+// ---------------
+// - Window -
+// ---------------
+
+class Player;
+
+class Window : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XPlayerWindow,
+                                                ::com::sun::star::lang::XServiceInfo >
+{
+public:
+
+            Window( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_rxMgr,
+                    Player& i_rPlayer,
+                    NSView* i_pParentView
+                    );
+            ~Window();
+
+    bool    create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments );
+    void    processGraphEvent();
+    void    updatePointer();
+
+    // XPlayerWindow
+    virtual void SAL_CALL update(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ZoomLevel ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XWindow
+    virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setFocus(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XComponent
+    virtual void SAL_CALL dispose(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+
+private:
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+
+    ::osl::Mutex                                maMutex;
+    ::cppu::OMultiTypeInterfaceContainerHelper  maListeners;
+    ::com::sun::star::media::ZoomLevel          meZoomLevel;
+    Player&                                     mrPlayer;
+    int                                         mnPointerType;
+
+    NSView*                                     mpParentView; // parent view for our own private movie view
+    QTMovieView*                                mpMovieView;  // the view containing the movie object, output target and controller
+
+    void                                        ImplLayoutVideoWindow();
+};
+
+} // namespace quicktime
+} // namespace avmedia
+
+#endif // _WINDOW_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/makefile.mk b/avmedia/source/viewer/makefile.mk
new file mode 100755
index 000000000000..7771d1eb0528
--- /dev/null
+++ b/avmedia/source/viewer/makefile.mk
@@ -0,0 +1,55 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=avmedia
+TARGET=viewer
+
+# --- Settings ----------------------------------
+
+.INCLUDE :  settings.mk
+
+# --- Resources ---------------------------------
+
+SRS1NAME=$(TARGET)
+SRC1FILES =\
+        mediawindow.src					
+
+# --- Files -------------------------------------
+
+SLOFILES= \
+	$(EXCEPTIONSFILES)
+
+EXCEPTIONSFILES= \
+        $(SLO)$/mediaevent_impl.obj     	\
+        $(SLO)$/mediawindow.obj         	\
+        $(SLO)$/mediawindow_impl.obj		\
+        $(SLO)$/mediawindowbase_impl.obj 	\
+        
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
new file mode 100644
index 000000000000..f7cd33409cea
--- /dev/null
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -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.
+ *
+ ************************************************************************/
+
+#include "mediaevent_impl.hxx"
+#include "mediawindow_impl.hxx"
+#include <osl/mutex.hxx>
+#include <osl/mutex.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/event.hxx>
+
+using namespace ::com::sun::star;
+
+/* Definition of MediaWindowImpl class */
+
+namespace avmedia { namespace priv {
+// ---------------------------
+// - MediaEventListenersImpl -
+// ---------------------------
+
+MediaEventListenersImpl::MediaEventListenersImpl( Window& rEventWindow ) :
+    mpNotifyWindow( &rEventWindow )
+{
+}
+
+// ---------------------------------------------------------------------
+
+MediaEventListenersImpl::~MediaEventListenersImpl()
+{
+}
+
+// ---------------------------------------------------------------------
+
+void MediaEventListenersImpl::cleanUp()
+{
+    Application::RemoveMouseAndKeyEvents( reinterpret_cast< ::Window* >( mpNotifyWindow ) );
+    mpNotifyWindow = NULL;
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::disposing( const ::com::sun::star::lang::EventObject& /* Source */ )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt::KeyEvent& e )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    const ::osl::MutexGuard aGuard( maMutex );
+    const SolarMutexGuard aAppGuard;
+
+    if( mpNotifyWindow )
+    {
+        KeyCode aVCLKeyCode( e.KeyCode,
+                            ( ( e.Modifiers & 1 ) ? KEY_SHIFT : 0 ) |
+                            ( ( e.Modifiers & 2 ) ? KEY_MOD1 : 0 ) |
+                            ( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) );
+        KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode );
+
+        Application::PostKeyEvent( VCLEVENT_WINDOW_KEYINPUT, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLKeyEvt );
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt::KeyEvent& e )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    const ::osl::MutexGuard aGuard( maMutex );
+    const SolarMutexGuard aAppGuard;
+
+    if( mpNotifyWindow )
+    {
+        KeyCode aVCLKeyCode( e.KeyCode,
+                            ( ( e.Modifiers & 1 ) ? KEY_SHIFT : 0 ) |
+                            ( ( e.Modifiers & 2 ) ? KEY_MOD1 : 0 ) |
+                            ( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) );
+        KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode );
+        Application::PostKeyEvent( VCLEVENT_WINDOW_KEYUP, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLKeyEvt );
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt::MouseEvent& e )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    const ::osl::MutexGuard aGuard( maMutex );
+    const SolarMutexGuard aAppGuard;
+
+    if( mpNotifyWindow )
+    {
+        MouseEvent aVCLMouseEvt( Point( e.X, e.Y ),
+                                 sal::static_int_cast< sal_uInt16 >(e.ClickCount),
+                                 0,
+                                ( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) |
+                                ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
+                                ( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ),
+                                e.Modifiers );
+        Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt );
+    }
+}
+
+// ----------------------------------------------gvd-----------------------
+
+void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::awt::MouseEvent& e )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    const ::osl::MutexGuard aGuard( maMutex );
+    const SolarMutexGuard aAppGuard;
+
+    if( mpNotifyWindow )
+    {
+        MouseEvent aVCLMouseEvt( Point( e.X, e.Y ),
+                                 sal::static_int_cast< sal_uInt16 >(e.ClickCount),
+                                 0,
+                                ( ( e.Buttons & 1 ) ? MOUSE_LEFT : 0 ) |
+                                ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) |
+                                ( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ),
+                                e.Modifiers );
+        Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONUP, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt );
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::mouseEntered( const ::com::sun::star::awt::MouseEvent& /* e */ )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    const ::osl::MutexGuard aGuard( maMutex );
+    const SolarMutexGuard aAppGuard;
+
+    if( mpNotifyWindow )
+    {
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::mouseExited( const ::com::sun::star::awt::MouseEvent& /* e */ )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    const ::osl::MutexGuard aGuard( maMutex );
+    const SolarMutexGuard aAppGuard;
+
+    if( mpNotifyWindow )
+    {
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt::MouseEvent& e )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    const ::osl::MutexGuard aGuard( maMutex );
+    const SolarMutexGuard aAppGuard;
+
+    if( mpNotifyWindow )
+    {
+        MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, 0, e.Buttons, e.Modifiers );
+        Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt );
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt::MouseEvent& e )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+    const ::osl::MutexGuard aGuard( maMutex );
+    const SolarMutexGuard aAppGuard;
+
+    if( mpNotifyWindow )
+    {
+        MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, 0, e.Buttons, e.Modifiers );
+        Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt );
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::focusGained( const ::com::sun::star::awt::FocusEvent& /* e */ )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+}
+
+// ---------------------------------------------------------------------
+
+void SAL_CALL MediaEventListenersImpl::focusLost( const ::com::sun::star::awt::FocusEvent& /* e */ )
+    throw (::com::sun::star::uno::RuntimeException)
+{
+}
+
+} // namespace priv
+} // namespace avemdia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
new file mode 100644
index 000000000000..9f282a90688f
--- /dev/null
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
@@ -0,0 +1,92 @@
+/* -*- 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 _AVMEDIA_MEDIAEVENT_IMPL_HXX
+#define _AVMEDIA_MEDIAEVENT_IMPL_HXX
+
+#include <avmedia/mediawindow.hxx>
+#include <cppuhelper/compbase4.hxx>
+#include <com/sun/star/awt/XKeyListener.hpp>
+#include <com/sun/star/awt/XMouseListener.hpp>
+#include <com/sun/star/awt/XMouseMotionListener.hpp>
+#include <com/sun/star/awt/XFocusListener.hpp>
+
+namespace avmedia
+{
+    namespace priv
+    {
+        // ---------------------------
+        // - MediaEventListenersImpl -
+        // ---------------------------
+
+        class MediaWindowImpl;
+
+        class MediaEventListenersImpl : public ::cppu::WeakImplHelper4< ::com::sun::star::awt::XKeyListener,
+                                                                        ::com::sun::star::awt::XMouseListener,
+                                                                        ::com::sun::star::awt::XMouseMotionListener,
+                                                                        ::com::sun::star::awt::XFocusListener >
+        {
+        public:
+
+                    MediaEventListenersImpl( Window& rNotifyWindow );
+                    ~MediaEventListenersImpl();
+
+        void        cleanUp();
+
+        protected:
+
+            // XKeyListener
+            virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+
+            // XMouseListener
+            virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+
+            // XMouseMotionListener
+            virtual void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+
+            // XFocusListener
+            virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException);
+
+        private:
+
+            Window*                 mpNotifyWindow;
+            mutable ::osl::Mutex    maMutex;
+        };
+    }
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
new file mode 100644
index 000000000000..b910a0c2c608
--- /dev/null
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -0,0 +1,433 @@
+/* -*- 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 <stdio.h>
+
+#include <avmedia/mediawindow.hxx>
+#include "mediawindow_impl.hxx"
+#include "mediamisc.hxx"
+#include "mediawindow.hrc"
+#include <tools/urlobj.hxx>
+#include <vcl/msgbox.hxx>
+#include <unotools/pathoptions.hxx>
+#include <sfx2/filedlghelper.hxx>
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/media/XManager.hpp>
+#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+
+#define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME_MEDIATIME 3.0
+
+using namespace ::com::sun::star;
+
+namespace avmedia {
+
+// ---------------
+// - MediaWindow -
+// ---------------
+
+MediaWindow::MediaWindow( Window* parent, bool bInternalMediaControl ) :
+    mpImpl( new priv::MediaWindowImpl( parent, this, bInternalMediaControl ) )
+{
+    mpImpl->Show();
+}
+
+// -------------------------------------------------------------------------
+
+MediaWindow::~MediaWindow()
+{
+    mpImpl->cleanUp();
+    delete mpImpl;
+    mpImpl = NULL;
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::setURL( const ::rtl::OUString& rURL )
+{
+    if( mpImpl )
+        mpImpl->setURL( rURL );
+}
+
+// -------------------------------------------------------------------------
+
+const ::rtl::OUString& MediaWindow::getURL() const
+{
+    return mpImpl->getURL();
+}
+
+// -------------------------------------------------------------------------
+
+bool MediaWindow::isValid() const
+{
+    return( mpImpl != NULL && mpImpl->isValid() );
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::MouseMove( const MouseEvent& /* rMEvt */ )
+{
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindow::MouseButtonDown( const MouseEvent& /* rMEvt */ )
+{
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindow::MouseButtonUp( const MouseEvent& /* rMEvt */ )
+{
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::KeyInput( const KeyEvent& /* rKEvt */ )
+{
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::KeyUp( const KeyEvent& /* rKEvt */ )
+{
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::Command( const CommandEvent& /* rCEvt */ )
+{
+}
+
+// -------------------------------------------------------------------------
+
+sal_Int8 MediaWindow::AcceptDrop( const AcceptDropEvent& /* rEvt */ )
+{
+    return 0;
+}
+
+// -------------------------------------------------------------------------
+
+sal_Int8 MediaWindow::ExecuteDrop( const ExecuteDropEvent& /* rEvt */ )
+{
+    return 0;
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::StartDrag( sal_Int8 /* nAction */, const Point& /* rPosPixel */ )
+{
+}
+
+// -------------------------------------------------------------------------
+
+bool MediaWindow::hasPreferredSize() const
+{
+    return( mpImpl != NULL && mpImpl->hasPreferredSize() );
+}
+
+// -------------------------------------------------------------------------
+
+Size MediaWindow::getPreferredSize() const
+{
+    return mpImpl->getPreferredSize();
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::setPosSize( const Rectangle& rNewRect )
+{
+    if( mpImpl )
+    {
+        mpImpl->setPosSize( rNewRect );
+    }
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::setPointer( const Pointer& rPointer )
+{
+    if( mpImpl )
+        mpImpl->setPointer( rPointer );
+}
+
+// -------------------------------------------------------------------------
+
+bool MediaWindow::start()
+{
+    return( mpImpl != NULL && mpImpl->start() );
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::updateMediaItem( MediaItem& rItem ) const
+{
+    if( mpImpl )
+        mpImpl->updateMediaItem( rItem );
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::executeMediaItem( const MediaItem& rItem )
+{
+    if( mpImpl )
+        mpImpl->executeMediaItem( rItem );
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::show()
+{
+    if( mpImpl )
+        mpImpl->Show();
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::hide()
+{
+    if( mpImpl )
+        mpImpl->Hide();
+}
+
+// -------------------------------------------------------------------------
+
+Window* MediaWindow::getWindow() const
+{
+    return mpImpl;
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
+{
+    static const char* pFilters[] = { "AIF Audio", "aif;aiff",
+                                      "AU Audio", "au",
+                                      "AVI", "avi",
+                                      "CD Audio", "cda",
+                                      "FLAC Audio", "flac",
+                                      "Matroska Media", "mkv",
+                                      "MIDI Audio", "mid;midi",
+                                      "MPEG Audio", "mp2;mp3;mpa",
+                                      "MPEG Video", "mpg;mpeg;mpv;mp4",
+                                      "Ogg bitstream", "ogg",
+                                      "Quicktime Video", "mov",
+                                      "Vivo Video", "viv",
+                                      "WAVE Audio", "wav",
+                                      "WebM Video", "webm" };
+
+    for( size_t i = 0; i < SAL_N_ELEMENTS(pFilters); i += 2 )
+    {
+        rFilterNameVector.push_back( ::std::make_pair< ::rtl::OUString, ::rtl::OUString >(
+                                        ::rtl::OUString::createFromAscii(pFilters[i]),
+                                        ::rtl::OUString::createFromAscii(pFilters[i+1]) ) );
+    }
+}
+
+// -------------------------------------------------------------------------
+
+bool MediaWindow::executeMediaURLDialog( Window* /* pParent */, ::rtl::OUString& rURL, bool bInsertDialog )
+{
+    ::sfx2::FileDialogHelper        aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+    static const ::rtl::OUString    aWildcard( RTL_CONSTASCII_USTRINGPARAM( "*." ) );
+    FilterNameVector                aFilters;
+    const ::rtl::OUString           aSeparator( RTL_CONSTASCII_USTRINGPARAM( ";" ) );
+    ::rtl::OUString                 aAllTypes;
+
+    aDlg.SetTitle( AVMEDIA_RESID( bInsertDialog ? AVMEDIA_STR_INSERTMEDIA_DLG : AVMEDIA_STR_OPENMEDIA_DLG ) );
+
+    getMediaFilters( aFilters );
+
+    unsigned int i;
+    for( i = 0; i < aFilters.size(); ++i )
+    {
+        for( sal_Int32 nIndex = 0; nIndex >= 0; )
+        {
+            if( aAllTypes.getLength() )
+                aAllTypes += aSeparator;
+
+            ( aAllTypes += aWildcard ) += aFilters[ i ].second.getToken( 0, ';', nIndex );
+        }
+    }
+
+    // add filter for all media types
+    aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_MEDIAFILES ), aAllTypes );
+
+    for( i = 0; i < aFilters.size(); ++i )
+    {
+        ::rtl::OUString aTypes;
+
+        for( sal_Int32 nIndex = 0; nIndex >= 0; )
+        {
+            if( aTypes.getLength() )
+                aTypes += aSeparator;
+
+            ( aTypes += aWildcard ) += aFilters[ i ].second.getToken( 0, ';', nIndex );
+        }
+
+        // add single filters
+        aDlg.AddFilter( aFilters[ i ].first, aTypes );
+    }
+
+    // add filter for all types
+    aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_FILES ), String( RTL_CONSTASCII_USTRINGPARAM( "*.*" ) ) );
+
+    if( aDlg.Execute() == ERRCODE_NONE )
+    {
+        const INetURLObject aURL( aDlg.GetPath() );
+        rURL = aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS );
+    }
+    else if( rURL.getLength() )
+        rURL = ::rtl::OUString();
+
+    return( rURL.getLength() > 0 );
+}
+
+// -------------------------------------------------------------------------
+
+void MediaWindow::executeFormatErrorBox( Window* pParent )
+{
+    ErrorBox aErrBox( pParent, AVMEDIA_RESID( AVMEDIA_ERR_URL ) );
+
+    aErrBox.Execute();
+}
+
+// -------------------------------------------------------------------------
+
+bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPreferredSizePixel )
+{
+    const INetURLObject aURL( rURL );
+    bool                bRet = false;
+
+    if( aURL.GetProtocol() != INET_PROT_NOT_VALID )
+    {
+        if( bDeep || pPreferredSizePixel )
+        {
+            try
+            {
+                uno::Reference< media::XPlayer > xPlayer( priv::MediaWindowImpl::createPlayer(
+                                                            aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) );
+
+                if( xPlayer.is() )
+                {
+                    bRet = true;
+
+                    if( pPreferredSizePixel )
+                    {
+                        const awt::Size aAwtSize( xPlayer->getPreferredPlayerWindowSize() );
+
+                        pPreferredSizePixel->Width() = aAwtSize.Width;
+                        pPreferredSizePixel->Height() = aAwtSize.Height;
+                    }
+                }
+            }
+            catch( ... )
+            {
+            }
+        }
+        else
+        {
+            FilterNameVector        aFilters;
+            const ::rtl::OUString   aExt( aURL.getExtension() );
+
+            getMediaFilters( aFilters );
+
+            unsigned int i;
+            for( i = 0; ( i < aFilters.size() ) && !bRet; ++i )
+            {
+                for( sal_Int32 nIndex = 0; nIndex >= 0 && !bRet; )
+                {
+                    if( aExt.equalsIgnoreAsciiCase( aFilters[ i ].second.getToken( 0, ';', nIndex ) ) )
+                        bRet = true;
+                }
+            }
+        }
+    }
+
+    return bRet;
+}
+
+// -------------------------------------------------------------------------
+
+uno::Reference< media::XPlayer > MediaWindow::createPlayer( const ::rtl::OUString& rURL )
+{
+    return priv::MediaWindowImpl::createPlayer( rURL );
+}
+
+// -------------------------------------------------------------------------
+
+uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const ::rtl::OUString& rURL,
+                                                            bool bAllowToCreateReplacementGraphic,
+                                                            double fMediaTime )
+{
+    uno::Reference< media::XPlayer >    xPlayer( createPlayer( rURL ) );
+    uno::Reference< graphic::XGraphic > xRet;
+    ::std::auto_ptr< Graphic >          apGraphic;
+
+    if( xPlayer.is() )
+    {
+        uno::Reference< media::XFrameGrabber > xGrabber( xPlayer->createFrameGrabber() );
+
+        if( xGrabber.is() )
+        {
+            if( AVMEDIA_FRAMEGRABBER_DEFAULTFRAME == fMediaTime )
+                fMediaTime = AVMEDIA_FRAMEGRABBER_DEFAULTFRAME_MEDIATIME;
+
+            if( fMediaTime >= xPlayer->getDuration() )
+                fMediaTime = ( xPlayer->getDuration() * 0.5 );
+
+            xRet = xGrabber->grabFrame( fMediaTime );
+        }
+
+        if( !xRet.is() && bAllowToCreateReplacementGraphic  )
+        {
+            awt::Size aPrefSize( xPlayer->getPreferredPlayerWindowSize() );
+
+            if( !aPrefSize.Width && !aPrefSize.Height )
+            {
+                const BitmapEx aBmpEx( AVMEDIA_RESID( AVMEDIA_BMP_AUDIOLOGO ) );
+                apGraphic.reset( new Graphic( aBmpEx ) );
+            }
+        }
+    }
+
+    if( !xRet.is() && !apGraphic.get() && bAllowToCreateReplacementGraphic )
+    {
+        const BitmapEx aBmpEx( AVMEDIA_RESID( AVMEDIA_BMP_EMPTYLOGO ) );
+        apGraphic.reset( new Graphic( aBmpEx ) );
+    }
+
+    if( apGraphic.get() )
+        xRet = apGraphic->GetXGraphic();
+
+    return xRet;
+}
+
+} // namespace avemdia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow.hrc b/avmedia/source/viewer/mediawindow.hrc
new file mode 100755
index 000000000000..67036e300c13
--- /dev/null
+++ b/avmedia/source/viewer/mediawindow.hrc
@@ -0,0 +1,9 @@
+#define AVMEDIA_STR_OPENMEDIA_DLG       16384
+#define AVMEDIA_STR_INSERTMEDIA_DLG     16385
+#define AVMEDIA_STR_ALL_MEDIAFILES      16386
+#define AVMEDIA_STR_ALL_FILES           16387
+
+#define AVMEDIA_BMP_AUDIOLOGO           20000
+#define AVMEDIA_BMP_EMPTYLOGO           20001
+
+#define AVMEDIA_ERR_URL                 21000
diff --git a/avmedia/source/viewer/mediawindow.src b/avmedia/source/viewer/mediawindow.src
new file mode 100644
index 000000000000..1c92b4d913af
--- /dev/null
+++ b/avmedia/source/viewer/mediawindow.src
@@ -0,0 +1,77 @@
+ /*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "mediawindow.hrc"
+
+String AVMEDIA_STR_INSERTMEDIA_DLG
+{
+    Text[en-US] = "Insert Movie and Sound";
+};
+
+// ------------------------------------------------------------------------------
+
+STRING AVMEDIA_STR_OPENMEDIA_DLG
+{
+    Text[en-US] = "Open Movie and Sound";
+};
+
+// ------------------------------------------------------------------------------
+
+String AVMEDIA_STR_ALL_MEDIAFILES
+{
+    Text[en-US] = "All movie and sound files";
+};
+
+// ------------------------------------------------------------------------------
+
+String AVMEDIA_STR_ALL_FILES
+{
+    Text[en-US] = "All files (*.*)";
+};
+
+// ------------------------------------------------------------------------------
+
+Bitmap AVMEDIA_BMP_AUDIOLOGO
+{
+    file = "avaudiologo.png";
+};
+
+// ------------------------------------------------------------------------------
+
+Bitmap AVMEDIA_BMP_EMPTYLOGO
+{
+    file = "avemptylogo.png";
+};
+
+// ------------------------------------------------------------------------------
+
+ErrorBox AVMEDIA_ERR_URL
+{
+    BUTTONS = WB_OK ;
+    DEFBUTTON = WB_DEF_OK ;
+    Message[en-US] = "The format of the selected file is not supported.";
+};
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
new file mode 100644
index 000000000000..c89fa538b3f2
--- /dev/null
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -0,0 +1,522 @@
+/* -*- 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 "mediawindow_impl.hxx"
+#include "mediaevent_impl.hxx"
+#include "mediamisc.hxx"
+#include "mediawindow.hrc"
+#include "helpids.hrc"
+
+#include <algorithm>
+#include <cmath>
+#include <osl/mutex.hxx>
+#include <tools/time.hxx>
+#include <vcl/svapp.hxx>
+#ifdef UNX
+#include <vcl/sysdata.hxx>
+#endif
+
+#include <com/sun/star/awt/SystemPointer.hdl>
+#include <com/sun/star/lang/XComponent.hdl>
+
+#define AVMEDIA_TOOLBOXITEM_PREV    0x0001
+#define AVMEDIA_TOOLBOXITEM_PLAY    0x0002
+#define AVMEDIA_TOOLBOXITEM_PAUSE   0x0004
+#define AVMEDIA_TOOLBOXITEM_STOP    0x0008
+#define AVMEDIA_TOOLBOXITEM_NEXT    0x0010
+#define AVMEDIA_TOOLBOXITEM_MUTE    0x0100
+
+#define AVMEDIA_FFW_PLAYRATE        4
+
+using namespace ::com::sun::star;
+
+namespace avmedia { namespace priv {
+
+// ----------------------
+// - MediaWindowControl -
+// ----------------------
+
+MediaWindowControl::MediaWindowControl( Window* pParent ) :
+    MediaControl( pParent, MEDIACONTROLSTYLE_MULTILINE )
+{
+}
+
+// ---------------------------------------------------------------------
+
+MediaWindowControl::~MediaWindowControl()
+{
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowControl::update()
+{
+    MediaItem aItem;
+
+    static_cast< MediaWindowImpl* >( GetParent() )->updateMediaItem( aItem );
+    setState( aItem );
+}
+
+// ---------------------------------------------------------------------
+
+void  MediaWindowControl::execute( const MediaItem& rItem )
+{
+    static_cast< MediaWindowImpl* >( GetParent() )->executeMediaItem( rItem );
+}
+
+// --------------------
+// - MediaChildWindow -
+// --------------------
+
+MediaChildWindow::MediaChildWindow( Window* pParent ) :
+    SystemChildWindow( pParent, WB_CLIPCHILDREN )
+{
+}
+
+// ---------------------------------------------------------------------
+
+MediaChildWindow::~MediaChildWindow()
+{
+}
+
+// ---------------------------------------------------------------------
+
+void MediaChildWindow::MouseMove( const MouseEvent& rMEvt )
+{
+    const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
+                                          rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
+
+    SystemChildWindow::MouseMove( rMEvt );
+    GetParent()->MouseMove( aTransformedEvent );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaChildWindow::MouseButtonDown( const MouseEvent& rMEvt )
+{
+    const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
+                                          rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
+
+    SystemChildWindow::MouseButtonDown( rMEvt );
+    GetParent()->MouseButtonDown( aTransformedEvent );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaChildWindow::MouseButtonUp( const MouseEvent& rMEvt )
+{
+    const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
+                                          rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
+
+    SystemChildWindow::MouseButtonUp( rMEvt );
+    GetParent()->MouseButtonUp( aTransformedEvent );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaChildWindow::KeyInput( const KeyEvent& rKEvt )
+{
+    SystemChildWindow::KeyInput( rKEvt );
+    GetParent()->KeyInput( rKEvt );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaChildWindow::KeyUp( const KeyEvent& rKEvt )
+{
+    SystemChildWindow::KeyUp( rKEvt );
+    GetParent()->KeyUp( rKEvt );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaChildWindow::Command( const CommandEvent& rCEvt )
+{
+    const CommandEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rCEvt.GetMousePosPixel() ) ),
+                                            rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetData() );
+
+    SystemChildWindow::Command( rCEvt );
+    GetParent()->Command( aTransformedEvent );
+}
+
+// ----------------------
+// - MediaWindowImpl -
+// ----------------------
+
+MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bool bInternalMediaControl ) :
+    Control( pParent ),
+    MediaWindowBaseImpl( pMediaWindow ),
+    DropTargetHelper( this ),
+    DragSourceHelper( this ),
+    mxEventsIf( static_cast< ::cppu::OWeakObject* >( mpEvents = new MediaEventListenersImpl( maChildWindow ) ) ),
+    maChildWindow( this ),
+    mpMediaWindowControl( bInternalMediaControl ? new MediaWindowControl( this ) : NULL ),
+    mpEmptyBmpEx( NULL ),
+    mpAudioBmpEx( NULL )
+{
+    maChildWindow.SetBackground( Color( COL_BLACK ) );
+    maChildWindow.SetHelpId( HID_AVMEDIA_PLAYERWINDOW );
+    maChildWindow.Hide();
+
+    if( mpMediaWindowControl )
+    {
+        mpMediaWindowControl->SetSizePixel( mpMediaWindowControl->getMinSizePixel() );
+        mpMediaWindowControl->Show();
+    }
+}
+
+// ---------------------------------------------------------------------
+
+MediaWindowImpl::~MediaWindowImpl()
+{
+    delete mpEmptyBmpEx;
+    delete mpAudioBmpEx;
+    delete mpMediaWindowControl;
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::cleanUp()
+{
+    uno::Reference< media::XPlayerWindow > xPlayerWindow( getPlayerWindow() );
+
+    mpEvents->cleanUp();
+
+    if( xPlayerWindow.is() )
+    {
+        xPlayerWindow->removeKeyListener( uno::Reference< awt::XKeyListener >( mxEventsIf, uno::UNO_QUERY ) );
+        xPlayerWindow->removeMouseListener( uno::Reference< awt::XMouseListener >( mxEventsIf, uno::UNO_QUERY ) );
+        xPlayerWindow->removeMouseMotionListener( uno::Reference< awt::XMouseMotionListener >( mxEventsIf, uno::UNO_QUERY ) );
+
+        uno::Reference< lang::XComponent > xComponent( xPlayerWindow, uno::UNO_QUERY );
+
+        if( xComponent.is() )
+            xComponent->dispose();
+
+        setPlayerWindow( NULL );
+    }
+
+    MediaWindowBaseImpl::cleanUp();
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::onURLChanged()
+{
+    if( getPlayer().is() )
+    {
+        uno::Sequence< uno::Any >              aArgs( 3 );
+        uno::Reference< media::XPlayerWindow > xPlayerWindow;
+        const Point                            aPoint;
+        const Size                             aSize( maChildWindow.GetSizePixel() );
+        const sal_Int32                        nWndHandle = 0;
+
+        aArgs[ 0 ] = uno::makeAny( nWndHandle );
+        aArgs[ 1 ] = uno::makeAny( awt::Rectangle( aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height() ) );
+        aArgs[ 2 ] = uno::makeAny( reinterpret_cast< sal_IntPtr >( &maChildWindow ) );
+
+        try
+        {
+            xPlayerWindow = getPlayer()->createPlayerWindow( aArgs );
+        }
+        catch( uno::RuntimeException )
+        {
+            // happens eg, on MacOSX where Java frames cannot be created from X11 window handles
+        }
+
+        setPlayerWindow( xPlayerWindow );
+
+        if( xPlayerWindow.is() )
+        {
+            xPlayerWindow->addKeyListener( uno::Reference< awt::XKeyListener >( mxEventsIf, uno::UNO_QUERY ) );
+            xPlayerWindow->addMouseListener( uno::Reference< awt::XMouseListener >( mxEventsIf, uno::UNO_QUERY ) );
+            xPlayerWindow->addMouseMotionListener( uno::Reference< awt::XMouseMotionListener >( mxEventsIf, uno::UNO_QUERY ) );
+            xPlayerWindow->addFocusListener( uno::Reference< awt::XFocusListener >( mxEventsIf, uno::UNO_QUERY ) );
+        }
+    }
+    else
+        setPlayerWindow( NULL );
+
+    if( getPlayerWindow().is() )
+        maChildWindow.Show();
+    else
+        maChildWindow.Hide();
+
+    if( mpMediaWindowControl )
+    {
+        MediaItem aItem;
+
+        updateMediaItem( aItem );
+        mpMediaWindowControl->setState( aItem );
+    }
+
+    Invalidate();
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::setPosSize( const Rectangle& rRect )
+{
+    SetPosSizePixel( rRect.TopLeft(), rRect.GetSize() );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::setPointer( const Pointer& rPointer )
+{
+    uno::Reference< media::XPlayerWindow >  xPlayerWindow( getPlayerWindow() );
+
+    SetPointer( rPointer );
+    maChildWindow.SetPointer( rPointer );
+
+    if( xPlayerWindow.is() )
+    {
+        long nPointer;
+
+        switch( rPointer.GetStyle() )
+        {
+            case( POINTER_CROSS ): nPointer = awt::SystemPointer::CROSS; break;
+            case( POINTER_HAND ): nPointer = awt::SystemPointer::HAND; break;
+            case( POINTER_MOVE ): nPointer = awt::SystemPointer::MOVE; break;
+            case( POINTER_WAIT ): nPointer = awt::SystemPointer::WAIT; break;
+
+            default: nPointer = awt::SystemPointer::ARROW; break;
+        }
+
+        xPlayerWindow->setPointerType( nPointer );
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::Resize()
+{
+    uno::Reference< media::XPlayerWindow >  xPlayerWindow( getPlayerWindow() );
+    const Size                              aCurSize( GetOutputSizePixel() );
+    const sal_Int32                         nOffset( mpMediaWindowControl ? AVMEDIA_CONTROLOFFSET : 0 );
+    Size                                    aPlayerWindowSize( aCurSize.Width() - ( nOffset << 1 ),
+                                                               aCurSize.Height() - ( nOffset << 1 ) );
+
+    if( mpMediaWindowControl )
+    {
+        const sal_Int32 nControlHeight = mpMediaWindowControl->GetSizePixel().Height();
+        const sal_Int32 nControlY = ::std::max( aCurSize.Height() - nControlHeight - nOffset, 0L );
+
+        aPlayerWindowSize.Height() = ( nControlY - ( nOffset << 1 ) );
+        mpMediaWindowControl->SetPosSizePixel( Point( nOffset, nControlY ), Size( aCurSize.Width() - ( nOffset << 1 ), nControlHeight ) );
+    }
+
+    if( xPlayerWindow.is() )
+        xPlayerWindow->setPosSize( 0, 0, aPlayerWindowSize.Width(), aPlayerWindowSize.Height(), 0 );
+
+    maChildWindow.SetPosSizePixel( Point( nOffset, nOffset ), aPlayerWindowSize );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::StateChanged( StateChangedType eType )
+{
+    uno::Reference< media::XPlayerWindow > xPlayerWindow( getPlayerWindow() );
+
+    if( xPlayerWindow.is() )
+    {
+        // stop playing when going disabled or hidden
+        switch( eType )
+        {
+            case STATE_CHANGE_VISIBLE:
+            {
+                stopPlayingInternal( !IsVisible() );
+                xPlayerWindow->setVisible( IsVisible() );
+            }
+            break;
+
+            case STATE_CHANGE_ENABLE:
+            {
+                stopPlayingInternal( !IsEnabled() );
+                xPlayerWindow->setEnable( IsEnabled() );
+            }
+            break;
+
+            default:
+            break;
+        }
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::Paint( const Rectangle& )
+{
+    BitmapEx* pLogo = NULL;
+
+    if( !getPlayer().is() )
+    {
+        if( !mpEmptyBmpEx )
+            mpEmptyBmpEx = new BitmapEx( AVMEDIA_RESID( AVMEDIA_BMP_EMPTYLOGO ) );
+
+        pLogo = mpEmptyBmpEx;
+    }
+    else if( !getPlayerWindow().is() )
+    {
+        if( !mpAudioBmpEx )
+            mpAudioBmpEx = new BitmapEx( AVMEDIA_RESID( AVMEDIA_BMP_AUDIOLOGO ) );
+
+        pLogo = mpAudioBmpEx;
+    }
+
+    const Point     aBasePos( maChildWindow.GetPosPixel() );
+    const Rectangle aVideoRect( aBasePos, maChildWindow.GetSizePixel() );
+
+    if( pLogo && !pLogo->IsEmpty() && ( aVideoRect.GetWidth() > 0 ) && ( aVideoRect.GetHeight() > 0 ) )
+    {
+        Size        aLogoSize( pLogo->GetSizePixel() );
+        const Color aBackgroundColor( 67, 67, 67 );
+
+        SetLineColor( aBackgroundColor );
+        SetFillColor( aBackgroundColor );
+        DrawRect( aVideoRect );
+
+        if( ( aLogoSize.Width() > aVideoRect.GetWidth() || aLogoSize.Height() > aVideoRect.GetHeight() ) &&
+            ( aLogoSize.Height() > 0 ) )
+        {
+            const double fLogoWH = (double) aLogoSize.Width() / aLogoSize.Height();
+
+            if( fLogoWH < ( (double) aVideoRect.GetWidth() / aVideoRect.GetHeight() ) )
+            {
+                aLogoSize.Width() = (long) ( aVideoRect.GetHeight() * fLogoWH );
+                aLogoSize.Height()= aVideoRect.GetHeight();
+            }
+            else
+            {
+                aLogoSize.Width() = aVideoRect.GetWidth();
+                aLogoSize.Height()= (long) ( aVideoRect.GetWidth() / fLogoWH );
+            }
+        }
+
+        DrawBitmapEx( Point( aBasePos.X() + ( ( aVideoRect.GetWidth() - aLogoSize.Width() ) >> 1 ),
+                             aBasePos.Y() + ( ( aVideoRect.GetHeight() - aLogoSize.Height() ) >> 1 ) ),
+                      aLogoSize, *pLogo );
+    }
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::GetFocus()
+{
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::MouseMove( const MouseEvent& rMEvt )
+{
+    MediaWindow* pMediaWindow = getMediaWindow();
+
+    if( pMediaWindow )
+        pMediaWindow->MouseMove( rMEvt );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::MouseButtonDown( const MouseEvent& rMEvt )
+{
+    MediaWindow* pMediaWindow = getMediaWindow();
+
+    if( pMediaWindow )
+        pMediaWindow->MouseButtonDown( rMEvt );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::MouseButtonUp( const MouseEvent& rMEvt )
+{
+    MediaWindow* pMediaWindow = getMediaWindow();
+
+    if( pMediaWindow )
+        pMediaWindow->MouseButtonUp( rMEvt );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::KeyInput( const KeyEvent& rKEvt )
+{
+    MediaWindow* pMediaWindow = getMediaWindow();
+
+    if( pMediaWindow )
+        pMediaWindow->KeyInput( rKEvt );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::KeyUp( const KeyEvent& rKEvt )
+{
+    MediaWindow* pMediaWindow = getMediaWindow();
+
+    if( pMediaWindow )
+        pMediaWindow->KeyUp( rKEvt );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::Command( const CommandEvent& rCEvt )
+{
+    MediaWindow* pMediaWindow = getMediaWindow();
+
+    if( pMediaWindow )
+        pMediaWindow->Command( rCEvt );
+}
+
+// ---------------------------------------------------------------------
+
+sal_Int8 MediaWindowImpl::AcceptDrop( const AcceptDropEvent& rEvt )
+{
+    MediaWindow* pMediaWindow = getMediaWindow();
+    return( pMediaWindow ? pMediaWindow->AcceptDrop( rEvt ) : 0 );
+}
+
+// ---------------------------------------------------------------------
+
+sal_Int8 MediaWindowImpl::ExecuteDrop( const ExecuteDropEvent& rEvt )
+{
+    MediaWindow* pMediaWindow = getMediaWindow();
+    return( pMediaWindow ? pMediaWindow->ExecuteDrop( rEvt ) : 0 );
+}
+
+// ---------------------------------------------------------------------
+
+void MediaWindowImpl::StartDrag( sal_Int8 nAction, const Point& rPosPixel )
+{
+    MediaWindow* pMediaWindow = getMediaWindow();
+
+    if( pMediaWindow )
+        pMediaWindow->StartDrag( nAction, rPosPixel );
+}
+
+} // namespace priv
+} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
new file mode 100644
index 000000000000..6767b860d914
--- /dev/null
+++ b/
author	Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>	2018-05-23 11:50:50 +0200
committer	Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>	2018-05-23 12:11:07 +0200
commit	e33719de813bcef0fd2285ff6b6748f3513a3108 (patch)
tree	ef26a62b1faaf1d0a8168c843e352744bb3ee364 /source/ru/starmath
parent	70836fdf7467a34f5a5ac03c576e9ebe535f5cde (diff)
author	Xisco Fauli <anistenis@gmail.com>	2011-08-21 21:50:13 +0200
committer	Xisco Fauli <anistenis@gmail.com>	2011-08-21 21:50:13 +0200
commit	6c76e4db034fd2c43884698b1a30225fd00b3bfd (patch)
tree	1937cb9be81cd2b9f3d0ad27adcc7a7531b8f29d
parent	e9440fb5a0579096423c081b0f0a2185b628e896 (diff)
parent	36703ca1de68cd62782d0d425123521a5bc6732b (diff)