diff options
author | Noel Grandin <noel@peralex.com> | 2016-05-27 12:31:29 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-30 08:37:11 +0000 |
commit | a52231c78526e14977d2129fa1abe812de567f03 (patch) | |
tree | 8d38fd537ebb43a72b41f4b838bc0effb9d05769 /connectivity/source/sdbcx | |
parent | a499d1b980be1eb2bd6ccfa07b1d87c02fcb1343 (diff) |
com::sun::star->css in connectivity
Change-Id: I9489e92dc89a6d83a26ff4f0d9aad26acd28ad9f
Reviewed-on: https://gerrit.libreoffice.org/25537
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'connectivity/source/sdbcx')
-rw-r--r-- | connectivity/source/sdbcx/VCatalog.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VColumn.cxx | 14 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VDescriptor.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VGroup.cxx | 14 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VIndex.cxx | 16 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VIndexColumn.cxx | 8 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VKey.cxx | 16 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VKeyColumn.cxx | 8 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VTable.cxx | 16 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VUser.cxx | 16 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VView.cxx | 10 |
11 files changed, 61 insertions, 61 deletions
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx index 4069b3352b68..459ee220a96a 100644 --- a/connectivity/source/sdbcx/VCatalog.cxx +++ b/connectivity/source/sdbcx/VCatalog.cxx @@ -219,7 +219,7 @@ void OCatalog::fillNames(Reference< XResultSet >& _xResult,TStringVector& _rName void ODescriptor::construct() { - sal_Int32 nAttrib = isNew() ? 0 : ::com::sun::star::beans::PropertyAttribute::READONLY; + sal_Int32 nAttrib = isNew() ? 0 : css::beans::PropertyAttribute::READONLY; registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME), PROPERTY_ID_NAME ,nAttrib,&m_Name,::cppu::UnoType<OUString>::get()); } diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx index 6be396b643d9..f5e46fa637ae 100644 --- a/connectivity/source/sdbcx/VColumn.cxx +++ b/connectivity/source/sdbcx/VColumn.cxx @@ -33,16 +33,16 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; -OUString SAL_CALL OColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OColumn::getImplementationName( ) throw (css::uno::RuntimeException, std::exception) { if(isNew()) return OUString("com.sun.star.sdbcx.VColumnDescription"); return OUString("com.sun.star.sdbcx.VColumn"); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL OColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL OColumn::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Sequence< OUString > aSupported(1); + css::uno::Sequence< OUString > aSupported(1); if(isNew()) aSupported[0] = "com.sun.star.sdbcx.ColumnDescription"; else @@ -51,7 +51,7 @@ OUString SAL_CALL OColumn::getImplementationName( ) throw (::com::sun::star::un return aSupported; } -sal_Bool SAL_CALL OColumn::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OColumn::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } @@ -206,18 +206,18 @@ Reference< XPropertySet > SAL_CALL OColumn::createDataDescriptor( ) throw(Runti return pNewColumn; } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OColumn::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OColumn::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } // XNamed -OUString SAL_CALL OColumn::getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OColumn::getName( ) throw(css::uno::RuntimeException, std::exception) { return m_Name; } -void SAL_CALL OColumn::setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OColumn::setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) { m_Name = aName; } diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx index 7874bfecfab4..62b58e072756 100644 --- a/connectivity/source/sdbcx/VDescriptor.cxx +++ b/connectivity/source/sdbcx/VDescriptor.cxx @@ -44,7 +44,7 @@ namespace connectivity } - // com::sun::star::lang::XUnoTunnel + // css::lang::XUnoTunnel sal_Int64 SAL_CALL ODescriptor::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx index 0e8b5ab2e643..21ac50470a2c 100644 --- a/connectivity/source/sdbcx/VGroup.cxx +++ b/connectivity/source/sdbcx/VGroup.cxx @@ -112,7 +112,7 @@ Reference< XNameAccess > SAL_CALL OGroup::getUsers( ) throw(RuntimeException, s } -sal_Int32 SAL_CALL OGroup::getPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OGroup::getPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OGroup_BASE::rBHelper.bDisposed); @@ -120,7 +120,7 @@ sal_Int32 SAL_CALL OGroup::getPrivileges( const OUString& /*objName*/, sal_Int32 return 0; } -sal_Int32 SAL_CALL OGroup::getGrantablePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OGroup::getGrantablePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OGroup_BASE::rBHelper.bDisposed); @@ -128,31 +128,31 @@ sal_Int32 SAL_CALL OGroup::getGrantablePrivileges( const OUString& /*objName*/, return 0; } -void SAL_CALL OGroup::grantPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) +void SAL_CALL OGroup::grantPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OGroup_BASE::rBHelper.bDisposed); throwFeatureNotImplementedSQLException( "XAuthorizable::grantPrivileges", *this ); } -void SAL_CALL OGroup::revokePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) +void SAL_CALL OGroup::revokePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OGroup_BASE::rBHelper.bDisposed); throwFeatureNotImplementedSQLException( "XAuthorizable::revokePrivileges", *this ); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OGroup::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OGroup::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -OUString SAL_CALL OGroup::getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OGroup::getName( ) throw(css::uno::RuntimeException, std::exception) { return m_Name; } -void SAL_CALL OGroup::setName( const OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OGroup::setName( const OUString& /*aName*/ ) throw(css::uno::RuntimeException, std::exception) { throwFeatureNotImplementedRuntimeException( "XNamed::setName", *this ); } diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx index d044447fa254..3981e2670382 100644 --- a/connectivity/source/sdbcx/VIndex.cxx +++ b/connectivity/source/sdbcx/VIndex.cxx @@ -38,16 +38,16 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -OUString SAL_CALL OIndex::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OIndex::getImplementationName( ) throw (css::uno::RuntimeException, std::exception) { if(isNew()) return OUString("com.sun.star.sdbcx.VIndexDescriptor"); return OUString("com.sun.star.sdbcx.VIndex"); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL OIndex::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL OIndex::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Sequence< OUString > aSupported(1); + css::uno::Sequence< OUString > aSupported(1); if(isNew()) aSupported[0] = "com.sun.star.sdbcx.IndexDescriptor"; else @@ -56,7 +56,7 @@ OUString SAL_CALL OIndex::getImplementationName( ) throw (::com::sun::star::uno return aSupported; } -sal_Bool SAL_CALL OIndex::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OIndex::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } @@ -143,7 +143,7 @@ void OIndex::disposing() m_pColumns->disposing(); } -Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OIndex::getColumns( ) throw(RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL OIndex::getColumns( ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(ODescriptor_BASE::rBHelper.bDisposed); @@ -175,17 +175,17 @@ Reference< XPropertySet > SAL_CALL OIndex::createDataDescriptor( ) throw(Runtim return this; } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OIndex::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OIndex::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -OUString SAL_CALL OIndex::getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OIndex::getName( ) throw(css::uno::RuntimeException, std::exception) { return m_Name; } -void SAL_CALL OIndex::setName( const OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OIndex::setName( const OUString& /*aName*/ ) throw(css::uno::RuntimeException, std::exception) { } diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx index d775aa17deb9..2cf762a9d49e 100644 --- a/connectivity/source/sdbcx/VIndexColumn.cxx +++ b/connectivity/source/sdbcx/VIndexColumn.cxx @@ -26,16 +26,16 @@ using namespace connectivity::sdbcx; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; -OUString SAL_CALL OIndexColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OIndexColumn::getImplementationName( ) throw (css::uno::RuntimeException, std::exception) { if(isNew()) return OUString("com.sun.star.sdbcx.VIndexColumnDescription"); return OUString("com.sun.star.sdbcx.VIndex"); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL OIndexColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL OIndexColumn::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Sequence< OUString > aSupported(1); + css::uno::Sequence< OUString > aSupported(1); if(isNew()) aSupported[0] = "com.sun.star.sdbcx.IndexDescription"; else @@ -44,7 +44,7 @@ OUString SAL_CALL OIndexColumn::getImplementationName( ) throw (::com::sun::sta return aSupported; } -sal_Bool SAL_CALL OIndexColumn::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OIndexColumn::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx index 3df816bf5bf9..bf8b0a92667d 100644 --- a/connectivity/source/sdbcx/VKey.cxx +++ b/connectivity/source/sdbcx/VKey.cxx @@ -36,16 +36,16 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -OUString SAL_CALL OKey::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OKey::getImplementationName( ) throw (css::uno::RuntimeException, std::exception) { if(isNew()) return OUString("com.sun.star.sdbcx.VKeyDescription"); return OUString("com.sun.star.sdbcx.VKey"); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL OKey::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL OKey::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Sequence< OUString > aSupported(1); + css::uno::Sequence< OUString > aSupported(1); if(isNew()) aSupported[0] = "com.sun.star.sdbcx.KeyDescription"; else @@ -54,7 +54,7 @@ OUString SAL_CALL OKey::getImplementationName( ) throw (::com::sun::star::uno:: return aSupported; } -sal_Bool SAL_CALL OKey::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OKey::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } @@ -151,7 +151,7 @@ void SAL_CALL OKey::disposing() return *getArrayHelper(isNew() ? 1 : 0); } -Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OKey::getColumns( ) throw(RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL OKey::getColumns( ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(ODescriptor_BASE::rBHelper.bDisposed); @@ -183,17 +183,17 @@ Reference< XPropertySet > SAL_CALL OKey::createDataDescriptor( ) throw(RuntimeE return this; } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OKey::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OKey::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -OUString SAL_CALL OKey::getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OKey::getName( ) throw(css::uno::RuntimeException, std::exception) { return m_Name; } -void SAL_CALL OKey::setName( const OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OKey::setName( const OUString& /*aName*/ ) throw(css::uno::RuntimeException, std::exception) { } diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx index 3bfb4d976498..7ebc912e3815 100644 --- a/connectivity/source/sdbcx/VKeyColumn.cxx +++ b/connectivity/source/sdbcx/VKeyColumn.cxx @@ -27,16 +27,16 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; using namespace cppu; -OUString SAL_CALL OKeyColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OKeyColumn::getImplementationName( ) throw (css::uno::RuntimeException, std::exception) { if(isNew()) return OUString("com.sun.star.sdbcx.VKeyColumnDescription"); return OUString("com.sun.star.sdbcx.VKeyColumn"); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL OKeyColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL OKeyColumn::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Sequence< OUString > aSupported(1); + css::uno::Sequence< OUString > aSupported(1); if(isNew()) aSupported[0] = "com.sun.star.sdbcx.KeyColumnDescription"; else @@ -45,7 +45,7 @@ OUString SAL_CALL OKeyColumn::getImplementationName( ) throw (::com::sun::star: return aSupported; } -sal_Bool SAL_CALL OKeyColumn::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OKeyColumn::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx index 809aa77b97d4..de38f104c1f7 100644 --- a/connectivity/source/sdbcx/VTable.cxx +++ b/connectivity/source/sdbcx/VTable.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -OUString SAL_CALL OTable::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OTable::getImplementationName( ) throw (css::uno::RuntimeException, std::exception) { if(isNew()) return OUString("com.sun.star.sdbcx.VTableDescriptor"); @@ -48,9 +48,9 @@ OUString SAL_CALL OTable::getImplementationName( ) throw (::com::sun::star::uno } -::com::sun::star::uno::Sequence< OUString > SAL_CALL OTable::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL OTable::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Sequence< OUString > aSupported(1); + css::uno::Sequence< OUString > aSupported(1); if(isNew()) aSupported[0] = "com.sun.star.sdbcx.TableDescriptor"; else @@ -59,7 +59,7 @@ OUString SAL_CALL OTable::getImplementationName( ) throw (::com::sun::star::uno return aSupported; } -sal_Bool SAL_CALL OTable::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OTable::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } @@ -284,17 +284,17 @@ void SAL_CALL OTable::alterColumnByName( const OUString& /*colName*/, const Refe throwFeatureNotImplementedSQLException( "XAlterTable::alterColumnByName", *this ); } -void SAL_CALL OTable::alterColumnByIndex( sal_Int32 /*index*/, const Reference< XPropertySet >& /*descriptor*/ ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL OTable::alterColumnByIndex( sal_Int32 /*index*/, const Reference< XPropertySet >& /*descriptor*/ ) throw(SQLException, css::lang::IndexOutOfBoundsException, RuntimeException, std::exception) { throwFeatureNotImplementedSQLException( "XAlterTable::alterColumnByIndex", *this ); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OTable::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OTable::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -OUString SAL_CALL OTable::getName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OTable::getName() throw(css::uno::RuntimeException, std::exception) { // this is only correct for tables who haven't a schema or catalog name OSL_ENSURE(m_CatalogName.isEmpty(),"getName(): forgot to override getName()!"); @@ -302,7 +302,7 @@ OUString SAL_CALL OTable::getName() throw(::com::sun::star::uno::RuntimeExceptio return m_Name; } -void SAL_CALL OTable::setName( const OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OTable::setName( const OUString& /*aName*/ ) throw(css::uno::RuntimeException, std::exception) { } diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx index ff1ac1e5aa4d..88e7cb296e2f 100644 --- a/connectivity/source/sdbcx/VUser.cxx +++ b/connectivity/source/sdbcx/VUser.cxx @@ -89,7 +89,7 @@ Sequence< Type > SAL_CALL OUser::getTypes( ) throw(RuntimeException, std::excep } // XUser -void SAL_CALL OUser::changePassword( const OUString& /*objPassword*/, const OUString& /*newPassword*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) +void SAL_CALL OUser::changePassword( const OUString& /*objPassword*/, const OUString& /*newPassword*/ ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE::rBHelper.bDisposed); @@ -123,7 +123,7 @@ Reference< XNameAccess > SAL_CALL OUser::getGroups( ) throw(RuntimeException, s SAL_WNOUNREACHABLE_CODE_PUSH -sal_Int32 SAL_CALL OUser::getPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL OUser::getPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE::rBHelper.bDisposed); @@ -131,7 +131,7 @@ sal_Int32 SAL_CALL OUser::getPrivileges( const OUString& /*objName*/, sal_Int32 return 0; } -sal_Int32 SAL_CALL OUser::getGrantablePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL OUser::getGrantablePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE::rBHelper.bDisposed); @@ -142,31 +142,31 @@ sal_Int32 SAL_CALL OUser::getGrantablePrivileges( const OUString& /*objName*/, s SAL_WNOUNREACHABLE_CODE_POP -void SAL_CALL OUser::grantPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OUser::grantPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE::rBHelper.bDisposed); ::dbtools::throwFeatureNotImplementedSQLException( "XAuthorizable::grantPrivileges", *this ); } -void SAL_CALL OUser::revokePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OUser::revokePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE::rBHelper.bDisposed); ::dbtools::throwFeatureNotImplementedSQLException( "XAuthorizable::revokePrivileges", *this ); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OUser::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OUser::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -OUString SAL_CALL OUser::getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OUser::getName( ) throw(css::uno::RuntimeException, std::exception) { return m_Name; } -void SAL_CALL OUser::setName( const OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OUser::setName( const OUString& /*aName*/ ) throw(css::uno::RuntimeException, std::exception) { OSL_FAIL( "OUser::setName: not implemented!" ); // not allowed to throw an SQLException here ... diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx index 42be94fb2b69..8bdbca929ff2 100644 --- a/connectivity/source/sdbcx/VView.cxx +++ b/connectivity/source/sdbcx/VView.cxx @@ -36,7 +36,7 @@ IMPLEMENT_SERVICE_INFO(OView,"com.sun.star.sdbcx.VView","com.sun.star.sdbcx.View OView::OView(bool _bCase, const OUString& Name, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData, + const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _xMetaData, sal_Int32 CheckOption, const OUString& Command, const OUString& SchemaName, @@ -52,7 +52,7 @@ OView::OView(bool _bCase, construct(); } -OView::OView(bool _bCase, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData) +OView::OView(bool _bCase, const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _xMetaData) : ODescriptor(::comphelper::OMutexAndBroadcastHelper::m_aBHelper, _bCase, true) ,m_xMetaData(_xMetaData) { @@ -96,7 +96,7 @@ Any SAL_CALL OView::queryInterface( const Type & rType ) throw(RuntimeException, return *getArrayHelper(isNew() ? 1 : 0); } -OUString SAL_CALL OView::getName() throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL OView::getName() throw(css::uno::RuntimeException, std::exception) { OUString sComposedName; if(m_xMetaData.is()) @@ -110,12 +110,12 @@ OUString SAL_CALL OView::getName() throw(::com::sun::star::uno::RuntimeException return sComposedName; } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OView::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OView::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -void SAL_CALL OView::setName( const OUString& ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OView::setName( const OUString& ) throw(css::uno::RuntimeException, std::exception) { } |