mav60: merge to m101

11 files changed, 137 insertions, 720 deletions

diff --git a/comphelper/source/compare/makefile.mk b/comphelper/source/compare/makefile.mk
deleted file mode 100644
index 156701d1d969..000000000000
--- a/comphelper/source/compare/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=..$/..$/inc
-PRJNAME=comphelper
-TARGET=compare
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=$(SLO)$/AnyCompareFactory.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index 15241cd72dd6..a73983517751 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -24,11 +24,11 @@
  *
 ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_comphelper.hxx"
 
 #include "comphelper_module.hxx"
 #include "comphelper/anytostring.hxx"
+#include "comphelper/anycompare.hxx"
 #include "comphelper/componentbase.hxx"
 #include "comphelper/componentcontext.hxx"
 #include "comphelper/extract.hxx"
@@ -47,9 +47,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <typelib/typedescription.hxx>
 
-#include <functional>
 #include <map>
-#include <memory>
 #include <boost/shared_ptr.hpp>
 
 //........................................................................
@@ -79,26 +77,14 @@ namespace comphelper
     using ::com::sun::star::beans::Pair;
     using ::com::sun::star::uno::TypeClass;
     using ::com::sun::star::uno::TypeClass_VOID;
-    using ::com::sun::star::uno::TypeClass_CHAR;
-    using ::com::sun::star::uno::TypeClass_BOOLEAN;
-    using ::com::sun::star::uno::TypeClass_BYTE;
-    using ::com::sun::star::uno::TypeClass_SHORT;
-    using ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT;
-    using ::com::sun::star::uno::TypeClass_LONG;
-    using ::com::sun::star::uno::TypeClass_UNSIGNED_LONG;
-    using ::com::sun::star::uno::TypeClass_HYPER;
-    using ::com::sun::star::uno::TypeClass_UNSIGNED_HYPER;
-    using ::com::sun::star::uno::TypeClass_FLOAT;
-    using ::com::sun::star::uno::TypeClass_DOUBLE;
-    using ::com::sun::star::uno::TypeClass_STRING;
-    using ::com::sun::star::uno::TypeClass_TYPE;
-    using ::com::sun::star::uno::TypeClass_ENUM;
-    using ::com::sun::star::uno::TypeClass_INTERFACE;
     using ::com::sun::star::uno::TypeClass_UNKNOWN;
     using ::com::sun::star::uno::TypeClass_ANY;
     using ::com::sun::star::uno::TypeClass_EXCEPTION;
     using ::com::sun::star::uno::TypeClass_STRUCT;
     using ::com::sun::star::uno::TypeClass_UNION;
+    using ::com::sun::star::uno::TypeClass_FLOAT;
+    using ::com::sun::star::uno::TypeClass_DOUBLE;
+    using ::com::sun::star::uno::TypeClass_INTERFACE;
     using ::com::sun::star::lang::XServiceInfo;
     using ::com::sun::star::uno::XComponentContext;
     using ::com::sun::star::container::XEnumeration;
@@ -108,136 +94,6 @@ namespace comphelper
     /** === end UNO using === **/
 
     //====================================================================
