diff options
Diffstat (limited to 'include/connectivity')
42 files changed, 663 insertions, 663 deletions
diff --git a/include/connectivity/BlobHelper.hxx b/include/connectivity/BlobHelper.hxx index 041d8444cb64..b05f3f527429 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 bec1ee33078e..7a798c6e4696 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 413cb4905eb0..3ae6b262823e 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 143f5326d90a..4a40d9c338c6 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 ebb228cfa7a2..247b5615442c 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 078ae891858d..a7bb4648834a 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 8aa9404982ff..1aa9d151c6e6 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 163cad9a8ecb..3f70e607fa04 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 a7cc2becc50e..f1997b755b26 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 7472719328b1..704946b46d8c 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 abdab99d350d..0c970aee722b 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 980f022caaa2..363285565540 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 8409ef803c76..09a22737cff0 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 4d0ee1a2ee70..a93bf43e57e2 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 53fbc0dd48e1..b8d32a9217f8 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 2ca18a77e539..b76c0527109c 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 3c13ba5198e1..2b4da40dd176 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 635ebf4c2448..a79436eb5685 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 5afd23aaa62c..69c3a0f1e347 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 148763d9dfe5..1a1d53a02759 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 2e185ee51356..5eb727674733 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. */ OOO_DLLPUBLIC_DBTOOLS - OUString createStandardCreateStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, + OUString createStandardCreateStatement( const css::uno::Reference< css::beans::XPropertySet >& descriptor, + const css::uno::Reference< css::sdbc::XConnection>& _xConnection, ISQLStatementHelper* _pHelper, const OUString& _sCreatePattern = OUString()); @@ -634,8 +634,8 @@ namespace dbtools The connection. */ OOO_DLLPUBLIC_DBTOOLS - OUString createStandardKeyStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); + OUString createStandardKeyStatement( const css::uno::Reference< css::beans::XPropertySet >& descriptor, + const css::uno::Reference< css::sdbc::XConnection>& _xConnection); /** creates the standard sql statement for the type part of a create or alter table statement. @param _pHelper @@ -646,8 +646,8 @@ namespace dbtools The connection. */ OOO_DLLPUBLIC_DBTOOLS - OUString createStandardTypePart( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection + OUString createStandardTypePart( const css::uno::Reference< css::beans::XPropertySet >& descriptor + ,const css::uno::Reference< css::sdbc::XConnection>& _xConnection ,const OUString& _sCreatePattern = OUString()); /** creates the standard sql statement for the column part of a create table statement. @@ -661,8 +661,8 @@ namespace dbtools Allow to add special SQL constructs. */ OOO_DLLPUBLIC_DBTOOLS - OUString createStandardColumnPart( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection + OUString createStandardColumnPart( const css::uno::Reference< css::beans::XPropertySet >& descriptor + ,const css::uno::Reference< css::sdbc::XConnection>& _xConnection ,ISQLStatementHelper* _pHelper = NULL ,const OUString& _sCreatePattern = OUString()); @@ -680,8 +680,8 @@ namespace dbtools The CREATE TABLE statement. */ OOO_DLLPUBLIC_DBTOOLS - OUString createSqlCreateTableStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection + OUString createSqlCreateTableStatement( const css::uno::Reference< css::beans::XPropertySet >& descriptor + ,const css::uno::Reference< css::sdbc::XConnection>& _xConnection ,ISQLStatementHelper* _pHelper = NULL ,const OUString& _sCreatePattern = OUString()); @@ -702,15 +702,15 @@ namespace dbtools The data type of the column. */ OOO_DLLPUBLIC_DBTOOLS - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> - createSDBCXColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, + css::uno::Reference< css::beans::XPropertySet> + createSDBCXColumn( const css::uno::Reference< css::beans::XPropertySet>& _xTable, + const css::uno::Reference< css::sdbc::XConnection>& _xConnection, const OUString& _rName, bool _bCase, bool _bQueryForInfo = true, bool _bIsAutoIncrement = false, bool _bIsCurrency = false, - sal_Int32 _nDataType = com::sun::star::sdbc::DataType::OTHER); + sal_Int32 _nDataType = css::sdbc::DataType::OTHER); /** tries to locate the corresponding DataDefinitionSupplier for the given url and connection @param _rsUrl @@ -722,10 +722,10 @@ namespace dbtools @return The datadefintion object. */ - OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> getDataDefinitionByURLAndConnection( + OOO_DLLPUBLIC_DBTOOLS css::uno::Reference< css::sdbcx::XTablesSupplier> getDataDefinitionByURLAndConnection( const OUString& _rsUrl, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); + const css::uno::Reference< css::sdbc::XConnection>& _xConnection, + const css::uno::Reference< css::uno::XComponentContext>& _rxContext); /** returns the table privileges to the given parameters @param _xMetaData @@ -738,7 +738,7 @@ namespace dbtools contains the table name */ OOO_DLLPUBLIC_DBTOOLS - sal_Int32 getTablePrivileges(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, + sal_Int32 getTablePrivileges(const css::uno::Reference< css::sdbc::XDatabaseMetaData>& _xMetaData, const OUString& _sCatalog, const OUString& _sSchema, const OUString& _sTable); @@ -758,7 +758,7 @@ namespace dbtools The information about the column(s). */ OOO_DLLPUBLIC_DBTOOLS - void collectColumnInformation( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, + void collectColumnInformation( const css::uno::Reference< css::sdbc::XConnection>& _xConnection, const OUString& _sComposedTableName, const OUString& _rName, ColumnInformationMap& _rInfo); diff --git a/include/connectivity/filtermanager.hxx b/include/connectivity/filtermanager.hxx index 6008b535107f..00a1b869627a 100644 --- a/include/connectivity/filtermanager.hxx +++ b/include/connectivity/filtermanager.hxx @@ -69,7 +69,7 @@ namespace dbtools }; private: - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xComponentAggregate; ::std::vector< OUString > m_aFilterComponents; bool m_bApplyPublicFilter; @@ -79,7 +79,7 @@ namespace dbtools explicit FilterManager(); /// late ctor - void initialize(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxComponentAggregate ); + void initialize(const css::uno::Reference< css::beans::XPropertySet >& _rxComponentAggregate ); /// makes the object forgetting the references to the database component void dispose( ); diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx index 74abd30e37af..1b3598fb454e 100644 --- a/include/connectivity/formattedcolumnvalue.hxx +++ b/include/connectivity/formattedcolumnvalue.hxx @@ -53,9 +53,9 @@ namespace dbtools examining its <code>ActiveConnection</code>. */ FormattedColumnValue( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn + const css::uno::Reference< css::uno::XComponentContext >& _rxContext, + const css::uno::Reference< css::sdbc::XRowSet >& _rxRowSet, + const css::uno::Reference< css::beans::XPropertySet >& _rxColumn ); /** constructs an instance @@ -67,8 +67,8 @@ namespace dbtools The locale of this fallback format is the current system locale. */ FormattedColumnValue( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& i_rNumberFormatter, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& i_rColumn + const css::uno::Reference< css::util::XNumberFormatter >& i_rNumberFormatter, + const css::uno::Reference< css::beans::XPropertySet >& i_rColumn ); // note that all methods of this class need to be virtual, since it's @@ -80,7 +80,7 @@ namespace dbtools // access to the details of the formatting we determined sal_Int16 getKeyType() const; - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& + const css::uno::Reference< css::sdb::XColumn >& getColumn() const; bool setFormattedValue( const OUString& _rFormattedStringValue ) const; diff --git a/include/connectivity/parameters.hxx b/include/connectivity/parameters.hxx index 9d4a50524ed6..b2a19b4925fc 100644 --- a/include/connectivity/parameters.hxx +++ b/include/connectivity/parameters.hxx @@ -42,7 +42,7 @@ namespace dbtools { - typedef ::utl::SharedUNOComponent< ::com::sun::star::sdb::XSingleSelectQueryComposer, ::utl::DisposableComponent > + typedef ::utl::SharedUNOComponent< css::sdb::XSingleSelectQueryComposer, ::utl::DisposableComponent > SharedQueryComposer; @@ -75,7 +75,7 @@ namespace dbtools /// the type of the parameter ParameterClassification eType; /// the column object for this parameter, as returned by the query composer - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > xComposerColumn; /// the indices of inner parameters which need to be filled when this concrete parameter is set ::std::vector< sal_Int32 > aInnerIndexes; @@ -87,7 +87,7 @@ namespace dbtools } /// ctor with composer column - ParameterMetaData( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn ) + ParameterMetaData( const css::uno::Reference< css::beans::XPropertySet >& _rxColumn ) :eType ( eFilledExternally ) ,xComposerColumn ( _rxColumn ) { @@ -100,18 +100,18 @@ namespace dbtools ::osl::Mutex& m_rMutex; ::cppu::OInterfaceContainerHelper m_aParameterListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::WeakReference< ::com::sun::star::beans::XPropertySet > + css::uno::WeakReference< css::beans::XPropertySet > m_xComponent; // the database component whose parameters we're handling - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > + css::uno::Reference< css::uno::XAggregation > m_xAggregatedRowSet; // the aggregated row set - necessary for unwrapped access to some interfaces - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters > + css::uno::Reference< css::sdbc::XParameters > m_xInnerParamUpdate; // write access to the inner parameters SharedQueryComposer m_xComposer; // query composer wrapping the statement which the *aggregate* is based on SharedQueryComposer m_xParentComposer; // query composer wrapping the statement of our parent database component - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > + css::uno::Reference< css::container::XIndexAccess > m_xInnerParamColumns; // index access to the parameter columns, as got from the query composer ::dbtools::param::ParametersContainerRef @@ -121,12 +121,12 @@ namespace dbtools ParameterInformation m_aParameterInformation; - ::com::sun::star::uno::Sequence< OUString > m_aMasterFields; - ::com::sun::star::uno::Sequence< OUString > m_aDetailFields; + css::uno::Sequence< OUString > m_aMasterFields; + css::uno::Sequence< OUString > m_aDetailFields; - OUString m_sIdentifierQuoteString; - OUString m_sSpecialCharacters; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xConnectionMetadata; + OUString m_sIdentifierQuoteString; + OUString m_sSpecialCharacters; + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xConnectionMetadata; ::std::vector< bool > m_aParametersVisited; @@ -137,13 +137,13 @@ namespace dbtools */ explicit ParameterManager( ::osl::Mutex& _rMutex, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext + const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); /// late ctor void initialize( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxComponent, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >& _rxComponentAggregate + const css::uno::Reference< css::beans::XPropertySet >& _rxComponent, + const css::uno::Reference< css::uno::XAggregation >& _rxComponentAggregate ); /// makes the object forgetting the references to the database component @@ -177,7 +177,7 @@ namespace dbtools <TRUE/> if and only if the parameter filling has <em>not</em> been cancelled by the user */ bool fillParameterValues( - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxCompletionHandler, + const css::uno::Reference< css::task::XInteractionHandler >& _rxCompletionHandler, ::osl::ResettableMutexGuard& _rClearForNotifies ); @@ -202,13 +202,13 @@ namespace dbtools /** adds the given listener to the list of parameter listeners */ void addParameterListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener >& _rxListener + const css::uno::Reference< css::form::XDatabaseParameterListener >& _rxListener ); /** removes the given listener from the list of parameter listeners */ void removeParameterListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener >& _rxListener + const css::uno::Reference< css::form::XDatabaseParameterListener >& _rxListener ); // XParameters equivalents @@ -222,18 +222,18 @@ namespace dbtools void setFloat ( sal_Int32 _nIndex, float x); void setDouble ( sal_Int32 _nIndex, double x); void setString ( sal_Int32 _nIndex, const OUString& x); - void setBytes ( sal_Int32 _nIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x); - void setDate ( sal_Int32 _nIndex, const ::com::sun::star::util::Date& x); - void setTime ( sal_Int32 _nIndex, const ::com::sun::star::util::Time& x); - void setTimestamp ( sal_Int32 _nIndex, const ::com::sun::star::util::DateTime& x); - void setBinaryStream ( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length); - void setCharacterStream ( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length); - void setObject ( sal_Int32 _nIndex, const ::com::sun::star::uno::Any& x); - void setObjectWithInfo ( sal_Int32 _nIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale); - void setRef ( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef>& x); - void setBlob ( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob>& x); - void setClob ( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob>& x); - void setArray ( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray>& x); + void setBytes ( sal_Int32 _nIndex, const css::uno::Sequence< sal_Int8 >& x); + void setDate ( sal_Int32 _nIndex, const css::util::Date& x); + void setTime ( sal_Int32 _nIndex, const css::util::Time& x); + void setTimestamp ( sal_Int32 _nIndex, const css::util::DateTime& x); + void setBinaryStream ( sal_Int32 _nIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length); + void setCharacterStream ( sal_Int32 _nIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length); + void setObject ( sal_Int32 _nIndex, const css::uno::Any& x); + void setObjectWithInfo ( sal_Int32 _nIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale); + void setRef ( sal_Int32 _nIndex, const css::uno::Reference< css::sdbc::XRef>& x); + void setBlob ( sal_Int32 _nIndex, const css::uno::Reference< css::sdbc::XBlob>& x); + void setClob ( sal_Int32 _nIndex, const css::uno::Reference< css::sdbc::XClob>& x); + void setArray ( sal_Int32 _nIndex, const css::uno::Reference< css::sdbc::XArray>& x); void clearParameters(); private: @@ -245,7 +245,7 @@ namespace dbtools OUString createFilterConditionFromColumnLink( const OUString& /* [in] */ _rMasterColumn, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& /* [in] */ xDetailColumn, + const css::uno::Reference< css::beans::XPropertySet >& /* [in] */ xDetailColumn, OUString& /* [out] */ _rNewParamName ); @@ -261,7 +261,7 @@ namespace dbtools inner parameters */ bool initializeComposerByComponent( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxComponent + const css::uno::Reference< css::beans::XPropertySet >& _rxComponent ); /** collects initial meta information about inner parameters (i.e. it initially fills @@ -306,8 +306,8 @@ namespace dbtools <member>m_aMasterFields</member> and <member>m_aDetailFields</member> have the same length */ void classifyLinks( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxParentColumns, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns, + const css::uno::Reference< css::container::XNameAccess >& _rxParentColumns, + const css::uno::Reference< css::container::XNameAccess >& _rxColumns, ::std::vector< OUString >& _out_rAdditionalFilterComponents ); @@ -330,7 +330,7 @@ namespace dbtools the instance is alive, i.e. <member>isAlive</member> returns <TRUE/> */ void fillLinkedParameters( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxParentColumns + const css::uno::Reference< css::container::XNameAccess >& _rxParentColumns ); /** completes all missing parameters via an interaction handler @@ -342,8 +342,8 @@ namespace dbtools <TRUE/> if and only if the parameter filling has <em>not</em> been cancelled by the user */ bool completeParameters( - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxCompletionHandler, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection + const css::uno::Reference< css::task::XInteractionHandler >& _rxCompletionHandler, + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection ); /** asks the parameter listeners to fill in final values @@ -369,7 +369,7 @@ namespace dbtools <TRUE/> if and only if the columns could be successfully retrieved */ bool getParentColumns( - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& /* [out] */ _out_rxParentColumns, + css::uno::Reference< css::container::XNameAccess >& /* [out] */ _out_rxParentColumns, bool _bFromComposer ); @@ -381,14 +381,14 @@ namespace dbtools <TRUE/> if and only if the columns could be successfully retrieved */ bool getColumns( - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& /* [out] */ _rxColumns, + css::uno::Reference< css::container::XNameAccess >& /* [out] */ _rxColumns, bool _bFromComposer ); /** retrieves the active connection of the database component */ bool getConnection( - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& /* [out] */ _rxConnection + css::uno::Reference< css::sdbc::XConnection >& /* [out] */ _rxConnection ); /** caches some info about the connection of our database component diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx index 9229dac0185c..50d1efd821fc 100644 --- a/include/connectivity/paramwrapper.hxx +++ b/include/connectivity/paramwrapper.hxx @@ -66,13 +66,13 @@ namespace param ::std::vector< sal_Int32 > m_aIndexes; /// the "delegator" column to which standard property requests are forwarded - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDelegator; + css::uno::Reference< css::beans::XPropertySet > m_xDelegator; /// the property set info for our delegator - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xDelegatorPSI; + css::uno::Reference< css::beans::XPropertySetInfo > m_xDelegatorPSI; /// the component taking the value - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters > m_xValueDestination; + css::uno::Reference< css::sdbc::XParameters > m_xValueDestination; /// helper for implementing XPropertySetInfo - ::std::unique_ptr< ::cppu::OPropertyArrayHelper > m_pInfoHelper; + ::std::unique_ptr< ::cppu::OPropertyArrayHelper > m_pInfoHelper; public: @@ -81,28 +81,28 @@ namespace param public: ParameterWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn + const css::uno::Reference< css::beans::XPropertySet >& _rxColumn ); ParameterWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters >& _rxAllParameters, + const css::uno::Reference< css::beans::XPropertySet >& _rxColumn, + const css::uno::Reference< css::sdbc::XParameters >& _rxAllParameters, const ::std::vector< sal_Int32 >& _rIndexes ); DECLARE_XINTERFACE() - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertySetHelper - virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw( ::com::sun::star::lang::IllegalArgumentException ) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw( ::com::sun::star::uno::Exception, std::exception ) override; - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const override; + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& rConvertedValue, css::uno::Any& rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue) throw( css::lang::IllegalArgumentException ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw( css::uno::Exception, std::exception ) override; + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override; // pseudo-XComponent void SAL_CALL dispose(); @@ -128,8 +128,8 @@ namespace param //= ParameterWrapperContainer - typedef ::cppu::WeakComponentImplHelper < ::com::sun::star::container::XIndexAccess - , ::com::sun::star::container::XEnumerationAccess + typedef ::cppu::WeakComponentImplHelper < css::container::XIndexAccess + , css::container::XEnumerationAccess > ParameterWrapperContainer_Base; /// class for the parameter event @see approveParameter @@ -153,18 +153,18 @@ namespace param Note that here, the simple constructor of the ParameterWrapper will be used, which does not use a XParameters instance to forward values to, but only remembers the values itself. */ - ParameterWrapperContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _rxComposer ); + ParameterWrapperContainer( const css::uno::Reference< css::sdb::XSingleSelectQueryAnalyzer >& _rxComposer ); - // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::container::XElementAccess + virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception ) override; - // ::com::sun::star::container::XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::container::XEnumerationAccess + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override; - // ::com::sun::star::container::XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 _rIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::container::XIndexAccess + virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _rIndex) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; public: const Parameters& getParameters() { return m_aParameters; } diff --git a/include/connectivity/predicateinput.hxx b/include/connectivity/predicateinput.hxx index 54dbaea9dc73..900b7160d7a5 100644 --- a/include/connectivity/predicateinput.hxx +++ b/include/connectivity/predicateinput.hxx @@ -43,11 +43,11 @@ namespace dbtools class OOO_DLLPUBLIC_DBTOOLS OPredicateInputController { private: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > + css::uno::Reference< css::sdbc::XConnection > m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > + css::uno::Reference< css::util::XNumberFormatter > m_xFormatter; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData4 > + css::uno::Reference< css::i18n::XLocaleData4 > m_xLocaleData; ::connectivity::OSQLParser @@ -55,8 +55,8 @@ namespace dbtools public: OPredicateInputController( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, const ::connectivity::IParseContext* _pParseContext = NULL ); @@ -71,7 +71,7 @@ namespace dbtools */ bool normalizePredicateString( OUString& _rPredicateValue, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, + const css::uno::Reference< css::beans::XPropertySet >& _rxField, OUString* _pErrorMessage = NULL ) const; @@ -87,7 +87,7 @@ namespace dbtools */ OUString getPredicateValueStr( const OUString& _rPredicateValue, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _rxField, + const css::uno::Reference< css::beans::XPropertySet > & _rxField, OUString* _pErrorMessage = NULL ) const; @@ -106,9 +106,9 @@ namespace dbtools points to. @see normalizePredicateString */ - ::com::sun::star::uno::Any getPredicateValue( + css::uno::Any getPredicateValue( const OUString& _rPredicateValue, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _rxField, + const css::uno::Reference< css::beans::XPropertySet > & _rxField, OUString* _pErrorMessage = NULL ) const; @@ -116,16 +116,16 @@ namespace dbtools ::connectivity::OSQLParseNode* implPredicateTree( OUString& _rErrorMessage, const OUString& _rStatement, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _rxField + const css::uno::Reference< css::beans::XPropertySet > & _rxField ) const; bool getSeparatorChars( - const ::com::sun::star::lang::Locale& _rLocale, + const css::lang::Locale& _rLocale, sal_Unicode& _rDecSep, sal_Unicode& _rThdSep ) const; - ::com::sun::star::uno::Any implParseNode(::connectivity::OSQLParseNode* pParseNode, bool _bForStatementUse) const; + css::uno::Any implParseNode(::connectivity::OSQLParseNode* pParseNode, bool _bForStatementUse) const; }; diff --git a/include/connectivity/sdbcx/VCatalog.hxx b/include/connectivity/sdbcx/VCatalog.hxx index 70eb2a258cc1..4254fdb2ee78 100644 --- a/include/connectivity/sdbcx/VCatalog.hxx +++ b/include/connectivity/sdbcx/VCatalog.hxx @@ -45,11 +45,11 @@ namespace connectivity // other drivers can be derived their catalog from this class when they want to support sdbcx // it holds already tables, views, groups and users - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbcx::XTablesSupplier, - ::com::sun::star::sdbcx::XViewsSupplier, - ::com::sun::star::sdbcx::XUsersSupplier, - ::com::sun::star::sdbcx::XGroupsSupplier, - ::com::sun::star::lang::XServiceInfo> OCatalog_BASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbcx::XTablesSupplier, + css::sdbcx::XViewsSupplier, + css::sdbcx::XUsersSupplier, + css::sdbcx::XGroupsSupplier, + css::lang::XServiceInfo> OCatalog_BASE; class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE OCatalog : @@ -70,14 +70,14 @@ namespace connectivity OCollection* m_pGroups; OCollection* m_pUsers; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier /** builds the name which should be used to access the object later on in the collection. Will only be called in fillNames. @param _xRow The current row from the resultset given to fillNames. */ - virtual OUString buildName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow); + virtual OUString buildName( const css::uno::Reference< css::sdbc::XRow >& _xRow); /** fills a vector with the necessary names which can be used in combination with the collections. For each row buildName will be called. @@ -86,10 +86,10 @@ namespace connectivity @param _rNames The vector who will be filled. */ - void fillNames(::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _xResult,TStringVector& _rNames); + void fillNames(css::uno::Reference< css::sdbc::XResultSet >& _xResult,TStringVector& _rNames); public: - OCatalog(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> &_xConnection); + OCatalog(const css::uno::Reference< css::sdbc::XConnection> &_xConnection); virtual ~OCatalog(); DECLARE_SERVICE_INFO(); @@ -108,13 +108,13 @@ namespace connectivity void SAL_CALL acquire() throw() override; void SAL_CALL release() throw() override; // XTablesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( ) throw(css::uno::RuntimeException, std::exception) override; // XViewsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getViews( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getViews( ) throw(css::uno::RuntimeException, std::exception) override; // XUsersSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getUsers( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers( ) throw(css::uno::RuntimeException, std::exception) override; // XGroupsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getGroups( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGroups( ) throw(css::uno::RuntimeException, std::exception) override; }; } diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx index 07981bd7f560..3250a81bc20d 100644 --- a/include/connectivity/sdbcx/VCollection.hxx +++ b/include/connectivity/sdbcx/VCollection.hxx @@ -47,16 +47,16 @@ namespace connectivity { // the class OCollection is base class for collections :-) - typedef ::cppu::ImplHelper10< ::com::sun::star::container::XNameAccess, - ::com::sun::star::container::XIndexAccess, - ::com::sun::star::container::XEnumerationAccess, - ::com::sun::star::container::XContainer, - ::com::sun::star::sdbc::XColumnLocate, - ::com::sun::star::util::XRefreshable, - ::com::sun::star::sdbcx::XDataDescriptorFactory, - ::com::sun::star::sdbcx::XAppend, - ::com::sun::star::sdbcx::XDrop, - ::com::sun::star::lang::XServiceInfo> OCollectionBase; + typedef ::cppu::ImplHelper10< css::container::XNameAccess, + css::container::XIndexAccess, + css::container::XEnumerationAccess, + css::container::XContainer, + css::sdbc::XColumnLocate, + css::util::XRefreshable, + css::sdbcx::XDataDescriptorFactory, + css::sdbcx::XAppend, + css::sdbcx::XDrop, + css::lang::XServiceInfo> OCollectionBase; typedef css::uno::Reference< css::beans::XPropertySet > ObjectType; @@ -73,7 +73,7 @@ namespace connectivity virtual void insert(const OUString& _sName, const ObjectType& _xObject) = 0; virtual bool rename(const OUString& _sOldName, const OUString& _sNewName) = 0; virtual sal_Int32 size() = 0; - virtual ::com::sun::star::uno::Sequence< OUString > getElementNames() = 0; + virtual css::uno::Sequence< OUString > getElementNames() = 0; virtual OUString getName(sal_Int32 _nIndex) = 0; virtual void disposeAndErase(sal_Int32 _nIndex) = 0; virtual void disposeElements() = 0; @@ -101,14 +101,14 @@ namespace connectivity bool m_bUseIndexOnly; // is only TRUE when only an indexaccess is needed // the implementing class should refresh their elements - virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) = 0; + virtual void impl_refresh() throw(css::uno::RuntimeException) = 0; // will be called when a object was requested by one of the accessing methods like getByIndex virtual ObjectType createObject(const OUString& _rName) = 0; // will be called when a new object should be generated by a call of createDataDescriptor // the returned object is empty will be filled outside and added to the collection - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); + virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor(); /** appends an object described by a descriptor, under a given name @param _rForName @@ -121,7 +121,7 @@ namespace connectivity the new object which is to be inserted into the collection. This might be the result of a call of <code>createObject( _rForName )</code>, or a clone of the descriptor. */ - virtual ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ); // called when XDrop was called virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName); @@ -181,38 +181,38 @@ namespace connectivity virtual void SAL_CALL release() throw() override; // XInterface - 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; - - // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - // ::com::sun::star::container::XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) 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; + + // css::container::XElementAccess + virtual css::uno::Type SAL_CALL getElementType( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw(css::uno::RuntimeException, std::exception) override; + // css::container::XIndexAccess + virtual sal_Int32 SAL_CALL getCount( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + + // css::container::XNameAccess + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - // ::com::sun::star::util::XRefreshable - virtual void SAL_CALL refresh( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) throw(css::uno::RuntimeException, std::exception) override; + // css::util::XRefreshable + virtual void SAL_CALL refresh( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) throw(css::uno::RuntimeException, std::exception) override; // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(css::uno::RuntimeException, std::exception) override; // XAppend - virtual void SAL_CALL appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; // XDrop - virtual void SAL_CALL dropByName( const OUString& elementName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByName( const OUString& elementName ) throw(css::sdbc::SQLException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw(css::sdbc::SQLException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - // ::com::sun::star::container::XContainer - virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + // css::container::XContainer + virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; private: void notifyElementRemoved(const OUString& _sName); void disposeElements(); diff --git a/include/connectivity/sdbcx/VColumn.hxx b/include/connectivity/sdbcx/VColumn.hxx index 8c957eb6d621..1a58b55ea97b 100644 --- a/include/connectivity/sdbcx/VColumn.hxx +++ b/include/connectivity/sdbcx/VColumn.hxx @@ -37,9 +37,9 @@ namespace connectivity class OColumn; typedef ::comphelper::OIdPropertyArrayUsageHelper<OColumn> OColumn_PROP; - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::container::XNamed, - ::com::sun::star::lang::XServiceInfo> OColumnDescriptor_BASE; - typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XDataDescriptorFactory > OColumn_BASE; + typedef ::cppu::WeakComponentImplHelper< css::container::XNamed, + css::lang::XServiceInfo> OColumnDescriptor_BASE; + typedef ::cppu::ImplHelper1< css::sdbcx::XDataDescriptorFactory > OColumn_BASE; class OOO_DLLPUBLIC_DBTOOLS OColumn : @@ -95,20 +95,20 @@ namespace connectivity DECLARE_SERVICE_INFO(); //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // ODescriptor virtual void construct() override; // ::cppu::OComponentHelper virtual void SAL_CALL disposing() override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(css::uno::RuntimeException, std::exception) override; }; } } diff --git a/include/connectivity/sdbcx/VDescriptor.hxx b/include/connectivity/sdbcx/VDescriptor.hxx index 3f6c9dbf13d5..fa9fa3190f3f 100644 --- a/include/connectivity/sdbcx/VDescriptor.hxx +++ b/include/connectivity/sdbcx/VDescriptor.hxx @@ -38,7 +38,7 @@ namespace connectivity typedef ::comphelper::OPropertyContainer ODescriptor_PBASE; class OOO_DLLPUBLIC_DBTOOLS ODescriptor :public ODescriptor_PBASE - ,public ::com::sun::star::lang::XUnoTunnel + ,public css::lang::XUnoTunnel { protected: OUString m_Name; @@ -69,8 +69,8 @@ namespace connectivity virtual void construct(); // XInterface - 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); + 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); // compare inline bool operator == ( const OUString & _rRH ) @@ -78,13 +78,13 @@ namespace connectivity return m_aCase(m_Name,_rRH); } - // 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(); - static ODescriptor* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSomeComp ); + static ODescriptor* getImplementation( const css::uno::Reference< css::uno::XInterface >& _rxSomeComp ); // retrieves the ODescriptor implementation of a given UNO component, and returns its ->isNew flag - static bool isNew( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDescriptor ); + static bool isNew( const css::uno::Reference< css::uno::XInterface >& _rxDescriptor ); }; } diff --git a/include/connectivity/sdbcx/VGroup.hxx b/include/connectivity/sdbcx/VGroup.hxx index 51e25ea0898c..b800b043cda4 100644 --- a/include/connectivity/sdbcx/VGroup.hxx +++ b/include/connectivity/sdbcx/VGroup.hxx @@ -42,10 +42,10 @@ namespace connectivity { typedef OCollection OUsers; - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbcx::XUsersSupplier, - ::com::sun::star::sdbcx::XAuthorizable, - ::com::sun::star::container::XNamed, - ::com::sun::star::lang::XServiceInfo> OGroup_BASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbcx::XUsersSupplier, + css::sdbcx::XAuthorizable, + css::container::XNamed, + css::lang::XServiceInfo> OGroup_BASE; class OOO_DLLPUBLIC_DBTOOLS OGroup : public comphelper::OBaseMutex, @@ -74,25 +74,25 @@ namespace connectivity virtual void SAL_CALL release() throw() override; //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // ::cppu::OComponentHelper virtual void SAL_CALL disposing() override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // XUsersSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getUsers( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers( ) throw(css::uno::RuntimeException, std::exception) override; // XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; }; } } diff --git a/include/connectivity/sdbcx/VIndex.hxx b/include/connectivity/sdbcx/VIndex.hxx index 0b92a1cf2e2a..9018030e2741 100644 --- a/include/connectivity/sdbcx/VIndex.hxx +++ b/include/connectivity/sdbcx/VIndex.hxx @@ -40,7 +40,7 @@ namespace connectivity { class OCollection; class OIndex; - typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XDataDescriptorFactory > OIndex_BASE; + typedef ::cppu::ImplHelper1< css::sdbcx::XDataDescriptorFactory > OIndex_BASE; typedef ::comphelper::OIdPropertyArrayUsageHelper<OIndex> OIndex_PROP; class OOO_DLLPUBLIC_DBTOOLS OIndex : @@ -78,25 +78,25 @@ namespace connectivity DECLARE_SERVICE_INFO(); //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // ODescriptor virtual void construct() override; // ::cppu::OComponentHelper virtual void SAL_CALL disposing() override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // XColumnsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns( ) throw(css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(css::uno::RuntimeException, std::exception) override; }; } } diff --git a/include/connectivity/sdbcx/VKey.hxx b/include/connectivity/sdbcx/VKey.hxx index 48540000322f..2ef38428b992 100644 --- a/include/connectivity/sdbcx/VKey.hxx +++ b/include/connectivity/sdbcx/VKey.hxx @@ -57,7 +57,7 @@ namespace connectivity KeyProperties():m_Type(0),m_UpdateRule(0),m_DeleteRule(0){} }; typedef std::shared_ptr< KeyProperties > TKeyProperties; - typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XDataDescriptorFactory > OKey_BASE; + typedef ::cppu::ImplHelper1< css::sdbcx::XDataDescriptorFactory > OKey_BASE; class OCollection; class OOO_DLLPUBLIC_DBTOOLS OKey : @@ -85,26 +85,26 @@ namespace connectivity DECLARE_SERVICE_INFO(); //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // ODescriptor virtual void construct() override; // ::cppu::OComponentHelper virtual void SAL_CALL disposing() override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // XColumnsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns( ) throw(css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw(css::uno::RuntimeException, std::exception) override; }; } } diff --git a/include/connectivity/sdbcx/VTable.hxx b/include/connectivity/sdbcx/VTable.hxx index 4f153a2f23a5..ae9414e4a8b1 100644 --- a/include/connectivity/sdbcx/VTable.hxx +++ b/include/connectivity/sdbcx/VTable.hxx @@ -45,15 +45,15 @@ namespace connectivity class OTable; class OCollection; - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbcx::XColumnsSupplier, - ::com::sun::star::sdbcx::XKeysSupplier, - ::com::sun::star::container::XNamed, - ::com::sun::star::lang::XServiceInfo> OTableDescriptor_BASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbcx::XColumnsSupplier, + css::sdbcx::XKeysSupplier, + css::container::XNamed, + css::lang::XServiceInfo> OTableDescriptor_BASE; - typedef ::cppu::ImplHelper4< ::com::sun::star::sdbcx::XDataDescriptorFactory, - ::com::sun::star::sdbcx::XIndexesSupplier, - ::com::sun::star::sdbcx::XRename, - ::com::sun::star::sdbcx::XAlterTable > OTable_BASE; + typedef ::cppu::ImplHelper4< css::sdbcx::XDataDescriptorFactory, + css::sdbcx::XIndexesSupplier, + css::sdbcx::XRename, + css::sdbcx::XAlterTable > OTable_BASE; typedef ::comphelper::OIdPropertyArrayUsageHelper<OTable> OTable_PROP; @@ -100,9 +100,9 @@ namespace connectivity //XInterface virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // ODescriptor virtual void construct() override; @@ -112,26 +112,26 @@ namespace connectivity // ::cppu::OComponentHelper virtual void SAL_CALL disposing() override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // XColumnsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns( ) throw(css::uno::RuntimeException, std::exception) override; // XKeysSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getKeys( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getKeys( ) throw(css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor() throw(css::uno::RuntimeException, std::exception) override; // XIndexesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getIndexes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getIndexes( ) throw(css::uno::RuntimeException, std::exception) 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 alterColumnByName( const OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL 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 alterColumnByName( const OUString& colName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + 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; // helper method - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() const; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() const; }; } } diff --git a/include/connectivity/sdbcx/VTypeDef.hxx b/include/connectivity/sdbcx/VTypeDef.hxx index c931a57b61df..65afc14fbcc5 100644 --- a/include/connectivity/sdbcx/VTypeDef.hxx +++ b/include/connectivity/sdbcx/VTypeDef.hxx @@ -29,9 +29,9 @@ namespace connectivity { namespace sdbcx { - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbcx::XColumnsSupplier, - ::com::sun::star::container::XNamed, - ::com::sun::star::lang::XServiceInfo> ODescriptor_BASE; + typedef ::cppu::WeakComponentImplHelper3< css::sdbcx::XColumnsSupplier, + css::container::XNamed, + css::lang::XServiceInfo> ODescriptor_BASE; } } diff --git a/include/connectivity/sdbcx/VUser.hxx b/include/connectivity/sdbcx/VUser.hxx index 000c59b2fed3..07c0d54a8a44 100644 --- a/include/connectivity/sdbcx/VUser.hxx +++ b/include/connectivity/sdbcx/VUser.hxx @@ -39,10 +39,10 @@ namespace connectivity { typedef OCollection OGroups; - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbcx::XUser, - ::com::sun::star::sdbcx::XGroupsSupplier, - ::com::sun::star::container::XNamed, - ::com::sun::star::lang::XServiceInfo> OUser_BASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbcx::XUser, + css::sdbcx::XGroupsSupplier, + css::container::XNamed, + css::lang::XServiceInfo> OUser_BASE; class OOO_DLLPUBLIC_DBTOOLS OUser : public comphelper::OBaseMutex, @@ -71,26 +71,26 @@ namespace connectivity // ::cppu::OComponentHelper virtual void SAL_CALL disposing() override; //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // XUser - virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XGroupsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getGroups( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGroups( ) throw(css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; }; } } diff --git a/include/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx index 3395a101c960..4ca46984a697 100644 --- a/include/connectivity/sdbcx/VView.hxx +++ b/include/connectivity/sdbcx/VView.hxx @@ -37,8 +37,8 @@ namespace connectivity namespace sdbcx { - typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::container::XNamed> OView_BASE; + typedef ::cppu::WeakImplHelper< css::lang::XServiceInfo, + css::container::XNamed> OView_BASE; @@ -54,7 +54,7 @@ namespace connectivity OUString m_Command; sal_Int32 m_CheckOption; // need for the getName method - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const override; @@ -64,10 +64,10 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); - OView(bool _bCase,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData); + OView(bool _bCase,const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _xMetaData); OView( bool _bCase, const OUString& _rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData, + const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _xMetaData, sal_Int32 _nCheckOption = 0, const OUString& _rCommand = OUString(), const OUString& _rSchemaName = OUString(), @@ -78,16 +78,16 @@ namespace connectivity virtual void construct() override; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& ) throw(css::uno::RuntimeException, std::exception) override; }; } } diff --git a/include/connectivity/sqlerror.hxx b/include/connectivity/sqlerror.hxx index 0c45fff8882f..8218b5f8aa65 100644 --- a/include/connectivity/sqlerror.hxx +++ b/include/connectivity/sqlerror.hxx @@ -35,11 +35,11 @@ namespace connectivity /** the type of error codes to be used in SQLExceptions - @see com::sun::star::sdbc::SQLException::ErrorCode + @see css::sdbc::SQLException::ErrorCode */ typedef ::sal_Int32 ErrorCode; - /** error condition values as defined in com::sun::star::sdb::ErrorCondition + /** error condition values as defined in css::sdb::ErrorCondition */ typedef ::sal_Int32 ErrorCondition; @@ -55,7 +55,7 @@ namespace connectivity database drivers, and checked in application-level code, to properly recognize highly specific error conditions. - @see ::com::sun::star::sdb::ErrorCondition + @see css::sdb::ErrorCondition */ class OOO_DLLPUBLIC_DBTOOLS SQLError { @@ -79,7 +79,7 @@ namespace connectivity public: - explicit SQLError( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & _rxContext ); + explicit SQLError( const css::uno::Reference< css::uno::XComponentContext > & _rxContext ); ~SQLError(); /** returns the message associated with a given error condition, after (optionally) replacing @@ -94,7 +94,7 @@ namespace connectivity In a non-product build, assertions will fire if the number of placeholders in the message's resource string does not match the number of passed parameter values. - As specified in the com::sun::star::sdb::ErrorCondition type, + As specified in the css::sdb::ErrorCondition type, error messages thrown by core components of OpenOffice.org Base will contain a standardized prefix "[OOoBase]" in every message. @@ -114,7 +114,7 @@ namespace connectivity not present (see <code>::boost::optional::operator !</code>), then no replacement will happen. - @see ::com::sun::star::sdb::ErrorCondition + @see css::sdb::ErrorCondition */ OUString getErrorMessage( const ErrorCondition _eCondition, @@ -126,15 +126,15 @@ namespace connectivity /** returns the error code associated with a given error condition @see getErrorMessage - @see ::com::sun::star::sdb::ErrorCondition - @see ::com::sun::star::sdbc::SQLException::ErrorCode + @see css::sdb::ErrorCondition + @see css::sdbc::SQLException::ErrorCode */ static ErrorCode getErrorCode( const ErrorCondition _eCondition ); /** returns the prefix which is used for OpenOffice.org Base's error messages - As specified in the com::sun::star::sdb::ErrorCondition type, + As specified in the css::sdb::ErrorCondition type, error messages thrown by core components of OpenOffice.org Base will contain a standardized prefix in every message. <code>getBaseErrorMessagePrefix</code> returns this prefix, so clients of such error messages might decide to strip this @@ -155,7 +155,7 @@ namespace connectivity @param _rxContext the context in which the error occurred. This will be filled in as - <member scope="com::sun::star::uno">Exception::Context</member> member. + <member scope="css::uno">Exception::Context</member> member. @param _rParamValue1 a runtime-dependent value which should be filled into the error message @@ -177,7 +177,7 @@ namespace connectivity */ void raiseException( const ErrorCondition _eCondition, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, + const css::uno::Reference< css::uno::XInterface >& _rxContext, const ParamValue& _rParamValue1 = ParamValue(), const ParamValue& _rParamValue2 = ParamValue(), const ParamValue& _rParamValue3 = ParamValue() @@ -221,18 +221,18 @@ namespace connectivity ) const; /** raises a typed exception, that is, a UNO exception which is derived from - com::sun::star::sdbc::SQLException + css::sdbc::SQLException @param _eCondition the ErrorCondition which hit you @param _rxContext the context in which the error occurred. This will be filled in as - <member scope="com::sun::star::uno">Exception::Context</member> member. + <member scope="css::uno">Exception::Context</member> member. @param _rExceptionType the type of the exception to throw. This type <em>must</em> specify - an exception class derived from com::sun::star::sdbc::SQLException. + an exception class derived from css::sdbc::SQLException. @param _rParamValue1 a runtime-dependent value which should be filled into the error message @@ -251,15 +251,15 @@ namespace connectivity @throws ::std::bad_cast if <arg>_rExceptionType</arg> does not specify an exception class derived from - com::sun::star::sdbc::SQLException. + css::sdbc::SQLException. @see getErrorMessage @see getErrorCode */ void raiseTypedException( const ErrorCondition _eCondition, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, - const ::com::sun::star::uno::Type& _rExceptionType, + const css::uno::Reference< css::uno::XInterface >& _rxContext, + const css::uno::Type& _rExceptionType, const ParamValue& _rParamValue1 = ParamValue(), const ParamValue& _rParamValue2 = ParamValue(), const ParamValue& _rParamValue3 = ParamValue() @@ -273,7 +273,7 @@ namespace connectivity @param _rxContext the context in which the error occurred. This will be filled in as - <member scope="com::sun::star::uno">Exception::Context</member> member. + <member scope="css::uno">Exception::Context</member> member. @param _rParamValue1 a runtime-dependent value which should be filled into the error message @@ -293,10 +293,10 @@ namespace connectivity @see getErrorMessage @see getErrorCode */ - ::com::sun::star::sdbc::SQLException + css::sdbc::SQLException getSQLException( const ErrorCondition _eCondition, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, + const css::uno::Reference< css::uno::XInterface >& _rxContext, const ParamValue& _rParamValue1 = ParamValue(), const ParamValue& _rParamValue2 = ParamValue(), const ParamValue& _rParamValue3 = ParamValue() diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx index 4c1e330b42b1..a703da07cf15 100644 --- a/include/connectivity/sqliterator.hxx +++ b/include/connectivity/sqliterator.hxx @@ -57,10 +57,10 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OSQLParseTreeIterator { private: - ::com::sun::star::sdbc::SQLException m_aErrors; // conatins the error while iterating through the statement - const OSQLParseNode* m_pParseTree; // current ParseTree - const OSQLParser& m_rParser; // if set used for general error messages from the context - OSQLStatementType m_eStatementType; + css::sdbc::SQLException m_aErrors; // conatins the error while iterating through the statement + const OSQLParseNode* m_pParseTree; // current ParseTree + const OSQLParser& m_rParser; // if set used for general error messages from the context + OSQLStatementType m_eStatementType; ::rtl::Reference<OSQLColumns> m_aSelectColumns; // all columns from the Select clause ::rtl::Reference<OSQLColumns> m_aParameters; // all parameters ::rtl::Reference<OSQLColumns> m_aGroupColumns; // the group by columns @@ -95,7 +95,7 @@ namespace connectivity @return the desired column object, or <NULL/> if no such column could be found */ - static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > findColumn( + static css::uno::Reference< css::beans::XPropertySet > findColumn( const OSQLTables& _rTables, const OUString & rColumnName, OUString & rTableRange ); /** finds a column with a given name, belonging to a given table @@ -108,7 +108,7 @@ namespace connectivity should be searched @return */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > findColumn( + css::uno::Reference< css::beans::XPropertySet > findColumn( const OUString & rColumnName, OUString & rTableRange, bool _bLookInSubTables ); /** finds a column with a given name among the select columns @@ -116,11 +116,11 @@ namespace connectivity the column name to look for @return */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > findSelectColumn( + css::uno::Reference< css::beans::XPropertySet > findSelectColumn( const OUString & rColumnName ); protected: - void setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const OUString & rColumnName,const OUString & rColumnAlias, const OUString & rTableRange, bool bFkt=false, sal_Int32 _nType = com::sun::star::sdbc::DataType::VARCHAR, bool bAggFkt=false); + void setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const OUString & rColumnName,const OUString & rColumnAlias, const OUString & rTableRange, bool bFkt=false, sal_Int32 _nType = css::sdbc::DataType::VARCHAR, bool bAggFkt=false); void appendColumns(::rtl::Reference<OSQLColumns>& _rColumns,const OUString& _rTableAlias,const OSQLTable& _rTable); // Other member variables that should be available in the "set" functions // can be defined in the derived class. They can be initialized @@ -133,8 +133,8 @@ namespace connectivity public: OSQLParseTreeIterator( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxTables, + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::container::XNameAccess >& _rxTables, const OSQLParser& _rParser, const OSQLParseNode* pRoot = NULL ); ~OSQLParseTreeIterator(); @@ -171,7 +171,7 @@ namespace connectivity The returned object contains a chain (via SQLException::NextException) of SQLExceptions. */ - inline const ::com::sun::star::sdbc::SQLException& getErrors() const { return m_aErrors; } + inline const css::sdbc::SQLException& getErrors() const { return m_aErrors; } inline bool hasErrors() const { return !m_aErrors.Message.isEmpty(); } // statement type (already set in setParseTree): @@ -266,7 +266,7 @@ namespace connectivity The table range to be set. */ static void getColumnRange( const OSQLParseNode* _pColumnRef, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, OUString &_rColumnName, OUString& _rTableRange); @@ -349,13 +349,13 @@ namespace connectivity /** appends an SQLException corresponding to the given error code to our error collection */ - void impl_appendError( const ::com::sun::star::sdbc::SQLException& _rError ); + void impl_appendError( const css::sdbc::SQLException& _rError ); /** resets our errors */ inline void impl_resetErrors() { - m_aErrors = ::com::sun::star::sdbc::SQLException(); + m_aErrors = css::sdbc::SQLException(); } void impl_fillJoinConditions(const OSQLParseNode* i_pJoinCondition); }; diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx index 61c6afa4bcc0..e30c7a274c73 100644 --- a/include/connectivity/sqlnode.hxx +++ b/include/connectivity/sqlnode.hxx @@ -76,15 +76,15 @@ namespace connectivity struct OOO_DLLPUBLIC_DBTOOLS SQLParseNodeParameter { - const ::com::sun::star::lang::Locale& rLocale; - ::dbtools::DatabaseMetaData aMetaData; - OSQLParser* pParser; - std::shared_ptr< QueryNameSet > pSubQueryHistory; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > xFormatter; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xField; - OUString sPredicateTableAlias; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xQueries; // see bParseToSDBCLevel - const IParseContext& m_rContext; + const css::lang::Locale& rLocale; + ::dbtools::DatabaseMetaData aMetaData; + OSQLParser* pParser; + std::shared_ptr< QueryNameSet > pSubQueryHistory; + css::uno::Reference< css::util::XNumberFormatter > xFormatter; + css::uno::Reference< css::beans::XPropertySet > xField; + OUString sPredicateTableAlias; + css::uno::Reference< css::container::XNameAccess > xQueries; // see bParseToSDBCLevel + const IParseContext& m_rContext; sal_Char cDecSep; bool bQuote : 1; /// should we quote identifiers? bool bInternational : 1; /// should we internationalize keywords and placeholders? @@ -92,11 +92,11 @@ namespace connectivity bool bParseToSDBCLevel : 1; /// should we create an SDBC-level statement (e.g. with substituted sub queries)? SQLParseNodeParameter( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _xFormatter, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xField, + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::util::XNumberFormatter >& _xFormatter, + const css::uno::Reference< css::beans::XPropertySet >& _xField, const OUString &_sPredicateTableAlias, - const ::com::sun::star::lang::Locale& _rLocale, + const css::lang::Locale& _rLocale, const IParseContext* _pContext, bool _bIntl, bool _bQuote, @@ -309,30 +309,30 @@ namespace connectivity <arg>_pErrorHolder</arg>. */ bool parseNodeToExecutableStatement( OUString& _out_rString, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, OSQLParser& _rParser, - ::com::sun::star::sdbc::SQLException* _pErrorHolder ) const; + css::sdbc::SQLException* _pErrorHolder ) const; void parseNodeToStr(OUString& rString, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, const IParseContext* pContext = NULL, bool _bIntl = false, bool _bQuote= true) const; // quoted and internationalised void parseNodeToPredicateStr(OUString& rString, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter, - const ::com::sun::star::lang::Locale& rIntl, + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::util::XNumberFormatter > & xFormatter, + const css::lang::Locale& rIntl, sal_Char _cDec, const IParseContext* pContext = NULL ) const; void parseNodeToPredicateStr(OUString& rString, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xField, + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::util::XNumberFormatter > & xFormatter, + const css::uno::Reference< css::beans::XPropertySet > & _xField, const OUString &_sTableAlias, - const ::com::sun::star::lang::Locale& rIntl, + const css::lang::Locale& rIntl, sal_Char _cDec, const IParseContext* pContext = NULL ) const; @@ -392,10 +392,10 @@ namespace connectivity // return the catalog, schema and tablename form this node // _pTableNode must be a rule of that above or a SQL_TOKEN_NAME static bool getTableComponents(const OSQLParseNode* _pTableNode, - ::com::sun::star::uno::Any &_rCatalog, + css::uno::Any &_rCatalog, OUString &_rSchema, - OUString &_rTable - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData); + OUString &_rTable, + const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _xMetaData); // substitute all occurrences of :var or [name] into the dynamic parameter ? // _pNode will be modified if parameters exists @@ -408,11 +408,11 @@ namespace connectivity protected: // ParseNodeToStr concatenates all Tokens (leaves) of the ParseNodes. void parseNodeToStr(OUString& rString, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xField, + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::util::XNumberFormatter > & xFormatter, + const css::uno::Reference< css::beans::XPropertySet > & _xField, const OUString &_sPredicateTableAlias, - const ::com::sun::star::lang::Locale& rIntl, + const css::lang::Locale& rIntl, const IParseContext* pContext, bool _bIntl, bool _bQuote, diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx index 6af4fb56e2c2..abe5e8411cb2 100644 --- a/include/connectivity/sqlparse.hxx +++ b/include/connectivity/sqlparse.hxx @@ -79,12 +79,12 @@ namespace connectivity virtual InternationalKeyCode getIntlKeyCode(const OString& rToken) const override; // determines the default international setting - static const ::com::sun::star::lang::Locale& getDefaultLocale(); + static const css::lang::Locale& getDefaultLocale(); /** 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 override; + virtual css::lang::Locale getPreferredLocale( ) const override; }; // OSQLParseNodesContainer @@ -110,10 +110,10 @@ namespace connectivity struct OSQLParser_Data { - ::com::sun::star::lang::Locale aLocale; + css::lang::Locale aLocale; ::connectivity::SQLError aErrors; - OSQLParser_Data( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ) + OSQLParser_Data( const css::uno::Reference< css::uno::XComponentContext >& _rxContext ) :aErrors( _rxContext ) { } @@ -146,16 +146,16 @@ namespace connectivity OUString m_sFieldName; // current field name for a predicate OUString m_sErrorMessage;// current error msg - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xField; // current field - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > + css::uno::Reference< css::util::XNumberFormatter > m_xFormatter; // current number formatter sal_Int32 m_nFormatKey; // numberformat, which should be used sal_Int32 m_nDateFormatKey; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification> m_xCharClass; - static ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData4> s_xLocaleData; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData> xDummy; // can be deleted after 627 + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::i18n::XCharacterClassification> m_xCharClass; + static css::uno::Reference< css::i18n::XLocaleData4> s_xLocaleData; + css::uno::Reference< css::i18n::XLocaleData> xDummy; // can be deleted after 627 // convert a string into double trim it to scale of _nscale and than transform it back to string OUString stringToDouble(const OUString& _rValue,sal_Int16 _nScale); @@ -172,7 +172,7 @@ namespace connectivity public: // if NULL, a default context will be used // the context must live as long as the parser - OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const IParseContext* _pContext = NULL); + OSQLParser(const css::uno::Reference< css::uno::XComponentContext >& rxContext, const IParseContext* _pContext = NULL); ~OSQLParser(); // Parsing an SQLStatement @@ -184,8 +184,8 @@ namespace connectivity // set bUseRealName to false if you pass a xField that comes from where you got that field, // as opposed from to from yourself. OSQLParseNode* predicateTree(OUString& rErrorMessage, const OUString& rStatement, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xField, + const css::uno::Reference< css::util::XNumberFormatter > & xFormatter, + const css::uno::Reference< css::beans::XPropertySet > & xField, bool bUseRealName = true); // Access to the context @@ -202,7 +202,7 @@ namespace connectivity static OUString RuleIDToStr(sal_uInt32 nRuleID); #endif - // StrToRuleID calculates the RuleID for a OUString (that is, ::com::sun::star::sdbcx::Index in yytname) + // StrToRuleID calculates the RuleID for a OUString (that is, css::sdbcx::Index in yytname) // (0 if not found). The search for an ID based on a String is // extremely inefficient (sequential search for OUString)! static sal_uInt32 StrToRuleID(const OString & rValue); diff --git a/include/connectivity/statementcomposer.hxx b/include/connectivity/statementcomposer.hxx index b4d5c1e3d31f..84151f65a282 100644 --- a/include/connectivity/statementcomposer.hxx +++ b/include/connectivity/statementcomposer.hxx @@ -48,7 +48,7 @@ namespace dbtools the connection to work with. Must not be <NULL/>. */ StatementComposer( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, + const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, const OUString& _rCommand, const sal_Int32 _nCommandType, const bool _bEscapeProcessing @@ -70,10 +70,10 @@ namespace dbtools /** returns the composer which has been fed with the current settings - @throws ::com::sun::star::sdbc::SQLException + @throws css::sdbc::SQLException if such an exception occurs while creating the composer */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > + css::uno::Reference< css::sdb::XSingleSelectQueryComposer > getComposer(); /** returns the composer statement @@ -81,7 +81,7 @@ namespace dbtools Effectively, this is equivalent to calling getComposer, and asking the composer for its Query attribute. - @throws ::com::sun::star::sdbc::SQLException + @throws css::sdbc::SQLException if such an exception occurs while creating the composer */ OUString |