summaryrefslogtreecommitdiff
path: root/dbaccess/source/sdbtools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-03 09:14:58 +0200
committerNoel Grandin <noel@peralex.com>2015-08-03 13:38:44 +0200
commit7dc5e8731fdc3a11ca429e717ec4a05e67ea1d21 (patch)
tree104e82c3fdda21d4b33c4f427cee9023377b731f /dbaccess/source/sdbtools
parent5edd744d1021b41f59528a6e3a8adebfe63e6b6e (diff)
com::sun::star->css in dbaccess
Change-Id: I4fbdd3fb7d1e0ad4423148aaaed3a15aebb26d14
Diffstat (limited to 'dbaccess/source/sdbtools')
-rw-r--r--dbaccess/source/sdbtools/connection/connectiondependent.hxx18
-rw-r--r--dbaccess/source/sdbtools/connection/connectiontools.cxx2
-rw-r--r--dbaccess/source/sdbtools/connection/connectiontools.hxx34
-rw-r--r--dbaccess/source/sdbtools/connection/datasourcemetadata.hxx10
-rw-r--r--dbaccess/source/sdbtools/connection/objectnames.hxx18
-rw-r--r--dbaccess/source/sdbtools/connection/tablename.hxx30
6 files changed, 56 insertions, 56 deletions
diff --git a/dbaccess/source/sdbtools/connection/connectiondependent.hxx b/dbaccess/source/sdbtools/connection/connectiondependent.hxx
index a696db4ea738..28a294a07caf 100644
--- a/dbaccess/source/sdbtools/connection/connectiondependent.hxx
+++ b/dbaccess/source/sdbtools/connection/connectiondependent.hxx
@@ -35,9 +35,9 @@ namespace sdbtools
{
private:
mutable ::osl::Mutex m_aMutex;
- ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection >
+ css::uno::WeakReference< css::sdbc::XConnection >
m_aConnection;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+ css::uno::Reference< css::uno::XComponentContext >
m_aContext;
/** a hard reference to the connection we're working for
@@ -46,20 +46,20 @@ namespace sdbtools
The guard will, in its constructor, set the member, and reset it in its destructor.
This ensures that the connection is only held hard when it's needed, and weak otherwise.
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >
+ css::uno::Reference< css::sdbc::XConnection >
m_xConnection;
protected:
::osl::Mutex& getMutex() const { return m_aMutex; }
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
+ const css::uno::Reference< css::uno::XComponentContext >&
getContext() const { return m_aContext; }
protected:
class EntryGuard;
protected:
- explicit ConnectionDependentComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & _rContext )
+ explicit ConnectionDependentComponent( const css::uno::Reference< css::uno::XComponentContext > & _rContext )
:m_aContext( _rContext )
{
}
@@ -71,12 +71,12 @@ namespace sdbtools
@param _rxConnection
the connection to set
*/
- void setWeakConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection )
+ void setWeakConnection( const css::uno::Reference< css::sdbc::XConnection >& _rxConnection )
{
m_aConnection = _rxConnection;
}
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >&
+ const css::uno::Reference< css::sdbc::XConnection >&
getConnection() const { return m_xConnection; }
public:
@@ -90,7 +90,7 @@ namespace sdbtools
inline bool acquireConnection( GuardAccess )
{
- m_xConnection = ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >(m_aConnection);
+ m_xConnection = css::uno::Reference< css::sdbc::XConnection >(m_aConnection);
return m_xConnection.is();
}
inline void releaseConnection( GuardAccess )
@@ -122,7 +122,7 @@ namespace sdbtools
,m_rComponent( _rComponent )
{
if ( !m_rComponent.acquireConnection( ConnectionDependentComponent::GuardAccess() ) )
- throw ::com::sun::star::lang::DisposedException();
+ throw css::lang::DisposedException();
}
~EntryGuard()
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx
index 1f700203087e..7dc78738bc48 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.cxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx
@@ -89,7 +89,7 @@ namespace sdbtools
aErrorInfo.doThrow();
return xRet;
}
- Reference< sdb::XSingleSelectQueryComposer > SAL_CALL ConnectionTools::getComposer( ::sal_Int32 commandType, const OUString& command ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+ Reference< sdb::XSingleSelectQueryComposer > SAL_CALL ConnectionTools::getComposer( ::sal_Int32 commandType, const OUString& command ) throw (css::uno::RuntimeException, std::exception)
{
EntryGuard aGuard( *this );
dbtools::StatementComposer aComposer(getConnection(), command, commandType, true );
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/connection/connectiontools.hxx
index 6326347b01f5..65602e6bb845 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.hxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.hxx
@@ -35,11 +35,11 @@ namespace sdbtools
{
// ConnectionTools
- typedef ::cppu::WeakImplHelper< ::com::sun::star::sdb::tools::XConnectionTools
- , ::com::sun::star::lang::XServiceInfo
- , ::com::sun::star::lang::XInitialization
+ typedef ::cppu::WeakImplHelper< css::sdb::tools::XConnectionTools
+ , css::lang::XServiceInfo
+ , css::lang::XInitialization
> ConnectionTools_Base;
- /** implements the com::sun::star::sdb::tools::XConnectionTools functionality
+ /** implements the css::sdb::tools::XConnectionTools functionality
*/
class ConnectionTools :public ConnectionTools_Base
,public ConnectionDependentComponent
@@ -53,28 +53,28 @@ namespace sdbtools
@param _rxContext
the context of the component
*/
- explicit ConnectionTools( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rContext );
+ explicit ConnectionTools( const css::uno::Reference< css::uno::XComponentContext >& _rContext );
// XConnectionTools
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XTableName > SAL_CALL createTableName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XObjectNames > SAL_CALL getObjectNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XDataSourceMetaData > SAL_CALL getDataSourceMetaData() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& keepFieldsAlive ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const OUString& command ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::sdb::tools::XTableName > SAL_CALL createTableName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::sdb::tools::XObjectNames > SAL_CALL getObjectNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::sdb::tools::XDataSourceMetaData > SAL_CALL getDataSourceMetaData() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, css::uno::Reference< css::lang::XComponent >& keepFieldsAlive ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const OUString& command ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo - static versions
static OUString SAL_CALL getImplementationName_static();
- static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
- Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&);
+ static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL
+ Create(const css::uno::Reference< css::uno::XComponentContext >&);
// XInitialization
- virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) throw (css::uno::RuntimeException, css::uno::Exception, std::exception) SAL_OVERRIDE;
protected:
virtual ~ConnectionTools();
diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
index ea1ddf5a7013..8ef42b9153bf 100644
--- a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
+++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
@@ -32,7 +32,7 @@ namespace sdbtools
{
// DataSourceMetaData
- typedef ::cppu::WeakImplHelper< ::com::sun::star::sdb::tools::XDataSourceMetaData
+ typedef ::cppu::WeakImplHelper< css::sdb::tools::XDataSourceMetaData
> DataSourceMetaData_Base;
struct DataSourceMetaData_Impl;
/** default implementation for XDataSourceMetaData
@@ -49,16 +49,16 @@ namespace sdbtools
the component's context
@param _rxConnection
the connection to work with. Will be held weak. Must not be <NULL/>.
- @throws ::com::sun::star::lang::NullPointerException
+ @throws css::lang::NullPointerException
if _rxConnection is <NULL/>
*/
DataSourceMetaData(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rContext,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection
+ const css::uno::Reference< css::uno::XComponentContext >& _rContext,
+ const css::uno::Reference< css::sdbc::XConnection >& _rxConnection
);
// XDataSourceMetaData
- virtual sal_Bool SAL_CALL supportsQueriesInFrom() throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsQueriesInFrom() throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
protected:
virtual ~DataSourceMetaData();
diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx
index cc0b2b029fdc..4ac124973f3d 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.hxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.hxx
@@ -32,7 +32,7 @@ namespace sdbtools
{
// ObjectNames
- typedef ::cppu::WeakImplHelper< ::com::sun::star::sdb::tools::XObjectNames
+ typedef ::cppu::WeakImplHelper< css::sdb::tools::XObjectNames
> ObjectNames_Base;
struct ObjectNames_Impl;
/** default implementation for XObjectNames
@@ -51,20 +51,20 @@ namespace sdbtools
@param _rxConnection
the connection to work with. Will be held weak. Must not be <NULL/>.
- @throws ::com::sun::star::lang::NullPointerException
+ @throws css::lang::NullPointerException
if _rxConnection is <NULL/>
*/
ObjectNames(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rContext,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection
+ const css::uno::Reference< css::uno::XComponentContext >& _rContext,
+ const css::uno::Reference< css::sdbc::XConnection >& _rxConnection
);
// XObjectNames
- virtual OUString SAL_CALL suggestName( ::sal_Int32 CommandType, const OUString& BaseName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL convertToSQLName( const OUString& Name ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isNameUsed( ::sal_Int32 CommandType, const OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isNameValid( ::sal_Int32 CommandType, const OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL checkNameForCreate( ::sal_Int32 CommandType, const OUString& Name ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL suggestName( ::sal_Int32 CommandType, const OUString& BaseName ) throw (css::lang::IllegalArgumentException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL convertToSQLName( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL isNameUsed( ::sal_Int32 CommandType, const OUString& Name ) throw (css::lang::IllegalArgumentException, css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL isNameValid( ::sal_Int32 CommandType, const OUString& Name ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL checkNameForCreate( ::sal_Int32 CommandType, const OUString& Name ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
protected:
virtual ~ObjectNames();
diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx
index c5eef8b713c4..795e7d7c3aae 100644
--- a/dbaccess/source/sdbtools/connection/tablename.hxx
+++ b/dbaccess/source/sdbtools/connection/tablename.hxx
@@ -32,7 +32,7 @@ namespace sdbtools
{
// TableName
- typedef ::cppu::WeakImplHelper< ::com::sun::star::sdb::tools::XTableName
+ typedef ::cppu::WeakImplHelper< css::sdb::tools::XTableName
> TableName_Base;
struct TableName_Impl;
/** default implementation for XTableName
@@ -51,26 +51,26 @@ namespace sdbtools
@param _rxConnection
the connection to work with. Will be held weak. Must not be <NULL/>.
- @throws ::com::sun::star::lang::NullPointerException
+ @throws css::lang::NullPointerException
if _rxConnection is <NULL/>
*/
TableName(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rContext,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection
+ const css::uno::Reference< css::uno::XComponentContext >& _rContext,
+ const css::uno::Reference< css::sdbc::XConnection >& _rxConnection
);
// XTableName
- virtual OUString SAL_CALL getCatalogName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setCatalogName( const OUString& _catalogname ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getSchemaName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setSchemaName( const OUString& _schemaname ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getTableName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setTableName( const OUString& _tablename ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getNameForSelect() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getTable() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setTable( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _table ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual OUString SAL_CALL getComposedName( ::sal_Int32 Type, sal_Bool _Quote ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setComposedName( const OUString& ComposedName, ::sal_Int32 Type ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getCatalogName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setCatalogName( const OUString& _catalogname ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getSchemaName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setSchemaName( const OUString& _schemaname ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getTableName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setTableName( const OUString& _tablename ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getNameForSelect() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getTable() throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setTable( const css::uno::Reference< css::beans::XPropertySet >& _table ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getComposedName( ::sal_Int32 Type, sal_Bool _Quote ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setComposedName( const OUString& ComposedName, ::sal_Int32 Type ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
protected:
virtual ~TableName();