summaryrefslogtreecommitdiff
path: root/connectivity/inc/connectivity/sdbcx
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/inc/connectivity/sdbcx')
-rw-r--r--connectivity/inc/connectivity/sdbcx/VCatalog.hxx2
-rw-r--r--connectivity/inc/connectivity/sdbcx/VCollection.hxx42
-rw-r--r--connectivity/inc/connectivity/sdbcx/VColumn.hxx30
-rw-r--r--connectivity/inc/connectivity/sdbcx/VDescriptor.hxx4
-rw-r--r--connectivity/inc/connectivity/sdbcx/VGroup.hxx14
-rw-r--r--connectivity/inc/connectivity/sdbcx/VIndex.hxx10
-rw-r--r--connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx12
-rw-r--r--connectivity/inc/connectivity/sdbcx/VKey.hxx16
-rw-r--r--connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx16
-rw-r--r--connectivity/inc/connectivity/sdbcx/VTable.hxx26
-rw-r--r--connectivity/inc/connectivity/sdbcx/VUser.hxx16
-rw-r--r--connectivity/inc/connectivity/sdbcx/VView.hxx18
12 files changed, 103 insertions, 103 deletions
diff --git a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
index 7004554cc08a..14840400b385 100644
--- a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
@@ -77,7 +77,7 @@ namespace connectivity
@param _xRow
The current row from the resultset given to fillNames.
*/
- virtual ::rtl::OUString buildName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow);
+ virtual OUString buildName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow);
/** fills a vector with the necessary names which can be used in combination with the collections.
For each row buildName will be called.
diff --git a/connectivity/inc/connectivity/sdbcx/VCollection.hxx b/connectivity/inc/connectivity/sdbcx/VCollection.hxx
index 77424f74a3d1..e30075f009e9 100644
--- a/connectivity/inc/connectivity/sdbcx/VCollection.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VCollection.hxx
@@ -66,23 +66,23 @@ namespace connectivity
public:
virtual ~IObjectCollection();
virtual void reserve(size_t nLength) = 0;
- virtual bool exists(const ::rtl::OUString& _sName ) = 0;
+ virtual bool exists(const OUString& _sName ) = 0;
virtual bool empty() = 0;
virtual void swapAll() = 0;
virtual void swap() = 0;
virtual void clear() = 0;
virtual void reFill(const TStringVector &_rVector) = 0;
- virtual void insert(const ::rtl::OUString& _sName,const ObjectType& _xObject) = 0;
- virtual bool rename(const ::rtl::OUString _sOldName,const ::rtl::OUString _sNewName) = 0;
+ virtual void insert(const OUString& _sName,const ObjectType& _xObject) = 0;
+ virtual bool rename(const OUString _sOldName,const OUString _sNewName) = 0;
virtual sal_Int32 size() = 0;
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > getElementNames() = 0;
- virtual ::rtl::OUString getName(sal_Int32 _nIndex) = 0;
+ virtual ::com::sun::star::uno::Sequence< OUString > getElementNames() = 0;
+ virtual OUString getName(sal_Int32 _nIndex) = 0;
virtual void disposeAndErase(sal_Int32 _nIndex) = 0;
virtual void disposeElements() = 0;
- virtual sal_Int32 findColumn( const ::rtl::OUString& columnName ) = 0;
- virtual ::rtl::OUString findColumnAtIndex( sal_Int32 _nIndex) = 0;
+ virtual sal_Int32 findColumn( const OUString& columnName ) = 0;
+ virtual OUString findColumnAtIndex( sal_Int32 _nIndex) = 0;
virtual ObjectType getObject(sal_Int32 _nIndex) = 0;
- virtual ObjectType getObject(const ::rtl::OUString& columnName) = 0;
+ virtual ObjectType getObject(const OUString& columnName) = 0;
virtual void setObject(sal_Int32 _nIndex,const ObjectType& _xObject) = 0;
virtual sal_Bool isCaseSensitive() const = 0;
};
@@ -107,7 +107,7 @@ namespace connectivity
virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) = 0;
// will be called when a object was requested by one of the accessing methods like getByIndex
- virtual ObjectType createObject(const ::rtl::OUString& _rName) = 0;
+ virtual ObjectType createObject(const OUString& _rName) = 0;
// will be called when a new object should be generated by a call of createDataDescriptor
// the returned object is empty will be filled outside and added to the collection
@@ -124,16 +124,16 @@ namespace connectivity
the new object which is to be inserted into the collection. This might be the result
of a call of <code>createObject( _rForName )</code>, or a clone of the descriptor.
*/
- virtual ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
+ virtual ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
// called when XDrop was called
- virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName);
+ virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName);
/** returns the name for the object. The default implementation ask for the property NAME. If this doesn't satisfy, it has to be overloaded.
@param _xObject The object where the name should be extracted.
@return The name of the object.
*/
- virtual ::rtl::OUString getNameForObject(const ObjectType& _xObject);
+ virtual OUString getNameForObject(const ObjectType& _xObject);
/** clones the given descriptor
@@ -160,11 +160,11 @@ namespace connectivity
/** insert a new element into the collection
*/
- void insertElement(const ::rtl::OUString& _sElementName,const ObjectType& _xElement);
+ void insertElement(const OUString& _sElementName,const ObjectType& _xElement);
/** return the name of element at index _nIndex
*/
- inline ::rtl::OUString getElementName(sal_Int32 _nIndex)
+ inline OUString getElementName(sal_Int32 _nIndex)
{
return m_pElements->findColumnAtIndex(_nIndex);
}
@@ -183,7 +183,7 @@ namespace connectivity
void reFill(const TStringVector &_rVector);
inline sal_Bool isCaseSensitive() const { return m_pElements->isCaseSensitive(); }
- void renameObject(const ::rtl::OUString _sOldName,const ::rtl::OUString _sNewName);
+ void renameObject(const OUString _sOldName,const OUString _sNewName);
// only the name is identical to ::cppu::OComponentHelper
virtual void SAL_CALL disposing(void);
@@ -203,9 +203,9 @@ namespace connectivity
virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// ::com::sun::star::container::XNameAccess
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
// XEnumerationAccess
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw(::com::sun::star::uno::RuntimeException);
// ::com::sun::star::util::XRefreshable
@@ -217,15 +217,15 @@ namespace connectivity
// XAppend
virtual void SAL_CALL appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
// XDrop
- virtual void SAL_CALL dropByName( const ::rtl::OUString& elementName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL dropByName( const OUString& elementName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
// XColumnLocate
- virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
// ::com::sun::star::container::XContainer
virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
private:
- void notifyElementRemoved(const ::rtl::OUString& _sName);
+ void notifyElementRemoved(const OUString& _sName);
void disposeElements();
void dropImpl(sal_Int32 _nIndex,sal_Bool _bReallyDrop = sal_True);
};
diff --git a/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
index ca7a0bcc0b1c..42cddc51c041 100644
--- a/connectivity/inc/connectivity/sdbcx/VColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
@@ -50,9 +50,9 @@ namespace connectivity
public ODescriptor
{
protected:
- ::rtl::OUString m_TypeName;
- ::rtl::OUString m_Description;
- ::rtl::OUString m_DefaultValue;
+ OUString m_TypeName;
+ OUString m_Description;
+ OUString m_DefaultValue;
sal_Int32 m_IsNullable;
sal_Int32 m_Precision;
@@ -63,9 +63,9 @@ namespace connectivity
sal_Bool m_IsRowVersion;
sal_Bool m_IsCurrency;
- ::rtl::OUString m_CatalogName;
- ::rtl::OUString m_SchemaName;
- ::rtl::OUString m_TableName;
+ OUString m_CatalogName;
+ OUString m_SchemaName;
+ OUString m_TableName;
using OColumnDescriptor_BASE::rBHelper;
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const;
@@ -77,10 +77,10 @@ namespace connectivity
virtual void SAL_CALL release() throw();
OColumn( sal_Bool _bCase);
- OColumn( const ::rtl::OUString& _Name,
- const ::rtl::OUString& _TypeName,
- const ::rtl::OUString& _DefaultValue,
- const ::rtl::OUString& _Description,
+ OColumn( const OUString& _Name,
+ const OUString& _TypeName,
+ const OUString& _DefaultValue,
+ const OUString& _Description,
sal_Int32 _IsNullable,
sal_Int32 _Precision,
sal_Int32 _Scale,
@@ -89,9 +89,9 @@ namespace connectivity
sal_Bool _IsRowVersion,
sal_Bool _IsCurrency,
sal_Bool _bCase,
- const ::rtl::OUString& _CatalogName,
- const ::rtl::OUString& _SchemaName,
- const ::rtl::OUString& _TableName);
+ const OUString& _CatalogName,
+ const OUString& _SchemaName,
+ const OUString& _TableName);
DECLARE_SERVICE_INFO();
//XInterface
@@ -105,8 +105,8 @@ namespace connectivity
// XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
// XNamed
- virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
// XDataDescriptorFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException);
};
diff --git a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
index 12f0e4b0cfbd..aa04b5229ac9 100644
--- a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
@@ -41,7 +41,7 @@ namespace connectivity
,public ::com::sun::star::lang::XUnoTunnel
{
protected:
- ::rtl::OUString m_Name;
+ OUString m_Name;
/** helper for derived classes to implement OPropertyArrayUsageHelper::createArrayHelper
@@ -74,7 +74,7 @@ namespace connectivity
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException);
// compare
- inline sal_Bool operator == ( const ::rtl::OUString & _rRH )
+ inline sal_Bool operator == ( const OUString & _rRH )
{
return m_aCase(m_Name,_rRH);
}
diff --git a/connectivity/inc/connectivity/sdbcx/VGroup.hxx b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
index 139c6240797d..6e4ba2355d62 100644
--- a/connectivity/inc/connectivity/sdbcx/VGroup.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
@@ -65,7 +65,7 @@ namespace connectivity
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
public:
OGroup(sal_Bool _bCase);
- OGroup( const ::rtl::OUString& _Name,sal_Bool _bCase);
+ OGroup( const OUString& _Name,sal_Bool _bCase);
virtual ~OGroup();
DECLARE_SERVICE_INFO();
@@ -85,14 +85,14 @@ namespace connectivity
// XUsersSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getUsers( ) throw(::com::sun::star::uno::RuntimeException);
// XAuthorizable
- virtual sal_Int32 SAL_CALL getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
// XNamed
- virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
};
}
}
diff --git a/connectivity/inc/connectivity/sdbcx/VIndex.hxx b/connectivity/inc/connectivity/sdbcx/VIndex.hxx
index 6fddc6c374ba..3e50ddf9459c 100644
--- a/connectivity/inc/connectivity/sdbcx/VIndex.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VIndex.hxx
@@ -52,7 +52,7 @@ namespace connectivity
public OIndex_BASE
{
protected:
- ::rtl::OUString m_Catalog;
+ OUString m_Catalog;
sal_Bool m_IsUnique;
sal_Bool m_IsPrimaryKeyIndex;
sal_Bool m_IsClustered;
@@ -66,8 +66,8 @@ namespace connectivity
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
OIndex(sal_Bool _bCase);
- OIndex( const ::rtl::OUString& _Name,
- const ::rtl::OUString& _Catalog,
+ OIndex( const OUString& _Name,
+ const OUString& _Catalog,
sal_Bool _isUnique,
sal_Bool _isPrimaryKeyIndex,
sal_Bool _isClustered,
@@ -93,8 +93,8 @@ namespace connectivity
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException);
// XNamed
- virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
// XDataDescriptorFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException);
};
diff --git a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
index bdccd128f172..a4de9e6bf5bd 100644
--- a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
@@ -40,9 +40,9 @@ namespace connectivity
public:
OIndexColumn( sal_Bool _bCase);
OIndexColumn( sal_Bool _IsAscending,
- const ::rtl::OUString& _Name,
- const ::rtl::OUString& _TypeName,
- const ::rtl::OUString& _DefaultValue,
+ const OUString& _Name,
+ const OUString& _TypeName,
+ const OUString& _DefaultValue,
sal_Int32 _IsNullable,
sal_Int32 _Precision,
sal_Int32 _Scale,
@@ -51,9 +51,9 @@ namespace connectivity
sal_Bool _IsRowVersion,
sal_Bool _IsCurrency,
sal_Bool _bCase,
- const ::rtl::OUString& _CatalogName,
- const ::rtl::OUString& _SchemaName,
- const ::rtl::OUString& _TableName);
+ const OUString& _CatalogName,
+ const OUString& _SchemaName,
+ const OUString& _TableName);
virtual void construct();
DECLARE_SERVICE_INFO();
diff --git a/connectivity/inc/connectivity/sdbcx/VKey.hxx b/connectivity/inc/connectivity/sdbcx/VKey.hxx
index eb95420e35f0..24d85dfb2614 100644
--- a/connectivity/inc/connectivity/sdbcx/VKey.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VKey.hxx
@@ -40,12 +40,12 @@ namespace connectivity
struct OOO_DLLPUBLIC_DBTOOLS KeyProperties
{
- ::std::vector< ::rtl::OUString> m_aKeyColumnNames;
- ::rtl::OUString m_ReferencedTable;
+ ::std::vector< OUString> m_aKeyColumnNames;
+ OUString m_ReferencedTable;
sal_Int32 m_Type;
sal_Int32 m_UpdateRule;
sal_Int32 m_DeleteRule;
- KeyProperties(const ::rtl::OUString& _ReferencedTable,
+ KeyProperties(const OUString& _ReferencedTable,
sal_Int32 _Type,
sal_Int32 _UpdateRule,
sal_Int32 _DeleteRule)
@@ -79,9 +79,9 @@ namespace connectivity
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
public:
OKey(sal_Bool _bCase);
- OKey(const ::rtl::OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase);
- /*OKey( const ::rtl::OUString& _Name,
- const ::rtl::OUString& _ReferencedTable,
+ OKey(const OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase);
+ /*OKey( const OUString& _Name,
+ const OUString& _ReferencedTable,
sal_Int32 _Type,
sal_Int32 _UpdateRule,
sal_Int32 _DeleteRule,
@@ -107,8 +107,8 @@ namespace connectivity
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException);
// XNamed
- virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
// XDataDescriptorFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException);
};
diff --git a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
index b3624bd69a3a..b22ea3247941 100644
--- a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
@@ -34,15 +34,15 @@ namespace connectivity
public OColumn, public OKeyColumn_PROP
{
protected:
- ::rtl::OUString m_ReferencedColumn;
+ OUString m_ReferencedColumn;
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
OKeyColumn(sal_Bool _bCase);
- OKeyColumn( const ::rtl::OUString& _ReferencedColumn,
- const ::rtl::OUString& _Name,
- const ::rtl::OUString& _TypeName,
- const ::rtl::OUString& _DefaultValue,
+ OKeyColumn( const OUString& _ReferencedColumn,
+ const OUString& _Name,
+ const OUString& _TypeName,
+ const OUString& _DefaultValue,
sal_Int32 _IsNullable,
sal_Int32 _Precision,
sal_Int32 _Scale,
@@ -51,9 +51,9 @@ namespace connectivity
sal_Bool _IsRowVersion,
sal_Bool _IsCurrency,
sal_Bool _bCase,
- const ::rtl::OUString& _CatalogName,
- const ::rtl::OUString& _SchemaName,
- const ::rtl::OUString& _TableName);
+ const OUString& _CatalogName,
+ const OUString& _SchemaName,
+ const OUString& _TableName);
// just to make it not inline
virtual ~OKeyColumn();
diff --git a/connectivity/inc/connectivity/sdbcx/VTable.hxx b/connectivity/inc/connectivity/sdbcx/VTable.hxx
index 47d589578e68..0be41a9cd22f 100644
--- a/connectivity/inc/connectivity/sdbcx/VTable.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VTable.hxx
@@ -67,10 +67,10 @@ namespace connectivity
public ODescriptor
{
protected:
- ::rtl::OUString m_CatalogName;
- ::rtl::OUString m_SchemaName;
- ::rtl::OUString m_Description;
- ::rtl::OUString m_Type;
+ OUString m_CatalogName;
+ OUString m_SchemaName;
+ OUString m_Description;
+ OUString m_Type;
OCollection* m_pKeys;
OCollection* m_pColumns;
@@ -88,11 +88,11 @@ namespace connectivity
sal_Bool _bCase);
OTable( OCollection* _pTables,
sal_Bool _bCase,
- const ::rtl::OUString& _Name,
- const ::rtl::OUString& _Type,
- const ::rtl::OUString& _Description = ::rtl::OUString(),
- const ::rtl::OUString& _SchemaName = ::rtl::OUString(),
- const ::rtl::OUString& _CatalogName = ::rtl::OUString());
+ const OUString& _Name,
+ const OUString& _Type,
+ const OUString& _Description = OUString(),
+ const OUString& _SchemaName = OUString(),
+ const OUString& _CatalogName = OUString());
virtual ~OTable();
@@ -118,16 +118,16 @@ namespace connectivity
// XKeysSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getKeys( ) throw(::com::sun::star::uno::RuntimeException);
// XNamed
- virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
// XDataDescriptorFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( void ) throw(::com::sun::star::uno::RuntimeException);
// XIndexesSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getIndexes( ) throw(::com::sun::star::uno::RuntimeException);
// XRename
- virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
// XAlterTable
- virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL alterColumnByName( const OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
// helper method
diff --git a/connectivity/inc/connectivity/sdbcx/VUser.hxx b/connectivity/inc/connectivity/sdbcx/VUser.hxx
index d953d6a2b714..01bafc0d177c 100644
--- a/connectivity/inc/connectivity/sdbcx/VUser.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VUser.hxx
@@ -62,7 +62,7 @@ namespace connectivity
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
public:
OUser(sal_Bool _bCase);
- OUser(const ::rtl::OUString& _Name,sal_Bool _bCase);
+ OUser(const OUString& _Name,sal_Bool _bCase);
virtual ~OUser( );
@@ -79,18 +79,18 @@ namespace connectivity
// XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
// XUser
- virtual void SAL_CALL changePassword( const ::rtl::OUString& objPassword, const ::rtl::OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
// XAuthorizable
- virtual sal_Int32 SAL_CALL getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
// XGroupsSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getGroups( ) throw(::com::sun::star::uno::RuntimeException);
// XNamed
- virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
};
}
}
diff --git a/connectivity/inc/connectivity/sdbcx/VView.hxx b/connectivity/inc/connectivity/sdbcx/VView.hxx
index 1772ac3acf1b..6134ddc4bb69 100644
--- a/connectivity/inc/connectivity/sdbcx/VView.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VView.hxx
@@ -50,9 +50,9 @@ namespace connectivity
public ODescriptor
{
protected:
- ::rtl::OUString m_CatalogName;
- ::rtl::OUString m_SchemaName;
- ::rtl::OUString m_Command;
+ OUString m_CatalogName;
+ OUString m_SchemaName;
+ OUString m_Command;
sal_Int32 m_CheckOption;
// need for the getName method
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
@@ -67,12 +67,12 @@ namespace connectivity
OView(sal_Bool _bCase,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData);
OView( sal_Bool _bCase,
- const ::rtl::OUString& _rName,
+ const OUString& _rName,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData,
sal_Int32 _nCheckOption = 0,
- const ::rtl::OUString& _rCommand = ::rtl::OUString(),
- const ::rtl::OUString& _rSchemaName = ::rtl::OUString(),
- const ::rtl::OUString& _rCatalogName = ::rtl::OUString());
+ const OUString& _rCommand = OUString(),
+ const OUString& _rSchemaName = OUString(),
+ const OUString& _rCatalogName = OUString());
virtual ~OView();
// ODescriptor
@@ -90,8 +90,8 @@ namespace connectivity
// XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
// XNamed
- virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setName( const ::rtl::OUString& ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setName( const OUString& ) throw(::com::sun::star::uno::RuntimeException);
};
}
}