merge vosremoval-reference.diff

15 files changed, 33 insertions, 33 deletions

diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
index 134e7e5dfca1..a941d2046eee 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
@@ -46,7 +46,7 @@
 #include "connectivity/FValue.hxx"
 #include "connectivity/dbtoolsdllapi.hxx"
 #include <comphelper/broadcasthelper.hxx>
-#include <vos/refernce.hxx>
+#include <salhelper/simplereferenceobject.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx
index 51a978121ca1..65e8b33371e7 100644
--- a/connectivity/source/inc/TSortIndex.hxx
+++ b/connectivity/source/inc/TSortIndex.hxx
@@ -98,7 +98,7 @@ namespace connectivity
             CreateKeySet creates the keyset which vaalues could be used to travel in your table/result
             The returned keyset is frozen.
         */
-        ::vos::ORef<OKeySet> CreateKeySet();
+        ::rtl::Reference<OKeySet> CreateKeySet();
 
 
 
diff --git a/connectivity/source/inc/adabas/BConnection.hxx b/connectivity/source/inc/adabas/BConnection.hxx
index 678eb2e61049..16b88305f0b7 100644
--- a/connectivity/source/inc/adabas/BConnection.hxx
+++ b/connectivity/source/inc/adabas/BConnection.hxx
@@ -31,7 +31,7 @@
 #include "odbc/OConnection.hxx"
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <cppuhelper/weakref.hxx>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
 
 namespace connectivity
 {
@@ -70,7 +70,7 @@ namespace connectivity
             virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException);
             static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
-            ::vos::ORef<OSQLColumns> createSelectColumns(const ::rtl::OUString& _rSql);
+            ::rtl::Reference<OSQLColumns> createSelectColumns(const ::rtl::OUString& _rSql);
         };
     }
 }
