1 files changed, 2 insertions, 2 deletions
diff --git a/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl b/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
index be933ce0ba0b..6c9d4100e730 100644
--- a/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeExpansionListener.idl
@@ -47,7 +47,7 @@ interface XTreeExpansionListener: com::sun::star::lang::XEventListener
 
         @throws ExpandVetoException
             to notify the calling XTreeControl that expanding
-            <member>TreeExpansionEvent::Node</member> should fail.
+            TreeExpansionEvent::Node should fail.
     */
     void treeExpanding( [in] TreeExpansionEvent Event )
         raises ( ExpandVetoException );
@@ -56,7 +56,7 @@ interface XTreeExpansionListener: com::sun::star::lang::XEventListener
 
         @throws ExpandVetoException
             to notify the calling XTreeControl that collapsing
-            <member>TreeExpansionEvent::Node</member> should fail.
+            TreeExpansionEvent::Node should fail.
     */
     void treeCollapsing( [in] TreeExpansionEvent Event )
         raises ( ExpandVetoException );
diff --git a/autodoc/inc/ary/ary.hxx b/autodoc/inc/ary/ary.hxx
index d15ed4d83f66..daa5945616b6 100644
--- a/autodoc/inc/ary/ary.hxx
+++ b/autodoc/inc/ary/ary.hxx
@@ -40,11 +40,6 @@ namespace idl
 {
     class Gate;
 }
-
-namespace cpp
-{
-    class Gate;
-}
 }
 
 
@@ -58,7 +53,6 @@ namespace ary
     Create and destroy the repository and
     give access to the "Gates" for different tasks.
 
-    @collab ::ary::cpp::Gate
     @collab ::ary::idl::Gate
 */
 
@@ -72,13 +66,9 @@ class Repository
     // 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(
