From e413521e0bd402530ff0308d9e05331e6bdc0c25 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 6 Dec 2013 10:37:32 +0100
Subject: Avoid ambiguities among different OWeakRefArray declarations

Change-Id: I61e3e9cdda17b6b23b33159d89904cce8f2e2ba0
---
 dbaccess/source/core/dataaccess/connection.cxx | 8 ++++----
 dbaccess/source/core/dataaccess/connection.hxx | 5 +++--
 dbaccess/source/inc/apitools.hxx               | 7 -------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 8863b10e7916..e5c170f4c1d1 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -487,8 +487,8 @@ void OConnection::disposing()
     OSubComponent::disposing();
     OConnectionWrapper::disposing();
 
-    OWeakRefArray::iterator aEnd = m_aStatements.end();
-    for (OWeakRefArray::iterator i = m_aStatements.begin(); aEnd != i; ++i)
+    connectivity::OWeakRefArray::iterator aEnd = m_aStatements.end();
+    for (connectivity::OWeakRefArray::iterator i = m_aStatements.begin(); aEnd != i; ++i)
     {
         Reference<XComponent> xComp(i->get(),UNO_QUERY);
         ::comphelper::disposeComponent(xComp);
@@ -503,8 +503,8 @@ void OConnection::disposing()
 
     ::comphelper::disposeComponent(m_xQueries);
 
-    OWeakRefArray::iterator aComposerEnd = m_aComposers.end();
-    for (OWeakRefArray::iterator j = m_aComposers.begin(); aComposerEnd != j; ++j)
+    connectivity::OWeakRefArray::iterator aComposerEnd = m_aComposers.end();
+    for (connectivity::OWeakRefArray::iterator j = m_aComposers.begin(); aComposerEnd != j; ++j)
     {
         Reference<XComponent> xComp(j->get(),UNO_QUERY);
         ::comphelper::disposeComponent(xComp);
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index 79952694ab33..4ae7e7e90e9c 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -48,6 +48,7 @@
 #include <comphelper/implbase_var.hxx>
 #endif
 #include <connectivity/ConnectionWrapper.hxx>
+#include <connectivity/CommonTools.hxx>
 #include <connectivity/warningscontainer.hxx>
 
 namespace dbaccess
@@ -80,10 +81,10 @@ class OConnection           :public ::comphelper::OBaseMutex
 protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier >
                             m_xMasterTables; // just to avoid the recreation of the catalog
-    OWeakRefArray           m_aStatements;
+    connectivity::OWeakRefArray           m_aStatements;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
                             m_xQueries;
-    OWeakRefArray           m_aComposers;
+    connectivity::OWeakRefArray           m_aComposers;
 
     // the filter as set on the parent data link at construction of the connection
     ::com::sun::star::uno::Sequence< OUString >  m_aTableFilter;
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index eb6db2aa42e7..0890b09e362d 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -22,8 +22,6 @@
 
 #include <sal/config.h>
 
-#include <vector>
-
 #include <cppuhelper/component.hxx>
 #include <osl/mutex.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
@@ -31,11 +29,6 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
 
-// various typedefs
-namespace {
-typedef std::vector<css::uno::WeakReferenceHelper> OWeakRefArray;
-}
-
 // OSubComponent - a component which holds a hard ref to it's parent
 //                 and is been hold itself (by the parent) with a weak ref
 class OSubComponent : public ::cppu::OComponentHelper
-- 
cgit