merge vosremoval-reference.diff

3 files changed, 15 insertions, 14 deletions

diff --git a/dbaccess/source/ui/inc/ConnectionLineData.hxx b/dbaccess/source/ui/inc/ConnectionLineData.hxx
index 7fb7c51e84ce7..42c1f8969daaf 100644
--- a/dbaccess/source/ui/inc/ConnectionLineData.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLineData.hxx
@@ -28,11 +28,10 @@
 #define DBAUI_CONNECTIONLINEDATA_HXX
 
 #include "QEnumTypes.hxx"
-#include <vos/refernce.hxx>
 #include <vector>
 
-#include <vos/ref.hxx>
-
+#include <rtl/ref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
 #include "RefFunctor.hxx"
 #include <rtl/ustring.hxx>
 
@@ -52,7 +51,7 @@ namespace dbaui
         the class OConnectionLineData contains the data of a connection
         e.g. the source and the destanation field
     **/
-    class OConnectionLineData : public ::vos::OReference
+    class OConnectionLineData : public ::salhelper::SimpleReferenceObject
     {
         ::rtl::OUString m_aSourceFieldName;
         ::rtl::OUString m_aDestFieldName;
@@ -94,7 +93,7 @@ namespace dbaui
 
     //-------------------------------------------------------------------------
     //------------------------------------------------------------------
-    typedef ::vos::ORef< OConnectionLineData >      OConnectionLineDataRef;
+    typedef ::rtl::Reference< OConnectionLineData >     OConnectionLineDataRef;
     typedef ::std::vector< OConnectionLineDataRef > OConnectionLineDataVec;
 }
 #endif // DBAUI_CONNECTIONLINEDATA_HXX
diff --git a/dbaccess/source/ui/inc/RefFunctor.hxx b/dbaccess/source/ui/inc/RefFunctor.hxx
index 29268f70bf101..95c55e485c6b8 100644
--- a/dbaccess/source/ui/inc/RefFunctor.hxx
+++ b/dbaccess/source/ui/inc/RefFunctor.hxx
@@ -28,7 +28,7 @@
 #ifndef DBAUI_REFFUNCTOR_HXX
 #define DBAUI_REFFUNCTOR_HXX
 
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
 #ifndef INCLUDED_FUNCTIONAL
 #define INCLUDED_FUNCTIONAL
 #include <functional>
@@ -36,19 +36,19 @@
 
 namespace dbaui
 {
-    template <class T> class OUnaryRefFunctor : public ::std::unary_function< ::vos::ORef<T> ,void>
+    template <class T> class OUnaryRefFunctor : public ::std::unary_function< ::rtl::Reference<T> ,void>
     {
         ::std::mem_fun_t<bool,T> m_aFunction;
     public:
         OUnaryRefFunctor(const ::std::mem_fun_t<bool,T>& _aFunc) : m_aFunction(_aFunc)
         {}
-        inline void operator()(const ::vos::ORef<T>& _aType) const
+        inline void operator()(const ::rtl::Reference<T>& _aType) const
         {
-            m_aFunction(_aType.getBodyPtr());
+            m_aFunction(_aType.get());
         }
-//      inline void operator()(const ::vos::ORef<T>& _aType)
+//      inline void operator()(const ::rtl::Reference<T>& _aType)
 //      {
-//          m_aFunction(_aType.getBodyPtr());
+//          m_aFunction(_aType.get());
 //      }
     };
 // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx
index 6943b97d59ccb..20ace4f664d07 100644
--- a/dbaccess/source/ui/inc/TableFieldDescription.hxx
+++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx
@@ -34,7 +34,9 @@
 #include "QEnumTypes.hxx"
 #include <rtl/ustring.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
+
+#include <salhelper/simplereferenceobject.hxx>
 
 namespace comphelper
 {
@@ -44,7 +46,7 @@ namespace comphelper
 class Window;
 namespace dbaui
 {
-    class OTableFieldDesc : public ::vos::OReference
+    class OTableFieldDesc : public ::salhelper::SimpleReferenceObject
     {
     private:
        ::std::vector< ::rtl::OUString >
@@ -152,7 +154,7 @@ namespace dbaui
         return bEmpty;
     }
     //------------------------------------------------------------------
-    typedef ::vos::ORef< OTableFieldDesc>       OTableFieldDescRef;
+    typedef ::rtl::Reference< OTableFieldDesc>      OTableFieldDescRef;
     typedef ::std::vector<OTableFieldDescRef>   OTableFields;
 }
 #endif //