diff --git a/connectivity/source/inc/adabas/BPreparedStatement.hxx b/connectivity/source/inc/adabas/BPreparedStatement.hxx
index a5cfac1666e4..4ccfc813bdfc 100644
--- a/connectivity/source/inc/adabas/BPreparedStatement.hxx
+++ b/connectivity/source/inc/adabas/BPreparedStatement.hxx
@@ -36,7 +36,7 @@ namespace connectivity
     {
         class OAdabasPreparedStatement :    public  ::connectivity::odbc::OPreparedStatement
         {
-            ::vos::ORef<OSQLColumns>    m_aSelectColumns;
+            ::rtl::Reference<OSQLColumns>   m_aSelectColumns;
         protected:
             virtual odbc::OResultSet* createResulSet();
             virtual void setResultSetConcurrency(sal_Int32 _par0)   ;
diff --git a/connectivity/source/inc/adabas/BResultSet.hxx b/connectivity/source/inc/adabas/BResultSet.hxx
index 46dbf5684484..51625c5777ea 100644
--- a/connectivity/source/inc/adabas/BResultSet.hxx
+++ b/connectivity/source/inc/adabas/BResultSet.hxx
@@ -35,9 +35,9 @@ namespace connectivity
     {
         class OAdabasResultSet :    public  ::connectivity::odbc::OResultSet
         {
-            ::vos::ORef<OSQLColumns>    m_aSelectColumns;
+            ::rtl::Reference<OSQLColumns>   m_aSelectColumns;
         public:
-            OAdabasResultSet(SQLHANDLE _pStatementHandle,::connectivity::odbc::OStatement_Base* pStmt,const ::vos::ORef<OSQLColumns>& _rSelectColumns)
+            OAdabasResultSet(SQLHANDLE _pStatementHandle,::connectivity::odbc::OStatement_Base* pStmt,const ::rtl::Reference<OSQLColumns>& _rSelectColumns)
              : ::connectivity::odbc::OResultSet( _pStatementHandle,pStmt)
              ,m_aSelectColumns(_rSelectColumns)
             {}
diff --git a/connectivity/source/inc/adabas/BResultSetMetaData.hxx b/connectivity/source/inc/adabas/BResultSetMetaData.hxx
index 1cbb328bcf1e..882256a2fe9c 100644
--- a/connectivity/source/inc/adabas/BResultSetMetaData.hxx
+++ b/connectivity/source/inc/adabas/BResultSetMetaData.hxx
@@ -28,7 +28,7 @@
 #define CONNECTIVITY_ADABAS_RESULTSETMETADATA_HXX
 
 #include "odbc/OResultSetMetaData.hxx"
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
 
 namespace connectivity
 {
@@ -41,10 +41,10 @@ namespace connectivity
         typedef odbc::OResultSetMetaData OAdabasResultSetMetaData_BASE;
         class OAdabasResultSetMetaData :    public  OAdabasResultSetMetaData_BASE
         {
-            ::vos::ORef<OSQLColumns>    m_aSelectColumns;
+            ::rtl::Reference<OSQLColumns>   m_aSelectColumns;
         public:
             // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
-            OAdabasResultSetMetaData(odbc::OConnection* _pConnection, SQLHANDLE _pStmt ,const ::vos::ORef<OSQLColumns>& _rSelectColumns);
+            OAdabasResultSetMetaData(odbc::OConnection* _pConnection, SQLHANDLE _pStmt ,const ::rtl::Reference<OSQLColumns>& _rSelectColumns);
             virtual ~OAdabasResultSetMetaData();
 
             virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/inc/adabas/BStatement.hxx b/connectivity/source/inc/adabas/BStatement.hxx
index 3e30639cd4e1..ae2834a3ee0d 100644
--- a/connectivity/source/inc/adabas/BStatement.hxx
+++ b/connectivity/source/inc/adabas/BStatement.hxx
@@ -30,7 +30,7 @@
 #include "odbc/OStatement.hxx"
 #include "adabas/BConnection.hxx"
 #include "connectivity/CommonTools.hxx"
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
 
 namespace connectivity
 {
@@ -39,7 +39,7 @@ namespace connectivity
         class OAdabasStatement :    public  ::connectivity::odbc::OStatement
         {
             OAdabasConnection*          m_pOwnConnection;
-            ::vos::ORef<OSQLColumns>    m_aSelectColumns;
+            ::rtl::Reference<OSQLColumns>   m_aSelectColumns;
         protected:
             virtual odbc::OResultSet* createResulSet();
             virtual void setResultSetConcurrency(sal_Int32 _par0);
diff --git a/connectivity/source/inc/dbase/DIndexPage.hxx b/connectivity/source/inc/dbase/DIndexPage.hxx
index bd161c334760..87dc00dca500 100644
--- a/connectivity/source/inc/dbase/DIndexPage.hxx
+++ b/connectivity/source/inc/dbase/DIndexPage.hxx
@@ -28,7 +28,7 @@
 #ifndef _CONNECTIVITY_DBASE_INDEXPAGE_HXX_
 #define _CONNECTIVITY_DBASE_INDEXPAGE_HXX_
 
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
 #include <tools/stream.hxx>
 #ifndef _VECTOR_
 #include <vector>
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index 9528ca16a508..b0109cecc917 100644
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -59,7 +59,7 @@ namespace connectivity
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData>   m_xMetaData;
 
             OResultSet*                                         m_pResultSet;
-            ::vos::ORef<connectivity::OSQLColumns>              m_xParamColumns;    // the parameter columns
+            ::rtl::Reference<connectivity::OSQLColumns>             m_xParamColumns;    // the parameter columns
 
             // factory method for resultset's
             virtual OResultSet* createResultSet();
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index 778fb6dc0808..699e34b796e2 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -101,14 +101,14 @@ namespace connectivity
 //          ::std::vector<TInt2IntMap::iterator>    m_aBookmarksPositions;// vector of iterators to bookmark map, the order is the logical position
             OSkipDeletedSet                         m_aSkipDeletedSet;
 
-            ::vos::ORef<OKeySet>                    m_pFileSet;
+            ::rtl::Reference<OKeySet>                   m_pFileSet;
             OKeySet::Vector::iterator               m_aFileSetIter;
 
 
 
             OSortIndex*                             m_pSortIndex;
-            ::vos::ORef<connectivity::OSQLColumns>  m_xColumns; // this are the select columns
-            ::vos::ORef<connectivity::OSQLColumns>  m_xParamColumns;
+            ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns
+            ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns;
             OFileTable*                             m_pTable;
             connectivity::OSQLParseNode*            m_pParseTree;
 
@@ -290,7 +290,7 @@ namespace connectivity
             inline sal_Int32 getRowCountResult() const { return m_nRowCountResult; }
             inline void setParameterRow(const OValueRefRow& _rParaRow)                  { m_aParameterRow = _rParaRow; }
             inline void setEvaluationRow(const OValueRefRow& _aRow)                     { m_aEvaluateRow = _aRow; }
-            inline void setParameterColumns(const ::vos::ORef<connectivity::OSQLColumns>&   _xParamColumns) { m_xParamColumns = _xParamColumns; }
+            inline void setParameterColumns(const ::rtl::Reference<connectivity::OSQLColumns>&  _xParamColumns) { m_xParamColumns = _xParamColumns; }
             inline void setAssignValues(const ORefAssignValues& _aAssignValues)         { m_aAssignValues = _aAssignValues; }
             inline void setBindingRow(const OValueRefRow& _aRow)                        { m_aRow = _aRow; }
             inline void setSelectRow(const OValueRefRow& _rRow)
@@ -310,7 +310,7 @@ namespace connectivity
             void clear();
             static void setBoundedColumns(const OValueRefRow& _rRow,
                                     const OValueRefRow& _rSelectRow,
-                                    const ::vos::ORef<connectivity::OSQLColumns>& _rxColumns,
+                                    const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xNames,
                                     sal_Bool _bSetColumnMapping,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData,
diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx
index 60bd3b179709..1e97418c2230 100644
--- a/connectivity/source/inc/file/FResultSetMetaData.hxx
+++ b/connectivity/source/inc/file/FResultSetMetaData.hxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include "connectivity/CommonTools.hxx"
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
 #include "file/filedllapi.hxx"
 
 namespace connectivity
@@ -48,7 +48,7 @@ namespace connectivity
             public  OResultSetMetaData_BASE
         {
             ::rtl::OUString     m_aTableName;
-            ::vos::ORef<connectivity::OSQLColumns>  m_xColumns;
+            ::rtl::Reference<connectivity::OSQLColumns> m_xColumns;
             OFileTable*         m_pTable;
 
             void checkColumnIndex(sal_Int32 column) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -56,7 +56,7 @@ namespace connectivity
             virtual ~OResultSetMetaData();
         public:
             // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
-            OResultSetMetaData(const ::vos::ORef<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable*  _pTable);
+            OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable* _pTable);
 
             /// Avoid ambigous cast error from the compiler.
             inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw()
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index 775704f4ff18..0380d17fa145 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -48,7 +48,7 @@ namespace connectivity
         protected:
             OConnection*                                        m_pConnection;
             SvStream*                                           m_pFileStream;
-            ::vos::ORef<OSQLColumns>                            m_aColumns;
+            ::rtl::Reference<OSQLColumns>                           m_aColumns;
             sal_Int32                                           m_nFilePos;                 // aktuelle IResultSetHelper::Movement
             sal_uInt8*                                          m_pBuffer;
             sal_uInt16                                          m_nBufferSize;  // Groesse des ReadBuffer, wenn pBuffer != NULL
@@ -84,7 +84,7 @@ namespace connectivity
             virtual sal_Bool seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos) = 0;
             virtual sal_Bool fetchRow(OValueRefRow& _rRow,const OSQLColumns& _rCols, sal_Bool _bUseTableDefs,sal_Bool bRetrieveData) = 0;
 
-            ::vos::ORef<OSQLColumns> getTableColumns() const {return m_aColumns;}
+            ::rtl::Reference<OSQLColumns> getTableColumns() const {return m_aColumns;}
             virtual BOOL InsertRow(OValueRefVector& rRow, BOOL bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
             virtual BOOL DeleteRow(const OSQLColumns& _rCols);
             virtual BOOL UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index c882b760765a..010cd08138ce 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -39,11 +39,11 @@ namespace connectivity
         class OOO_DLLPUBLIC_FILE OSQLAnalyzer
         {
             typedef ::std::list<OEvaluateSet*>      OEvaluateSetList;
-            typedef ::std::pair< ::vos::ORef<OPredicateCompiler>,::vos::ORef<OPredicateInterpreter> > TPredicates;
+            typedef ::std::pair< ::rtl::Reference<OPredicateCompiler>,::rtl::Reference<OPredicateInterpreter> > TPredicates;
 
             ::std::vector< TPredicates >        m_aSelectionEvaluations;
-            ::vos::ORef<OPredicateCompiler>     m_aCompiler;
-            ::vos::ORef<OPredicateInterpreter>  m_aInterpreter;
+            ::rtl::Reference<OPredicateCompiler>        m_aCompiler;
+            ::rtl::Reference<OPredicateInterpreter> m_aInterpreter;
             OConnection*                        m_pConnection;
 
             mutable sal_Bool                    m_bHasSelectionCode;
@@ -64,7 +64,7 @@ namespace connectivity
                 {  }
 
             OConnection* getConnection() const { return m_pConnection; }
-            void describeParam(::vos::ORef<OSQLColumns> rParameterColumns); // genauere Beschreibung der Parameter
+            void describeParam(::rtl::Reference<OSQLColumns> rParameterColumns); // genauere Beschreibung der Parameter
             ::std::vector<sal_Int32>* bindEvaluationRow(OValueRefRow& _pRow);                   // Anbinden einer Ergebniszeile an die Restrictions
             /** bind the select columns if they contain a function which needs a row value
                 @param  _pRow   the result row
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index 7a2125206549..a13069264c77 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -130,7 +130,7 @@ namespace connectivity
         {
         public:
             OOperandParam(connectivity::OSQLParseNode* pNode, sal_Int32 _nPos);
-            void describe(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, ::vos::ORef<connectivity::OSQLColumns> _xParamColumns);
+            void describe(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, ::rtl::Reference<connectivity::OSQLColumns> _xParamColumns);
 
             TYPEINFO();
         };
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index b46d24ddd089..6b8778de6082 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -43,7 +43,7 @@ namespace connectivity
         class OSQLAnalyzer;
         typedef::std::vector<OCode*> OCodeList;
 
-        class OPredicateCompiler : public ::vos::OReference
+        class OPredicateCompiler : public ::salhelper::SimpleReferenceObject
         {
             friend class OPredicateInterpreter;
             friend class OSQLAnalyzer;
@@ -90,13 +90,13 @@ namespace connectivity
 
 
         class OPredicateInterpreter :
-            public ::vos::OReference
+            public ::salhelper::SimpleReferenceObject
         {
             OCodeStack          m_aStack;
-            ::vos::ORef<OPredicateCompiler> m_rCompiler;
+            ::rtl::Reference<OPredicateCompiler> m_rCompiler;
 
         public:
-            OPredicateInterpreter(const ::vos::ORef<OPredicateCompiler>& rComp) : m_rCompiler(rComp){}
+            OPredicateInterpreter(const ::rtl::Reference<OPredicateCompiler>& rComp) : m_rCompiler(rComp){}
             virtual ~OPredicateInterpreter();
 
             sal_Bool    evaluate(OCodeList& rCodeList);