diff options
author | Noel Grandin <noel@peralex.com> | 2015-11-09 11:05:53 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-09 11:14:44 +0000 |
commit | a3db4959b07d2454fba7774f04c7658ae4fba783 (patch) | |
tree | fb9853e4158d2b39fd80c302b54440cf56e654f8 /ucb/source/ucp/file | |
parent | e31205f3ec1f941ab5a188bfde6329edf2acc55b (diff) |
com::sun::star->css in tools/ and ucb/
Change-Id: I695ff721efd63b8ca0dd3c61ba5a4fef2c43cde6
Reviewed-on: https://gerrit.libreoffice.org/19854
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'ucb/source/ucp/file')
-rw-r--r-- | ucb/source/ucp/file/bc.hxx | 177 | ||||
-rw-r--r-- | ucb/source/ucp/file/filcmd.hxx | 32 | ||||
-rw-r--r-- | ucb/source/ucp/file/filglob.hxx | 3 | ||||
-rw-r--r-- | ucb/source/ucp/file/filid.hxx | 22 | ||||
-rw-r--r-- | ucb/source/ucp/file/filinl.hxx | 10 | ||||
-rw-r--r-- | ucb/source/ucp/file/filinpstr.hxx | 71 | ||||
-rw-r--r-- | ucb/source/ucp/file/filinsreq.hxx | 12 | ||||
-rw-r--r-- | ucb/source/ucp/file/filnot.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/file/filnot.hxx | 49 | ||||
-rw-r--r-- | ucb/source/ucp/file/filprp.hxx | 18 | ||||
-rw-r--r-- | ucb/source/ucp/file/filrow.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/filrow.hxx | 112 | ||||
-rw-r--r-- | ucb/source/ucp/file/filrset.hxx | 334 | ||||
-rw-r--r-- | ucb/source/ucp/file/filstr.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/filstr.hxx | 102 | ||||
-rw-r--r-- | ucb/source/ucp/file/filtask.hxx | 20 | ||||
-rw-r--r-- | ucb/source/ucp/file/prov.cxx | 24 | ||||
-rw-r--r-- | ucb/source/ucp/file/prov.hxx | 112 | ||||
-rw-r--r-- | ucb/source/ucp/file/shell.cxx | 16 | ||||
-rw-r--r-- | ucb/source/ucp/file/shell.hxx | 110 |
20 files changed, 597 insertions, 635 deletions
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx index 8d39045bef6e..d35a139af6b3 100644 --- a/ucb/source/ucp/file/bc.hxx +++ b/ucb/source/ucp/file/bc.hxx @@ -59,16 +59,16 @@ namespace fileaccess { class BaseContent: public cppu::OWeakObject, - public com::sun::star::lang::XComponent, - public com::sun::star::lang::XServiceInfo, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::ucb::XCommandProcessor, - public com::sun::star::beans::XPropertiesChangeNotifier, - public com::sun::star::beans::XPropertyContainer, - public com::sun::star::beans::XPropertySetInfoChangeNotifier, - public com::sun::star::ucb::XContentCreator, - public com::sun::star::container::XChild, - public com::sun::star::ucb::XContent, + public css::lang::XComponent, + public css::lang::XServiceInfo, + public css::lang::XTypeProvider, + public css::ucb::XCommandProcessor, + public css::beans::XPropertiesChangeNotifier, + public css::beans::XPropertyContainer, + public css::beans::XPropertySetInfoChangeNotifier, + public css::ucb::XContentCreator, + public css::container::XChild, + public css::ucb::XContent, public fileaccess::Notifier // implementation class { private: @@ -81,16 +81,16 @@ namespace fileaccess { public: BaseContent( shell* pMyShell, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xContentIdentifier, + const css::uno::Reference< css::ucb::XContentIdentifier >& xContentIdentifier, const OUString& aUnqPath ); virtual ~BaseContent(); // 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( @@ -107,96 +107,91 @@ namespace fileaccess { 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; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XCommandProcessor virtual sal_Int32 SAL_CALL - createCommandIdentifier( - void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + createCommandIdentifier() + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL execute( - const com::sun::star::ucb::Command& aCommand, + const css::ucb::Command& aCommand, sal_Int32 CommandId, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::uno::Exception, - com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception, + css::ucb::CommandAbortedException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XContent - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL - getIdentifier( - void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL + getIdentifier() + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL - getContentType( - void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + getContentType() + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addContentEventListener( - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeContentEventListener( - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; // XPropertiesChangeNotifier virtual void SAL_CALL addPropertiesChangeListener( - const com::sun::star::uno::Sequence< OUString >& PropertyNames, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertiesChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< OUString >& PropertyNames, + const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - removePropertiesChangeListener( const com::sun::star::uno::Sequence< OUString >& PropertyNames, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertiesChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + removePropertiesChangeListener( const css::uno::Sequence< OUString >& PropertyNames, + const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; // XPropertyContainer @@ -204,57 +199,55 @@ namespace fileaccess { addProperty( const OUString& Name, sal_Int16 Attributes, - const com::sun::star::uno::Any& DefaultValue ) - throw( com::sun::star::beans::PropertyExistException, - com::sun::star::beans::IllegalTypeException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Any& DefaultValue ) + throw( css::beans::PropertyExistException, + css::beans::IllegalTypeException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeProperty( const OUString& Name ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::beans::UnknownPropertyException, + css::beans::NotRemoveableException, + css::uno::RuntimeException, std::exception ) override; // XPropertySetInfoChangeNotifier virtual void SAL_CALL addPropertySetInfoChangeListener( - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySetInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removePropertySetInfoChangeListener( - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySetInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; // XContentCreator - virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > SAL_CALL + virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL createNewContent( - const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::ucb::ContentInfo& Info ) + throw( css::uno::RuntimeException, std::exception ) override; // XChild - virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( - void ) throw( com::sun::star::uno::RuntimeException, std::exception ) override; + void ) throw( css::uno::RuntimeException, std::exception ) override; // Not supported virtual void SAL_CALL - setParent( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& Parent ) - throw( com::sun::star::lang::NoSupportException, - com::sun::star::uno::RuntimeException, std::exception) override; + setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) + throw( css::lang::NoSupportException, + css::uno::RuntimeException, std::exception) override; // Notifier @@ -267,9 +260,9 @@ namespace fileaccess { private: // Data members - shell* m_pMyShell; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > m_xContentIdentifier; - OUString m_aUncPath; + shell* m_pMyShell; + css::uno::Reference< css::ucb::XContentIdentifier > m_xContentIdentifier; + OUString m_aUncPath; enum state { NameForInsertionSet = 1, JustInserted = 2, @@ -289,30 +282,30 @@ namespace fileaccess { // Private Methods - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandInfo > SAL_CALL + css::uno::Reference< css::ucb::XCommandInfo > SAL_CALL getCommandInfo() - throw( com::sun::star::uno::RuntimeException ); + throw( css::uno::RuntimeException ); - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( sal_Int32 nMyCommandIdentifier ) - throw( com::sun::star::uno::RuntimeException ); + throw( css::uno::RuntimeException ); - com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > SAL_CALL + css::uno::Reference< css::sdbc::XRow > SAL_CALL getPropertyValues( sal_Int32 nMyCommandIdentifier, - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& PropertySet ) + const css::uno::Sequence< css::beans::Property >& PropertySet ) throw( css::uno::RuntimeException, std::exception ); - com::sun::star::uno::Sequence< com::sun::star::uno::Any > SAL_CALL + css::uno::Sequence< css::uno::Any > SAL_CALL setPropertyValues( sal_Int32 nMyCommandIdentifier, - const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Values ); + const css::uno::Sequence< css::beans::PropertyValue >& Values ); - com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSet > SAL_CALL + css::uno::Reference< css::ucb::XDynamicResultSet > SAL_CALL open( sal_Int32 nMyCommandIdentifier, - const com::sun::star::ucb::OpenCommandArgument2& aCommandArgument ); + const css::ucb::OpenCommandArgument2& aCommandArgument ); void SAL_CALL deleteContent( sal_Int32 nMyCommandIdentifier ); @@ -320,11 +313,11 @@ namespace fileaccess { void SAL_CALL transfer( sal_Int32 nMyCommandIdentifier, - const com::sun::star::ucb::TransferInfo& aTransferInfo ); + const css::ucb::TransferInfo& aTransferInfo ); void SAL_CALL insert( sal_Int32 nMyCommandIdentifier, - const com::sun::star::ucb::InsertCommandArgument& aInsertArgument ); + const css::ucb::InsertCommandArgument& aInsertArgument ); void SAL_CALL endTask( sal_Int32 CommandId ); diff --git a/ucb/source/ucp/file/filcmd.hxx b/ucb/source/ucp/file/filcmd.hxx index 27daba8a6b1f..c0d22df40c66 100644 --- a/ucb/source/ucp/file/filcmd.hxx +++ b/ucb/source/ucp/file/filcmd.hxx @@ -35,7 +35,7 @@ namespace fileaccess { class XCommandInfo_impl : public cppu::OWeakObject, - public com::sun::star::ucb::XCommandInfo + public css::ucb::XCommandInfo { public: @@ -44,10 +44,10 @@ namespace fileaccess { virtual ~XCommandInfo_impl(); // 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( @@ -61,38 +61,38 @@ namespace fileaccess { // XCommandInfo - virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > SAL_CALL + virtual css::uno::Sequence< css::ucb::CommandInfo > SAL_CALL getCommands( void ) - throw( com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::ucb::CommandInfo SAL_CALL + virtual css::ucb::CommandInfo SAL_CALL getCommandInfoByName( const OUString& Name ) - throw( com::sun::star::ucb::UnsupportedCommandException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::ucb::UnsupportedCommandException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::ucb::CommandInfo SAL_CALL + virtual css::ucb::CommandInfo SAL_CALL getCommandInfoByHandle( sal_Int32 Handle ) - throw( com::sun::star::ucb::UnsupportedCommandException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::ucb::UnsupportedCommandException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasCommandByName( const OUString& Name ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasCommandByHandle( sal_Int32 Handle ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; private: - shell* m_pMyShell; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider; + shell* m_pMyShell; + css::uno::Reference< css::ucb::XContentProvider > m_xProvider; }; } diff --git a/ucb/source/ucp/file/filglob.hxx b/ucb/source/ucp/file/filglob.hxx index 2792e74b48e4..2bbecb3a8756 100644 --- a/ucb/source/ucp/file/filglob.hxx +++ b/ucb/source/ucp/file/filglob.hxx @@ -81,8 +81,7 @@ namespace fileaccess { extern void throw_handler( sal_Int32 errorCode, sal_Int32 minorCode, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv, const OUString& aUncPath, BaseContent* pContent, bool isHandled = false); diff --git a/ucb/source/ucp/file/filid.hxx b/ucb/source/ucp/file/filid.hxx index 8d58001f4df0..abd60b1373ca 100644 --- a/ucb/source/ucp/file/filid.hxx +++ b/ucb/source/ucp/file/filid.hxx @@ -30,8 +30,8 @@ namespace fileaccess { class FileContentIdentifier : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::ucb::XContentIdentifier + public css::lang::XTypeProvider, + public css::ucb::XContentIdentifier { // This implementation has to be reworked @@ -42,10 +42,10 @@ namespace fileaccess { virtual ~FileContentIdentifier(); // 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( @@ -58,26 +58,26 @@ namespace fileaccess { throw() override; // XTypeProvider - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XContentIdentifier virtual OUString SAL_CALL getContentIdentifier( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getContentProviderScheme( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; private: OUString m_aContentId; // The URL string diff --git a/ucb/source/ucp/file/filinl.hxx b/ucb/source/ucp/file/filinl.hxx index 48e1e256c00a..003f11b325c8 100644 --- a/ucb/source/ucp/file/filinl.hxx +++ b/ucb/source/ucp/file/filinl.hxx @@ -27,15 +27,15 @@ inline const sal_Int32& SAL_CALL shell::MyProperty::getHandle() const { return Handle; } -inline const com::sun::star::uno::Type& SAL_CALL shell::MyProperty::getType() const +inline const css::uno::Type& SAL_CALL shell::MyProperty::getType() const { return Typ; } -inline const com::sun::star::uno::Any& SAL_CALL shell::MyProperty::getValue() const +inline const css::uno::Any& SAL_CALL shell::MyProperty::getValue() const { return Value; } -inline const com::sun::star::beans::PropertyState& SAL_CALL shell::MyProperty::getState() const +inline const css::beans::PropertyState& SAL_CALL shell::MyProperty::getState() const { return State; } @@ -43,11 +43,11 @@ inline const sal_Int16& SAL_CALL shell::MyProperty::getAttributes() const { return Attributes; } -inline void SAL_CALL shell::MyProperty::setValue( const com::sun::star::uno::Any& __Value ) const +inline void SAL_CALL shell::MyProperty::setValue( const css::uno::Any& __Value ) const { const_cast<MyProperty*>(this)->Value = __Value; } -inline void SAL_CALL shell::MyProperty::setState( const com::sun::star::beans::PropertyState& __State ) const +inline void SAL_CALL shell::MyProperty::setState( const css::beans::PropertyState& __State ) const { const_cast<MyProperty*>(this)->State = __State; } diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx index d97bca854611..3fcc4b593765 100644 --- a/ucb/source/ucp/file/filinpstr.hxx +++ b/ucb/source/ucp/file/filinpstr.hxx @@ -36,9 +36,9 @@ namespace fileaccess { class XInputStream_impl : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::io::XInputStream, - public com::sun::star::io::XSeekable + public css::lang::XTypeProvider, + public css::io::XInputStream, + public css::io::XSeekable { public: @@ -61,10 +61,10 @@ namespace fileaccess { virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type& rType ) - throw( com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Type& rType ) + throw( css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( @@ -78,68 +78,67 @@ namespace fileaccess { virtual sal_Int32 SAL_CALL readBytes( - com::sun::star::uno::Sequence< sal_Int8 >& aData, + css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL readSomeBytes( - com::sun::star::uno::Sequence< sal_Int8 >& aData, + css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL available( void ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL closeInput( void ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL seek( sal_Int64 location ) - throw( com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IllegalArgumentException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getPosition( void ) - throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getLength( void ) - throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::IOException, + css::uno::RuntimeException, std::exception ) override; private: - com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProvider > m_xProvider; - bool m_nIsOpen; + css::uno::Reference< css::ucb::XContentProvider > m_xProvider; + bool m_nIsOpen; ReconnectingFile m_aFile; diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx index 4ed056c1b4d1..511d8f2daf50 100644 --- a/ucb/source/ucp/file/filinsreq.hxx +++ b/ucb/source/ucp/file/filinsreq.hxx @@ -46,13 +46,13 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< } virtual void SAL_CALL select() - throw (::com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { m_bSelected = true; } void SAL_CALL setName(const OUString& Name) - throw(::com::sun::star::uno::RuntimeException, std::exception) override + throw(css::uno::RuntimeException, std::exception) override { m_aNewName = Name; } @@ -86,7 +86,7 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< } virtual void SAL_CALL select() - throw (::com::sun::star::uno::RuntimeException, std::exception) override + throw (css::uno::RuntimeException, std::exception) override { m_bSelected = true; } @@ -110,8 +110,7 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< XInteractionRequestImpl( const OUString& aClashingName, - const com::sun::star::uno::Reference< - com::sun::star::uno::XInterface>& xOrigin, + const css::uno::Reference< css::uno::XInterface>& xOrigin, shell* pShell, sal_Int32 CommandId); @@ -142,8 +141,7 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< css::uno::Reference<css::task::XInteractionRequest> m_xRequest; OUString m_aClashingName; - com::sun::star::uno::Reference< - com::sun::star::uno::XInterface> m_xOrigin; + css::uno::Reference< css::uno::XInterface> m_xOrigin; }; } diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx index 2f84445aae84..aba54e3c5fcd 100644 --- a/ucb/source/ucp/file/filnot.cxx +++ b/ucb/source/ucp/file/filnot.cxx @@ -201,8 +201,8 @@ PropertySetInfoChangeNotifier::notifyPropertyRemoved( const OUString & aProperty PropertyChangeNotifier::PropertyChangeNotifier( - const com::sun::star::uno::Reference< XContent >& xCreatorContent, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xCreatorId, + const css::uno::Reference< XContent >& xCreatorContent, + const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId, ListenerMap* pListeners ) : m_xCreatorContent( xCreatorContent ), m_xCreatorId( xCreatorId ), diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx index 95db8640767f..b65af7ad7042 100644 --- a/ucb/source/ucp/file/filnot.hxx +++ b/ucb/source/ucp/file/filnot.hxx @@ -34,26 +34,24 @@ namespace fileaccess { { private: shell* m_pMyShell; - com::sun::star::uno::Reference< com::sun::star::ucb::XContent > m_xCreatorContent; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > m_xCreatorId; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > m_xOldId; - com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > > m_sListeners; + css::uno::Reference< css::ucb::XContent > m_xCreatorContent; + css::uno::Reference< css::ucb::XContentIdentifier > m_xCreatorId; + css::uno::Reference< css::ucb::XContentIdentifier > m_xOldId; + css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > m_sListeners; public: ContentEventNotifier( shell* pMyShell, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContent >& xCreatorContent, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xCreatorId, - const com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >& sListeners ); + const css::uno::Reference< css::ucb::XContent >& xCreatorContent, + const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId, + const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& sListeners ); ContentEventNotifier( shell* pMyShell, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContent >& xCreatorContent, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xCreatorId, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xOldId, - const com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >& sListeners ); + const css::uno::Reference< css::ucb::XContent >& xCreatorContent, + const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId, + const css::uno::Reference< css::ucb::XContentIdentifier >& xOldId, + const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& sListeners ); void notifyChildInserted( const OUString& aChildName ); void notifyDeleted(); @@ -65,15 +63,14 @@ namespace fileaccess { class PropertySetInfoChangeNotifier { private: - com::sun::star::uno::Reference< com::sun::star::ucb::XContent > m_xCreatorContent; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > m_xCreatorId; - com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > > m_sListeners; + css::uno::Reference< css::ucb::XContent > m_xCreatorContent; + css::uno::Reference< css::ucb::XContentIdentifier > m_xCreatorId; + css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > m_sListeners; public: PropertySetInfoChangeNotifier( - const com::sun::star::uno::Reference< com::sun::star::ucb::XContent >& xCreatorContent, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xCreatorId, - const com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >& sListeners ); + const css::uno::Reference< css::ucb::XContent >& xCreatorContent, + const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId, + const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& sListeners ); void SAL_CALL notifyPropertyAdded( const OUString & aPropertyName ); void SAL_CALL notifyPropertyRemoved( const OUString & aPropertyName ); @@ -81,25 +78,25 @@ namespace fileaccess { typedef std::unordered_map< OUString, - com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >, + css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >, OUStringHash > ListenerMap; class PropertyChangeNotifier { private: - com::sun::star::uno::Reference< com::sun::star::ucb::XContent > m_xCreatorContent; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > m_xCreatorId; + css::uno::Reference< css::ucb::XContent > m_xCreatorContent; + css::uno::Reference< css::ucb::XContentIdentifier > m_xCreatorId; ListenerMap* m_pListeners; public: PropertyChangeNotifier( - const com::sun::star::uno::Reference< com::sun::star::ucb::XContent >& xCreatorContent, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& xCreatorId, + const css::uno::Reference< css::ucb::XContent >& xCreatorContent, + const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId, ListenerMap* pListeners ); ~PropertyChangeNotifier(); void notifyPropertyChanged( - const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyChangeEvent >& seqChanged ); + const css::uno::Sequence< css::beans::PropertyChangeEvent >& seqChanged ); }; diff --git a/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx index b3c53ea1ae64..ecb92c8eb7a1 100644 --- a/ucb/source/ucp/file/filprp.hxx +++ b/ucb/source/ucp/file/filprp.hxx @@ -33,30 +33,30 @@ class XPropertySetInfo_impl : public cppu::WeakImplHelper< { public: XPropertySetInfo_impl( shell* pMyShell,const OUString& aUnqPath ); - XPropertySetInfo_impl( shell* pMyShell,const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq ); + XPropertySetInfo_impl( shell* pMyShell,const css::uno::Sequence< css::beans::Property >& seq ); virtual ~XPropertySetInfo_impl(); - virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > SAL_CALL + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::beans::Property SAL_CALL + virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; private: shell* m_pMyShell; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider; + css::uno::Reference< css::ucb::XContentProvider > m_xProvider; sal_Int32 m_count; - com::sun::star::uno::Sequence< com::sun::star::beans::Property > m_seq; + css::uno::Sequence< css::beans::Property > m_seq; }; } diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx index 80828ed6f772..ad497f6997d8 100644 --- a/ucb/source/ucp/file/filrow.cxx +++ b/ucb/source/ucp/file/filrow.cxx @@ -25,7 +25,7 @@ using namespace fileaccess; using namespace com::sun::star; -using namespace com::sun::star::uno; +using namespace css::uno; #if OSL_DEBUG_LEVEL > 0 #define THROW_WHERE SAL_WHERE diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx index 1e900f1b49a3..5be0822e1303 100644 --- a/ucb/source/ucp/file/filrow.hxx +++ b/ucb/source/ucp/file/filrow.hxx @@ -32,138 +32,138 @@ namespace fileaccess { css::sdbc::XRow > { public: - XRow_impl( shell* pShell,const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& __m_aValueMap ); + XRow_impl( shell* pShell,const css::uno::Sequence< css::uno::Any >& __m_aValueMap ); virtual ~XRow_impl(); virtual sal_Bool SAL_CALL wasNull( 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 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; 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; 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; virtual sal_Int16 SAL_CALL 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; 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; 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; 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; 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; - 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; - 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; - 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; - 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; - 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; - 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; - 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; - 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; - 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; - 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; - 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; private: osl::Mutex m_aMutex; - com::sun::star::uno::Sequence< com::sun::star::uno::Any > m_aValueMap; + css::uno::Sequence< css::uno::Any > m_aValueMap; bool m_nWasNull; shell* m_pMyShell; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider; - com::sun::star::uno::Reference< com::sun::star::script::XTypeConverter > m_xTypeConverter; + css::uno::Reference< css::ucb::XContentProvider > m_xProvider; + css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter; }; } // end namespace fileaccess diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index 7ffcd870870d..e018d67787e3 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -56,8 +56,8 @@ class XResultSet_impl : public Notifier, XResultSet_impl( shell* pMyShell, const OUString& aUnqPath, sal_Int32 OpenMode, - 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 ~XResultSet_impl(); @@ -92,31 +92,31 @@ class XResultSet_impl : public Notifier, // XEventListener virtual void SAL_CALL disposing( - const com::sun::star::lang::EventObject& Source ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::lang::EventObject& Source ) + throw( css::uno::RuntimeException, std::exception ) override; // XComponent 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 + 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(); @@ -128,8 +128,8 @@ class XResultSet_impl : public Notifier, 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 { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getString( columnIndex ); @@ -140,8 +140,8 @@ class XResultSet_impl : public Notifier, 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 ); @@ -152,8 +152,8 @@ class XResultSet_impl : public Notifier, 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 ); @@ -165,8 +165,8 @@ class XResultSet_impl : public Notifier, 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 ); @@ -177,8 +177,8 @@ class XResultSet_impl : public Notifier, 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 ); @@ -189,8 +189,8 @@ class XResultSet_impl : public Notifier, 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 ); @@ -201,8 +201,8 @@ class XResultSet_impl : public Notifier, 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 ); @@ -213,8 +213,8 @@ class XResultSet_impl : public Notifier, 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 ); @@ -222,137 +222,137 @@ class XResultSet_impl : public Notifier, 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 >(); } @@ -361,138 +361,138 @@ class XResultSet_impl : public Notifier, 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; + 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; + 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; + 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; + 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; + 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; + 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; + 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; + 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; + 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; + 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; + 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; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( 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; // XDynamicResultSet - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > SAL_CALL + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getStaticResultSet( void ) - throw( com::sun::star::ucb::ListenerAlreadySetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::ucb::ListenerAlreadySetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setListener( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XDynamicResultSetListener >& Listener ) - throw( com::sun::star::ucb::ListenerAlreadySetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< + css::ucb::XDynamicResultSetListener >& Listener ) + throw( css::ucb::ListenerAlreadySetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - connectToCache( const com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSet > & xCache ) - throw( com::sun::star::ucb::ListenerAlreadySetException, - com::sun::star::ucb::AlreadyInitializedException, - com::sun::star::ucb::ServiceNotFoundException, - com::sun::star::uno::RuntimeException, std::exception ) override; + connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache ) + throw( css::ucb::ListenerAlreadySetException, + css::ucb::AlreadyInitializedException, + css::ucb::ServiceNotFoundException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL getCapabilities() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XCloseable @@ -500,85 +500,85 @@ class XResultSet_impl : public Notifier, virtual void SAL_CALL close( 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; // XContentAccess virtual OUString SAL_CALL queryContentIdentifierString( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL + virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL queryContentIdentifier( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XResultSetMetaDataSupplier - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSetMetaData > SAL_CALL + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( 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; // 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; private: @@ -587,15 +587,15 @@ class XResultSet_impl : public Notifier, // const uno::Reference< ucb::XContentProvider > m_xProvider; shell* m_pMyShell; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider; + css::uno::Reference< css::ucb::XContentProvider > m_xProvider; bool m_nIsOpen; sal_Int32 m_nRow; bool m_nWasNull; sal_Int32 m_nOpenMode; 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 > UnqPathSet; IdentSet m_aIdents; @@ -604,8 +604,8 @@ class XResultSet_impl : public Notifier, const OUString m_aBaseDirectory; osl::Directory m_aFolder; - 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; osl::Mutex m_aEventListenerMutex; @@ -614,7 +614,7 @@ class XResultSet_impl : public Notifier, cppu::OInterfaceContainerHelper* m_pRowCountListeners; cppu::OInterfaceContainerHelper* m_pIsFinalListeners; - com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSetListener > m_xListener; + css::uno::Reference< css::ucb::XDynamicResultSetListener > m_xListener; bool m_bStatic; sal_Int32 m_nErrorCode; diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 68010c9e0e83..ca8598035fc8 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -27,7 +27,7 @@ using namespace fileaccess; using namespace com::sun::star; -using namespace com::sun::star::ucb; +using namespace css::ucb; #if OSL_DEBUG_LEVEL > 0 #define THROW_WHERE SAL_WHERE diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx index df107f20c525..f031fc836022 100644 --- a/ucb/source/ucp/file/filstr.hxx +++ b/ucb/source/ucp/file/filstr.hxx @@ -62,117 +62,117 @@ class XStream_impl : public cppu::WeakImplHelper< // XStream - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > SAL_CALL + virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XTruncate virtual void SAL_CALL truncate() - throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::IOException, + css::uno::RuntimeException, std::exception ) override; // XInputStream sal_Int32 SAL_CALL readBytes( - com::sun::star::uno::Sequence< sal_Int8 >& aData, + css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; sal_Int32 SAL_CALL readSomeBytes( - com::sun::star::uno::Sequence< sal_Int8 >& aData, + css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; sal_Int32 SAL_CALL available( void ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; void SAL_CALL closeInput( void ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; // XSeekable void SAL_CALL seek( sal_Int64 location ) - throw( com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IllegalArgumentException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; sal_Int64 SAL_CALL getPosition( void ) - throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::IOException, + css::uno::RuntimeException, std::exception ) override; sal_Int64 SAL_CALL getLength( void ) - throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::IOException, + css::uno::RuntimeException, std::exception ) override; // XOutputStream void SAL_CALL - writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception) override; + writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; void SAL_CALL flush() - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::BufferSizeExceededException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; void SAL_CALL closeOutput( void ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL waitForCompletion() throw ( - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception) override; + css::io::IOException, + css::uno::RuntimeException, std::exception) override; private: @@ -180,7 +180,7 @@ class XStream_impl : public cppu::WeakImplHelper< bool m_bInputStreamCalled,m_bOutputStreamCalled; shell* m_pMyShell; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider; + css::uno::Reference< css::ucb::XContentProvider > m_xProvider; bool m_nIsOpen; ReconnectingFile m_aFile; @@ -193,9 +193,9 @@ class XStream_impl : public cppu::WeakImplHelper< void SAL_CALL closeStream( void ) - throw( com::sun::star::io::NotConnectedException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException ); }; diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index d24aec4fdb83..44e6870b3216 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -54,16 +54,16 @@ namespace fileaccess bool m_bAbort,m_bHandled; sal_Int32 m_nErrorCode,m_nMinorCode; - com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > m_xInteractionHandler; - com::sun::star::uno::Reference< com::sun::star::ucb::XProgressHandler > m_xProgressHandler; - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xCommandEnvironment; + css::uno::Reference< css::task::XInteractionHandler > m_xInteractionHandler; + css::uno::Reference< css::ucb::XProgressHandler > m_xProgressHandler; + css::uno::Reference< css::ucb::XCommandEnvironment > m_xCommandEnvironment; public: explicit TaskHandling( - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xCommandEnv - = com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >( 0 ) ) + const css::uno::Reference< css::ucb::XCommandEnvironment >& xCommandEnv + = css::uno::Reference< css::ucb::XCommandEnvironment >( 0 ) ) : m_bAbort( false ), m_bHandled( false ), m_nErrorCode( TASKHANDLER_NO_ERROR ), @@ -112,7 +112,7 @@ namespace fileaccess return m_nMinorCode; } - com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > SAL_CALL + css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() { if( ! m_xInteractionHandler.is() && m_xCommandEnvironment.is() ) @@ -121,7 +121,7 @@ namespace fileaccess return m_xInteractionHandler; } - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > SAL_CALL + css::uno::Reference< css::ucb::XCommandEnvironment > SAL_CALL getCommandEnvironment() { return m_xCommandEnvironment; @@ -145,8 +145,8 @@ namespace fileaccess void SAL_CALL startTask( sal_Int32 CommandId, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xCommandEnv ) - throw( com::sun::star::ucb::DuplicateCommandIdentifierException ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xCommandEnv ) + throw( css::ucb::DuplicateCommandIdentifierException ); sal_Int32 SAL_CALL getCommandId(); void SAL_CALL abort( sal_Int32 CommandId ); @@ -182,7 +182,7 @@ namespace fileaccess */ void SAL_CALL handleTask( sal_Int32 CommandId, - const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& request ); + const css::uno::Reference< css::task::XInteractionRequest >& request ); /** * Clears any error which are set on the commandid diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index d51363932d2a..82cfca68f3b0 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -146,30 +146,6 @@ Reference< XSingleServiceFactory > SAL_CALL FileProvider::createServiceFactory( const Reference< XMultiServiceFactory >& rxServiceMgr ) { - /** - * Create a single service factory.<BR> - * Note: The function pointer ComponentInstantiation points to a function throws Exception. - * - * @param rServiceManager the service manager used by the implementation. - * @param rImplementationName the implementation name. An empty string is possible. - * @param ComponentInstantiation the function pointer to create an object. - * @param rServiceNames the service supported by the implementation. - * @return a factory that support the interfaces XServiceProvider, XServiceInfo - * XSingleServiceFactory and XComponent. - * - * @see createOneInstanceFactory - */ - /* - * Reference< ::com::sun::star::XSingleServiceFactory > createSingleFactory - * ( - * const ::com::sun::star::Reference< ::com::sun::star::XMultiServiceFactory > & rServiceManager, - * const OUString & rImplementationName, - * ComponentInstantiation pCreateFunction, - - * const ::com::sun::star::Sequence< OUString > & rServiceNames - * ); - */ - return Reference< XSingleServiceFactory > ( cppu::createSingleFactory( rxServiceMgr, fileaccess::shell::getImplementationName_static(), diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx index db15667e622d..d65aedd19ca7 100644 --- a/ucb/source/ucp/file/prov.hxx +++ b/ucb/source/ucp/file/prov.hxx @@ -59,130 +59,130 @@ namespace fileaccess { friend class BaseContent; public: - explicit FileProvider( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); + explicit FileProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~FileProvider(); // XServiceInfo virtual OUString SAL_CALL getImplementationName( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(com::sun::star::uno::RuntimeException, std::exception ) override; + throw(css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - static com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > SAL_CALL + static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL createServiceFactory( - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxServiceMgr ); + const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr ); - static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > SAL_CALL CreateInstance( - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMultiServiceFactory ); + const css::uno::Reference< css::lang::XMultiServiceFactory >& xMultiServiceFactory ); // XInitialization virtual void SAL_CALL initialize( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XContentProvider - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent( - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier ) - throw( com::sun::star::ucb::IllegalIdentifierException, - com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) + throw( css::ucb::IllegalIdentifierException, + css::uno::RuntimeException, std::exception ) override; // XContentIdentifierFactory - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL + virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL createContentIdentifier( const OUString& ContentId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL compareContentIds( - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Id1, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Id2 ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentIdentifier >& Id1, + const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) + throw( css::uno::RuntimeException, std::exception ) override; // XProperySet - 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; // XFileIdentifierConverter virtual sal_Int32 SAL_CALL getFileProviderLocality( const OUString& BaseURL ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getFileURLFromSystemPath( const OUString& BaseURL, - const OUString& SystemPath ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const OUString& SystemPath ) + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getSystemPathFromFileURL( const OUString& URL ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; private: @@ -190,7 +190,7 @@ namespace fileaccess { void SAL_CALL init(); // Members - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; void SAL_CALL initProperties(); osl::Mutex m_aMutex; @@ -198,9 +198,9 @@ namespace fileaccess { OUString m_HomeDirectory; sal_Int32 m_FileSystemNotation; - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > m_xPropertySetInfo; + css::uno::Reference< css::beans::XPropertySetInfo > m_xPropertySetInfo; - shell* m_pMyShell; + shell* m_pMyShell; }; } // end namespace fileaccess diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index 982e68480b35..2d3cea0631d7 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -121,13 +121,13 @@ shell::MyProperty::MyProperty( const OUString& __Propert // empty } -shell::MyProperty::MyProperty( const bool& __isNative, - const OUString& __PropertyName, - const sal_Int32& __Handle, - const com::sun::star::uno::Type& __Typ, - const com::sun::star::uno::Any& __Value, - const com::sun::star::beans::PropertyState& __State, - const sal_Int16& __Attributes ) +shell::MyProperty::MyProperty( const bool& __isNative, + const OUString& __PropertyName, + const sal_Int32& __Handle, + const css::uno::Type& __Typ, + const css::uno::Any& __Value, + const css::beans::PropertyState& __State, + const sal_Int16& __Attributes ) : PropertyName( __PropertyName ), Handle( __Handle ), isNative( __isNative ), @@ -3044,7 +3044,7 @@ uno::Sequence< OUString > SAL_CALL shell::getSupportedServiceNames_static() { OUString Supported("com.sun.star.ucb.FileContentProvider"); - com::sun::star::uno::Sequence< OUString > Seq( &Supported,1 ); + css::uno::Sequence< OUString > Seq( &Supported,1 ); return Seq; } diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx index 5b1ff4249537..c629d65c59fc 100644 --- a/ucb/source/ucp/file/shell.hxx +++ b/ucb/source/ucp/file/shell.hxx @@ -79,36 +79,36 @@ namespace fileaccess { class MyProperty { private: - OUString PropertyName; - sal_Int32 Handle; - bool isNative; - com::sun::star::uno::Type Typ; // Duplicates information in Value - com::sun::star::uno::Any Value; - com::sun::star::beans::PropertyState State; - sal_Int16 Attributes; + OUString PropertyName; + sal_Int32 Handle; + bool isNative; + css::uno::Type Typ; // Duplicates information in Value + css::uno::Any Value; + css::beans::PropertyState State; + sal_Int16 Attributes; public: MyProperty(); explicit MyProperty( const OUString& __PropertyName ); - MyProperty( const bool& __isNative, - const OUString& __PropertyName, - const sal_Int32& __Handle, - const com::sun::star::uno::Type& __Typ, - const com::sun::star::uno::Any& __Value, - const com::sun::star::beans::PropertyState& __State, - const sal_Int16& __Attributes ); + MyProperty( const bool& __isNative, + const OUString& __PropertyName, + const sal_Int32& __Handle, + const css::uno::Type& __Typ, + const css::uno::Any& __Value, + const css::beans::PropertyState& __State, + const sal_Int16& __Attributes ); ~MyProperty(); inline const bool& SAL_CALL IsNative() const; inline const OUString& SAL_CALL getPropertyName() const { return PropertyName; } inline const sal_Int32& SAL_CALL getHandle() const; - inline const com::sun::star::uno::Type& SAL_CALL getType() const; - inline const com::sun::star::uno::Any& SAL_CALL getValue() const; - inline const com::sun::star::beans::PropertyState& SAL_CALL getState() const; + inline const css::uno::Type& SAL_CALL getType() const; + inline const css::uno::Any& SAL_CALL getValue() const; + inline const css::beans::PropertyState& SAL_CALL getState() const; inline const sal_Int16& SAL_CALL getAttributes() const; // The set* functions are declared const, because the key of "this" stays intact - inline void SAL_CALL setValue( const com::sun::star::uno::Any& __Value ) const; - inline void SAL_CALL setState( const com::sun::star::beans::PropertyState& __State ) const; + inline void SAL_CALL setValue( const css::uno::Any& __Value ) const; + inline void SAL_CALL setState( const css::beans::PropertyState& __State ) const; }; struct eMyProperty @@ -143,9 +143,9 @@ namespace fileaccess { NotifierList* notifier; // Three views on the PersistentPropertySet - com::sun::star::uno::Reference< com::sun::star::ucb::XPersistentPropertySet > xS; - com::sun::star::uno::Reference< com::sun::star::beans::XPropertyContainer > xC; - com::sun::star::uno::Reference< com::sun::star::beans::XPropertyAccess > xA; + css::uno::Reference< css::ucb::XPersistentPropertySet > xS; + css::uno::Reference< css::beans::XPropertyContainer > xC; + css::uno::Reference< css::beans::XPropertyAccess > xA; }; typedef std::unordered_map< OUString,UnqPathData,OUStringHash > ContentMap; @@ -153,7 +153,7 @@ namespace fileaccess { public: // MethodenDefinitionen - shell( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, + shell( const css::uno::Reference< css::uno::XComponentContext >& rxContext, FileProvider* pProvider, bool bWithConfig ); virtual ~shell(); @@ -179,18 +179,18 @@ namespace fileaccess { void SAL_CALL associate( const OUString& UnqPath, const OUString& PropertyName, - const com::sun::star::uno::Any& DefaultValue, + const css::uno::Any& DefaultValue, const sal_Int16 Attributes ) - throw( com::sun::star::beans::PropertyExistException, - com::sun::star::beans::IllegalTypeException, - com::sun::star::uno::RuntimeException); + throw( css::beans::PropertyExistException, + css::beans::IllegalTypeException, + css::uno::RuntimeException); void SAL_CALL deassociate( const OUString& UnqPath, const OUString& PropertyName ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException); + throw( css::beans::UnknownPropertyException, + css::beans::NotRemoveableException, + css::uno::RuntimeException); @@ -207,14 +207,14 @@ namespace fileaccess { void SAL_CALL page( sal_Int32 CommandId, const OUString& aUnqPath, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xOutputStream ); + const css::uno::Reference< css::io::XOutputStream >& xOutputStream ); /** * Given a file URL aUnqPath, this methods returns a XInputStream which reads from the open file. */ - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL + css::uno::Reference< css::io::XInputStream > SAL_CALL open( sal_Int32 CommandId, const OUString& aUnqPath, bool bLock ); @@ -225,7 +225,7 @@ namespace fileaccess { * to read and write from/to the file. */ - com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL + css::uno::Reference< css::io::XStream > SAL_CALL open_rw( sal_Int32 CommandId, const OUString& aUnqPath, bool bLock ); @@ -236,12 +236,12 @@ namespace fileaccess { * to file URL aUnqPath */ - com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSet > SAL_CALL + css::uno::Reference< css::ucb::XDynamicResultSet > SAL_CALL ls( sal_Int32 CommandId, const OUString& aUnqPath, const sal_Int32 OpenMode, - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& sProperty, - const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo > & sSortingInfo ); + const css::uno::Sequence< css::beans::Property >& sProperty, + const css::uno::Sequence< css::ucb::NumberedSortingInfo > & sSortingInfo ); /** @@ -249,11 +249,11 @@ namespace fileaccess { */ // Info for commands - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandInfo > SAL_CALL + css::uno::Reference< css::ucb::XCommandInfo > SAL_CALL info_c(); // Info for the properties - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL info_p( const OUString& aUnqPath ); @@ -261,9 +261,9 @@ namespace fileaccess { * Sets the values of the properties belonging to fileURL aUnqPath */ - com::sun::star::uno::Sequence< com::sun::star::uno::Any > SAL_CALL + css::uno::Sequence< css::uno::Any > SAL_CALL setv( const OUString& aUnqPath, - const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& values ); + const css::uno::Sequence< css::beans::PropertyValue >& values ); /** @@ -271,10 +271,10 @@ namespace fileaccess { * Returns an XRow object containing the values in the requested order. */ - com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > SAL_CALL + css::uno::Reference< css::sdbc::XRow > SAL_CALL getv( sal_Int32 CommandId, const OUString& aUnqPath, - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& properties ); + const css::uno::Sequence< css::beans::Property >& properties ); /********************************************************************************/ @@ -339,7 +339,7 @@ namespace fileaccess { mkfil( sal_Int32 CommandId, const OUString& aFileName, bool OverWrite, - const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream ); + const css::uno::Reference< css::io::XInputStream >& aInputStream ); /** @@ -351,13 +351,13 @@ namespace fileaccess { write( sal_Int32 CommandId, const OUString& aUnqPath, bool OverWrite, - const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream ); + const css::uno::Reference< css::io::XInputStream >& aInputStream ); void SAL_CALL insertDefaultProperties( const OUString& aUnqPath ); - com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > + css::uno::Sequence< css::ucb::ContentInfo > queryCreatableContentsInfo(); @@ -374,9 +374,9 @@ namespace fileaccess { bool m_bWithConfig; - FileProvider* m_pProvider; - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< com::sun::star::ucb::XPropertySetRegistry > m_xFileRegistry; + FileProvider* m_pProvider; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::ucb::XPropertySetRegistry > m_xFileRegistry; private: @@ -408,7 +408,7 @@ namespace fileaccess { static void SAL_CALL notifyPropertyChanges( std::list< PropertyChangeNotifier* >* listeners, - const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyChangeEvent >& seqChanged ); + const css::uno::Sequence< css::beans::PropertyChangeEvent >& seqChanged ); static void SAL_CALL notifyContentExchanged( std::vector< std::list< ContentEventNotifier* >* >* listeners_vec ); @@ -452,9 +452,9 @@ namespace fileaccess { // Special optimized method for getting the properties of a directoryitem, which // is returned by osl::DirectoryItem::getNextItem() - com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > SAL_CALL + css::uno::Reference< css::sdbc::XRow > SAL_CALL getv( Notifier* pNotifier, - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& properties, + const css::uno::Sequence< css::beans::Property >& properties, osl::DirectoryItem& DirItem, OUString& aUnqPath, bool& bIsRegular ); @@ -488,7 +488,7 @@ namespace fileaccess { void SAL_CALL getMaskFromProperties( sal_Int32& n_Mask, - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq ); + const css::uno::Sequence< css::beans::Property >& seq ); // Helper function for public copy @@ -542,8 +542,8 @@ namespace fileaccess { private: - PropertySet m_aDefaultProperties; - com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > m_sCommandInfo; + PropertySet m_aDefaultProperties; + css::uno::Sequence< css::ucb::CommandInfo > m_sCommandInfo; public: // Misceancellous: @@ -553,7 +553,7 @@ namespace fileaccess { static OUString SAL_CALL getImplementationName_static(); - static com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); }; // end class shell |