comphelper/source/property/genericpropertyset.cxx | 3 -
connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx | 4 +
connectivity/source/inc/calc/CTable.hxx | 4 -
connectivity/source/inc/dbase/DTable.hxx | 3 -
dbaccess/source/core/inc/ContentHelper.hxx | 8 +-
dbaccess/source/core/inc/column.hxx | 9 ---
dbaccess/source/ui/inc/sbamultiplex.hxx | 3 -
embeddedobj/source/general/intercept.cxx | 25 --------
embedserv/source/embed/intercept.cxx | 28 ----------
framework/inc/dispatch/menudispatcher.hxx | 3 -
framework/inc/dispatch/popupmenudispatcher.hxx | 3 -
framework/inc/stdtypes.h | 3 -
include/comphelper/stl_types.hxx | 13 ----
include/cppuhelper/interfacecontainer.h | 5 +
include/sfx2/unoctitm.hxx | 3 -
linguistic/source/lngopt.hxx | 5 -
svx/source/unodraw/shapepropertynotifier.cxx | 2
sw/source/ui/inc/unomailmerge.hxx | 4 -
ucb/source/cacher/contentresultsetwrapper.hxx | 18 ------
ucb/source/core/ucbstore.cxx | 24 --------
ucb/source/ucp/file/bc.cxx | 2
ucb/source/ucp/file/filglob.hxx | 18 ------
ucb/source/ucp/file/filnot.hxx | 3 -
ucb/source/ucp/file/shell.hxx | 6 --
ucbhelper/source/provider/contenthelper.cxx | 19 ------
ucbhelper/source/provider/resultset.cxx | 19 ------
26 files changed, 33 insertions(+), 204 deletions(-)
New commits:
commit e7911236e3a3012ce2589080da1f3bcc10b5f2fa
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 6 12:03:06 2013 +0100
Missing include
Change-Id: Ie5036134f03a0e9bfdfcb28190444b5d2ddcc323
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
index 17bb847..675f79a 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
@@ -20,6 +20,10 @@
#ifndef _CONNECTIVITY_MAB_QUERYHELPER_HXX_
#define _CONNECTIVITY_MAB_QUERYHELPER_HXX_
+#include <sal/config.h>
+
+#include <vector>
+
#include <MNSInclude.hxx>
#include "MErrorResource.hxx"
#include <sal/types.h>
commit 0fa31bed9a7a0666df26a1016d74df3ec15b40f9
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 6 11:57:54 2013 +0100
Default OMultiTypeInferfaceContainerHelperVar equalImpl parameter
...and assorted OUStringHash clean up
Change-Id: I779904e1275e8df88f567beb388d1d11af9e9671
diff --git a/comphelper/source/property/genericpropertyset.cxx
b/comphelper/source/property/genericpropertyset.cxx
index 1261db3..feb803e 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -30,7 +30,6 @@
#include <osl/mutex.hxx>
#include <comphelper/genericpropertyset.hxx>
#include <comphelper/propertysetinfo.hxx>
-#include <comphelper/stl_types.hxx>
#include <comphelper/servicehelper.hxx>
#include <rtl/uuid.h>
@@ -62,7 +61,7 @@ namespace comphelper
{
private:
GenericAnyMapImpl maAnyMap;
- ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString,
OUStringHash,UStringEqual> m_aListener;
+ ::cppu::OMultiTypeInterfaceContainerHelperVar<OUString, OUStringHash>
m_aListener;
protected:
virtual void _setPropertyValues( const PropertyMapEntry** ppEntries,
const Any* pValues ) throw( UnknownPropertyException, PropertyVetoException,
IllegalArgumentException, WrappedTargetException );
diff --git a/dbaccess/source/core/inc/ContentHelper.hxx
b/dbaccess/source/core/inc/ContentHelper.hxx
index 26cdd3d..9f44367 100644
--- a/dbaccess/source/core/inc/ContentHelper.hxx
+++ b/dbaccess/source/core/inc/ContentHelper.hxx
@@ -34,13 +34,16 @@
#include <cppuhelper/compbase9.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/uno3.hxx>
-#include <comphelper/stl_types.hxx>
#include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/sdbcx/XRename.hpp>
#include <connectivity/sqlerror.hxx>
#include <boost/shared_ptr.hpp>
+namespace com { namespace sun { namespace star { namespace beans {
+ struct PropertyValue;
+} } } }
+
namespace dbaccess
{
class ODatabaseModelImpl;
@@ -76,8 +79,7 @@ namespace dbaccess
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString,
- OUStringHash,
-
::comphelper::UStringEqual
+ OUStringHash
>
PropertyChangeListenerContainer;
typedef ::comphelper::OBaseMutex OContentHelper_MBASE;
typedef ::cppu::WeakComponentImplHelper9 <
::com::sun::star::ucb::XContent
diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx
b/dbaccess/source/ui/inc/sbamultiplex.hxx
index e4ee390..9a09a88 100644
--- a/dbaccess/source/ui/inc/sbamultiplex.hxx
+++ b/dbaccess/source/ui/inc/sbamultiplex.hxx
@@ -39,7 +39,6 @@
#include <com/sun/star/sdb/XRowSetApproveListener.hpp>
#include <com/sun/star/sdbc/XRowSetListener.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
-#include <comphelper/stl_types.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/queryinterface.hxx>
@@ -186,7 +185,7 @@ namespace dbaui
,public listenerclass
\
{
\
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar<
\
- OUString, OUStringHash, ::comphelper::UStringEqual >
ListenerContainerMap; \
+ OUString, OUStringHash > ListenerContainerMap; \
ListenerContainerMap m_aListeners;
\
\
public:
\
diff --git a/embeddedobj/source/general/intercept.cxx
b/embeddedobj/source/general/intercept.cxx
index 0f328cb..cda4dab 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -31,35 +31,14 @@ using namespace ::com::sun::star;
uno::Sequence< OUString > Interceptor::m_aInterceptedURL(IUL);
-struct equalOUString
-{
- bool operator()(
- const OUString& rKey1,
- const OUString& rKey2 ) const
- {
- return !!( rKey1 == rKey2 );
- }
-};
-
-
-struct hashOUString
-{
- size_t operator()( const OUString& rName ) const
- {
- return rName.hashCode();
- }
-};
-
-
-
class StatusChangeListenerContainer
: public ::cppu::OMultiTypeInterfaceContainerHelperVar<
-OUString,hashOUString,equalOUString>
+OUString,OUStringHash>
{
public:
StatusChangeListenerContainer( ::osl::Mutex& aMutex )
: cppu::OMultiTypeInterfaceContainerHelperVar<
- OUString,hashOUString,equalOUString>(aMutex)
+ OUString,OUStringHash>(aMutex)
{
}
};
diff --git a/embedserv/source/embed/intercept.cxx
b/embedserv/source/embed/intercept.cxx
index eba61b4..7db42b7 100644
--- a/embedserv/source/embed/intercept.cxx
+++ b/embedserv/source/embed/intercept.cxx
@@ -32,38 +32,14 @@ using namespace ::com::sun::star;
uno::Sequence< OUString > Interceptor::m_aInterceptedURL(IUL);
-
-
-
-struct equalOUString
-{
- bool operator()(
- const OUString& rKey1,
- const OUString& rKey2 ) const
- {
- return !!( rKey1 == rKey2 );
- }
-};
-
-
-struct hashOUString
-{
- size_t operator()( const OUString& rName ) const
- {
- return rName.hashCode();
- }
-};
-
-
-
class StatusChangeListenerContainer
: public ::cppu::OMultiTypeInterfaceContainerHelperVar<
-OUString,hashOUString,equalOUString>
+OUString,OUStringHash>
{
public:
StatusChangeListenerContainer( ::osl::Mutex& aMutex )
: cppu::OMultiTypeInterfaceContainerHelperVar<
- OUString,hashOUString,equalOUString>(aMutex)
+ OUString,OUStringHash>(aMutex)
{
}
};
diff --git a/framework/inc/dispatch/menudispatcher.hxx
b/framework/inc/dispatch/menudispatcher.hxx
index 21f1da7..7a957d5 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -54,8 +54,7 @@ namespace framework{
*//*-*************************************************************************************************************/
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString ,
- OUStringHash,
- std::equal_to<
OUString > > IMPL_ListenerHashContainer;
+ OUStringHash >
IMPL_ListenerHashContainer;
/*-************************************************************************************************************//**
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx
b/framework/inc/dispatch/popupmenudispatcher.hxx
index 6fafe87..c2fe7de 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -57,8 +57,7 @@ namespace framework{
*//*-*************************************************************************************************************/
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString ,
- OUStringHash,
- std::equal_to<
OUString > > IMPL_ListenerHashContainer;
+ OUStringHash >
IMPL_ListenerHashContainer;
/*-************************************************************************************************************//**
diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h
index 7a5f08f..79523bb 100644
--- a/framework/inc/stdtypes.h
+++ b/framework/inc/stdtypes.h
@@ -170,8 +170,7 @@ typedef BaseHash< sal_Int32 > NameToHandleHash;
So it's better to declare it one times only!
*/
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString
,
- OUStringHash,
- ::std::equal_to<
OUString > > ListenerHash;
+ OUStringHash >
ListenerHash;
} // namespace framework
diff --git a/include/cppuhelper/interfacecontainer.h
b/include/cppuhelper/interfacecontainer.h
index 223148f..860529d 100644
--- a/include/cppuhelper/interfacecontainer.h
+++ b/include/cppuhelper/interfacecontainer.h
@@ -19,6 +19,9 @@
#ifndef INCLUDED_CPPUHELPER_INTERFACECONTAINER_H
#define INCLUDED_CPPUHELPER_INTERFACECONTAINER_H
+#include <sal/config.h>
+
+#include <functional>
#include <vector>
#include <osl/mutex.hxx>
#include <rtl/alloc.h>
@@ -293,7 +296,7 @@ inline void OInterfaceContainerHelper::notifyEach( void (
SAL_CALL ListenerT::*N
@see OInterfaceIteratorHelper
@see OInterfaceContainerHelper
*/
-template< class key , class hashImpl , class equalImpl >
+template< class key , class hashImpl , class equalImpl = std::equal_to<key> >
class OMultiTypeInterfaceContainerHelperVar
{
public:
diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index 2641c45..9682827 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SFX2_UNOCTITM_HXX
#define INCLUDED_SFX2_UNOCTITM_HXX
-#include <functional>
#include <com/sun/star/frame/XNotifyingDispatch.hpp>
#include <com/sun/star/frame/XDispatchResultListener.hpp>
#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
@@ -77,7 +76,7 @@ struct SfxStatusDispatcher_Impl_hashType
{ return s.hashCode(); }
};
-typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString,
SfxStatusDispatcher_Impl_hashType, std::equal_to< OUString > >
SfxStatusDispatcher_Impl_ListenerContainer ;
+typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString,
SfxStatusDispatcher_Impl_hashType >
SfxStatusDispatcher_Impl_ListenerContainer ;
class SfxStatusDispatcher : public ::cppu::WeakImplHelper1<
css::frame::XNotifyingDispatch >
{
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 528b853..4d68370 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_LINGUISTIC_SOURCE_LNGOPT_HXX
#define INCLUDED_LINGUISTIC_SOURCE_LNGOPT_HXX
-#include <functional>
-
#include <uno/lbnames.h>
#include <cppuhelper/implbase5.hxx>
#include <cppuhelper/interfacecontainer.hxx>
@@ -85,8 +83,7 @@ struct PropHashType_Impl
typedef cppu::OMultiTypeInterfaceContainerHelperVar
<
sal_Int32,
- PropHashType_Impl,
- std::equal_to< sal_Int32 >
+ PropHashType_Impl
> OPropertyListenerContainerHelper;
diff --git a/svx/source/unodraw/shapepropertynotifier.cxx
b/svx/source/unodraw/shapepropertynotifier.cxx
index ed2d7ed..2a401e7 100644
--- a/svx/source/unodraw/shapepropertynotifier.cxx
+++ b/svx/source/unodraw/shapepropertynotifier.cxx
@@ -22,7 +22,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <comphelper/stl_types.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/weak.hxx>
#include <tools/diagnose_ex.h>
@@ -66,7 +65,6 @@ namespace svx
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar < OUString
, OUStringHash
- ,
::comphelper::UStringEqual
>
PropertyChangeListenerContainer;
//====================================================================
diff --git a/sw/source/ui/inc/unomailmerge.hxx
b/sw/source/ui/inc/unomailmerge.hxx
index b9c5e1f..9b9a4c1 100644
--- a/sw/source/ui/inc/unomailmerge.hxx
+++ b/sw/source/ui/inc/unomailmerge.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SW_SOURCE_UI_INC_UNOMAILMERGE_HXX
#define INCLUDED_SW_SOURCE_UI_INC_UNOMAILMERGE_HXX
-#include <functional>
#include <cppuhelper/implbase5.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <unotools/configitem.hxx>
@@ -72,8 +71,7 @@ struct PropHashType_Impl
typedef cppu::OMultiTypeInterfaceContainerHelperVar
<
sal_Int32,
- PropHashType_Impl,
- std::equal_to< sal_Int32 >
+ PropHashType_Impl
> OPropertyListenerContainerHelper;
////////////////////////////////////////////////////////////
diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx
b/ucb/source/cacher/contentresultsetwrapper.hxx
index 7d1b3bf6..9874049 100644
--- a/ucb/source/cacher/contentresultsetwrapper.hxx
+++ b/ucb/source/cacher/contentresultsetwrapper.hxx
@@ -52,24 +52,8 @@ protected:
//--------------------------------------------------------------------------
//class PropertyChangeListenerContainer_Impl.
- struct equalStr_Impl
- {
- bool operator()( const OUString& s1, const OUString& s2 ) const
- {
- return !!( s1 == s2 );
- }
- };
-
- struct hashStr_Impl
- {
- size_t operator()( const OUString& rName ) const
- {
- return rName.hashCode();
- }
- };
-
typedef cppu::OMultiTypeInterfaceContainerHelperVar
- < OUString , hashStr_Impl , equalStr_Impl >
+ < OUString, OUStringHash >
PropertyChangeListenerContainer_Impl;
//--------------------------------------------------------------------------
// class ReacquireableGuard
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 73b2835..04a961f 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -101,24 +101,6 @@ OUString makeHierarchalNameSegment( const OUString & rIn )
#define CFGPROPERTY_LAZYWRITE "lazywrite"
//=========================================================================
-
-struct equalString_Impl
-{
- bool operator()( const OUString& s1, const OUString& s2 ) const
- {
- return !!( s1 == s2 );
- }
-};
-
-struct hashString_Impl
-{
- size_t operator()( const OUString & rName ) const
- {
- return rName.hashCode();
- }
-};
-
-//=========================================================================
//
// PropertySetMap_Impl.
//
@@ -128,8 +110,7 @@ typedef boost::unordered_map
<
OUString,
PersistentPropertySet*,
- hashString_Impl,
- equalString_Impl
+ OUStringHash
>
PropertySetMap_Impl;
@@ -1207,8 +1188,7 @@ Reference< XInterface >
PropertySetRegistry::getConfigWriteAccess(
typedef OMultiTypeInterfaceContainerHelperVar
<
OUString,
- hashString_Impl,
- equalString_Impl
+ OUStringHash
> PropertyListeners_Impl;
//=========================================================================
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 73f734d..4658864 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -51,7 +51,7 @@ using namespace com::sun::star::ucb;
// PropertyListeners
-typedef cppu::OMultiTypeInterfaceContainerHelperVar<
OUString,hashOUString,equalOUString >
+typedef cppu::OMultiTypeInterfaceContainerHelperVar< OUString,OUStringHash >
PropertyListeners_impl;
class fileaccess::PropertyListeners
diff --git a/ucb/source/ucp/file/filglob.hxx b/ucb/source/ucp/file/filglob.hxx
index fbb6d8b..ebf569a 100644
--- a/ucb/source/ucp/file/filglob.hxx
+++ b/ucb/source/ucp/file/filglob.hxx
@@ -28,24 +28,6 @@ namespace fileaccess {
class BaseContent;
- struct equalOUString
- {
- bool operator()( const OUString& rKey1, const OUString& rKey2 ) const
- {
- return !!( rKey1 == rKey2 );
- }
- };
-
-
- struct hashOUString
- {
- size_t operator()( const OUString& rName ) const
- {
- return rName.hashCode();
- }
- };
-
-
/******************************************************************************/
/*
*/
/* Helper functions
*/
diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx
index 8bb76d1..1527738 100644
--- a/ucb/source/ucp/file/filnot.hxx
+++ b/ucb/source/ucp/file/filnot.hxx
@@ -83,8 +83,7 @@ namespace fileaccess {
typedef boost::unordered_map< OUString,
com::sun::star::uno::Sequence<
com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >,
- hashOUString,
- equalOUString > ListenerMap;
+ OUStringHash > ListenerMap;
class PropertyChangeNotifier
{
diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx
index 12a7b7e..7228fbb 100644
--- a/ucb/source/ucp/file/shell.hxx
+++ b/ucb/source/ucp/file/shell.hxx
@@ -76,10 +76,6 @@ namespace fileaccess {
public:
// Type definitions
- typedef OUString UniquePath;
- typedef equalOUString eUniquePath;
- typedef hashOUString hUniquePath;
-
class MyProperty
{
private:
@@ -155,7 +151,7 @@ namespace fileaccess {
com::sun::star::uno::Reference<
com::sun::star::beans::XPropertyAccess > xA;
};
- typedef boost::unordered_map<
UniquePath,UnqPathData,hUniquePath,eUniquePath > ContentMap;
+ typedef boost::unordered_map< OUString,UnqPathData,OUStringHash >
ContentMap;
public:
diff --git a/ucbhelper/source/provider/contenthelper.cxx
b/ucbhelper/source/provider/contenthelper.cxx
index 2f1fde0..8b9159a 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.cxx
@@ -106,27 +106,10 @@ PropertiesEventListenerMap;
//
//=========================================================================
-struct equalStr
-{
- bool operator()( const OUString& s1, const OUString& s2 ) const
- {
- return !!( s1 == s2 );
- }
-};
-
-struct hashStr
-{
- size_t operator()( const OUString& rName ) const
- {
- return rName.hashCode();
- }
-};
-
typedef cppu::OMultiTypeInterfaceContainerHelperVar
<
OUString,
- hashStr,
- equalStr
+ OUStringHash
> PropertyChangeListeners;
//=========================================================================
diff --git a/ucbhelper/source/provider/resultset.cxx
b/ucbhelper/source/provider/resultset.cxx
index 858ebba..beed2f1 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -120,27 +120,10 @@ public:
//
//=========================================================================
-struct equalStr_Impl
-{
- bool operator()( const OUString& s1, const OUString& s2 ) const
- {
- return !!( s1 == s2 );
- }
-};
-
-struct hashStr_Impl
-{
- size_t operator()( const OUString& rName ) const
- {
- return rName.hashCode();
- }
-};
-
typedef cppu::OMultiTypeInterfaceContainerHelperVar
<
OUString,
- hashStr_Impl,
- equalStr_Impl
+ OUStringHash
> PropertyChangeListenerContainer;
//=========================================================================
commit 4ae9b3ab10c882bd9c25b1f1303325a0ecd7fc06
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 6 11:04:21 2013 +0100
Remove unused typedefs
Change-Id: I59f3fba9d4602cddfef1bd6862cbcfb9eec133ae
diff --git a/connectivity/source/inc/calc/CTable.hxx
b/connectivity/source/inc/calc/CTable.hxx
index ed9bd30..ead0689 100644
--- a/connectivity/source/inc/calc/CTable.hxx
+++ b/connectivity/source/inc/calc/CTable.hxx
@@ -39,10 +39,6 @@ namespace connectivity
typedef file::OFileTable OCalcTable_BASE;
class OCalcConnection;
- typedef ::std::map< OUString,
- ::com::sun::star::uno::Reference<
::com::sun::star::container::XNamed>,
- comphelper::UStringMixLess > OContainer;
-
class OCalcTable : public OCalcTable_BASE
{
private:
diff --git a/connectivity/source/inc/dbase/DTable.hxx
b/connectivity/source/inc/dbase/DTable.hxx
index 60b903b..2a00c51 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -33,9 +33,6 @@ namespace connectivity
typedef file::OFileTable ODbaseTable_BASE;
class ODbaseConnection;
- typedef ::std::map< OUString,
- ::com::sun::star::uno::Reference<
::com::sun::star::container::XNamed>, comphelper::UStringMixLess > OContainer;
-
class ODbaseTable : public ODbaseTable_BASE
{
// The first byte of a dBase file specifies its type
commit 33035833651d5d0131fe6064a0a24b1e47d8751c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 6 11:01:07 2013 +0100
Remove unused comphelper::UStringMixHash
Change-Id: Ie41a0ed7c49a2bb3368179bd198c9de508605931
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 5ab7230..8ed702a 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -118,19 +118,6 @@ public:
return !!(lhs.Name == rhs);
}
};
-//------------------------------------------------------------------------
-class UStringMixHash
-{
- sal_Bool m_bCaseSensitive;
-
-public:
- UStringMixHash(sal_Bool bCaseSensitive =
sal_True):m_bCaseSensitive(bCaseSensitive){}
- size_t operator() (const OUString& rStr) const
- {
- return m_bCaseSensitive ? rStr.hashCode() :
rStr.toAsciiUpperCase().hashCode();
- }
- sal_Bool isCaseSensitive() const {return m_bCaseSensitive;}
-};
//=====================================================================
//= OInterfaceCompare
commit 0bdfebdc95c7a5d13247d5285552d1ba438b796c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 6 10:49:13 2013 +0100
Remove unused typedefs
Change-Id: I5af478155963343fa9fe5fa2a39d0209829b2409
diff --git a/dbaccess/source/core/inc/column.hxx
b/dbaccess/source/core/inc/column.hxx
index 74b3fcd..5ccb224 100644
--- a/dbaccess/source/core/inc/column.hxx
+++ b/dbaccess/source/core/inc/column.hxx
@@ -42,7 +42,6 @@
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/propertycontainer.hxx>
-#include <comphelper/stl_types.hxx>
#include <connectivity/CommonTools.hxx>
#include <connectivity/FValue.hxx>
#include <connectivity/TColumnsHelper.hxx>
@@ -53,8 +52,6 @@
#include <cppuhelper/propshlp.hxx>
#include <osl/diagnose.h>
-#include <boost/unordered_map.hpp>
-
namespace dbaccess
{
@@ -144,12 +141,6 @@ namespace dbaccess
~IColumnFactory() {}
};
- // OColumns
- // general columns map, could be used for readonly access
- // no appending and dropping is supported
- typedef ::boost::unordered_map<OUString, OColumn*,
::comphelper::UStringMixHash, ::comphelper::UStringMixEqual> OColumnMap;
- typedef ::std::vector<OColumn*> OColumnArray;
-
class OContainerMediator;
typedef ::cppu::ImplHelper1< ::com::sun::star::container::XChild > TXChild;
typedef connectivity::OColumnsHelper OColumns_BASE;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