-    //= IKeyPredicateLess
-    //====================================================================
-    class SAL_NO_VTABLE IKeyPredicateLess
-    {
-    public:
-        virtual bool isLess( const Any& _lhs, const Any& _rhs ) const = 0;
-        virtual ~IKeyPredicateLess() {}
-    };
-
-    //====================================================================
-    //= LessPredicateAdapter
-    //====================================================================
-    struct LessPredicateAdapter : public ::std::binary_function< Any, Any, bool >
-    {
-        LessPredicateAdapter( const IKeyPredicateLess& _predicate )
-            :m_predicate( _predicate )
-        {
-        }
-
-        bool operator()( const Any& _lhs, const Any& _rhs ) const
-        {
-            return m_predicate.isLess( _lhs, _rhs );
-        }
-
-    private:
-        const IKeyPredicateLess&    m_predicate;
-
-    private:
-        LessPredicateAdapter(); // never implemented
-    };
-
-    //====================================================================
-    //= ScalarPredicateLess
-    //====================================================================
-    template< typename SCALAR >
-    class ScalarPredicateLess : public IKeyPredicateLess
-    {
-    public:
-        virtual bool isLess( const Any& _lhs, const Any& _rhs ) const
-        {
-            SCALAR lhs(0), rhs(0);
-            if  (   !( _lhs >>= lhs )
-                ||  !( _rhs >>= rhs )
-                )
-                throw IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unsupported key type." ) ), NULL, 1 );
-            return lhs < rhs;
-        }
-    };
-
-    //====================================================================
-    //= StringPredicateLess
-    //====================================================================
-    class StringPredicateLess : public IKeyPredicateLess
-    {
-    public:
-        virtual bool isLess( const Any& _lhs, const Any& _rhs ) const
-        {
-            ::rtl::OUString lhs, rhs;
-            if  (   !( _lhs >>= lhs )
-                ||  !( _rhs >>= rhs )
-                )
-                throw IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unsupported key type." ) ), NULL, 1 );
-            return lhs < rhs;
-        }
-    };
-
-    //====================================================================
-    //= TypePredicateLess
-    //====================================================================
-    class TypePredicateLess : public IKeyPredicateLess
-    {
-    public:
-        virtual bool isLess( const Any& _lhs, const Any& _rhs ) const
-        {
-            Type lhs, rhs;
-            if  (   !( _lhs >>= lhs )
-                ||  !( _rhs >>= rhs )
-                )
-                throw IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unsupported key type." ) ), NULL, 1 );
-            return lhs.getTypeName() < rhs.getTypeName();
-        }
-    };
-
-    //====================================================================
-    //= EnumPredicateLess
-    //====================================================================
-    class EnumPredicateLess : public IKeyPredicateLess
-    {
-    public:
-        EnumPredicateLess( const Type& _enumType )
-            :m_enumType( _enumType )
-        {
-        }
-
-        virtual bool isLess( const Any& _lhs, const Any& _rhs ) const
-        {
-            sal_Int32 lhs(0), rhs(0);
-            if  (   !::cppu::enum2int( lhs, _lhs )
-                ||  !::cppu::enum2int( rhs, _rhs )
-                ||  !_lhs.getValueType().equals( m_enumType )
-                ||  !_rhs.getValueType().equals( m_enumType )
-                )
-                throw IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unsupported key type." ) ), NULL, 1 );
-            return lhs < rhs;
-        }
-
-    private:
-        const Type  m_enumType;
-    };
-
-    //====================================================================
-    //= InterfacePredicateLess
-    //====================================================================
-    class InterfacePredicateLess : public IKeyPredicateLess
-    {
-    public:
-        virtual bool isLess( const Any& _lhs, const Any& _rhs ) const
-        {
-            if  (   ( _lhs.getValueTypeClass() != TypeClass_INTERFACE )
-                ||  ( _rhs.getValueTypeClass() != TypeClass_INTERFACE )
-                )
-                throw IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unsupported key type." ) ), NULL, 1 );
-
-            Reference< XInterface > lhs( _lhs, UNO_QUERY );
-            Reference< XInterface > rhs( _rhs, UNO_QUERY );
-            return lhs.get() < rhs.get();
-        }
-    };
-
-    //====================================================================
     //= MapData
     //====================================================================
     class IMapModificationListener;
@@ -549,58 +405,9 @@ namespace comphelper
             throw IllegalTypeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unsupported value type." ) ), *this );
 
         // create the comparator for the KeyType, and throw if the type is not supported
