dr77: rebase to DEV300m96

22 files changed, 656 insertions, 905 deletions

diff --git a/comphelper/inc/comphelper/docpasswordhelper.hxx b/comphelper/inc/comphelper/docpasswordhelper.hxx
index dbbb68372a07..7e9f06318a26 100644
--- a/comphelper/inc/comphelper/docpasswordhelper.hxx
+++ b/comphelper/inc/comphelper/docpasswordhelper.hxx
@@ -28,6 +28,7 @@
 #ifndef COMPHELPER_DOCPASSWORDHELPR_HXX
 #define COMPHELPER_DOCPASSWORDHELPR_HXX
 
+#include <com/sun/star/beans/NamedValue.hpp>
 #include "comphelper/comphelperdllapi.h"
 #include <vector>
 #include "comphelper/docpasswordrequest.hxx"
@@ -53,7 +54,7 @@ enum DocPasswordVerifierResult
 /** Base class for a password verifier used by the DocPasswordHelper class
     below.
 
-    Users have to implement the virtual function and pass an instance of the
+    Users have to implement the virtual functions and pass an instance of the
     verifier to one of the password request functions.
  */
 class COMPHELPER_DLLPUBLIC IDocPasswordVerifier
@@ -63,6 +64,14 @@ public:
 
     /** Will be called everytime a password needs to be verified.
 
+        @param rPassword
+            The password to be verified
+
+        @param o_rEncryptionData
+            Output parameter, that is filled with the EncryptionData generated
+            from the password. The data is filled only if the validation was
+            successful.
+
         @return  The result of the verification.
             - DocPasswordVerifierResult_OK, if and only if the passed password
               is valid and can be used to process the related document.
@@ -72,7 +81,23 @@ public:
               occured while password verification. The password request loop
               will be aborted.
      */
-    virtual DocPasswordVerifierResult verifyPassword( const ::rtl::OUString& rPassword ) = 0;
+    virtual DocPasswordVerifierResult verifyPassword( const ::rtl::OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) = 0;
+
+    /** Will be called everytime an encryption data needs to be verified.
+
+        @param rEncryptionData
+            The data will be validated
+
+        @return  The result of the verification.
+            - DocPasswordVerifierResult_OK, if and only if the passed encryption data
+              is valid and can be used to process the related document.
+            - DocPasswordVerifierResult_WRONG_PASSWORD, if the encryption data is
+              wrong.
+            - DocPasswordVerifierResult_ABORT, if an unrecoverable error
+              occured while data verification. The password request loop
+              will be aborted.
+     */
+    virtual DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) = 0;
 
 };
 
@@ -195,6 +220,35 @@ public:
 
     // ------------------------------------------------------------------------
 
+    /** This helper function generates a random sequence of bytes of
+        requested length.
+      */
+
+    static ::com::sun::star::uno::Sequence< sal_Int8 > GenerateRandomByteSequence(
+                sal_Int32 nLength );
+
+    // ------------------------------------------------------------------------
+
+    /** This helper function generates a byte sequence representing the
+        key digest value used by MSCodec_Std97 codec.
+      */
+
+    static ::com::sun::star::uno::Sequence< sal_Int8 > GenerateStd97Key(
+                const ::rtl::OUString& aPassword,
+                const ::com::sun::star::uno::Sequence< sal_Int8 >& aDocId );
+
+    // ------------------------------------------------------------------------
+
+    /** This helper function generates a byte sequence representing the
+        key digest value used by MSCodec_Std97 codec.
+      */
+
+    static ::com::sun::star::uno::Sequence< sal_Int8 > GenerateStd97Key(
+                const sal_uInt16 pPassData[16],
+                const ::com::sun::star::uno::Sequence< sal_Int8 >& aDocId );
+
+    // ------------------------------------------------------------------------
+
     /** This helper function tries to request and verify a password to load a
         protected document.
 
@@ -248,8 +302,9 @@ public:
             passed password verifier. If empty, no valid password has been
             found, or the user has chossen to cancel password input.
      */
