diff options
Diffstat (limited to 'ucb/source/ucp/ftp')
-rw-r--r-- | ucb/source/ucp/ftp/ftpcontentidentifier.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpcontentidentifier.hxx | 34 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpdirp.hxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpdynresultset.hxx | 11 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpintreq.hxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpresultsetI.hxx | 12 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpresultsetbase.hxx | 428 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpstrcont.hxx | 10 |
8 files changed, 224 insertions, 281 deletions
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx index b492c5d582c5..cab4ccc35f9a 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx @@ -104,7 +104,7 @@ OUString SAL_CALL FTPContentIdentifier::getContentIdentifier( ) throw ( - com::sun::star::uno::RuntimeException, std::exception + css::uno::RuntimeException, std::exception ) { return m_ident; @@ -115,7 +115,7 @@ OUString SAL_CALL FTPContentIdentifier::getContentProviderScheme( ) throw ( - com::sun::star::uno::RuntimeException, std::exception + css::uno::RuntimeException, std::exception ) { return OUString("ftp"); diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx index 71d6eb1c9257..6b4b4138d3f0 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx @@ -41,8 +41,8 @@ namespace ftp { class FTPContentIdentifier : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::ucb::XContentIdentifier + public css::lang::XTypeProvider, + public css::ucb::XContentIdentifier { public: @@ -52,9 +52,9 @@ namespace ftp { // 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; @@ -63,35 +63,31 @@ namespace ftp { // XTypeProvider virtual - com::sun::star::uno::Sequence<com::sun::star::uno::Type> SAL_CALL - getTypes( - ) + css::uno::Sequence<css::uno::Type> SAL_CALL + getTypes() throw( - com::sun::star::uno::RuntimeException, std::exception + css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId( - ) + virtual css::uno::Sequence<sal_Int8> SAL_CALL + getImplementationId() throw( - com::sun::star::uno::RuntimeException, std::exception + css::uno::RuntimeException, std::exception ) override; // XContentIdentifier virtual OUString SAL_CALL - getContentIdentifier( - ) + getContentIdentifier() throw ( - com::sun::star::uno::RuntimeException, std::exception + css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL - getContentProviderScheme( - ) + getContentProviderScheme() throw ( - ::com::sun::star::uno::RuntimeException, std::exception + css::uno::RuntimeException, std::exception ) override; diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx index 5a6d2dc6fd32..13b344464be4 100644 --- a/ucb/source/ucp/ftp/ftpdirp.hxx +++ b/ucb/source/ucp/ftp/ftpdirp.hxx @@ -39,7 +39,7 @@ namespace ftp { *======================================================================*/ struct DateTime - : public com::sun::star::util::DateTime + : public css::util::DateTime { DateTime(const sal_uInt32& nanoSeconds, const sal_uInt16& seconds, @@ -48,7 +48,7 @@ namespace ftp { const sal_uInt16& day, const sal_uInt16& month, const sal_uInt16& year) - : com::sun::star::util::DateTime(nanoSeconds, + : css::util::DateTime(nanoSeconds, seconds, minutes, hours, diff --git a/ucb/source/ucp/ftp/ftpdynresultset.hxx b/ucb/source/ucp/ftp/ftpdynresultset.hxx index 757855d497c4..757bc68d4e0a 100644 --- a/ucb/source/ucp/ftp/ftpdynresultset.hxx +++ b/ucb/source/ucp/ftp/ftpdynresultset.hxx @@ -32,8 +32,7 @@ namespace ftp { class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper { rtl::Reference< FTPContent > m_xContent; - com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > m_xEnv; + css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; ResultSetFactory* m_pFactory; private: @@ -42,12 +41,10 @@ namespace ftp { public: DynamicResultSet( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< FTPContent >& rxContent, - const com::sun::star::ucb::OpenCommandArgument2& rCommand, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& rxEnv, + const css::ucb::OpenCommandArgument2& rCommand, + const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv, ResultSetFactory* pFactory ); virtual ~DynamicResultSet(); diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx index 409dbdb9c4b0..8088755ba06c 100644 --- a/ucb/source/ucp/ftp/ftpintreq.hxx +++ b/ucb/source/ucp/ftp/ftpintreq.hxx @@ -62,7 +62,7 @@ namespace ftp { XInteractionDisapproveImpl(); virtual void SAL_CALL select() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; private: diff --git a/ucb/source/ucp/ftp/ftpresultsetI.hxx b/ucb/source/ucp/ftp/ftpresultsetI.hxx index 6437debb9bf5..eb4442346b82 100644 --- a/ucb/source/ucp/ftp/ftpresultsetI.hxx +++ b/ucb/source/ucp/ftp/ftpresultsetI.hxx @@ -35,15 +35,11 @@ namespace ftp { public: ResultSetI( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext>& rxContext, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProvider>& xProvider, + const css::uno::Reference< css::uno::XComponentContext>& rxContext, + const css::uno::Reference< css::ucb::XContentProvider>& xProvider, sal_Int32 nOpenMode, - const com::sun::star::uno::Sequence< - com::sun::star::beans::Property >& seq, - const com::sun::star::uno::Sequence< - com::sun::star::ucb::NumberedSortingInfo >& seqSort, + const css::uno::Sequence< css::beans::Property >& seq, + const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort, const std::vector<FTPDirentry>& dirvec); private: diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx index 2ee5d63fd036..7a45ba050a66 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx @@ -40,33 +40,29 @@ namespace ftp { class ResultSetBase : public cppu::OWeakObject, - public com::sun::star::lang::XComponent, - public com::sun::star::sdbc::XRow, - public com::sun::star::sdbc::XResultSet, - public com::sun::star::sdbc::XCloseable, - public com::sun::star::sdbc::XResultSetMetaDataSupplier, - public com::sun::star::beans::XPropertySet, - public com::sun::star::ucb::XContentAccess + public css::lang::XComponent, + public css::sdbc::XRow, + public css::sdbc::XResultSet, + public css::sdbc::XCloseable, + public css::sdbc::XResultSetMetaDataSupplier, + public css::beans::XPropertySet, + public css::ucb::XContentAccess { public: - ResultSetBase(const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProvider >& xProvider, + ResultSetBase(const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::ucb::XContentProvider >& xProvider, sal_Int32 nOpenMode, - const com::sun::star::uno::Sequence< - com::sun::star::beans::Property >& seq, - const com::sun::star::uno::Sequence< - com::sun::star::ucb::NumberedSortingInfo >& seqSort); + const css::uno::Sequence< css::beans::Property >& seq, + const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort); virtual ~ResultSetBase(); // XInterface - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Type& aType ) + throw( css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( @@ -82,26 +78,23 @@ namespace ftp { virtual void SAL_CALL dispose( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addEventListener( - const com::sun::star::uno::Reference< - com::sun::star::lang::XEventListener >& xListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::lang::XEventListener >& xListener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - removeEventListener( const com::sun::star::uno::Reference< - com::sun::star::lang::XEventListener >& aListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) + throw( css::uno::RuntimeException, std::exception ) override; // XRow virtual sal_Bool SAL_CALL - wasNull( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override + wasNull() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override { if( 0<= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) m_nWasNull = m_aItems[m_nRow]->wasNull(); @@ -113,8 +106,8 @@ namespace ftp { virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { OUString ret; if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) @@ -126,8 +119,8 @@ namespace ftp { virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBoolean( columnIndex ); @@ -138,8 +131,8 @@ namespace ftp { virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getByte( columnIndex ); @@ -151,8 +144,8 @@ namespace ftp { getShort( sal_Int32 columnIndex ) throw( - com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getShort( columnIndex ); @@ -163,8 +156,8 @@ namespace ftp { virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getInt( columnIndex ); @@ -175,8 +168,8 @@ namespace ftp { virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getLong( columnIndex ); @@ -187,8 +180,8 @@ namespace ftp { virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getFloat( columnIndex ); @@ -199,8 +192,8 @@ namespace ftp { virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getDouble( columnIndex ); @@ -208,149 +201,139 @@ namespace ftp { return double( 0 ); } - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBytes( columnIndex ); else - return com::sun::star::uno::Sequence< sal_Int8 >(); + return css::uno::Sequence< sal_Int8 >(); } - virtual com::sun::star::util::Date SAL_CALL + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getDate( columnIndex ); else - return com::sun::star::util::Date(); + return css::util::Date(); } - virtual com::sun::star::util::Time SAL_CALL + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getTime( columnIndex ); else - return com::sun::star::util::Time(); + return css::util::Time(); } - virtual com::sun::star::util::DateTime SAL_CALL + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getTimestamp( columnIndex ); else - return com::sun::star::util::DateTime(); + return css::util::DateTime(); } - virtual com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > SAL_CALL + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBinaryStream( columnIndex ); else - return com::sun::star::uno::Reference< - com::sun::star::io::XInputStream >(); + return css::uno::Reference< css::io::XInputStream >(); } - virtual com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > SAL_CALL + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getCharacterStream( columnIndex ); else - return com::sun::star::uno::Reference< - com::sun::star::io::XInputStream >(); + return css::uno::Reference< css::io::XInputStream >(); } - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, - const com::sun::star::uno::Reference< - com::sun::star::container::XNameAccess >& typeMap ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + const css::uno::Reference< css::container::XNameAccess >& typeMap ) + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getObject( columnIndex,typeMap ); else - return com::sun::star::uno::Any(); + return css::uno::Any(); } - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XRef > SAL_CALL + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getRef( columnIndex ); else - return com::sun::star::uno::Reference< com::sun::star::sdbc::XRef >(); + return css::uno::Reference< css::sdbc::XRef >(); } - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XBlob > SAL_CALL + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBlob( columnIndex ); else - return com::sun::star::uno::Reference< com::sun::star::sdbc::XBlob >(); + return css::uno::Reference< css::sdbc::XBlob >(); } - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XClob > SAL_CALL + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getClob( columnIndex ); else - return com::sun::star::uno::Reference< - com::sun::star::sdbc::XClob >(); + return css::uno::Reference< css::sdbc::XClob >(); } - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XArray > SAL_CALL + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getArray( columnIndex ); else - return com::sun::star::uno::Reference< - com::sun::star::sdbc::XArray >(); + return css::uno::Reference< + css::sdbc::XArray >(); } @@ -359,221 +342,194 @@ namespace ftp { virtual sal_Bool SAL_CALL next( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - isBeforeFirst( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + isBeforeFirst() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - isAfterLast( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + isAfterLast() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - isFirst( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + isFirst() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - isLast( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + isLast() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - beforeFirst( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + beforeFirst() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - afterLast( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + afterLast() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - first( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + first() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL last( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getRow( void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - previous( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + previous() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - refreshRow( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + refreshRow() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - rowUpdated( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + rowUpdated() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - rowInserted( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + rowInserted() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - rowDeleted( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + rowDeleted() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Reference< - com::sun::star::uno::XInterface > SAL_CALL - getStatement( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL + getStatement() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; // XCloseable virtual void SAL_CALL - close( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + close() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; // XContentAccess virtual OUString SAL_CALL - queryContentIdentifierString( - void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + queryContentIdentifierString() + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > SAL_CALL - queryContentIdentifier( - void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL + queryContentIdentifier() + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL - queryContent( - void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + queryContent() + throw( css::uno::RuntimeException, std::exception ) override; // XResultSetMetaDataSupplier - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSetMetaData > SAL_CALL - getMetaData( - void ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL + getMetaData() + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySetInfo > SAL_CALL + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const com::sun::star::uno::Any& aValue ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::beans::PropertyVetoException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) override; - - virtual com::sun::star::uno::Any SAL_CALL + const css::uno::Any& aValue ) + throw( css::beans::UnknownPropertyException, + css::beans::PropertyVetoException, + css::lang::IllegalArgumentException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const com::sun::star::uno::Reference< - com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const com::sun::star::uno::Reference< - com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) + throw( css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; protected: - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProvider > m_xProvider; + css::uno::Reference< + css::uno::XComponentContext > m_xContext; + css::uno::Reference< + css::ucb::XContentProvider > m_xProvider; sal_Int32 m_nRow; - bool m_nWasNull; + bool m_nWasNull; sal_Int32 m_nOpenMode; - bool m_bRowCountFinal; + bool m_bRowCountFinal; - typedef std::vector< com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > > IdentSet; - typedef std::vector< com::sun::star::uno::Reference< - com::sun::star::sdbc::XRow > > ItemSet; + typedef std::vector< css::uno::Reference< + css::ucb::XContentIdentifier > > IdentSet; + typedef std::vector< css::uno::Reference< + css::sdbc::XRow > > ItemSet; typedef std::vector< OUString > PathSet; @@ -581,10 +537,10 @@ namespace ftp { ItemSet m_aItems; PathSet m_aPath; - com::sun::star::uno::Sequence< - com::sun::star::beans::Property > m_sProperty; - com::sun::star::uno::Sequence< - com::sun::star::ucb::NumberedSortingInfo > m_sSortingInfo; + css::uno::Sequence< + css::beans::Property > m_sProperty; + css::uno::Sequence< + css::ucb::NumberedSortingInfo > m_sSortingInfo; osl::Mutex m_aMutex; cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; diff --git a/ucb/source/ucp/ftp/ftpstrcont.hxx b/ucb/source/ucp/ftp/ftpstrcont.hxx index 383995c47275..9c88272c83f5 100644 --- a/ucb/source/ucp/ftp/ftpstrcont.hxx +++ b/ucb/source/ucp/ftp/ftpstrcont.hxx @@ -38,14 +38,13 @@ namespace ftp { : public FTPStreamContainer { public: - explicit FTPOutputStreamContainer(const com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream>& out); + explicit FTPOutputStreamContainer(const css::uno::Reference< + css::io::XOutputStream>& out); virtual ~FTPOutputStreamContainer() {} private: - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream> m_out; + css::uno::Reference< css::io::XOutputStream> m_out; }; @@ -57,8 +56,7 @@ namespace ftp { virtual ~FTPInputStreamContainer() {} - com::sun::star::uno::Reference< - com::sun::star::io::XInputStream> operator()(); + css::uno::Reference< css::io::XInputStream> operator()(); private: FTPInputStream* m_out; |