-        TypeClass eKeyTypeClass = aKeyType.getTypeClass();
-        ::std::auto_ptr< IKeyPredicateLess > pComparator;
-        switch ( eKeyTypeClass )
-        {
-        case TypeClass_CHAR:
-            pComparator.reset( new ScalarPredicateLess< sal_Unicode >() );
-            break;
-        case TypeClass_BOOLEAN:
-            pComparator.reset( new ScalarPredicateLess< sal_Bool >() );
-            break;
-        case TypeClass_BYTE:
-            pComparator.reset( new ScalarPredicateLess< sal_Int8 >() );
-            break;
-        case TypeClass_SHORT:
-            pComparator.reset( new ScalarPredicateLess< sal_Int16 >() );
-            break;
-        case TypeClass_UNSIGNED_SHORT:
-            pComparator.reset( new ScalarPredicateLess< sal_uInt16 >() );
-            break;
-        case TypeClass_LONG:
-            pComparator.reset( new ScalarPredicateLess< sal_Int32 >() );
-            break;
-        case TypeClass_UNSIGNED_LONG:
-            pComparator.reset( new ScalarPredicateLess< sal_uInt32 >() );
-            break;
-        case TypeClass_HYPER:
-            pComparator.reset( new ScalarPredicateLess< sal_Int64 >() );
-            break;
-        case TypeClass_UNSIGNED_HYPER:
-            pComparator.reset( new ScalarPredicateLess< sal_uInt64 >() );
-            break;
-        case TypeClass_FLOAT:
-            pComparator.reset( new ScalarPredicateLess< float >() );
-            break;
-        case TypeClass_DOUBLE:
-            pComparator.reset( new ScalarPredicateLess< double >() );
-            break;
-        case TypeClass_STRING:
-            pComparator.reset( new StringPredicateLess() );
-            break;
-        case TypeClass_TYPE:
-            pComparator.reset( new TypePredicateLess() );
-            break;
-        case TypeClass_ENUM:
-            pComparator.reset( new EnumPredicateLess( aKeyType ) );
-            break;
-        case TypeClass_INTERFACE:
-            pComparator.reset( new InterfacePredicateLess() );
-            break;
-        default:
+        ::std::auto_ptr< IKeyPredicateLess > pComparator( getStandardLessPredicate( aKeyType, NULL ) );
+        if ( !pComparator.get() )
             throw IllegalTypeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unsupported key type." ) ), *this );
-        }
 
         // init members
         m_aData.m_aKeyType = aKeyType;