-    static ::rtl::OUString requestAndVerifyDocPassword(
+    static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > requestAndVerifyDocPassword(
                             IDocPasswordVerifier& rVerifier,
+                            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rMediaEncData,
                             const ::rtl::OUString& rMediaPassword,
                             const ::com::sun::star::uno::Reference<
                                 ::com::sun::star::task::XInteractionHandler >& rxInteractHandler,
@@ -300,7 +355,7 @@ public:
             passed password verifier. If empty, no valid password has been
             found, or the user has chossen to cancel password input.
      */
-    static ::rtl::OUString requestAndVerifyDocPassword(
+    static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > requestAndVerifyDocPassword(
                             IDocPasswordVerifier& rVerifier,
                             MediaDescriptor& rMediaDesc,
                             DocPasswordRequestType eRequestType,
diff --git a/comphelper/inc/comphelper/documentconstants.hxx b/comphelper/inc/comphelper/documentconstants.hxx
index b78150586e28..73b90d72cc8a 100644
--- a/comphelper/inc/comphelper/documentconstants.hxx
+++ b/comphelper/inc/comphelper/documentconstants.hxx
@@ -111,3 +111,41 @@
 #define ODFVER_012_TEXT ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ODFVER_012_TEXT_ASCII ) )
 #endif
 
+// filter flags
+// TODO/LATER: The flags should be part of the UNO specification
+#define SFX_FILTER_IMPORT            0x00000001L
+#define SFX_FILTER_EXPORT            0x00000002L
+#define SFX_FILTER_TEMPLATE          0x00000004L
+#define SFX_FILTER_INTERNAL          0x00000008L
+#define SFX_FILTER_TEMPLATEPATH      0x00000010L
+#define SFX_FILTER_OWN               0x00000020L
+#define SFX_FILTER_ALIEN             0x00000040L
+#define SFX_FILTER_USESOPTIONS       0x00000080L
+
+#define SFX_FILTER_DEFAULT           0x00000100L
+#define SFX_FILTER_EXECUTABLE        0x00000200L
+#define SFX_FILTER_SUPPORTSSELECTION 0x00000400L
+#define SFX_FILTER_MAPTOAPPPLUG      0x00000800L
+#define SFX_FILTER_NOTINFILEDLG      0x00001000L
+#define SFX_FILTER_NOTINCHOOSER      0x00002000L
+#define SFX_FILTER_ASYNC             0x00004000L
+#define SFX_FILTER_CREATOR           0x00008000L
+#define SFX_FILTER_OPENREADONLY      0x00010000L
+#define SFX_FILTER_MUSTINSTALL       0x00020000L
+#define SFX_FILTER_CONSULTSERVICE    0x00040000L
+
+#define SFX_FILTER_STARONEFILTER     0x00080000L
+#define SFX_FILTER_PACKED            0x00100000L
+#define SFX_FILTER_SILENTEXPORT      0x00200000L
+
+#define SFX_FILTER_BROWSERPREFERED   0x00400000L
+
+#define SFX_FILTER_ENCRYPTION        0x01000000L
+#define SFX_FILTER_PASSWORDTOMODIFY  0x02000000L
+
+#define SFX_FILTER_PREFERED          0x10000000L
+
+#define SFX_FILTER_VERSION_NONE      0
+#define SFX_FILTER_NOTINSTALLED      SFX_FILTER_MUSTINSTALL | SFX_FILTER_CONSULTSERVICE
+
+
diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx
index 7d2333045390..e92a6c4650f6 100644
--- a/comphelper/inc/comphelper/mediadescriptor.hxx
+++ b/comphelper/inc/comphelper/mediadescriptor.hxx
@@ -78,6 +78,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
         static const ::rtl::OUString& PROP_DEEPDETECTION();
         static const ::rtl::OUString& PROP_DETECTSERVICE();
         static const ::rtl::OUString& PROP_DOCUMENTSERVICE();
+        static const ::rtl::OUString& PROP_ENCRYPTIONDATA();
         static const ::rtl::OUString& PROP_EXTENSION();
         static const ::rtl::OUString& PROP_FILENAME();
         static const ::rtl::OUString& PROP_FILTERNAME();
@@ -127,10 +128,6 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
     //-------------------------------------------
     // interface
     public:
-        /** Value type of the 'ComponentData' property.
-         */
-        typedef ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > ComponentDataSequence;
-
         //---------------------------------------
         /** @short  these ctors do nothing - excepting that they forward
                     the given parameters to the base class ctors.
@@ -204,8 +201,9 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
         /** Returns a value from the sequence contained in the property
             'ComponentData' of this media descriptor.
 
-            @descr  The property 'ComponentData' should be empty or should
-                contain a value of type ComponentDataSequence (see above).
+            @descr  The property 'ComponentData' should be empty, or should
+                contain a value of type sequence<com.sun.star.beans.NamedValue>
+                or sequence<com.sun.star.beans.PropertyValue>.
 
             @return  The value with the specified name, if existing in the
                 sequence of the 'ComponentData' property, otherwise an empty
@@ -218,10 +216,11 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
         /** Inserts a value into the sequence contained in the property
             'ComponentData' of the media descriptor.
 
-            @descr  The property 'ComponentData' should be empty or should
-                contain a value of type ComponentDataSequence (see above). The
-                passed value will be inserted into the sequence, or, if already
-                existing, will be overwritten.
+            @descr  The property 'ComponentData' should be empty, or should
+                contain a value of type sequence<com.sun.star.beans.NamedValue>
+                or sequence<com.sun.star.beans.PropertyValue>. The passed value
+                will be inserted into the sequence, or, if already existing,
+                will be overwritten.
 
             @param rName  The name of the value to be inserted into the
                 sequence of the 'ComponentData' property.
@@ -237,10 +236,10 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
         /** Removes a value from the sequence contained in the property
             'ComponentData' of the media descriptor.
 
-            @descr  The property 'ComponentData' should be empty or should
-                contain a value of type ComponentDataSequence (see above). The
-                value with the passed name will be removed from the sequence,
-                if existing.
+            @descr  The property 'ComponentData' should be empty, or should
+                contain a value of type sequence<com.sun.star.beans.NamedValue>
+                or sequence<com.sun.star.beans.PropertyValue>. The value with
+                the passed name will be removed from the sequence, if existing.
 
             @param rName  The name of the value to be removed from the sequence
                 of the 'ComponentData' property.
diff --git a/comphelper/inc/comphelper/mimeconfighelper.hxx b/comphelper/inc/comphelper/mimeconfighelper.hxx
index 5e02d4761cb1..16a0a159d5a4 100644
--- a/comphelper/inc/comphelper/mimeconfighelper.hxx
+++ b/comphelper/inc/comphelper/mimeconfighelper.hxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XContainerQuery.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/embed/VerbDescriptor.hpp>
@@ -50,6 +51,8 @@ class COMPHELPER_DLLPUBLIC MimeConfigurationHelper
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xVerbsConfig;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xMediaTypeConfig;
 
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xFilterFactory;
+
 public:
 
     MimeConfigurationHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
@@ -106,6 +109,10 @@ public:
     ::rtl::OUString GetFactoryNameByMediaType( const ::rtl::OUString& aMediaType );
 
     // typedetection related
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetFilterFactory();
+
+    sal_Int32 GetFilterFlags( const ::rtl::OUString& aFilterName );
+
     ::rtl::OUString UpdateMediaDescriptorWithFilterName(
                         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr,
                         sal_Bool bIgnoreType );
@@ -117,6 +124,14 @@ public:
 
     ::rtl::OUString GetDefaultFilterFromServiceName( const ::rtl::OUString& aServName, sal_Int32 nVersion );
 
+    ::rtl::OUString GetExportFilterFromImportFilter( const ::rtl::OUString& aImportFilterName );
+
+    static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SearchForFilter(
+                        const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerQuery >& xFilterQuery,
+                        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aSearchRequest,
+                        sal_Int32 nMustFlags,
+                        sal_Int32 nDontFlags );
+
     static sal_Bool ClassIDsEqual( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID1,
                         const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID2 );
     static ::com::sun::star::uno::Sequence< sal_Int8 > GetSequenceClassID( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
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/inc/comphelper/storagehelper.hxx b/comphelper/inc/comphelper/storagehelper.hxx
index b7e5704c4d68..9d44b42e9514 100644
--- a/comphelper/inc/comphelper/storagehelper.hxx
+++ b/comphelper/inc/comphelper/storagehelper.hxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/io/XStream.hpp>
@@ -43,6 +44,9 @@
 #define ZIP_STORAGE_FORMAT_STRING       ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ZipFormat" ) )
 #define OFOPXML_STORAGE_FORMAT_STRING   ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OFOPXMLFormat" ) )
 
+#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8   ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageSHA1UTF8EncryptionKey" ) )
+#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageSHA1MS1252EncryptionKey" ) )
+
 namespace comphelper {
 
 class COMPHELPER_DLLPUBLIC OStorageHelper
@@ -112,9 +116,9 @@ public:
                             = ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >() )
         throw ( ::com::sun::star::uno::Exception );
 
-    static void SetCommonStoragePassword(
+    static void SetCommonStorageEncryptionData(
             const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
-            const ::rtl::OUString& aPass )
+            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData )
         throw ( ::com::sun::star::uno::Exception );
 
     // the following method supports only storages of OOo formats
@@ -159,6 +163,9 @@ public:
             sal_Bool bRepairStorage = sal_False )
         throw ( ::com::sun::star::uno::Exception );
 
+    static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >
+        CreatePackageEncryptionData( const ::rtl::OUString& aPassword );
+
     static sal_Bool IsValidZipEntryFileName( const ::rtl::OUString& aName, sal_Bool bSlashAllowed );
     static sal_Bool IsValidZipEntryFileName( const sal_Unicode *pChar, sal_Int32 nLength, sal_Bool bSlashAllowed );
 
diff --git a/comphelper/prj/build.lst b/comphelper/prj/build.lst
index 793d8bf30e09..91e836cabd68 100644
--- a/comphelper/prj/build.lst
+++ b/comphelper/prj/build.lst
@@ -1,4 +1,4 @@
-ph	comphelper	:	cppuhelper ucbhelper offuh vos salhelper NULL
+ph	comphelper	:	cppuhelper ucbhelper offuh vos salhelper LIBXSLT:libxslt NULL
 ph	comphelper								usr1	-	all	ph_mkout NULL
 ph	comphelper\inc							nmake	-	all	ph_inc NULL
 ph	comphelper\source\container				nmake	-	all	ph_container ph_inc NULL
diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx
index 37941352ae28..3c8d66bd57e4 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -84,16 +84,9 @@ uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswo
 {
     uno::Sequence< beans::PropertyValue > aResult;
 
-    uno::Sequence< sal_Int8 > aSalt( 16 );
+    uno::Sequence< sal_Int8 > aSalt = GenerateRandomByteSequence( 16 );
     sal_Int32 nCount = 1024;
 
-    TimeValue aTime;
-    osl_getSystemTime( &aTime );
-    rtlRandomPool aRandomPool = rtl_random_createPool ();
-    rtl_random_addBytes ( aRandomPool, &aTime, 8 );
-
-    rtl_random_getBytes ( aRandomPool, aSalt.getArray(), 16 );
-
     uno::Sequence< sal_Int8 > aNewHash = GeneratePBKDF2Hash( aPassword, aSalt, nCount, 16 );
     if ( aNewHash.getLength() )
     {
@@ -108,9 +101,6 @@ uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswo
         aResult[3].Value <<= aNewHash;
     }
 
-    // Clean up random pool memory
-    rtl_random_destroyPool ( aRandomPool );
-
     return aResult;
 }
 
@@ -282,9 +272,98 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
 }
 
 // ============================================================================
+/*static*/ uno::Sequence< sal_Int8 > DocPasswordHelper::GenerateRandomByteSequence( sal_Int32 nLength )
+{
+    uno::Sequence< sal_Int8 > aResult( nLength );
+
+    TimeValue aTime;
+    osl_getSystemTime( &aTime );
+    rtlRandomPool aRandomPool = rtl_random_createPool ();
+    rtl_random_addBytes ( aRandomPool, &aTime, 8 );
+    rtl_random_getBytes ( aRandomPool, aResult.getArray(), nLength );
+    rtl_random_destroyPool ( aRandomPool );
 
-/*static*/ OUString DocPasswordHelper::requestAndVerifyDocPassword(
+    return aResult;
+}
+
+
+// ============================================================================
+/*static*/ uno::Sequence< sal_Int8 > DocPasswordHelper::GenerateStd97Key( const ::rtl::OUString& aPassword, const uno::Sequence< sal_Int8 >& aDocId )
+{
+    uno::Sequence< sal_Int8 > aResultKey;
+    if ( aPassword.getLength() && aDocId.getLength() == 16 )
+    {
+        sal_uInt16 pPassData[16];
+        rtl_zeroMemory( pPassData, sizeof(pPassData) );
+
+        sal_Int32 nPassLen = ::std::min< sal_Int32 >( aPassword.getLength(), 15 );
+        rtl_copyMemory( pPassData, aPassword.getStr(), nPassLen * sizeof(pPassData[0]) );
+
+        aResultKey = GenerateStd97Key( pPassData, aDocId );
+    }
+
+    return aResultKey;
+}
+
+// ============================================================================
+/*static*/ uno::Sequence< sal_Int8 > DocPasswordHelper::GenerateStd97Key( const sal_uInt16 pPassData[16], const uno::Sequence< sal_Int8 >& aDocId )
+{
+    uno::Sequence< sal_Int8 > aResultKey;
+    if ( pPassData[0] && aDocId.getLength() == 16 )
+    {
+        sal_uInt8 pKeyData[64];
+        rtl_zeroMemory( pKeyData, sizeof(pKeyData) );
+
+        sal_Int32 nInd = 0;
+
+        // Fill PassData into KeyData.
+        for ( nInd = 0; nInd < 16 && pPassData[nInd]; nInd++)
+        {
+            pKeyData[2*nInd] = sal::static_int_cast< sal_uInt8 >( (pPassData[nInd] >> 0) & 0xff );
+            pKeyData[2*nInd + 1] = sal::static_int_cast< sal_uInt8 >( (pPassData[nInd] >> 8) & 0xff );
+        }
+
+        pKeyData[2*nInd] = 0x80;
+        pKeyData[56] = sal::static_int_cast< sal_uInt8 >( nInd << 4 );
+
+        // Fill raw digest of KeyData into KeyData.
+        rtlDigest hDigest = rtl_digest_create ( rtl_Digest_AlgorithmMD5 );
+        (void)rtl_digest_updateMD5 (
+            hDigest, pKeyData, sizeof(pKeyData));
+        (void)rtl_digest_rawMD5 (
+            hDigest, pKeyData, RTL_DIGEST_LENGTH_MD5);
+
+        // Update digest with KeyData and Unique.
+        for ( nInd = 0; nInd < 16; nInd++ )
+        {
+            rtl_digest_updateMD5( hDigest, pKeyData, 5 );
+            rtl_digest_updateMD5( hDigest, (const sal_uInt8*)aDocId.getConstArray(), aDocId.getLength() );
+        }
+
+        // Update digest with padding.
+        pKeyData[16] = 0x80;
+        rtl_zeroMemory( pKeyData + 17, sizeof(pKeyData) - 17 );
+        pKeyData[56] = 0x80;
+        pKeyData[57] = 0x0a;
+
+        rtl_digest_updateMD5( hDigest, &(pKeyData[16]), sizeof(pKeyData) - 16 );
+
+        // Fill raw digest of above updates
+        aResultKey.realloc( RTL_DIGEST_LENGTH_MD5 );
+        rtl_digest_rawMD5 ( hDigest, (sal_uInt8*)aResultKey.getArray(), aResultKey.getLength() );
+
+        // Erase KeyData array and leave.
+        rtl_zeroMemory( pKeyData, sizeof(pKeyData) );
+    }
+
+    return aResultKey;
+}
+
+// ============================================================================
+
+/*static*/ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > DocPasswordHelper::requestAndVerifyDocPassword(
         IDocPasswordVerifier& rVerifier,
+        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rMediaEncData,
         const OUString& rMediaPassword,
         const Reference< XInteractionHandler >& rxInteractHandler,
         const OUString& rDocumentName,
@@ -292,7 +371,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
         const ::std::vector< OUString >* pDefaultPasswords,
         bool* pbIsDefaultPassword )
 {
-    OUString aPassword;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > aEncData;
     DocPasswordVerifierResult eResult = DocPasswordVerifierResult_WRONG_PASSWORD;
 
     // first, try provided default passwords
@@ -302,23 +381,32 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
     {
         for( ::std::vector< OUString >::const_iterator aIt = pDefaultPasswords->begin(), aEnd = pDefaultPasswords->end(); (eResult == DocPasswordVerifierResult_WRONG_PASSWORD) && (aIt != aEnd); ++aIt )
         {
-            aPassword = *aIt;
-            OSL_ENSURE( aPassword.getLength() > 0, "DocPasswordHelper::requestAndVerifyDocPassword - unexpected empty default password" );
-            if( aPassword.getLength() > 0 )
+            OSL_ENSURE( aIt->getLength() > 0, "DocPasswordHelper::requestAndVerifyDocPassword - unexpected empty default password" );
+            if( aIt->getLength() > 0 )
             {
-                eResult = rVerifier.verifyPassword( aPassword );
+                eResult = rVerifier.verifyPassword( *aIt, aEncData );
                 if( pbIsDefaultPassword )
                     *pbIsDefaultPassword = eResult == DocPasswordVerifierResult_OK;
             }
         }
     }
 
+    // try media encryption data (skip, if result is OK or ABORT)
+    if( eResult == DocPasswordVerifierResult_WRONG_PASSWORD )
+    {
+        if( rMediaEncData.getLength() > 0 )
+        {
+            eResult = rVerifier.verifyEncryptionData( rMediaEncData );
+            if( eResult == DocPasswordVerifierResult_OK )
+                aEncData = rMediaEncData;
+        }
+    }
+
     // try media password (skip, if result is OK or ABORT)
     if( eResult == DocPasswordVerifierResult_WRONG_PASSWORD )
     {
-        aPassword = rMediaPassword;
-        if( aPassword.getLength() > 0 )
-            eResult = rVerifier.verifyPassword( aPassword );
+        if( rMediaPassword.getLength() > 0 )
+            eResult = rVerifier.verifyPassword( rMediaPassword, aEncData );
     }
 
     // request a password (skip, if result is OK or ABORT)
@@ -332,9 +420,8 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
             rxInteractHandler->handle( xRequest );
             if( pRequest->isPassword() )
             {
-                aPassword = pRequest->getPassword();
-                if( aPassword.getLength() > 0 )
-                    eResult = rVerifier.verifyPassword( aPassword );
+                if( pRequest->getPassword().getLength() > 0 )
+                    eResult = rVerifier.verifyPassword( pRequest->getPassword(), aEncData );
             }
             else
             {
@@ -347,15 +434,17 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
     {
     }
 
-    return (eResult == DocPasswordVerifierResult_OK) ? aPassword : OUString();
+    return (eResult == DocPasswordVerifierResult_OK) ? aEncData : uno::Sequence< beans::NamedValue >();
 }
 
-/*static*/ OUString DocPasswordHelper::requestAndVerifyDocPassword(
+/*static*/ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > DocPasswordHelper::requestAndVerifyDocPassword(
         IDocPasswordVerifier& rVerifier,
         MediaDescriptor& rMediaDesc,
         DocPasswordRequestType eRequestType,
         const ::std::vector< OUString >* pDefaultPasswords )
 {
+    uno::Sequence< beans::NamedValue > aMediaEncData = rMediaDesc.getUnpackedValueOrDefault(
+        MediaDescriptor::PROP_ENCRYPTIONDATA(), uno::Sequence< beans::NamedValue >() );
     OUString aMediaPassword = rMediaDesc.getUnpackedValueOrDefault(
         MediaDescriptor::PROP_PASSWORD(), OUString() );
     Reference< XInteractionHandler > xInteractHandler = rMediaDesc.getUnpackedValueOrDefault(
@@ -364,14 +453,17 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
         MediaDescriptor::PROP_URL(), OUString() );
 
     bool bIsDefaultPassword = false;
-    OUString aPassword = requestAndVerifyDocPassword(
-        rVerifier, aMediaPassword, xInteractHandler, aDocumentName, eRequestType, pDefaultPasswords, &bIsDefaultPassword );
+    uno::Sequence< beans::NamedValue > aEncryptionData = requestAndVerifyDocPassword(
+        rVerifier, aMediaEncData, aMediaPassword, xInteractHandler, aDocumentName, eRequestType, pDefaultPasswords, &bIsDefaultPassword );
+
+    rMediaDesc.erase( MediaDescriptor::PROP_PASSWORD() );
+    rMediaDesc.erase( MediaDescriptor::PROP_ENCRYPTIONDATA() );
 
     // insert valid password into media descriptor (but not a default password)
-    if( (aPassword.getLength() > 0) && !bIsDefaultPassword )
-        rMediaDesc[ MediaDescriptor::PROP_PASSWORD() ] <<= aPassword;
+    if( (aEncryptionData.getLength() > 0) && !bIsDefaultPassword )
+        rMediaDesc[ MediaDescriptor::PROP_ENCRYPTIONDATA() ] <<= aEncryptionData;
 
-    return aPassword;
+    return aEncryptionData;
 }
 
 // ============================================================================
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/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index 9e02afe8c56c..e0b3e797264a 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -28,6 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_comphelper.hxx"
 #include <comphelper/mediadescriptor.hxx>
+#include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/stillreadwriteinteraction.hxx>
 
 #include <com/sun/star/ucb/XContent.hpp>
@@ -112,6 +113,12 @@ const ::rtl::OUString& MediaDescriptor::PROP_DOCUMENTSERVICE()
     return sProp;
 }
 
+const ::rtl::OUString& MediaDescriptor::PROP_ENCRYPTIONDATA()
+{
+    static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("EncryptionData"));
+    return sProp;
+}
+
 const ::rtl::OUString& MediaDescriptor::PROP_EXTENSION()
 {
     static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("Extension"));
@@ -477,27 +484,30 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const
 
 css::uno::Any MediaDescriptor::getComponentDataEntry( const ::rtl::OUString& rName ) const
 {
-    SequenceAsHashMap aCompDataMap( getUnpackedValueOrDefault( PROP_COMPONENTDATA(), ComponentDataSequence() ) );
-    SequenceAsHashMap::iterator aIt = aCompDataMap.find( rName );
-    return (aIt == aCompDataMap.end()) ? css::uno::Any() : aIt->second;
+    css::uno::Any aEntry;
+    SequenceAsHashMap::const_iterator aPropertyIter = find( PROP_COMPONENTDATA() );
+    if( aPropertyIter != end() )
+        return NamedValueCollection( aPropertyIter->second ).get( rName );
+    return css::uno::Any();
 }
 
 void MediaDescriptor::setComponentDataEntry( const ::rtl::OUString& rName, const css::uno::Any& rValue )
 {
     if( rValue.hasValue() )
     {
-        // get or craete the 'ComponentData' property entry
+        // get or create the 'ComponentData' property entry
         css::uno::Any& rCompDataAny = operator[]( PROP_COMPONENTDATA() );
-        // check type, insert the value
-        OSL_ENSURE( !rCompDataAny.hasValue() || rCompDataAny.has< ComponentDataSequence >(),
-            "MediaDescriptor::setComponentDataEntry - incompatible 'ComponentData' property in media descriptor" );
-        if( !rCompDataAny.hasValue() || rCompDataAny.has< ComponentDataSequence >() )
+        // insert the value (retain sequence type, create NamedValue elements by default)
+        bool bHasNamedValues = !rCompDataAny.hasValue() || rCompDataAny.has< css::uno::Sequence< css::beans::NamedValue > >();
+        bool bHasPropValues = rCompDataAny.has< css::uno::Sequence< css::beans::PropertyValue > >();
+        OSL_ENSURE( bHasNamedValues || bHasPropValues, "MediaDescriptor::setComponentDataEntry - incompatible 'ComponentData' property in media descriptor" );
+        if( bHasNamedValues || bHasPropValues )
         {
             // insert or overwrite the passed value
             SequenceAsHashMap aCompDataMap( rCompDataAny );
             aCompDataMap[ rName ] = rValue;
-            // write back the sequence (sal_False = use NamedValue instead of PropertyValue)
-            rCompDataAny = aCompDataMap.getAsConstAny( sal_False );
+            // write back the sequence (restore sequence with correct element type)
+            rCompDataAny = aCompDataMap.getAsConstAny( bHasPropValues );
         }
     }
     else
@@ -512,18 +522,20 @@ void MediaDescriptor::clearComponentDataEntry( const ::rtl::OUString& rName )
     SequenceAsHashMap::iterator aPropertyIter = find( PROP_COMPONENTDATA() );
     if( aPropertyIter != end() )
     {
-        OSL_ENSURE( aPropertyIter->second.has< ComponentDataSequence >(),
-            "MediaDescriptor::clearComponentDataEntry - incompatible 'ComponentData' property in media descriptor" );
-        if( aPropertyIter->second.has< ComponentDataSequence >() )
+        css::uno::Any& rCompDataAny = aPropertyIter->second;
+        bool bHasNamedValues = rCompDataAny.has< css::uno::Sequence< css::beans::NamedValue > >();
+        bool bHasPropValues = rCompDataAny.has< css::uno::Sequence< css::beans::PropertyValue > >();
+        OSL_ENSURE( bHasNamedValues || bHasPropValues, "MediaDescriptor::clearComponentDataEntry - incompatible 'ComponentData' property in media descriptor" );
+        if( bHasNamedValues || bHasPropValues )
         {
             // remove the value with the passed name
-            SequenceAsHashMap aCompDataMap( aPropertyIter->second );
+            SequenceAsHashMap aCompDataMap( rCompDataAny );
             aCompDataMap.erase( rName );
             // write back the sequence, or remove it completely if it is empty
             if( aCompDataMap.empty() )
                 erase( aPropertyIter );
             else
-                aPropertyIter->second = aCompDataMap.getAsConstAny( sal_False );
+                rCompDataAny = aCompDataMap.getAsConstAny( bHasPropValues );
         }
     }
 }
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index b677c977739e..5be9df3d61b6 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -35,6 +35,7 @@
 #include <comphelper/mimeconfighelper.hxx>
 #include <comphelper/classids.hxx>
 #include <comphelper/sequenceashashmap.hxx>
+#include <comphelper/documentconstants.hxx>
 
 
 using namespace ::com::sun::star;
@@ -187,6 +188,46 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetMediaTypeCo
 
     return m_xMediaTypeConfig;
 }
+
+//-----------------------------------------------------------------------
+uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetFilterFactory()
+{
+    osl::MutexGuard aGuard( m_aMutex );
+
+    if ( !m_xFilterFactory.is() )
+        m_xFilterFactory.set(
+            m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
+            uno::UNO_QUERY );
+
+    return m_xFilterFactory;
+}
+
+//-----------------------------------------------------------------------
+sal_Int32 MimeConfigurationHelper::GetFilterFlags( const ::rtl::OUString& aFilterName )
+{
+    sal_Int32 nFlags = 0;
+    try
+    {
+        if ( aFilterName.getLength() )
+        {
+            uno::Reference< container::XNameAccess > xFilterFactory(
+                GetFilterFactory(),
+                uno::UNO_SET_THROW );
+
+            uno::Any aFilterAny = xFilterFactory->getByName( aFilterName );
+            uno::Sequence< beans::PropertyValue > aData;
+            if ( aFilterAny >>= aData )
+            {
+                SequenceAsHashMap aFilterHM( aData );
+                nFlags = aFilterHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Flags" ), (sal_Int32)0 );
+            }
+        }
+    } catch( uno::Exception& )
+    {}
+
+    return nFlags;
+}
+
 //-------------------------------------------------------------------------
 ::rtl::OUString MimeConfigurationHelper::GetDocServiceNameFromFilter( const ::rtl::OUString& aFilterName )
 {
@@ -195,8 +236,8 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetMediaTypeCo
     try
     {
         uno::Reference< container::XNameAccess > xFilterFactory(
-            m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
-            uno::UNO_QUERY_THROW );
+            GetFilterFactory(),
+            uno::UNO_SET_THROW );
 
         uno::Any aFilterAnyData = xFilterFactory->getByName( aFilterName );
         uno::Sequence< beans::PropertyValue > aFilterData;
@@ -668,36 +709,17 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
 sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
                         uno::Sequence< beans::PropertyValue >& aMediaDescr )
 {
+    sal_Bool bResult = sal_False;
+
     ::rtl::OUString aFilterName = UpdateMediaDescriptorWithFilterName( aMediaDescr, sal_False );
     if ( aFilterName.getLength() )
     {
-        try
-        {
-            uno::Reference< container::XNameAccess > xFilterFactory(
-                m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
-                uno::UNO_QUERY_THROW );
-
-            uno::Any aFilterAnyData = xFilterFactory->getByName( aFilterName );
-            uno::Sequence< beans::PropertyValue > aFilterData;
-            if ( aFilterAnyData >>= aFilterData )
-            {
-                for ( sal_Int32 nInd = 0; nInd < aFilterData.getLength(); nInd++ )
-                    if ( aFilterData[nInd].Name.equalsAscii( "Flags" ) )
-                    {
-                        uno::Any aVal = aFilterData[nInd].Value;
-                        sal_Int32 nFlags = 0;
-                        // check the OWN flag
-                        if ( ( aFilterData[nInd].Value >>= nFlags ) && ( nFlags & 0x20 ) )
-                            return sal_True;
-                        break;
-                    }
-            }
-        }
-        catch( uno::Exception& )
-        {}
+        sal_Int32 nFlags = GetFilterFlags( aFilterName );
+        // check the OWN flag
+        bResult = ( nFlags & SFX_FILTER_OWN );
     }
 
-    return sal_False;
+    return bResult;
 }
 
 //-----------------------------------------------------------
@@ -709,7 +731,7 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
         try
         {
             uno::Reference< container::XContainerQuery > xFilterQuery(
-                m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
+                GetFilterFactory(),
                 uno::UNO_QUERY_THROW );
 
             uno::Sequence< beans::NamedValue > aSearchRequest( 2 );
@@ -734,14 +756,15 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
                                                                                 (sal_Int32)0 );
 
                         // that should be import, export, own filter and not a template filter ( TemplatePath flag )
-                        if ( ( ( nFlags & 0x23L ) == 0x23L ) && !( nFlags & 0x10 ) )
+                        sal_Int32 nRequired = ( SFX_FILTER_OWN | SFX_FILTER_EXPORT | SFX_FILTER_IMPORT );
+                        if ( ( ( nFlags & nRequired ) == nRequired ) && !( nFlags & SFX_FILTER_TEMPLATEPATH ) )
                         {
                             // if there are more than one filter the preffered one should be used
                             // if there is no preffered filter the first one will be used
-                            if ( !aResult.getLength() || ( nFlags & 0x10000000L ) )
+                            if ( !aResult.getLength() || ( nFlags & SFX_FILTER_PREFERED ) )
                                 aResult = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Name" ),
                                                                                 ::rtl::OUString() );
-                            if ( nFlags & 0x10000000L )
+                            if ( nFlags & SFX_FILTER_PREFERED )
                                 break; // the preffered filter was found
                         }
                     }
@@ -752,6 +775,116 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
 
     return aResult;
 }
+
+//-------------------------------------------------------------------------
+::rtl::OUString MimeConfigurationHelper::GetExportFilterFromImportFilter( const ::rtl::OUString& aImportFilterName )
+{
+    ::rtl::OUString aExportFilterName;
+
+    try
+    {
+        if ( aImportFilterName.getLength() )
+        {
+            uno::Reference< container::XNameAccess > xFilterFactory(
+                GetFilterFactory(),
+                uno::UNO_SET_THROW );
+
+            uno::Any aImpFilterAny = xFilterFactory->getByName( aImportFilterName );
+            uno::Sequence< beans::PropertyValue > aImpData;
+            if ( aImpFilterAny >>= aImpData )
+            {
+                SequenceAsHashMap aImpFilterHM( aImpData );
+                sal_Int32 nFlags = aImpFilterHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Flags" ),
+                                                                        (sal_Int32)0 );
+
+                if ( !( nFlags & SFX_FILTER_IMPORT ) )
+                {
+                    OSL_ENSURE( sal_False, "This is no import filter!" );
+                    throw uno::Exception();
+                }
+
+                if ( nFlags & SFX_FILTER_EXPORT )
+                {
+                    aExportFilterName = aImportFilterName;
+                }
+                else
+                {
+                    ::rtl::OUString aDocumentServiceName = aImpFilterHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "DocumentService" ), ::rtl::OUString() );
+                    ::rtl::OUString aTypeName = aImpFilterHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Type" ), ::rtl::OUString() );
+
+                    OSL_ENSURE( aDocumentServiceName.getLength() && aTypeName.getLength(), "Incomplete filter data!" );
+                    if ( aDocumentServiceName.getLength() && aTypeName.getLength() )
+                    {
+                        uno::Sequence< beans::NamedValue > aSearchRequest( 2 );
+                        aSearchRequest[0].Name = ::rtl::OUString::createFromAscii( "Type" );
+                        aSearchRequest[0].Value <<= aTypeName;
+                        aSearchRequest[1].Name = ::rtl::OUString::createFromAscii( "DocumentService" );
+                        aSearchRequest[1].Value <<= aDocumentServiceName;
+
+                        uno::Sequence< beans::PropertyValue > aExportFilterProps = SearchForFilter(
+                            uno::Reference< container::XContainerQuery >( xFilterFactory, uno::UNO_QUERY_THROW ),
+                            aSearchRequest,
+                            SFX_FILTER_EXPORT,
+                            SFX_FILTER_INTERNAL );
+
+                        if ( aExportFilterProps.getLength() )
+                        {
+                            SequenceAsHashMap aExpPropsHM( aExportFilterProps );
+                            aExportFilterName = aExpPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Name" ), ::rtl::OUString() );
+                        }
+                    }
+                }
+            }
+        }
+    }
+    catch( uno::Exception& )
+    {}
+
+    return aExportFilterName;
+}
+
+//-------------------------------------------------------------------------
+// static
+uno::Sequence< beans::PropertyValue > MimeConfigurationHelper::SearchForFilter(
+                                                        const uno::Reference< container::XContainerQuery >& xFilterQuery,
+                                                        const uno::Sequence< beans::NamedValue >& aSearchRequest,
+                                                        sal_Int32 nMustFlags,
+                                                        sal_Int32 nDontFlags )
+{
+    uno::Sequence< beans::PropertyValue > aFilterProps;
+    uno::Reference< container::XEnumeration > xFilterEnum =
+                                            xFilterQuery->createSubSetEnumerationByProperties( aSearchRequest );
+
+    // the first default filter will be taken,
+    // if there is no filter with flag default the first acceptable filter will be taken
+    if ( xFilterEnum.is() )
+    {
+        while ( xFilterEnum->hasMoreElements() )
+        {
+            uno::Sequence< beans::PropertyValue > aProps;
+            if ( xFilterEnum->nextElement() >>= aProps )
+            {
+                SequenceAsHashMap aPropsHM( aProps );
+                sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Flags" ),
+                                                                        (sal_Int32)0 );
+                if ( ( ( nFlags & nMustFlags ) == nMustFlags ) && !( nFlags & nDontFlags ) )
+                {
+                    if ( ( nFlags & SFX_FILTER_DEFAULT ) == SFX_FILTER_DEFAULT )
+                    {
+                        aFilterProps = aProps;
+                        break;
+                    }
+                    else if ( !aFilterProps.getLength() )
+                        aFilterProps = aProps;
+                }
+            }
+        }
+    }
+
+    return aFilterProps;
+}
+
+
 //-------------------------------------------------------------------------
 sal_Bool MimeConfigurationHelper::ClassIDsEqual( const uno::Sequence< sal_Int8 >& aClassID1, const uno::Sequence< sal_Int8 >& aClassID2 )
 {
@@ -764,7 +897,8 @@ sal_Bool MimeConfigurationHelper::ClassIDsEqual( const uno::Sequence< sal_Int8 >
 
     return sal_True;
 }
-//----------------------------------------------
+
+//-------------------------------------------------------------------------
 uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassID( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
                                                 sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11,
                                                 sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15 )
@@ -789,6 +923,8 @@ uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassID( sal_uInt3
 
     return aResult;
 }
+
+//-------------------------------------------------------------------------
 uno::Sequence<sal_Int8> MimeConfigurationHelper::GetSequenceClassIDFromObjectName(const ::rtl::OUString& _sObjectName)
 {
     uno::Sequence<sal_Int8> aClassId;
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/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index db5ba71cd876..60ffa965fcf1 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -28,12 +28,15 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_comphelper.hxx"
 #include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/embed/XEncryptionProtectedSource.hpp>
+#include <com/sun/star/embed/XEncryptionProtectedSource2.hpp>
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/IllegalTypeException.hpp>
 
+#include <rtl/digest.h>
+
 #include <ucbhelper/content.hxx>
 
 #include <comphelper/fileformat.h>
@@ -236,16 +239,16 @@ uno::Reference< io::XInputStream > OStorageHelper::GetInputStreamFromURL(
 }
 
 // ----------------------------------------------------------------------
-void OStorageHelper::SetCommonStoragePassword(
+void OStorageHelper::SetCommonStorageEncryptionData(
             const uno::Reference< embed::XStorage >& xStorage,
-            const ::rtl::OUString& aPass )
+            const uno::Sequence< beans::NamedValue >& aEncryptionData )
     throw ( uno::Exception )
 {
-    uno::Reference< embed::XEncryptionProtectedSource > xEncrSet( xStorage, uno::UNO_QUERY );
+    uno::Reference< embed::XEncryptionProtectedSource2 > xEncrSet( xStorage, uno::UNO_QUERY );
     if ( !xEncrSet.is() )
         throw io::IOException(); // TODO
 
-    xEncrSet->setEncryptionPassword( aPass );
+    xEncrSet->setEncryptionData( aEncryptionData );
 }
 
 // ----------------------------------------------------------------------
@@ -419,6 +422,45 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromStream(
 }
 
 // ----------------------------------------------------------------------
+uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( const ::rtl::OUString& aPassword )
+{
+    // TODO/LATER: Should not the method be part of DocPasswordHelper?
+    uno::Sequence< beans::NamedValue > aEncryptionData;
+    if ( aPassword.getLength() )
+    {
+        // MS_1252 encoding was used for SO60 document format password encoding,
+        // this encoding supports only a minor subset of nonascii characters,
+        // but for compatibility reasons it has to be used for old document formats
+        aEncryptionData.realloc( 2 );
+        aEncryptionData[0].Name = PACKAGE_ENCRYPTIONDATA_SHA1UTF8;
+        aEncryptionData[1].Name = PACKAGE_ENCRYPTIONDATA_SHA1MS1252;
+
+        rtl_TextEncoding pEncoding[2] = { RTL_TEXTENCODING_UTF8, RTL_TEXTENCODING_MS_1252 };
+
+        for ( sal_Int32 nInd = 0; nInd < 2; nInd++ )
+        {
+            ::rtl::OString aByteStrPass = ::rtl::OUStringToOString( aPassword, pEncoding[nInd] );
+
+            sal_uInt8 pBuffer[RTL_DIGEST_LENGTH_SHA1];
+            rtlDigestError nError = rtl_digest_SHA1( aByteStrPass.getStr(),
+                                                    aByteStrPass.getLength(),
+                                                    pBuffer,
+                                                    RTL_DIGEST_LENGTH_SHA1 );
+
+            if ( nError != rtl_Digest_E_None )
+            {
+                aEncryptionData.realloc( 0 );
+                break;
+            }
+
+            aEncryptionData[nInd].Value <<= uno::Sequence< sal_Int8 >( (sal_Int8*)pBuffer, RTL_DIGEST_LENGTH_SHA1 );
+        }
+    }
+
+    return aEncryptionData;
+}
+
+// ----------------------------------------------------------------------
 sal_Bool OStorageHelper::IsValidZipEntryFileName( const ::rtl::OUString& aName, sal_Bool bSlashAllowed )
 {
     return IsValidZipEntryFileName( aName.getStr(), aName.getLength(), bSlashAllowed );
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