diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-06 11:57:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-06 12:03:59 +0100 |
| commit | 0fa31bed9a7a0666df26a1016d74df3ec15b40f9 (patch) | |
| tree | 679aea468eef96285855e2a4b7316ee2f0de37d6 /dbaccess | |
| parent | 4ae9b3ab10c882bd9c25b1f1303325a0ecd7fc06 (diff) | |
Default OMultiTypeInferfaceContainerHelperVar equalImpl parameter
...and assorted OUStringHash clean up
Change-Id: I779904e1275e8df88f567beb388d1d11af9e9671
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/inc/ContentHelper.hxx | 8 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/sbamultiplex.hxx | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index 26cdd3d22f05..9f443672c562 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 e4ee39090fe7..9a09a883e766 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: \ |