summaryrefslogtreecommitdiff
path: root/connectivity/source/inc/mysql
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/inc/mysql')
-rw-r--r--connectivity/source/inc/mysql/YCatalog.hxx12
-rw-r--r--connectivity/source/inc/mysql/YColumns.hxx4
-rw-r--r--connectivity/source/inc/mysql/YDriver.hxx46
-rw-r--r--connectivity/source/inc/mysql/YTable.hxx14
-rw-r--r--connectivity/source/inc/mysql/YTables.hxx14
-rw-r--r--connectivity/source/inc/mysql/YUser.hxx20
-rw-r--r--connectivity/source/inc/mysql/YUsers.hxx10
-rw-r--r--connectivity/source/inc/mysql/YViews.hxx12
8 files changed, 66 insertions, 66 deletions
diff --git a/connectivity/source/inc/mysql/YCatalog.hxx b/connectivity/source/inc/mysql/YCatalog.hxx
index e90928500604..ea30a1175490 100644
--- a/connectivity/source/inc/mysql/YCatalog.hxx
+++ b/connectivity/source/inc/mysql/YCatalog.hxx
@@ -30,7 +30,7 @@ namespace connectivity
// some compilers have problems with this task as I noticed on windows
class OMySQLCatalog : public connectivity::sdbcx::OCatalog
{
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
+ css::uno::Reference< css::sdbc::XConnection > m_xConnection;
/** calls XDatabaseMetaData::getTables.
@param _sKindOfObject
@@ -38,7 +38,7 @@ namespace connectivity
@param _rNames
The container for the names to be filled. <OUT/>
*/
- void refreshObjects(const ::com::sun::star::uno::Sequence< OUString >& _sKindOfObject,TStringVector& _rNames);
+ void refreshObjects(const css::uno::Sequence< OUString >& _sKindOfObject,TStringVector& _rNames);
public:
// implementation of the pure virtual methods
@@ -48,15 +48,15 @@ namespace connectivity
virtual void refreshUsers() override ;
public:
- OMySQLCatalog(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection);
+ OMySQLCatalog(const css::uno::Reference< css::sdbc::XConnection >& _xConnection);
inline sdbcx::OCollection* getPrivateTables() const { return m_pTables;}
inline sdbcx::OCollection* getPrivateViews() const { return m_pViews; }
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& getConnection() const { return m_xConnection; }
+ const css::uno::Reference< css::sdbc::XConnection >& getConnection() const { return m_xConnection; }
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
// ::cppu::OComponentHelper
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
};
}
}
diff --git a/connectivity/source/inc/mysql/YColumns.hxx b/connectivity/source/inc/mysql/YColumns.hxx
index db5f1059d2df..3d11514c36d5 100644
--- a/connectivity/source/inc/mysql/YColumns.hxx
+++ b/connectivity/source/inc/mysql/YColumns.hxx
@@ -28,7 +28,7 @@ namespace connectivity
class OMySQLColumns : public OColumnsHelper
{
protected:
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() override;
+ virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
public:
OMySQLColumns( ::cppu::OWeakObject& _rParent
,::osl::Mutex& _rMutex
@@ -52,7 +52,7 @@ namespace connectivity
OMySQLColumn();
virtual void construct() override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override;
};
}
}
diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx
index 13403de61803..d0a9aeab214d 100644
--- a/connectivity/source/inc/mysql/YDriver.hxx
+++ b/connectivity/source/inc/mysql/YDriver.hxx
@@ -42,17 +42,17 @@ namespace connectivity
namespace mysql
{
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ODriverDelegator_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxMSF) throw( ::com::sun::star::uno::Exception );
+ css::uno::Reference< css::uno::XInterface > SAL_CALL ODriverDelegator_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxMSF) throw( css::uno::Exception );
- typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver
- , ::com::sun::star::sdbcx::XDataDefinitionSupplier
- , ::com::sun::star::lang::XServiceInfo
+ typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver
+ , css::sdbcx::XDataDefinitionSupplier
+ , css::lang::XServiceInfo
> ODriverDelegator_BASE;
- typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,OMetaConnection*> TWeakConnectionPair;
- typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair;
+ typedef ::std::pair< css::uno::WeakReferenceHelper,OMetaConnection*> TWeakConnectionPair;
+ typedef ::std::pair< css::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair;
typedef ::std::vector< TWeakPair > TWeakPairVector;
- typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > > TJDBCDrivers;
+ typedef std::map< OUString, css::uno::Reference< css::sdbc::XDriver > > TJDBCDrivers;
/** delegates all calls to the orignal driver and extend the existing one with the SDBCX layer.
@@ -60,13 +60,13 @@ namespace connectivity
class ODriverDelegator : public ::comphelper::OBaseMutex
,public ODriverDelegator_BASE
{
- TJDBCDrivers m_aJdbcDrivers; // all jdbc drivers
- TWeakPairVector m_aConnections; // vector containing a list
+ TJDBCDrivers m_aJdbcDrivers; // all jdbc drivers
+ TWeakPairVector m_aConnections; // vector containing a list
// of all the Connection objects
// for this Driver
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xODBCDriver;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xNativeDriver;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::sdbc::XDriver > m_xODBCDriver;
+ css::uno::Reference< css::sdbc::XDriver > m_xNativeDriver;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
/** load the driver we want to delegate.
The <member>m_xODBCDriver</member> or <member>m_xDBCDriver</member> may be <NULL/> if the driver could not be loaded.
@@ -77,28 +77,28 @@ namespace connectivity
@return
The driver which was currently selected.
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > loadDriver( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info );
+ css::uno::Reference< css::sdbc::XDriver > loadDriver( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info );
public:
/** creates a new delegator for a mysql driver
*/
- ODriverDelegator(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext);
+ ODriverDelegator(const css::uno::Reference< css::uno::XComponentContext >& _rxContext);
// XServiceInfo
DECLARE_SERVICE_INFO();
- static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException);
- static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException);
+ static OUString getImplementationName_Static( ) throw(css::uno::RuntimeException);
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException);
// XDriver
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getMajorVersion( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getMajorVersion( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (css::uno::RuntimeException, std::exception) override;
// XDataDefinitionSupplier
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& connection ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const css::uno::Reference< css::sdbc::XConnection >& connection ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
protected:
/// dtor
virtual ~ODriverDelegator();
diff --git a/connectivity/source/inc/mysql/YTable.hxx b/connectivity/source/inc/mysql/YTable.hxx
index eb912b043c0d..a8055e60e62e 100644
--- a/connectivity/source/inc/mysql/YTable.hxx
+++ b/connectivity/source/inc/mysql/YTable.hxx
@@ -82,9 +82,9 @@ namespace connectivity
public:
OMySQLTable( sdbcx::OCollection* _pTables,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection);
+ const css::uno::Reference< css::sdbc::XConnection >& _xConnection);
OMySQLTable( sdbcx::OCollection* _pTables,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
+ const css::uno::Reference< css::sdbc::XConnection >& _xConnection,
const OUString& Name,
const OUString& Type,
const OUString& Description = OUString(),
@@ -95,18 +95,18 @@ namespace connectivity
// ODescriptor
virtual void construct() override;
- // com::sun::star::lang::XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
+ // css::lang::XUnoTunnel
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+ static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
// XAlterTable
- 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, std::exception) override;
+ virtual void SAL_CALL alterColumnByName( const OUString& colName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
/** returns the ALTER TABLE XXX statement
*/
OUString getAlterTableColumnPart();
// some methods to alter table structures
- void alterColumnType(sal_Int32 nNewType,const OUString& _rColName,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDescriptor);
+ void alterColumnType(sal_Int32 nNewType,const OUString& _rColName,const css::uno::Reference< css::beans::XPropertySet >& _xDescriptor);
void alterDefaultValue(const OUString& _sNewDefault,const OUString& _rColName);
void dropDefaultValue(const OUString& _sNewDefault);
diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx
index b1e246e597c9..d3a2824dbbe5 100644
--- a/connectivity/source/inc/mysql/YTables.hxx
+++ b/connectivity/source/inc/mysql/YTables.hxx
@@ -29,19 +29,19 @@ namespace connectivity
class OTables : public sdbcx::OCollection,
public ::dbtools::ISQLStatementHelper
{
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
+ css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData;
protected:
virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
- virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() override;
- virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) override;
+ virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+ virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
+ virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override;
- void createTable( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
+ void createTable( const css::uno::Reference< css::beans::XPropertySet >& descriptor );
virtual OUString getNameForObject(const sdbcx::ObjectType& _xObject) override;
public:
- OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
+ OTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
const TStringVector &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector)
,m_xMetaData(_rMetaData)
{}
@@ -58,7 +58,7 @@ namespace connectivity
static OUString adjustSQL(const OUString& _sSql);
// ISQLStatementHelper
- virtual void addComment(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,OUStringBuffer& _rOut) override;
+ virtual void addComment(const css::uno::Reference< css::beans::XPropertySet >& descriptor,OUStringBuffer& _rOut) override;
};
}
}
diff --git a/connectivity/source/inc/mysql/YUser.hxx b/connectivity/source/inc/mysql/YUser.hxx
index b638dcdc48b2..a527f85bc403 100644
--- a/connectivity/source/inc/mysql/YUser.hxx
+++ b/connectivity/source/inc/mysql/YUser.hxx
@@ -31,24 +31,24 @@ namespace connectivity
class OMySQLUser : public OUser_TYPEDEF
{
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
+ css::uno::Reference< css::sdbc::XConnection > m_xConnection;
static OUString getPrivilegeString(sal_Int32 nRights);
// return the privileges and additional the grant rights
- void findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ void findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(css::sdbc::SQLException, css::uno::RuntimeException);
public:
virtual void refreshGroups() override;
public:
- OMySQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection);
- OMySQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const OUString& Name);
+ OMySQLUser( const css::uno::Reference< css::sdbc::XConnection >& _xConnection);
+ OMySQLUser( const css::uno::Reference< css::sdbc::XConnection >& _xConnection,const OUString& Name);
// XUser
- virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
// XAuthorizable
- virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- 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, std::exception) override;
- 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, std::exception) override;
+ virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
};
class OUserExtend;
@@ -64,7 +64,7 @@ namespace connectivity
// OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
public:
- OUserExtend(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection);
+ OUserExtend(const css::uno::Reference< css::sdbc::XConnection >& _xConnection);
virtual void construct() override;
};
diff --git a/connectivity/source/inc/mysql/YUsers.hxx b/connectivity/source/inc/mysql/YUsers.hxx
index 153ad7552722..fb16d9e1ca02 100644
--- a/connectivity/source/inc/mysql/YUsers.hxx
+++ b/connectivity/source/inc/mysql/YUsers.hxx
@@ -32,19 +32,19 @@ namespace connectivity
{
class OUsers : public sdbcx::OCollection
{
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
+ css::uno::Reference< css::sdbc::XConnection > m_xConnection;
connectivity::sdbcx::IRefreshableUsers* m_pParent;
public:
virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() override;
- virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) override;
- virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) override;
+ virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
+ virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+ virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override;
public:
OUsers( ::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
const TStringVector &_rVector,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
+ const css::uno::Reference< css::sdbc::XConnection >& _xConnection,
connectivity::sdbcx::IRefreshableUsers* _pParent);
};
}
diff --git a/connectivity/source/inc/mysql/YViews.hxx b/connectivity/source/inc/mysql/YViews.hxx
index 024f9c569406..3daf2e2e09e9 100644
--- a/connectivity/source/inc/mysql/YViews.hxx
+++ b/connectivity/source/inc/mysql/YViews.hxx
@@ -27,19 +27,19 @@ namespace connectivity
{
class OViews : public sdbcx::OCollection
{
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
+ css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData;
bool m_bInDrop;
// OCatalog* m_pParent;
protected:
virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
- virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor() override;
- virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) override;
+ virtual void impl_refresh() throw(css::uno::RuntimeException) override;
+ virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
+ virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override;
- void createView( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
+ void createView( const css::uno::Reference< css::beans::XPropertySet >& descriptor );
public:
- OViews(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
+ OViews(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
const TStringVector &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector)
,m_xMetaData(_rMetaData)
,m_bInDrop(false)