[Libreoffice-commits] .: 11 commits - cross_tail_build/prj Makefile.top Repository.mk RepositoryModule_ooo.mk sal/inc sal/prj sal/qa scripting/README scripting/source sc/source setup_native/prj solenv/gbuild solenv/inc soltools/mkdepend stoc/InternalUnoApi_bootstrap.mk stoc/source stoc/test sysui/prj xml2cmp/Executable_xml2cmp.mk xml2cmp/Makefile xml2cmp/Module_xml2cmp.mk xml2cmp/prj xml2cmp/README xml2cmp/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Oct 3 09:27:03 PDT 2012


 Makefile.top                                           |    1 
 Repository.mk                                          |    1 
 RepositoryModule_ooo.mk                                |    1 
 cross_tail_build/prj/build.lst                         |    2 
 sal/inc/rtl/ustrbuf.hxx                                |   19 
 sal/prj/build.lst                                      |    2 
 sal/qa/rtl_strings/rtl_OUStringBuffer.cxx              |   14 
 sc/source/ui/docshell/docfunc.cxx                      |    2 
 scripting/README                                       |    5 
 scripting/source/runtimemgr/ScriptExecDialog.hrc       |   19 
 scripting/source/runtimemgr/ScriptExecDialog.src       |   27 
 scripting/source/runtimemgr/ScriptNameResolverImpl.cxx |  611 -----------------
 scripting/source/runtimemgr/ScriptNameResolverImpl.hxx |  103 --
 scripting/source/runtimemgr/ScriptRuntimeManager.cxx   |  466 ------------
 scripting/source/runtimemgr/ScriptRuntimeManager.hxx   |  142 ---
 scripting/source/runtimemgr/StorageBridge.cxx          |  124 ---
 scripting/source/runtimemgr/StorageBridge.hxx          |   78 --
 scripting/source/runtimemgr/StorageBridgeFactory.cxx   |   59 -
 scripting/source/runtimemgr/StorageBridgeFactory.hxx   |   51 -
 scripting/source/runtimemgr/makefile.mk                |   39 -
 scripting/source/runtimemgr/runtimemgr.xml             |   64 -
 setup_native/prj/build.lst                             |    2 
 solenv/gbuild/InternalUnoApi.mk                        |    4 
 solenv/gbuild/UnoApiTarget.mk                          |   24 
 solenv/inc/rules.mk                                    |    4 
 solenv/inc/settings.mk                                 |   47 -
 solenv/inc/target.mk                                   |   62 -
 solenv/inc/tg_dep.mk                                   |    3 
 soltools/mkdepend/collectdircontent.cxx                |    8 
 soltools/mkdepend/collectdircontent.hxx                |   14 
 stoc/InternalUnoApi_bootstrap.mk                       |   69 +
 stoc/source/bootstrap/bootstrap.xml                    |  375 ----------
 stoc/test/excomp/example/ExampleComponent1.idl         |   34 
 stoc/test/excomp/example/ExampleComponent2.idl         |   34 
 stoc/test/excomp/example/XTest.idl                     |   40 -
 stoc/test/excomp/excomp.cxx                            |  123 ---
 stoc/test/excomp/excomp1.cxx                           |  201 -----
 stoc/test/excomp/excomp1.xml                           |   48 -
 stoc/test/excomp/excomp2.cxx                           |  272 -------
 stoc/test/excomp/excomp2.xml                           |   48 -
 stoc/test/excomp/exports.dxp                           |    2 
 stoc/test/excomp/makefile.mk                           |  119 ---
 sysui/prj/build.lst                                    |    2 
 xml2cmp/Executable_xml2cmp.mk                          |   49 -
 xml2cmp/Makefile                                       |    7 
 xml2cmp/Module_xml2cmp.mk                              |   38 -
 xml2cmp/README                                         |    3 
 xml2cmp/prj/build.lst                                  |    2 
 xml2cmp/source/finder/dep_main.cxx                     |   88 --
 xml2cmp/source/inc/precomp.h                           |   45 -
 xml2cmp/source/support/badcast.cxx                     |   43 -
 xml2cmp/source/support/cmdline.cxx                     |  161 ----
 xml2cmp/source/support/cmdline.hxx                     |   71 -
 xml2cmp/source/support/heap.cxx                        |  194 -----
 xml2cmp/source/support/heap.hxx                        |   83 --
 xml2cmp/source/support/list.hxx                        |  244 ------
 xml2cmp/source/support/sistr.cxx                       |  393 ----------
 xml2cmp/source/support/sistr.hxx                       |  141 ---
 xml2cmp/source/support/syshelp.cxx                     |  307 --------
 xml2cmp/source/support/syshelp.hxx                     |   78 --
 xml2cmp/source/xcd/cr_html.cxx                         |  261 -------
 xml2cmp/source/xcd/cr_html.hxx                         |   92 --
 xml2cmp/source/xcd/cr_metho.cxx                        |   97 --
 xml2cmp/source/xcd/cr_metho.hxx                        |   31 
 xml2cmp/source/xcd/dependy.cxx                         |  218 ------
 xml2cmp/source/xcd/dependy.hxx                         |  109 ---
 xml2cmp/source/xcd/filebuff.cxx                        |   60 -
 xml2cmp/source/xcd/filebuff.hxx                        |   48 -
 xml2cmp/source/xcd/main.cxx                            |  248 ------
 xml2cmp/source/xcd/parse.cxx                           |  440 ------------
 xml2cmp/source/xcd/parse.hxx                           |  136 ---
 xml2cmp/source/xcd/xmlelem.cxx                         |  251 ------
 xml2cmp/source/xcd/xmlelem.hxx                         |  229 ------
 xml2cmp/source/xcd/xmltree.cxx                         |  233 ------
 xml2cmp/source/xcd/xmltree.hxx                         |  136 ---
 75 files changed, 122 insertions(+), 7779 deletions(-)

New commits:
commit 70216212dac0643b601d005386f0fd37fc19834a
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Oct 3 17:17:41 2012 +0200

    changing conditional formats invalids the stream
    
    Change-Id: I5d0137ebfa53cfbe37f7ad33c3400e75e2e3a05a

diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index f44fcd5..41fdfe6 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -5069,6 +5069,7 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong nOldFormat, ScConditionalFor
     if(nOldFormat)
     {
         pDoc->DeleteConditionalFormat(nOldFormat, nTab);
+        pDoc->SetStreamValid(nTab, false);
     }
     if(pFormat)
     {
@@ -5082,6 +5083,7 @@ void ScDocFunc::ReplaceConditionalFormat( sal_uLong nOldFormat, ScConditionalFor
 	size_t n = rRanges.size();
 	for(size_t i = 0; i < n; ++i)
 	    pFormat->DoRepaint(rRanges[i]);
+        pDoc->SetStreamValid(nTab, false);
     }
     aModificator.SetDocumentModified();
     SFX_APP()->Broadcast(SfxSimpleHint(SC_HINT_AREAS_CHANGED));
commit 563fa900ba22bf83dfa58e67807ed0337f810576
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Oct 3 05:14:18 2012 +0200

    add rtl::OUStringBuffer::append(bool)
    
    Change-Id: I2cbb4d126b27c5cb7a1be3606807fcbda25d3e72

diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index a11dff1..0b4586b 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -501,6 +501,25 @@ public:
     }
 
     /**
+        Appends the string representation of the <code>bool</code>
+        argument to the string buffer.
+
+        The argument is converted to a string as if by the method
+        <code>String.valueOf</code>, and the characters of that
+        string are then appended to this string buffer.
+
+        @param   b   a <code>bool</code>.
+        @return  this string buffer.
+
+        @since LibreOffice 3.7
+     */
+    OUStringBuffer & append(bool b)
+    {
+        sal_Unicode sz[RTL_USTR_MAX_VALUEOFBOOLEAN];
+        return append( sz, rtl_ustr_valueOfBoolean( sz, b ) );
+    }
+
+    /**
         Appends the string representation of the <code>sal_Bool</code>
         argument to the string buffer.
 
commit d9757d71e89711efa35e2e559d682f8dabeb814f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Oct 3 05:13:13 2012 +0200

    fix indentation
    
    Change-Id: I43bad91f6afe5b55c6e2b6bf952cc0291d5bdd10

diff --git a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
index 58cf2ca..d40306d 100644
--- a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
+++ b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
@@ -1172,25 +1172,25 @@ sal_Bool SAL_CALL test_rtl_OUStringBuffer_append_004(
     {"Appends the sal_Bool(sal_True) to the string buffer arrOUS[1]",
                 new OUString(aUStr47),
                 new OUStringBuffer(arrOUS[1]), sal_True },
-        {"Appends the sal_Bool(sal_False) to the string buffer arrOUS[1]",
+    {"Appends the sal_Bool(sal_False) to the string buffer arrOUS[1]",
                 new OUString(aUStr48),
                 new OUStringBuffer(arrOUS[1]), sal_False },
-        {"Appends the sal_Bool(sal_True) to the string buffer arrOUS[2]",
+    {"Appends the sal_Bool(sal_True) to the string buffer arrOUS[2]",
                 new OUString(aUStr47),
                 new OUStringBuffer(arrOUS[2]), sal_True },
-        {"Appends the sal_Bool(sal_False) to the string buffer arrOUS[2]",
+    {"Appends the sal_Bool(sal_False) to the string buffer arrOUS[2]",
                 new OUString(aUStr48),
                 new OUStringBuffer(arrOUS[2]), sal_False },
-        {"Appends the sal_Bool(sal_True) to the string buffer arrOUS[3]",
+    {"Appends the sal_Bool(sal_True) to the string buffer arrOUS[3]",
                 new OUString(aUStr47),
                 new OUStringBuffer(arrOUS[3]), sal_True },
-        {"Appends the sal_Bool(sal_False) to the string buffer arrOUS[3]",
+    {"Appends the sal_Bool(sal_False) to the string buffer arrOUS[3]",
                 new OUString(aUStr48),
                 new OUStringBuffer(arrOUS[3]), sal_False },
-        {"Appends the sal_Bool(sal_True) to the string buffer arrOUS[4]",
+    {"Appends the sal_Bool(sal_True) to the string buffer arrOUS[4]",
                 new OUString(aUStr49),
                 new OUStringBuffer(arrOUS[4]), sal_True },
-        {"Appends the sal_Bool(sal_False) to the string buffer arrOUS[4]",
+    {"Appends the sal_Bool(sal_False) to the string buffer arrOUS[4]",
                 new OUString(aUStr50),
                 new OUStringBuffer(arrOUS[4]), sal_False }
     };
commit f9b4426b9783eb989878bbb3c71f245b1cc5b780
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 3 13:40:05 2012 +0200

    xml2cmp no longer used
    
    Change-Id: Idba65371b8778521bc767fe4893340cf13a8ff3b

diff --git a/Makefile.top b/Makefile.top
index 3e6f2c4..b3937ae 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -190,7 +190,6 @@ writerfilter\
 writerperfect\
 x11_extensions\
 xmerge\
-xml2cmp\
 xmlhelp\
 xmloff\
 xmlreader\
diff --git a/Repository.mk b/Repository.mk
index a4daa93..70cf306 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -74,7 +74,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     uiex \
     ulfconv \
     ulfex \
-    xml2cmp \
     xpdfimport \
     xrmex \
 ))
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 8be0d6e..b10b323 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -190,7 +190,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     writerperfect \
 	$(call gb_Helper_optional,X11_EXTENSIONS,x11_extensions) \
     xmerge \
-    xml2cmp \
 	$(call gb_Helper_optional,DESKTOP,xmlhelp) \
     xmloff \
     xmlreader \
diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst
index 995bae7..308c851 100644
--- a/cross_tail_build/prj/build.lst
+++ b/cross_tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBLANGTAG:liblangtag LIBXML2:libxml2 LIBXSLT:libxslt sal solenv soltools NATIVE:xml2cmp ZLIB:zlib NULL
+ctb	cross_tail_build	::	BERKELEYDB:berkeleydb BOOST:boost CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBLANGTAG:liblangtag LIBXML2:libxml2 LIBXSLT:libxslt sal solenv soltools ZLIB:zlib NULL
 ctb tail_build\prj nmake - all ctb_prj   NULL
diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index e9234c4..b91a41b 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -1,2 +1,2 @@
-sa	sal	:	NATIVE:xml2cmp external BOOST:boost CPPUNIT:cppunit NULL
+sa	sal	: external BOOST:boost CPPUNIT:cppunit NULL
 sa	sal\prj				nmake	-	all	sa_prj NULL
diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst
index 701f8ed..24d973c 100644
--- a/setup_native/prj/build.lst
+++ b/setup_native/prj/build.lst
@@ -1,4 +1,4 @@
-pk	setup_native	:	TRANSLATIONS:translations DESKTOP:l10ntools soltools sal NATIVE:xml2cmp NULL
+pk	setup_native	:	TRANSLATIONS:translations DESKTOP:l10ntools soltools sal NULL
 pk  setup_native                                          usr1    - all  sn_mkout NULL
 pk  setup_native\scripts\source                           nmake   -  u   sn_source NULL
 pk  setup_native\scripts                                  nmake   -  u   sn_scripts sn_source.u NULL
diff --git a/sysui/prj/build.lst b/sysui/prj/build.lst
index 0823776..c6ca96f 100644
--- a/sysui/prj/build.lst
+++ b/sysui/prj/build.lst
@@ -1,4 +1,4 @@
-su	sysui	:	TRANSLATIONS:translations offapi NATIVE:xml2cmp DESKTOP:rdbmaker DESKTOP:l10ntools NULL
+su	sysui	:	TRANSLATIONS:translations offapi DESKTOP:rdbmaker DESKTOP:l10ntools NULL
 #su	sysui\source\win32\QuickStart		nmake	-	w	su_win32_quickstart NULL
 #su	sysui\source\win32\QuickStart\so	nmake	-	w	su_win32_quickstart_so su_win32_quickstart.w NULL
 su	sysui\desktop\icons					nmake	-	w	su_iconsw NULL
diff --git a/xml2cmp/Executable_xml2cmp.mk b/xml2cmp/Executable_xml2cmp.mk
deleted file mode 100644
index 6003029..0000000
--- a/xml2cmp/Executable_xml2cmp.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# 	Peter Foley <pefoley2 at verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-
-$(eval $(call gb_Executable_Executable,xml2cmp))
-
-$(eval $(call gb_Executable_add_exception_objects,xml2cmp,\
-	xml2cmp/source/xcd/main \
-	xml2cmp/source/support/cmdline \
-	xml2cmp/source/support/heap \
-	xml2cmp/source/support/sistr \
-	xml2cmp/source/support/syshelp \
-	xml2cmp/source/support/badcast \
-	xml2cmp/source/xcd/cr_html \
-	xml2cmp/source/xcd/cr_metho \
-	xml2cmp/source/xcd/filebuff \
-	xml2cmp/source/xcd/parse \
-	xml2cmp/source/xcd/xmlelem \
-	xml2cmp/source/xcd/xmltree \
-	xml2cmp/source/xcd/dependy \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/xml2cmp/Makefile b/xml2cmp/Makefile
deleted file mode 100644
index ccb1c85..0000000
--- a/xml2cmp/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/xml2cmp/Module_xml2cmp.mk b/xml2cmp/Module_xml2cmp.mk
deleted file mode 100644
index c4279fb..0000000
--- a/xml2cmp/Module_xml2cmp.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# 	Peter Foley <pefoley2 at verizon.net>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-
-$(eval $(call gb_Module_Module,xml2cmp))
-
-ifneq ($(CROSS_COMPILING),YES)
-$(eval $(call gb_Module_add_targets,xml2cmp,\
-	Executable_xml2cmp \
-))
-endif
-
diff --git a/xml2cmp/README b/xml2cmp/README
deleted file mode 100644
index d8e12d4..0000000
--- a/xml2cmp/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Part of the LibreOffice SDK.
-
-Mostly used by makefiles to pull out types from xml.
diff --git a/xml2cmp/prj/build.lst b/xml2cmp/prj/build.lst
deleted file mode 100644
index b486de7..0000000
--- a/xml2cmp/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-xc  xml2cmp : solenv NULL
-xc  xml2cmp\prj nmake -	all xc_prj NULL
diff --git a/xml2cmp/prj/d.lst b/xml2cmp/prj/d.lst
deleted file mode 100644
index e69de29..0000000
diff --git a/xml2cmp/source/finder/dep_main.cxx b/xml2cmp/source/finder/dep_main.cxx
deleted file mode 100644
index 33fd7fc..0000000
--- a/xml2cmp/source/finder/dep_main.cxx
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <iostream>
-
-#include "dependy.hxx"
-
-
-int
-#ifdef WNT
-_cdecl
-#endif
-main( int       argc,
-      char *    argv[] )
-{
-    if (argc < 2 || *argv[1] == '?')
-    {
-        std::cout << "\nUse:\n"
-             << "srvdepy.exe  <xml-component-descriptions-root-directory>\n"
-             << std::endl;
-        return 0;
-    }
-
-
-    DependencyFinder aDependencies;
-
-    aDependencies.GatherData(argv[1]);
-    char sInput[500] = "";
-    std::vector<Simstr>  aLibs;
-    std::vector<Simstr>  aServs;
-
-
-    std::cout
-         << "\nNow you can start to put in Service names.\n"
-         << "Please use correct case, but don't use namespaces.\n"
-         << "Just the Service's own name.\n\n"
-         << "To stop the program, put in a hashmark \"#\" + ENTER.\n"
-         << std::endl;
-
-
-
-    do {
-
-        sInput[0] = 0;
-        std::cin >> sInput;
-        Simstr sImplService(sInput);
-        if (*sInput != '#')
-        {
-            aLibs.erase( aLibs.begin(), aLibs.end() );
-            aServs.erase( aServs.begin(), aServs.end() );
-
-            aDependencies.FindNeededServices( aLibs, aServs, sImplService );
-
-            std::cout << "\n\n\nNeeded libraries: " << std::endl;
-            for ( unsigned i = 0; i < aLibs.size(); ++i )
-            {
-                std::cout << "    " << aLibs[i].str() << std::endl;
-            }
-            std::cout << "\nNeeded services: " << std::endl;
-            for ( unsigned s= 0; s < aServs.size(); ++s )
-            {
-                std::cout << "    " << aServs[s].str() << std::endl;
-            }
-            std::cout << "\n\n" << std::endl;
-        }
-    }   while (*sInput != '#');
-
-    return 0;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/inc/precomp.h b/xml2cmp/source/inc/precomp.h
deleted file mode 100644
index aa7f115..0000000
--- a/xml2cmp/source/inc/precomp.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef CPV_PRECOMP_H
-#define CPV_PRECOMP_H
-
-typedef short       Bool;
-#define True        1
-#define False       0
-
-
-
-typedef long        intt;
-
-#define AND &&
-#define OR  ||
-#define NOT !
-
-
-#define REF( x )  (&(x))
-#define THIS_       pThis
-
-
-
-#endif
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/badcast.cxx b/xml2cmp/source/support/badcast.cxx
deleted file mode 100644
index 09afc27..0000000
--- a/xml2cmp/source/support/badcast.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-
-/* Include this for instantiating bad-cast,
-   due to problems with WNT-STL-headers.
-*/
-
-// If anybody who happens to read this has any idea what dark magic
-// this is supposed to achieve, and whether it is needed or in any way
-// relevant with MSVC2008 (or eventually newer), please add a
-// comment...
-
-#if defined(WNT) && !defined(__MINGW32__)
-
-#define _NTSDK
-#include<typeinfo>
-
-_STD_BEGIN
-bad_cast G_Dummy_Inst_bad_cast;
-_STD_END
-#endif // WNT
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/cmdline.cxx b/xml2cmp/source/support/cmdline.cxx
deleted file mode 100644
index cdf484f..0000000
--- a/xml2cmp/source/support/cmdline.cxx
+++ /dev/null
@@ -1,161 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "cmdline.hxx"
-
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <iostream>
-
-
-char C_sUseText[] = "Use: xml2cmp.exe \n"
-                    "        [-dep <xml-component-descriptions-root-directory> \n"
-                    "        [-func funcFile] \n"
-                    "        [-html htmlFile] \n"
-                    "        [-types typeFile] \n"
-                    "        [-idlpath idlPath] \n"
-                    "        Xml_FileName\n";
-
-
-char C_sCmdFunc[]       = "-func";
-char C_sCmdDep[]       = "-dep";
-char C_sCmdHtml[]       = "-html";
-char C_sCmdType[]       = "-types";
-char C_sCmdIdlPath[]    = "-idlpath";
-
-
-
-bool GetParameter( Simstr & o_rMemory, int & io_nCountArg, int argc, char * argv[] );
-
-
-CommandLine::CommandLine( int           argc,
-                          char *        argv[] )
-    :   bIsOk(true)
-{
-    bool bDisplayUse = false;
-
-    /* Check command line: */
-    if ( argc < 2 )
-        bDisplayUse = true;
-    else if ( argc == 2 && ! isalnum(argv[1][0]) )
-        bDisplayUse = true;
-
-    if (bDisplayUse)
-    {
-        std::cout << C_sUseText << std::endl;
-        bIsOk = false;
-        exit(0);
-    }
-
-    ParseSingleFileCommand(argc,argv);
-
-    if ( sXmlSourceFile.l() == 0
-         && sXmlSourceDirectory.l() == 0 )
-    {
-        bIsOk = false;
-    }
-    else if ( sXmlSourceFile.l() > 0
-              && sXmlSourceDirectory.l() > 0 )
-    {
-        bIsOk = false;
-    }
-}
-
-CommandLine::~CommandLine()
-{
-}
-
-
-const char *
-CommandLine::ErrorText() const
-{
-    static char cOut[] = "Error:  Command line was incorrect. Probably there was a flag without\n"
-                         "        the corresponding parameter. Or there was no XML-sourcefile specified.\n";
-    return cOut;
-}
-
-bool
-GetParameter( Simstr &      o_pMemory,
-              int &         io_pCountArg,
-              int           argc,              char *        argv[] )
-{
-    io_pCountArg++;
-    if( io_pCountArg < argc )
-    {
-        o_pMemory = argv[io_pCountArg];
-        return true;
-    }
-    return false;
-}
-
-void
-CommandLine::ParseSingleFileCommand( int                argc,
-                                     char *             argv[] )
-{
-    for ( int nCountArg = 1; nCountArg < argc && bIsOk; ++nCountArg )
-    {
-        if ( strcmp( argv[nCountArg], C_sCmdFunc ) == 0 )
-        {
-            bIsOk = GetParameter(
-                                sFuncFile,
-                                nCountArg,
-                                argc,
-                                argv  );
-        }
-        else if ( strcmp( argv[nCountArg], C_sCmdHtml ) == 0 )
-        {
-            bIsOk = GetParameter(
-                                sHtmlFile,
-                                nCountArg,
-                                argc,
-                                argv  );
-        }
-        else if ( strcmp( argv[nCountArg], C_sCmdType ) == 0 )
-        {
-            bIsOk = GetParameter(
-                                sTypeInfoFile,
-                                nCountArg,
-                                argc,
-                                argv  );
-        }
-        else if ( strcmp( argv[nCountArg], C_sCmdIdlPath ) == 0 )
-        {
-            bIsOk = GetParameter(
-                                sIdlRootPath,
-                                nCountArg,
-                                argc,
-                                argv  );
-        }
-        else if ( strcmp( argv[nCountArg], C_sCmdDep ) == 0 )
-        {
-            bIsOk = GetParameter(
-                                sDepPath,
-                                nCountArg,
-                                argc,
-                                argv  );
-        }
-        else
-        {
-            sXmlSourceFile = argv[nCountArg];
-        }
-    }   /* end for */
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/cmdline.hxx b/xml2cmp/source/support/cmdline.hxx
deleted file mode 100644
index 89052fc..0000000
--- a/xml2cmp/source/support/cmdline.hxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef X2C_CMDLINE_HXX
-#define X2C_CMDLINE_HXX
-
-#include "sistr.hxx"
-
-class CommandLine
-{
-  public:
-                        CommandLine(
-                            int                 i_argc,
-                            char *              i_argv[] );
-                        ~CommandLine();
-
-    bool                IsOk() const            { return bIsOk; }
-    const char *        ErrorText() const;
-
-    const char *        XmlSrcFile() const      { return sXmlSourceFile.str(); }
-    const char *        FuncFile() const        { return sFuncFile.str(); }
-    const char *        HtmlFile() const        { return sHtmlFile.str(); }
-    const char *        TypeInfoFile() const    { return sTypeInfoFile.str(); }
-    const char *        DepPath() const         { return sDepPath.str(); }
-
-    bool                IsDepCommand() const    { return sDepPath.l() > 0; }
-    const char *        XmlSrcDirectory() const { return sXmlSourceDirectory.str(); }
-    const char *        OutputDirectory() const { return sOutputDirectory.str(); }
-
-    const char *        IdlRootPath() const     { return sIdlRootPath.str(); }
-
-  private:
-    void                ParseSingleFileCommand(
-                            int                 argc,
-                            char *              argv[] );
-    Simstr              sXmlSourceFile;
-    Simstr              sFuncFile;
-    Simstr              sHtmlFile;
-    Simstr              sTypeInfoFile;
-
-    Simstr              sXmlSourceDirectory;
-    Simstr              sOutputDirectory;
-
-    Simstr              sIdlRootPath;
-    Simstr              sDepPath;
-
-    bool                bIsOk;
-};
-
-
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/heap.cxx b/xml2cmp/source/support/heap.cxx
deleted file mode 100644
index d0e0e96..0000000
--- a/xml2cmp/source/support/heap.cxx
+++ /dev/null
@@ -1,194 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <string.h>
-#include "heap.hxx"
-
-
-#include <iostream>
-#include <stdlib.h>
-#define AssertionOf(x)  {if (!(x)) {std::cerr << "Assertion failed: " << #x << __FILE__ << __LINE__ << std::endl; exit(3); }}
-
-#ifdef UNX
-#define stricmp strcasecmp
-#endif
-
-
-
-Heap::Heap(unsigned i_nWidth)
-    :   dpColumnsArray(new Column[i_nWidth]),
-        nColumnsArraySize(i_nWidth),
-        nActiveColumn(nColumnsArraySize-1)
-{
-    for ( unsigned i = 0; i < nColumnsArraySize; i++)
-    {
-        dpColumnsArray[i] = 0;
-    }  // end for
-}
-
-Heap::~Heap()
-{
-    for ( unsigned i = 0; i < nColumnsArraySize; i++)
-    {
-        HeapItem * & rColumn = dpColumnsArray[i];
-        for ( HeapItem * pValue = rColumn; pValue != 0; pValue = rColumn )
-        {
-            rColumn = rColumn->Next();
-            delete pValue;
-        }
-    }  // end for
-
-    delete [] dpColumnsArray;
-}
-
-void
-Heap::InsertValue( const char *     i_sKey,
-                   const char *     i_sValue )
-{
-    HeapItem * pSearch1 = 0;
-    HeapItem * pSearch2 = 0;
-    HeapItem * pNew = new HeapItem(i_sKey, i_sValue);
-
-    IncColumn();
-    pSearch1 = ActiveColumn();
-
-    if ( pSearch1 != 0 ? *pNew < *pSearch1 : true )
-    {
-        pNew->SetNext( pSearch1 );
-        ActiveColumn() = pNew;
-
-        if ( pNew->Next() != 0)
-        {
-            AssertionOf( *pNew <= *pNew->Next() );
-        }
-
-        return;
-    }
-
-    do
-    {
-        pSearch2 = pSearch1;
-        pSearch1 = pSearch1->Next();
-
-        if ( pSearch1 != 0 ? *pNew < *pSearch1 : true )
-        {
-            pNew->SetNext( pSearch1 );
-            pSearch2->SetNext(pNew);
-
-
-        AssertionOf( *pSearch2 <= *pNew );
-        if ( pNew->Next() != 0)
-        {
-            AssertionOf( *pNew <= *pNew->Next() );
-        }
-
-        }
-    } while (pSearch2->Next() != pNew);
-}
-
-
-Simstr sKey1;
-Simstr sValue1;
-Simstr sKey2;
-Simstr sValue2;
-int nCol1 = 0;
-int nCol2 = 0;
-
-
-HeapItem *
-Heap::ReleaseTop()
-{
-    unsigned nRetColumn = 0;
-    HeapItem * ret = dpColumnsArray[0];
-    HeapItem * pSearch = 0;
-
-    for ( unsigned i = 1; i < nColumnsArraySize; ++i )
-    {
-        pSearch = dpColumnsArray[i];
-        if (pSearch != 0)
-        {
-            if ( ret == 0 ? true : *pSearch < *ret)
-            {
-                ret = pSearch;
-                nRetColumn = i;
-            }
-        }
-    }   // for
-
-    if (ret != 0)
-    {
-        dpColumnsArray[nRetColumn] = ret->Next();
-    }
-    return ret;
-}
-
-void
-Heap::IncColumn()
-{
-    if (++nActiveColumn >= nColumnsArraySize)
-        nActiveColumn = 0;
-}
-
-
-
-HeapItem::HeapItem( const char *        i_sKey,
-                    const char *        i_sValue )
-    :   sValue(i_sValue),
-        sKey(i_sKey),
-        pNext(0)
-{
-}
-
-HeapItem::~HeapItem()
-{
-}
-
-bool
-HeapItem::operator<( const HeapItem & i_rOther ) const
-{
-    int ret = stricmp(sKey.str(), i_rOther.sKey.str());
-    if (ret == 0)
-        ret = strcmp(sKey.str(), i_rOther.sKey.str());
-    if (ret == 0)
-        ret = stricmp(sValue.str(), i_rOther.sValue.str());
-    if (ret == 0)
-        ret = strcmp(sValue.str(), i_rOther.sValue.str());
-    return ret < 0;
-}
-
-const Simstr &
-HeapItem::Key() const
-{
-    return sKey;
-}
-
-HeapItem *
-HeapItem::Next() const
-{
-    return pNext;
-}
-
-void
-HeapItem::SetNext( HeapItem * i_pNext )
-{
-    pNext = i_pNext;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/heap.hxx b/xml2cmp/source/support/heap.hxx
deleted file mode 100644
index df6969e..0000000
--- a/xml2cmp/source/support/heap.hxx
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef X2C_HEAP_HXX
-#define X2C_HEAP_HXX
-
-#include "sistr.hxx"
-
-class HeapItem;
-
-class Heap
-{
-  public:
-                        Heap(
-                            unsigned            i_nWidth );
-                        ~Heap();
-
-    void                InsertValue(
-                            const char *        i_sKey,
-                            const char *        i_sValue );
-    HeapItem *          ReleaseTop();           /// @return must be deleted by caller of method.
-
-  private:
-    typedef HeapItem * Column;
-
-    void                IncColumn();
-    Column &            ActiveColumn()          { return dpColumnsArray[nActiveColumn]; }
-
-    Column *            dpColumnsArray;
-    unsigned            nColumnsArraySize;
-    unsigned            nActiveColumn;
-};
-
-
-class HeapItem
-{
-  public:
-                        HeapItem(
-                            const char *        i_sKey,
-                            const char *        i_sValue );
-                        ~HeapItem(  );
-
-    bool                operator<(
-                            const HeapItem &    i_rOther ) const;
-    bool                operator<=(
-                            const HeapItem &    i_rOther ) const
-                                                { return ! (i_rOther < *this); }
-    const Simstr &      Key() const;
-    HeapItem *          Next() const;
-
-    void                SetNext(
-                            HeapItem *          i_pNext );
-  private:
-    Simstr              sValue;
-    Simstr              sKey;
-    HeapItem *          pNext;
-};
-
-
-
-
-
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/list.hxx b/xml2cmp/source/support/list.hxx
deleted file mode 100644
index 77da160..0000000
--- a/xml2cmp/source/support/list.hxx
+++ /dev/null
@@ -1,244 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __LISTEN_123456__
-#define __LISTEN_123456__
-
-#include <string.h>
-#include <iostream>
-#include <stdlib.h>
-
-template <class XX>
-class List
-{
-  public :
-    typedef XX *        iterator;
-    typedef const XX *  const_iterator;
-
-    // LIFECYCLE
-                        List();
-    virtual             ~List() { delete [] inhalt; }
-
-    // OPERATORS
-    const XX &          operator[](
-                            unsigned            n) const
-                                                { return elem(n); }
-    XX &                operator[](
-                            unsigned            n)
-                                                { return elem(n); }
-    // OPERATIONS
-    void                reserve(
-                            unsigned            i_nSize )
-                                                { alloc(i_nSize,true); }
-    virtual void        insert(
-                            unsigned            pos,
-                            const XX &          elem );
-    void                push_back(
-                            const XX &          elem_)
-                                                { insert(size(),elem_); }
-
-    virtual void        remove(
-                            unsigned            pos );
-    void                pop_back()              { remove(size()-1); }
-    void                erase_all()             { while (size()) remove(size()-1); }
-
-    // INQUIRY
-    const XX &          front() const           { return elem(0); }
-    const XX &          back() const            { return elem(len-1); }
-
-    unsigned            size() const            { return len; }
-    unsigned            space() const           { return allocated; }
-    bool                is_valid_index(
-                            unsigned            n) const
-                                                { return n < len; }
-    // ACCESS
-    XX &                front()                 { return elem(0); }
-    XX &                back()                  { return elem(len-1); }
-
-  protected:
-    void                checkSize(
-                            unsigned            newLength);
-    void                alloc(
-                            unsigned            newSpace,
-                            bool                re = false );
-
-    const XX &          elem(
-                            unsigned            n ) const
-                                                { return inhalt[n]; }
-    XX &                elem(
-                            unsigned            n )
-                                                { return inhalt[n]; }
-  // DATA
-    XX *                inhalt;
-    unsigned            len;
-    unsigned            allocated;
-
-  private:
-    // forbidden functions
-                        List(const List<XX> & L);
-    List<XX> &          operator=(
-                            const List<XX> &    L);
-
-};
-
-template <class XY>
-class DynamicList : public List<XY*>
-{
-  public:
-    virtual             ~DynamicList();
-
-    virtual void        insert(
-                            unsigned            pos,
-                            XY * const &        elem );
-    virtual void        remove(
-                            unsigned            pos );
-};
-
-
-
-template <class XX>
-List<XX>::List()
-    :   inhalt(0),
-        len(0),
-        allocated(0)
-
-{
-    alloc(1);
-}
-
-
-template <class XX>
-void
-List<XX>::insert(unsigned pos, const XX & elem_)
-{
-    if ( pos > len )
-      return;
-
-    checkSize(len+2);
-    for ( unsigned p = len; p > pos; --p)
-    {
-        inhalt[p] = inhalt[p-1];
-    }
-    inhalt[pos] = elem_;
-    len++;
-}
-
-
-template <class XX>
-void
-List<XX>::remove(unsigned pos)
-{
-    if ( pos >= len )
-      return;
-    len--;
-    for ( unsigned p = pos; p < len; ++p)
-    {
-        inhalt[p] = inhalt[p+1];
-    }
-}
-
-
-// Protected:
-template <class XX>
-void
-List<XX>::checkSize(unsigned newLength)
-{
-   // test new size requirement:
-   unsigned newSpace = space();
-   if (newLength > newSpace)
-   {
-      if (!newSpace)
-         newSpace = 1;
-      const unsigned nBorder = 65536 / 2;
-      while(newLength > newSpace)
-      {
-        if (newSpace < nBorder)
-            newSpace <<= 1;
-        else
-        {
-            std::cerr << "List becomes too big" << std::endl;
-            exit(1);
-        }
-      }
-   }
-
-   // change?
-   if (newSpace != space())
-      alloc(newSpace,true);
-}
-
-template <class XX>
-void
-List<XX>::alloc( unsigned           newSpace,
-                 bool               re )
-{
-    XX * pNew = new XX[newSpace];
-
-    if (inhalt != 0)
-    {
-        if (re)
-        {
-            for (unsigned i = 0; i < len; ++i)
-            {
-                pNew[i] = inhalt[i];
-            }  // end for
-        }
-        delete [] inhalt;
-    }
-
-    inhalt = pNew;
-    allocated = newSpace;
-}
-
-
-template <class XY>
-DynamicList<XY>::~DynamicList()
-{
-    this->erase_all();
-}
-
-template <class XY>
-void
-DynamicList<XY>::insert(unsigned pos, XY * const & elem_)
-{
-    if ( pos > this->len )
-      return;
-
-    this->checkSize(this->len+2);
-    memmove(&this->inhalt[pos+1], &this->inhalt[pos], (this->len-pos) * sizeof(XY*) );
-    this->inhalt[pos] = elem_;
-    this->len++;
-}
-
-template <class XY>
-void
-DynamicList<XY>::remove( unsigned           pos )
-{
-    if (!this->is_valid_index(pos) )
-        return;
-    this->len--;
-    delete this->inhalt[pos];
-    memmove(&this->inhalt[pos], &this->inhalt[pos+1], (this->len-pos) * sizeof(XY*) );
-}
-
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/sistr.cxx b/xml2cmp/source/support/sistr.cxx
deleted file mode 100644
index a346417..0000000
--- a/xml2cmp/source/support/sistr.cxx
+++ /dev/null
@@ -1,393 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <sistr.hxx>
-
-// The following two header-files declare
-//   standard ANSI-C++ functions. They may be replaced
-//   by the corresponding header-file-names of the
-//   actually used runtime library.
-#include <string.h>  // strlen(), memcpy(), memset()
-#include <ctype.h>   // tolower()
-#include <limits.h>  // INT_MAX
-
-#if (_MSC_VER >=1400)
-#pragma warning(disable:4365)
-#endif
-
-const char NULCH = '\0';
-const int  NO_POS = -1;
-
-
-Simstr::Simstr(const char * str_)
-{
-   if (str_ == 0)
-      {
-         len = 0;
-         sz = new char[1];
-         *sz = 0;
-      }
-   else
-      {
-         len = strlen(str_);
-         sz = new char[len+1];
-         memcpy(sz,str_,len+1);
-      }
-}
-
-Simstr::Simstr( const char *   anybytes,
-                int            firstBytesPos,
-                int            nrOfBytes)
-{
-   unsigned slen = strlen(anybytes);
-   if (anybytes == 0 || slen <= unsigned(firstBytesPos))
-      {
-         len = 0;
-         sz = new char[1];
-         *sz = 0;
-      }
-   else
-      {
-         int maxLen = slen - unsigned(firstBytesPos);
-         len =  maxLen < nrOfBytes
-                  ? maxLen
-                  : nrOfBytes;
-         sz = new char[len+1];
-         memcpy(sz,anybytes+firstBytesPos,len);
-         *(sz+len) = 0;
-      }
-}
-
-
-Simstr::Simstr(const Simstr & S)
-{
-   len = S.len;
-   sz = new char[len+1];
-   memcpy(sz,S.sz,len+1);
-}
-
-Simstr & Simstr::operator=(const Simstr & S)
-{
-   if (sz == S.sz)
-      return *this;
-
-   delete [] sz;
-
-   len = S.len;
-   sz = new char[len+1];
-   memcpy(sz,S.sz,len+1);
-
-   return *this;
-}
-
-Simstr::~Simstr()
-{
-   delete [] sz;
-}
-
-Simstr
-Simstr::operator+(const Simstr & S) const
-{
-   Simstr ret = sz;
-   ret.push_back(S);
-   return ret;
-}
-
-Simstr &
-Simstr::operator+=(const Simstr & S)
-{
-   push_back(S);
-   return *this;
-}
-
-
-// REL
-
-bool
-Simstr::operator==(const Simstr & S) const
-{ return !strcmp(sz,S.sz) ? true : false; }
-
-bool
-Simstr::operator!=(const Simstr & S) const
-{ return strcmp(sz,S.sz) ? true : false; }
-
-bool
-Simstr::operator<(const Simstr & S) const
-{ return (strcmp(sz,S.sz) < 0) ? true : false; }
-
-bool
-Simstr::operator>(const Simstr & S) const
-{ return (strcmp(sz,S.sz) > 0) ? true : false; }
-
-bool
-Simstr::operator<=(const Simstr & S) const
-{ return (strcmp(sz,S.sz) <= 0) ? true : false; }
-
-bool
-Simstr::operator>=(const Simstr & S) const
-{ return (strcmp(sz,S.sz) >= 0) ? true : false; }
-
-
-
-
-// **************          LIST - Funktionen        *****************
-
-// Insert
-
-void
-Simstr::push_front(char c)
-{
-   char * result = new char[len+2];
-
-   result[0] = c;
-   memcpy(result+1,sz,len+1);
-
-   delete [] sz;
-   sz = result;
-   len++;
-}
-
-void
-Simstr::push_back(char c)
-{
-   char * result = new char[len+2];
-
-   memcpy(result,sz,len);
-   result[len] = c;
-   result[len+1] = 0;
-
-   delete [] sz;
-   sz = result;
-   len++;
-}
-
-void
-Simstr::push_front(const Simstr & S)
-{
-   char * result = new char[len+1+S.len];
-
-   memcpy(result,S.sz,S.len);
-   memcpy(result+S.len,sz,len+1);
-
-   delete [] sz;
-   sz = result;
-   len += S.len;
-}
-
-void
-Simstr::push_back(const Simstr & S)
-{
-   char * result = new char[len+1+S.len];
-
-   memcpy(result,sz,len);
-   memcpy(result+len,S.sz,S.len+1);
-
-   delete [] sz;
-   sz = result;
-   len += S.len;
-}
-
-
-// Remove
-
-void
-Simstr::remove(int  pos, int  anzahl)
-{
-   if (pos >= len || pos < 0 || anzahl < 1)
-      return;
-
-    int anz = len - pos < anzahl ? len - pos : anzahl;
-
-    char * result = new char[len-anz+1];
-
-    memcpy(result,sz,pos);
-   memcpy(result+pos,sz+pos+anz,len-pos-anz+1);
-
-   delete [] sz;
-   sz = result;
-   len -= anz;
-}
-
-void
-Simstr::remove_trailing_blanks()
-{
-    int newlen = len-1;
-    for ( ; newlen > 1 && sz[newlen] <= 32; --newlen ) {}
-
-    if (newlen < len-1)
-        remove ( newlen+1, len-newlen);
-}
-
-// Find
-
-int
-Simstr::pos_first(char c) const
-{
-   int i = 0;
-   for (i = 0; i < len ? sz[i] != c : false; i++) ;
-   if (i >= len)
-      return NO_POS;
-   else
-      return i;
-}
-
-int
-Simstr::pos_last(char c) const
-{
-   int i = 0;
-   for (i = len-1; i >= 0 ? sz[i] != c : false; i--) ;
-   if (i < 0)
-      return NO_POS;
-   else
-      return i;
-}
-
-bool
-Simstr::is_no_text() const
-{
-   if (!len)
-      return true;
-
-   int i;
-   for (i = 0; i < len && sz[i] <= 32 ; i++) ;
-   if (i < len)
-        return false;
-    return true;
-}
-
-// Change
-
-void
-Simstr::replace_all(char oldCh, char newCh)
-{
-   for (int i=0; i < len; i++)
-      if (sz[i] == oldCh)
-         sz[i] = newCh;
-}
-
-//   Simstr addition
-Simstr
-operator+(const char * str, const Simstr & S)
-{
-   Simstr ret = S;
-   ret.push_front(str);
-   return ret;
-}
-
-Simstr
-operator+(const Simstr & S, const char * str)
-{
-   Simstr ret = S;
-   ret.push_back(str);
-   return ret;
-}
-
-Simstr
-operator+(char c, const Simstr & S)
-{
-   Simstr ret = S;
-   ret.push_front(c);
-   return ret;
-}
-
-Simstr
-operator+(const Simstr & S, char c)
-{
-   Simstr ret = S;
-   ret.push_back(c);
-   return ret;
-}
-
-
-// Simstr-Vergleiche mit char *
-bool
-operator==(const Simstr & S, const char * str)
-{
-   return strcmp(S,str) == 0;
-}
-
-bool
-operator!=(const Simstr & S, const char * str)
-{
-   return strcmp(S,str) != 0;
-}
-
-bool
-operator<(const Simstr & S, const char * str)
-{
-   return strcmp(S,str) < 0;
-}
-
-bool
-operator>(const Simstr & S, const char * str)
-{
-   return strcmp(S,str) > 0;
-}
-
-bool
-operator<=(const Simstr & S, const char * str)
-{
-   return strcmp(S,str) <= 0;
-}
-
-bool
-operator>=(const Simstr & S, const char * str)
-{
-   return strcmp(S,str) >= 0;
-}
-
-bool
-operator==(const char * str, const Simstr & S)
-{
-   return strcmp(str,S) == 0;
-}
-
-bool
-operator!=(const char * str, const Simstr & S)
-{
-   return strcmp(str,S) != 0;
-}
-
-bool
-operator<(const char * str, const Simstr & S)
-{
-   return strcmp(str,S) < 0;
-}
-
-bool
-operator>(const char * str, const Simstr & S)
-{
-   return strcmp(str,S) > 0;
-}
-
-bool
-operator<=(const char * str, const Simstr & S)
-{
-   return strcmp(str,S) <= 0;
-}
-
-bool
-operator>=(const char * str, const Simstr & S)
-{
-   return strcmp(str,S) >= 0;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/sistr.hxx b/xml2cmp/source/support/sistr.hxx
deleted file mode 100644
index de20004..0000000
--- a/xml2cmp/source/support/sistr.hxx
+++ /dev/null
@@ -1,141 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef XML2CMP_SISTR_HXX
-#define XML2CMP_SISTR_HXX
-
-
-class  Simstr
-{
-// INTERFACE
-   public:
-      // Constructors, destructor, '=' and typecasts
-                     Simstr(
-                           const char *   str = 0);
-                     Simstr(                       // Creates Simstr out of a copy of the described bytes within 'anyBytes'.
-                                                   // Adds a '\0' at the end.
-                           const char *   anybytes,
-                           int            firstBytesPos,
-                           int            nrOfBytes);
-      virtual        ~Simstr();
-                     Simstr(
-                           const Simstr & S);
-      Simstr &       operator=(
-                           const Simstr & S);
-                     operator const char*() const;
-
-      // diverse utility functions
-      const char *   str() const                { return sz; }
-      char *         s();   // CAUTION!!!          // Only use when a function needs a 'char*' but
-                                                   //   still will NOT MODIFY THE STRING!
-                                                   //   Typecasts to 'const char*' are performed automatically.
-      int            l() const;                    // Length of string without '\0' at end.
-      Simstr         operator+(
-                           const Simstr & S) const;
-      Simstr &       operator+=(
-                           const Simstr & S);
-
-      // comparison operators
-      bool           operator==(
-                           const Simstr & S) const;
-      bool           operator!=(
-                           const Simstr & S) const;
-      bool           operator<(
-                           const Simstr & S) const;
-      bool           operator>(
-                           const Simstr & S) const;
-      bool           operator<=(
-                           const Simstr & S) const;
-      bool           operator>=(
-                           const Simstr & S) const;
-
-
-      // 'List of characters' - functions
-         // insert - functions
-      void           push_front(
-                           char           c);
-      void           push_back(
-                           char           c);
-      void           push_front(
-                           const Simstr & S);
-      void           push_back(
-                           const Simstr & S);
-         // remove - functions
-      void           remove(
-                             int            pos,
-                           int            anzahl = 1);
-      void           remove_trailing_blanks();
-
-         // search functions
-      int            pos_first(
-                           char           c) const;
-      int            pos_last(
-                           char           c) const;
-      bool           is_empty() const;                         // Only true if object == "".
-      bool           is_no_text() const;                       // String may contain spaces or tabs.
-
-         // substitution functions
-      void           replace_all(
-                           char           oldCh,
-                           char           newCh);
-         // token functions
-            // get...-functions return the token, separated by char 'c' and leave the object unchanged.
-            // take...-functions return the same, but remove the token and the corresponding separator from the object.
-      Simstr         get_last_token(
-                           char           c) const;
-
-   private:
-      char *         sz;
-      int            len;
-};
-
-// Simstr - char* / char - concatenations
-Simstr operator+(const char * str, const Simstr & S);
-Simstr operator+(const Simstr & S, const char * str);
-Simstr operator+(char c, const Simstr & S);
-Simstr operator+(const Simstr & S, char c);
-
-// Simstr - char* - comparison operators
-bool  operator==(const Simstr & S, const char * str);
-bool  operator!=(const Simstr & S, const char * str);
-bool  operator<(const Simstr & S, const char * str);
-bool  operator>(const Simstr & S, const char * str);
-bool  operator<=(const Simstr & S, const char * str);
-bool  operator>=(const Simstr & S, const char * str);
-bool  operator==(const char * str, const Simstr & S);
-bool  operator!=(const char * str, const Simstr & S);
-bool  operator<(const char * str, const Simstr & S);
-bool  operator>(const char * str, const Simstr & S);
-bool  operator<=(const char * str, const Simstr & S);
-bool  operator>=(const char * str, const Simstr & S);
-
-
-inline char *
-Simstr::s()                            { return sz; }
-inline int
-Simstr::l() const                      { return len; }
-inline
-Simstr::operator const char*() const   { return sz; }
-inline bool
-Simstr::is_empty() const               { return len == 0; }
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/syshelp.cxx b/xml2cmp/source/support/syshelp.cxx
deleted file mode 100644
index 6cc915a..0000000
--- a/xml2cmp/source/support/syshelp.cxx
+++ /dev/null
@@ -1,307 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <syshelp.hxx>
-
-
-// NOT FULLY DEFINED SERVICES
-#include <string.h>
-#include "sistr.hxx"
-#include "list.hxx"
-
-#ifdef WNT
-#include <io.h>
-#elif defined(UNX)
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#define stricmp strcasecmp
-#else
-#error Must run under unix or windows, please define UNX or WNT.
-#endif
-
-
-char C_sSpaceInName[] = "   ";
-
-void
-WriteName( std::ostream &       o_rFile,
-           const Simstr &   i_rIdlDocuBaseDir,
-           const Simstr &   i_rName,
-           E_LinkType       i_eLinkType )
-{
-    if (i_rName.l() == 0)
-        return;
-
-
-    const char * pNameEnd = strstr( i_rName.str(), " in " );
-
-    // No link:
-    if ( i_eLinkType == lt_nolink )
-    {
-        if ( pNameEnd != 0 )
-        {
-            const char * pStart = i_rName.str();
-            o_rFile.write( pStart, pNameEnd - pStart );
-            WriteStr( o_rFile, C_sSpaceInName );
-            WriteStr( o_rFile, pNameEnd );
-        }
-        else
-        {
-            WriteStr( o_rFile, i_rName );
-        }
-        return;
-    }
-
-    if ( i_eLinkType == lt_idl )
-    {
-        Simstr sPath(i_rName);
-        sPath.replace_all('.','/');
-        int nNameEnd = sPath.pos_first(' ');
-        int nPathStart = sPath.pos_last(' ');
-        WriteStr( o_rFile, "<A HREF=\"" );
-
-        if ( nNameEnd > -1 )
-        {
-            WriteStr( o_rFile, "file:///" );
-            WriteStr( o_rFile, i_rIdlDocuBaseDir );
-            WriteStr( o_rFile, "/" );
-            WriteStr( o_rFile, sPath.str() + 1 + nPathStart );
-            WriteStr( o_rFile, "/" );
-            o_rFile.write( sPath.str(), nNameEnd );
-            WriteStr( o_rFile, ".html\">" );
-        }
-        else
-        {   // Should not be reached:
-            WriteStr(o_rFile, i_rName);
-            return;
-        }
-    }
-    else if ( i_eLinkType == lt_html )
-    {
-        int nKomma = i_rName.pos_first(',');
-        int nEnd = i_rName.pos_first(' ');
-        if ( nKomma > -1 )
-        {
-            o_rFile.write( i_rName.str(), nKomma );
-            WriteStr( o_rFile, ": " );
-
-            WriteStr( o_rFile, "<A HREF=\"" );
-
-            o_rFile.write( i_rName.str(), nKomma );
-            WriteStr( o_rFile, ".html#" );
-            if ( nEnd > -1 )
-                o_rFile.write( i_rName.str() + nKomma + 1, nEnd - nKomma );
-            else
-                WriteStr( o_rFile, i_rName.str() + nKomma + 1 );
-            WriteStr( o_rFile, "\">" );
-
-            o_rFile.write( i_rName.str() + nKomma + 1, nEnd - nKomma );
-        }
-        else
-        {
-            WriteStr( o_rFile, "<A HREF=\"" );
-            WriteStr( o_rFile, i_rName );
-            WriteStr( o_rFile, ".html\">" );
-
-            WriteStr( o_rFile, i_rName );
-        }
-        WriteStr( o_rFile, "</A>" );
-        return;
-    }
-
-    if ( pNameEnd != 0 )
-    {
-        const char * pStart = i_rName.str();
-        if ( pNameEnd > pStart )
-            o_rFile.write( pStart, pNameEnd - pStart );
-        WriteStr( o_rFile, "</A>" );
-
-        WriteStr( o_rFile, C_sSpaceInName );
-        WriteStr( o_rFile, pNameEnd );
-    }
-    else
-    {
-        WriteStr( o_rFile, i_rName );
-        WriteStr( o_rFile, "</A>" );
-    }
-}
-
-
-void
-WriteStr( std::ostream &    o_rFile,
-          const char *      i_sStr )
-{
-    o_rFile.write( i_sStr, (int) strlen(i_sStr) );
-}
-
-void
-WriteStr( std::ostream &      o_rFile,
-          const Simstr &      i_sStr )
-{
-    o_rFile.write( i_sStr.str(), i_sStr.l() );
-}
-
-
-const char C_sXML_END[] = "\\*.xml";
-
-void
-GatherFileNames( List<Simstr> &     o_sFiles,
-                 const char *       i_sSrcDirectory )
-{
-    static int   nAliveCounter = 0;
-
-    char *       sNextDir = 0;
-    Simstr       sNew = 0;
-
-#ifdef WNT
-    struct _finddata_t aEntry;
-    long hFile = 0;
-    int bFindMore = 0;
-    char * sFilter = new char[ strlen(i_sSrcDirectory) + sizeof C_sXML_END ];
-
-    // Stayingalive sign
-    if (++nAliveCounter % 100 == 1)
-        std::cout << "." << std::flush;
-
-    strcpy(sFilter, i_sSrcDirectory);       // STRCPY SAFE HERE
-    strcat(sFilter,C_sXML_END);             // STRCAT SAFE HERE
-
-    hFile = _findfirst( sFilter, &aEntry );
-    for ( bFindMore = hFile == -1;
-          bFindMore == 0;
-          bFindMore = _findnext( hFile, &aEntry ) )
-    {
-        sNew = i_sSrcDirectory;
-        sNew += "\\";
-        sNew += aEntry.name;
-        o_sFiles.push_back(sNew);
-    }   // end for
-
-    _findclose(hFile);
-    delete [] sFilter;
-#elif defined(UNX)
-    DIR * pDir = opendir( i_sSrcDirectory );
-    dirent * pEntry = 0;
-    char * sEnding;
-
-    // Stayingalive sign
-    if (++nAliveCounter % 100 == 1)
-        std::cout << "." << std::flush;
-
-    while ( (pEntry = readdir(pDir)) != 0 )
-    {
-        sEnding = strrchr(pEntry->d_name,'.');
-        if (sEnding != 0 ? stricmp(sEnding,".xml") == 0 : 0 )
-        {
-            sNew = i_sSrcDirectory;
-            sNew += "/";
-            sNew += pEntry->d_name;
-            o_sFiles.push_back(sNew);
-        }
-    }   // end while
-
-    closedir( pDir );
-#else
-#error Must run on unix or windows, please define UNX or WNT.
-#endif
-
-    //  gathering from subdirectories:
-    List<Simstr> aSubDirectories;
-    GatherSubDirectories( aSubDirectories, i_sSrcDirectory );
-
-    unsigned d_max = aSubDirectories.size();
-    for ( unsigned d = 0; d < d_max; ++d )
-    {
-        sNextDir = new char[ strlen(i_sSrcDirectory) + 2 + aSubDirectories[d].l() ];
-
-        strcpy(sNextDir, i_sSrcDirectory);
-        strcat(sNextDir, C_sSLASH);
-        strcat(sNextDir, aSubDirectories[d].str());
-        GatherFileNames(o_sFiles, sNextDir);
-
-        delete [] sNextDir;
-    }
-}
-
-
-const char * C_sANYDIR = "\\*.*";
-
-void
-GatherSubDirectories( List<Simstr> &    o_sSubDirectories,
-                      const char *      i_sParentdDirectory )
-{
-    Simstr sNew;
-
-#ifdef WNT
-    struct _finddata_t aEntry;
-    long hFile = 0;
-    int bFindMore = 0;
-    char * sFilter = new char[strlen(i_sParentdDirectory) + sizeof C_sANYDIR];
-
-    strcpy(sFilter, i_sParentdDirectory);
-    strcat(sFilter,C_sANYDIR);
-
-    hFile = _findfirst( sFilter, &aEntry );
-    for ( bFindMore = hFile == -1;
-          bFindMore == 0;
-          bFindMore = _findnext( hFile, &aEntry ) )
-    {
-        if (aEntry.attrib == _A_SUBDIR)
-        {
-            // Do not gather . .. and outputtree directories
-            if ( strchr(aEntry.name,'.') == 0
-                 && strncmp(aEntry.name, "wnt", 3) != 0
-                 && strncmp(aEntry.name, "unx", 3) != 0 )
-            {
-                sNew = aEntry.name;
-                o_sSubDirectories.push_back(sNew);
-            }
-        }   // endif (aEntry.attrib == _A_SUBDIR)
-    }   // end for
-    _findclose(hFile);
-    delete [] sFilter;
-
-#elif defined(UNX)
-    DIR * pDir = opendir( i_sParentdDirectory );
-    dirent * pEntry = 0;
-    struct stat     aEntryStatus;
-
-    while ( ( pEntry = readdir(pDir) ) != 0 )
-    {
-        stat(pEntry->d_name, &aEntryStatus);
-        if ( ( aEntryStatus.st_mode & S_IFDIR ) == S_IFDIR )
-        {
-            // Do not gather . .. and outputtree directories
-            if ( strchr(pEntry->d_name,'.') == 0
-                 && strncmp(pEntry->d_name, "wnt", 3) != 0
-                 && strncmp(pEntry->d_name, "unx", 3) != 0 )
-            {
-                sNew = pEntry->d_name;
-                o_sSubDirectories.push_back(sNew);
-            }
-        }   // endif (aEntry.attrib == _A_SUBDIR)
-    }   // end while
-    closedir( pDir );
-#else
-#error Must run on unix or windows, please define UNX or WNT.
-#endif
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/support/syshelp.hxx b/xml2cmp/source/support/syshelp.hxx
deleted file mode 100644
index 91c231b..0000000
--- a/xml2cmp/source/support/syshelp.hxx
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef X2C_SYSHELP_HXX
-#define X2C_SYSHELP_HXX
-
-
-
-// USED SERVICES
-    // BASE CLASSES
-    // COMPONENTS
-    // PARAMETERS
-#include <iosfwd>
-
-class Simstr;
-template <class XY> class List;
-
-
-#if defined(WNT)
-const char   C_sSLASH[] = "\\";
-const char   C_cSLASH = '\\';
-#elif defined(UNX)
-const char   C_sSLASH[] = "/";
-const char   C_cSLASH = '/';
-#else
-#error Must run under unix or windows, please define UNX or WNT.
-#endif
-
-enum E_LinkType
-{
-    lt_nolink = 0,
-    lt_idl,
-    lt_html
-};
-
-
-void                WriteName(
-                        std::ostream &      o_rFile,
-                        const Simstr &      i_rIdlDocuBaseDir,
-                        const Simstr &      i_rName,
-                        E_LinkType          i_eLinkType );
-
-
-void                WriteStr(
-                        std::ostream &      o_rFile,
-                        const char *        i_sStr );
-void                WriteStr(
-                        std::ostream &      o_rFile,
-                        const Simstr &      i_sStr );
-
-void                GatherFileNames(
-                        List<Simstr> &      o_sFiles,
-                        const char *        i_sSrcDirectory );
-void                GatherSubDirectories(
-                        List<Simstr> &      o_sSubDirectories,
-                        const char *        i_sParentdDirectory );
-
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/cr_html.cxx b/xml2cmp/source/xcd/cr_html.cxx
deleted file mode 100644
index b268d14..0000000
--- a/xml2cmp/source/xcd/cr_html.cxx
+++ /dev/null
@@ -1,261 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <fstream>
-#include "cr_html.hxx"
-#include "xmltree.hxx"
-#include "../support/syshelp.hxx"
-
-
-
-
-char C_sHtmlFileHeader1[] =
-    "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n"
-    "<HTML>\n"
-    "<HEAD>\n"
-    "   <TITLE>";
-
-char C_sHtmlFileHeader2[] =
-        "</TITLE>\n"
-    "       <META NAME=\"GENERATOR\" CONTENT=\"xml2cmp\">\n"
-    "</HEAD>\n"
-    "<BODY BGCOLOR=\"#ffffff\">\n<P><BR></P>";
-
-
-char C_sHtmlFileFoot[] = "</BODY>\n</HTML>\n";
-
-
-HtmlCreator::HtmlCreator( const char *              i_pOutputFileName,
-                          const XmlElement &        i_rDocument,
-                          const Simstr &            i_sIDL_BaseDirectory )
-    :   aFile(i_pOutputFileName, std::ios::out
-#if defined(WNT)
-                                               | std::ios::binary
-#endif
-                                                             ),
-        rDocument(i_rDocument),
-        sIdl_BaseDirectory(i_sIDL_BaseDirectory)
-{
-    if ( !aFile )
-    {
-        std::cerr << "Error: " << i_pOutputFileName << " could not be created." << std::endl;
-        exit(0);
-    }
-}
-
-HtmlCreator::~HtmlCreator()
-{
-    aFile.close();
-}
-
-void
-HtmlCreator::Run()
-{
-    WriteStr( C_sHtmlFileHeader1 );
-    WriteStr( "ModuleDescription" );
-    WriteStr( C_sHtmlFileHeader2 );
-
-    rDocument.Write2Html(*this);
-
-    WriteStr( "<P><BR><BR></P>\n" );
-    WriteStr( C_sHtmlFileFoot );
-}
-
-void
-HtmlCreator::StartTable()
-{
-    WriteStr( "<P><BR></P>\n" );
-    WriteStr(
-            "<TABLE WIDTH=95% BORDER=1 CELLSPACING=0 CELLPADDING=4>\n"
-            "   <TBODY>\n"  );
-}
-
-void
-HtmlCreator::FinishTable()
-{
-    WriteStr( " </TBODY>\n"
-              "</TABLE>\n\n" );
-}
-
-void
-HtmlCreator::StartBigCell( const char * i_sTitle )
-{
-    WriteStr( "<TR><TD COLSPAN=2>\n"
-              "<H4><BR>" );
-    WriteStr( i_sTitle );
-    WriteStr( "</H4>\n" );
-
-}
-
-void
-HtmlCreator::FinishBigCell()
-{
-    WriteStr( "</TD><TR>\n" );
-}
-
-void
-HtmlCreator::Write_SglTextElement( const SglTextElement &  i_rElement,
-                                   bool                    i_bStrong )
-{
-    StartRow();
-
-    WriteElementName( i_rElement.Name(), i_bStrong );
-
-    StartCell( "77%");
-    if (i_bStrong)
-    {
-        WriteStr( "<H4><A NAME=\"" );
-        unsigned nLen = strlen(i_rElement.Data());
-        if ( i_rElement.IsReversedName())
-        {
-            const char * pEnd = strchr(i_rElement.Data(), ' ');
-            nLen = (unsigned)( pEnd - i_rElement.Data() );
-        }
-        aFile.write( i_rElement.Data(), (int) nLen );
-        WriteStr( "\">" );
-    }
-
-    WriteName( aFile, sIdl_BaseDirectory, i_rElement.Data(),
-               i_bStrong ? lt_nolink : i_rElement.LinkType() );
-
-    if (i_bStrong)
-        WriteStr( "</A></H4>" );
-    FinishCell();
-
-    FinishRow();
-}
-
-void
-HtmlCreator::Write_MultiTextElement( const MultipleTextElement &    i_rElement )
-{
-    StartRow();
-
-    WriteElementName( i_rElement.Name(), false );
-
-    StartCell( "77%");
-    unsigned i_max = i_rElement.Size();
-    for ( unsigned i = 0; i < i_max; ++i )
-    {
-        if (i > 0)
-            WriteStr( "<BR>\n" );
-        WriteName( aFile, sIdl_BaseDirectory, i_rElement.Data(i), i_rElement.LinkType() );
-    }   // end for
-    FinishCell();
-
-    FinishRow();
-}
-
-void
-HtmlCreator::Write_SglText( const Simstr &      i_sName,
-                            const Simstr &      i_sValue )
-{
-    StartRow();
-
-    WriteElementName( i_sName, false );
-
-    StartCell( "77%");
-    WriteStr( i_sValue );
-    FinishCell();
-
-    FinishRow();
-}
-
-void
-HtmlCreator::Write_ReferenceDocu( const Simstr &      i_sName,
-                                  const Simstr &      i_sRef,
-                                  const Simstr &      i_sRole,
-                                  const Simstr &      i_sTitle )
-{
-    StartRow();
-
-    StartCell( "23%" );
-    WriteStr(i_sName);
-    FinishCell();
-
-    StartCell( "77%" );
-    if ( !i_sRef.is_empty() )
-    {
-        WriteStr("<A href=\"");
-        WriteStr(i_sRef);
-        WriteStr("\">");
-        if ( !i_sTitle.is_empty() )
-            WriteStr( i_sTitle );
-        else
-            WriteStr(i_sRef);
-        WriteStr("</A><BR>\n");
-    }
-    else if ( !i_sTitle.is_empty() )
-    {
-        WriteStr("Title: ");
-        WriteStr( i_sTitle );
-        WriteStr("<BR>\n");
-    }
-    if ( !i_sRole.is_empty() )
-    {
-        WriteStr("Role: ");
-        WriteStr( i_sRole );
-    }
-    FinishCell();
-
-    FinishRow();
-}
-
-
-void
-HtmlCreator::StartRow()
-{
-    WriteStr( "     <TR VALIGN=TOP>\n" );
-}
-
-void
-HtmlCreator::FinishRow()
-{
-    WriteStr( "     </TR>\n" );
-}
-
-void
-HtmlCreator::StartCell( const char * i_pWidth)
-{
-    WriteStr( "         <TD WIDTH=" );
-    WriteStr( i_pWidth );
-    WriteStr( ">\n              <P>" );
-}
-
-void
-HtmlCreator::FinishCell()
-{
-    WriteStr( "</P>\n           </TD>\n" );
-}
-
-void
-HtmlCreator::WriteElementName( const Simstr & i_sName,
-                               bool           i_bStrong )
-{
-    StartCell( "23%" );
-    if (i_bStrong)
-        WriteStr( "<H4>" );
-    WriteStr(i_sName);
-    if (i_bStrong)
-        WriteStr( "</H4>" );
-    FinishCell();
-}
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/cr_html.hxx b/xml2cmp/source/xcd/cr_html.hxx
deleted file mode 100644
index a49f1bd..0000000
--- a/xml2cmp/source/xcd/cr_html.hxx
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef X2C_CR_HTML_HXX
-#define X2C_CR_HTML_HXX
-
-
-#include <string.h>
-#include <fstream>
-#include "../support/sistr.hxx"
-#include "../support/syshelp.hxx"
-
-
-class XmlElement;
-class SglTextElement;
-class MultipleTextElement;
-
-
-class HtmlCreator
-{
-  public:
-                        HtmlCreator(
-                            const char *        i_pOutputFileName,
-                            const XmlElement &  i_rDocument,
-                            const Simstr &      i_sIDL_BaseDirectory );
-                        ~HtmlCreator();
-
-    void                Run();
-
-    void                StartTable();
-    void                FinishTable();
-    void                StartBigCell(
-                            const char *        i_sTitle );
-    void                FinishBigCell();
-
-    void                Write_SglTextElement(
-                            const SglTextElement &
-                                                i_rElement,
-                            bool                i_bStrong = false );
-    void                Write_MultiTextElement(
-                            const MultipleTextElement &
-                                                i_rElement );
-    void                Write_SglText(
-                            const Simstr &      i_sName,
-                            const Simstr &      i_sValue );
-    void                Write_ReferenceDocu(
-                            const Simstr &      i_sName,
-                            const Simstr &      i_sRef,
-                            const Simstr &      i_sRole,
-                            const Simstr &      i_sTitle );
-  private:
-    void                StartRow();
-    void                FinishRow();
-    void                StartCell(
-                            const char *        i_pWidth );
-    void                FinishCell();
-
-    void                WriteElementName(
-                            const Simstr &      i_sName,
-                            bool                i_bStrong );
-    void                WriteStr(
-                            const char *        i_sStr )
-                                                { aFile.write( i_sStr, (int) strlen(i_sStr) ); }
-    // DATA
-    std::ofstream       aFile;
-    const XmlElement &  rDocument;
-    Simstr              sIdl_BaseDirectory;
-};
-
-
-
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/cr_metho.cxx b/xml2cmp/source/xcd/cr_metho.cxx
deleted file mode 100644
index 3927c02..0000000
--- a/xml2cmp/source/xcd/cr_metho.cxx
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "cr_metho.hxx"
-
-#include <string.h>
-#include <fstream>
-#include <iostream>
-
-
-
-const char C_sFileHeader1[]
-                      = "/* ";
-const char C_sFileHeader2[]
-                      = " */\r\n/* Implementation of component_getDescriptionFunc() */\r\n\r\n"
-                        "#include <sal/types.h>\r\n\r\n";
-const char C_sFuncBegin[]
-                      = "#ifdef __cplusplus\r\n"
-                        "extern \"C\" {\r\n"
-                        "#endif\r\n\r\n"
-                        "const sal_Char * SAL_CALL\r\ncomponent_getDescriptionFunc()\r\n"
-                        "{\r\n"
-                        "    return (const sal_Char*) \r\n"
-                        "    \"";
-const char C_sFuncEnd[]    =  "\";\r\n"
-                        "}\r\n\r\n"
-                        "#ifdef __cplusplus\r\n"
-                        "} /* end of extern \"C\" */\r\n"
-                        "#endif\r\n";
-
-
-void
-Create_AccessMethod( const char *           i_pOutputFileName,
-                     const char *           i_sText )
-{
-    const char * pText = i_sText;
-    const char * pTrans = 0;
-    const char   sDescrLineChange[] = "\"\r\n    \"";
-    int    sDescrLen = (int) strlen(sDescrLineChange);
-
-    std::ofstream aFile(i_pOutputFileName, std::ios::out
-#if defined(WNT)
-                                               | std::ios::binary
-#endif
-    );
-
-
-    if ( !aFile )
-    {
-        std::cerr << "Error: " << i_pOutputFileName << " could not be created." << std::endl;
-        return;
-    }
-
-    aFile.write( C_sFileHeader1, (int) strlen(C_sFileHeader1) );
-    aFile.write( i_pOutputFileName, (int) strlen(i_pOutputFileName) );
-    aFile.write( C_sFileHeader2, (int) strlen(C_sFileHeader2) );
-    aFile.write( C_sFuncBegin, (int) strlen(C_sFuncBegin) );
-
-    for ( pTrans = pText; *pTrans != '\0'; pTrans++ )
-    {
-        switch (*pTrans)
-        {
-            case '"':   aFile.write( "\\\"", 2);
-                        break;
-            case '\n':  aFile.write( "\\n", 2);
-                        aFile.write( sDescrLineChange, sDescrLen);
-                        break;
-            case '\r':  aFile.write( "\\r", 2);
-                        break;
-            default:    aFile.write( pTrans, 1);
-        }
-    }   /* end for */
-
-    aFile.write( C_sFuncEnd, (int) strlen(C_sFuncEnd) );
-
-
-    aFile.close();
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/cr_metho.hxx b/xml2cmp/source/xcd/cr_metho.hxx
deleted file mode 100644
index 73e6b3b..0000000
--- a/xml2cmp/source/xcd/cr_metho.hxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef CPV_CR_METHOD_H
-#define CPV_CR_METHOD_H
-
-
-
-void                Create_AccessMethod(
-                        const char *            i_pOutputFileName,
-                        const char *            i_sText );
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/dependy.cxx b/xml2cmp/source/xcd/dependy.cxx
deleted file mode 100644
index 66f9969..0000000
--- a/xml2cmp/source/xcd/dependy.cxx
+++ /dev/null
@@ -1,218 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include "dependy.hxx"
-#include <iostream>
-#include "../support/syshelp.hxx"
-#include "../support/list.hxx"
-#include "xmltree.hxx"
-#include "parse.hxx"
-
-
-
-Simstr              ShortName(const Simstr & i_rService);
-
-
-
-Service::Service( const char * i_sName )
-    :   sName(i_sName)
-        // aImplementations
-{
-}
-
-ServiceInfo &
-Service::AddImplementation( const char * i_sLibrary )
-{
-    ServiceInfo * ret = new ServiceInfo(i_sLibrary);
-    aImplementations.push_back(ret);
-    return *ret;
-}
-
-ServiceInfo::ServiceInfo( const char * i_sLibrary )
-    :   sImplementingLibrary(i_sLibrary)
-        // aNeededServices
-{
-}
-
-void
-ServiceInfo::AddDependency( const char * i_sNeededService )
-{
-    aNeededServices.push_back(i_sNeededService);
-}
-
-DependencyFinder::DependencyFinder()
-{
-}
-
-DependencyFinder::~DependencyFinder()
-{
-    for (Map_Services::const_iterator aIter = aServices.begin(); aIter != aServices.end(); ++aIter)
-        delete aIter->second;
-}
-
-void
-DependencyFinder::GatherData( const char * i_sSearchDirectory )
-{
-    List<Simstr> aFiles;
-    GatherFileNames( aFiles, i_sSearchDirectory );
-
-    for ( unsigned i = 0; i < aFiles.size(); ++i )
-    {
-        ReadFile( aFiles[i].str() );
-    }
-}
-
-void
-DependencyFinder::FindNeededServices( StringVector &        o_rLibraries,
-                                      StringVector &        o_rServices,
-                                      const Simstr &        i_rService )
-{
-    Map_Services::const_iterator itService = aServices.find(i_rService);
-    if ( itService == aServices.end() )
-    {
-        std::cerr << "Error: Service \""
-                  << i_rService.str()
-                  << "\" not found."
-                  << std::endl;
-        return ;
-    }
-
-    aResult_Libraries.erase( aResult_Libraries.begin(), aResult_Libraries.end() );
-    aResult_Services.erase( aResult_Services.begin(), aResult_Services.end() );
-
-    Add2Result( *(*itService).second );
-
-    for ( std::set< Simstr >::const_iterator il = aResult_Libraries.begin();
-          il != aResult_Libraries.end();
-          ++il )
-    {
-        o_rLibraries.push_back(*il);
-    }
-
-    for ( std::set< Simstr >::const_iterator is = aResult_Services.begin();
-          is != aResult_Services.end();
-          ++is )
-    {
-        o_rServices.push_back(*is);
-    }
-}
-
-void
-DependencyFinder::ReadFile(  const char * i_sFilename )
-{
-    ModuleDescription   aModule;
-    X2CParser           aParser(aModule);
-
-    if ( !aParser.Parse(i_sFilename) )
-    {
-        std::cerr << "Error: File \""
-             << i_sFilename
-             << "\" could not be parsed."
-             << std::endl;
-        return;
-    }
-
-    // GetResults:
-    Simstr sModule = aModule.ModuleName();
-
-    List < const MultipleTextElement* > aImplServices;
-    List < const MultipleTextElement* > aNeededServices;
-
-    aModule.Get_SupportedServices(aImplServices);
-    aModule.Get_ServiceDependencies(aNeededServices);
-
-    unsigned nImplServicesSize = aImplServices.size();
-    unsigned nNeededServicesSize = aNeededServices.size();
-
-    for ( unsigned i = 0; i < nImplServicesSize; ++i )
-    {
-        const MultipleTextElement & rImpl = *aImplServices[i];
-
-        unsigned nImplDataSize = rImpl.Size();
-        for ( unsigned di = 0; di < nImplDataSize; ++di )
-        {
-            Simstr sService = ShortName(rImpl.Data(di));
-            Service * pService = aServices[sService];
-            if (pService == 0)
-            {
-                pService = new Service(rImpl.Data(di));
-                aServices[sService] = pService;
-            }
-            ServiceInfo & rSInfo = pService->AddImplementation(sModule);
-
-            for ( unsigned n = 0; n < nNeededServicesSize; ++n )
-            {
-                unsigned nNeededDataSize = aNeededServices[n]->Size();
-                for ( unsigned dn = 0; dn < nNeededDataSize; ++dn )
-                {
-                    if (! aNeededServices[n]->Data(dn).is_no_text())
-                        rSInfo.AddDependency( ShortName(aNeededServices[n]->Data(dn)) );
-                }   // end for dn
-            }   // end for n
-        }   //  end for di
-    }   // end for i
-}
-
-void
-DependencyFinder::Add2Result( const Service & i_rService )
-{
-    const ServiceInfo & rSInfo = i_rService.FirstImplementation();
-    aResult_Libraries.insert(rSInfo.Library());
-
-    const ServiceInfo::List_NeededServices & rNeededs
-            = rSInfo.NeededServices();
-    for ( StringVector::const_iterator it = rNeededs.begin();
-          it != rNeededs.end();
-          ++it )
-    {
-        std::pair< std::set< Simstr >::iterator, bool > aInsertResult
-                = aResult_Services.insert(*it);
-        if (aInsertResult.second)
-        {   // Needed service not yet known
-            Map_Services::const_iterator itFound = aServices.find(*it);
-            if ( itFound == aServices.end() )
-            {
-                std::cerr << "Needed service \""
-                          << (*it).str()
-                          << "\" not found,"
-                          << std::endl;
-            }
-            else
-            {
-                Add2Result( *(*itFound).second );
-            }
-        }   // endif (! aInsertResult.second)
-    }   // end for (it)
-}
-
-
-
-Simstr
-ShortName(const Simstr & i_rService)
-{
-    const char * pStart = i_rService.str();
-    const char * pEnd = strchr(pStart,' ');
-    if (pEnd != 0)
-        return Simstr(pStart, 0, int(pEnd-pStart));
-    else
-        return i_rService;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/dependy.hxx b/xml2cmp/source/xcd/dependy.hxx
deleted file mode 100644
index 8658eb4..0000000
--- a/xml2cmp/source/xcd/dependy.hxx
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef X2C_DEPENDY_HXX
-#define X2C_DEPENDY_HXX
-
-
-#include <vector>
-#include <map>
-#include <set>
-#include <../support/sistr.hxx>
-
-class Service;
-class ServiceInfo;
-
-typedef std::vector< Simstr>            StringVector;
-typedef std::vector< ServiceInfo* >     List_Implementations;
-typedef std::map< Simstr, Service* >    Map_Services;
-
-class Service
-{
-  public:
-                        Service(
-                            const char *        i_sName );
-
-    ServiceInfo &       AddImplementation(
-                            const char *        i_sLibrary );   /// That is: module-name.
-
-    const Simstr &      Name() const            { return sName; }
-    const ServiceInfo & FirstImplementation() const
-                                                { return *aImplementations[0]; }
-
-  private:
-    Simstr              sName;
-    List_Implementations
-                        aImplementations;
-};
-
-class ServiceInfo
-{
-  public:
-    typedef StringVector List_NeededServices;
-
-                        ServiceInfo(
-                            const char *        i_sLibrary );
-
-    void                AddDependency(
-                            const char *        i_sNeededService );
-
-    const Simstr &      Library() const         { return sImplementingLibrary; }
-    const List_NeededServices &
-                        NeededServices() const  { return aNeededServices; }
-
-
-  private:
-    Simstr              sImplementingLibrary;
-    List_NeededServices aNeededServices;
-};
-
-
-class DependencyFinder
-{
-  public:
-                        DependencyFinder();
-                        ~DependencyFinder();
-
-    void                GatherData(
-                            const char *        i_sSearchDirectory );
-
-    void                FindNeededServices(
-                            StringVector &      o_rLibraries,
-                            StringVector &      o_rServices,
-                            const Simstr &      i_rService );
-  private:
-    void                ReadFile(
-                            const char *        i_sFilename );
-    void                Add2Result(
-                            const Service &     i_rService );
-
-    // Data
-    Map_Services        aServices;
-
-    // Temporary data
-    std::set< Simstr >  aResult_Libraries;
-    std::set< Simstr >  aResult_Services;
-};
-
-
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/filebuff.cxx b/xml2cmp/source/xcd/filebuff.cxx
deleted file mode 100644
index b271a59..0000000
--- a/xml2cmp/source/xcd/filebuff.cxx
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifdef AIX
-#    undef _THREAD_SAFE
-#endif
-
-#include "filebuff.hxx"
-
-#include <string.h>
-#include <fstream>
-#include <ctype.h>
-
-
-bool
-LoadXmlFile( Buffer &           o_rBuffer,
-             const char *       i_sXmlFilePath )
-{
-    std::ifstream aXmlFile;
-
-    aXmlFile.open(i_sXmlFilePath, std::ios::in
-#if defined(WNT)
-                                          | std::ios::binary
-#endif // WNT
-    );
-
-    if (! aXmlFile)
-        return false;
-
-    // Prepare buffer:
-    aXmlFile.seekg(0, std::ios::end);
-    unsigned long nBufferSize = (unsigned long) aXmlFile.tellg();
-    o_rBuffer.SetSize(nBufferSize + 1);
-    o_rBuffer.Data()[nBufferSize] = '\0';
-    aXmlFile.seekg(0);
-
-    // Read file:
-    aXmlFile.read(o_rBuffer.Data(), (int) nBufferSize);
-    bool ret = aXmlFile.good() != 0;
-    aXmlFile.close();
-    return ret;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/filebuff.hxx b/xml2cmp/source/xcd/filebuff.hxx
deleted file mode 100644
index 8dafd08..0000000
--- a/xml2cmp/source/xcd/filebuff.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef X2C_FILEBUFF_HXX
-#define X2C_FILEBUFF_HXX
-
-
-class Buffer
-{
-  public:
-                        Buffer()                : s(0) {}
-                        ~Buffer()               { if (s) delete [] s; }
-                        operator const char *() const
-                                                { return s; }
-    char *              Data()                  { return s; }
-    void                SetSize(
-                           unsigned long                i_size )
-                                                { if (s) delete [] s; s = new char [i_size]; }
-  private:
-    char * s;
-};
-
-
-bool                LoadXmlFile(
-                        Buffer &            o_rBuffer,
-                        const char *        i_sXmlFilePath );
-
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/xcd/main.cxx b/xml2cmp/source/xcd/main.cxx
deleted file mode 100644
index 21393d3..0000000
--- a/xml2cmp/source/xcd/main.cxx
+++ /dev/null
@@ -1,248 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <iostream>
-#include <fstream>
-#include <stdio.h>
-
-
-#include <string.h>
-#include "../support/cmdline.hxx"
-#include "cr_metho.hxx"
-#include "cr_html.hxx"
-#include "xmlelem.hxx"
-#include "xmltree.hxx"
-#include "parse.hxx"
-#include "../support/syshelp.hxx"
-#include "../support/heap.hxx"
-#include "dependy.hxx"
-
-
-
-void StreamOut_TypeInfo( std::ostream& o_rOut, ModuleDescription& i_rData,
-                         const char* i_sSeparator )
-{
-    Heap    aTypesHeap(12);
-
-    // Gather types:
-    List< const MultipleTextElement * > aTypes;
-    i_rData.Get_Types(aTypes);
-
-    for ( unsigned t = 0; t < aTypes.size(); ++t )
-    {
-        unsigned i_max = aTypes[t]->Size();
-        for ( unsigned  i = 0; i < i_max; ++i )
-        {
-            aTypesHeap.InsertValue( aTypes[t]->Data(i), "" );
-        }  // end for
-    }
-
-    // Write types:
-    HeapItem * pLastHeapTop = 0;
-    for ( HeapItem * pHeapTop = aTypesHeap.ReleaseTop(); pHeapTop != 0; pHeapTop = aTypesHeap.ReleaseTop() )
-    {
-        if (pLastHeapTop != 0)
-        {
-            if ( 0 == strcmp(pHeapTop->Key(), pLastHeapTop->Key()) )
-                continue;
-            delete pLastHeapTop;
-        }
-        pLastHeapTop = pHeapTop;
-
-        WriteStr( o_rOut, i_sSeparator );
-
-        const char * sEnd = strchr( pHeapTop->Key(), ' ' );
-        if (sEnd != 0)
-        {
-            const char * sQuali = strrchr( pHeapTop->Key(), ' ' ) + 1;
-            WriteStr( o_rOut, sQuali );
-            WriteStr( o_rOut, "." );
-            o_rOut.write( pHeapTop->Key(), sEnd - pHeapTop->Key() );
-        }
-        else
-        {
-            WriteStr( o_rOut, pHeapTop->Key() );
-        }
-    }   // end for
-
-    if (pLastHeapTop != 0)
-    {
-        delete pLastHeapTop;
-        pLastHeapTop = 0;
-    }
-}
-
-void Put2StdOut_TypeInfo( ModuleDescription& i_rData )
-{
-    StreamOut_TypeInfo(std::cout, i_rData, " ");
-}
-
-void Put2File_TypeInfo( const char* i_sOutputFile, ModuleDescription& i_rData )
-{
-    std::ofstream aOut(i_sOutputFile, std::ios::out
-#if defined(WNT)
-                                               | std::ios::binary
-#endif
-    );
-    if ( !aOut )
-    {
-        std::cerr << "Error: " << i_sOutputFile << " could not be created." << std::endl;
-        return;
-    }
-
-    Simstr  sLibPrefix = i_rData.ModuleName();
-    WriteStr( aOut, sLibPrefix );
-    WriteStr( aOut, "_XML2CMPTYPES= ");
-
-    StreamOut_TypeInfo(aOut, i_rData, "\t\\\n\t\t");
-
-    aOut.close();
-}
-
-void Create_TypeInfo( const char* o_sOutputFile, ModuleDescription& i_rData )
-{
-    if ( strcmp(o_sOutputFile, "stdout") == 0 )
-    {
-        Put2StdOut_TypeInfo(i_rData);
-    }
-    else
-    {
-        Put2File_TypeInfo(o_sOutputFile,i_rData);
-    }
-}
-
-int Do_DepCommandLine(const CommandLine & i_rCommandLine)
-{
-    DependencyFinder aDependencies;
-
-    aDependencies.GatherData(i_rCommandLine.DepPath());
-    char sInput[500] = "";
-    std::vector<Simstr>  aLibs;
-    std::vector<Simstr>  aServs;
-
-
-    std::cout
-         << "\nNow you can start to put in Service names.\n"
-         << "Please use correct case, but don't use namespaces.\n"
-         << "Just the Service's own name.\n\n"
-         << "To stop the program, put in a hashmark \"#\" + ENTER.\n"
-         << std::endl;
-
-    do
-    {
-        sInput[0] = 0;
-        std::cin >> sInput;
-        Simstr sImplService(sInput);
-        if (*sInput != '#')
-        {
-            aLibs.erase( aLibs.begin(), aLibs.end() );

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list