diff --git a/comphelper/source/container/makefile.mk b/comphelper/source/container/makefile.mk
deleted file mode 100644
index 97a066f9802a..000000000000
--- a/comphelper/source/container/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=..$/..$/inc
-PRJNAME=comphelper
-TARGET=container
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=\
-            $(SLO)$/namecontainer.obj \
-            $(SLO)$/enumhelper.obj	\
-            $(SLO)$/container.obj \
-            $(SLO)$/containermultiplexer.obj \
-            $(SLO)$/IndexedPropertyValuesContainer.obj	\
-            $(SLO)$/embeddedobjectcontainer.obj      \
-            $(SLO)$/NamedPropertyValuesContainer.obj \
-            $(SLO)$/enumerablemap.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/comphelper/source/eventattachermgr/makefile.mk b/comphelper/source/eventattachermgr/makefile.mk
deleted file mode 100644
index 26aca0467d7d..000000000000
--- a/comphelper/source/eventattachermgr/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=..$/..$/inc
-PRJNAME=comphelper
-TARGET=evtattmgr
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings common for the whole project -----
-
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=	$(SLO)$/eventattachermgr.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/comphelper/source/misc/anycompare.cxx b/comphelper/source/misc/anycompare.cxx
new file mode 100755
index 000000000000..a86174daf08e
--- /dev/null
+++ b/comphelper/source/misc/anycompare.cxx
@@ -0,0 +1,131 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_comphelper.hxx"
+
+#include "comphelper/anycompare.hxx"
+
+/** === begin UNO includes === **/
+/** === end UNO includes === **/
+
+//......................................................................................................................
+namespace comphelper
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::uno::TypeClass_CHAR;
+    using ::com::sun::star::uno::TypeClass_BOOLEAN;
+    using ::com::sun::star::uno::TypeClass_BYTE;
+    using ::com::sun::star::uno::TypeClass_SHORT;
+    using ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT;
+    using ::com::sun::star::uno::TypeClass_LONG;
+    using ::com::sun::star::uno::TypeClass_UNSIGNED_LONG;
+    using ::com::sun::star::uno::TypeClass_HYPER;
+    using ::com::sun::star::uno::TypeClass_UNSIGNED_HYPER;
+    using ::com::sun::star::uno::TypeClass_FLOAT;
+    using ::com::sun::star::uno::TypeClass_DOUBLE;
+    using ::com::sun::star::uno::TypeClass_STRING;
+    using ::com::sun::star::uno::TypeClass_TYPE;
+    using ::com::sun::star::uno::TypeClass_ENUM;
+    using ::com::sun::star::uno::TypeClass_INTERFACE;
+    using ::com::sun::star::i18n::XCollator;
+    /** === end UNO using === **/
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::std::auto_ptr< IKeyPredicateLess > getStandardLessPredicate( Type const & i_type, Reference< XCollator > const & i_collator )
+    {
+        ::std::auto_ptr< IKeyPredicateLess > pComparator;
+        switch ( i_type.getTypeClass() )
+        {
+        case TypeClass_CHAR:
+            pComparator.reset( new ScalarPredicateLess< sal_Unicode >() );
+            break;
+        case TypeClass_BOOLEAN:
+            pComparator.reset( new ScalarPredicateLess< sal_Bool >() );
+            break;
+        case TypeClass_BYTE:
+            pComparator.reset( new ScalarPredicateLess< sal_Int8 >() );
+            break;
+        case TypeClass_SHORT:
+            pComparator.reset( new ScalarPredicateLess< sal_Int16 >() );
+            break;
+        case TypeClass_UNSIGNED_SHORT:
+            pComparator.reset( new ScalarPredicateLess< sal_uInt16 >() );
+            break;
+        case TypeClass_LONG:
+            pComparator.reset( new ScalarPredicateLess< sal_Int32 >() );
+            break;
+        case TypeClass_UNSIGNED_LONG:
+            pComparator.reset( new ScalarPredicateLess< sal_uInt32 >() );
+            break;
+        case TypeClass_HYPER:
+            pComparator.reset( new ScalarPredicateLess< sal_Int64 >() );
+            break;
+        case TypeClass_UNSIGNED_HYPER:
+            pComparator.reset( new ScalarPredicateLess< sal_uInt64 >() );
+            break;
+        case TypeClass_FLOAT:
+            pComparator.reset( new ScalarPredicateLess< float >() );
+            break;
+        case TypeClass_DOUBLE:
+            pComparator.reset( new ScalarPredicateLess< double >() );
+            break;
+        case TypeClass_STRING:
+            if ( i_collator.is() )
+                pComparator.reset( new StringCollationPredicateLess( i_collator ) );
+            else
+                pComparator.reset( new StringPredicateLess() );
+            break;
+        case TypeClass_TYPE:
+            pComparator.reset( new TypePredicateLess() );
+            break;
+        case TypeClass_ENUM:
+            pComparator.reset( new EnumPredicateLess( i_type ) );
+            break;
+        case TypeClass_INTERFACE:
+            pComparator.reset( new InterfacePredicateLess() );
+            break;
+        default:
+            break;
+        }
+        return pComparator;
+    }
+
+//......................................................................................................................
+} // namespace comphelper
+//......................................................................................................................
diff --git a/comphelper/source/misc/makefile.mk b/comphelper/source/misc/makefile.mk
deleted file mode 100644
index 0bb4defb4165..000000000000
--- a/comphelper/source/misc/makefile.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=comphelper
-TARGET=misc
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=   \
-            $(SLO)$/accessiblecomponenthelper.obj \
-            $(SLO)$/accessiblecontexthelper.obj \
-            $(SLO)$/accessibleeventbuffer.obj \
-            $(SLO)$/accessibleeventnotifier.obj  \
-            $(SLO)$/accessiblekeybindinghelper.obj \
-            $(SLO)$/accessibleselectionhelper.obj \
-            $(SLO)$/accessibletexthelper.obj \
-            $(SLO)$/accessiblewrapper.obj \
-            $(SLO)$/accimplaccess.obj \
-            $(SLO)$/anytostring.obj \
-            $(SLO)$/asyncnotification.obj \
-            $(SLO)$/componentcontext.obj \
-            $(SLO)$/componentmodule.obj \
-            $(SLO)$/configurationhelper.obj \
-            $(SLO)$/docpasswordhelper.obj \
-            $(SLO)$/docpasswordrequest.obj \
-            $(SLO)$/documentinfo.obj \
-            $(SLO)$/evtmethodhelper.obj \
-            $(SLO)$/documentiologring.obj \
-            $(SLO)$/evtlistenerhlp.obj \
-            $(SLO)$/ihwrapnofilter.obj \
-            $(SLO)$/instancelocker.obj \
-            $(SLO)$/interaction.obj \
-            $(SLO)$/legacysingletonfactory.obj \
-            $(SLO)$/listenernotification.obj \
-            $(SLO)$/locale.obj \
-            $(SLO)$/logging.obj \
-            $(SLO)$/mediadescriptor.obj \
-            $(SLO)$/mimeconfighelper.obj \
-            $(SLO)$/namedvaluecollection.obj \
-            $(SLO)$/numberedcollection.obj \
-            $(SLO)$/numbers.obj \
-            $(SLO)$/officeresourcebundle.obj \
-            $(SLO)$/officerestartmanager.obj \
-            $(SLO)$/proxyaggregation.obj \
-            $(SLO)$/regpathhelper.obj \
-            $(SLO)$/scopeguard.obj \
-            $(SLO)$/SelectionMultiplex.obj \
-            $(SLO)$/sequenceashashmap.obj \
-            $(SLO)$/sequence.obj \
-            $(SLO)$/servicedecl.obj \
-            $(SLO)$/serviceinfohelper.obj \
-            $(SLO)$/sharedmutex.obj \
-            $(SLO)$/synchronousdispatch.obj \
-            $(SLO)$/storagehelper.obj \
-            $(SLO)$/string.obj \
-            $(SLO)$/types.obj \
-            $(SLO)$/uieventslogger.obj \
-            $(SLO)$/weakeventlistener.obj \
-            $(SLO)$/weak.obj \
-            $(SLO)$/comphelper_module.obj \
-            $(SLO)$/comphelper_services.obj \
-            $(SLO)$/componentbase.obj \
-            $(SLO)$/stillreadwriteinteraction.obj \
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/comphelper/source/officeinstdir/makefile.mk b/comphelper/source/officeinstdir/makefile.mk
deleted file mode 100644
index dfe195da662a..000000000000
--- a/comphelper/source/officeinstdir/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=..$/..$/inc
-PRJNAME=comphelper
-TARGET=officeinstdir
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings common for the whole project -----
-
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=   $(SLO)$/officeinstallationdirectories.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/comphelper/source/processfactory/makefile.mk b/comphelper/source/processfactory/makefile.mk
deleted file mode 100644
index 531291bb3a15..000000000000
--- a/comphelper/source/processfactory/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=comphelper
-TARGET=processfactory
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings common for the whole project -----
-
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Types -------------------------------------
-
-# --- Files -------------------------------------
-
-SLOFILES=	$(SLO)$/processfactory.obj	\
-            $(SLO)$/componentfactory.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/comphelper/source/property/makefile.mk b/comphelper/source/property/makefile.mk
deleted file mode 100644
index 1bcdb4c8dd63..000000000000
--- a/comphelper/source/property/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=..$/..$/inc
-PRJNAME=comphelper
-TARGET=property
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES= 	\
-            $(SLO)$/MasterPropertySetInfo.obj \
-            $(SLO)$/MasterPropertySet.obj \
-            $(SLO)$/ChainablePropertySetInfo.obj \
-            $(SLO)$/ChainablePropertySet.obj \
-            $(SLO)$/TypeGeneration.obj \
-            $(SLO)$/genericpropertyset.obj\
-            $(SLO)$/propertysethelper.obj \
-            $(SLO)$/propertysetinfo.obj \
-            $(SLO)$/composedprops.obj \
-            $(SLO)$/propagg.obj \
-            $(SLO)$/property.obj \
-            $(SLO)$/propmultiplex.obj \
-            $(SLO)$/propstate.obj \
-            $(SLO)$/propertystatecontainer.obj \
-            $(SLO)$/propertycontainer.obj \
-            $(SLO)$/propertycontainerhelper.obj \
-            $(SLO)$/propertybag.obj \
-            $(SLO)$/opropertybag.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/comphelper/source/streaming/makefile.mk b/comphelper/source/streaming/makefile.mk
deleted file mode 100644
index 2a6ea38ca65e..000000000000
--- a/comphelper/source/streaming/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=comphelper
-TARGET=streaming
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=	$(SLO)$/basicio.obj \
-            $(SLO)$/oslfile2streamwrap.obj	\
-            $(SLO)$/seqstream.obj	\
-            $(SLO)$/seqinputstreamserv.obj	\
-            $(SLO)$/seqoutputstreamserv.obj  \
-            $(SLO)$/streamsection.obj \
-            $(SLO)$/seekableinput.obj \
-            $(SLO)$/otransactedfilestream.obj \
-            $(SLO)$/memorystream.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/comphelper/source/xml/makefile.mk b/comphelper/source/xml/makefile.mk
deleted file mode 100644
index 8fa34b2477a2..000000000000
--- a/comphelper/source/xml/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=comphelper
-TARGET=xml
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=	\
-            $(SLO)$/ofopxmlhelper.obj \
-            $(SLO)$/attributelist.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-