sb131: merged in re/DEV300_next towards DEV300_m94

12 files changed, 157 insertions, 802 deletions

diff --git a/comphelper/inc/comphelper/namedvaluecollection.hxx b/comphelper/inc/comphelper/namedvaluecollection.hxx
index 72cd0e7cdfbe..e13059361b0a 100644
--- a/comphelper/inc/comphelper/namedvaluecollection.hxx
+++ b/comphelper/inc/comphelper/namedvaluecollection.hxx
@@ -39,6 +39,7 @@
 
 #include <memory>
 #include <algorithm>
+#include <vector>
 
 //........................................................................
 namespace comphelper
@@ -91,6 +92,11 @@ namespace comphelper
 
         ~NamedValueCollection();
 
+        inline void assign( const ::com::sun::star::uno::Any& i_rWrappedElements )
+        {
+            impl_assign( i_rWrappedElements );
+        }
+
         inline void assign( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments )
         {
             impl_assign( _rArguments );
@@ -117,6 +123,11 @@ namespace comphelper
         /// determines whether the collection is empty
         bool    empty() const;
 
+        /** returns the names of all elements in the collection
+        */
+        ::std::vector< ::rtl::OUString >
+                getNames() const;
+
         /** merges the content of another collection into |this|
             @param _rAdditionalValues
                 the collection whose values are to be merged
@@ -312,6 +323,7 @@ namespace comphelper
         }
 
     private:
+        void    impl_assign( const ::com::sun::star::uno::Any& i_rWrappedElements );
         void    impl_assign( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments );
         void    impl_assign( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArguments );
         void    impl_assign( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _rArguments );
diff --git a/comphelper/inc/comphelper/optionalvalue.hxx b/comphelper/inc/comphelper/optionalvalue.hxx
deleted file mode 100644
index f63e1cde51aa..000000000000
--- a/comphelper/inc/comphelper/optionalvalue.hxx
+++ /dev/null
@@ -1,187 +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.
- *
- ************************************************************************/
-
-#ifndef _COMPHELPER_OPTIONALVALUE_HXX
-#define _COMPHELPER_OPTIONALVALUE_HXX
-
-#include <com/sun/star/uno/Any.hxx>
-
-namespace comphelper
-{
-
-/** @deprecated
-    Use boost/optional.hpp instead.
-*/
-
-
-
-    /* Definition of OptionalValue template */
-
-    /** This template provides 'optionality' for the given value type.
-
-        Especially for PODs, optionality either needs to be achieved
-        by special 'magic' values (i.e. an int value is not set when
-        -1 etc.), or an additional bool denoting value
-        validity. This template encapsulates the latter into an atomic
-        data type.
-
-        @tpl Element
-        The value type that should be made optional
-     */
-    template< typename Element > class OptionalValue
-    {
-    public:
-        typedef Element ValueType;
-
-        /** Default-construct the value.
-
-            A default-constructed value is not valid. You have to
-            explicitely set a value.
-         */
-        OptionalValue() :
-            maValue(),
-            mbValid( false )
-        {
-        }
-
-        /** Construct the value.
-
-            An explicitely constructed value is valid. To create an
-            invalid value, you have to default-construct it.
-         */
-        OptionalValue( const Element& rValue ) :
-            maValue( rValue ),
-            mbValid( true )
-        {
-        }
-
-        // default copy/assignment operators are okay here
-        //OptionalValue(const OptionalValue&);
-        //OptionalValue& operator=( const OptionalValue& );
-
-        /** Query whether the value is valid
-
-            @return true, if this object contains a valid value.
-         */
-        bool isValid() const
-        {
-            return mbValid;
-        }
-
-        /** Set a value.
-
-            After this call, the object contains a valid value.
-         */
-        void setValue( const Element& rValue )
-        {
-            maValue = rValue;
-            mbValid = true;
-        }
-
-        /** Get the value.
-
-            The return value of this method is undefined, if the
-            object does not contain a valid value.
-         */
-        Element getValue() const
-        {
-            return maValue;
-        }
-
-        /** Clear the value.
-
-            After this call, the object no longer contains a valid
-            value.
-         */
-        void clearValue()
-        {
-            mbValid = false;
-        }
-
-        // NOTE: The following two methods would optimally have been
-        // implemented as operator>>=/operator<<=
-        // overloads. Unfortunately, there's already a templatized
-        // version for those two methods, namely for UNO interface
-        // types. Adding a second would lead to ambiguities.
-
-        /** Export the value into an Any.
-
-            This method extracts the value into an Any. If the value
-            is invalid, the Any will be cleared.
-
-            @return true, if the value has been successfully
-            transferred to the Any. Clearing the Any from an invalid
-            object is also considered a successful operation.
-         */
-        bool exportValue( ::com::sun::star::uno::Any& o_rAny )
-        {
-            o_rAny.clear();
-
-            if( isValid() )
-            {
-                if( !(o_rAny <<= getValue()) )
-                    return false;
-            }
-
-            return true;
-        }
-
-        /** Import the value from an Any.
-
-            This method imports the value from an Any. If the Any
-            is invalid, the object will get an invalid value.
-
-            @return true, if the value has been successfully
-            transferred from the Any. Setting the value to invalid
-            from an empty Any is also considered a successful
-            operation.
-         */
-        bool importValue( const ::com::sun::star::uno::Any& rAny )
-        {
-            clearValue();
-
-            if( rAny.hasValue() )
-            {
-                Element tmp;
-
-                if( !(rAny >>= tmp) )
-                    return false;
-
-                setValue( tmp );
-            }
-
-            return true;
-        }
-
-    private:
-        Element     maValue;
-        bool        mbValid;
-    };
-
-}
-
-#endif /* _COMPHELPER_OPTIONALVALUE_HXX */
diff --git a/comphelper/inc/comphelper/property.hxx b/comphelper/inc/comphelper/property.hxx
index 5631cf5670f2..9b5b1a9804fe 100644
--- a/comphelper/inc/comphelper/property.hxx
+++ b/comphelper/inc/comphelper/property.hxx
@@ -150,11 +150,11 @@ COMPHELPER_DLLPUBLIC void copyProperties(const staruno::Reference<starbeans::XPr
                     sal_False, if the value could be converted and has not changed
     @exception      InvalidArgumentException thrown if the value could not be converted to the requested type (which is the template argument)
 */
-template <class TYPE>
-sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, const TYPE& _rCurrentValue)
+template <typename T>
+sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, const T& _rCurrentValue)
 {
     sal_Bool bModified(sal_False);
-    TYPE aNewValue;
+    T aNewValue = T();
     ::cppu::convertPropertyValue(aNewValue, _rValueToSet);
     if (aNewValue != _rCurrentValue)
     {
@@ -207,7 +207,7 @@ sal_Bool tryPropertyValueEnum(staruno::Any& /*out*/_rConvertedValue, staruno::An
 inline sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, sal_Bool _bCurrentValue)
 {
     sal_Bool bModified(sal_False);
-    sal_Bool bNewValue;
+    sal_Bool bNewValue(sal_False);
     ::cppu::convertPropertyValue(bNewValue, _rValueToSet);
     if (bNewValue != _bCurrentValue)
     {
diff --git a/comphelper/inc/comphelper/querydeep.hxx b/comphelper/inc/comphelper/querydeep.hxx
deleted file mode 100644
index 4115412d8d6c..000000000000
--- a/comphelper/inc/comphelper/querydeep.hxx
+++ /dev/null
@@ -1,484 +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.
- *
- ************************************************************************/
-
-#ifndef _COMPHELPER_QUERYDEEPINTERFACE_HXX
-#define _COMPHELPER_QUERYDEEPINTERFACE_HXX
-
-#include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Type.hxx>
-
-/** */ //for docpp
-namespace comphelper
-{
-
-//--------------------------------------------------------------------------------------------------------
-/**
- * Inspect interfaces types whether they are related by inheritance.
- *<BR>
- * @return      true if rType is derived from rBaseType
- * @param       rBaseType   a <type>Type</type> of an interface.
- * @param       rType       a <type>Type</type> of an interface.
- */
-sal_Bool isDerivedFrom(
-    const ::com::sun::star::uno::Type & rBaseType,
-    const ::com::sun::star::uno::Type & rType );
-
-//--------------------------------------------------------------------------------------------------------
-/**
- * Inspect interface types whether they are related by inheritance.
- *<BR>
- * @return      true if p is of a type derived from rBaseType
- * @param       rBaseType   a <type>Type</type> of an interface.
- * @param       p           a pointer to an interface.
- */
-template <class Interface>
-inline sal_Bool isDerivedFrom(
-    const ::com::sun::star::uno::Type& rBaseType,
-    Interface* /*p*/)
-{
-    return isDerivedFrom(rBaseType, Interface::static_type());
-}
-
-//--------------------------------------------------------------------------------------------------------
-// possible optimization ?
-//  Any aRet(::cppu::queryInterface(rType, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12));
-//  if (aRet.hasValue())
-//      return aRet;
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param       p1      a pointer to an interface.
- */
-template< class Interface1 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- */
-template< class Interface1, class Interface2 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else if (isDerivedFrom(rType, Interface4::static_type()))
-        return ::com::sun::star::uno::Any( &p4, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else if (isDerivedFrom(rType, Interface4::static_type()))
-        return ::com::sun::star::uno::Any( &p4, rType );
-    else if (isDerivedFrom(rType, Interface5::static_type()))
-        return ::com::sun::star::uno::Any( &p5, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
-          class Interface6 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
-    Interface6 * p6 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else if (isDerivedFrom(rType, Interface4::static_type()))
-        return ::com::sun::star::uno::Any( &p4, rType );
-    else if (isDerivedFrom(rType, Interface5::static_type()))
-        return ::com::sun::star::uno::Any( &p5, rType );
-    else if (isDerivedFrom(rType, Interface6::static_type()))
-        return ::com::sun::star::uno::Any( &p6, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
-          class Interface6, class Interface7 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
-    Interface6 * p6, Interface7 * p7 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else if (isDerivedFrom(rType, Interface4::static_type()))
-        return ::com::sun::star::uno::Any( &p4, rType );
-    else if (isDerivedFrom(rType, Interface5::static_type()))
-        return ::com::sun::star::uno::Any( &p5, rType );
-    else if (isDerivedFrom(rType, Interface6::static_type()))
-        return ::com::sun::star::uno::Any( &p6, rType );
-    else if (isDerivedFrom(rType, Interface7::static_type()))
-        return ::com::sun::star::uno::Any( &p7, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
-          class Interface6, class Interface7, class Interface8 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
-    Interface6 * p6, Interface7 * p7, Interface8 * p8 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else if (isDerivedFrom(rType, Interface4::static_type()))
-        return ::com::sun::star::uno::Any( &p4, rType );
-    else if (isDerivedFrom(rType, Interface5::static_type()))
-        return ::com::sun::star::uno::Any( &p5, rType );
-    else if (isDerivedFrom(rType, Interface6::static_type()))
-        return ::com::sun::star::uno::Any( &p6, rType );
-    else if (isDerivedFrom(rType, Interface7::static_type()))
-        return ::com::sun::star::uno::Any( &p7, rType );
-    else if (isDerivedFrom(rType, Interface8::static_type()))
-        return ::com::sun::star::uno::Any( &p8, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
- * @param       p9      a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
-          class Interface6, class Interface7, class Interface8, class Interface9 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
-    Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else if (isDerivedFrom(rType, Interface4::static_type()))
-        return ::com::sun::star::uno::Any( &p4, rType );
-    else if (isDerivedFrom(rType, Interface5::static_type()))
-        return ::com::sun::star::uno::Any( &p5, rType );
-    else if (isDerivedFrom(rType, Interface6::static_type()))
-        return ::com::sun::star::uno::Any( &p6, rType );
-    else if (isDerivedFrom(rType, Interface7::static_type()))
-        return ::com::sun::star::uno::Any( &p7, rType );
-    else if (isDerivedFrom(rType, Interface8::static_type()))
-        return ::com::sun::star::uno::Any( &p8, rType );
-    else if (isDerivedFrom(rType, Interface9::static_type()))
-        return ::com::sun::star::uno::Any( &p9, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
- * @param       p9      a pointer to an interface.
- * @param       p10     a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
-          class Interface6, class Interface7, class Interface8, class Interface9, class Interface10 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
-    Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else if (isDerivedFrom(rType, Interface4::static_type()))
-        return ::com::sun::star::uno::Any( &p4, rType );
-    else if (isDerivedFrom(rType, Interface5::static_type()))
-        return ::com::sun::star::uno::Any( &p5, rType );
-    else if (isDerivedFrom(rType, Interface6::static_type()))
-        return ::com::sun::star::uno::Any( &p6, rType );
-    else if (isDerivedFrom(rType, Interface7::static_type()))
-        return ::com::sun::star::uno::Any( &p7, rType );
-    else if (isDerivedFrom(rType, Interface8::static_type()))
-        return ::com::sun::star::uno::Any( &p8, rType );
-    else if (isDerivedFrom(rType, Interface9::static_type()))
-        return ::com::sun::star::uno::Any( &p9, rType );
-    else if (isDerivedFrom(rType, Interface10::static_type()))
-        return ::com::sun::star::uno::Any( &p10, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
- * @param       p9      a pointer to an interface.
- * @param       p10     a pointer to an interface.
- * @param       p11     a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
-          class Interface6, class Interface7, class Interface8, class Interface9, class Interface10,
-          class Interface11 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
-    Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10,
-    Interface11 * p11 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else if (isDerivedFrom(rType, Interface4::static_type()))
-        return ::com::sun::star::uno::Any( &p4, rType );
-    else if (isDerivedFrom(rType, Interface5::static_type()))
-        return ::com::sun::star::uno::Any( &p5, rType );
-    else if (isDerivedFrom(rType, Interface6::static_type()))
-        return ::com::sun::star::uno::Any( &p6, rType );
-    else if (isDerivedFrom(rType, Interface7::static_type()))
-        return ::com::sun::star::uno::Any( &p7, rType );
-    else if (isDerivedFrom(rType, Interface8::static_type()))
-        return ::com::sun::star::uno::Any( &p8, rType );
-    else if (isDerivedFrom(rType, Interface9::static_type()))
-        return ::com::sun::star::uno::Any( &p9, rType );
-    else if (isDerivedFrom(rType, Interface10::static_type()))
-        return ::com::sun::star::uno::Any( &p10, rType );
-    else if (isDerivedFrom(rType, Interface11::static_type()))
-        return ::com::sun::star::uno::Any( &p11, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *<BR>
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
- * @param       p9      a pointer to an interface.
- * @param       p10     a pointer to an interface.
- * @param       p11     a pointer to an interface.
- * @param       p12     a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
-          class Interface6, class Interface7, class Interface8, class Interface9, class Interface10,
-          class Interface11, class Interface12 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
-    Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10,
-    Interface11 * p11, Interface12 * p12 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else if (isDerivedFrom(rType, Interface4::static_type()))
-        return ::com::sun::star::uno::Any( &p4, rType );
-    else if (isDerivedFrom(rType, Interface5::static_type()))
-        return ::com::sun::star::uno::Any( &p5, rType );
-    else if (isDerivedFrom(rType, Interface6::static_type()))
-        return ::com::sun::star::uno::Any( &p6, rType );
-    else if (isDerivedFrom(rType, Interface7::static_type()))
-        return ::com::sun::star::uno::Any( &p7, rType );
-    else if (isDerivedFrom(rType, Interface8::static_type()))
-        return ::com::sun::star::uno::Any( &p8, rType );
-    else if (isDerivedFrom(rType, Interface9::static_type()))
-        return ::com::sun::star::uno::Any( &p9, rType );
-    else if (isDerivedFrom(rType, Interface10::static_type()))
-        return ::com::sun::star::uno::Any( &p10, rType );
-    else if (isDerivedFrom(rType, Interface11::static_type()))
-        return ::com::sun::star::uno::Any( &p11, rType );
-    else if (isDerivedFrom(rType, Interface12::static_type()))
-        return ::com::sun::star::uno::Any( &p12, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-} // namespace comphelper
-
-#endif // _COMPHELPER_QUERYDEEPINTERFACE_HXX
-
diff --git a/comphelper/inc/comphelper/scopeguard.hxx b/comphelper/inc/comphelper/scopeguard.hxx
index 4841a564ae61..1fdd179404a2 100644
--- a/comphelper/inc/comphelper/scopeguard.hxx
+++ b/comphelper/inc/comphelper/scopeguard.hxx
@@ -33,6 +33,7 @@
 #endif
 #include "boost/function.hpp"
 #include "boost/noncopyable.hpp"
+#include "boost/bind.hpp"
 
 namespace comphelper {
 
@@ -66,6 +67,21 @@ private:
     exc_handling const m_excHandling;
 };
 
+class COMPHELPER_DLLPUBLIC FlagGuard : ScopeGuard
+{
+public:
+    explicit FlagGuard( bool& i_flagRef, exc_handling i_excHandling = IGNORE_EXCEPTIONS )
+        :ScopeGuard( ::boost::bind( ResetFlag, ::boost::ref( i_flagRef ) ), i_excHandling )
+    {
+    }
+
+private:
+    static void ResetFlag( bool& i_flagRef )
+    {
+        i_flagRef = false;
+    }
+};
+
 } // namespace comphelper
 
 #endif // ! defined(INCLUDED_COMPHELPER_SCOPEGUARD_HXX)
diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx
index adf120b3bae2..5ea7972e29a2 100644
--- a/comphelper/inc/comphelper/servicedecl.hxx
+++ b/comphelper/inc/comphelper/servicedecl.hxx
@@ -67,7 +67,7 @@ typedef ::boost::function3<
     The declaration can be done in various ways, the (simplest) form is
 
     <pre>
-    class MyClass : cppu::WeakImplHelper2<XInterface1, XInterface2> {
+    class MyClass : public cppu::WeakImplHelper2<XInterface1, XInterface2> {
     public:
         MyClass( uno::Reference<uno::XComponentContext> const& xContext )
         [...]
@@ -85,7 +85,7 @@ typedef ::boost::function3<
     context:
 
     <pre>
-    class MyClass : cppu::WeakImplHelper2<XInterface1, XInterface2> {
+    class MyClass : public cppu::WeakImplHelper2<XInterface1, XInterface2> {
     public:
         MyClass( uno::Sequence<uno::Any> const& args,
                  uno::Reference<uno:XComponentContext> const& xContext )
diff --git a/comphelper/source/misc/makefile.mk b/comphelper/source/misc/makefile.mk
index cecba554b332..0bb4defb4165 100644
--- a/comphelper/source/misc/makefile.mk
+++ b/comphelper/source/misc/makefile.mk
@@ -74,7 +74,6 @@ SLOFILES=   \
             $(SLO)$/officeresourcebundle.obj \
             $(SLO)$/officerestartmanager.obj \
             $(SLO)$/proxyaggregation.obj \
-            $(SLO)$/querydeep.obj \
             $(SLO)$/regpathhelper.obj \
             $(SLO)$/scopeguard.obj \
             $(SLO)$/SelectionMultiplex.obj \
diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx
index 8bab7fa3d7c7..566e5526019c 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.cxx
@@ -99,21 +99,7 @@ namespace comphelper
     NamedValueCollection::NamedValueCollection( const Any& _rElements )
         :m_pImpl( new NamedValueCollection_Impl )
     {
-        Sequence< NamedValue > aNamedValues;
-        Sequence< PropertyValue > aPropertyValues;
-        NamedValue aNamedValue;
-        PropertyValue aPropertyValue;
-
-        if ( _rElements >>= aNamedValues )
-            impl_assign( aNamedValues );
-        else if ( _rElements >>= aPropertyValues )
-            impl_assign( aPropertyValues );
-        else if ( _rElements >>= aNamedValue )
-            impl_assign( Sequence< NamedValue >( &aNamedValue, 1 ) );
-        else if ( _rElements >>= aPropertyValue )
-            impl_assign( Sequence< PropertyValue >( &aPropertyValue, 1 ) );
-        else
-            OSL_ENSURE( !_rElements.hasValue(), "NamedValueCollection::NamedValueCollection(Any): unsupported type!" );
+        impl_assign( _rElements );
     }
 
     //--------------------------------------------------------------------
@@ -170,6 +156,39 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
+    ::std::vector< ::rtl::OUString > NamedValueCollection::getNames() const
+    {
+        ::std::vector< ::rtl::OUString > aNames( m_pImpl->aValues.size() );
+        ::std::transform(
+            m_pImpl->aValues.begin(),
+            m_pImpl->aValues.end(),
+            aNames.begin(),
+            ::std::select1st< NamedValueRepository::value_type >()
+        );
+        return aNames;
+    }
+
+    //--------------------------------------------------------------------
+    void NamedValueCollection::impl_assign( const Any& i_rWrappedElements )
+    {
+        Sequence< NamedValue > aNamedValues;
+        Sequence< PropertyValue > aPropertyValues;
+        NamedValue aNamedValue;
+        PropertyValue aPropertyValue;
+
+        if ( i_rWrappedElements >>= aNamedValues )
+            impl_assign( aNamedValues );
+        else if ( i_rWrappedElements >>= aPropertyValues )
+            impl_assign( aPropertyValues );
+        else if ( i_rWrappedElements >>= aNamedValue )
+            impl_assign( Sequence< NamedValue >( &aNamedValue, 1 ) );
+        else if ( i_rWrappedElements >>= aPropertyValue )
+            impl_assign( Sequence< PropertyValue >( &aPropertyValue, 1 ) );
+        else
+            OSL_ENSURE( !i_rWrappedElements.hasValue(), "NamedValueCollection::impl_assign(Any): unsupported type!" );
+    }
+
+    //--------------------------------------------------------------------
     void NamedValueCollection::impl_assign( const Sequence< Any >& _rArguments )
     {
         {
diff --git a/comphelper/source/misc/querydeep.cxx b/comphelper/source/misc/querydeep.cxx
deleted file mode 100644
index 92e475686783..000000000000
--- a/comphelper/source/misc/querydeep.cxx
+++ /dev/null
@@ -1,76 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_comphelper.hxx"
-#include <comphelper/querydeep.hxx>
-#include <typelib/typedescription.h>
-
-//__________________________________________________________________________________________________
-
-sal_Bool comphelper::isDerivedFrom(
-    const ::com::sun::star::uno::Type & rBaseType,
-    const ::com::sun::star::uno::Type & rType )
-{
-    using namespace ::com::sun::star::uno;
-
-    TypeClass eClass = rBaseType.getTypeClass();
-
-    if (eClass != TypeClass_INTERFACE)
-        return sal_False;
-
-    // supported TypeClass - do the types match ?
-    if (eClass != rType.getTypeClass())
-        return sal_False;
-
-    sal_Bool bRet;
-
-    // shortcut for simple case
-    if (rBaseType == ::getCppuType(static_cast<const Reference< XInterface > *>(0)))
-    {
-        bRet = sal_True;
-    }
-    else
-    {
-        // now ask in cppu (aka typelib)
-        ::typelib_TypeDescription *pBaseTD = 0, *pTD = 0;
-
-        rBaseType.  getDescription(&pBaseTD);
-        rType.      getDescription(&pTD);
-
-        // interfaces are assignable to a base
-        bRet = ::typelib_typedescription_isAssignableFrom(pBaseTD, pTD);
-
-        ::typelib_typedescription_release(pBaseTD);
-        ::typelib_typedescription_release(pTD);
-    }
-
-    return bRet;
-}
-
-
-
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index 3ce0d4de865a..ebeedc92839d 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -101,10 +101,12 @@ static bool makeCanonicalFileURL( rtl::OUString & rURL )
 
 OfficeInstallationDirectories::OfficeInstallationDirectories(
         const uno::Reference< uno::XComponentContext > & xCtx )
-: m_aOfficeDirMacro( RTL_CONSTASCII_USTRINGPARAM( "$(baseinsturl)" ) ),
+: m_aOfficeBrandDirMacro( RTL_CONSTASCII_USTRINGPARAM( "$(brandbaseurl)" ) ),
+  m_aOfficeBaseDirMacro( RTL_CONSTASCII_USTRINGPARAM( "$(baseinsturl)" ) ),
   m_aUserDirMacro( RTL_CONSTASCII_USTRINGPARAM( "$(userdataurl)" ) ),
   m_xCtx( xCtx ),
-  m_pOfficeDir( 0 ),
+  m_pOfficeBrandDir( 0 ),
+  m_pOfficeBaseDir( 0 ),
   m_pUserDir( 0 )
 {
 }
@@ -113,6 +115,9 @@ OfficeInstallationDirectories::OfficeInstallationDirectories(
 // virtual
 OfficeInstallationDirectories::~OfficeInstallationDirectories()
 {
+    delete m_pOfficeBrandDir;
+    delete m_pOfficeBaseDir;
+    delete m_pUserDir;
 }
 
 //=========================================================================
@@ -124,9 +129,8 @@ rtl::OUString SAL_CALL
 OfficeInstallationDirectories::getOfficeInstallationDirectoryURL()
     throw ( uno::RuntimeException )
 {
-    // late init m_pOfficeDir and m_pUserDir
     initDirs();
-    return rtl::OUString( *m_pOfficeDir );
+    return rtl::OUString( *m_pOfficeBrandDir );
 }
 
 //=========================================================================
@@ -135,7 +139,6 @@ rtl::OUString SAL_CALL
 OfficeInstallationDirectories::getOfficeUserDataDirectoryURL()
     throw ( uno::RuntimeException )
 {
-    // late init m_pOfficeDir and m_pUserDir
     initDirs();
     return rtl::OUString( *m_pUserDir );
 }
@@ -149,29 +152,39 @@ OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL )
 {
     if ( URL.getLength() > 0 )
     {
-        // late init m_pOfficeDir and m_pUserDir
         initDirs();
 
         rtl::OUString aCanonicalURL( URL );
         makeCanonicalFileURL( aCanonicalURL );
 
-        sal_Int32 nIndex = aCanonicalURL.indexOf( *m_pOfficeDir );
+        sal_Int32 nIndex = aCanonicalURL.indexOf( *m_pOfficeBrandDir );
         if ( nIndex  != -1 )
         {
             return rtl::OUString(
                 URL.replaceAt( nIndex,
-                               m_pOfficeDir->getLength(),
-                               m_aOfficeDirMacro ) );
+                               m_pOfficeBrandDir->getLength(),
+                               m_aOfficeBrandDirMacro ) );
         }
         else
         {
-            nIndex = aCanonicalURL.indexOf( *m_pUserDir );
+            nIndex = aCanonicalURL.indexOf( *m_pOfficeBaseDir );
             if ( nIndex  != -1 )
             {
                 return rtl::OUString(
                     URL.replaceAt( nIndex,
-                                   m_pUserDir->getLength(),
-                                   m_aUserDirMacro ) );
+                                   m_pOfficeBaseDir->getLength(),
+                                   m_aOfficeBaseDirMacro ) );
+            }
+            else
+            {
+                nIndex = aCanonicalURL.indexOf( *m_pUserDir );
+                if ( nIndex  != -1 )
+                {
+                    return rtl::OUString(
+                        URL.replaceAt( nIndex,
+                                       m_pUserDir->getLength(),
+                                       m_aUserDirMacro ) );
+                }
             }
         }
     }
@@ -186,29 +199,40 @@ OfficeInstallationDirectories::makeAbsoluteURL( const rtl::OUString& URL )
 {
     if ( URL.getLength() > 0 )
     {
-        sal_Int32 nIndex = URL.indexOf( m_aOfficeDirMacro );
+        sal_Int32 nIndex = URL.indexOf( m_aOfficeBrandDirMacro );
         if ( nIndex != -1 )
         {
-            // late init m_pOfficeDir and m_pUserDir
             initDirs();
 
             return rtl::OUString(
                 URL.replaceAt( nIndex,
-                               m_aOfficeDirMacro.getLength(),
-                               *m_pOfficeDir ) );
+                               m_aOfficeBrandDirMacro.getLength(),
+                               *m_pOfficeBrandDir ) );
         }
         else
         {
-            nIndex = URL.indexOf( m_aUserDirMacro );
+            nIndex = URL.indexOf( m_aOfficeBaseDirMacro );
             if ( nIndex != -1 )
             {
-                // late init m_pOfficeDir and m_pUserDir
                 initDirs();
 
                 return rtl::OUString(
                     URL.replaceAt( nIndex,
-                                   m_aUserDirMacro.getLength(),
-                                   *m_pUserDir ) );
+                                   m_aOfficeBaseDirMacro.getLength(),
+                                   *m_pOfficeBaseDir ) );
+            }
+            else
+            {
+                nIndex = URL.indexOf( m_aUserDirMacro );
+                if ( nIndex != -1 )
+                {
+                    initDirs();
+
+                    return rtl::OUString(
+                        URL.replaceAt( nIndex,
+                                       m_aUserDirMacro.getLength(),
+                                       *m_pUserDir ) );
+                }
             }
         }
     }
@@ -300,13 +324,14 @@ OfficeInstallationDirectories::Create(
 
 void OfficeInstallationDirectories::initDirs()
 {
-    if ( m_pOfficeDir == 0 )
+    if ( m_pOfficeBrandDir == 0 )
     {
         osl::MutexGuard aGuard( m_aMutex );
-        if ( m_pOfficeDir == 0 )
+        if ( m_pOfficeBrandDir == 0 )
         {
-            m_pOfficeDir = new rtl::OUString;
-            m_pUserDir   = new rtl::OUString;
+            m_pOfficeBrandDir = new rtl::OUString;
+            m_pOfficeBaseDir  = new rtl::OUString;
+            m_pUserDir        = new rtl::OUString;
 
             uno::Reference< util::XMacroExpander > xExpander;
 
@@ -320,15 +345,24 @@ void OfficeInstallationDirectories::initDirs()
 
             if ( xExpander.is() )
             {
-                *m_pOfficeDir =
+                *m_pOfficeBrandDir =
+                    xExpander->expandMacros(
+                         rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR" ) ) );
+
+                OSL_ENSURE( m_pOfficeBrandDir->getLength() > 0,
+                            "Unable to obtain office brand installation directory!" );
+
+                makeCanonicalFileURL( *m_pOfficeBrandDir );
+
+                *m_pOfficeBaseDir =
                     xExpander->expandMacros(
                         rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
                             "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":BaseInstallation}" ) ) );
 
-                OSL_ENSURE( m_pOfficeDir->getLength() > 0,
-                        "Unable to obtain office installation directory!" );
+                OSL_ENSURE( m_pOfficeBaseDir->getLength() > 0,
+                            "Unable to obtain office base installation directory!" );
 
-                makeCanonicalFileURL( *m_pOfficeDir );
+                makeCanonicalFileURL( *m_pOfficeBaseDir );
 
                 *m_pUserDir =
                     xExpander->expandMacros(
@@ -336,7 +370,7 @@ void OfficeInstallationDirectories::initDirs()
                             "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ) ) );
 
                 OSL_ENSURE( m_pUserDir->getLength() > 0,
-                        "Unable to obtain office user data directory!" );
+                            "Unable to obtain office user data directory!" );
 
                 makeCanonicalFileURL( *m_pUserDir );
             }
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
index 2ffb3582718a..9c56f7ce80fd 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
@@ -94,11 +94,13 @@ public:
 private:
     void initDirs();
 
-    rtl::OUString                                   m_aOfficeDirMacro;
+    rtl::OUString                                   m_aOfficeBrandDirMacro;
+    rtl::OUString                                   m_aOfficeBaseDirMacro;
     rtl::OUString                                   m_aUserDirMacro;
     com::sun::star::uno::Reference<
         com::sun::star::uno::XComponentContext >    m_xCtx;
-    rtl::OUString *                                 m_pOfficeDir;
+    rtl::OUString *                                 m_pOfficeBrandDir;
+    rtl::OUString *                                 m_pOfficeBaseDir;
     rtl::OUString *                                 m_pUserDir;
 };
 
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index e796c29eba90..9c2fd868d973 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -87,20 +87,36 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(
     const   Property* pDelegateProps    = _rProperties.getConstArray();
             Property* pMergedProps = m_aProperties.getArray();
 
+    // if properties are present both at the delegatee and the aggregate, then the former are supposed to win.
+    // So, we'll need an existence check.
+    ::std::set< ::rtl::OUString > aDelegatorProps;
+
     // create the map for the delegator properties
     sal_Int32 nMPLoop = 0;
     for ( ; nMPLoop < nDelegatorProps; ++nMPLoop, ++pDelegateProps )
+    {
         m_aPropertyAccessors[ pDelegateProps->Handle ] = OPropertyAccessor( -1, nMPLoop, sal_False );
+        OSL_ENSURE( aDelegatorProps.find( pDelegateProps->Name ) == aDelegatorProps.end(),
+            "OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper: duplicate delegatee property!" );
+        aDelegatorProps.insert( pDelegateProps->Name );
+    }
 
     // create the map for the aggregate properties
     sal_Int32 nAggregateHandle = _nFirstAggregateId;
     pMergedProps += nDelegatorProps;
-    for ( ; nMPLoop < nMergedProps; ++nMPLoop, ++pMergedProps, ++pAggregateProps )
+    for ( ; nMPLoop < nMergedProps; ++pAggregateProps )
     {
+        // if the aggregate property is present at the delegatee already, ignore it
+        if ( aDelegatorProps.find( pAggregateProps->Name ) != aDelegatorProps.end() )
+        {
+            --nMergedProps;
+            continue;
+        }
+
         // next aggregate property - remember it
         *pMergedProps = *pAggregateProps;
 
-        // determine the handle for the property which we will expose to the ourside world
+        // determine the handle for the property which we will expose to the outside world
         sal_Int32 nHandle = -1;
         // ask the infor service first
         if ( _pInfoService )
@@ -123,7 +139,11 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(
         // remember the accessor for this property
         m_aPropertyAccessors[ nHandle ] = OPropertyAccessor( pMergedProps->Handle, nMPLoop, sal_True );
         pMergedProps->Handle = nHandle;
+
+        ++nMPLoop;
+        ++pMergedProps;
     }
+    m_aProperties.realloc( nMergedProps );
     pMergedProps = m_aProperties.getArray();    // reset, needed again below
 
     // sortieren der Properties nach Namen