[Libreoffice-commits] core.git: include/connectivity
Noel Grandin
noel at peralex.com
Tue Oct 20 00:06:21 PDT 2015
include/connectivity/BlobHelper.hxx | 16 -
include/connectivity/CommonTools.hxx | 24 +-
include/connectivity/ConnectionWrapper.hxx | 32 +--
include/connectivity/DriversConfig.hxx | 14 -
include/connectivity/FValue.hxx | 90 +++++-----
include/connectivity/IParseContext.hxx | 2
include/connectivity/OSubComponent.hxx | 8
include/connectivity/PColumn.hxx | 18 +-
include/connectivity/ParameterCont.hxx | 8
include/connectivity/SQLStatementHelper.hxx | 2
include/connectivity/TColumnsHelper.hxx | 6
include/connectivity/TIndexColumns.hxx | 4
include/connectivity/TIndexes.hxx | 6
include/connectivity/TKeyColumns.hxx | 4
include/connectivity/TKeys.hxx | 6
include/connectivity/TTableHelper.hxx | 24 +-
include/connectivity/conncleanup.hxx | 26 +--
include/connectivity/dbconversion.hxx | 80 ++++-----
include/connectivity/dbexception.hxx | 88 +++++-----
include/connectivity/dbmetadata.hxx | 14 -
include/connectivity/dbtools.hxx | 220 +++++++++++++-------------
include/connectivity/filtermanager.hxx | 4
include/connectivity/formattedcolumnvalue.hxx | 12 -
include/connectivity/parameters.hxx | 82 ++++-----
include/connectivity/paramwrapper.hxx | 48 ++---
include/connectivity/predicateinput.hxx | 24 +-
include/connectivity/sdbcx/VCatalog.hxx | 26 +--
include/connectivity/sdbcx/VCollection.hxx | 82 ++++-----
include/connectivity/sdbcx/VColumn.hxx | 18 +-
include/connectivity/sdbcx/VDescriptor.hxx | 16 -
include/connectivity/sdbcx/VGroup.hxx | 28 +--
include/connectivity/sdbcx/VIndex.hxx | 16 -
include/connectivity/sdbcx/VKey.hxx | 16 -
include/connectivity/sdbcx/VTable.hxx | 42 ++--
include/connectivity/sdbcx/VTypeDef.hxx | 6
include/connectivity/sdbcx/VUser.hxx | 30 +--
include/connectivity/sdbcx/VView.hxx | 20 +-
include/connectivity/sqlerror.hxx | 40 ++--
include/connectivity/sqliterator.hxx | 28 +--
include/connectivity/sqlnode.hxx | 60 +++----
include/connectivity/sqlparse.hxx | 28 +--
include/connectivity/statementcomposer.hxx | 8
42 files changed, 663 insertions(+), 663 deletions(-)
New commits:
commit 12c4c9cbf3de4c03bfb89d0f57c3a5094447c065
Author: Noel Grandin <noel at peralex.com>
Date: Mon Oct 19 13:44:44 2015 +0200
com::sun::star->css in include/connectivity
Change-Id: I74920b46144dbdde6abf9cf267fa508a3faea0ce
Reviewed-on: https://gerrit.libreoffice.org/19460
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/include/connectivity/BlobHelper.hxx b/include/connectivity/BlobHelper.hxx
index 041d8444..b05f3f5 100644
--- a/include/connectivity/BlobHelper.hxx
+++ b/include/connectivity/BlobHelper.hxx
@@ -25,17 +25,17 @@
namespace connectivity
{
- class OOO_DLLPUBLIC_DBTOOLS BlobHelper : public ::cppu::WeakImplHelper< com::sun::star::sdbc::XBlob >
+ class OOO_DLLPUBLIC_DBTOOLS BlobHelper : public ::cppu::WeakImplHelper< css::sdbc::XBlob >
{
- ::com::sun::star::uno::Sequence< sal_Int8 > m_aValue;
+ css::uno::Sequence< sal_Int8 > m_aValue;
public:
- BlobHelper(const ::com::sun::star::uno::Sequence< sal_Int8 >& _val);
+ BlobHelper(const css::uno::Sequence< sal_Int8 >& _val);
private:
- virtual ::sal_Int64 SAL_CALL length( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getBytes( ::sal_Int64 pos, ::sal_Int32 length ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int64 SAL_CALL position( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& pattern, ::sal_Int64 start ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int64 SAL_CALL positionOfBlob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& pattern, ::sal_Int64 start ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int64 SAL_CALL length( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getBytes( ::sal_Int64 pos, ::sal_Int32 length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int64 SAL_CALL position( const css::uno::Sequence< ::sal_Int8 >& pattern, ::sal_Int64 start ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int64 SAL_CALL positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& pattern, ::sal_Int64 start ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
};
}
diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx
index bec1ee3..7a798c6 100644
--- a/include/connectivity/CommonTools.hxx
+++ b/include/connectivity/CommonTools.hxx
@@ -58,8 +58,8 @@ namespace connectivity
return match(rWild.getStr(), rStr.getStr(), cEscape);
}
// typedefs
- typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray;
- typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> OSQLTable;
+ typedef std::vector< css::uno::WeakReferenceHelper > OWeakRefArray;
+ typedef css::uno::Reference< css::sdbcx::XColumnsSupplier> OSQLTable;
typedef std::map<OUString,OSQLTable,comphelper::UStringMixLess> OSQLTables;
@@ -105,7 +105,7 @@ namespace connectivity
{}
};
- typedef ORefVector< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> > OSQLColumns;
+ typedef ORefVector< css::uno::Reference< css::beans::XPropertySet> > OSQLColumns;
// search from __first to __last the column with the name _rVal
// when no such column exist __last is returned
@@ -133,7 +133,7 @@ namespace connectivity
const OUString& _rVal,
const ::comphelper::UStringMixEqual& _rCase);
- OOO_DLLPUBLIC_DBTOOLS void checkDisposed(bool _bThrow) throw ( ::com::sun::star::lang::DisposedException );
+ OOO_DLLPUBLIC_DBTOOLS void checkDisposed(bool _bThrow) throw ( css::lang::DisposedException );
#if HAVE_FEATURE_JAVA
/** creates a java virtual machine
@@ -142,7 +142,7 @@ namespace connectivity
@return
The JavaVM.
*/
- OOO_DLLPUBLIC_DBTOOLS ::rtl::Reference< jvmaccess::VirtualMachine > getJavaVM(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext);
+ OOO_DLLPUBLIC_DBTOOLS ::rtl::Reference< jvmaccess::VirtualMachine > getJavaVM(const css::uno::Reference< css::uno::XComponentContext >& _rxContext);
/** return <TRUE/> if the java class exists, otherwise <FALSE/>.
@param _pJVM
@@ -155,22 +155,22 @@ namespace connectivity
}
#define DECLARE_SERVICE_INFO() \
- virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; \
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; \
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override \
+ virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; \
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; \
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override \
#define IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname) \
- OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) \
+ OUString SAL_CALL classname::getImplementationName( ) throw (css::uno::RuntimeException, std::exception) \
{ \
return OUString(implasciiname); \
} \
- ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) \
+ css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) \
{ \
- ::com::sun::star::uno::Sequence< OUString > aSupported(1); \
+ css::uno::Sequence< OUString > aSupported(1); \
aSupported[0] = serviceasciiname; \
return aSupported; \
} \
- sal_Bool SAL_CALL classname::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) \
+ sal_Bool SAL_CALL classname::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception) \
{ \
return cppu::supportsService(this, _rServiceName); \
} \
diff --git a/include/connectivity/ConnectionWrapper.hxx b/include/connectivity/ConnectionWrapper.hxx
index 413cb49..3ae6b26 100644
--- a/include/connectivity/ConnectionWrapper.hxx
+++ b/include/connectivity/ConnectionWrapper.hxx
@@ -37,23 +37,23 @@ namespace connectivity
//= OConnectionWrapper - wraps all methods to the real connection from the driver
//= but when disposed it doesn't dispose the real connection
- typedef ::cppu::ImplHelper2< ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::lang::XUnoTunnel
+ typedef ::cppu::ImplHelper2< css::lang::XServiceInfo,
+ css::lang::XUnoTunnel
> OConnection_BASE;
class OOO_DLLPUBLIC_DBTOOLS OConnectionWrapper : public OConnection_BASE
{
protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xProxyConnection;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > m_xTypeProvider;
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > m_xUnoTunnel;
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo > m_xServiceInfo;
+ css::uno::Reference< css::uno::XAggregation > m_xProxyConnection;
+ css::uno::Reference< css::sdbc::XConnection > m_xConnection;
+ css::uno::Reference< css::lang::XTypeProvider > m_xTypeProvider;
+ css::uno::Reference< css::lang::XUnoTunnel > m_xUnoTunnel;
+ css::uno::Reference< css::lang::XServiceInfo > m_xServiceInfo;
virtual ~OConnectionWrapper();
- void setDelegation(::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >& _rxProxyConnection,oslInterlockedCount& _rRefCount);
- void setDelegation(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection
- ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext
+ void setDelegation(css::uno::Reference< css::uno::XAggregation >& _rxProxyConnection,oslInterlockedCount& _rRefCount);
+ void setDelegation(const css::uno::Reference< css::sdbc::XConnection >& _xConnection
+ ,const css::uno::Reference< css::uno::XComponentContext>& _rxContext
,oslInterlockedCount& _rRefCount);
// must be called from derived classes
void disposing();
@@ -62,12 +62,12 @@ namespace connectivity
// XServiceInfo
DECLARE_SERVICE_INFO();
- 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 ::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::Any SAL_CALL queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) 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();
/** method to create unique ids
@param _rURL
The URL.
@@ -81,7 +81,7 @@ namespace connectivity
The password.
*/
static void createUniqueId( const OUString& _rURL
- ,::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo
+ ,css::uno::Sequence< css::beans::PropertyValue >& _rInfo
,sal_uInt8* _pBuffer
,const OUString& _rUserName = OUString()
,const OUString& _rPassword = OUString());
diff --git a/include/connectivity/DriversConfig.hxx b/include/connectivity/DriversConfig.hxx
index 143f532..4a40d9c 100644
--- a/include/connectivity/DriversConfig.hxx
+++ b/include/connectivity/DriversConfig.hxx
@@ -45,12 +45,12 @@ namespace connectivity
class DriversConfigImpl
{
mutable ::utl::OConfigurationTreeRoot m_aInstalled;
- mutable TInstalledDrivers m_aDrivers;
- void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB) const;
+ mutable TInstalledDrivers m_aDrivers;
+ void Load(const css::uno::Reference< css::uno::XComponentContext >& _rxORB) const;
public:
DriversConfigImpl();
- const TInstalledDrivers& getInstalledDrivers(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB) const { Load(_rxORB); return m_aDrivers; }
+ const TInstalledDrivers& getInstalledDrivers(const css::uno::Reference< css::uno::XComponentContext >& _rxORB) const { Load(_rxORB); return m_aDrivers; }
};
// Allows to access all driver which are located in the configuration
@@ -61,7 +61,7 @@ namespace connectivity
const ::comphelper::NamedValueCollection& impl_get(const OUString& _sURL,sal_Int32 _nProps) const;
public:
- DriversConfig(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB);
+ DriversConfig(const css::uno::Reference< css::uno::XComponentContext >& _rxORB);
~DriversConfig();
DriversConfig( const DriversConfig& );
@@ -72,10 +72,10 @@ namespace connectivity
const ::comphelper::NamedValueCollection& getProperties(const OUString& _sURL) const;
const ::comphelper::NamedValueCollection& getFeatures(const OUString& _sURL) const;
const ::comphelper::NamedValueCollection& getMetaData(const OUString& _sURL) const;
- ::com::sun::star::uno::Sequence< OUString > getURLs() const;
+ css::uno::Sequence< OUString > getURLs() const;
private:
- OSharedConfigNode m_aNode;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xORB;
+ OSharedConfigNode m_aNode;
+ css::uno::Reference< css::uno::XComponentContext > m_xORB;
};
}
#endif // INCLUDED_CONNECTIVITY_DRIVERSCONFIG_HXX
diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx
index ebb228c..247b561 100644
--- a/include/connectivity/FValue.hxx
+++ b/include/connectivity/FValue.hxx
@@ -78,7 +78,7 @@ namespace connectivity
public:
ORowSetValue()
- :m_eTypeKind(::com::sun::star::sdbc::DataType::VARCHAR)
+ :m_eTypeKind(css::sdbc::DataType::VARCHAR)
,m_bNull(true)
,m_bBound(true)
,m_bModified(false)
@@ -88,7 +88,7 @@ namespace connectivity
}
ORowSetValue(const ORowSetValue& _rRH)
- :m_eTypeKind(::com::sun::star::sdbc::DataType::VARCHAR)
+ :m_eTypeKind(css::sdbc::DataType::VARCHAR)
,m_bNull(true)
,m_bBound(true)
,m_bModified(false)
@@ -99,7 +99,7 @@ namespace connectivity
}
ORowSetValue(const OUString& _rRH)
- :m_eTypeKind(::com::sun::star::sdbc::DataType::VARCHAR)
+ :m_eTypeKind(css::sdbc::DataType::VARCHAR)
,m_bNull(true)
,m_bBound(true)
,m_bModified(false)
@@ -110,7 +110,7 @@ namespace connectivity
}
ORowSetValue(const double& _rRH)
- :m_eTypeKind(::com::sun::star::sdbc::DataType::DOUBLE)
+ :m_eTypeKind(css::sdbc::DataType::DOUBLE)
,m_bNull(true)
,m_bBound(true)
,m_bModified(false)
@@ -121,7 +121,7 @@ namespace connectivity
}
ORowSetValue(const float& _rRH)
- :m_eTypeKind(::com::sun::star::sdbc::DataType::FLOAT)
+ :m_eTypeKind(css::sdbc::DataType::FLOAT)
,m_bNull(true)
,m_bBound(true)
,m_bModified(false)
@@ -132,7 +132,7 @@ namespace connectivity
}
ORowSetValue(const sal_Int8& _rRH)
- :m_eTypeKind(::com::sun::star::sdbc::DataType::TINYINT)
+ :m_eTypeKind(css::sdbc::DataType::TINYINT)
,m_bNull(true)
,m_bBound(true)
,m_bModified(false)
@@ -143,7 +143,7 @@ namespace connectivity
}
ORowSetValue(const sal_uInt8& _rRH)
- :m_eTypeKind(::com::sun::star::sdbc::DataType::TINYINT)
+ :m_eTypeKind(css::sdbc::DataType::TINYINT)
,m_bNull(true)
,m_bBound(true)
,m_bModified(false)
@@ -153,7 +153,7 @@ namespace connectivity
operator=(_rRH);
}
ORowSetValue(const sal_Int16& _rRH)
- :m_eTypeKind(::com::sun::star::sdbc::DataType::SMALLINT)
+ :m_eTypeKind(css::sdbc::DataType::SMALLINT)
,m_bNull(true)
,m_bBound(true)
,m_bModified(false)
@@ -163,7 +163,7 @@ namespace connectivity
operator=(_rRH);
}
ORowSetValue(const sal_uInt16& _rRH)
- :m_eTypeKind(::com::sun::star::sdbc::DataType::SMALLINT)
+ :m_eTypeKind(css::sdbc::DataType::SMALLINT)
,m_bNull(true)
,m_bBound(true)
,m_bModified(false)
@@ -173,7 +173,7 @@ namespace connectivity
operator=(_rRH);
}
ORowSetValue(const sal_Int32& _rRH)
- :m_eTypeKind(::com::sun::star::sdbc::DataType::INTEGER)
+ :m_eTypeKind(css::sdbc::DataType::INTEGER)
,m_bNull(true)
,m_bBound(true)
,m_bModified(false)
@@ -183,7 +183,7 @@ namespace connectivity
operator=(_rRH);
}
ORowSetValue(const sal_uInt32& _rRH)
- :m_eTypeKind(::com::sun::star::sdbc::DataType::INTEGER)
+ :m_eTypeKind(css::sdbc::DataType::INTEGER)
,m_bNull(true)
,m_bBound(true)
,m_bModified(false)
@@ -193,7 +193,7 @@ namespace connectivity
operator=(_rRH);
}
ORowSetValue(const sal_Int64& _rRH)
- :m_eTypeKind(::com::sun::star::sdbc::DataType::BIGINT)
+ :m_eTypeKind(css::sdbc::DataType::BIGINT)
,m_bNull(true)
,m_bBound(true)
,m_bModified(false)
@@ -203,7 +203,7 @@ namespace connectivity
operator=(_rRH);
}
ORowSetValue(const sal_uInt64& _rRH)
- :m_eTypeKind(::com::sun::star::sdbc::DataType::BIGINT)
+ :m_eTypeKind(css::sdbc::DataType::BIGINT)
,m_bNull(true)
,m_bBound(true)
,m_bModified(false)
@@ -214,7 +214,7 @@ namespace connectivity
}
ORowSetValue(const bool& _rRH)
- :m_eTypeKind(::com::sun::star::sdbc::DataType::BIT)
+ :m_eTypeKind(css::sdbc::DataType::BIT)
,m_bNull(true)
,m_bBound(true)
,m_bModified(false)
@@ -224,8 +224,8 @@ namespace connectivity
operator=(_rRH);
}
- ORowSetValue(const ::com::sun::star::util::Date& _rRH)
- :m_eTypeKind(::com::sun::star::sdbc::DataType::DATE)
+ ORowSetValue(const css::util::Date& _rRH)
+ :m_eTypeKind(css::sdbc::DataType::DATE)
,m_bNull(true)
,m_bBound(true)
,m_bModified(false)
@@ -235,8 +235,8 @@ namespace connectivity
operator=(_rRH);
}
- ORowSetValue(const ::com::sun::star::util::Time& _rRH)
- :m_eTypeKind(::com::sun::star::sdbc::DataType::TIME)
+ ORowSetValue(const css::util::Time& _rRH)
+ :m_eTypeKind(css::sdbc::DataType::TIME)
,m_bNull(true)
,m_bBound(true)
,m_bModified(false)
@@ -246,8 +246,8 @@ namespace connectivity
operator=(_rRH);
}
- ORowSetValue(const ::com::sun::star::util::DateTime& _rRH)
- :m_eTypeKind(::com::sun::star::sdbc::DataType::TIMESTAMP)
+ ORowSetValue(const css::util::DateTime& _rRH)
+ :m_eTypeKind(css::sdbc::DataType::TIMESTAMP)
,m_bNull(true)
,m_bBound(true)
,m_bModified(false)
@@ -257,8 +257,8 @@ namespace connectivity
operator=(_rRH);
}
- ORowSetValue(const ::com::sun::star::uno::Sequence<sal_Int8>& _rRH)
- :m_eTypeKind(::com::sun::star::sdbc::DataType::LONGVARBINARY)
+ ORowSetValue(const css::uno::Sequence<sal_Int8>& _rRH)
+ :m_eTypeKind(css::sdbc::DataType::LONGVARBINARY)
,m_bNull(true)
,m_bBound(true)
,m_bModified(false)
@@ -306,15 +306,15 @@ namespace connectivity
ORowSetValue& operator=(const float& _rRH);
// ADT's
- ORowSetValue& operator=(const ::com::sun::star::util::Date& _rRH);
- ORowSetValue& operator=(const ::com::sun::star::util::Time& _rRH);
- ORowSetValue& operator=(const ::com::sun::star::util::DateTime& _rRH);
+ ORowSetValue& operator=(const css::util::Date& _rRH);
+ ORowSetValue& operator=(const css::util::Time& _rRH);
+ ORowSetValue& operator=(const css::util::DateTime& _rRH);
ORowSetValue& operator=(const OUString& _rRH);
// the type isn't set it will be set to VARCHAR if the type is different change it
- ORowSetValue& operator=(const ::com::sun::star::uno::Sequence<sal_Int8>& _rRH);
+ ORowSetValue& operator=(const css::uno::Sequence<sal_Int8>& _rRH);
// we the possibility to save a any for bookmarks
- ORowSetValue& operator=(const ::com::sun::star::uno::Any& _rAny);
+ ORowSetValue& operator=(const css::uno::Any& _rAny);
operator bool() const { return !isNull() && getBool(); }
operator sal_Int8() const { return isNull() ? static_cast<sal_Int8>(0) : getInt8(); }
@@ -337,24 +337,24 @@ namespace connectivity
return isNull() ? OUString() : getString();
}
- operator ::com::sun::star::util::Date() const
+ operator css::util::Date() const
{
- return isNull() ? ::com::sun::star::util::Date() : getDate();
+ return isNull() ? css::util::Date() : getDate();
}
- operator ::com::sun::star::util::Time() const
+ operator css::util::Time() const
{
- return isNull() ? ::com::sun::star::util::Time() : getTime();
+ return isNull() ? css::util::Time() : getTime();
}
- operator ::com::sun::star::util::DateTime() const
+ operator css::util::DateTime() const
{
- return isNull() ? ::com::sun::star::util::DateTime() : getDateTime();
+ return isNull() ? css::util::DateTime() : getDateTime();
}
- operator ::com::sun::star::uno::Sequence<sal_Int8>() const
+ operator css::uno::Sequence<sal_Int8>() const
{
- return isNull() ? ::com::sun::star::uno::Sequence<sal_Int8>() : getSequence();
+ return isNull() ? css::uno::Sequence<sal_Int8>() : getSequence();
}
bool operator==(const ORowSetValue& _rRH) const;
@@ -405,13 +405,13 @@ namespace connectivity
float getFloat() const;
OUString getString() const; // makes a automatic conversion if type isn't a string
- ::com::sun::star::util::Date getDate() const;
- ::com::sun::star::util::Time getTime() const;
- ::com::sun::star::util::DateTime getDateTime() const;
- ::com::sun::star::uno::Sequence<sal_Int8> getSequence() const;
+ css::util::Date getDate() const;
+ css::util::Time getTime() const;
+ css::util::DateTime getDateTime() const;
+ css::uno::Sequence<sal_Int8> getSequence() const;
// only use for anys
- ::com::sun::star::uno::Any getAny() const { return *static_cast<css::uno::Any*>(m_aValue.m_pValue); }
- ::com::sun::star::uno::Any makeAny() const;
+ css::uno::Any getAny() const { return *static_cast<css::uno::Any*>(m_aValue.m_pValue); }
+ css::uno::Any makeAny() const;
/**
fetches a single value out of the row
@@ -421,7 +421,7 @@ namespace connectivity
*/
void fill(sal_Int32 _nPos,
sal_Int32 _nType,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow>& _xRow);
+ const css::uno::Reference< css::sdbc::XRow>& _xRow);
/**
fetches a single value out of the row
@@ -433,12 +433,12 @@ namespace connectivity
void fill(sal_Int32 _nPos,
sal_Int32 _nType,
bool _bNullable,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow>& _xRow);
+ const css::uno::Reference< css::sdbc::XRow>& _xRow);
- void fill(const ::com::sun::star::uno::Any& _rValue);
+ void fill(const css::uno::Any& _rValue);
void fill( const sal_Int32 _nType,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn );
+ const css::uno::Reference< css::sdb::XColumn >& _rxColumn );
private:
void impl_fill( const sal_Int32 _nType, bool _bNullable, const detail::IValueSource& _rValueSource );
diff --git a/include/connectivity/IParseContext.hxx b/include/connectivity/IParseContext.hxx
index 078ae89..a7bb464 100644
--- a/include/connectivity/IParseContext.hxx
+++ b/include/connectivity/IParseContext.hxx
@@ -93,7 +93,7 @@ namespace connectivity
/** get's a locale instance which should be used when parsing in the context specified by this instance
<p>if this is not overridden by derived classes, it returns the static default locale.</p>
*/
- virtual ::com::sun::star::lang::Locale getPreferredLocale( ) const = 0;
+ virtual css::lang::Locale getPreferredLocale( ) const = 0;
protected:
~IParseContext() {}
diff --git a/include/connectivity/OSubComponent.hxx b/include/connectivity/OSubComponent.hxx
index 8aa9404..1aa9d15 100644
--- a/include/connectivity/OSubComponent.hxx
+++ b/include/connectivity/OSubComponent.hxx
@@ -42,8 +42,8 @@ namespace connectivity
OOO_DLLPUBLIC_DBTOOLS
void release(oslInterlockedCount& _refCount,
::cppu::OBroadcastHelper& rBHelper,
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface,
- ::com::sun::star::lang::XComponent* _pObject);
+ css::uno::Reference< css::uno::XInterface >& _xInterface,
+ css::lang::XComponent* _pObject);
// OSubComponent
@@ -51,12 +51,12 @@ namespace connectivity
{
protected:
// the parent must support the tunnel implementation
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent;
+ css::uno::Reference< css::uno::XInterface > m_xParent;
SELF* m_pDerivedImplementation;
public:
OSubComponent(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParent,
+ const css::uno::Reference< css::uno::XInterface >& _xParent,
SELF* _pDerivedImplementation)
:m_xParent(_xParent)
,m_pDerivedImplementation(_pDerivedImplementation)
diff --git a/include/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx
index 163cad9..3f70e60 100644
--- a/include/connectivity/PColumn.hxx
+++ b/include/connectivity/PColumn.hxx
@@ -57,7 +57,7 @@ namespace connectivity
virtual ~OParseColumn();
public:
- OParseColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, bool _bCase);
+ OParseColumn(const css::uno::Reference< css::beans::XPropertySet>& _xColumn, bool _bCase);
OParseColumn(const OUString& _Name,
const OUString& _TypeName,
const OUString& _DefaultValue,
@@ -87,9 +87,9 @@ namespace connectivity
*/
static ::rtl::Reference< OSQLColumns >
createColumnsForResultSet(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData >& _rxResMetaData,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMetaData,
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& i_xQueryColumns
+ const css::uno::Reference< css::sdbc::XResultSetMetaData >& _rxResMetaData,
+ const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rxDBMetaData,
+ const css::uno::Reference< css::container::XNameAccess>& i_xQueryColumns
);
typedef std::map<OUString, int> StringMap;
@@ -98,8 +98,8 @@ namespace connectivity
*/
static OParseColumn*
createColumnForResultSet(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData >& _rxResMetaData,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMetaData,
+ const css::uno::Reference< css::sdbc::XResultSetMetaData >& _rxResMetaData,
+ const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rxDBMetaData,
sal_Int32 _nColumnPos,
StringMap& _rColumns
);
@@ -125,21 +125,21 @@ namespace connectivity
virtual ~OOrderColumn();
public:
OOrderColumn(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,
+ const css::uno::Reference< css::beans::XPropertySet>& _xColumn,
const OUString& i_rOriginatingTableName,
bool _bCase,
bool _bAscending
);
OOrderColumn(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,
+ const css::uno::Reference< css::beans::XPropertySet>& _xColumn,
bool _bCase,
bool _bAscending
);
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;
private:
using OOrderColumn_BASE::createArrayHelper;
};
diff --git a/include/connectivity/ParameterCont.hxx b/include/connectivity/ParameterCont.hxx
index a7cc2be..f1997b7 100644
--- a/include/connectivity/ParameterCont.hxx
+++ b/include/connectivity/ParameterCont.hxx
@@ -28,17 +28,17 @@ namespace dbtools
//= OParameterContinuation
- class OOO_DLLPUBLIC_DBTOOLS OParameterContinuation : public comphelper::OInteraction< ::com::sun::star::sdb::XInteractionSupplyParameters >
+ class OOO_DLLPUBLIC_DBTOOLS OParameterContinuation : public comphelper::OInteraction< css::sdb::XInteractionSupplyParameters >
{
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aValues;
+ css::uno::Sequence< css::beans::PropertyValue > m_aValues;
public:
OParameterContinuation() { }
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getValues() const { return m_aValues; }
+ css::uno::Sequence< css::beans::PropertyValue > getValues() const { return m_aValues; }
// XInteractionSupplyParameters
- virtual void SAL_CALL setParameters( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rValues ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setParameters( const css::uno::Sequence< css::beans::PropertyValue >& _rValues ) throw(css::uno::RuntimeException, std::exception) override;
protected:
virtual ~OParameterContinuation() { }
diff --git a/include/connectivity/SQLStatementHelper.hxx b/include/connectivity/SQLStatementHelper.hxx
index 7472719..704946b 100644
--- a/include/connectivity/SQLStatementHelper.hxx
+++ b/include/connectivity/SQLStatementHelper.hxx
@@ -28,7 +28,7 @@ namespace dbtools
class OOO_DLLPUBLIC_DBTOOLS ISQLStatementHelper
{
public:
- virtual void addComment(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,OUStringBuffer& _rOut) = 0;
+ virtual void addComment(const css::uno::Reference< css::beans::XPropertySet >& descriptor,OUStringBuffer& _rOut) = 0;
protected:
~ISQLStatementHelper() {}
diff --git a/include/connectivity/TColumnsHelper.hxx b/include/connectivity/TColumnsHelper.hxx
index abdab99..0c970ae 100644
--- a/include/connectivity/TColumnsHelper.hxx
+++ b/include/connectivity/TColumnsHelper.hxx
@@ -38,9 +38,9 @@ namespace connectivity
OTableHelper* m_pTable;
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;
public:
OColumnsHelper( ::cppu::OWeakObject& _rParent
diff --git a/include/connectivity/TIndexColumns.hxx b/include/connectivity/TIndexColumns.hxx
index 980f022..3632855 100644
--- a/include/connectivity/TIndexColumns.hxx
+++ b/include/connectivity/TIndexColumns.hxx
@@ -31,8 +31,8 @@ namespace connectivity
OIndexHelper* m_pIndex;
protected:
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 css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
+ virtual void impl_refresh() throw(css::uno::RuntimeException) override;
public:
OIndexColumns( OIndexHelper* _pIndex,
::osl::Mutex& _rMutex,
diff --git a/include/connectivity/TIndexes.hxx b/include/connectivity/TIndexes.hxx
index 8409ef8..09a2273 100644
--- a/include/connectivity/TIndexes.hxx
+++ b/include/connectivity/TIndexes.hxx
@@ -32,9 +32,9 @@ namespace connectivity
OTableHelper* m_pTable;
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;
public:
OIndexesHelper(OTableHelper* _pTable,
diff --git a/include/connectivity/TKeyColumns.hxx b/include/connectivity/TKeyColumns.hxx
index 4d0ee1a..a93bf43 100644
--- a/include/connectivity/TKeyColumns.hxx
+++ b/include/connectivity/TKeyColumns.hxx
@@ -31,8 +31,8 @@ namespace connectivity
OTableKeyHelper* m_pKey;
protected:
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 css::uno::Reference< css::beans::XPropertySet > createDescriptor() override;
+ virtual void impl_refresh() throw(css::uno::RuntimeException) override;
public:
OKeyColumnsHelper( OTableKeyHelper* _pKey,
::osl::Mutex& _rMutex,
diff --git a/include/connectivity/TKeys.hxx b/include/connectivity/TKeys.hxx
index 53fbc0d..b8d32a9 100644
--- a/include/connectivity/TKeys.hxx
+++ b/include/connectivity/TKeys.hxx
@@ -33,9 +33,9 @@ namespace connectivity
OTableHelper* m_pTable;
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;
virtual OUString getDropForeignKey() const;
diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx
index 2ca18a7..b76c052 100644
--- a/include/connectivity/TTableHelper.hxx
+++ b/include/connectivity/TTableHelper.hxx
@@ -73,7 +73,7 @@ namespace connectivity
};
typedef connectivity::sdbcx::OTable OTable_TYPEDEF;
- OOO_DLLPUBLIC_DBTOOLS OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp);
+ OOO_DLLPUBLIC_DBTOOLS OUString getTypeString(const css::uno::Reference< css::beans::XPropertySet >& xColProp);
typedef std::map<OUString, sdbcx::TKeyProperties> TKeyMap;
@@ -126,10 +126,10 @@ namespace connectivity
public:
OTableHelper( sdbcx::OCollection* _pTables,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
+ const css::uno::Reference< css::sdbc::XConnection >& _xConnection,
bool _bCase);
OTableHelper( sdbcx::OCollection* _pTables,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
+ const css::uno::Reference< css::sdbc::XConnection >& _xConnection,
bool _bCase,
const OUString& _Name,
const OUString& _Type,
@@ -138,19 +138,19 @@ namespace connectivity
const OUString& _CatalogName = OUString()
);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() const override;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() const;
+ virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() const override;
+ css::uno::Reference< css::sdbc::XConnection> getConnection() const;
virtual void SAL_CALL acquire() throw() override;
virtual void SAL_CALL release() throw() override;
// XRename
- virtual void SAL_CALL rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL rename( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
// XAlterTable
- 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, std::exception) override;
+ virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
// XNamed
- virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
// helper method to get key properties
sdbcx::TKeyProperties getKeyProperties(const OUString& _sName) const;
@@ -158,10 +158,10 @@ namespace connectivity
virtual OUString getTypeCreatePattern() const;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XTableRename> getRenameService() const;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XTableAlteration> getAlterService() const;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XKeyAlteration> getKeyService() const;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XIndexAlteration> getIndexService() const;
+ css::uno::Reference< css::sdb::tools::XTableRename> getRenameService() const;
+ css::uno::Reference< css::sdb::tools::XTableAlteration> getAlterService() const;
+ css::uno::Reference< css::sdb::tools::XKeyAlteration> getKeyService() const;
+ css::uno::Reference< css::sdb::tools::XIndexAlteration> getIndexService() const;
};
}
#endif // INCLUDED_CONNECTIVITY_TTABLEHELPER_HXX
diff --git a/include/connectivity/conncleanup.hxx b/include/connectivity/conncleanup.hxx
index 3c13ba5..2b4da40 100644
--- a/include/connectivity/conncleanup.hxx
+++ b/include/connectivity/conncleanup.hxx
@@ -34,15 +34,15 @@ namespace dbtools
//= OAutoConnectionDisposer
- typedef ::cppu::WeakImplHelper < ::com::sun::star::beans::XPropertyChangeListener,
- ::com::sun::star::sdbc::XRowSetListener
+ typedef ::cppu::WeakImplHelper < css::beans::XPropertyChangeListener,
+ css::sdbc::XRowSetListener
> OAutoConnectionDisposer_Base;
class OOO_DLLPUBLIC_DBTOOLS OAutoConnectionDisposer : public OAutoConnectionDisposer_Base
{
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >
+ css::uno::Reference< css::sdbc::XConnection >
m_xOriginalConnection;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xRowSet; // needed to add as listener
+ css::uno::Reference< css::sdbc::XRowSet > m_xRowSet; // needed to add as listener
bool m_bRSListening : 1; // true when we're listening on rowset
bool m_bPropertyListening : 1; // true when we're listening for property changes
@@ -53,21 +53,21 @@ namespace dbtools
here) will be disposed.</p>
*/
OAutoConnectionDisposer(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection
+ const css::uno::Reference< css::sdbc::XRowSet >& _rxRowSet,
+ const css::uno::Reference< css::sdbc::XConnection >& _rxConnection
);
protected:
// XPropertyChangeListener
- virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) override;
// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override;
// XRowSetListener
- virtual void SAL_CALL cursorMoved( const ::com::sun::star::lang::EventObject& event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL rowChanged( const ::com::sun::star::lang::EventObject& event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL rowSetChanged( const ::com::sun::star::lang::EventObject& event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL cursorMoved( const css::lang::EventObject& event ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL rowChanged( const css::lang::EventObject& event ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL rowSetChanged( const css::lang::EventObject& event ) throw (css::uno::RuntimeException, std::exception) override;
private:
void clearConnection();
@@ -76,8 +76,8 @@ namespace dbtools
void stopRowSetListening();
bool isRowSetListening() const { return m_bRSListening; }
- void startPropertyListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps );
- void stopPropertyListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxEventSource );
+ void startPropertyListening( const css::uno::Reference< css::beans::XPropertySet >& _rxProps );
+ void stopPropertyListening( const css::uno::Reference< css::beans::XPropertySet >& _rxEventSource );
bool isPropertyListening() const { return m_bPropertyListening; }
};
diff --git a/include/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx
index 635ebf4..a79436e 100644
--- a/include/connectivity/dbconversion.hxx
+++ b/include/connectivity/dbconversion.hxx
@@ -67,74 +67,74 @@ namespace dbtools
{
namespace DBTypeConversion
{
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::util::Date getStandardDate();
- OOO_DLLPUBLIC_DBTOOLS void setValue(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate>& xVariant,
- const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& xFormatter,
- const ::com::sun::star::util::Date& rNullDate,
+ OOO_DLLPUBLIC_DBTOOLS css::util::Date getStandardDate();
+ OOO_DLLPUBLIC_DBTOOLS void setValue(const css::uno::Reference< css::sdb::XColumnUpdate>& xVariant,
+ const css::uno::Reference< css::util::XNumberFormatter>& xFormatter,
+ const css::util::Date& rNullDate,
const OUString& rString,
sal_Int32 nKey,
sal_Int16 nFieldType,
- sal_Int16 nKeyType) throw(::com::sun::star::lang::IllegalArgumentException);
+ sal_Int16 nKeyType) throw(css::lang::IllegalArgumentException);
- OOO_DLLPUBLIC_DBTOOLS void setValue(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate>& xVariant,
- const ::com::sun::star::util::Date& rNullDate,
+ OOO_DLLPUBLIC_DBTOOLS void setValue(const css::uno::Reference< css::sdb::XColumnUpdate>& xVariant,
+ const css::util::Date& rNullDate,
const double& rValue,
- sal_Int16 nKeyType) throw(::com::sun::star::lang::IllegalArgumentException);
+ sal_Int16 nKeyType) throw(css::lang::IllegalArgumentException);
- OOO_DLLPUBLIC_DBTOOLS double getValue( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& xVariant, const ::com::sun::star::util::Date& rNullDate );
+ OOO_DLLPUBLIC_DBTOOLS double getValue( const css::uno::Reference< css::sdb::XColumn>& xVariant, const css::util::Date& rNullDate );
// get the columnvalue as string with a default format given by the column or a default format
// for the type
OOO_DLLPUBLIC_DBTOOLS OUString getFormattedValue(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,
- const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& xFormatter,
- const ::com::sun::star::lang::Locale& _rLocale,
- const ::com::sun::star::util::Date& rNullDate);
+ const css::uno::Reference< css::beans::XPropertySet>& _xColumn,
+ const css::uno::Reference< css::util::XNumberFormatter>& xFormatter,
+ const css::lang::Locale& _rLocale,
+ const css::util::Date& rNullDate);
OOO_DLLPUBLIC_DBTOOLS OUString getFormattedValue(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _xColumn,
- const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& xFormatter,
- const ::com::sun::star::util::Date& rNullDate,
+ const css::uno::Reference< css::sdb::XColumn>& _xColumn,
+ const css::uno::Reference< css::util::XNumberFormatter>& xFormatter,
+ const css::util::Date& rNullDate,
sal_Int32 nKey,
sal_Int16 nKeyType);
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::util::Date toDate(double dVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate());
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::util::Date toDate(const OUString& _sSQLDate);
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::util::Time toTime(double dVal, short nDigits = 9);
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::util::Time toTime(const OUString& _sSQLDate);
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::util::DateTime toDateTime(double dVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate());
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::util::DateTime toDateTime(const OUString& _sSQLDate);
+ OOO_DLLPUBLIC_DBTOOLS css::util::Date toDate(double dVal, const css::util::Date& _rNullDate = getStandardDate());
+ OOO_DLLPUBLIC_DBTOOLS css::util::Date toDate(const OUString& _sSQLDate);
+ OOO_DLLPUBLIC_DBTOOLS css::util::Time toTime(double dVal, short nDigits = 9);
+ OOO_DLLPUBLIC_DBTOOLS css::util::Time toTime(const OUString& _sSQLDate);
+ OOO_DLLPUBLIC_DBTOOLS css::util::DateTime toDateTime(double dVal, const css::util::Date& _rNullDate = getStandardDate());
+ OOO_DLLPUBLIC_DBTOOLS css::util::DateTime toDateTime(const OUString& _sSQLDate);
- OOO_DLLPUBLIC_DBTOOLS sal_Int64 getNsFromTime(const ::com::sun::star::util::Time& rVal);
+ OOO_DLLPUBLIC_DBTOOLS sal_Int64 getNsFromTime(const css::util::Time& rVal);
- OOO_DLLPUBLIC_DBTOOLS sal_Int32 toDays(const ::com::sun::star::util::Date& _rVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate());
+ OOO_DLLPUBLIC_DBTOOLS sal_Int32 toDays(const css::util::Date& _rVal, const css::util::Date& _rNullDate = getStandardDate());
- OOO_DLLPUBLIC_DBTOOLS double toDouble(const ::com::sun::star::util::Date& rVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate());
- OOO_DLLPUBLIC_DBTOOLS double toDouble(const ::com::sun::star::util::Time& rVal);
- OOO_DLLPUBLIC_DBTOOLS double toDouble(const ::com::sun::star::util::DateTime& rVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate());
+ OOO_DLLPUBLIC_DBTOOLS double toDouble(const css::util::Date& rVal, const css::util::Date& _rNullDate = getStandardDate());
+ OOO_DLLPUBLIC_DBTOOLS double toDouble(const css::util::Time& rVal);
+ OOO_DLLPUBLIC_DBTOOLS double toDouble(const css::util::DateTime& rVal, const css::util::Date& _rNullDate = getStandardDate());
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::util::Date toDate(sal_Int32 _nVal);
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::util::Time toTime(sal_Int64 _nVal);
+ OOO_DLLPUBLIC_DBTOOLS css::util::Date toDate(sal_Int32 _nVal);
+ OOO_DLLPUBLIC_DBTOOLS css::util::Time toTime(sal_Int64 _nVal);
/** convert a double which is a date value relative to the standard db null date into a date value relative
to a given fixed date.
*/
- inline double toNullDate(const ::com::sun::star::util::Date& _rNullDate, double _rVal) { return _rVal - toDays(_rNullDate); }
+ inline double toNullDate(const css::util::Date& _rNullDate, double _rVal) { return _rVal - toDays(_rNullDate); }
// return the date from the numberformatsupplier or the STANDARD_DATE (1900,1,1)
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::util::Date getNULLDate(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > &xSupplier);
+ OOO_DLLPUBLIC_DBTOOLS css::util::Date getNULLDate(const css::uno::Reference< css::util::XNumberFormatsSupplier > &xSupplier);
// return the date in the format %04d-%02d-%02d
- OOO_DLLPUBLIC_DBTOOLS OUString toDateString(const ::com::sun::star::util::Date& rDate);
+ OOO_DLLPUBLIC_DBTOOLS OUString toDateString(const css::util::Date& rDate);
// return the time in the format %02d:%02d:%02d
- OOO_DLLPUBLIC_DBTOOLS OUString toTimeStringS(const ::com::sun::star::util::Time& rTime);
+ OOO_DLLPUBLIC_DBTOOLS OUString toTimeStringS(const css::util::Time& rTime);
// return the time in the format %02d:%02d:%02d.%09d
- OOO_DLLPUBLIC_DBTOOLS OUString toTimeString(const ::com::sun::star::util::Time& rTime);
+ OOO_DLLPUBLIC_DBTOOLS OUString toTimeString(const css::util::Time& rTime);
// return the DateTime in the format %04d-%02d-%02d %02d:%02d:%02d.%09d
- OOO_DLLPUBLIC_DBTOOLS OUString toDateTimeString(const ::com::sun::star::util::DateTime& _rDateTime);
+ OOO_DLLPUBLIC_DBTOOLS OUString toDateTimeString(const css::util::DateTime& _rDateTime);
// return the any in an sql standard format
- OOO_DLLPUBLIC_DBTOOLS OUString toSQLString(sal_Int32 eType, const ::com::sun::star::uno::Any& _rVal, bool bQuote,
- const ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter >& _rxTypeConverter);
+ OOO_DLLPUBLIC_DBTOOLS OUString toSQLString(sal_Int32 eType, const css::uno::Any& _rVal, bool bQuote,
+ const css::uno::Reference< css::script::XTypeConverter >& _rxTypeConverter);
/** converts a Unicode string into a 8-bit string, using the given encoding
@@ -145,7 +145,7 @@ namespace dbtools
@param _eEncoding
the encoding to use for the conversion
- @throws com::sun::star::sdbc::SQLException
+ @throws css::sdbc::SQLException
if the given string contains characters which are not convertible using the given encoding
The SQLState of the exception will be set to 22018 ("Invalid character value for cast specification")
@@ -172,10 +172,10 @@ namespace dbtools
@param _eEncoding
the encoding to use for the conversion
- @throws com::sun::star::sdbc::SQLException
+ @throws css::sdbc::SQLException
if convertUnicodeString, which is called internally, throws such an exception
- @throws com::sun::star::sdbc::SQLException
+ @throws css::sdbc::SQLException
if the conversion results in a string which is longer than _nMaxLen
@return
diff --git a/include/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx
index 5afd23a..69c3a0f 100644
--- a/include/connectivity/dbexception.hxx
+++ b/include/connectivity/dbexception.hxx
@@ -65,14 +65,14 @@ public:
enum TYPE { SQL_EXCEPTION, SQL_WARNING, SQL_CONTEXT, UNDEFINED };
private:
- ::com::sun::star::uno::Any m_aContent;
+ css::uno::Any m_aContent;
TYPE m_eType; // redundant (could be derived from m_aContent.getValueType())
public:
SQLExceptionInfo();
- SQLExceptionInfo(const ::com::sun::star::sdbc::SQLException& _rError);
- SQLExceptionInfo(const ::com::sun::star::sdbc::SQLWarning& _rError);
- SQLExceptionInfo(const ::com::sun::star::sdb::SQLContext& _rError);
+ SQLExceptionInfo(const css::sdbc::SQLException& _rError);
+ SQLExceptionInfo(const css::sdbc::SQLWarning& _rError);
+ SQLExceptionInfo(const css::sdb::SQLContext& _rError);
/** convenience constructor
@@ -86,7 +86,7 @@ public:
SQLExceptionInfo(const SQLExceptionInfo& _rCopySource);
// use for events got via XSQLErrorListener::errorOccured
- SQLExceptionInfo(const ::com::sun::star::uno::Any& _rError);
+ SQLExceptionInfo(const css::uno::Any& _rError);
// use with the Reason member of an SQLErrorEvent or with NextElement of an SQLException
/** prepends a plain error message to the chain of exceptions
@@ -121,22 +121,22 @@ public:
*/
void doThrow();
- const SQLExceptionInfo& operator=(const ::com::sun::star::sdbc::SQLException& _rError);
- const SQLExceptionInfo& operator=(const ::com::sun::star::sdbc::SQLWarning& _rError);
- const SQLExceptionInfo& operator=(const ::com::sun::star::sdb::SQLContext& _rError);
- const SQLExceptionInfo& operator=(const ::com::sun::star::sdb::SQLErrorEvent& _rErrorEvent);
- const SQLExceptionInfo& operator=(const ::com::sun::star::uno::Any& _rCaughtSQLException);
+ const SQLExceptionInfo& operator=(const css::sdbc::SQLException& _rError);
+ const SQLExceptionInfo& operator=(const css::sdbc::SQLWarning& _rError);
+ const SQLExceptionInfo& operator=(const css::sdb::SQLContext& _rError);
+ const SQLExceptionInfo& operator=(const css::sdb::SQLErrorEvent& _rErrorEvent);
+ const SQLExceptionInfo& operator=(const css::uno::Any& _rCaughtSQLException);
bool isKindOf(TYPE _eType) const;
// not just a simple comparisation ! e.g. getType() == SQL_CONTEXT implies isKindOf(SQL_EXCEPTION) == sal_True !
bool isValid() const { return m_eType != UNDEFINED; }
TYPE getType() const { return m_eType; }
- operator const ::com::sun::star::sdbc::SQLException* () const;
- operator const ::com::sun::star::sdbc::SQLWarning* () const;
- operator const ::com::sun::star::sdb::SQLContext* () const;
+ operator const css::sdbc::SQLException* () const;
+ operator const css::sdbc::SQLWarning* () const;
+ operator const css::sdb::SQLContext* () const;
- const ::com::sun::star::uno::Any& get() const { return m_aContent; }
+ const css::uno::Any& get() const { return m_aContent; }
void clear()
{
@@ -155,7 +155,7 @@ protected:
class OOO_DLLPUBLIC_DBTOOLS SQLExceptionIteratorHelper
{
protected:
- const ::com::sun::star::sdbc::SQLException* m_pCurrent;
+ const css::sdbc::SQLException* m_pCurrent;
SQLExceptionInfo::TYPE m_eCurrentType;
public:
@@ -165,7 +165,7 @@ public:
the start of the exception chain to iterate. Must live as long as the iterator
instances lives, at least.
*/
- SQLExceptionIteratorHelper( const ::com::sun::star::sdbc::SQLException& _rChainStart );
+ SQLExceptionIteratorHelper( const css::sdbc::SQLException& _rChainStart );
/** constructs an iterator instance from an SQLExceptionInfo
@@ -182,7 +182,7 @@ public:
/** retrieves the current element in the chain, or <NULL/> if the chain has been completely
traveled.
*/
- const ::com::sun::star::sdbc::SQLException* current() const { return m_pCurrent; }
+ const css::sdbc::SQLException* current() const { return m_pCurrent; }
/** retrieves the current element in the chain, or <NULL/> if the chain has been completely
traveled.
@@ -196,7 +196,7 @@ public:
@return the current element in the chain, as <b>before</em> the chain move.
*/
- const ::com::sun::star::sdbc::SQLException* next();
+ const css::sdbc::SQLException* next();
/** proceeds to the next element in the chain
@@ -224,52 +224,52 @@ OOO_DLLPUBLIC_DBTOOLS OUString getStandardSQLState( StandardSQLState _eState );
*/
OOO_DLLPUBLIC_DBTOOLS void throwFunctionNotSupportedSQLException(
const OUString& _rFunctionName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
- const ::com::sun::star::uno::Any& _rNextException = ::com::sun::star::uno::Any()
+ const css::uno::Reference< css::uno::XInterface >& _rxContext,
+ const css::uno::Any& _rNextException = css::uno::Any()
)
- throw ( ::com::sun::star::sdbc::SQLException );
+ throw ( css::sdbc::SQLException );
OOO_DLLPUBLIC_DBTOOLS void throwFunctionNotSupportedRuntimeException(
const OUString& _rFunctionName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext
+ const css::uno::Reference< css::uno::XInterface >& _rxContext
)
throw (css::uno::RuntimeException );
/** throws a function sequence (HY010) exception
*/
OOO_DLLPUBLIC_DBTOOLS void throwFunctionSequenceException(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _Context,
- const ::com::sun::star::uno::Any& _Next = ::com::sun::star::uno::Any()
+ const css::uno::Reference< css::uno::XInterface >& _Context,
+ const css::uno::Any& _Next = css::uno::Any()
)
- throw ( ::com::sun::star::sdbc::SQLException );
+ throw ( css::sdbc::SQLException );
/** throw a invalid index sqlexception
*/
OOO_DLLPUBLIC_DBTOOLS void throwInvalidIndexException(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _Context,
- const ::com::sun::star::uno::Any& _Next = ::com::sun::star::uno::Any()
+ const css::uno::Reference< css::uno::XInterface >& _Context,
+ const css::uno::Any& _Next = css::uno::Any()
)
- throw ( ::com::sun::star::sdbc::SQLException );
+ throw ( css::sdbc::SQLException );
/** throw a generic SQLException, i.e. one with an SQLState of HY000, an ErrorCode of 0 and no NextException
*/
OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException(
const OUString& _rMsg,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSource
+ const css::uno::Reference< css::uno::XInterface >& _rxSource
)
- throw (::com::sun::star::sdbc::SQLException);
+ throw (css::sdbc::SQLException);
/** throw a generic SQLException, i.e. one with an SQLState of HY000, an ErrorCode of 0 and no NextException
*/
OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException(
const OUString& _rMsg,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSource,
- const ::com::sun::star::uno::Any& _rNextException
+ const css::uno::Reference< css::uno::XInterface >& _rxSource,
+ const css::uno::Any& _rNextException
)
- throw (::com::sun::star::sdbc::SQLException);
+ throw (css::sdbc::SQLException);
/** throw a SQLException with SQLState HYC00 (Optional feature not implemented)
@@ -283,8 +283,8 @@ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException(
*/
OOO_DLLPUBLIC_DBTOOLS void throwFeatureNotImplementedSQLException(
const OUString& _rFeatureName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
- const ::com::sun::star::uno::Any* _pNextException = NULL
+ const css::uno::Reference< css::uno::XInterface >& _rxContext,
+ const css::uno::Any* _pNextException = NULL
)
throw (css::sdbc::SQLException);
@@ -299,7 +299,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwFeatureNotImplementedSQLException(
*/
OOO_DLLPUBLIC_DBTOOLS void throwFeatureNotImplementedRuntimeException(
const OUString& _rFeatureName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext
+ const css::uno::Reference< css::uno::XInterface >& _rxContext
)
throw (css::uno::RuntimeException);
@@ -311,9 +311,9 @@ OOO_DLLPUBLIC_DBTOOLS void throwFeatureNotImplementedRuntimeException(
*/
OOO_DLLPUBLIC_DBTOOLS void throwInvalidColumnException(
const OUString& _rColumnName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext
+ const css::uno::Reference< css::uno::XInterface >& _rxContext
)
- throw (::com::sun::star::sdbc::SQLException);
+ throw (css::sdbc::SQLException);
/** throws an SQLException
@@ -321,11 +321,11 @@ OOO_DLLPUBLIC_DBTOOLS void throwInvalidColumnException(
OOO_DLLPUBLIC_DBTOOLS void throwSQLException(
const OUString& _rMessage,
const OUString& _rSQLState,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
+ const css::uno::Reference< css::uno::XInterface >& _rxContext,
const sal_Int32 _nErrorCode = 0,
- const ::com::sun::star::uno::Any* _pNextException = NULL
+ const css::uno::Any* _pNextException = NULL
)
- throw (::com::sun::star::sdbc::SQLException);
+ throw (css::sdbc::SQLException);
/** throws an SQLException
@@ -333,11 +333,11 @@ OOO_DLLPUBLIC_DBTOOLS void throwSQLException(
OOO_DLLPUBLIC_DBTOOLS void throwSQLException(
const OUString& _rMessage,
StandardSQLState _eSQLState,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
+ const css::uno::Reference< css::uno::XInterface >& _rxContext,
const sal_Int32 _nErrorCode = 0,
- const ::com::sun::star::uno::Any* _pNextException = NULL
+ const css::uno::Any* _pNextException = NULL
)
- throw (::com::sun::star::sdbc::SQLException);
+ throw (css::sdbc::SQLException);
} // namespace dbtools
diff --git a/include/connectivity/dbmetadata.hxx b/include/connectivity/dbmetadata.hxx
index 148763d..1a1d53a 100644
--- a/include/connectivity/dbmetadata.hxx
+++ b/include/connectivity/dbmetadata.hxx
@@ -60,16 +60,16 @@ namespace dbtools
if this connection denotes an application-level connection, i.e. supports
the com.sun.star.sdb.Connection service.
- @throws ::com::sun::star::lang::IllegalArgumentException
+ @throws css::lang::IllegalArgumentException
if the given connection is not <NULL/>, but the XDatabaseMetaData provided by it
are <NULL/>
- @throws ::com::sun::star::sdbc::SQLException
+ @throws css::sdbc::SQLException
if obtaining the meta data from the connection throws an SQLException
- @throws ::com::sun::star::uno::RuntimeException
+ @throws css::uno::RuntimeException
if obtaining the meta data from the connection throws an RuntimeException
*/
DatabaseMetaData(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _connection );
+ const css::uno::Reference< css::sdbc::XConnection >& _connection );
DatabaseMetaData( const DatabaseMetaData& _copyFrom );
DatabaseMetaData& operator=( const DatabaseMetaData& _copyFrom );
@@ -85,7 +85,7 @@ namespace dbtools
/** resets the instance so that it's based on a new connection
*/
- inline void reset( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _connection )
+ inline void reset( const css::uno::Reference< css::sdbc::XConnection >& _connection )
{
*this = DatabaseMetaData( _connection );
}
@@ -98,7 +98,7 @@ namespace dbtools
/** determines whether the database supports sub queries in the FROM part
of a SELECT clause are supported.
- @throws ::com::sun::star::sdbc::SQLException
+ @throws css::sdbc::SQLException
with SQLState 08003 (connection does not exist) if the instances was
default-constructed and does not have a connection, yet.
*/
@@ -140,7 +140,7 @@ namespace dbtools
/** determines the syntax to use for boolean comparison predicates
- @see ::com::sun::star::sdb::BooleanComparisonMode
+ @see css::sdb::BooleanComparisonMode
*/
sal_Int32
getBooleanComparisonMode() const;
diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx
index 2e185ee..5eb7276 100644
--- a/include/connectivity/dbtools.hxx
+++ b/include/connectivity/dbtools.hxx
@@ -77,7 +77,7 @@ namespace task {
namespace dbtools
{
class ISQLStatementHelper;
- typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection > SharedConnection;
+ typedef ::utl::SharedUNOComponent< css::sdbc::XConnection > SharedConnection;
enum EComposeRule
{
@@ -93,9 +93,9 @@ namespace dbtools
// calculates the default numberformat for a given datatype and a give language
OOO_DLLPUBLIC_DBTOOLS
- sal_Int32 getDefaultNumberFormat(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xColumn,
- const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes >& _xTypes,
- const ::com::sun::star::lang::Locale& _rLocale);
+ sal_Int32 getDefaultNumberFormat(const css::uno::Reference< css::beans::XPropertySet >& _xColumn,
+ const css::uno::Reference< css::util::XNumberFormatTypes >& _xTypes,
+ const css::lang::Locale& _rLocale);
// calculates the default numberformat for a given datatype and a give language
// @param _nDataType @see com.sun.star.sdbc.DataType
@@ -104,8 +104,8 @@ namespace dbtools
sal_Int32 getDefaultNumberFormat(sal_Int32 _nDataType,
sal_Int32 _nScale,
bool _bIsCurrency,
- const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes >& _xTypes,
- const ::com::sun::star::lang::Locale& _rLocale);
+ const css::uno::Reference< css::util::XNumberFormatTypes >& _xTypes,
+ const css::lang::Locale& _rLocale);
@@ -144,9 +144,9 @@ namespace dbtools
there's no resource leak from an un-owned connection object.
*/
OOO_DLLPUBLIC_DBTOOLS
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> connectRowset(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext,
+ css::uno::Reference< css::sdbc::XConnection> connectRowset(
+ const css::uno::Reference< css::sdbc::XRowSet>& _rxRowSet,
+ const css::uno::Reference< css::uno::XComponentContext>& _rxContext,
bool _bSetAsActiveConnection
);
@@ -174,43 +174,43 @@ namespace dbtools
</ul>
*/
OOO_DLLPUBLIC_DBTOOLS SharedConnection ensureRowSetConnection(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext,
+ const css::uno::Reference< css::sdbc::XRowSet>& _rxRowSet,
+ const css::uno::Reference< css::uno::XComponentContext>& _rxContext,
bool _bUseAutoConnectionDisposer
);
/** returns the connection the RowSet is currently working with (which is the ActiveConnection property)
*/
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet) throw (::com::sun::star::uno::RuntimeException);
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback(
+ OOO_DLLPUBLIC_DBTOOLS css::uno::Reference< css::sdbc::XConnection> getConnection(const css::uno::Reference< css::sdbc::XRowSet>& _rxRowSet) throw (css::uno::RuntimeException);
+ OOO_DLLPUBLIC_DBTOOLS css::uno::Reference< css::sdbc::XConnection> getConnection_withFeedback(
const OUString& _rDataSourceName,
const OUString& _rUser,
const OUString& _rPwd,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext);
+ const css::uno::Reference< css::uno::XComponentContext>& _rxContext);
/** determines whether the given component is part of a document which is an embedded database
document (such as a form)
*/
OOO_DLLPUBLIC_DBTOOLS bool isEmbeddedInDatabase(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent,
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxActualConnection
+ const css::uno::Reference< css::uno::XInterface >& _rxComponent,
+ css::uno::Reference< css::sdbc::XConnection >& _rxActualConnection
);
/** returns the columns of the named table of the given connection
*/
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getTableFields(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn,
+ OOO_DLLPUBLIC_DBTOOLS css::uno::Reference< css::container::XNameAccess> getTableFields(
+ const css::uno::Reference< css::sdbc::XConnection>& _rxConn,
const OUString& _rName
);
/** returns the primary key columns of the table
*/
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getPrimaryKeyColumns_throw(
- const ::com::sun::star::uno::Any& i_aTable
+ OOO_DLLPUBLIC_DBTOOLS css::uno::Reference< css::container::XNameAccess> getPrimaryKeyColumns_throw(
+ const css::uno::Any& i_aTable
);
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getPrimaryKeyColumns_throw(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& i_xTable
+ OOO_DLLPUBLIC_DBTOOLS css::uno::Reference< css::container::XNameAccess> getPrimaryKeyColumns_throw(
+ const css::uno::Reference< css::beans::XPropertySet >& i_xTable
);
/** get fields for a result set given by a "command descriptor"
@@ -253,12 +253,12 @@ namespace dbtools
the container of the columns (aka fields) of the object
*/
OOO_DLLPUBLIC_DBTOOLS
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
+ css::uno::Reference< css::container::XNameAccess >
getFieldsByCommandDescriptor(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
+ const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,
const sal_Int32 _nCommandType,
const OUString& _rCommand,
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive,
+ css::uno::Reference< css::lang::XComponent >& _rxKeepFieldsAlive,
SQLExceptionInfo* _pErrorInfo = NULL
);
@@ -290,29 +290,29 @@ namespace dbtools
@return
an array of strings containing the names of the columns (aka fields) of the object
*/
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Sequence< OUString >
+ OOO_DLLPUBLIC_DBTOOLS css::uno::Sequence< OUString >
getFieldNamesByCommandDescriptor(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
+ const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,
const sal_Int32 _nCommandType,
const OUString& _rCommand,
SQLExceptionInfo* _pErrorInfo = NULL
);
- /** create a new ::com::sun::star::sdbc::SQLContext, fill it with the given descriptions and the given source,
+ /** create a new css::sdbc::SQLContext, fill it with the given descriptions and the given source,
and <i>append</i> _rException (i.e. put it into the NextException member of the SQLContext).
*/
OOO_DLLPUBLIC_DBTOOLS
- ::com::sun::star::sdbc::SQLException prependErrorInfo(
- const ::com::sun::star::sdbc::SQLException& _rChainedException,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
+ css::sdbc::SQLException prependErrorInfo(
+ const css::sdbc::SQLException& _rChainedException,
+ const css::uno::Reference< css::uno::XInterface >& _rxContext,
const OUString& _rAdditionalError,
const StandardSQLState _eSQLState = SQL_ERROR_UNSPECIFIED,
const sal_Int32 _nErrorCode = 0);
/** search the parent hierarchy for a data source.
*/
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> findDataSource(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParent);
+ OOO_DLLPUBLIC_DBTOOLS css::uno::Reference< css::sdbc::XDataSource> findDataSource(const css::uno::Reference< css::uno::XInterface >& _xParent);
/** determines the value of a boolean data source setting, given by ASCII name
@@ -322,7 +322,7 @@ namespace dbtools
the ASCII name of the setting
*/
OOO_DLLPUBLIC_DBTOOLS bool getBooleanDataSourceSetting(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
+ const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,
const sal_Char* _pAsciiSettingName
);
@@ -332,7 +332,7 @@ namespace dbtools
instead of spreading this knowledge through all callers.
*/
OOO_DLLPUBLIC_DBTOOLS
- bool isDataSourcePropertyEnabled(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xProp,
+ bool isDataSourcePropertyEnabled(const css::uno::Reference< css::uno::XInterface>& _xProp,
const OUString& _sProperty,
bool _bDefault = false);
@@ -346,24 +346,24 @@ namespace dbtools
the value of the setting, upon successful return
@return
- <FALSE/> if the setting is not present in the <member scope="com::sun::star::sdb">DataSource::Info</member>
+ <FALSE/> if the setting is not present in the <member scope="css::sdb">DataSource::Info</member>
member of the data source
<TRUE/> otherwise
*/
OOO_DLLPUBLIC_DBTOOLS
bool getDataSourceSetting(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDataSource,
+ const css::uno::Reference< css::uno::XInterface >& _rxDataSource,
const sal_Char* _pAsciiSettingsName,
- ::com::sun::star::uno::Any& /* [out] */ _rSettingsValue
+ css::uno::Any& /* [out] */ _rSettingsValue
);
OOO_DLLPUBLIC_DBTOOLS
bool getDataSourceSetting(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDataSource,
+ const css::uno::Reference< css::uno::XInterface >& _rxDataSource,
const OUString& _sSettingsName,
- ::com::sun::star::uno::Any& /* [out] */ _rSettingsValue
+ css::uno::Any& /* [out] */ _rSettingsValue
);
- OOO_DLLPUBLIC_DBTOOLS OUString getDefaultReportEngineServiceName(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory);
+ OOO_DLLPUBLIC_DBTOOLS OUString getDefaultReportEngineServiceName(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory);
/** quote the given name with the given quote string.
*/
@@ -372,7 +372,7 @@ namespace dbtools
/** quote the given table name (which may contain a catalog and a schema) according to the rules provided by the meta data
*/
OOO_DLLPUBLIC_DBTOOLS
- OUString quoteTableName(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _rxMeta
+ OUString quoteTableName(const css::uno::Reference< css::sdbc::XDatabaseMetaData>& _rxMeta
, const OUString& _rName
,EComposeRule _eComposeRule);
@@ -384,7 +384,7 @@ namespace dbtools
@param _rName (out parameter) upon return, contains the table name
@param _eComposeRule where do you need the name for
*/
- OOO_DLLPUBLIC_DBTOOLS void qualifiedNameComponents(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxConnMetaData,
+ OOO_DLLPUBLIC_DBTOOLS void qualifiedNameComponents(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rxConnMetaData,
const OUString& _rQualifiedName, OUString& _rCatalog, OUString& _rSchema, OUString& _rName,EComposeRule _eComposeRule);
/** calculate a NumberFormatsSupplier for use with an given connection
@@ -395,23 +395,23 @@ namespace dbtools
@param _rxFactory required (only of _bAllowDefault is sal_True) for creating the DatabaseEnvironment.
@return the formatter all object related to the given connection should work with.
*/
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn,
+ OOO_DLLPUBLIC_DBTOOLS css::uno::Reference< css::util::XNumberFormatsSupplier> getNumberFormats(
+ const css::uno::Reference< css::sdbc::XConnection>& _rxConn,
bool _bAllowDefault = false,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>()
+ const css::uno::Reference< css::uno::XComponentContext>& _rxContext = css::uno::Reference< css::uno::XComponentContext>()
);
- /** create an com::sun::star::sdb::XSingleSelectQueryComposer which represents
+ /** create an css::sdb::XSingleSelectQueryComposer which represents
the current settings (Command/CommandType/Filter/Order) of the given rowset.
- As such an instance can be obtained from a com::sun::star::sdb::Connection
+ As such an instance can be obtained from a css::sdb::Connection
only the function searches for the connection the RowSet is using via connectRowset.
This implies that a connection will be set on the RowSet if needed.
(need to changes this sometimes ...)
*/
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > getCurrentSettingsComposer(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxRowSetProps,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext
+ OOO_DLLPUBLIC_DBTOOLS css::uno::Reference< css::sdb::XSingleSelectQueryComposer > getCurrentSettingsComposer(
+ const css::uno::Reference< css::beans::XPropertySet>& _rxRowSetProps,
+ const css::uno::Reference< css::uno::XComponentContext>& _rxContext
);
/** transfer and translate properties between two FormComponents
@@ -420,28 +420,28 @@ namespace dbtools
@param _rLocale the locale for converting number related properties
*/
OOO_DLLPUBLIC_DBTOOLS void TransferFormComponentProperties(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxOld,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxNew,
- const ::com::sun::star::lang::Locale& _rLocale
+ const css::uno::Reference< css::beans::XPropertySet>& _rxOld,
+ const css::uno::Reference< css::beans::XPropertySet>& _rxNew,
+ const css::lang::Locale& _rLocale
);
- /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT
+ /** check if the property "Privileges" supports css::sdbcx::Privilege::INSERT
@param _rxCursorSet the property set
*/
- OOO_DLLPUBLIC_DBTOOLS bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet);
- /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::UPDATE
+ OOO_DLLPUBLIC_DBTOOLS bool canInsert(const css::uno::Reference< css::beans::XPropertySet>& _rxCursorSet);
+ /** check if the property "Privileges" supports css::sdbcx::Privilege::UPDATE
@param _rxCursorSet the property set
*/
- OOO_DLLPUBLIC_DBTOOLS bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet);
- /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::DELETE
+ OOO_DLLPUBLIC_DBTOOLS bool canUpdate(const css::uno::Reference< css::beans::XPropertySet>& _rxCursorSet);
+ /** check if the property "Privileges" supports css::sdbcx::Privilege::DELETE
@param _rxCursorSet the property set
*/
- OOO_DLLPUBLIC_DBTOOLS bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet);
+ OOO_DLLPUBLIC_DBTOOLS bool canDelete(const css::uno::Reference< css::beans::XPropertySet>& _rxCursorSet);
/** compose a complete table name from it's up to three parts, regarding to the database meta data composing rules
*/
- OOO_DLLPUBLIC_DBTOOLS OUString composeTableName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxMetaData,
+ OOO_DLLPUBLIC_DBTOOLS OUString composeTableName( const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rxMetaData,
const OUString& _rCatalog,
const OUString& _rSchema,
const OUString& _rName,
@@ -455,7 +455,7 @@ namespace dbtools
in the data source which the connection belongs to.
*/
OOO_DLLPUBLIC_DBTOOLS OUString composeTableNameForSelect(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
+ const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,
const OUString& _rCatalog,
const OUString& _rSchema,
const OUString& _rName );
@@ -467,29 +467,29 @@ namespace dbtools
in the data source which the connection belongs to.
*/
OOO_DLLPUBLIC_DBTOOLS OUString composeTableNameForSelect(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable );
+ const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,
+ const css::uno::Reference< css::beans::XPropertySet>& _xTable );
- /** compose the table name out of the property set which must support the properties from the service <member scope= "com::sun::star::sdbcx">table</member>
+ /** compose the table name out of the property set which must support the properties from the service <member scope= "css::sdbcx">table</member>
@param _xMetaData
The metadata from the connection.
@param _xTable
The table.
*/
OOO_DLLPUBLIC_DBTOOLS OUString composeTableName(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable,
+ const css::uno::Reference< css::sdbc::XDatabaseMetaData>& _xMetaData,
+ const css::uno::Reference< css::beans::XPropertySet>& _xTable,
EComposeRule _eComposeRule,
bool _bSuppressCatalogName,
bool _bSuppressSchemaName,
bool _bQuote);
- OOO_DLLPUBLIC_DBTOOLS sal_Int32 getSearchColumnFlag( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn,
+ OOO_DLLPUBLIC_DBTOOLS sal_Int32 getSearchColumnFlag( const css::uno::Reference< css::sdbc::XConnection>& _rxConn,
sal_Int32 _nDataType);
// return the datasource for the given datasource name
- OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> getDataSource(const OUString& _rsDataSourceName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext);
+ OOO_DLLPUBLIC_DBTOOLS css::uno::Reference< css::sdbc::XDataSource> getDataSource(const OUString& _rsDataSourceName,
+ const css::uno::Reference< css::uno::XComponentContext>& _rxContext);
/** search for a name that is NOT in the NameAcces
@param _rxContainer
@@ -502,14 +502,14 @@ namespace dbtools
A name which doesn't exist in the collection.
*/
OOO_DLLPUBLIC_DBTOOLS
- OUString createUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxContainer,
+ OUString createUniqueName(const css::uno::Reference< css::container::XNameAccess>& _rxContainer,
const OUString& _rBaseName,
bool _bStartWithNumber = true);
/** creates a unique name which is not already used in the given name array
*/
OOO_DLLPUBLIC_DBTOOLS OUString createUniqueName(
- const ::com::sun::star::uno::Sequence< OUString >& _rNames,
+ const css::uno::Sequence< OUString >& _rNames,
const OUString& _rBaseName,
bool _bStartWithNumber = true
);
@@ -533,8 +533,8 @@ namespace dbtools
OOO_DLLPUBLIC_DBTOOLS
void showError( const SQLExceptionInfo& _rInfo,
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& _pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext);
+ const css::uno::Reference< css::awt::XWindow>& _pParent,
+ const css::uno::Reference< css::uno::XComponentContext>& _rxContext);
/** implements <method scope="com.sun.star.sdb">XRowUpdate::updateObject</method>
<p>The object which is to be set is analyzed, and in case it is a simlpe scalar type for which there
@@ -549,51 +549,51 @@ namespace dbtools
<TRUE/> if the update request was successfully re-routed to one of the other updateXXX methods
*/
OOO_DLLPUBLIC_DBTOOLS
- bool implUpdateObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate >& _rxUpdatedObject,
+ bool implUpdateObject( const css::uno::Reference< css::sdbc::XRowUpdate >& _rxUpdatedObject,
const sal_Int32 _nColumnIndex,
- const ::com::sun::star::uno::Any& _rValue);
+ const css::uno::Any& _rValue);
/** ask the user for parameters if the prepared statement needs some and sets them in the prepared statement
- @param _xConnection the connection must be able to create com::sun::star::sdb::SingleSelectQueryComposers
+ @param _xConnection the connection must be able to create css::sdb::SingleSelectQueryComposers
@param _xPreparedStmt the prepared statement where the parameters could be set when needed
@param _aParametersSet contains which parameters have to asked for and which already have set.
*/
OOO_DLLPUBLIC_DBTOOLS
- void askForParameters( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& _xComposer,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _xParameters,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
- const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxHandler,
+ void askForParameters( const css::uno::Reference< css::sdb::XSingleSelectQueryComposer >& _xComposer,
+ const css::uno::Reference< css::sdbc::XParameters>& _xParameters,
+ const css::uno::Reference< css::sdbc::XConnection>& _xConnection,
+ const css::uno::Reference< css::task::XInteractionHandler >& _rxHandler,
const ::std::vector<bool, std::allocator<bool> >& _aParametersSet = ::std::vector<bool, std::allocator<bool> >());
- /** call the appropriate set method for the specific sql type @see com::sun::star::sdbc::DataType
+ /** call the appropriate set method for the specific sql type @see css::sdbc::DataType
@param _xParams the parameters where to set the value
@param parameterIndex the index of the parameter, 1 based
@param x the value to set
- @param sqlType the corresponding sql type @see com::sun::star::sdbc::DataType
+ @param sqlType the corresponding sql type @see css::sdbc::DataType
@param scale the scale of the sql type can be 0
*/
OOO_DLLPUBLIC_DBTOOLS
- void setObjectWithInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _xParameters,
+ void setObjectWithInfo( const css::uno::Reference< css::sdbc::XParameters>& _xParameters,
sal_Int32 parameterIndex,
- const ::com::sun::star::uno::Any& x,
+ const css::uno::Any& x,
sal_Int32 sqlType,
- sal_Int32 scale=0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ sal_Int32 scale=0) throw(css::sdbc::SQLException, css::uno::RuntimeException);
- /** call the appropriate set method for the specific sql type @see com::sun::star::sdbc::DataType
+ /** call the appropriate set method for the specific sql type @see css::sdbc::DataType
@param _xParams the parameters where to set the value
@param parameterIndex the index of the parameter, 1 based
@param x the value to set
- @param sqlType the corresponding sql type @see com::sun::star::sdbc::DataType
+ @param sqlType the corresponding sql type @see css::sdbc::DataType
@param scale the scale of the sql type can be 0
*/
OOO_DLLPUBLIC_DBTOOLS
- void setObjectWithInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _xParameters,
+ void setObjectWithInfo( const css::uno::Reference< css::sdbc::XParameters>& _xParameters,
sal_Int32 parameterIndex,
const ::connectivity::ORowSetValue& x,
sal_Int32 sqlType,
- sal_Int32 scale=0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ sal_Int32 scale=0) throw(css::sdbc::SQLException, css::uno::RuntimeException);
/** implements <method scope="com.sun.star.sdb">XParameters::setObject</method>
@@ -609,9 +609,9 @@ namespace dbtools
<TRUE/> if the update request was successfully re-routed to one of the other updateXXX methods
*/
OOO_DLLPUBLIC_DBTOOLS
- bool implSetObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _rxParameters,
+ bool implSetObject( const css::uno::Reference< css::sdbc::XParameters>& _rxParameters,
const sal_Int32 _nColumnIndex,
- const ::com::sun::star::uno::Any& _rValue);
+ const css::uno::Any& _rValue);
/** creates the standard sql create table statement without the key part.
@param descriptor
@@ -622,8 +622,8 @@ namespace dbtools
The scale will also be added when the value is 0.
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list