Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba34b

3 files changed, 307 insertions, 0 deletions

diff --git a/comphelper/inc/comphelper/anycompare.hxx b/comphelper/inc/comphelper/anycompare.hxx
new file mode 100755
index 000000000000..03f41e108ba9
--- /dev/null
+++ b/comphelper/inc/comphelper/anycompare.hxx
@@ -0,0 +1,226 @@
+/*************************************************************************
+ * 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_ANYCOMPARE_HXX
+#define COMPHELPER_ANYCOMPARE_HXX
+
+#include "comphelper/comphelperdllapi.h"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/i18n/XCollator.hpp>
+/** === end UNO includes === **/
+
+#include <comphelper/extract.hxx>
+
+#include <functional>
+#include <memory>
+
+//......................................................................................................................
+namespace comphelper
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= IKeyPredicateLess
+    //==================================================================================================================
+    class SAL_NO_VTABLE IKeyPredicateLess
+    {
+    public:
+        virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const = 0;
+        virtual ~IKeyPredicateLess() {}
+    };
+
+    //==================================================================================================================
+    //= LessPredicateAdapter
+    //==================================================================================================================
+    struct LessPredicateAdapter : public ::std::binary_function< ::com::sun::star::uno::Any, ::com::sun::star::uno::Any, bool >
+    {
+        LessPredicateAdapter( const IKeyPredicateLess& _predicate )
+            :m_predicate( _predicate )
+        {
+        }
+
+        bool operator()( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const
+        {
+            return m_predicate.isLess( _lhs, _rhs );
+        }
+
+    private:
+        IKeyPredicateLess const &   m_predicate;
+
+    private:
+        LessPredicateAdapter(); // never implemented
+    };
+
+    //==================================================================================================================
+    //= ScalarPredicateLess
+    //==================================================================================================================
+    template< typename SCALAR >
+    class ScalarPredicateLess : public IKeyPredicateLess
+    {
+    public:
+        virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const
+        {
+            SCALAR lhs(0), rhs(0);
+            if  (   !( _lhs >>= lhs )
+                ||  !( _rhs >>= rhs )
+                )
+                throw ::com::sun::star::lang::IllegalArgumentException();
+            return lhs < rhs;
+        }
+    };
+
+    //==================================================================================================================
+    //= StringPredicateLess
+    //==================================================================================================================
+    class StringPredicateLess : public IKeyPredicateLess
+    {
+    public:
+        virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const
+        {
+            ::rtl::OUString lhs, rhs;
+            if  (   !( _lhs >>= lhs )
+                ||  !( _rhs >>= rhs )
+                )
+                throw ::com::sun::star::lang::IllegalArgumentException();
+            return lhs < rhs;
+        }
+    };
+
+    //==================================================================================================================
+    //= StringCollationPredicateLess
+    //==================================================================================================================
+    class StringCollationPredicateLess : public IKeyPredicateLess
+    {
+    public:
+        StringCollationPredicateLess( ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > const & i_collator )
+            :m_collator( i_collator )
+        {
+        }
+
+        virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const
+        {
+            ::rtl::OUString lhs, rhs;
+            if  (   !( _lhs >>= lhs )
+                ||  !( _rhs >>= rhs )
+                )
+                throw ::com::sun::star::lang::IllegalArgumentException();
+            return m_collator->compareString( lhs, rhs ) < 0;
+        }
+
+    private:
+        ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > const m_collator;
+    };
+
+    //==================================================================================================================
+    //= TypePredicateLess
+    //==================================================================================================================
+    class TypePredicateLess : public IKeyPredicateLess
+    {
+    public:
+        virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const
+        {
+            ::com::sun::star::uno::Type lhs, rhs;
+            if  (   !( _lhs >>= lhs )
+                ||  !( _rhs >>= rhs )
+                )
+                throw ::com::sun::star::lang::IllegalArgumentException();
+            return lhs.getTypeName() < rhs.getTypeName();
+        }
+    };
+
+    //==================================================================================================================
+    //= EnumPredicateLess
+    //==================================================================================================================
+    class EnumPredicateLess : public IKeyPredicateLess
+    {
+    public:
+        EnumPredicateLess( ::com::sun::star::uno::Type const & _enumType )
+            :m_enumType( _enumType )
+        {
+        }
+
+        virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const
+        {
+            sal_Int32 lhs(0), rhs(0);
+            if  (   !::cppu::enum2int( lhs, _lhs )
+                ||  !::cppu::enum2int( rhs, _rhs )
+                ||  !_lhs.getValueType().equals( m_enumType )
+                ||  !_rhs.getValueType().equals( m_enumType )
+                )
+                throw ::com::sun::star::lang::IllegalArgumentException();
+            return lhs < rhs;
+        }
+
+    private:
+        ::com::sun::star::uno::Type const   m_enumType;
+    };
+
+    //==================================================================================================================
+    //= InterfacePredicateLess
+    //==================================================================================================================
+    class InterfacePredicateLess : public IKeyPredicateLess
+    {
+    public:
+        virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const
+        {
+            if  (   ( _lhs.getValueTypeClass() != ::com::sun::star::uno::TypeClass_INTERFACE )
+                ||  ( _rhs.getValueTypeClass() != ::com::sun::star::uno::TypeClass_INTERFACE )
+                )
+                throw ::com::sun::star::lang::IllegalArgumentException();
+
+            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > lhs( _lhs, ::com::sun::star::uno::UNO_QUERY );
+            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > rhs( _rhs, ::com::sun::star::uno::UNO_QUERY );
+            return lhs.get() < rhs.get();
+        }
+    };
+
+    //==================================================================================================================
+    //= getStandardLessPredicate
+    //==================================================================================================================
+    /** creates a default IKeyPredicateLess instance for the given UNO type
+        @param i_type
+            the type for which a predicate instance should be created
+        @param i_collator
+            specifies a collator instance to use, or <NULL/>. If <NULL/>, strings will be compared using the <code>&lt</code>
+            operator, otherwise the collator will be used. The parameter is ignored if <arg>i_type</arg> does not specify
+            the string type.
+        @return
+            a default implementation of IKeyPredicateLess, which is able to compare values of the given type. If no
+            such default implementation is known for the given type, then <NULL/> is returned.
+    */
+    ::std::auto_ptr< IKeyPredicateLess > COMPHELPER_DLLPUBLIC
+        getStandardLessPredicate(
+            ::com::sun::star::uno::Type const & i_type,
+            ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > const & i_collator
+        );
+
+//......................................................................................................................
+} // namespace comphelper
+//......................................................................................................................
+
+#endif // COMPHELPER_ANYCOMPARE_HXX
diff --git a/comphelper/inc/comphelper/componentguard.hxx b/comphelper/inc/comphelper/componentguard.hxx
new file mode 100755
index 000000000000..820b901a5c55
--- /dev/null
+++ b/comphelper/inc/comphelper/componentguard.hxx
@@ -0,0 +1,70 @@
+/*************************************************************************
+ * 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_COMPONENTGUARD_HXX
+#define COMPHELPER_COMPONENTGUARD_HXX
+
+/** === begin UNO includes === **/
+#include <com/sun/star/lang/DisposedException.hpp>
+/** === end UNO includes === **/
+
+#include <cppuhelper/weak.hxx>
+#include <cppuhelper/interfacecontainer.hxx>
+
+//......................................................................................................................
+namespace comphelper
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= ComponentGuard
+    //==================================================================================================================
+    class ComponentGuard
+    {
+    public:
+        ComponentGuard( ::cppu::OWeakObject& i_component, ::cppu::OBroadcastHelper & i_broadcastHelper )
+            :m_aGuard( i_broadcastHelper.rMutex )
+        {
+            if ( i_broadcastHelper.bDisposed )
+                throw ::com::sun::star::lang::DisposedException( ::rtl::OUString(), &i_component );
+        }
+
+        ~ComponentGuard()
+        {
+        }
+
+        void clear()    { m_aGuard.clear(); }
+        void reset()    { m_aGuard.reset(); }
+
+    private:
+        ::osl::ResettableMutexGuard m_aGuard;
+    };
+
+//......................................................................................................................
+} // namespace comphelper
+//......................................................................................................................
+
+#endif // COMPHELPER_COMPONENTGUARD_HXX
diff --git a/comphelper/inc/comphelper/sequenceasvector.hxx b/comphelper/inc/comphelper/sequenceasvector.hxx
index 263b68b24c7c..48dfe50b1645 100644
--- a/comphelper/inc/comphelper/sequenceasvector.hxx
+++ b/comphelper/inc/comphelper/sequenceasvector.hxx
@@ -86,6 +86,17 @@ class SequenceAsVector : public ::std::vector< TElementType >
         {}
 
         //---------------------------------------
+        /** @short  creates a new vector with the given length.
+
+            @param  nLength
+                    the number of elements for the new vector.
+         */
+        explicit SequenceAsVector(sal_Int32 nLength) :
+            ::std::vector< TElementType >( static_cast< size_t >( nLength ) )
+        {
+        }
+
+        //---------------------------------------
         /** @short  creates a new deque from the given uno sequence.
 
             @param  lSource