diff options
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/inc/ContentHelper.hxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/sbagrid.hxx | 9 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/sbamultiplex.hxx | 2 |
3 files changed, 5 insertions, 12 deletions
diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index bc3f5955e748..0cd416b26d81 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -77,10 +77,8 @@ namespace dbaccess typedef ::boost::shared_ptr<OContentHelper_Impl> TContentPtr; - - typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString, - OUStringHash - > PropertyChangeListenerContainer; + typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString> + PropertyChangeListenerContainer; typedef ::comphelper::OBaseMutex OContentHelper_MBASE; typedef ::cppu::WeakComponentImplHelper9 < ::com::sun::star::ucb::XContent , ::com::sun::star::ucb::XCommandProcessor diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index ef9b4db2f991..7d14bb52246f 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -48,12 +48,6 @@ namespace dbaui bool operator() (const ::com::sun::star::util::URL& x, const ::com::sun::star::util::URL& y) const {return x.Complete == y.Complete ? true : false;} }; - struct SbaURLHash - { - sal_Int32 operator() (const ::com::sun::star::util::URL& x) const {return x.Complete.hashCode();} - }; - // SbaXGridControl - class SbaXStatusMultiplexer; class SbaXGridControl :public FmXGridControl @@ -103,7 +97,8 @@ namespace dbaui :public FmXGridPeer ,public ::com::sun::star::frame::XDispatch { - ::cppu::OMultiTypeInterfaceContainerHelperVar< ::com::sun::star::util::URL,SbaURLHash , SbaURLCompare> m_aStatusListeners; + cppu::OMultiTypeInterfaceContainerHelperVar< + css::util::URL, void, SbaURLCompare> m_aStatusListeners; public: SbaXGridPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx index ba23e758a0b8..4828bccd6c4c 100644 --- a/dbaccess/source/ui/inc/sbamultiplex.hxx +++ b/dbaccess/source/ui/inc/sbamultiplex.hxx @@ -185,7 +185,7 @@ namespace dbaui ,public listenerclass \ { \ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< \ - OUString, OUStringHash > ListenerContainerMap; \ + OUString > ListenerContainerMap; \ ListenerContainerMap m_aListeners; \ \ public: \ |