diff --git a/autodoc/inc/ary/ary_disp.hxx b/autodoc/inc/ary/ary_disp.hxx
deleted file mode 100644
index 566f3209be20..000000000000
--- a/autodoc/inc/ary/ary_disp.hxx
+++ /dev/null
@@ -1,114 +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 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
deleted file mode 100644
index 1acb07e076dc..000000000000
--- a/autodoc/inc/ary/arygroup.hxx
+++ /dev/null
@@ -1,110 +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 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
deleted file mode 100644
index 9dcd1599f92d..000000000000
--- a/autodoc/inc/ary/ceslot.hxx
+++ /dev/null
@@ -1,106 +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 ARY_CESLOT_HXX
-#define ARY_CESLOT_HXX
-//  KORR_DEPRECATED_3.0
-
-
-// USED SERVICES
-    // BASE CLASSES
-    // COMPONENTS
-    // PARAMETERS
-
-namespace ary
-{
-
-class Display;
-
-/** differentiation of 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
deleted file mode 100644
index cc402ae25eac..000000000000
--- a/autodoc/inc/ary/cessentl.hxx
+++ /dev/null
@@ -1,91 +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 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
deleted file mode 100644
index 0fff94d1e5fc..000000000000
--- a/autodoc/inc/ary/cpp/c_builtintype.hxx
+++ /dev/null
@@ -1,100 +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 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
deleted file mode 100644
index 5f7e6353e90a..000000000000
--- a/autodoc/inc/ary/cpp/c_ce.hxx
+++ /dev/null
@@ -1,106 +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 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
deleted file mode 100644
index 49b75b72902f..000000000000
--- a/autodoc/inc/ary/cpp/c_class.hxx
+++ /dev/null
@@ -1,248 +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 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
deleted file mode 100644
index fab3d2f728fe..000000000000
--- a/autodoc/inc/ary/cpp/c_cppentity.hxx
+++ /dev/null
@@ -1,94 +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 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
deleted file mode 100644
index 8426222ab3b4..000000000000
--- a/autodoc/inc/ary/cpp/c_de.hxx
+++ /dev/null
@@ -1,107 +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 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
deleted file mode 100644
index 460ddb79ac1b..000000000000
--- a/autodoc/inc/ary/cpp/c_define.hxx
+++ /dev/null
@@ -1,85 +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 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
deleted file mode 100644
index 4704c700773f..000000000000
--- a/autodoc/inc/ary/cpp/c_enum.hxx
+++ /dev/null
@@ -1,119 +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 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
deleted file mode 100644
index 3ed523baa3f3..000000000000
--- a/autodoc/inc/ary/cpp/c_enuval.hxx
+++ /dev/null
@@ -1,99 +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 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
deleted file mode 100644
index 917ff823f151..000000000000
--- a/autodoc/inc/ary/cpp/c_funct.hxx
+++ /dev/null
@@ -1,152 +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 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
deleted file mode 100644
index df0af5afbd19..000000000000
--- a/autodoc/inc/ary/cpp/c_gate.hxx
+++ /dev/null
@@ -1,124 +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 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
deleted file mode 100644
index 8740c2e94015..000000000000
--- a/autodoc/inc/ary/cpp/c_macro.hxx
+++ /dev/null
@@ -1,87 +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 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
deleted file mode 100644
index d15c526394f3..000000000000
--- a/autodoc/inc/ary/cpp/c_namesp.hxx
+++ /dev/null
@@ -1,197 +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 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
deleted file mode 100644
index 4434f65b877e..000000000000
--- a/autodoc/inc/ary/cpp/c_osigna.hxx
+++ /dev/null
@@ -1,125 +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 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
deleted file mode 100644
index 3ce842494304..000000000000
--- a/autodoc/inc/ary/cpp/c_slntry.hxx
+++ /dev/null
@@ -1,113 +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 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
deleted file mode 100644
index 060b0d2ea0ce..000000000000
--- a/autodoc/inc/ary/cpp/c_traits.hxx
+++ /dev/null
@@ -1,219 +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 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
deleted file mode 100644
index eefbda569484..000000000000
--- a/autodoc/inc/ary/cpp/c_tydef.hxx
+++ /dev/null
@@ -1,103 +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 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
deleted file mode 100644
index 513ec0cefb5f..000000000000
--- a/autodoc/inc/ary/cpp/c_type.hxx
+++ /dev/null
@@ -1,136 +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 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
deleted file mode 100644
index 2d39819ae458..000000000000
--- a/autodoc/inc/ary/cpp/c_types4cpp.hxx
+++ /dev/null
@@ -1,137 +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 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
deleted file mode 100644
index e8b2e442486e..000000000000
--- a/autodoc/inc/ary/cpp/c_vari.hxx
+++ /dev/null
@@ -1,117 +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 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
deleted file mode 100644
index c198dac67267..000000000000
--- a/autodoc/inc/ary/cpp/c_vfflag.hxx
+++ /dev/null
@@ -1,154 +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 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
deleted file mode 100644
index cb86e44b17d4..000000000000
--- a/autodoc/inc/ary/cpp/cp_ce.hxx
+++ /dev/null
@@ -1,176 +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 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
deleted file mode 100644
index 8fd44074523b..000000000000
--- a/autodoc/inc/ary/cpp/cp_def.hxx
+++ /dev/null
@@ -1,102 +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 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
deleted file mode 100644
index edc536fcea71..000000000000
--- a/autodoc/inc/ary/cpp/cp_type.hxx
+++ /dev/null
@@ -1,99 +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 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
deleted file mode 100644
index 9fea2e2053b7..000000000000
--- a/autodoc/inc/ary/cpp/inpcontx.hxx
+++ /dev/null
@@ -1,219 +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 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
deleted file mode 100644
index 9e85b4ee4b0d..000000000000
--- a/autodoc/inc/ary/cpp/namechain.hxx
+++ /dev/null
@@ -1,143 +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 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
deleted file mode 100644
index b7f6d68ac4cc..000000000000
--- a/autodoc/inc/ary/cpp/usedtype.hxx
+++ /dev/null
@@ -1,215 +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 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
deleted file mode 100644
index 1bf7bc3e307e..000000000000
--- a/autodoc/inc/ary/doc/d_boolean.hxx
+++ /dev/null
@@ -1,99 +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 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_oldcppdocu.hxx b/autodoc/inc/ary/doc/d_oldcppdocu.hxx
deleted file mode 100644
index 0429ab312d66..000000000000
--- a/autodoc/inc/ary/doc/d_oldcppdocu.hxx
+++ /dev/null
@@ -1,133 +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 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/loc/loc_dir.hxx b/autodoc/inc/ary/loc/loc_dir.hxx
deleted file mode 100644
index f8abf70cf062..000000000000
--- a/autodoc/inc/ary/loc/loc_dir.hxx
+++ /dev/null
@@ -1,148 +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 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
deleted file mode 100644
index 1afdd650a7c1..000000000000
--- a/autodoc/inc/ary/loc/loc_file.hxx
+++ /dev/null
@@ -1,71 +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 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
deleted file mode 100644
index 04550d4c8da4..000000000000
--- a/autodoc/inc/ary/loc/loc_filebase.hxx
+++ /dev/null
@@ -1,75 +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 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
deleted file mode 100644
index b2c0e602083e..000000000000
--- a/autodoc/inc/ary/loc/loc_le.hxx
+++ /dev/null
@@ -1,97 +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 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
deleted file mode 100644
index e8b3a66b6209..000000000000
--- a/autodoc/inc/ary/loc/loc_root.hxx
+++ /dev/null
@@ -1,113 +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 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
deleted file mode 100644
index d07fdeebf334..000000000000
--- a/autodoc/inc/ary/loc/loc_traits.hxx
+++ /dev/null
@@ -1,118 +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 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
deleted file mode 100644
index 64b2a0b76261..000000000000
--- a/autodoc/inc/ary/loc/loc_types4loc.hxx
+++ /dev/null
@@ -1,57 +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 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
deleted file mode 100644
index 1d6f201cdf6b..000000000000
--- a/autodoc/inc/ary/loc/locp_le.hxx
+++ /dev/null
@@ -1,91 +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 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/sequentialids.hxx b/autodoc/inc/ary/sequentialids.hxx
deleted file mode 100644
index 828ad1f310e1..000000000000
--- a/autodoc/inc/ary/sequentialids.hxx
+++ /dev/null
@@ -1,156 +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 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/symtreenode.hxx b/autodoc/inc/ary/symtreenode.hxx
deleted file mode 100644
index 8686e8837197..000000000000
--- a/autodoc/inc/ary/symtreenode.hxx
+++ /dev/null
@@ -1,347 +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 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 children 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/autodoc/displaying.hxx b/autodoc/inc/autodoc/displaying.hxx
index 96bd66c0ad71..b16fa84a810c 100644
--- a/autodoc/inc/autodoc/displaying.hxx
+++ b/autodoc/inc/autodoc/displaying.hxx
@@ -40,7 +40,6 @@ namespace display
 namespace autodoc
 {
 
-class HtmlDisplay_UdkStd;
 class HtmlDisplay_Idl_Ifc;
 
 // class TextDisplay_FunctionList_Ifc;
@@ -59,8 +58,6 @@ class DisplayToolsFactory_Ifc
 //    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;
 
diff --git a/autodoc/inc/autodoc/dsp_html_std.hxx b/autodoc/inc/autodoc/dsp_html_std.hxx
index 78d75efe7e23..b674b2651dda 100644
--- a/autodoc/inc/autodoc/dsp_html_std.hxx
+++ b/autodoc/inc/autodoc/dsp_html_std.hxx
@@ -33,10 +33,6 @@
 
 namespace ary
 {
-    namespace cpp
-    {
-        class Gate;
-    }
     namespace idl
     {
         class Gate;
@@ -52,127 +48,6 @@ namespace display
 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
diff --git a/autodoc/inc/autodoc/parsing.hxx b/autodoc/inc/autodoc/parsing.hxx
index d0073af86731..a91d9b197f73 100644
--- a/autodoc/inc/autodoc/parsing.hxx
+++ b/autodoc/inc/autodoc/parsing.hxx
@@ -34,7 +34,6 @@
 namespace autodoc
 {
 
-class CodeParser_Ifc;
 class DocumentationParser_Ifc;
 class FileCollector_Ifc;
 
@@ -49,19 +48,6 @@ class 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;
 
diff --git a/autodoc/inc/autodoc/prs_code.hxx b/autodoc/inc/autodoc/prs_code.hxx
deleted file mode 100644
index 982fa91c6f79..000000000000
--- a/autodoc/inc/autodoc/prs_code.hxx
+++ /dev/null
@@ -1,79 +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 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/prj/build.lst b/autodoc/prj/build.lst
index c6ae87451fe2..d74fe9e0c9f1 100644
--- a/autodoc/prj/build.lst
+++ b/autodoc/prj/build.lst
@@ -1,22 +1,17 @@
 ar	autodoc	:  cosv udm sal 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\kernel			nmake	-	all	ar_sr_cinfo 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\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\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\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
+ar	autodoc\source\exes\adc_uni			nmake	-	all	ar_se_uni ar_sr_doc ar_sr_idl ar_sr_info ar_sr_kernel ar_sr_cinfo ar_sd_html ar_sd_kernel ar_sd_idl ar_sp_krnl ar_sp_tok ar_sp2_idl ar_sd_tkit ar_sp2_idoc ar_sp2_tok ar_st NULL
diff --git a/autodoc/source/ary/cpp/c_builtintype.cxx b/autodoc/source/ary/cpp/c_builtintype.cxx
deleted file mode 100644
index f6168f197856..000000000000
--- a/autodoc/source/ary/cpp/c_builtintype.cxx
+++ /dev/null
@@ -1,130 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index 33aa04a8c5ac..000000000000
--- a/autodoc/source/ary/cpp/c_class.cxx
+++ /dev/null
@@ -1,287 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index 704bc697e239..000000000000
--- a/autodoc/source/ary/cpp/c_de.cxx
+++ /dev/null
@@ -1,54 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index 6ea6b8f6a04f..000000000000
--- a/autodoc/source/ary/cpp/c_define.cxx
+++ /dev/null
@@ -1,79 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index e4f8ad15983c..000000000000
--- a/autodoc/source/ary/cpp/c_enum.cxx
+++ /dev/null
@@ -1,137 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index 1641689895d4..000000000000
--- a/autodoc/source/ary/cpp/c_enuval.cxx
+++ /dev/null
@@ -1,90 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index 514e294f2bef..000000000000
--- a/autodoc/source/ary/cpp/c_funct.cxx
+++ /dev/null
@@ -1,250 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index 2fad2c0fe5aa..000000000000
--- a/autodoc/source/ary/cpp/c_macro.cxx
+++ /dev/null
@@ -1,81 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index 133f8e96c812..000000000000
--- a/autodoc/source/ary/cpp/c_namesp.cxx
+++ /dev/null
@@ -1,295 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index 463c84b1f5f7..000000000000
--- a/autodoc/source/ary/cpp/c_osigna.cxx
+++ /dev/null
@@ -1,79 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index 05fb5947e259..000000000000
--- a/autodoc/source/ary/cpp/c_reposypart.cxx
+++ /dev/null
@@ -1,526 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index c3b200f1f71b..000000000000
--- a/autodoc/source/ary/cpp/c_reposypart.hxx
+++ /dev/null
@@ -1,117 +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 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
deleted file mode 100644
index e93b25c60d5c..000000000000
--- a/autodoc/source/ary/cpp/c_slots.cxx
+++ /dev/null
@@ -1,109 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index dab4f5d4552f..000000000000
--- a/autodoc/source/ary/cpp/c_slots.hxx
+++ /dev/null
@@ -1,87 +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 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
deleted file mode 100644
index e0bd26a06685..000000000000
--- a/autodoc/source/ary/cpp/c_traits.cxx
+++ /dev/null
@@ -1,226 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index 60f67e7e6c30..000000000000
--- a/autodoc/source/ary/cpp/c_tydef.cxx
+++ /dev/null
@@ -1,97 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index 5006748f65c9..000000000000
--- a/autodoc/source/ary/cpp/c_vari.cxx
+++ /dev/null
@@ -1,99 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index b2ceb27dc41a..000000000000
--- a/autodoc/source/ary/cpp/ca_ce.cxx
+++ /dev/null
@@ -1,623 +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.
- *
- ************************************************************************/
-
-
-#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();
-
-    if (NOT (it == it_end) )
-    {
-        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
deleted file mode 100644
index 00e722b170c4..000000000000
--- a/autodoc/source/ary/cpp/ca_ce.hxx
+++ /dev/null
@@ -1,216 +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 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
deleted file mode 100644
index 8a2daa8dd9ea..000000000000
--- a/autodoc/source/ary/cpp/ca_def.cxx
+++ /dev/null
@@ -1,114 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index 254ad1797b1b..000000000000
--- a/autodoc/source/ary/cpp/ca_def.hxx
+++ /dev/null
@@ -1,118 +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 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
deleted file mode 100644
index 29117aea7cd0..000000000000
--- a/autodoc/source/ary/cpp/ca_type.cxx
+++ /dev/null
@@ -1,139 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index 123912d7c389..000000000000
--- a/autodoc/source/ary/cpp/ca_type.hxx
+++ /dev/null
@@ -1,130 +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 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
deleted file mode 100644
index 3b4828b67230..000000000000
--- a/autodoc/source/ary/cpp/cs_ce.cxx
+++ /dev/null
@@ -1,107 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index a741f0d86c09..000000000000
--- a/autodoc/source/ary/cpp/cs_ce.hxx
+++ /dev/null
@@ -1,108 +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 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
deleted file mode 100644
index 713c2aaa63d8..000000000000
--- a/autodoc/source/ary/cpp/cs_def.cxx
+++ /dev/null
@@ -1,89 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index cfd6b5c61b53..000000000000
--- a/autodoc/source/ary/cpp/cs_def.hxx
+++ /dev/null
@@ -1,110 +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 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
deleted file mode 100644
index a5c6791a7ec2..000000000000
--- a/autodoc/source/ary/cpp/cs_type.cxx
+++ /dev/null
@@ -1,115 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index c1f1568cb097..000000000000
--- a/autodoc/source/ary/cpp/cs_type.hxx
+++ /dev/null
@@ -1,141 +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 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
deleted file mode 100644
index 5c20a59bd82e..000000000000
--- a/autodoc/source/ary/cpp/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General 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
deleted file mode 100644
index 4df64afe3deb..000000000000
--- a/autodoc/source/ary/cpp/namechain.cxx
+++ /dev/null
@@ -1,199 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index c22fb78e4787..000000000000
--- a/autodoc/source/ary/cpp/tplparam.cxx
+++ /dev/null
@@ -1,77 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index a720eff22776..000000000000
--- a/autodoc/source/ary/cpp/tplparam.hxx
+++ /dev/null
@@ -1,87 +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 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
deleted file mode 100644
index bde91e5b644b..000000000000
--- a/autodoc/source/ary/cpp/usedtype.cxx
+++ /dev/null
@@ -1,578 +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.
- *
- ************************************************************************/
-
-#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
deleted file mode 100644
index 163f5ef0c8e6..000000000000
--- a/autodoc/source/ary/doc/d_boolean.cxx
+++ /dev/null
@@ -1,58 +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.
- *
- ************************************************************************/
-
-#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_oldcppdocu.cxx b/autodoc/source/ary/doc/d_oldcppdocu.cxx
deleted file mode 100644
index 17d2edcb298a..000000000000
--- a/autodoc/source/ary/doc/d_oldcppdocu.cxx
+++ /dev/null
@@ -1,339 +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.
- *
- ************************************************************************/
-
-#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/makefile.mk b/autodoc/source/ary/doc/makefile.mk
index 21989dcc5827..d8e23e369def 100644
--- a/autodoc/source/ary/doc/makefile.mk
+++ b/autodoc/source/ary/doc/makefile.mk
@@ -46,10 +46,8 @@ PRJINC=$(PRJ)$/source
 
 
 OBJFILES= \
-    $(OBJ)$/d_boolean.obj           \
     $(OBJ)$/d_docu.obj              \
     $(OBJ)$/d_node.obj              \
-    $(OBJ)$/d_oldcppdocu.obj        \
     $(OBJ)$/d_oldidldocu.obj
 
 
diff --git a/autodoc/source/ary/inc/cpp_internalgate.hxx b/autodoc/source/ary/inc/cpp_internalgate.hxx
deleted file mode 100644
index a2d4532c71ed..000000000000
--- a/autodoc/source/ary/inc/cpp_internalgate.hxx
+++ /dev/null
@@ -1,69 +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 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/reposy.hxx b/autodoc/source/ary/inc/reposy.hxx
index 8668d2e47ef3..bc5466317b3e 100644
--- a/autodoc/source/ary/inc/reposy.hxx
+++ b/autodoc/source/ary/inc/reposy.hxx
@@ -36,10 +36,6 @@
 
 namespace ary
 {
-namespace cpp
-{
-    class InternalGate;
-}
 namespace idl
 {
     class InternalGate;
@@ -67,10 +63,8 @@ class RepositoryCenter : public ::ary::Repository
 
     // 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 );
 
@@ -79,8 +73,6 @@ class RepositoryCenter : public ::ary::Repository
     String              sDisplayedName;     /// Name to be displayed for human users.
     csv::ploc::Directory
                         aLocation;
-    Dyn<cpp::InternalGate>
-                        pCppPartition;
     Dyn<idl::InternalGate>
                         pIdlPartition;
 };
diff --git a/autodoc/source/ary/inc/slots.hxx b/autodoc/source/ary/inc/slots.hxx
deleted file mode 100644
index bcba75defda9..000000000000
--- a/autodoc/source/ary/inc/slots.hxx
+++ /dev/null
@@ -1,166 +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 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/kernel/ary_disp.cxx b/autodoc/source/ary/kernel/ary_disp.cxx
deleted file mode 100644
index b9608f2f547a..000000000000
--- a/autodoc/source/ary/kernel/ary_disp.cxx
+++ /dev/null
@@ -1,111 +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.
- *
- ************************************************************************/
-
-#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