summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2010-10-15 12:10:06 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2010-10-25 19:55:33 -0500
commit4ec839be778e5541c09b0f1a6e3b707ca29bae6d (patch)
tree64c8c7d8bcc108825859d147838e9a40a433d44f
parent8df6bbe67a18b79bf35ff8affcd47b4ab8f73bb7 (diff)
merge vosremoval-reference.diff
-rw-r--r--connectivity/inc/connectivity/FValue.hxx12
-rw-r--r--connectivity/inc/connectivity/PColumn.hxx4
-rw-r--r--connectivity/inc/connectivity/sqliterator.hxx26
-rw-r--r--connectivity/inc/pch/precompiled_connectivity.hxx5
-rw-r--r--connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx4
-rw-r--r--connectivity/source/commontools/TSortIndex.cxx4
-rw-r--r--connectivity/source/cpool/ZConnectionPool.hxx4
-rw-r--r--connectivity/source/dbtools/makefile.mk1
-rw-r--r--connectivity/source/drivers/adabas/BConnection.cxx4
-rw-r--r--connectivity/source/drivers/adabas/BResultSetMetaData.cxx6
-rw-r--r--connectivity/source/drivers/adabas/makefile.mk1
-rw-r--r--connectivity/source/drivers/calc/CColumns.cxx2
-rw-r--r--connectivity/source/drivers/calc/makefile.mk1
-rw-r--r--connectivity/source/drivers/dbase/DColumns.cxx2
-rw-r--r--connectivity/source/drivers/dbase/DIndex.cxx2
-rw-r--r--connectivity/source/drivers/dbase/DIndexColumns.cxx2
-rw-r--r--connectivity/source/drivers/dbase/DTable.cxx8
-rw-r--r--connectivity/source/drivers/dbase/makefile.mk1
-rw-r--r--connectivity/source/drivers/evoab/LColumns.cxx6
-rw-r--r--connectivity/source/drivers/evoab/LConnection.cxx1
-rw-r--r--connectivity/source/drivers/evoab/LDatabaseMetaData.cxx1
-rw-r--r--connectivity/source/drivers/evoab/LFolderList.cxx6
-rw-r--r--connectivity/source/drivers/evoab/LFolderList.hxx4
-rw-r--r--connectivity/source/drivers/evoab/LTable.cxx2
-rw-r--r--connectivity/source/drivers/evoab/makefile.mk1
-rw-r--r--connectivity/source/drivers/evoab2/NConnection.cxx1
-rw-r--r--connectivity/source/drivers/evoab2/NPreparedStatement.cxx2
-rw-r--r--connectivity/source/drivers/evoab2/NResultSetMetaData.cxx2
-rw-r--r--connectivity/source/drivers/evoab2/NResultSetMetaData.hxx4
-rw-r--r--connectivity/source/drivers/evoab2/NStatement.cxx2
-rw-r--r--connectivity/source/drivers/evoab2/NStatement.hxx2
-rw-r--r--connectivity/source/drivers/evoab2/makefile.mk1
-rw-r--r--connectivity/source/drivers/file/FDriver.cxx2
-rw-r--r--connectivity/source/drivers/file/FPreparedStatement.cxx24
-rw-r--r--connectivity/source/drivers/file/FResultSet.cxx58
-rw-r--r--connectivity/source/drivers/file/FResultSetMetaData.cxx2
-rw-r--r--connectivity/source/drivers/file/FStatement.cxx12
-rw-r--r--connectivity/source/drivers/file/fanalyzer.cxx18
-rw-r--r--connectivity/source/drivers/file/fcode.cxx8
-rw-r--r--connectivity/source/drivers/file/makefile.mk1
-rw-r--r--connectivity/source/drivers/flat/EColumns.cxx2
-rw-r--r--connectivity/source/drivers/flat/ETable.cxx2
-rw-r--r--connectivity/source/drivers/flat/makefile.mk1
-rw-r--r--connectivity/source/drivers/jdbc/makefile.mk1
-rw-r--r--connectivity/source/drivers/kab/KPreparedStatement.cxx8
-rw-r--r--connectivity/source/drivers/kab/KResultSetMetaData.cxx2
-rw-r--r--connectivity/source/drivers/kab/KResultSetMetaData.hxx4
-rw-r--r--connectivity/source/drivers/kab/KStatement.cxx4
-rw-r--r--connectivity/source/drivers/kab/makefile.mk4
-rw-r--r--connectivity/source/drivers/macab/MacabPreparedStatement.cxx8
-rw-r--r--connectivity/source/drivers/macab/MacabResultSetMetaData.cxx2
-rw-r--r--connectivity/source/drivers/macab/MacabResultSetMetaData.hxx4
-rw-r--r--connectivity/source/drivers/macab/MacabStatement.cxx4
-rw-r--r--connectivity/source/drivers/mozab/MPreparedStatement.cxx4
-rw-r--r--connectivity/source/drivers/mozab/MPreparedStatement.hxx2
-rw-r--r--connectivity/source/drivers/mozab/MResultSet.cxx80
-rw-r--r--connectivity/source/drivers/mozab/MResultSet.hxx40
-rw-r--r--connectivity/source/drivers/mozab/MResultSetMetaData.hxx6
-rw-r--r--connectivity/source/drivers/mozab/MStatement.cxx6
-rw-r--r--connectivity/source/drivers/mozab/makefile.mk1
-rw-r--r--connectivity/source/drivers/odbc/makefile.mk3
-rw-r--r--connectivity/source/drivers/odbcbase/makefile.mk3
-rw-r--r--connectivity/source/inc/FDatabaseMetaDataResultSet.hxx2
-rw-r--r--connectivity/source/inc/TSortIndex.hxx2
-rw-r--r--connectivity/source/inc/adabas/BConnection.hxx4
-rw-r--r--connectivity/source/inc/adabas/BPreparedStatement.hxx2
-rw-r--r--connectivity/source/inc/adabas/BResultSet.hxx6
-rw-r--r--connectivity/source/inc/adabas/BResultSetMetaData.hxx6
-rw-r--r--connectivity/source/inc/adabas/BStatement.hxx8
-rw-r--r--connectivity/source/inc/dbase/DIndexPage.hxx4
-rw-r--r--connectivity/source/inc/file/FPreparedStatement.hxx2
-rw-r--r--connectivity/source/inc/file/FResultSet.hxx10
-rw-r--r--connectivity/source/inc/file/FResultSetMetaData.hxx6
-rw-r--r--connectivity/source/inc/file/FTable.hxx4
-rw-r--r--connectivity/source/inc/file/fanalyzer.hxx8
-rw-r--r--connectivity/source/inc/file/fcode.hxx2
-rw-r--r--connectivity/source/inc/file/fcomp.hxx8
-rw-r--r--connectivity/source/parse/PColumn.cxx4
-rw-r--r--connectivity/source/parse/sqliterator.cxx6
-rw-r--r--desktop/inc/app.hxx7
-rw-r--r--desktop/source/app/app.cxx5
-rw-r--r--desktop/source/app/appfirststart.cxx2
-rw-r--r--desktop/source/app/userinstall.cxx5
-rw-r--r--editeng/inc/editeng/UnoForbiddenCharsTable.hxx6
-rw-r--r--editeng/inc/editeng/editeng.hxx6
-rw-r--r--editeng/inc/editeng/forbiddencharacterstable.hxx8
-rw-r--r--editeng/inc/editeng/outliner.hxx6
-rw-r--r--editeng/inc/editeng/unolingu.hxx3
-rw-r--r--editeng/inc/pch/precompiled_editeng.hxx4
-rw-r--r--editeng/source/editeng/editeng.cxx4
-rw-r--r--editeng/source/editeng/eerdll.cxx4
-rw-r--r--editeng/source/editeng/eerdll2.hxx8
-rw-r--r--editeng/source/editeng/impedit.hxx8
-rw-r--r--editeng/source/editeng/impedit2.cxx8
-rw-r--r--editeng/source/outliner/outlin2.cxx4
-rw-r--r--editeng/source/uno/UnoForbiddenCharsTable.cxx13
-rw-r--r--editeng/util/makefile.mk1
-rw-r--r--framework/inc/classes/framecontainer.hxx1
-rw-r--r--framework/inc/pch/precompiled_framework.hxx3
-rw-r--r--framework/source/helper/dockingareadefaultacceptor.cxx1
-rw-r--r--framework/source/helper/oframes.cxx4
-rw-r--r--svx/inc/pch/precompiled_svx.hxx4
-rw-r--r--svx/inc/svx/svdmodel.hxx6
-rw-r--r--svx/source/accessibility/GraphCtlAccessibleContext.cxx2
-rw-r--r--svx/source/svdraw/svdmodel.cxx6
-rw-r--r--svx/util/makefile.mk1
-rw-r--r--ucb/inc/pch/precompiled_ucb.hxx3
-rw-r--r--xmlhelp/source/cxxhelp/provider/content.hxx1
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultset.cxx2
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultset.hxx6
-rw-r--r--xmloff/inc/pch/precompiled_xmloff.hxx4
-rw-r--r--xmloff/inc/xmloff/controlpropertyhdl.hxx2
-rw-r--r--xmloff/inc/xmloff/formlayerexport.hxx8
-rw-r--r--xmloff/inc/xmloff/formlayerimport.hxx8
-rw-r--r--xmloff/inc/xmloff/nmspmap.hxx6
-rw-r--r--xmloff/source/core/nmspmap.cxx8
-rw-r--r--xmloff/source/forms/callbacks.hxx4
-rw-r--r--xmloff/source/forms/formattributes.hxx2
-rw-r--r--xmloff/source/forms/formlayerexport.cxx2
-rw-r--r--xmloff/source/forms/formlayerimport.cxx2
-rw-r--r--xmloff/source/forms/layerexport.cxx8
-rw-r--r--xmloff/source/forms/layerexport.hxx8
-rw-r--r--xmloff/source/forms/layerimport.cxx6
-rw-r--r--xmloff/source/forms/layerimport.hxx8
-rw-r--r--xmloff/source/forms/propertyimport.hxx2
-rw-r--r--xmloff/source/script/xmlscripti.cxx1
-rw-r--r--xmloff/source/style/xmlimppr.cxx2
-rw-r--r--xmloff/source/style/xmlnumi.cxx3
-rw-r--r--xmloff/source/text/XMLTextMarkImportContext.cxx2
-rw-r--r--xmloff/util/makefile.mk1
130 files changed, 383 insertions, 370 deletions
diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx
index 44d65f863f..d410a318f5 100644
--- a/connectivity/inc/connectivity/FValue.hxx
+++ b/connectivity/inc/connectivity/FValue.hxx
@@ -33,7 +33,7 @@
#include <rtl/ustring.hxx>
#include <osl/diagnose.h>
#include <comphelper/stl_types.hxx>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include "connectivity/dbtoolsdllapi.hxx"
#include "connectivity/CommonTools.hxx"
#include <com/sun/star/util/DateTime.hpp>
@@ -373,7 +373,7 @@ namespace connectivity
};
/// ORowSetValueDecorator decorates a ORowSetValue so the value is "refcounted"
- class OOO_DLLPUBLIC_DBTOOLS ORowSetValueDecorator : public ::vos::OReference
+ class OOO_DLLPUBLIC_DBTOOLS ORowSetValueDecorator : public ::salhelper::SimpleReferenceObject
{
ORowSetValue m_aValue; // my own value
public:
@@ -393,7 +393,7 @@ namespace connectivity
inline void setModified(sal_Bool _bModified) { m_aValue.setModified(_bModified); }
};
- typedef ::vos::ORef<ORowSetValueDecorator> ORowSetValueDecoratorRef;
+ typedef ::rtl::Reference<ORowSetValueDecorator> ORowSetValueDecoratorRef;
// -------------------------------------------------------------------------
/// TSetBound is a unary_function to set the bound value with e.q. for_each call
@@ -454,12 +454,12 @@ namespace connectivity
sal_Int32 getParameterIndex(sal_Int32 _nId) const { return m_nParameterIndexes[_nId]; }
};
- typedef ::vos::ORef< OAssignValues > ORefAssignValues;
+ typedef ::rtl::Reference< OAssignValues > ORefAssignValues;
- typedef ::vos::ORef< OValueVector > OValueRow;
- typedef ::vos::ORef< OValueRefVector > OValueRefRow;
+ typedef ::rtl::Reference< OValueVector > OValueRow;
+ typedef ::rtl::Reference< OValueRefVector > OValueRefRow;
}
#endif // #ifndef _CONNECTIVITY_FILE_VALUE_HXX_
diff --git a/connectivity/inc/connectivity/PColumn.hxx b/connectivity/inc/connectivity/PColumn.hxx
index 1db8d7a292..d76f6e598a 100644
--- a/connectivity/inc/connectivity/PColumn.hxx
+++ b/connectivity/inc/connectivity/PColumn.hxx
@@ -30,7 +30,7 @@
#include "connectivity/dbtoolsdllapi.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
#include "connectivity/CommonTools.hxx"
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
@@ -94,7 +94,7 @@ namespace connectivity
public:
/** creates a collection of OParseColumn, as described by a result set meta data instance.
*/
- static ::vos::ORef< OSQLColumns >
+ static ::rtl::Reference< OSQLColumns >
createColumnsForResultSet(
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData >& _rxResMetaData,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMetaData,
diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/connectivity/inc/connectivity/sqliterator.hxx
index 6c43324a03..edc41a3d85 100644
--- a/connectivity/inc/connectivity/sqliterator.hxx
+++ b/connectivity/inc/connectivity/sqliterator.hxx
@@ -35,7 +35,7 @@
#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include "connectivity/CommonTools.hxx"
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <cppuhelper/weak.hxx>
#include <map>
@@ -69,11 +69,11 @@ namespace connectivity
const OSQLParseNode* m_pParseTree; // aktueller ParseTree
const OSQLParser& m_rParser; // if set used for general error messages from the context
OSQLStatementType m_eStatementType; // Art des Statements
- ::vos::ORef<OSQLColumns> m_aSelectColumns; // alle Spalten aus dem Select-Clause
- ::vos::ORef<OSQLColumns> m_aParameters; // all parameters
- ::vos::ORef<OSQLColumns> m_aGroupColumns; // the group by columns
- ::vos::ORef<OSQLColumns> m_aOrderColumns; // the order by columns
- ::vos::ORef<OSQLColumns> m_aCreateColumns; // the columns for Create table clause
+ ::rtl::Reference<OSQLColumns> m_aSelectColumns; // alle Spalten aus dem Select-Clause
+ ::rtl::Reference<OSQLColumns> m_aParameters; // all parameters
+ ::rtl::Reference<OSQLColumns> m_aGroupColumns; // the group by columns
+ ::rtl::Reference<OSQLColumns> m_aOrderColumns; // the order by columns
+ ::rtl::Reference<OSQLColumns> m_aCreateColumns; // the columns for Create table clause
::std::auto_ptr< OSQLParseTreeIteratorImpl > m_pImpl;
@@ -121,8 +121,8 @@ namespace connectivity
const ::rtl::OUString & rColumnName, const ::rtl::OUString & rTableRange, bool _bLookInSubTables );
protected:
- void setSelectColumnName(::vos::ORef<OSQLColumns>& _rColumns,const ::rtl::OUString & rColumnName,const ::rtl::OUString & rColumnAlias, const ::rtl::OUString & rTableRange,sal_Bool bFkt=sal_False,sal_Int32 _nType = com::sun::star::sdbc::DataType::VARCHAR,sal_Bool bAggFkt=sal_False);
- void appendColumns(::vos::ORef<OSQLColumns>& _rColumns,const ::rtl::OUString& _rTableAlias,const OSQLTable& _rTable);
+ void setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const ::rtl::OUString & rColumnName,const ::rtl::OUString & rColumnAlias, const ::rtl::OUString & rTableRange,sal_Bool bFkt=sal_False,sal_Int32 _nType = com::sun::star::sdbc::DataType::VARCHAR,sal_Bool bAggFkt=sal_False);
+ void appendColumns(::rtl::Reference<OSQLColumns>& _rColumns,const ::rtl::OUString& _rTableAlias,const OSQLTable& _rTable);
// Weitere Member-Variable, die in den "set"-Funktionen zur
// Verfuegung stehen sollen, koennen in der abgeleiteten Klasse
// definiert werden und z. B. in deren Konstruktor initialisiert
@@ -214,11 +214,11 @@ namespace connectivity
// Die TableRangeMap enth"alt alle Tabellen unter dem zugeh"origen Rangenamen der zuerst gefunden wird
const OSQLTables& getTables() const;
- ::vos::ORef<OSQLColumns> getSelectColumns() const { return m_aSelectColumns;}
- ::vos::ORef<OSQLColumns> getGroupColumns() const { return m_aGroupColumns;}
- ::vos::ORef<OSQLColumns> getOrderColumns() const { return m_aOrderColumns;}
- ::vos::ORef<OSQLColumns> getParameters() const { return m_aParameters; }
- ::vos::ORef<OSQLColumns> getCreateColumns() const { return m_aCreateColumns;}
+ ::rtl::Reference<OSQLColumns> getSelectColumns() const { return m_aSelectColumns;}
+ ::rtl::Reference<OSQLColumns> getGroupColumns() const { return m_aGroupColumns;}
+ ::rtl::Reference<OSQLColumns> getOrderColumns() const { return m_aOrderColumns;}
+ ::rtl::Reference<OSQLColumns> getParameters() const { return m_aParameters; }
+ ::rtl::Reference<OSQLColumns> getCreateColumns() const { return m_aCreateColumns;}
/** return the columname and the table range
@param _pColumnRef
diff --git a/connectivity/inc/pch/precompiled_connectivity.hxx b/connectivity/inc/pch/precompiled_connectivity.hxx
index b95cd05a90..1579c30cb6 100644
--- a/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/connectivity/inc/pch/precompiled_connectivity.hxx
@@ -309,6 +309,7 @@
#include "rtl/ustring.hxx"
#include "salhelper/timer.hxx"
+#include "salhelper/simplereferenceobject.hxx"
#include "sys/types.h"
@@ -327,9 +328,7 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
-#include "vos/ref.hxx"
-#include "vos/ref.hxx"
-#include "vos/refernce.hxx"
+
//---MARKER---
#endif
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 7b30f599ea..cc57466d7c 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -463,7 +463,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) throw(SQLException, Ru
checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed );
- if(m_aRowsIter == m_aRows.end() || !(*m_aRowsIter)[m_nColPos].isValid())
+ if(m_aRowsIter == m_aRows.end() || !(*m_aRowsIter)[m_nColPos].is())
return sal_True;
return (*m_aRowsIter)[m_nColPos]->getValue().isNull();
@@ -642,7 +642,7 @@ const ORowSetValue& ODatabaseMetaDataResultSet::getValue(sal_Int32 columnIndex)
checkIndex(columnIndex );
m_nColPos = columnIndex;
- if(m_aRowsIter != m_aRows.end() && (*m_aRowsIter)[columnIndex].isValid())
+ if(m_aRowsIter != m_aRows.end() && (*m_aRowsIter)[columnIndex].is())
return *(*m_aRowsIter)[columnIndex];
return m_aEmptyValue;
}
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx
index 0706d98ba2..31fe65d048 100644
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
@@ -86,11 +86,11 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v
};
// -----------------------------------------------------------------------------
-::vos::ORef<OKeySet> OSortIndex::CreateKeySet()
+::rtl::Reference<OKeySet> OSortIndex::CreateKeySet()
{
Freeze();
- ::vos::ORef<OKeySet> pKeySet = new OKeySet();
+ ::rtl::Reference<OKeySet> pKeySet = new OKeySet();
pKeySet->get().reserve(m_aKeyValues.size());
::std::transform(m_aKeyValues.begin()
,m_aKeyValues.end()
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index 47e8bb821d..c8630bea65 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -38,7 +38,7 @@
#include <comphelper/stl_types.hxx>
#include <osl/mutex.hxx>
#include <salhelper/timer.hxx>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <rtl/digest.h>
namespace connectivity
@@ -116,7 +116,7 @@ namespace connectivity
TActiveConnectionMap m_aActiveConnections; // the currently active connections
::osl::Mutex m_aMutex;
- ::vos::ORef<OPoolTimer> m_xInvalidator; // invalidates the conntection pool when shot
+ ::rtl::Reference<OPoolTimer> m_xInvalidator; // invalidates the conntection pool when shot
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xDriver; // the one and only driver for this connectionpool
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDriverNode; // config node entry
diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk
index af4ac13e54..aab8fc5454 100644
--- a/connectivity/source/dbtools/makefile.mk
+++ b/connectivity/source/dbtools/makefile.mk
@@ -59,6 +59,7 @@ SHL1STDLIBS=\
$(CPPUHELPERLIB) \
$(VOSLIB) \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(JVMACCESSLIB) \
$(UNOTOOLSLIB) \
$(TOOLSLIB) \
diff --git a/connectivity/source/drivers/adabas/BConnection.cxx b/connectivity/source/drivers/adabas/BConnection.cxx
index 0a5716e839..d0d76dbf54 100644
--- a/connectivity/source/drivers/adabas/BConnection.cxx
+++ b/connectivity/source/drivers/adabas/BConnection.cxx
@@ -251,9 +251,9 @@ Sequence< sal_Int8 > OAdabasConnection::getUnoTunnelImplementationId()
return new OAdabasConnection(m_pDriverHandleCopy,m_pDriver);
}
// -----------------------------------------------------------------------------
-::vos::ORef<OSQLColumns> OAdabasConnection::createSelectColumns(const ::rtl::OUString& _rSql)
+::rtl::Reference<OSQLColumns> OAdabasConnection::createSelectColumns(const ::rtl::OUString& _rSql)
{
- ::vos::ORef<OSQLColumns> aRet;
+ ::rtl::Reference<OSQLColumns> aRet;
OSQLParser aParser(getDriver()->getORB());
::rtl::OUString sErrorMessage;
OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,_rSql);
diff --git a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
index ff4920433a..fe1eba559a 100644
--- a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
+++ b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
@@ -39,7 +39,7 @@ using namespace com::sun::star::uno;
using namespace connectivity::adabas;
using namespace connectivity;
-OAdabasResultSetMetaData::OAdabasResultSetMetaData(odbc::OConnection* _pConnection, SQLHANDLE _pStmt,const ::vos::ORef<OSQLColumns>& _rSelectColumns )
+OAdabasResultSetMetaData::OAdabasResultSetMetaData(odbc::OConnection* _pConnection, SQLHANDLE _pStmt,const ::rtl::Reference<OSQLColumns>& _rSelectColumns )
: OAdabasResultSetMetaData_BASE(_pConnection,_pStmt)
,m_aSelectColumns(_rSelectColumns)
{
@@ -63,7 +63,7 @@ sal_Int32 SAL_CALL OAdabasResultSetMetaData::isNullable( sal_Int32 column ) thro
{
sal_Int32 nValue = 0;
sal_Bool bFound = sal_False;
- if ( m_aSelectColumns.isValid() && column > 0 && column <= (sal_Int32)m_aSelectColumns->get().size() )
+ if ( m_aSelectColumns.is() && column > 0 && column <= (sal_Int32)m_aSelectColumns->get().size() )
bFound = (m_aSelectColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nValue;
if ( !bFound )
@@ -73,7 +73,7 @@ sal_Int32 SAL_CALL OAdabasResultSetMetaData::isNullable( sal_Int32 column ) thro
// -------------------------------------------------------------------------
sal_Bool SAL_CALL OAdabasResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException)
{
- if ( m_aSelectColumns.isValid() && column > 0 && column <= (sal_Int32)m_aSelectColumns->get().size() )
+ if ( m_aSelectColumns.is() && column > 0 && column <= (sal_Int32)m_aSelectColumns->get().size() )
{
sal_Bool bAutoIncrement = sal_False;
(m_aSelectColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement;
diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk
index 9268f02a3b..c4154cbea3 100644
--- a/connectivity/source/drivers/adabas/makefile.mk
+++ b/connectivity/source/drivers/adabas/makefile.mk
@@ -82,6 +82,7 @@ SHL1STDLIBS=\
$(CPPUHELPERLIB) \
$(VOSLIB) \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(DBTOOLSLIB) \
$(TOOLSLIB) \
$(ODBCBASELIB) \
diff --git a/connectivity/source/drivers/calc/CColumns.cxx b/connectivity/source/drivers/calc/CColumns.cxx
index af80788722..e3d7bcaa44 100644
--- a/connectivity/source/drivers/calc/CColumns.cxx
+++ b/connectivity/source/drivers/calc/CColumns.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::container;
sdbcx::ObjectType OCalcColumns::createObject(const ::rtl::OUString& _rName)
{
OCalcTable* pTable = (OCalcTable*)m_pTable;
- ::vos::ORef<OSQLColumns> aCols = pTable->getTableColumns();
+ ::rtl::Reference<OSQLColumns> aCols = pTable->getTableColumns();
OSQLColumns::Vector::const_iterator aIter = find(aCols->get().begin(),aCols->get().end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive()));
sdbcx::ObjectType xRet;
diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk
index 8e193524aa..04ea9e364e 100644
--- a/connectivity/source/drivers/calc/makefile.mk
+++ b/connectivity/source/drivers/calc/makefile.mk
@@ -71,6 +71,7 @@ SHL1STDLIBS=\
$(TOOLSLIB) \
$(UNOTOOLSLIB) \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(DBTOOLSLIB) \
$(DBFILELIB) \
$(COMPHELPERLIB)
diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx
index eef1788aab..6f2fb95d5b 100644
--- a/connectivity/source/drivers/dbase/DColumns.cxx
+++ b/connectivity/source/drivers/dbase/DColumns.cxx
@@ -49,7 +49,7 @@ sdbcx::ObjectType ODbaseColumns::createObject(const ::rtl::OUString& _rName)
ODbaseTable* pTable = (ODbaseTable*)m_pTable;
- ::vos::ORef<OSQLColumns> aCols = pTable->getTableColumns();
+ ::rtl::Reference<OSQLColumns> aCols = pTable->getTableColumns();
OSQLColumns::Vector::const_iterator aIter = find(aCols->get().begin(),aCols->get().end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive()));
sdbcx::ObjectType xRet;
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index f45244d573..09103a277f 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -551,7 +551,7 @@ BOOL ODbaseIndex::CreateImpl()
// Setzen der Headerinfo
memset(&m_aHeader,0,sizeof(m_aHeader));
sal_Int32 nType = 0;
- ::vos::ORef<OSQLColumns> aCols = m_pTable->getTableColumns();
+ ::rtl::Reference<OSQLColumns> aCols = m_pTable->getTableColumns();
const Reference< XPropertySet > xTableCol(*find(aCols->get().begin(),aCols->get().end(),aName,::comphelper::UStringMixEqual(isCaseSensitive())));
xTableCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType;
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx
index 6541c7eb01..b10780bfc6 100644
--- a/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -50,7 +50,7 @@ sdbcx::ObjectType ODbaseIndexColumns::createObject(const ::rtl::OUString& _rName
{
const ODbaseTable* pTable = m_pIndex->getTable();
- ::vos::ORef<OSQLColumns> aCols = pTable->getTableColumns();
+ ::rtl::Reference<OSQLColumns> aCols = pTable->getTableColumns();
OSQLColumns::Vector::const_iterator aIter = find(aCols->get().begin(),aCols->get().end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive()));
Reference< XPropertySet > xCol;
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 3b06aa34dd..fa286f3456 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -297,7 +297,7 @@ void ODbaseTable::fillColumns()
m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN);
m_pFileStream->Seek(32L);
- if(!m_aColumns.isValid())
+ if(!m_aColumns.is())
m_aColumns = new OSQLColumns();
else
m_aColumns->get().clear();
@@ -1729,7 +1729,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const
if (xIndex.is())
{
// first check if the value is different to the old one and when if it conform to the index
- if(pOrgRow.isValid() && (rRow.get()[nPos]->getValue().isNull() || rRow.get()[nPos] == (pOrgRow->get())[nPos]))
+ if(pOrgRow.is() && (rRow.get()[nPos]->getValue().isNull() || rRow.get()[nPos] == (pOrgRow->get())[nPos]))
continue;
else
{
@@ -1842,7 +1842,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const
ODbaseIndex* pIndex = reinterpret_cast< ODbaseIndex* >( xTunnel->getSomething(ODbaseIndex::getUnoTunnelImplementationId()) );
OSL_ENSURE(pIndex,"ODbaseTable::UpdateBuffer: No Index returned!");
// Update !!
- if (pOrgRow.isValid() && !rRow.get()[nPos]->getValue().isNull() )
+ if (pOrgRow.is() && !rRow.get()[nPos]->getValue().isNull() )
pIndex->Update(m_nFilePos,*(pOrgRow->get())[nPos],*rRow.get()[nPos]);
else
pIndex->Insert(m_nFilePos,*rRow.get()[nPos]);
@@ -2549,7 +2549,7 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos)
bOk = seekRow( IResultSetHelper::BOOKMARK, nRowPos+1, nCurPos );
if ( bOk )
{
- bOk = fetchRow( aRow, m_aColumns.getBody(), sal_True, sal_True);
+ bOk = fetchRow( aRow, *m_aColumns, sal_True, sal_True);
if ( bOk && !aRow->isDeleted() ) // copy only not deleted rows
{
// special handling when pos == 0 then we don't have to distinguish between the two rows
diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk
index f855cf1f45..3d77af5d66 100644
--- a/connectivity/source/drivers/dbase/makefile.mk
+++ b/connectivity/source/drivers/dbase/makefile.mk
@@ -103,6 +103,7 @@ SHL1STDLIBS=\
$(TOOLSLIB) \
$(UCBHELPERLIB) \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(DBTOOLSLIB) \
$(DBFILELIB) \
$(UNOTOOLSLIB) \
diff --git a/connectivity/source/drivers/evoab/LColumns.cxx b/connectivity/source/drivers/evoab/LColumns.cxx
index d01b1f35c2..5d69f28290 100644
--- a/connectivity/source/drivers/evoab/LColumns.cxx
+++ b/connectivity/source/drivers/evoab/LColumns.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_connectivity.hxx"
-
+
#include "LColumns.hxx"
#include "LTable.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
@@ -46,7 +46,7 @@ sdbcx::ObjectType OEvoabColumns::createObject(const ::rtl::OUString& _rName)
{
OEvoabTable* pTable = (OEvoabTable*)m_pTable;
- ::vos::ORef<OSQLColumns> aCols = pTable->getTableColumns();
+ ::rtl::Reference<OSQLColumns> aCols = pTable->getTableColumns();
OSQLColumns::Vector::const_iterator aIter = find(aCols->get().begin(),aCols->get().end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive()));
sdbcx::ObjectType xRet;
if(aIter != aCols->get().end())
diff --git a/connectivity/source/drivers/evoab/LConnection.cxx b/connectivity/source/drivers/evoab/LConnection.cxx
index 6dcb2f0446..05af3a373c 100644
--- a/connectivity/source/drivers/evoab/LConnection.cxx
+++ b/connectivity/source/drivers/evoab/LConnection.cxx
@@ -49,7 +49,6 @@
using namespace connectivity::evoab;
using namespace connectivity::file;
-using namespace vos;
typedef connectivity::file::OConnection OConnection_B;
diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
index 4d583a0f0a..fa59234445 100644
--- a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
@@ -65,7 +65,6 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::ucb;
using namespace osl;
-using namespace vos;
namespace connectivity
{
diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx
index 3f43dc751d..e7833f25ed 100644
--- a/connectivity/source/drivers/evoab/LFolderList.cxx
+++ b/connectivity/source/drivers/evoab/LFolderList.cxx
@@ -92,7 +92,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
// column count
xub_StrLen nFieldCount = aHeaderLine.GetTokenCount(pConnection->getFieldDelimiter(),pConnection->getStringDelimiter());
- if(!m_aColumns.isValid())
+ if(!m_aColumns.is())
m_aColumns = new OSQLColumns();
else
m_aColumns->get().clear();
@@ -524,7 +524,7 @@ sal_Int32 SAL_CALL OEvoabFolderList::getInt( sal_Int32 _nColumnIndex ) throw(SQL
// -----------------------------------------------------------------------------
void OEvoabFolderList::initializeRow(sal_Int32 _nColumnCount)
{
- if(!m_aRow.isValid())
+ if(!m_aRow.is())
{
m_aRow = new OValueVector(_nColumnCount);
(m_aRow->get())[0].setBound(sal_True);
@@ -555,7 +555,7 @@ sal_Bool SAL_CALL OEvoabFolderList::next( ) throw(SQLException, RuntimeExceptio
sal_Int32 SAL_CALL OEvoabFolderList::getRow( ) throw(SQLException, RuntimeException)
{
- sal_Bool bRet = fetchRow(m_aRow,getTableColumns().getBody());
+ sal_Bool bRet = fetchRow(m_aRow,*(getTableColumns()));
EVO_TRACE_STRING("OEvoabFolderList::getRow()::fetchRow() = %s\n", ::rtl::OUString::valueOf(bRet) );
return bRet;
diff --git a/connectivity/source/drivers/evoab/LFolderList.hxx b/connectivity/source/drivers/evoab/LFolderList.hxx
index e28a58a661..862aed3cad 100644
--- a/connectivity/source/drivers/evoab/LFolderList.hxx
+++ b/connectivity/source/drivers/evoab/LFolderList.hxx
@@ -57,7 +57,7 @@ namespace connectivity
sal_Int32 m_nFilePos; // aktuelle IResultSetHelper::Movement
SvStream* m_pFileStream;
OEvoabConnection* m_pConnection;
- ::vos::ORef<OSQLColumns> m_aColumns;
+ ::rtl::Reference<OSQLColumns> m_aColumns;
OValueRow m_aRow;
sal_Bool m_bIsNull;
@@ -73,7 +73,7 @@ namespace connectivity
OEvoabFolderList( OEvoabConnection* _pConnection);
OEvoabConnection* getConnection() const { return m_pConnection;}
- ::vos::ORef<OSQLColumns> getTableColumns() const {return m_aColumns;}
+ ::rtl::Reference<OSQLColumns> getTableColumns() const {return m_aColumns;}
void construct(); // can throw any exception
static SvStream* createStream_simpleError( const String& _rFileName, StreamMode _eOpenMode);
void initializeRow(sal_Int32 _nColumnCount);
diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx
index c9d6a22cb2..505337dacf 100644
--- a/connectivity/source/drivers/evoab/LTable.cxx
+++ b/connectivity/source/drivers/evoab/LTable.cxx
@@ -100,7 +100,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
// column count
xub_StrLen nFieldCount = aHeaderLine.GetTokenCount(pConnection->getFieldDelimiter(),pConnection->getStringDelimiter());
- if(!m_aColumns.isValid())
+ if(!m_aColumns.is())
m_aColumns = new OSQLColumns();
else
m_aColumns->get().clear();
diff --git a/connectivity/source/drivers/evoab/makefile.mk b/connectivity/source/drivers/evoab/makefile.mk
index c1dbc21cdf..81f34fc6cb 100644
--- a/connectivity/source/drivers/evoab/makefile.mk
+++ b/connectivity/source/drivers/evoab/makefile.mk
@@ -81,6 +81,7 @@ SHL1STDLIBS=\
$(UNOTOOLSLIB) \
$(UCBHELPERLIB) \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(DBTOOLSLIB) \
$(DBFILELIB) \
$(COMPHELPERLIB)
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 58d725cd2e..3affa4b566 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -45,7 +45,6 @@
#include <comphelper/sequence.hxx>
using namespace connectivity::evoab;
-using namespace vos;
using namespace dbtools;
//------------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
index 947da96d6d..1aadfbf031 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
@@ -68,7 +68,7 @@ void OEvoabPreparedStatement::construct( const ::rtl::OUString& _sql )
m_aQueryData = impl_getEBookQuery_throw( m_sSqlStatement );
ENSURE_OR_THROW( m_aQueryData.getQuery(), "no EBookQuery" );
- ENSURE_OR_THROW( m_aQueryData.xSelectColumns.isValid(), "no SelectColumn" );
+ ENSURE_OR_THROW( m_aQueryData.xSelectColumns.is(), "no SelectColumn" );
// create our meta data
OEvoabResultSetMetaData* pMeta = new OEvoabResultSetMetaData( m_aQueryData.sTable );
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index 0401196099..ed727feb07 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
@@ -51,7 +51,7 @@ OEvoabResultSetMetaData::~OEvoabResultSetMetaData()
{
}
// -------------------------------------------------------------------------
-void OEvoabResultSetMetaData::setEvoabFields(const ::vos::ORef<connectivity::OSQLColumns> &xColumns) throw(SQLException)
+void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException)
{
OSQLColumns::Vector::const_iterator aIter;
static const ::rtl::OUString aName(::rtl::OUString::createFromAscii("Name"));
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
index 443b2a8db6..05744849de 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <cppuhelper/implbase1.hxx>
#include "NConnection.hxx"
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <com/sun/star/connection/XConnection.hpp>
namespace connectivity
{
@@ -51,7 +51,7 @@ namespace connectivity
virtual ~OEvoabResultSetMetaData();
public:
OEvoabResultSetMetaData(const ::rtl::OUString& _aTableName);
- void setEvoabFields(const ::vos::ORef<connectivity::OSQLColumns> &xColumns) throw(::com::sun::star::sdbc::SQLException);
+ void setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(::com::sun::star::sdbc::SQLException);
inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const
{ return m_aEvoabFields[columnIndex - 1]; }
inline sal_Int32 getFieldSize() const
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index ebd3f2485c..43bbaf2fcf 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -602,7 +602,7 @@ QueryData OCommonStatement::impl_getEBookQuery_throw( const ::rtl::OUString& _rS
// a postcondition of this method is that we properly determined the SELECT columns
aData.xSelectColumns = m_aSQLIterator.getSelectColumns();
- if ( !aData.xSelectColumns.isValid() )
+ if ( !aData.xSelectColumns.is() )
m_pConnection->throwGenericSQLException( STR_QUERY_TOO_COMPLEX, *this );
return aData;
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index a2bac2fbcf..ee559eca45 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -87,7 +87,7 @@ namespace connectivity
public:
::rtl::OUString sTable;
QueryFilterType eFilterType;
- ::vos::ORef< ::connectivity::OSQLColumns > xSelectColumns;
+ ::rtl::Reference< ::connectivity::OSQLColumns > xSelectColumns;
SortDescriptor aSortOrder;
QueryData()
diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk
index e8a1cf96cd..837ef49958 100644
--- a/connectivity/source/drivers/evoab2/makefile.mk
+++ b/connectivity/source/drivers/evoab2/makefile.mk
@@ -81,6 +81,7 @@ SHL1STDLIBS=\
$(UNOTOOLSLIB) \
$(UCBHELPERLIB) \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(DBTOOLSLIB) \
$(DBFILELIB) \
$(COMPHELPERLIB)
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index 2a77b25299..f04bd3f489 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -249,7 +249,7 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const
return getDataDefinitionByConnection(connect(url,info));
}
// -----------------------------------------------------------------------------
-void OOperandParam::describe(const Reference< XPropertySet>& rColumn, ::vos::ORef<connectivity::OSQLColumns> rParameterColumns)
+void OOperandParam::describe(const Reference< XPropertySet>& rColumn, ::rtl::Reference<connectivity::OSQLColumns> rParameterColumns)
{
// den alten namen beibehalten
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 1510faaf01..700a8b9a69 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -97,7 +97,7 @@ void OPreparedStatement::disposing()
m_xParamColumns = NULL;
m_xMetaData.clear();
- if(m_aParameterRow.isValid())
+ if(m_aParameterRow.is())
{
m_aParameterRow->get().clear();
m_aParameterRow = NULL;
@@ -299,7 +299,7 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /
::osl::MutexGuard aGuard( m_aMutex );
checkAndResizeParameters(parameterIndex);
- if ( m_aAssignValues.isValid() )
+ if ( m_aAssignValues.is() )
(m_aAssignValues->get())[m_aParameterIndexes[parameterIndex]]->setNull();
else
(m_aParameterRow->get())[parameterIndex]->setNull();
@@ -429,8 +429,8 @@ Reference<XResultSet> OPreparedStatement::initResultSet()
Reference<XResultSet> xRs(m_pResultSet);
// check if we got enough paramters
- if ( (m_aParameterRow.isValid() && ( m_aParameterRow->get().size() -1 ) < m_xParamColumns->get().size()) ||
- (m_xParamColumns.isValid() && !m_aParameterRow.isValid() && !m_aParameterRow->get().empty()) )
+ if ( (m_aParameterRow.is() && ( m_aParameterRow->get().size() -1 ) < m_xParamColumns->get().size()) ||
+ (m_xParamColumns.is() && !m_aParameterRow.is() && !m_aParameterRow->get().empty()) )
m_pConnection->throwGenericSQLException(STR_INVALID_PARA_COUNT,*this);
m_pResultSet->OpenImpl();
@@ -453,7 +453,7 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::checkAndResizeParameters" );
::connectivity::checkDisposed(OStatement_BASE::rBHelper.bDisposed);
- if ( m_aAssignValues.isValid() && (parameterIndex < 1 || parameterIndex >= static_cast<sal_Int32>(m_aParameterIndexes.size())) )
+ if ( m_aAssignValues.is() && (parameterIndex < 1 || parameterIndex >= static_cast<sal_Int32>(m_aParameterIndexes.size())) )
throwInvalidIndexException(*this);
else if ( static_cast<sal_Int32>((m_aParameterRow->get()).size()) <= parameterIndex )
{
@@ -461,7 +461,7 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex)
(m_aParameterRow->get()).resize(parameterIndex+1);
for ( ;i <= parameterIndex+1; ++i )
{
- if ( !(m_aParameterRow->get())[i].isValid() )
+ if ( !(m_aParameterRow->get())[i].is() )
(m_aParameterRow->get())[i] = new ORowSetValueDecorator;
}
}
@@ -473,7 +473,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const ORowSetVal
::osl::MutexGuard aGuard( m_aMutex );
checkAndResizeParameters(parameterIndex);
- if(m_aAssignValues.isValid())
+ if(m_aAssignValues.is())
*(m_aAssignValues->get())[m_aParameterIndexes[parameterIndex]] = x;
else
*((m_aParameterRow->get())[parameterIndex]) = x;
@@ -580,7 +580,7 @@ void OPreparedStatement::initializeResultSet(OResultSet* _pResult)
USHORT nParaCount=0; // gibt die aktuelle Anzahl der bisher gesetzen Parameter an
// Nach zu substituierenden Parametern suchen:
- size_t nCount = m_aAssignValues.isValid() ? m_aAssignValues->get().size() : 1; // 1 ist wichtig fuer die Kriterien
+ size_t nCount = m_aAssignValues.is() ? m_aAssignValues->get().size() : 1; // 1 ist wichtig fuer die Kriterien
for (size_t j = 1; j < nCount; j++)
{
UINT32 nParameter = (*m_aAssignValues).getParameterIndex(j);
@@ -593,19 +593,19 @@ void OPreparedStatement::initializeResultSet(OResultSet* _pResult)
// (*m_aAssignValues)[j] = (*m_aParameterRow)[(UINT16)nParameter];
}
- if (m_aParameterRow.isValid() && (m_xParamColumns->get().size()+1) != m_aParameterRow->get().size() )
+ if (m_aParameterRow.is() && (m_xParamColumns->get().size()+1) != m_aParameterRow->get().size() )
{
sal_Int32 i = m_aParameterRow->get().size();
sal_Int32 nParamColumns = m_xParamColumns->get().size()+1;
m_aParameterRow->get().resize(nParamColumns);
for ( ;i < nParamColumns; ++i )
{
- if ( !(m_aParameterRow->get())[i].isValid() )
+ if ( !(m_aParameterRow->get())[i].is() )
(m_aParameterRow->get())[i] = new ORowSetValueDecorator;
}
//m_aParameterRow->resize(m_xParamColumns->size()+1);
}
- if (m_aParameterRow.isValid() && nParaCount < m_aParameterRow->get().size() )
+ if (m_aParameterRow.is() && nParaCount < m_aParameterRow->get().size() )
{
m_pSQLAnalyzer->bindParameterRow(m_aParameterRow);
@@ -619,7 +619,7 @@ void OPreparedStatement::parseParamterElem(const String& _sColumnName,OSQLParseN
Reference<XPropertySet> xCol;
m_xColNames->getByName(_sColumnName) >>= xCol;
sal_Int32 nParameter = -1;
- if(m_xParamColumns.isValid())
+ if(m_xParamColumns.is())
{
OSQLColumns::Vector::const_iterator aIter = find(m_xParamColumns->get().begin(),m_xParamColumns->get().end(),_sColumnName,::comphelper::UStringMixEqual(m_pTable->isCaseSensitive()));
if(aIter != m_xParamColumns->get().end())
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index cad6b21c0b..72736cf0b8 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -197,7 +197,7 @@ void OResultSet::clear()
m_pFileSet = NULL;
DELETEZ(m_pSortIndex);
- if(m_aInsertRow.isValid())
+ if(m_aInsertRow.is())
m_aInsertRow->get().clear();
m_aSkipDeletedSet.clear();
@@ -589,12 +589,12 @@ sal_Bool OResultSet::evaluate()
{
if(m_pEvaluationKeySet)
{
- bRet = m_pTable->fetchRow(m_aEvaluateRow,m_pTable->getTableColumns().getBody(),sal_True,sal_True);
+ bRet = m_pTable->fetchRow(m_aEvaluateRow,*(m_pTable->getTableColumns()),sal_True,sal_True);
evaluate();
}
else
- bRet = m_pTable->fetchRow(m_aRow,m_xColumns.getBody(),sal_False,sal_True);
+ bRet = m_pTable->fetchRow(m_aRow,*m_xColumns,sal_False,sal_True);
}
}
@@ -651,8 +651,8 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException)
// we know that we append new rows at the end
// so we have to know where the end is
m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,sal_False);
- m_bRowInserted = m_pTable->InsertRow(m_aInsertRow.getBody(), TRUE,m_xColsIdx);
- if(m_bRowInserted && m_pFileSet.isValid())
+ m_bRowInserted = m_pTable->InsertRow(*m_aInsertRow, TRUE, m_xColsIdx);
+ if(m_bRowInserted && m_pFileSet.is())
{
sal_Int32 nPos = (m_aInsertRow->get())[0]->getValue();
m_pFileSet->get().push_back(nPos);
@@ -672,7 +672,7 @@ void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException)
if(!m_pTable || m_pTable->isReadOnly())
lcl_throwError(STR_TABLE_READONLY,*this);
- m_bRowUpdated = m_pTable->UpdateRow(m_aInsertRow.getBody(), m_aRow,m_xColsIdx);
+ m_bRowUpdated = m_pTable->UpdateRow(*m_aInsertRow, m_aRow,m_xColsIdx);
*(m_aInsertRow->get())[0] = (sal_Int32)(m_aRow->get())[0]->getValue();
clearInsertRow();
@@ -693,8 +693,8 @@ void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException)
lcl_throwError(STR_ROW_ALREADY_DELETED,*this);
sal_Int32 nPos = (sal_Int32)(m_aRow->get())[0]->getValue();
- m_bRowDeleted = m_pTable->DeleteRow(m_xColumns.getBody());
- if(m_bRowDeleted && m_pFileSet.isValid())
+ m_bRowDeleted = m_pTable->DeleteRow(*m_xColumns);
+ if(m_bRowDeleted && m_pFileSet.is())
{
m_aRow->setDeleted(sal_True);
// don't touch the m_pFileSet member here
@@ -714,7 +714,7 @@ void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeExcept
m_bRowInserted = sal_False;
m_bRowDeleted = sal_False;
- if(m_aInsertRow.isValid())
+ if(m_aInsertRow.is())
{
OValueRefVector::Vector::iterator aIter = m_aInsertRow->get().begin()+1;
for(;aIter != m_aInsertRow->get().end();++aIter)
@@ -919,7 +919,7 @@ BOOL OResultSet::ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
IResultSetHelper::Movement eCursorPosition = eFirstCursorPosition;
INT32 nOffset = nFirstOffset;
- const OSQLColumns & rTableCols = m_pTable->getTableColumns().getBody();
+ const OSQLColumns & rTableCols = *(m_pTable->getTableColumns());
BOOL bHasRestriction = m_pSQLAnalyzer->hasRestriction();
again:
@@ -958,7 +958,7 @@ again:
return sal_False;
}
}
- else if (m_pFileSet.isValid())
+ else if (m_pFileSet.is())
{
OSL_ENSURE(//!m_pFileSet->IsFrozen() &&
eCursorPosition == IResultSetHelper::NEXT, "Falsche CursorPosition!");
@@ -995,14 +995,14 @@ again:
// Evaluate darf nur gesetzt sein,
// wenn der Keyset weiter aufgebaut werden soll
if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT && !isCount() &&
- (m_pFileSet.isValid() || m_pSortIndex) && bEvaluate)
+ (m_pFileSet.is() || m_pSortIndex) && bEvaluate)
{
if (m_pSortIndex)
{
OKeyValue* pKeyValue = GetOrderbyKeyValue(m_aEvaluateRow);
m_pSortIndex->AddKeyValue(pKeyValue);
}
- else if (m_pFileSet.isValid())
+ else if (m_pFileSet.is())
{
// OSL_ENSURE(!m_pFileSet->IsFrozen() , "Falsche CursorPosition!");
sal_uInt32 nBookmarkValue = Abs((sal_Int32)(m_aEvaluateRow->get())[0]->getValue());
@@ -1015,13 +1015,13 @@ again:
if (bEvaluate)
{
// jetzt die eigentliche Ergebniszeile Lesen
- bOK = m_pTable->fetchRow(m_aEvaluateRow, m_pTable->getTableColumns().getBody(), sal_True,TRUE);
+ bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), sal_True,TRUE);
}
if (bOK)
{
// Nur die zu aendernden Werte uebergeben:
- if(!m_pTable->UpdateRow(m_aAssignValues.getBody(),m_aEvaluateRow,m_xColsIdx))
+ if(!m_pTable->UpdateRow(*m_aAssignValues,m_aEvaluateRow, m_xColsIdx))
return sal_False;
}
}
@@ -1030,11 +1030,11 @@ again:
sal_Bool bOK = sal_True;
if (bEvaluate)
{
- bOK = m_pTable->fetchRow(m_aEvaluateRow, m_pTable->getTableColumns().getBody(), sal_True,TRUE);
+ bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), sal_True,TRUE);
}
if (bOK)
{
- if(!m_pTable->DeleteRow(m_xColumns.getBody()))
+ if(!m_pTable->DeleteRow(*m_xColumns))
return sal_False;
}
}
@@ -1049,13 +1049,11 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
//IgnoreDeletedRows:
//
INT32 nTempPos = m_nRowPos;
- // exclusiver zugriff auf die Tabelle
- // NAMESPACE_VOS(OGuard)* pGuard = m_pTable->Lock();
if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT &&
!isCount())
{
- if (!m_pFileSet.isValid()) // kein Index verfuegbar
+ if (!m_pFileSet.is()) // kein Index verfuegbar
{
// Normales FETCH
ExecuteRow(eCursorPosition,nOffset,FALSE,bRetrieveData);
@@ -1151,7 +1149,7 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
if (bOK)
{
// jetzt nochmal die Ergebnisse lesen
- m_pTable->fetchRow(m_aRow, m_pTable->getTableColumns().getBody(), sal_True,bRetrieveData);
+ m_pTable->fetchRow(m_aRow, *(m_pTable->getTableColumns()), sal_True,bRetrieveData);
// now set the bookmark for outside
*(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1);
@@ -1246,7 +1244,7 @@ Error:
case IResultSetHelper::ABSOLUTE:
case IResultSetHelper::RELATIVE:
if (nOffset > 0)
- m_nRowPos = m_pFileSet.isValid() ? (sal_Int32)m_pFileSet->get().size() : -1;
+ m_nRowPos = m_pFileSet.is() ? (sal_Int32)m_pFileSet->get().size() : -1;
else if (nOffset < 0)
m_nRowPos = -1;
break;
@@ -1409,8 +1407,6 @@ BOOL OResultSet::OpenImpl()
m_nFilePos = 0;
m_nRowCountResult = -1;
- // exclusiver zugriff auf die Tabelle
- // NAMESPACE_VOS(OGuard)* pGuard = pTable->Lock();
m_nLastVisitedPos = m_pTable->getCurrentLastPos();
switch(m_aSQLIterator.getStatementType())
@@ -1488,7 +1484,7 @@ BOOL OResultSet::OpenImpl()
if (IsSorted())
sortRows();
- if (!m_pFileSet.isValid())
+ if (!m_pFileSet.is())
{
m_pFileSet = new OKeySet();
@@ -1503,9 +1499,9 @@ BOOL OResultSet::OpenImpl()
m_pFileSet->get().push_back(i + 1);
}
}
- OSL_ENSURE(m_pFileSet.isValid(),"Kein KeySet vorhanden! :-(");
+ OSL_ENSURE(m_pFileSet.is(),"Kein KeySet vorhanden! :-(");
- if(bDistinct && m_pFileSet.isValid()) // sicher ist sicher
+ if(bDistinct && m_pFileSet.is()) // sicher ist sicher
{
OValueRow aSearchRow = new OValueVector(m_aRow->get().size());
OValueRefVector::Vector::iterator aRowIter = m_aRow->get().begin();
@@ -1632,8 +1628,8 @@ BOOL OResultSet::OpenImpl()
case SQL_STATEMENT_INSERT:
m_nRowCountResult = 0;
- OSL_ENSURE(m_aAssignValues.isValid(),"No assign values set!");
- if(!m_pTable->InsertRow(m_aAssignValues.getBody(), TRUE,m_xColsIdx))
+ OSL_ENSURE(m_aAssignValues.is(),"No assign values set!");
+ if(!m_pTable->InsertRow(*m_aAssignValues, TRUE,m_xColsIdx))
{
m_nFilePos = 0;
return sal_False;
@@ -1680,7 +1676,7 @@ sal_Int64 OResultSet::getSomething( const Sequence< sal_Int8 > & rId ) throw (Ru
// -----------------------------------------------------------------------------
void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
const OValueRefRow& _rSelectRow,
- const ::vos::ORef<connectivity::OSQLColumns>& _rxColumns,
+ const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,
const Reference<XIndexAccess>& _xNames,
sal_Bool _bSetColumnMapping,
const Reference<XDatabaseMetaData>& _xMetaData,
@@ -1847,7 +1843,7 @@ void OResultSet::clearInsertRow()
void OResultSet::initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::initializeRow" );
- if(!_rRow.isValid())
+ if(!_rRow.is())
{
_rRow = new OValueRefVector(_nColumnCount);
(_rRow->get())[0]->setBound(sal_True);
diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx
index 96dc9e541c..fc45a15afb 100644
--- a/connectivity/source/drivers/file/FResultSetMetaData.cxx
+++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
// -------------------------------------------------------------------------
-OResultSetMetaData::OResultSetMetaData(const ::vos::ORef<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable* _pTable)
+OResultSetMetaData::OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable* _pTable)
:m_aTableName(_aTableName)
,m_xColumns(_rxColumns)
,m_pTable(_pTable)
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 7decb563b2..1ccb031bba 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -135,7 +135,7 @@ void OStatement_BASE2::disposing()
if(m_pSQLAnalyzer)
m_pSQLAnalyzer->dispose();
- if(m_aRow.isValid())
+ if(m_aRow.is())
{
m_aRow->get().clear();
m_aRow = NULL;
@@ -363,7 +363,7 @@ sal_Int32 SAL_CALL OStatement::executeUpdate( const ::rtl::OUString& sql ) throw
void SAL_CALL OStatement_Base::disposing(void)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::disposing" );
- if(m_aEvaluateRow.isValid())
+ if(m_aEvaluateRow.is())
{
m_aEvaluateRow->get().clear();
m_aEvaluateRow = NULL;
@@ -458,7 +458,7 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef,
}
catch(Exception)
{
- ::vos::ORef<OSQLColumns> aSelectColumns = m_aSQLIterator.getSelectColumns();
+ ::rtl::Reference<OSQLColumns> aSelectColumns = m_aSQLIterator.getSelectColumns();
::comphelper::UStringMixEqual aCase;
OSQLColumns::Vector::const_iterator aFind = ::connectivity::find(aSelectColumns->get().begin(),aSelectColumns->get().end(),aColumnName,aCase);
if ( aFind == aSelectColumns->get().end() )
@@ -554,7 +554,7 @@ void OStatement_Base::createColumnMapping()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::createColumnMapping" );
// initialize the column index map (mapping select columns to table columns)
- ::vos::ORef<connectivity::OSQLColumns> xColumns = m_aSQLIterator.getSelectColumns();
+ ::rtl::Reference<connectivity::OSQLColumns> xColumns = m_aSQLIterator.getSelectColumns();
m_aColMapping.resize(xColumns->get().size() + 1);
for (sal_Int32 i=0; i<(sal_Int32)m_aColMapping.size(); ++i)
m_aColMapping[i] = i;
@@ -598,7 +598,7 @@ void OStatement_Base::GetAssignValues()
else if (SQL_ISRULE(m_pParseTree,insert_statement))
{
// Row fuer die zu setzenden Werte anlegen (Referenz durch new)
- if(m_aAssignValues.isValid())
+ if(m_aAssignValues.is())
m_aAssignValues->get().clear();
sal_Int32 nCount = Reference<XIndexAccess>(m_xColNames,UNO_QUERY)->getCount();
m_aAssignValues = new OAssignValues(nCount);
@@ -687,7 +687,7 @@ void OStatement_Base::GetAssignValues()
}
else if (SQL_ISRULE(m_pParseTree,update_statement_searched))
{
- if(m_aAssignValues.isValid())
+ if(m_aAssignValues.is())
m_aAssignValues->get().clear();
sal_Int32 nCount = Reference<XIndexAccess>(m_xColNames,UNO_QUERY)->getCount();
m_aAssignValues = new OAssignValues(nCount);
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index 73a31f29d0..773b24b277 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -93,9 +93,9 @@ void OSQLAnalyzer::start(OSQLParseNode* pSQLParseNode)
|| SQL_ISRULE(pColumnRef,factor)
|| SQL_ISRULE(pColumnRef,set_fct_spec) )
{
- ::vos::ORef<OPredicateCompiler> pCompiler = new OPredicateCompiler(this);
+ ::rtl::Reference<OPredicateCompiler> pCompiler = new OPredicateCompiler(this);
pCompiler->setOrigColumns(m_aCompiler->getOrigColumns());
- ::vos::ORef<OPredicateInterpreter> pInterpreter = new OPredicateInterpreter(pCompiler);
+ ::rtl::Reference<OPredicateInterpreter> pInterpreter = new OPredicateInterpreter(pCompiler);
pCompiler->execute( pColumnRef );
m_aSelectionEvaluations.push_back( TPredicates(pCompiler,pInterpreter) );
}
@@ -153,7 +153,7 @@ void OSQLAnalyzer::bindSelectRow(const OValueRefRow& _pRow)
OEvaluateSetList aEvaluateSetList;
for ( ::std::vector< TPredicates >::iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter)
{
- if ( aIter->first.isValid() )
+ if ( aIter->first.is() )
bindRow( aIter->first->m_aCodeList,_pRow,aEvaluateSetList);
}
}
@@ -197,7 +197,7 @@ void OSQLAnalyzer::bindSelectRow(const OValueRefRow& _pRow)
}
//------------------------------------------------------------------
-void OSQLAnalyzer::describeParam(::vos::ORef<OSQLColumns> rParameterColumns)
+void OSQLAnalyzer::describeParam(::rtl::Reference<OSQLColumns> rParameterColumns)
{
OCodeList& rCodeList = m_aCompiler->m_aCodeList;
OCodeStack aCodeStack;
@@ -208,7 +208,7 @@ void OSQLAnalyzer::describeParam(::vos::ORef<OSQLColumns> rParameterColumns)
return; // keine Parameter
// Anlegen von Columns, die eine genauere Beschreibung fuer die enthalten
- ::vos::ORef<OSQLColumns> aNewParamColumns = new OSQLColumns(*rParameterColumns);
+ ::rtl::Reference<OSQLColumns> aNewParamColumns = new OSQLColumns(*rParameterColumns);
// Anlegen einer Testzeile, wird benoetigt um die Parameter zu beschreiben
@@ -278,7 +278,7 @@ BOOL OSQLAnalyzer::hasFunctions() const
m_bSelectionFirstTime = sal_False;
for ( ::std::vector< TPredicates >::const_iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end() && !m_bHasSelectionCode ;++aIter)
{
- if ( aIter->first.isValid() )
+ if ( aIter->first.is() )
m_bHasSelectionCode = aIter->first->hasCode();
}
}
@@ -290,7 +290,7 @@ void OSQLAnalyzer::setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std:
sal_Int32 nPos = 1;
for ( ::std::vector< TPredicates >::iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter,++nPos)
{
- if ( aIter->second.isValid() )
+ if ( aIter->second.is() )
{
sal_Int32 map = nPos;
// the first column (index 0) is for convenience only. The first real select column is no 1.
@@ -306,7 +306,7 @@ void OSQLAnalyzer::dispose()
m_aCompiler->dispose();
for ( ::std::vector< TPredicates >::iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter)
{
- if ( aIter->first.isValid() )
+ if ( aIter->first.is() )
aIter->first->dispose();
}
}
@@ -316,7 +316,7 @@ void OSQLAnalyzer::setOrigColumns(const OFileColumns& rCols)
m_aCompiler->setOrigColumns(rCols);
for ( ::std::vector< TPredicates >::iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter)
{
- if ( aIter->first.isValid() )
+ if ( aIter->first.is() )
aIter->first->setOrigColumns(rCols);
}
}
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index 1ddc1fa33a..bb48041a30 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -102,23 +102,23 @@ OOperandRow::OOperandRow(sal_uInt16 _nPos, sal_Int32 _rType)
void OOperandRow::bindValue(const OValueRefRow& _pRow)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OOperandRow::OOperandRow" );
- OSL_ENSURE(_pRow.isValid(),"NO EMPTY row allowed!");
+ OSL_ENSURE(_pRow.is(),"NO EMPTY row allowed!");
m_pRow = _pRow;
- OSL_ENSURE(m_pRow.isValid() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()");
+ OSL_ENSURE(m_pRow.is() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()");
(m_pRow->get())[m_nRowPos]->setBound(sal_True);
}
// -----------------------------------------------------------------------------
void OOperandRow::setValue(const ORowSetValue& _rVal)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OOperandRow::setValue" );
- OSL_ENSURE(m_pRow.isValid() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()");
+ OSL_ENSURE(m_pRow.is() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()");
(*(m_pRow->get())[m_nRowPos]) = _rVal;
}
//------------------------------------------------------------------
const ORowSetValue& OOperandRow::getValue() const
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OOperandRow::getValue" );
- OSL_ENSURE(m_pRow.isValid() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()");
+ OSL_ENSURE(m_pRow.is() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()");
return (m_pRow->get())[m_nRowPos]->getValue();
}
diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk
index bd6a29e3ae..16e28a3062 100644
--- a/connectivity/source/drivers/file/makefile.mk
+++ b/connectivity/source/drivers/file/makefile.mk
@@ -80,6 +80,7 @@ SHL1STDLIBS=\
$(TOOLSLIB) \
$(UCBHELPERLIB) \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(DBTOOLSLIB) \
$(UNOTOOLSLIB) \
$(COMPHELPERLIB)
diff --git a/connectivity/source/drivers/flat/EColumns.cxx b/connectivity/source/drivers/flat/EColumns.cxx
index ec366c6ccb..7fdbeca25c 100644
--- a/connectivity/source/drivers/flat/EColumns.cxx
+++ b/connectivity/source/drivers/flat/EColumns.cxx
@@ -45,7 +45,7 @@ sdbcx::ObjectType OFlatColumns::createObject(const ::rtl::OUString& _rName)
{
OFlatTable* pTable = (OFlatTable*)m_pTable;
- ::vos::ORef<OSQLColumns> aCols = pTable->getTableColumns();
+ ::rtl::Reference<OSQLColumns> aCols = pTable->getTableColumns();
OSQLColumns::Vector::const_iterator aIter = find(aCols->get().begin(),aCols->get().end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive()));
sdbcx::ObjectType xRet;
if(aIter != aCols->get().end())
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 36cad8583d..02cc780a47 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -104,7 +104,7 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
// column count
const xub_StrLen nFieldCount = aHeaderLine.GetTokenCount(m_cFieldDelimiter,m_cStringDelimiter);
- if(!m_aColumns.isValid())
+ if(!m_aColumns.is())
m_aColumns = new OSQLColumns();
else
m_aColumns->get().clear();
diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk
index 2d1f99f759..3d134ec12d 100644
--- a/connectivity/source/drivers/flat/makefile.mk
+++ b/connectivity/source/drivers/flat/makefile.mk
@@ -83,6 +83,7 @@ SHL1STDLIBS=\
$(SVLLIB) \
$(UNOTOOLSLIB) \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(DBTOOLSLIB) \
$(DBFILELIB) \
$(COMPHELPERLIB)
diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk
index 4661995216..84326eb3c0 100644
--- a/connectivity/source/drivers/jdbc/makefile.mk
+++ b/connectivity/source/drivers/jdbc/makefile.mk
@@ -89,6 +89,7 @@ SHL1STDLIBS=\
$(CPPUHELPERLIB) \
$(VOSLIB) \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(JVMACCESSLIB) \
$(DBTOOLSLIB) \
$(UNOTOOLSLIB) \
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx
index 7d2ace40cb..d82ca654d7 100644
--- a/connectivity/source/drivers/kab/KPreparedStatement.cxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx
@@ -46,7 +46,7 @@ IMPLEMENT_SERVICE_INFO(KabPreparedStatement, "com.sun.star.sdbc.drivers.KabPrepa
// -------------------------------------------------------------------------
void KabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(SQLException)
{
- if ( !m_aParameterRow.isValid() )
+ if ( !m_aParameterRow.is() )
m_aParameterRow = new OValueVector();
if (nParams < 1)
@@ -58,10 +58,10 @@ void KabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(SQL
// -------------------------------------------------------------------------
void KabPreparedStatement::setKabFields() const throw(SQLException)
{
- ::vos::ORef<connectivity::OSQLColumns> xColumns; // selected columns
+ ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns
xColumns = m_aSQLIterator.getSelectColumns();
- if (!xColumns.isValid())
+ if (!xColumns.is())
{
::connectivity::SharedResources aResources;
const ::rtl::OUString sError( aResources.getResourceString(
@@ -112,7 +112,7 @@ void KabPreparedStatement::disposing()
{
KabPreparedStatement_BASE::disposing();
- if (m_aParameterRow.isValid())
+ if (m_aParameterRow.is())
{
m_aParameterRow->get().clear();
m_aParameterRow = NULL;
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
index 44bd4fea64..c9bc2853f1 100644
--- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
@@ -49,7 +49,7 @@ KabResultSetMetaData::~KabResultSetMetaData()
{
}
// -------------------------------------------------------------------------
-void KabResultSetMetaData::setKabFields(const ::vos::ORef<connectivity::OSQLColumns> &xColumns) throw(SQLException)
+void KabResultSetMetaData::setKabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException)
{
OSQLColumns::Vector::const_iterator aIter;
static const ::rtl::OUString aName(::rtl::OUString::createFromAscii("Name"));
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.hxx b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
index 555431d168..f031c87fa0 100644
--- a/connectivity/source/drivers/kab/KResultSetMetaData.hxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
@@ -32,7 +32,7 @@
#include <connectivity/CommonTools.hxx>
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <cppuhelper/implbase1.hxx>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
namespace connectivity
{
@@ -60,7 +60,7 @@ namespace connectivity
{ return this; }
void setKabFields(
- const ::vos::ORef<connectivity::OSQLColumns> &xColumns) throw(::com::sun::star::sdbc::SQLException);
+ const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(::com::sun::star::sdbc::SQLException);
inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const
{ return m_aKabFields[columnIndex - 1]; }
diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx
index f32460f36d..655e8ae656 100644
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
@@ -311,11 +311,11 @@ sal_Bool KabCommonStatement::isTableKnown(KabResultSet *pResult) const
//------------------------------------------------------------------------------
void KabCommonStatement::setKabFields(KabResultSet *pResult) const throw(SQLException)
{
- ::vos::ORef<connectivity::OSQLColumns> xColumns; // selected columns
+ ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns
KabResultSetMetaData *pMeta; // meta information - holds the list of KAddressBook fields
xColumns = m_aSQLIterator.getSelectColumns();
- if (!xColumns.isValid())
+ if (!xColumns.is())
{
lcl_throwError(STR_INVALID_COLUMN_SELECTION);
}
diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk
index 5e32a5d336..2e98efe9ea 100644
--- a/connectivity/source/drivers/kab/makefile.mk
+++ b/connectivity/source/drivers/kab/makefile.mk
@@ -69,7 +69,8 @@ SHL1STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(DBTOOLSLIB) \
- $(SALLIB)
+ $(SALLIB) \
+ $(SALHELPERLIB)
SHL1DEPN=
SHL1IMPLIB= i$(TARGET)
@@ -112,6 +113,7 @@ SHL2STDLIBS=\
$(CPPUHELPERLIB) \
$(VOSLIB) \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(DBTOOLSLIB) \
$(COMPHELPERLIB)
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
index ab37667492..19d9c5f9de 100644
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
@@ -47,7 +47,7 @@ IMPLEMENT_SERVICE_INFO(MacabPreparedStatement, "com.sun.star.sdbc.drivers.MacabP
// -------------------------------------------------------------------------
void MacabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(SQLException)
{
- if ( !m_aParameterRow.isValid() )
+ if ( !m_aParameterRow.is() )
m_aParameterRow = new OValueVector();
if (nParams < 1)
@@ -59,10 +59,10 @@ void MacabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(S
// -------------------------------------------------------------------------
void MacabPreparedStatement::setMacabFields() const throw(SQLException)
{
- ::vos::ORef<connectivity::OSQLColumns> xColumns; // selected columns
+ ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns
xColumns = m_aSQLIterator.getSelectColumns();
- if (!xColumns.isValid())
+ if (!xColumns.is())
{
::connectivity::SharedResources aResources;
const ::rtl::OUString sError( aResources.getResourceString(
@@ -114,7 +114,7 @@ void MacabPreparedStatement::disposing()
{
MacabPreparedStatement_BASE::disposing();
- if (m_aParameterRow.isValid())
+ if (m_aParameterRow.is())
{
m_aParameterRow->get().clear();
m_aParameterRow = NULL;
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
index e4a799c175..27ff55dced 100644
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
@@ -52,7 +52,7 @@ MacabResultSetMetaData::~MacabResultSetMetaData()
{
}
// -------------------------------------------------------------------------
-void MacabResultSetMetaData::setMacabFields(const ::vos::ORef<connectivity::OSQLColumns> &xColumns) throw(SQLException)
+void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException)
{
OSQLColumns::Vector::const_iterator aIter;
static const ::rtl::OUString aName(::rtl::OUString::createFromAscii("Name"));
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
index e3755910e2..9d59680180 100644
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
@@ -33,7 +33,7 @@
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <cppuhelper/implbase1.hxx>
#include <connectivity/dbexception.hxx>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
namespace connectivity
{
@@ -62,7 +62,7 @@ namespace connectivity
{ return this; }
void setMacabFields(
- const ::vos::ORef<connectivity::OSQLColumns> &xColumns) throw(::com::sun::star::sdbc::SQLException);
+ const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(::com::sun::star::sdbc::SQLException);
inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const
{ return m_aMacabFields[columnIndex - 1]; }
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 102819ad88..fa2654131f 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -313,11 +313,11 @@ MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pPar
//------------------------------------------------------------------------------
void MacabCommonStatement::setMacabFields(MacabResultSet *pResult) const throw(SQLException)
{
- ::vos::ORef<connectivity::OSQLColumns> xColumns; // selected columns
+ ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns
MacabResultSetMetaData *pMeta; // meta information - holds the list of AddressBook fields
xColumns = m_aSQLIterator.getSelectColumns();
- if (!xColumns.isValid())
+ if (!xColumns.is())
{
::connectivity::SharedResources aResources;
const ::rtl::OUString sError( aResources.getResourceString(
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
index 2311d65eb3..c221684cbb 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
@@ -90,7 +90,7 @@ void SAL_CALL OPreparedStatement::disposing()
OCommonStatement::disposing();
m_xMetaData.clear();
- if(m_aParameterRow.isValid())
+ if(m_aParameterRow.is())
{
m_aParameterRow->get().clear();
m_aParameterRow = NULL;
@@ -395,7 +395,7 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex)
{
::connectivity::checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed);
- if ( !m_aParameterRow.isValid() ) {
+ if ( !m_aParameterRow.is() ) {
m_aParameterRow = new OValueVector();
m_aParameterRow->get().push_back(sal_Int32(0));
}
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
index b1286669fa..6c0f598a7e 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
@@ -75,7 +75,7 @@ namespace connectivity
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData;
sal_Bool m_bPrepared;
::rtl::Reference< OResultSet > m_pResultSet;
- ::vos::ORef<connectivity::OSQLColumns> m_xParamColumns; // the parameter columns
+ ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; // the parameter columns
OValueRow m_aParameterRow;
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index ffdc5bb894..8ca4e57b81 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -79,10 +79,10 @@ using namespace com::sun::star::util;
// -------------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException)
{
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2);
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2);
aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet"));
aSupported[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet"));
- return aSupported;
+ return aSupported;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL OResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw( RuntimeException)
@@ -122,7 +122,7 @@ OResultSet::OResultSet(OCommonStatement* pStmt, const ::boost::shared_ptr< conne
,m_RowStates(0)
,m_bIsReadOnly(-1)
{
-
+
m_aQuery.setMaxNrOfReturns(pStmt->getOwnConnection()->getMaxResultRecords());
}
// -------------------------------------------------------------------------
@@ -275,7 +275,7 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLEx
ResultSetEntryGuard aGuard( *this );
if(!m_xMetaData.is())
- m_xMetaData = new OResultSetMetaData(
+ m_xMetaData = new OResultSetMetaData(
m_pSQLIterator->getSelectColumns(), m_pSQLIterator->getTables().begin()->first ,m_pTable,determineReadOnly());
return m_xMetaData;
}
@@ -335,7 +335,7 @@ sal_Bool OResultSet::fetchCurrentRow( ) throw(SQLException, RuntimeException)
{
OSL_TRACE("fetchCurrentRow, m_nRowPos = %u", m_nRowPos );
return fetchRow(getCurrentCardNumber());
-}
+}
// -------------------------------------------------------------------------
sal_Bool OResultSet::pushCard(sal_uInt32 cardNumber) throw(SQLException, RuntimeException)
@@ -362,7 +362,7 @@ sal_Bool OResultSet::pushCard(sal_uInt32 cardNumber) throw(SQLException, Runtime
}
}
return sal_True;
-
+
}
// -------------------------------------------------------------------------
sal_Bool OResultSet::fetchRow(sal_Int32 cardNumber,sal_Bool bForceReload) throw(SQLException, RuntimeException)
@@ -383,7 +383,7 @@ sal_Bool OResultSet::fetchRow(sal_Int32 cardNumber,sal_Bool bForceReload) throw(
}
else
m_aQuery.resyncRow(cardNumber);
-
+
if ( validRow( cardNumber ) == sal_False )
return sal_False;
@@ -427,7 +427,7 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnI
{
ResultSetEntryGuard aGuard( *this );
- OSL_ENSURE(m_xColumns.isValid(), "Need the Columns!!");
+ OSL_ENSURE(m_xColumns.is(), "Need the Columns!!");
OSL_ENSURE(columnIndex <= (sal_Int32)m_xColumns->get().size(), "Trying to access invalid columns number");
checkIndex( columnIndex );
@@ -626,7 +626,7 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY);
DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) PropertyAttribute::READONLY);
DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY);
-
+
return new OPropertyArrayHelper(aProps);
}
// -------------------------------------------------------------------------
@@ -722,7 +722,7 @@ void SAL_CALL OResultSet::release() throw()
// -----------------------------------------------------------------------------
void OResultSet::initializeRow(OValueRow& _rRow,sal_Int32 _nColumnCount)
{
- if(!_rRow.isValid())
+ if(!_rRow.is())
{
_rRow = new OValueVector(_nColumnCount);
(_rRow->get())[0].setBound(sal_True);
@@ -750,7 +750,7 @@ void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMat
m_nParamIndex ++;
OSL_TRACE("Parameter name [%d]: %s\n", m_nParamIndex,OUtoCStr(aParameterName) );
- if ( m_aParameterRow.isValid() ) {
+ if ( m_aParameterRow.is() ) {
OSL_ENSURE( m_nParamIndex < (sal_Int32)m_aParameterRow->get().size() + 1, "More parameters than values found" );
rMatchString = (m_aParameterRow->get())[(sal_uInt16)m_nParamIndex];
#if OSL_DEBUG_LEVEL > 0
@@ -775,8 +775,8 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
return;
if ( m_pSQLIterator->getParseTree() != NULL ) {
- ::vos::ORef<OSQLColumns> xColumns = m_pSQLIterator->getParameters();
- if(xColumns.isValid())
+ ::rtl::Reference<OSQLColumns> xColumns = m_pSQLIterator->getParameters();
+ if(xColumns.is())
{
::rtl::OUString aTabName,aColName,aParameterName,aParameterValue;
OSQLColumns::Vector::iterator aIter = xColumns->get().begin();
@@ -785,7 +785,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
{
(*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName;
OSL_TRACE("Prop Column Name : %s\n", OUtoCStr( aColName ) );
- if ( m_aParameterRow.isValid() ) {
+ if ( m_aParameterRow.is() ) {
aParameterValue = (m_aParameterRow->get())[(sal_uInt16)i];
#if OSL_DEBUG_LEVEL > 0
OSL_TRACE("Prop Value : %s\n", OUtoCStr( aParameterValue ) );
@@ -896,7 +896,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
OSQLParseNode *pColumn;
OSQLParseNode *pAtom;
OSQLParseNode *pOptEscape;
- const OSQLParseNode* pPart2 = parseTree->getChild(1);
+ const OSQLParseNode* pPart2 = parseTree->getChild(1);
pColumn = parseTree->getChild(0); // Match Item
pAtom = pPart2->getChild(parseTree->count()-2); // Match String
pOptEscape = pPart2->getChild(parseTree->count()-1); // Opt Escape Rule
@@ -1024,7 +1024,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
else if (SQL_ISRULE(parseTree,test_for_null))
{
OSL_ENSURE(parseTree->count() == 2,"Error in ParseTree");
- const OSQLParseNode* pPart2 = parseTree->getChild(1);
+ const OSQLParseNode* pPart2 = parseTree->getChild(1);
OSL_ENSURE(SQL_ISTOKEN(pPart2->getChild(0),IS),"Error in ParseTree");
if (!SQL_ISRULE(parseTree->getChild(0),column_ref))
@@ -1065,7 +1065,7 @@ void OResultSet::fillRowData()
OConnection* xConnection = static_cast<OConnection*>(m_pStatement->getConnection().get());
m_xColumns = m_pSQLIterator->getSelectColumns();
- OSL_ENSURE(m_xColumns.isValid(), "Need the Columns!!");
+ OSL_ENSURE(m_xColumns.is(), "Need the Columns!!");
OSQLColumns::Vector::const_iterator aIter = m_xColumns->get().begin();
const ::rtl::OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME);
@@ -1166,7 +1166,7 @@ sal_Int32 OResultSet::getRowForCardNumber(sal_Int32 nCardNum)
{
OSL_TRACE("In/Out: OResultSet::getRowForCardNumber, nCardNum = %u", nCardNum );
- if ( m_pKeySet.isValid() )
+ if ( m_pKeySet.is() )
{
sal_Int32 nPos;
for(nPos=0;nPos < (sal_Int32)m_pKeySet->get().size();nPos++)
@@ -1204,7 +1204,7 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep
fillRowData();
- OSL_ENSURE(m_xColumns.isValid(), "Need the Columns!!");
+ OSL_ENSURE(m_xColumns.is(), "Need the Columns!!");
// sal_Int32 nColumnCount = m_xColumns->size();
// initializeRow(m_aRow,nColumnCount);
@@ -1329,7 +1329,7 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep
m_pKeySet = new OKeySet();
// Handle the DISTINCT case
- if ( bDistinct && m_pKeySet.isValid() )
+ if ( bDistinct && m_pKeySet.is() )
{
OValueRow aSearchRow = new OValueVector( m_aRow->get().size() );
@@ -1369,7 +1369,7 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep
// -----------------------------------------------------------------------------
void OResultSet::setBoundedColumns(const OValueRow& _rRow,
- const ::vos::ORef<connectivity::OSQLColumns>& _rxColumns,
+ const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,
const Reference<XIndexAccess>& _xNames,
sal_Bool _bSetColumnMapping,
const Reference<XDatabaseMetaData>& _xMetaData,
@@ -1510,13 +1510,13 @@ sal_Int32 OResultSet::deletedCount()
{
impl_ensureKeySet();
return m_CurrentRowCount - m_pKeySet->get().size();
-
+
}
// -----------------------------------------------------------------------------
sal_Bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset )
{
ResultSetEntryGuard aGuard( *this );
- if ( !m_pKeySet.isValid() )
+ if ( !m_pKeySet.is() )
m_pStatement->getOwnConnection()->throwSQLException( STR_ILLEGAL_MOVEMENT, *this );
sal_Int32 nNumberOfRecords = m_aQuery.getRealRowCount();
@@ -1566,7 +1566,7 @@ sal_Bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset )
}
else //The requested row has not been retrived until now. We should get the right card for it.
nCurCard = nCurPos + deletedCount();
-
+
while ( nCurCard > nNumberOfRecords && !m_aQuery.queryComplete() ) {
m_aQuery.checkRowAvailable( nCurCard );
if ( m_aQuery.hadError() )
@@ -1606,7 +1606,7 @@ void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMappin
ResultSetEntryGuard aGuard( *this );
if ( fetchCurrentRow() == sal_False )
m_pStatement->getOwnConnection()->throwSQLException( STR_ERROR_GET_ROW, *this );
-
+
OSL_ENSURE((!m_aRow->isDeleted()),"getBookmark called for deleted row");
return makeAny((sal_Int32)(m_aRow->get())[0]);
}
@@ -1644,7 +1644,7 @@ sal_Int32 OResultSet::compareBookmarks( const ::com::sun::star::uno::Any& lhs, c
nResult = 1;
else
nResult = 0;
-
+
return nResult;
}
sal_Bool OResultSet::hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
@@ -1662,7 +1662,7 @@ sal_Int32 OResultSet::hashBookmark( const ::com::sun::star::uno::Any& bookmark )
sal_Int32 OResultSet::getCurrentCardNumber()
{
- if ( ( m_nRowPos == 0 ) || !m_pKeySet.isValid() )
+ if ( ( m_nRowPos == 0 ) || !m_pKeySet.is() )
return 0;
if (m_pKeySet->get().size() < m_nRowPos)
return 0;
@@ -1672,7 +1672,7 @@ void OResultSet::checkPendingUpdate() throw(SQLException, RuntimeException)
{
OSL_TRACE("checkPendingUpdate, m_nRowPos = %u", m_nRowPos );
const sal_Int32 nCurrentRow = getCurrentCardNumber();
-
+
if ((m_nNewRow && nCurrentRow != m_nNewRow)
|| ( m_nUpdatedRow && m_nUpdatedRow != nCurrentRow))
{
@@ -1682,7 +1682,7 @@ void OResultSet::checkPendingUpdate() throw(SQLException, RuntimeException)
) );
::dbtools::throwGenericSQLException(sError,*this);
}
-
+
}
void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw(SQLException, RuntimeException)
{
@@ -1859,14 +1859,14 @@ void SAL_CALL OResultSet::updateRow( ) throw(::com::sun::star::sdbc::SQLExcepti
m_RowStates = RowStates_Error;
m_pStatement->getOwnConnection()->throwSQLException( STR_ROW_CAN_NOT_SAVE, *this );
}
-
+
if (!m_aQuery.commitRow(nCurrentCard))
{
m_RowStates = RowStates_Error;
m_nUpdatedRow = 0;
m_pStatement->getOwnConnection()->throwSQLException( m_aQuery.getError(), *this );
}
-
+
m_nUpdatedRow = 0;
fetchCurrentRow();
OSL_TRACE("updateRow out, m_nRowPos = %u", m_nRowPos );
@@ -1878,7 +1878,7 @@ void SAL_CALL OResultSet::deleteRow( ) throw(::com::sun::star::sdbc::SQLExcepti
ResultSetEntryGuard aGuard( *this );
if (rowDeleted())
m_pStatement->getOwnConnection()->throwSQLException( STR_ROW_ALREADY_DELETED, *this );
-
+
const sal_Int32 nCurrentRow = getCurrentCardNumber();
//fetchRow(nCurrentRow);
if (!nCurrentRow)
@@ -1907,7 +1907,7 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLE
OSL_TRACE("moveToInsertRow in, m_nRowPos = %u", m_nRowPos );
ResultSetEntryGuard aGuard( *this );
m_nOldRowPos = m_nRowPos;
-
+
if (!m_nNewRow) //no new row now, insert one
{
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1920,7 +1920,7 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLE
m_nNewRow = m_aQuery.createNewCard();
if (!m_nNewRow)
m_pStatement->getOwnConnection()->throwSQLException( STR_CAN_NOT_CREATE_ROW, *this );
-
+
m_RowStates = RowStates_Normal;
fillKeySet(m_nNewRow);
}
@@ -1954,10 +1954,10 @@ sal_Bool OResultSet::determineReadOnly()
return m_bIsReadOnly != 0;
}
-void OResultSet::setTable(OTable* _rTable)
-{
+void OResultSet::setTable(OTable* _rTable)
+{
OSL_TRACE("In : setTable");
- m_pTable = _rTable;
+ m_pTable = _rTable;
m_pTable->acquire();
m_xTableColumns = m_pTable->getColumns();
if(m_xTableColumns.is())
@@ -1965,9 +1965,9 @@ void OResultSet::setTable(OTable* _rTable)
OSL_TRACE("Out : setTable");
}
-void OResultSet::setOrderByColumns(const ::std::vector<sal_Int32>& _aColumnOrderBy)
+void OResultSet::setOrderByColumns(const ::std::vector<sal_Int32>& _aColumnOrderBy)
{
- m_aOrderbyColumnNumber = _aColumnOrderBy;
+ m_aOrderbyColumnNumber = _aColumnOrderBy;
}
void OResultSet::setOrderByAscending(const ::std::vector<TAscendingOrder>& _aOrderbyAsc)
diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx
index 1d1e0f7433..6c7d9c1ada 100644
--- a/connectivity/source/drivers/mozab/MResultSet.hxx
+++ b/connectivity/source/drivers/mozab/MResultSet.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -122,9 +122,9 @@ namespace connectivity
virtual ~OResultSet();
public:
DECLARE_SERVICE_INFO();
-
+
OResultSet(OCommonStatement* pStmt, const ::boost::shared_ptr< ::connectivity::OSQLParseTreeIterator >& _pSQLIterator );
-
+
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *()
{
@@ -232,7 +232,7 @@ protected:
MQuery m_aQuery;
OTable* m_pTable;
sal_Int32 m_CurrentRowCount;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
m_xTableColumns;
::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime
@@ -244,7 +244,7 @@ protected:
::std::vector< ::rtl::OUString> m_aAttributeStrings;
sal_Int32 m_nParamIndex;
sal_Bool m_bIsAlwaysFalseQuery;
- ::vos::ORef<OKeySet> m_pKeySet;
+ ::rtl::Reference<OKeySet> m_pKeySet;
OSortIndex* m_pSortIndex;
sal_Int32 m_nNewRow; //inserted row
sal_Int32 m_nUpdatedRow; //updated row
@@ -252,13 +252,13 @@ protected:
sal_Int32 m_bIsReadOnly;
inline void resetParameters() { m_nParamIndex = 0; }
- ::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;
+
void parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMatchString );
void fillRowData() throw( ::com::sun::star::sdbc::SQLException );
void initializeRow(OValueRow& _rRow,sal_Int32 _nColumnCount);
- void analyseWhereClause( const OSQLParseNode* parseTree,
+ void analyseWhereClause( const OSQLParseNode* parseTree,
MQueryExpression &queryExpression);
sal_Bool isCount() const;
@@ -266,7 +266,7 @@ protected:
// XXX sal_Bool IsSorted() const { return !m_aOrderbyColumnNumber.empty() && m_aOrderbyColumnNumber[0] != STRING_NOTFOUND ;}
sal_Bool IsSorted() const { return !m_aOrderbyColumnNumber.empty(); }
- enum eRowPosition {
+ enum eRowPosition {
NEXT_POS, PRIOR_POS, FIRST_POS, LAST_POS, ABSOLUTE_POS, RELATIVE_POS
};
@@ -295,16 +295,16 @@ public:
// MozAddressbook Specific methods
void SAL_CALL executeQuery() throw( ::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
-
+
void setTable(OTable* _rTable);
- void setParameterRow(const OValueRow& _rParaRow)
+ void setParameterRow(const OValueRow& _rParaRow)
{ m_aParameterRow = _rParaRow; }
- void setParameterColumns(const ::vos::ORef<connectivity::OSQLColumns>& _xParamColumns)
+ void setParameterColumns(const ::rtl::Reference<connectivity::OSQLColumns>& _xParamColumns)
{ m_xParamColumns = _xParamColumns; }
- void setBindingRow(const OValueRow& _aRow)
+ void setBindingRow(const OValueRow& _aRow)
{ m_aRow = _aRow; }
void setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMapping);
@@ -318,11 +318,11 @@ public:
void checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException);
static void setBoundedColumns(
- const OValueRow& _rRow,
- const ::vos::ORef<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,
+ const OValueRow& _rRow,
+ 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,
::std::vector<sal_Int32>& _rColMapping);
::osl::Mutex& getMutex() { return m_aMutex; }
@@ -331,7 +331,7 @@ public:
private:
inline void impl_ensureKeySet()
{
- if ( !m_pKeySet.isValid() )
+ if ( !m_pKeySet.is() )
m_pKeySet = new OKeySet();
}
diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
index 018df117c0..67ada8a4ca 100644
--- a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
+++ b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <cppuhelper/implbase1.hxx>
#include <vector>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include "MConnection.hxx"
#include "MTable.hxx"
@@ -46,7 +46,7 @@ namespace connectivity
class OResultSetMetaData : public OResultSetMetaData_BASE
{
::rtl::OUString m_aTableName;
- ::vos::ORef<connectivity::OSQLColumns> m_xColumns;
+ ::rtl::Reference<connectivity::OSQLColumns> m_xColumns;
OTable* m_pTable;
sal_Bool m_bReadOnly;
@@ -55,7 +55,7 @@ namespace connectivity
public:
// ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
// OResultSetMetaData(OConnection* _pConnection) : m_pConnection(_pConnection){}
- OResultSetMetaData(const ::vos::ORef<connectivity::OSQLColumns>& _rxColumns,
+ OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,
const ::rtl::OUString& _aTableName,OTable* _pTable,sal_Bool aReadOnly
)
:m_aTableName(_aTableName)
diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx
index 75c570611e..e00ab8db2a 100644
--- a/connectivity/source/drivers/mozab/MStatement.cxx
+++ b/connectivity/source/drivers/mozab/MStatement.cxx
@@ -147,14 +147,14 @@ void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException )
{
if(m_pParseTree)
{
- ::vos::ORef<connectivity::OSQLColumns> xCreateColumn;
+ ::rtl::Reference<connectivity::OSQLColumns> xCreateColumn;
if (m_pSQLIterator->getStatementType() == SQL_STATEMENT_CREATE_TABLE)
{
const OSQLTables& xTabs = m_pSQLIterator->getTables();
OSL_ENSURE( !xTabs.empty(), "Need a Table");
::rtl::OUString ouTableName=xTabs.begin()->first;
xCreateColumn = m_pSQLIterator->getCreateColumns();
- OSL_ENSURE(xCreateColumn.isValid(), "Need the Columns!!");
+ OSL_ENSURE(xCreateColumn.is(), "Need the Columns!!");
const OColumnAlias& aColumnAlias = m_pConnection->getColumnAlias();
@@ -491,7 +491,7 @@ void OCommonStatement::createColumnMapping()
size_t i;
// initialize the column index map (mapping select columns to table columns)
- ::vos::ORef<connectivity::OSQLColumns> xColumns = m_pSQLIterator->getSelectColumns();
+ ::rtl::Reference<connectivity::OSQLColumns> xColumns = m_pSQLIterator->getSelectColumns();
m_aColMapping.resize(xColumns->get().size() + 1);
for (i=0; i<m_aColMapping.size(); ++i)
m_aColMapping[i] = i;
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index b1e12fde6f..bb3878d352 100644
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -154,6 +154,7 @@ SHL2STDLIBS=\
$(CPPUHELPERLIB) \
$(VOSLIB) \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(DBTOOLSLIB) \
$(COMPHELPERLIB) \
$(MOZ_LIB_XPCOM)
diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk
index 508cbfb6df..a13837224b 100644
--- a/connectivity/source/drivers/odbc/makefile.mk
+++ b/connectivity/source/drivers/odbc/makefile.mk
@@ -64,7 +64,8 @@ SHL1STDLIBS=\
$(ODBCBASELIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(SALLIB)
+ $(SALLIB) \
+ $(SALHELPERLIB)
SHL1IMPLIB= i$(ODBC_TARGET)
diff --git a/connectivity/source/drivers/odbcbase/makefile.mk b/connectivity/source/drivers/odbcbase/makefile.mk
index 798517c8f9..0f83addab9 100644
--- a/connectivity/source/drivers/odbcbase/makefile.mk
+++ b/connectivity/source/drivers/odbcbase/makefile.mk
@@ -67,7 +67,8 @@ SHL1STDLIBS=\
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(VOSLIB) \
- $(SALLIB)
+ $(SALLIB) \
+ $(SALHELPERLIB)
SHL1DEPN=
SHL1IMPLIB= i$(ODBC2_TARGET)
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
index 531f0b02e7..8d3508b3aa 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 c7a7cefd85..920f045aab 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 b714394d29..fcf5d30422 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 4be9678e5a..06d98f28df 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 d8c33bc25f..3b9a5cffeb 100644
--- a/connectivity/source/inc/adabas/BResultSet.hxx
+++ b/connectivity/source/inc/adabas/BResultSet.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 6b4ec5042c..a4a84d078a 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 9e8f0e4e62..5121a61f99 100644
--- a/connectivity/source/inc/adabas/BStatement.hxx
+++ b/connectivity/source/inc/adabas/BStatement.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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,14 +39,14 @@ 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);
virtual void setResultSetType(sal_Int32 _par0) ;
virtual void setUsingBookmarks(sal_Bool _bUseBookmark);
public:
- OAdabasStatement( OAdabasConnection* _pConnection)
+ OAdabasStatement( OAdabasConnection* _pConnection)
: ::connectivity::odbc::OStatement( _pConnection )
,m_pOwnConnection(_pConnection)
{}
diff --git a/connectivity/source/inc/dbase/DIndexPage.hxx b/connectivity/source/inc/dbase/DIndexPage.hxx
index 7e9b5babc2..87dc00dca5 100644
--- a/connectivity/source/inc/dbase/DIndexPage.hxx
+++ b/connectivity/source/inc/dbase/DIndexPage.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -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 cf53848458..bf36e8dad4 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 9b21b42f3e..d11c0465a4 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 ef29ec0196..ab61bf8664 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 928f672944..6845297d78 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 e56dc8c649..44ed3164c7 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 ea64cb0081..ff28397c7d 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 11049767a7..9a186302ce 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);
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index 27b54bc45a..bdbe4bbb6b 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -99,11 +99,11 @@ OParseColumn::OParseColumn( const ::rtl::OUString& _Name,
}
// -------------------------------------------------------------------------
-::vos::ORef< OSQLColumns > OParseColumn::createColumnsForResultSet( const Reference< XResultSetMetaData >& _rxResMetaData,
+::rtl::Reference< OSQLColumns > OParseColumn::createColumnsForResultSet( const Reference< XResultSetMetaData >& _rxResMetaData,
const Reference< XDatabaseMetaData >& _rxDBMetaData,const Reference< XNameAccess>& i_xQueryColumns )
{
sal_Int32 nColumnCount = _rxResMetaData->getColumnCount();
- ::vos::ORef< OSQLColumns > aReturn( new OSQLColumns ); aReturn->get().reserve( nColumnCount );
+ ::rtl::Reference< OSQLColumns > aReturn( new OSQLColumns ); aReturn->get().reserve( nColumnCount );
StringMap aColumnMap;
for ( sal_Int32 i = 1; i <= nColumnCount; ++i )
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 97e9bd9d56..799557a79d 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -329,7 +329,7 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu
// parameters not to be included in the traversal
return;
- ::vos::ORef< OSQLColumns > pSubQueryParameterColumns( new OSQLColumns() );
+ ::rtl::Reference< OSQLColumns > pSubQueryParameterColumns( new OSQLColumns() );
// get the command and the EscapeProcessing properties from the sub query
::rtl::OUString sSubQueryCommand;
@@ -1689,7 +1689,7 @@ OSQLTable OSQLParseTreeIterator::impl_createTableObject( const ::rtl::OUString&
return aReturnTable;
}
//-----------------------------------------------------------------------------
-void OSQLParseTreeIterator::appendColumns(::vos::ORef<OSQLColumns>& _rColumns,const ::rtl::OUString& _rTableAlias,const OSQLTable& _rTable)
+void OSQLParseTreeIterator::appendColumns(::rtl::Reference<OSQLColumns>& _rColumns,const ::rtl::OUString& _rTableAlias,const OSQLTable& _rTable)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::appendColumns" );
@@ -1733,7 +1733,7 @@ void OSQLParseTreeIterator::appendColumns(::vos::ORef<OSQLColumns>& _rColumns,co
}
}
//-----------------------------------------------------------------------------
-void OSQLParseTreeIterator::setSelectColumnName(::vos::ORef<OSQLColumns>& _rColumns,const ::rtl::OUString & rColumnName,const ::rtl::OUString & rColumnAlias, const ::rtl::OUString & rTableRange,sal_Bool bFkt,sal_Int32 _nType,sal_Bool bAggFkt)
+void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const ::rtl::OUString & rColumnName,const ::rtl::OUString & rColumnAlias, const ::rtl::OUString & rTableRange,sal_Bool bFkt,sal_Int32 _nType,sal_Bool bAggFkt)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::setSelectColumnName" );
if(rColumnName.toChar() == '*' && !rTableRange.getLength())
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index c04c8a2f27..f4cafd6c85 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -43,7 +43,6 @@
using namespace com::sun::star::task;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using namespace rtl;
#define DESKTOP_SAVETASKS_MOD 0x1
#define DESKTOP_SAVETASKS_UNMOD 0x2
@@ -57,7 +56,7 @@ namespace desktop
--------------------------------------------------------------------*/
class CommandLineArgs;
class Lockfile;
-class AcceptorMap : public std::map< OUString, Reference<XInitialization> > {};
+class AcceptorMap : public std::map< rtl::OUString, Reference<XInitialization> > {};
struct ConvertData;
class Desktop : public Application
{
@@ -193,9 +192,9 @@ class Desktop : public Application
static sal_Bool isUIOnSessionShutdownAllowed();
// on-demand acceptors
- static void createAcceptor(const OUString& aDescription);
+ static void createAcceptor(const rtl::OUString& aDescription);
static void enableAcceptors();
- static void destroyAcceptor(const OUString& aDescription);
+ static void destroyAcceptor(const rtl::OUString& aDescription);
sal_Bool m_bMinimized;
sal_Bool m_bInvisible;
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 746040e888..187ade718e 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -102,7 +102,7 @@
#include <tools/solar.h>
#include <toolkit/unohlp.hxx>
#include <osl/security.hxx>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/componentcontext.hxx>
#include <comphelper/configurationhelper.hxx>
@@ -163,7 +163,8 @@
#define U2S(STRING) ::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8)
using namespace vos;
-using namespace rtl;
+using rtl::OUString;
+using rtl::OUStringBuffer;
//Gives an ICE with MSVC6
//namespace css = ::com::sun::star;
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index 08f04d1a92..79c3c57934 100644
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.cxx
@@ -72,7 +72,7 @@ OUString Desktop::GetLicensePath()
// determine the filename of the license to show
OUString aLangString;
::com::sun::star::lang::Locale aLocale;
- OString aMgrName = OString("dkt");
+ rtl::OString aMgrName = rtl::OString("dkt");
AllSettings aSettings(Application::GetSettings());
aLocale = aSettings.GetUILocale();
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 333efd58ee..e2c6b48bbd 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -41,7 +41,7 @@
#include <osl/process.h>
#include <osl/diagnose.h>
#include <osl/security.hxx>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <vos/process.hxx>
#include <tools/resmgr.hxx>
@@ -64,7 +64,8 @@
#include "app.hxx"
-using namespace rtl;
+using rtl::OString;
+using rtl::OUString;
using namespace osl;
using namespace utl;
using namespace com::sun::star::container;
diff --git a/editeng/inc/editeng/UnoForbiddenCharsTable.hxx b/editeng/inc/editeng/UnoForbiddenCharsTable.hxx
index afc0bd04e9..3bcf1c8145 100644
--- a/editeng/inc/editeng/UnoForbiddenCharsTable.hxx
+++ b/editeng/inc/editeng/UnoForbiddenCharsTable.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/i18n/XForbiddenCharacters.hpp>
#include <com/sun/star/linguistic2/XSupportedLocales.hpp>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <cppuhelper/implbase2.hxx>
#include "editeng/editengdllapi.h"
@@ -45,10 +45,10 @@ protected:
/** this virtual function is called if the forbidden characters are changed */
virtual void onChange();
- vos::ORef<SvxForbiddenCharactersTable> mxForbiddenChars;
+ rtl::Reference<SvxForbiddenCharactersTable> mxForbiddenChars;
public:
- SvxUnoForbiddenCharsTable(vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars);
+ SvxUnoForbiddenCharsTable(rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars);
~SvxUnoForbiddenCharsTable();
// XForbiddenCharacters
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index a23a03c7bd..49e8a7e5ca 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -64,7 +64,7 @@ class SvxForbiddenCharactersTable;
class SvxNumberFormat;
class FontList;
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <vector>
#include <com/sun/star/uno/Reference.h>
@@ -369,8 +369,8 @@ public:
void SetHyphenator( ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenator >& xHyph );
- void SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars );
- vos::ORef<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const;
+ void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars );
+ rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const;
void SetDefaultLanguage( LanguageType eLang );
LanguageType GetDefaultLanguage() const;
diff --git a/editeng/inc/editeng/forbiddencharacterstable.hxx b/editeng/inc/editeng/forbiddencharacterstable.hxx
index f342ad543b..0ae839a039 100644
--- a/editeng/inc/editeng/forbiddencharacterstable.hxx
+++ b/editeng/inc/editeng/forbiddencharacterstable.hxx
@@ -30,7 +30,7 @@
#include <tools/table.hxx>
-#include <vos/refernce.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/i18n/ForbiddenCharacters.hpp>
#include "editeng/editengdllapi.h"
@@ -50,11 +50,11 @@ struct ForbiddenCharactersInfo
DECLARE_TABLE( SvxForbiddenCharactersTableImpl, ForbiddenCharactersInfo* )
-class EDITENG_DLLPUBLIC SvxForbiddenCharactersTable : public SvxForbiddenCharactersTableImpl, public vos::OReference
+class EDITENG_DLLPUBLIC SvxForbiddenCharactersTable : public SvxForbiddenCharactersTableImpl, public salhelper::SimpleReferenceObject
{
-private:
+private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF;
-
+
public:
SvxForbiddenCharactersTable( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF, USHORT nISize = 4, USHORT nGrow = 4 );
~SvxForbiddenCharactersTable();
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index 3ec6f67f2e..9c81c847a0 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -80,7 +80,7 @@ class SvKeyValueIterator;
class SvxForbiddenCharactersTable;
#include <com/sun/star/uno/Reference.h>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <editeng/svxfont.hxx>
#include <editeng/eedata.hxx>
#include <editeng/paragraphdata.hxx>
@@ -979,8 +979,8 @@ public:
void SetHyphenator( ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenator >& xHyph );
- void SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars );
- vos::ORef<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const;
+ void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars );
+ rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const;
// Depricated
void SetDefaultLanguage( LanguageType eLang );
diff --git a/editeng/inc/editeng/unolingu.hxx b/editeng/inc/editeng/unolingu.hxx
index ed455b2c09..ac017e5a43 100644
--- a/editeng/inc/editeng/unolingu.hxx
+++ b/editeng/inc/editeng/unolingu.hxx
@@ -30,7 +30,6 @@
#include <i18npool/lang.h>
#include <tools/string.hxx>
-#include <vos/refernce.hxx>
#include <com/sun/star/util/Language.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/linguistic2/XLinguServiceManager.hpp>
@@ -74,8 +73,6 @@ class EDITENG_DLLPUBLIC LinguMgr
{
friend class LinguMgrExitLstnr;
- //static ::VOS::ORefCount aRefCount;
-
static ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguServiceManager > xLngSvcMgr;
static ::com::sun::star::uno::Reference<
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index d82ecc6cb6..d33419d809 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -671,6 +671,7 @@
#include "rtl/logfile.hxx"
#include "rtl/math.hxx"
#include "rtl/memory.h"
+#include "rlt/ref.hxx"
#include "rtl/tencinfo.h"
#include "rtl/textenc.h"
#include "rtl/ustrbuf.hxx"
@@ -679,6 +680,7 @@
#include "sal/config.h"
#include "sal/main.h"
#include "sal/types.h"
+#include <salhelper/simplereferenceobject.hxx>
#include "svl/srchdefs.hxx"
#include "sot/clsids.hxx"
#include "sot/exchange.hxx"
@@ -876,8 +878,6 @@
#include "vcl/wall.hxx"
#include "vcl/wintypes.hxx"
#include "vos/mutex.hxx"
-#include "vos/ref.hxx"
-#include "vos/refernce.hxx"
#include "vos/thread.hxx"
#include "vos/xception.hxx"
#include "xmloff/DashStyle.hxx"
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index d10e905321..c6a446362f 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2147,13 +2147,13 @@ void EditEngine::SetHyphenator( Reference< XHyphenator > & xHyph )
pImpEditEngine->SetHyphenator( xHyph );
}
-void EditEngine::SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars )
+void EditEngine::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars )
{
DBG_CHKTHIS( EditEngine, 0 );
pImpEditEngine->SetForbiddenCharsTable( xForbiddenChars );
}
-vos::ORef<SvxForbiddenCharactersTable> EditEngine::GetForbiddenCharsTable() const
+rtl::Reference<SvxForbiddenCharactersTable> EditEngine::GetForbiddenCharsTable() const
{
DBG_CHKTHIS( EditEngine, 0 );
return pImpEditEngine->GetForbiddenCharsTable( FALSE );
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 3976338a3c..c1491b7643 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -185,9 +185,9 @@ SfxPoolItem** GlobalEditData::GetDefItems()
return ppDefItems;
}
-vos::ORef<SvxForbiddenCharactersTable> GlobalEditData::GetForbiddenCharsTable()
+rtl::Reference<SvxForbiddenCharactersTable> GlobalEditData::GetForbiddenCharsTable()
{
- if ( !xForbiddenCharsTable.isValid() )
+ if ( !xForbiddenCharsTable.is() )
{
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
xForbiddenCharsTable = new SvxForbiddenCharactersTable( xMSF );
diff --git a/editeng/source/editeng/eerdll2.hxx b/editeng/source/editeng/eerdll2.hxx
index 5ca92b7e47..cd3e764cb7 100644
--- a/editeng/source/editeng/eerdll2.hxx
+++ b/editeng/source/editeng/eerdll2.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
#include <editeng/forbiddencharacterstable.hxx>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
class SfxPoolItem;
@@ -42,7 +42,7 @@ private:
SfxPoolItem** ppDefItems;
OutputDevice* pStdRefDevice;
- vos::ORef<SvxForbiddenCharactersTable> xForbiddenCharsTable;
+ rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharsTable;
public:
GlobalEditData();
@@ -51,8 +51,8 @@ public:
SfxPoolItem** GetDefItems();
OutputDevice* GetStdRefDevice();
- vos::ORef<SvxForbiddenCharactersTable> GetForbiddenCharsTable();
- void SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars ) { xForbiddenCharsTable = xForbiddenChars; }
+ rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable();
+ void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ) { xForbiddenCharsTable = xForbiddenChars; }
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLanguageGuessing > GetLanguageGuesser();
};
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index c10575e840..399be3766d 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -54,7 +54,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <i18npool/lang.h>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
DBG_NAMEEX( EditView )
DBG_NAMEEX( EditEngine )
@@ -519,7 +519,7 @@ private:
Link maBeginDropHdl;
Link maEndDropHdl;
- vos::ORef<SvxForbiddenCharactersTable> xForbiddenCharsTable;
+ rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharsTable;
// ================================================================
@@ -1021,8 +1021,8 @@ public:
void SetAddExtLeading( BOOL b );
BOOL IsAddExtLeading() const { return bAddExtLeading; }
- vos::ORef<SvxForbiddenCharactersTable> GetForbiddenCharsTable( BOOL bGetInternal = TRUE ) const;
- void SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars );
+ rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable( BOOL bGetInternal = TRUE ) const;
+ void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars );
BOOL mbLastTryMerge;
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 402bc7339c..d610c68dcb 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -4548,15 +4548,15 @@ void ImpEditEngine::IndentBlock( EditView* pEditView, BOOL bRight )
}
}
-vos::ORef<SvxForbiddenCharactersTable> ImpEditEngine::GetForbiddenCharsTable( BOOL bGetInternal ) const
+rtl::Reference<SvxForbiddenCharactersTable> ImpEditEngine::GetForbiddenCharsTable( BOOL bGetInternal ) const
{
- vos::ORef<SvxForbiddenCharactersTable> xF = xForbiddenCharsTable;
- if ( !xF.isValid() && bGetInternal )
+ rtl::Reference<SvxForbiddenCharactersTable> xF = xForbiddenCharsTable;
+ if ( !xF.is() && bGetInternal )
xF = EE_DLL()->GetGlobalData()->GetForbiddenCharsTable();
return xF;
}
-void ImpEditEngine::SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars )
+void ImpEditEngine::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars )
{
EE_DLL()->GetGlobalData()->SetForbiddenCharsTable( xForbiddenChars );
}
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 72f894a42d..cf2428eaba 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -534,13 +534,13 @@ Reference< XSpellChecker1 > Outliner::GetSpeller()
return pEditEngine->GetSpeller();
}
-void Outliner::SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars )
+void Outliner::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->SetForbiddenCharsTable( xForbiddenChars );
}
-vos::ORef<SvxForbiddenCharactersTable> Outliner::GetForbiddenCharsTable() const
+rtl::Reference<SvxForbiddenCharactersTable> Outliner::GetForbiddenCharsTable() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->GetForbiddenCharsTable();
diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx
index 7a6107ea49..59a8831630 100644
--- a/editeng/source/uno/UnoForbiddenCharsTable.cxx
+++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx
@@ -40,10 +40,9 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::i18n;
using namespace ::rtl;
-using namespace ::vos;
using namespace ::cppu;
-SvxUnoForbiddenCharsTable::SvxUnoForbiddenCharsTable(ORef<SvxForbiddenCharactersTable> xForbiddenChars) :
+SvxUnoForbiddenCharsTable::SvxUnoForbiddenCharsTable(::rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars) :
mxForbiddenChars( xForbiddenChars )
{
}
@@ -61,7 +60,7 @@ ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const Loc
{
SolarMutexGuard aGuard;
- if(!mxForbiddenChars.isValid())
+ if(!mxForbiddenChars.is())
throw RuntimeException();
const LanguageType eLang = SvxLocaleToLanguage( rLocale );
@@ -77,7 +76,7 @@ sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const Locale& rLocal
{
SolarMutexGuard aGuard;
- if(!mxForbiddenChars.isValid())
+ if(!mxForbiddenChars.is())
return sal_False;
const LanguageType eLang = SvxLocaleToLanguage( rLocale );
@@ -91,7 +90,7 @@ void SvxUnoForbiddenCharsTable::setForbiddenCharacters(const Locale& rLocale, co
{
SolarMutexGuard aGuard;
- if(!mxForbiddenChars.isValid())
+ if(!mxForbiddenChars.is())
throw RuntimeException();
const LanguageType eLang = SvxLocaleToLanguage( rLocale );
@@ -105,7 +104,7 @@ void SvxUnoForbiddenCharsTable::removeForbiddenCharacters( const Locale& rLocale
{
SolarMutexGuard aGuard;
- if(!mxForbiddenChars.isValid())
+ if(!mxForbiddenChars.is())
throw RuntimeException();
const LanguageType eLang = SvxLocaleToLanguage( rLocale );
@@ -120,7 +119,7 @@ Sequence< Locale > SAL_CALL SvxUnoForbiddenCharsTable::getLocales()
{
SolarMutexGuard aGuard;
- const sal_Int32 nCount = mxForbiddenChars.isValid() ? mxForbiddenChars->Count() : 0;
+ const sal_Int32 nCount = mxForbiddenChars.is() ? mxForbiddenChars->Count() : 0;
Sequence< Locale > aLocales( nCount );
if( nCount )
diff --git a/editeng/util/makefile.mk b/editeng/util/makefile.mk
index a11bde28ae..b1e5675240 100644
--- a/editeng/util/makefile.mk
+++ b/editeng/util/makefile.mk
@@ -77,6 +77,7 @@ SHL1STDLIBS= \
$(CPPULIB) \
$(VOSLIB) \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(ICUUCLIB)
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx
index 9416b2b01e..12ac4fa3a7 100644
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
@@ -55,7 +55,6 @@
// other includes
//_________________________________________________________________________________________________________________
#include <cppuhelper/weakref.hxx>
-#include <vos/ref.hxx>
#include <rtl/ustring.hxx>
#include <vcl/evntpost.hxx>
diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx
index a7296fd95c..ada29414b8 100644
--- a/framework/inc/pch/precompiled_framework.hxx
+++ b/framework/inc/pch/precompiled_framework.hxx
@@ -359,6 +359,7 @@
#include "rtl/instance.hxx"
#include "rtl/logfile.hxx"
#include "rtl/random.h"
+#include "rtl.ref.hxx"
#include "rtl/strbuf.hxx"
#include "rtl/string.h"
#include "rtl/string.hxx"
@@ -370,6 +371,7 @@
#include "sal/alloca.h"
#include "sal/main.h"
+#include "salhelper/simplereferenceobject.hxx"
#include "salhelper/singletonref.hxx"
#include "salhelper/timer.hxx"
@@ -487,7 +489,6 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
-#include "vos/ref.hxx"
#include "vos/thread.hxx"
//---MARKER---
diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx
index 5d1bcf0aca..2ff5c23266 100644
--- a/framework/source/helper/dockingareadefaultacceptor.cxx
+++ b/framework/source/helper/dockingareadefaultacceptor.cxx
@@ -60,7 +60,6 @@ using namespace ::com::sun::star::lang ;
using namespace ::com::sun::star::uno ;
using namespace ::cppu ;
using namespace ::osl ;
-using namespace ::rtl ;
//_________________________________________________________________________________________________________________
// non exported const
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index ed23fd2c4f..760891c888 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -59,9 +59,9 @@ using namespace ::com::sun::star::lang ;
using namespace ::com::sun::star::uno ;
using namespace ::cppu ;
using namespace ::osl ;
-using namespace ::rtl ;
using namespace ::std ;
-using namespace ::vos ;
+
+using rtl::OUString;
//_________________________________________________________________________________________________________________
// non exported const
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 1f6b883ede..1860480941 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -700,6 +700,7 @@
#include "rtl/logfile.hxx"
#include "rtl/math.hxx"
#include "rtl/memory.h"
+#include "rtl/ref.hxx"
#include "rtl/tencinfo.h"
#include "rtl/textenc.h"
#include "rtl/ustrbuf.hxx"
@@ -708,6 +709,7 @@
#include "sal/config.h"
#include "sal/main.h"
#include "sal/types.h"
+#include "salhelper/simplereferenceobject.hxx"
#include "sfx2/bindings.hxx"
#include "sfx2/ctrlitem.hxx"
#include "sfx2/dispatch.hxx"
@@ -943,8 +945,6 @@
#include "vcl/wall.hxx"
#include "vcl/wintypes.hxx"
#include "vos/mutex.hxx"
-#include "vos/ref.hxx"
-#include "vos/refernce.hxx"
#include "vos/xception.hxx"
#include "xmloff/DashStyle.hxx"
#include "xmloff/GradientStyle.hxx"
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index f7633bf6ae..3a590d7507 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -51,7 +51,7 @@ class OutputDevice;
#include <vcl/field.hxx>
#include "svx/svxdllapi.h"
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#if defined(UNX) || defined(WIN) || defined(WNT)
#define DEGREE_CHAR ((sal_Unicode)176) /* 0xB0 = Ansi */
@@ -693,8 +693,8 @@ public:
BOOL isLocked() const { return (BOOL)mbModelLocked; }
void setLock( BOOL bLock );
- void SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars );
- vos::ORef<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const;
+ void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars );
+ rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const;
void SetCharCompressType( UINT16 nType );
UINT16 GetCharCompressType() const { return mnCharCompressType; }
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index aa099b85ca..2a6a05c342 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -74,6 +74,8 @@ using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::accessibility;
+using rtl::OUString;
+
//===== internal ============================================================
/** initialize this component and set default values */
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 9c47bedf61..07028eb4f6 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1972,12 +1972,12 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe
////////////////////////////////////////////////////////////////////////////////////////////////////
-void SdrModel::SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars )
+void SdrModel::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars )
{
if( mpForbiddenCharactersTable )
mpForbiddenCharactersTable->release();
- mpForbiddenCharactersTable = xForbiddenChars.getBodyPtr();
+ mpForbiddenCharactersTable = xForbiddenChars.get();
if( mpForbiddenCharactersTable )
mpForbiddenCharactersTable->acquire();
@@ -1986,7 +1986,7 @@ void SdrModel::SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xF
ImpSetOutlinerDefaults( pHitTestOutliner );
}
-vos::ORef<SvxForbiddenCharactersTable> SdrModel::GetForbiddenCharsTable() const
+rtl::Reference<SvxForbiddenCharactersTable> SdrModel::GetForbiddenCharsTable() const
{
return mpForbiddenCharactersTable;
}
diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk
index 050decc8d4..06e3132f4e 100644
--- a/svx/util/makefile.mk
+++ b/svx/util/makefile.mk
@@ -154,6 +154,7 @@ SHL2STDLIBS= \
$(CPPULIB) \
$(VOSLIB) \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(ICUUCLIB)
.IF "$(GUI)"=="WNT"
diff --git a/ucb/inc/pch/precompiled_ucb.hxx b/ucb/inc/pch/precompiled_ucb.hxx
index 11eaa22214..0928337a8c 100644
--- a/ucb/inc/pch/precompiled_ucb.hxx
+++ b/ucb/inc/pch/precompiled_ucb.hxx
@@ -161,6 +161,7 @@
#include "rtl/alloc.h"
#include "rtl/memory.h"
+#include "rtl/ref.hxx"
#include "rtl/string.hxx"
#include "rtl/ustrbuf.hxx"
#include "rtl/ustring.h"
@@ -177,8 +178,6 @@
#include "osl/diagnose.h"
#include "vos/mutex.hxx"
#include "vos/process.hxx"
-#include "vos/ref.hxx"
-#include "vos/refernce.hxx"
//---MARKER---
#endif
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx
index dcb6a0e064..f0edc22744 100644
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
@@ -28,7 +28,6 @@
#ifndef _CONTENT_HXX
#define _CONTENT_HXX
-#include <vos/ref.hxx>
#include <ucbhelper/contenthelper.hxx>
#include <com/sun/star/io/XInputStream.hpp>
diff --git a/xmlhelp/source/cxxhelp/provider/resultset.cxx b/xmlhelp/source/cxxhelp/provider/resultset.cxx
index e9bd06f995..e232168f06 100644
--- a/xmlhelp/source/cxxhelp/provider/resultset.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultset.cxx
@@ -51,7 +51,7 @@ using namespace chelp;
DynamicResultSet::DynamicResultSet(
const Reference< XMultiServiceFactory >& rxSMgr,
- const vos::ORef< Content >& rxContent,
+ const rtl::Reference< Content >& rxContent,
const OpenCommandArgument2& rCommand,
const Reference< XCommandEnvironment >& rxEnv,
ResultSetFactory* pFactory )
diff --git a/xmlhelp/source/cxxhelp/provider/resultset.hxx b/xmlhelp/source/cxxhelp/provider/resultset.hxx
index b1c0e3b6ce..1d3004b240 100644
--- a/xmlhelp/source/cxxhelp/provider/resultset.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultset.hxx
@@ -29,7 +29,7 @@
#define _RESULTSET_HXX
#include <ucbhelper/resultsethelper.hxx>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include "content.hxx"
@@ -39,7 +39,7 @@ namespace chelp {
class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper
{
- vos::ORef< Content > m_xContent;
+ rtl::Reference< Content > m_xContent;
com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment > m_xEnv;
ResultSetFactory* m_pFactory;
@@ -52,7 +52,7 @@ namespace chelp {
DynamicResultSet(
const com::sun::star::uno::Reference<
com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
- const vos::ORef< Content >& rxContent,
+ const rtl::Reference< Content >& rxContent,
const com::sun::star::ucb::OpenCommandArgument2& rCommand,
const com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment >& rxEnv,
diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx
index 91a199339d..58fc72d3e7 100644
--- a/xmloff/inc/pch/precompiled_xmloff.hxx
+++ b/xmloff/inc/pch/precompiled_xmloff.hxx
@@ -471,8 +471,8 @@
#include "tools/mapunit.hxx"
#include "vos/mutex.hxx"
-#include "vos/ref.hxx"
-#include "vos/refernce.hxx"
+#include "rtl/ref.hxx"
+#include "salhelper/simplereferenceobject.hxx"
#include "xmloff/dllapi.h"
//---MARKER---
diff --git a/xmloff/inc/xmloff/controlpropertyhdl.hxx b/xmloff/inc/xmloff/controlpropertyhdl.hxx
index 7fb75edfc6..81dfb0b4dc 100644
--- a/xmloff/inc/xmloff/controlpropertyhdl.hxx
+++ b/xmloff/inc/xmloff/controlpropertyhdl.hxx
@@ -31,7 +31,7 @@
#include "sal/config.h"
#include "xmloff/dllapi.h"
#include <xmloff/prhdlfac.hxx>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
#include <xmloff/xmlexppr.hxx>
#include <xmloff/XMLConstantsPropertyHandler.hxx>
diff --git a/xmloff/inc/xmloff/formlayerexport.hxx b/xmloff/inc/xmloff/formlayerexport.hxx
index 953c18ede0..bd39b16177 100644
--- a/xmloff/inc/xmloff/formlayerexport.hxx
+++ b/xmloff/inc/xmloff/formlayerexport.hxx
@@ -30,12 +30,12 @@
#include "sal/config.h"
#include "xmloff/dllapi.h"
-#include <vos/refernce.hxx>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/XModel.hpp>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <xmloff/xmlexppr.hxx>
namespace com { namespace sun { namespace star { namespace awt {
@@ -57,7 +57,7 @@ namespace xmloff
/** provides functionallity for exporting a complete form layer.
*/
class XMLOFF_DLLPUBLIC OFormLayerXMLExport
- :public ::vos::OReference
+ :public ::salhelper::SimpleReferenceObject
{
protected:
/// our export context
@@ -166,7 +166,7 @@ namespace xmloff
bool documentContainsXForms() const;
/// retrieves the property mapper for control styles
- ::vos::ORef< SvXMLExportPropertyMapper > getStylePropertyMapper();
+ ::rtl::Reference< SvXMLExportPropertyMapper > getStylePropertyMapper();
/** exports the controls number styles
*/
diff --git a/xmloff/inc/xmloff/formlayerimport.hxx b/xmloff/inc/xmloff/formlayerimport.hxx
index 54e025e5bb..43b4ddd3f0 100644
--- a/xmloff/inc/xmloff/formlayerimport.hxx
+++ b/xmloff/inc/xmloff/formlayerimport.hxx
@@ -30,11 +30,11 @@
#include "sal/config.h"
#include "xmloff/dllapi.h"
-#include <vos/refernce.hxx>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <xmloff/xmlimppr.hxx>
class SvXMLImport;
@@ -54,7 +54,7 @@ namespace xmloff
/** allows you to import a &lt;form:form&gt; element
*/
class XMLOFF_DLLPUBLIC OFormLayerXMLImport
- :public ::vos::OReference
+ :public ::salhelper::SimpleReferenceObject
{
OFormLayerXMLImport_Impl* m_pImpl;
@@ -64,7 +64,7 @@ namespace xmloff
/** retrieves the property mapper form form related auto styles.
*/
- ::vos::ORef< SvXMLImportPropertyMapper >
+ ::rtl::Reference< SvXMLImportPropertyMapper >
getStylePropertyMapper() const;
/** start importing the forms of the given page
diff --git a/xmloff/inc/xmloff/nmspmap.hxx b/xmloff/inc/xmloff/nmspmap.hxx
index a91305e216..e650a2fcb7 100644
--- a/xmloff/inc/xmloff/nmspmap.hxx
+++ b/xmloff/inc/xmloff/nmspmap.hxx
@@ -36,7 +36,7 @@
#ifndef __SGI_STL_MAP
#include <map>
#endif
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <cppuhelper/weak.hxx>
#include <limits.h>
@@ -93,8 +93,8 @@ struct QNamePairEq
};
typedef ::std::hash_map < QNamePair, ::rtl::OUString, QNamePairHash, QNamePairEq > QNameCache;
-typedef ::std::hash_map < ::rtl::OUString, ::vos::ORef <NameSpaceEntry >, rtl::OUStringHash, OUStringEqFunc > NameSpaceHash;
-typedef ::std::map < sal_uInt16, ::vos::ORef < NameSpaceEntry >, uInt32lt > NameSpaceMap;
+typedef ::std::hash_map < ::rtl::OUString, ::rtl::Reference <NameSpaceEntry >, rtl::OUStringHash, OUStringEqFunc > NameSpaceHash;
+typedef ::std::map < sal_uInt16, ::rtl::Reference < NameSpaceEntry >, uInt32lt > NameSpaceMap;
class XMLOFF_DLLPUBLIC SvXMLNamespaceMap
{
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 9ace2a45bb..3e09660c08 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -106,7 +106,7 @@ sal_uInt16 SvXMLNamespaceMap::_Add( const OUString& rPrefix, const OUString &rNa
}
while ( sal_True );
}
- ::vos::ORef<NameSpaceEntry> pEntry(new NameSpaceEntry);
+ ::rtl::Reference<NameSpaceEntry> pEntry(new NameSpaceEntry);
pEntry->sName = rName;
pEntry->nKey = nKey;
pEntry->sPrefix = rPrefix;
@@ -308,7 +308,7 @@ sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName( const OUString& rAttrName,
it = aNameCache.end();
if ( it != aNameCache.end() )
{
- const NameSpaceEntry &rEntry = (*it).second.getBody();
+ const NameSpaceEntry &rEntry = *((*it).second);
if ( pPrefix )
*pPrefix = rEntry.sPrefix;
if ( pLocalName )
@@ -322,7 +322,7 @@ sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName( const OUString& rAttrName,
}
else
{
- vos::ORef<NameSpaceEntry> xEntry(new NameSpaceEntry());
+ rtl::Reference<NameSpaceEntry> xEntry(new NameSpaceEntry());
sal_Int32 nColonPos = rAttrName.indexOf( sal_Unicode(':') );
if( -1L == nColonPos )
@@ -360,7 +360,7 @@ sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName( const OUString& rAttrName,
if (bCache)
{
- typedef std::pair< const rtl::OUString, vos::ORef<NameSpaceEntry> > value_type;
+ typedef std::pair< const rtl::OUString, rtl::Reference<NameSpaceEntry> > value_type;
(void) const_cast<NameSpaceHash*>(&aNameCache)->insert (value_type (rAttrName, xEntry));
}
}
diff --git a/xmloff/source/forms/callbacks.hxx b/xmloff/source/forms/callbacks.hxx
index b0cb120b11..bfd7e2a980 100644
--- a/xmloff/source/forms/callbacks.hxx
+++ b/xmloff/source/forms/callbacks.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/script/ScriptEventDescriptor.hpp>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
class SvXMLImport;
class SvXMLExport;
@@ -53,7 +53,7 @@ namespace xmloff
{
public:
virtual SvXMLExport& getGlobalContext() = 0;
- virtual ::vos::ORef< SvXMLExportPropertyMapper > getStylePropertyMapper() = 0;
+ virtual ::rtl::Reference< SvXMLExportPropertyMapper > getStylePropertyMapper() = 0;
/** steps through a collection and exports all children of this collection
*/
diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx
index a406a6e7c9..b4b1f53465 100644
--- a/xmloff/source/forms/formattributes.hxx
+++ b/xmloff/source/forms/formattributes.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <sal/types.h>
-#include <vos/refernce.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <comphelper/stl_types.hxx>
class SvXMLExport;
diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx
index 66d5ebf234..3d8ef0e911 100644
--- a/xmloff/source/forms/formlayerexport.cxx
+++ b/xmloff/source/forms/formlayerexport.cxx
@@ -94,7 +94,7 @@ namespace xmloff
}
//---------------------------------------------------------------------
- ::vos::ORef< SvXMLExportPropertyMapper > OFormLayerXMLExport::getStylePropertyMapper()
+ ::rtl::Reference< SvXMLExportPropertyMapper > OFormLayerXMLExport::getStylePropertyMapper()
{
return m_pImpl->getStylePropertyMapper();
}
diff --git a/xmloff/source/forms/formlayerimport.cxx b/xmloff/source/forms/formlayerimport.cxx
index 7ecd16bfcb..4217b95ab7 100644
--- a/xmloff/source/forms/formlayerimport.cxx
+++ b/xmloff/source/forms/formlayerimport.cxx
@@ -61,7 +61,7 @@ namespace xmloff
}
//---------------------------------------------------------------------
- ::vos::ORef< SvXMLImportPropertyMapper > OFormLayerXMLImport::getStylePropertyMapper() const
+ ::rtl::Reference< SvXMLImportPropertyMapper > OFormLayerXMLImport::getStylePropertyMapper() const
{
return m_pImpl->getStylePropertyMapper();
}
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index 1a64b4583a..01a60eb7f8 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -100,13 +100,13 @@ namespace xmloff
// add our style family to the export context's style pool
m_xPropertyHandlerFactory = new OControlPropertyHandlerFactory();
- ::vos::ORef< XMLPropertySetMapper > xStylePropertiesMapper = new XMLPropertySetMapper( getControlStylePropertyMap(), m_xPropertyHandlerFactory.getBodyPtr() );
- m_xStyleExportMapper = new OFormComponentStyleExportMapper( xStylePropertiesMapper.getBodyPtr() );
+ ::rtl::Reference< XMLPropertySetMapper > xStylePropertiesMapper = new XMLPropertySetMapper( getControlStylePropertyMap(), m_xPropertyHandlerFactory.get() );
+ m_xStyleExportMapper = new OFormComponentStyleExportMapper( xStylePropertiesMapper.get() );
// our style family
m_rContext.GetAutoStylePool()->AddFamily(
XML_STYLE_FAMILY_CONTROL_ID, token::GetXMLToken(token::XML_PARAGRAPH),
- m_xStyleExportMapper.getBodyPtr(),
+ m_xStyleExportMapper.get(),
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_CONTROL_PREFIX) )
);
@@ -184,7 +184,7 @@ namespace xmloff
}
//---------------------------------------------------------------------
- ::vos::ORef< SvXMLExportPropertyMapper > OFormLayerXMLExport_Impl::getStylePropertyMapper()
+ ::rtl::Reference< SvXMLExportPropertyMapper > OFormLayerXMLExport_Impl::getStylePropertyMapper()
{
return m_xStyleExportMapper;
}
diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx
index 0a2e7c25eb..eb0e04bf8e 100644
--- a/xmloff/source/forms/layerexport.hxx
+++ b/xmloff/source/forms/layerexport.hxx
@@ -34,7 +34,7 @@
#include <com/sun/star/awt/XControlModel.hpp>
#include "callbacks.hxx"
#include "ifacecompare.hxx"
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
class SvXMLExport;
class SvXMLNumFmtExport;
@@ -80,8 +80,8 @@ namespace xmloff
PropertySetBag m_aIgnoreList;
// style handling
- ::vos::ORef< XMLPropertyHandlerFactory > m_xPropertyHandlerFactory;
- ::vos::ORef< SvXMLExportPropertyMapper > m_xStyleExportMapper;
+ ::rtl::Reference< XMLPropertyHandlerFactory > m_xPropertyHandlerFactory;
+ ::rtl::Reference< SvXMLExportPropertyMapper > m_xStyleExportMapper;
// we need our own number formats supplier:
// Controls which have a number formats do not work with the formats supplier of the document they reside
@@ -181,7 +181,7 @@ namespace xmloff
virtual SvXMLExport& getGlobalContext();
virtual ::rtl::OUString getObjectStyleName(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject );
- virtual ::vos::ORef< SvXMLExportPropertyMapper > getStylePropertyMapper();
+ virtual ::rtl::Reference< SvXMLExportPropertyMapper > getStylePropertyMapper();
/** clear any structures which have been build in the recent <method>examine</method> calls.
*/
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index 78a297bda6..7205a87081 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -242,8 +242,8 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter)
// initialize our style map
m_xPropertyHandlerFactory = new OControlPropertyHandlerFactory();
- ::vos::ORef< XMLPropertySetMapper > xStylePropertiesMapper = new XMLPropertySetMapper(getControlStylePropertyMap(), m_xPropertyHandlerFactory.getBodyPtr());
- m_xImportMapper = new SvXMLImportPropertyMapper(xStylePropertiesMapper.getBodyPtr(), _rImporter);
+ ::rtl::Reference< XMLPropertySetMapper > xStylePropertiesMapper = new XMLPropertySetMapper(getControlStylePropertyMap(), m_xPropertyHandlerFactory.get());
+ m_xImportMapper = new SvXMLImportPropertyMapper(xStylePropertiesMapper.get(), _rImporter);
// 'initialize'
m_aCurrentPageIds = m_aControlIds.end();
@@ -419,7 +419,7 @@ void OFormLayerXMLImport_Impl::registerControlReferences(const Reference< XPrope
}
//---------------------------------------------------------------------
-::vos::ORef< SvXMLImportPropertyMapper > OFormLayerXMLImport_Impl::getStylePropertyMapper() const
+::rtl::Reference< SvXMLImportPropertyMapper > OFormLayerXMLImport_Impl::getStylePropertyMapper() const
{
return m_xImportMapper;
}
diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx
index 80a9db78d8..bbd0ae4e83 100644
--- a/xmloff/source/forms/layerimport.hxx
+++ b/xmloff/source/forms/layerimport.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <com/sun/star/form/XFormsSupplier2.hpp>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include "formattributes.hxx"
#include "callbacks.hxx"
#include "eventimport.hxx"
@@ -93,8 +93,8 @@ namespace xmloff
protected:
// style handling
- ::vos::ORef< XMLPropertyHandlerFactory > m_xPropertyHandlerFactory;
- ::vos::ORef< SvXMLImportPropertyMapper > m_xImportMapper;
+ ::rtl::Reference< XMLPropertyHandlerFactory > m_xPropertyHandlerFactory;
+ ::rtl::Reference< SvXMLImportPropertyMapper > m_xImportMapper;
DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, MapString2PropertySet );
DECLARE_STL_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >, MapString2PropertySet, ODrawPageCompare, MapDrawPage2Map);
@@ -170,7 +170,7 @@ namespace xmloff
/** retrieves the property mapper form form related auto styles.
*/
- ::vos::ORef< SvXMLImportPropertyMapper > getStylePropertyMapper() const;
+ ::rtl::Reference< SvXMLImportPropertyMapper > getStylePropertyMapper() const;
/** start importing the forms of the given page
*/
diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx
index 647af830f1..19d013609f 100644
--- a/xmloff/source/forms/propertyimport.hxx
+++ b/xmloff/source/forms/propertyimport.hxx
@@ -30,7 +30,7 @@
#include <xmloff/xmlictxt.hxx>
#include "formattributes.hxx"
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
#include <comphelper/stl_types.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include "layerimport.hxx"
diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx
index e20c5f4ed3..ac67323a80 100644
--- a/xmloff/source/script/xmlscripti.cxx
+++ b/xmloff/source/script/xmlscripti.cxx
@@ -49,6 +49,7 @@ using namespace com::sun::star::document;
using namespace com::sun::star::xml::sax;
using namespace ::xmloff::token;
+using rtl::OUString;
// =============================================================================
// XMLScriptChildContext: context for <office:script> element
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index 1002c414c0..4739d7195e 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -70,6 +70,8 @@ using ::com::sun::star::lang::WrappedTargetException;
using ::com::sun::star::beans::UnknownPropertyException;
using ::com::sun::star::beans::PropertyVetoException;
+using rtl::OUString;
+using rtl::OUStringBuffer;
SvXMLImportPropertyMapper::SvXMLImportPropertyMapper(
const UniReference< XMLPropertySetMapper >& rMapper,
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index f5ecb43dda..7e0dd7f9d5 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -84,6 +84,9 @@ using namespace ::com::sun::star::frame;
using namespace ::xmloff::token;
using namespace ::com::sun::star::io;
+using rtl::OUString;
+using rtl::OUStringBuffer;
+
static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_SYMBOL_TEXT_DISTANCE[] =
"SymbolTextDistance";
static sal_Char __READONLY_DATA XML_UNO_NAME_NRULE_PARENT_NUMBERING[] =
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 0b294c8239..e4a2d09c8d 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -65,6 +65,8 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::xml::sax;
using namespace ::xmloff::token;
+using rtl::OUString;
+
XMLFieldParamImportContext::XMLFieldParamImportContext(
SvXMLImport& rImport,
diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk
index b8745b6b8f..d01fbd829a 100644
--- a/xmloff/util/makefile.mk
+++ b/xmloff/util/makefile.mk
@@ -66,6 +66,7 @@ SHL1STDLIBS= \
$(COMPHELPERLIB)\
$(SVLLIB) \
$(SALLIB) \
+ $(SALHELPERLIB) \
$(UNOTOOLSLIB) \
$(BASEGFXLIB)