From fa452b54a5d2b31d5bc57617323f0f1092d0794f Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 24 Nov 2015 14:17:16 +0200 Subject: com::sun::star->css in xmlhelp Change-Id: Iaa57a071f8f0e6945d24f019cb4c06e02d066e0a Reviewed-on: https://gerrit.libreoffice.org/20147 Tested-by: Jenkins Reviewed-by: Noel Grandin --- xmlhelp/source/cxxhelp/inc/tvfactory.hxx | 42 +-- xmlhelp/source/cxxhelp/inc/tvread.hxx | 144 ++++----- .../cxxhelp/provider/bufferedinputstream.hxx | 70 ++--- xmlhelp/source/cxxhelp/provider/content.hxx | 46 ++- xmlhelp/source/cxxhelp/provider/databases.cxx | 2 +- xmlhelp/source/cxxhelp/provider/databases.hxx | 128 ++++---- xmlhelp/source/cxxhelp/provider/db.hxx | 6 +- xmlhelp/source/cxxhelp/provider/inputstream.hxx | 64 ++-- xmlhelp/source/cxxhelp/provider/provider.hxx | 45 ++- xmlhelp/source/cxxhelp/provider/resultset.hxx | 11 +- xmlhelp/source/cxxhelp/provider/resultsetbase.hxx | 328 ++++++++++----------- .../source/cxxhelp/provider/resultsetforquery.hxx | 8 +- .../source/cxxhelp/provider/resultsetforroot.hxx | 8 +- xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 6 +- xmlhelp/source/cxxhelp/provider/urlparameter.hxx | 16 +- xmlhelp/source/treeview/tvread.cxx | 10 +- 16 files changed, 462 insertions(+), 472 deletions(-) (limited to 'xmlhelp') diff --git a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx index 12e28d96a978..8bd8551bfffd 100644 --- a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx +++ b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx @@ -39,7 +39,7 @@ class TVFactory: public cppu::WeakImplHelper < { public: - TVFactory( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); + TVFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~TVFactory(); @@ -47,57 +47,57 @@ class TVFactory: public cppu::WeakImplHelper < 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; // XMultiServiceFactory - virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) - throw( com::sun::star::uno::Exception, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::Exception, + 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 createInstanceWithArguments( const OUString& ServiceSpecifier, - const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& Arguments ) - throw( com::sun::star::uno::Exception, - com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& Arguments ) + throw( css::uno::Exception, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // Other 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(); - 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 ); private: // Members - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > m_xHDS; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XInterface > m_xHDS; }; } diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx index 9373fd6fbeff..0b21e313fde5 100644 --- a/xmlhelp/source/cxxhelp/inc/tvread.hxx +++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx @@ -75,15 +75,15 @@ namespace treeview { // XNameAccess - virtual com::sun::star::uno::Type SAL_CALL + virtual css::uno::Type SAL_CALL getElementType( ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override + throw( css::uno::RuntimeException, std::exception ) override { return cppu::UnoType::get(); } virtual sal_Bool SAL_CALL hasElements() - throw( com::sun::star::uno::RuntimeException, std::exception ) override + throw( css::uno::RuntimeException, std::exception ) override { return true; } @@ -92,8 +92,8 @@ namespace treeview { virtual void SAL_CALL addChangesListener( - const com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >& aListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override + const css::uno::Reference< css::util::XChangesListener >& aListener ) + throw( css::uno::RuntimeException, std::exception ) override { // read only (void)aListener; @@ -101,8 +101,8 @@ namespace treeview { virtual void SAL_CALL removeChangesListener( - const com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >& aListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override + const css::uno::Reference< css::util::XChangesListener >& aListener ) + throw( css::uno::RuntimeException, std::exception ) override { // read only (void)aListener; @@ -111,21 +111,21 @@ namespace treeview { // XComponent virtual void SAL_CALL dispose( ) - 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 { (void)xListener; } 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 + const css::uno::Reference< css::lang::XEventListener >& aListener ) + throw( css::uno::RuntimeException, std::exception ) override { (void)aListener; } @@ -133,30 +133,30 @@ namespace treeview { // Abstract functions // XNameAccess - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) - throw( com::sun::star::container::NoSuchElementException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) override = 0; + throw( css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override = 0; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override = 0; + throw( css::uno::RuntimeException, std::exception ) override = 0; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override = 0; + throw( css::uno::RuntimeException, std::exception ) override = 0; // XHierarchicalNameAccess - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getByHierarchicalName( const OUString& aName ) - throw( com::sun::star::container::NoSuchElementException, - com::sun::star::uno::RuntimeException, std::exception ) override = 0; + throw( css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception ) override = 0; virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString& aName ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override = 0; + throw( css::uno::RuntimeException, std::exception ) override = 0; }; // end class TVBase @@ -172,30 +172,30 @@ namespace treeview { // XNameAccess - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) - throw( com::sun::star::container::NoSuchElementException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XHierarchicalNameAccess - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getByHierarchicalName( const OUString& aName ) - throw( com::sun::star::container::NoSuchElementException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString& aName ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; private: @@ -212,56 +212,56 @@ namespace treeview { TVChildTarget( const ConfigData& configData,TVDom* tvDom ); - TVChildTarget( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); + TVChildTarget( const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~TVChildTarget(); - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) - throw( com::sun::star::container::NoSuchElementException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) override; + throw( css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XHierarchicalNameAccess - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getByHierarchicalName( const OUString& aName ) - throw( com::sun::star::container::NoSuchElementException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString& aName ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; private: std::vector< rtl::Reference< TVRead > > Elements; static ConfigData init( - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); + const css::uno::Reference< css::uno::XComponentContext >& xContext ); - static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > + static css::uno::Reference< css::lang::XMultiServiceFactory > getConfiguration( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - static ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > - getHierAccess( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxProvider, + static css::uno::Reference< css::container::XHierarchicalNameAccess > + getHierAccess( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxProvider, const char* file ); static OUString - getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, + getKey( const css::uno::Reference< css::container::XHierarchicalNameAccess >& xHierAccess, const char* key ); static bool getBooleanKey( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, + const css::uno::Reference< css::container::XHierarchicalNameAccess >& xHierAccess, const char* key); static void subst( OUString& instpath ); @@ -287,38 +287,38 @@ namespace treeview { void init(); private: - static com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetHelpPackageFromPackage - ( const com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage, - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); + static css::uno::Reference< css::deployment::XPackage > implGetHelpPackageFromPackage + ( const css::uno::Reference< css::deployment::XPackage > xPackage, + css::uno::Reference< css::deployment::XPackage >& o_xParentPackageBundle ); protected: - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetNextUserHelpPackage - ( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetNextSharedHelpPackage - ( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetNextBundledHelpPackage - ( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); + css::uno::Reference< css::deployment::XPackage > implGetNextUserHelpPackage + ( css::uno::Reference< css::deployment::XPackage >& o_xParentPackageBundle ); + css::uno::Reference< css::deployment::XPackage > implGetNextSharedHelpPackage + ( css::uno::Reference< css::deployment::XPackage >& o_xParentPackageBundle ); + css::uno::Reference< css::deployment::XPackage > implGetNextBundledHelpPackage + ( css::uno::Reference< css::deployment::XPackage >& o_xParentPackageBundle ); void implGetLanguageVectorFromPackage( ::std::vector< OUString > &rv, - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ); + css::uno::Reference< css::deployment::XPackage > xPackage ); osl::Mutex m_aMutex; - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > m_xSFA; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::ucb::XSimpleFileAccess3 > m_xSFA; IteratorState m_eState; OUString m_aLanguage; - com::sun::star::uno::Sequence< com::sun::star::uno::Reference - < com::sun::star::deployment::XPackage > > m_aUserPackagesSeq; + css::uno::Sequence< css::uno::Reference + < css::deployment::XPackage > > m_aUserPackagesSeq; bool m_bUserPackagesLoaded; - com::sun::star::uno::Sequence< com::sun::star::uno::Reference - < com::sun::star::deployment::XPackage > > m_aSharedPackagesSeq; + css::uno::Sequence< css::uno::Reference + < css::deployment::XPackage > > m_aSharedPackagesSeq; bool m_bSharedPackagesLoaded; - com::sun::star::uno::Sequence< com::sun::star::uno::Reference - < com::sun::star::deployment::XPackage > > m_aBundledPackagesSeq; + css::uno::Sequence< css::uno::Reference + < css::deployment::XPackage > > m_aBundledPackagesSeq; bool m_bBundledPackagesLoaded; int m_iUserPackage; @@ -339,7 +339,7 @@ namespace treeview { private: OUString expandURL( const OUString& aURL ); OUString implGetTreeFileFromPackage( sal_Int32& rnFileSize, - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ); + css::uno::Reference< css::deployment::XPackage > xPackage ); }; // end class TreeFileIterator diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx index e227783e8b6b..3cead43f76d6 100644 --- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx +++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx @@ -30,8 +30,8 @@ namespace chelp { class BufferedInputStream : public cppu::OWeakObject, - public com::sun::star::io::XInputStream, - public com::sun::star::io::XSeekable + public css::io::XInputStream, + public css::io::XSeekable { private: @@ -43,67 +43,67 @@ namespace chelp { public: explicit BufferedInputStream( - const com::sun::star::uno::Reference& xInputStream); + const css::uno::Reference& xInputStream); virtual ~BufferedInputStream(); - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( const com::sun::star::uno::Type& rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL + queryInterface( const css::uno::Type& rType ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; - virtual sal_Int32 SAL_CALL readBytes( com::sun::star::uno::Sequence< sal_Int8 >& aData, + virtual sal_Int32 SAL_CALL readBytes( 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, + virtual sal_Int32 SAL_CALL readSomeBytes( 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() - 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() - 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() - 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() - throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::io::IOException, + css::uno::RuntimeException, std::exception ) override; }; - extern com::sun::star::uno::Reference + extern css::uno::Reference turnToSeekable( - const com::sun::star::uno::Reference& xInputStream); + const css::uno::Reference& xInputStream); } diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx index 9a43c30d3052..785143d21ee6 100644 --- a/xmlhelp/source/cxxhelp/provider/content.hxx +++ b/xmlhelp/source/cxxhelp/provider/content.hxx @@ -43,11 +43,9 @@ namespace chelp { public: - Content( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, + Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ::ucbhelper::ContentProviderImplHelper* pProvider, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Identifier, + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, Databases* pDatabases ); virtual ~Content(); @@ -63,36 +61,35 @@ namespace chelp // 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 ::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; // XContent virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XCommandProcessor - virtual com::sun::star::uno::Any SAL_CALL - execute( const com::sun::star::ucb::Command& aCommand, + virtual css::uno::Any SAL_CALL + execute( 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; private: @@ -103,18 +100,15 @@ namespace chelp // private methods - virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > - getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > - getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; + virtual css::uno::Sequence< css::beans::Property > + getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; + virtual css::uno::Sequence< css::ucb::CommandInfo > + getCommands( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; virtual OUString getParentURL() override { return OUString(); } - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValues( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProperties ); + css::uno::Reference< css::sdbc::XRow > + getPropertyValues( const css::uno::Sequence< css::beans::Property >& rProperties ); }; } diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 54825b416f48..c09f2d7e8cf4 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -1372,7 +1372,7 @@ inline bool isLetter( sal_Unicode c ) } void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< OUString > &rv, - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ) + css::uno::Reference< css::deployment::XPackage > xPackage ) { rv.clear(); OUString aExtensionPath = xPackage->getURL(); diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index 2c65dedbc1ce..b5988db99869 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -101,9 +101,9 @@ namespace chelp { private: OUString key; - com::sun::star::uno::Sequence< OUString > listId; - com::sun::star::uno::Sequence< OUString > listAnchor; - com::sun::star::uno::Sequence< OUString > listTitle; + css::uno::Sequence< OUString > listId; + css::uno::Sequence< OUString > listAnchor; + css::uno::Sequence< OUString > listTitle; void init( Databases *pDatabases,helpdatafileproxy::Hdf* pHdf,const OUString& ids ); }; @@ -112,22 +112,22 @@ namespace chelp { ~KeywordInfo() { }; - com::sun::star::uno::Sequence< OUString >& + css::uno::Sequence< OUString >& getKeywordList() { return listKey; } - com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< OUString > >& + css::uno::Sequence< css::uno::Sequence< OUString > >& getIdList() { return listId; } - com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< OUString > >& + css::uno::Sequence< css::uno::Sequence< OUString > >& getAnchorList() { return listAnchor; } - com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< OUString > >& + css::uno::Sequence< css::uno::Sequence< OUString > >& getTitleList() { return listTitle; } private: - com::sun::star::uno::Sequence< OUString > listKey; - com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< OUString > > listId,listAnchor,listTitle; + css::uno::Sequence< OUString > listKey; + css::uno::Sequence< css::uno::Sequence< OUString > > listId,listAnchor,listTitle; }; // end class KeywordInfo class Databases @@ -143,7 +143,7 @@ namespace chelp { const OUString& productName, const OUString& productVersion, const OUString& styleSheet, - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext ); + css::uno::Reference< css::uno::XComponentContext > xContext ); ~Databases(); @@ -168,7 +168,7 @@ namespace chelp { * The following method returns the Collator for the given language-country combination */ - com::sun::star::uno::Reference< com::sun::star::i18n::XCollator > + css::uno::Reference< css::i18n::XCollator > getCollator( const OUString& Language, const OUString& System ); // System not used by current implementation // // of XCollator @@ -202,11 +202,11 @@ namespace chelp { * Has the purpose of forcing the jarfile to stay open */ - com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > + css::uno::Reference< css::container::XHierarchicalNameAccess > jarFile( const OUString& jar, const OUString& Language ); - com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > + css::uno::Reference< css::container::XHierarchicalNameAccess > findJarFileForPath( const OUString& jar, const OUString& Language, const OUString& path, OUString* o_pExtensionPath = nullptr, OUString* o_pExtensionRegistryPath = nullptr ); @@ -232,14 +232,14 @@ namespace chelp { OUString expandURL( const OUString& aURL ); static OUString expandURL( const OUString& aURL, - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext ); + css::uno::Reference< css::uno::XComponentContext > xContext ); private: - osl::Mutex m_aMutex; - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< com::sun::star::lang::XMultiComponentFactory > m_xSMgr; - com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > m_xSFA; + osl::Mutex m_aMutex; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::lang::XMultiComponentFactory > m_xSMgr; + css::uno::Reference< css::ucb::XSimpleFileAccess3 > m_xSFA; bool m_bShowBasic; char* m_pErrorDoc; @@ -281,16 +281,16 @@ namespace chelp { typedef std::unordered_map< - OUString, - ::com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess >, - OUStringHash > ZipFileTable; + OUString, + css::uno::Reference< css::container::XHierarchicalNameAccess >, + OUStringHash > ZipFileTable; ZipFileTable m_aZipFileTable; // No closing of an once opened jarfile typedef std::unordered_map< - OUString, - ::com::sun::star::uno::Reference< com::sun::star::i18n::XCollator >, - OUStringHash > CollatorTable; + OUString, + css::uno::Reference< css::i18n::XCollator >, + OUStringHash > CollatorTable; CollatorTable m_aCollatorTable; @@ -330,60 +330,60 @@ namespace chelp { static ExtensionHelpExistanceMap aHelpExistanceMap; public: - ExtensionIteratorBase( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext, + ExtensionIteratorBase( css::uno::Reference< css::uno::XComponentContext > xContext, Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage ); ExtensionIteratorBase( Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage ); void init(); private: - static com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetHelpPackageFromPackage - ( const com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage, - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); + static css::uno::Reference< css::deployment::XPackage > implGetHelpPackageFromPackage + ( const css::uno::Reference< css::deployment::XPackage > xPackage, + css::uno::Reference< css::deployment::XPackage >& o_xParentPackageBundle ); protected: - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetNextUserHelpPackage - ( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetNextSharedHelpPackage - ( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > implGetNextBundledHelpPackage - ( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle ); + css::uno::Reference< css::deployment::XPackage > implGetNextUserHelpPackage + ( css::uno::Reference< css::deployment::XPackage >& o_xParentPackageBundle ); + css::uno::Reference< css::deployment::XPackage > implGetNextSharedHelpPackage + ( css::uno::Reference< css::deployment::XPackage >& o_xParentPackageBundle ); + css::uno::Reference< css::deployment::XPackage > implGetNextBundledHelpPackage + ( css::uno::Reference< css::deployment::XPackage >& o_xParentPackageBundle ); OUString implGetFileFromPackage( const OUString& rFileExtension, - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ); + css::uno::Reference< css::deployment::XPackage > xPackage ); void implGetLanguageVectorFromPackage( ::std::vector< OUString > &rv, - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ); + css::uno::Reference< css::deployment::XPackage > xPackage ); - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > m_xSFA; - Databases& m_rDatabases; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::ucb::XSimpleFileAccess3 > m_xSFA; + Databases& m_rDatabases; - IteratorState m_eState; + IteratorState m_eState; - OUString m_aInitialModule; - OUString m_aLanguage; + OUString m_aInitialModule; + OUString m_aLanguage; - com::sun::star::uno::Sequence< com::sun::star::uno::Reference - < com::sun::star::deployment::XPackage > > m_aUserPackagesSeq; - bool m_bUserPackagesLoaded; + css::uno::Sequence< css::uno::Reference + < css::deployment::XPackage > > m_aUserPackagesSeq; + bool m_bUserPackagesLoaded; - com::sun::star::uno::Sequence< com::sun::star::uno::Reference - < com::sun::star::deployment::XPackage > > m_aSharedPackagesSeq; - bool m_bSharedPackagesLoaded; + css::uno::Sequence< css::uno::Reference + < css::deployment::XPackage > > m_aSharedPackagesSeq; + bool m_bSharedPackagesLoaded; - com::sun::star::uno::Sequence< com::sun::star::uno::Reference - < com::sun::star::deployment::XPackage > > m_aBundledPackagesSeq; - bool m_bBundledPackagesLoaded; + css::uno::Sequence< css::uno::Reference + < css::deployment::XPackage > > m_aBundledPackagesSeq; + bool m_bBundledPackagesLoaded; - int m_iUserPackage; - int m_iSharedPackage; - int m_iBundledPackage; + int m_iUserPackage; + int m_iSharedPackage; + int m_iBundledPackage; }; // end class ExtensionIteratorBase class DataBaseIterator : public ExtensionIteratorBase { public: - DataBaseIterator( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext, + DataBaseIterator( css::uno::Reference< css::uno::XComponentContext > xContext, Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage, bool bHelpText ) : ExtensionIteratorBase( xContext, rDatabases, aInitialModule, aLanguage ) , m_bHelpText( bHelpText ) @@ -398,7 +398,7 @@ namespace chelp { private: helpdatafileproxy::Hdf* implGetHdfFromPackage( - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage, + css::uno::Reference< css::deployment::XPackage > xPackage, OUString* o_pExtensionPath, OUString* o_pExtensionRegistryPath ); bool m_bHelpText; @@ -408,7 +408,7 @@ namespace chelp { class KeyDataBaseFileIterator : public ExtensionIteratorBase { public: - KeyDataBaseFileIterator( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext, + KeyDataBaseFileIterator( css::uno::Reference< css::uno::XComponentContext > xContext, Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage ) : ExtensionIteratorBase( xContext, rDatabases, aInitialModule, aLanguage ) {} @@ -417,25 +417,25 @@ namespace chelp { private: OUString implGetDbFileFromPackage( - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ); + css::uno::Reference< css::deployment::XPackage > xPackage ); }; // end class KeyDataBaseFileIterator class JarFileIterator : public ExtensionIteratorBase { public: - JarFileIterator( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext, + JarFileIterator( css::uno::Reference< css::uno::XComponentContext > xContext, Databases& rDatabases, const OUString& aInitialModule, const OUString& aLanguage ) : ExtensionIteratorBase( xContext, rDatabases, aInitialModule, aLanguage ) {} - com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > - nextJarFile( com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >& o_xParentPackageBundle, + css::uno::Reference< css::container::XHierarchicalNameAccess > + nextJarFile( css::uno::Reference< css::deployment::XPackage >& o_xParentPackageBundle, OUString* o_pExtensionPath = nullptr, OUString* o_pExtensionRegistryPath = nullptr ); private: - com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > - implGetJarFromPackage(com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage, + css::uno::Reference< css::container::XHierarchicalNameAccess > + implGetJarFromPackage(css::uno::Reference< css::deployment::XPackage > xPackage, OUString* o_pExtensionPath = nullptr, OUString* o_pExtensionRegistryPath = nullptr ); }; // end class JarFileIterator @@ -452,7 +452,7 @@ namespace chelp { private: OUString implGetIndexFolderFromPackage( bool& o_rbTemporary, - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ); + css::uno::Reference< css::deployment::XPackage > xPackage ); }; // end class KeyDataBaseFileIterator diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx index 2bcb79b1c0b6..23d0c3250e80 100644 --- a/xmlhelp/source/cxxhelp/provider/db.hxx +++ b/xmlhelp/source/cxxhelp/provider/db.hxx @@ -58,10 +58,10 @@ namespace helpdatafileproxy { OUString m_aFileURL; StringToDataMap* m_pStringToDataMap; StringToValPosMap* m_pStringToValPosMap; - com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > + css::uno::Reference< css::ucb::XSimpleFileAccess3 > m_xSFA; - com::sun::star::uno::Sequence< sal_Int8 > + css::uno::Sequence< sal_Int8 > m_aItData; const char* m_pItData; int m_nItRead; @@ -74,7 +74,7 @@ namespace helpdatafileproxy { //SimpleFileAccess requires file URLs as arguments. Passing file path may work but fails //for example when using long file paths on Windows, which start with "\\?\" Hdf( const OUString& rFileURL, - com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > xSFA ) + css::uno::Reference< css::ucb::XSimpleFileAccess3 > xSFA ) : m_aFileURL( rFileURL ) , m_pStringToDataMap( nullptr ) , m_pStringToValPosMap( nullptr ) diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.hxx b/xmlhelp/source/cxxhelp/provider/inputstream.hxx index 5425e071d031..275031c15d5d 100644 --- a/xmlhelp/source/cxxhelp/provider/inputstream.hxx +++ b/xmlhelp/source/cxxhelp/provider/inputstream.hxx @@ -33,8 +33,8 @@ namespace chelp { class XInputStream_impl : public cppu::OWeakObject, - public com::sun::star::io::XInputStream, - public com::sun::star::io::XSeekable + public css::io::XInputStream, + public css::io::XSeekable { public: @@ -48,10 +48,10 @@ namespace chelp { bool SAL_CALL CtorSuccess() { return m_bIsOpen;} - 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( @@ -65,62 +65,62 @@ namespace chelp { 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: bool m_bIsOpen; diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx index cd6cf86e4092..202c6dae04ac 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.hxx +++ b/xmlhelp/source/cxxhelp/provider/provider.hxx @@ -48,12 +48,12 @@ namespace chelp { class ContentProvider : public ::ucbhelper::ContentProviderImplHelper, - public ::com::sun::star::container::XContainerListener, - public ::com::sun::star::lang::XComponent + public css::container::XContainerListener, + public css::lang::XComponent { public: explicit ContentProvider( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~ContentProvider(); @@ -99,18 +99,18 @@ namespace chelp { virtual void SAL_CALL dispose( ) - 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 + addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override { (void)xListener; } 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 { (void)aListener; } @@ -118,29 +118,29 @@ namespace chelp { // XConainerListener ( derive from XEventListener ) virtual void SAL_CALL - disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override + disposing( const css::lang::EventObject& /*Source*/ ) + throw (css::uno::RuntimeException, std::exception) override { m_xContainer.clear(); } virtual void SAL_CALL - elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override + elementInserted( const css::container::ContainerEvent& Event ) + throw (css::uno::RuntimeException, std::exception) override { (void)Event; } virtual void SAL_CALL - elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override + elementRemoved( const css::container::ContainerEvent& Event ) + throw (css::uno::RuntimeException, std::exception) override { (void)Event; } virtual void SAL_CALL - elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + elementReplaced( const css::container::ContainerEvent& Event ) + throw (css::uno::RuntimeException, std::exception) override; // Non-interface methods. @@ -150,27 +150,26 @@ namespace chelp { bool isInitialized; OUString m_aScheme; Databases* m_pDatabases; - com::sun::star::uno::Reference m_xContainer; + css::uno::Reference m_xContainer; // private methods void init(); - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > + css::uno::Reference< css::lang::XMultiServiceFactory > getConfiguration() const; - static ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > - getHierAccess( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& sProvider, + static css::uno::Reference< css::container::XHierarchicalNameAccess > + getHierAccess( const css::uno::Reference< css::lang::XMultiServiceFactory >& sProvider, const char* file ); static OUString - getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, + getKey( const css::uno::Reference< css::container::XHierarchicalNameAccess >& xHierAccess, const char* key ); static bool getBooleanKey( - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess, + const css::uno::Reference< css::container::XHierarchicalNameAccess >& xHierAccess, const char* key); static void subst( OUString& instpath ); diff --git a/xmlhelp/source/cxxhelp/provider/resultset.hxx b/xmlhelp/source/cxxhelp/provider/resultset.hxx index 2878ea9f05a1..53432d7b2410 100644 --- a/xmlhelp/source/cxxhelp/provider/resultset.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultset.hxx @@ -32,8 +32,7 @@ namespace chelp { class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper { rtl::Reference< Content > m_xContent; - com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > m_xEnv; + css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; ResultSetFactory* m_pFactory; private: @@ -42,12 +41,10 @@ namespace chelp { public: DynamicResultSet( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rxContent, - const com::sun::star::ucb::OpenCommandArgument2& rCommand, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& rxEnv, + const css::ucb::OpenCommandArgument2& rCommand, + const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv, ResultSetFactory* pFactory ); virtual ~DynamicResultSet(); diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx index b577fc50d4a3..072d18ef570c 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx @@ -40,28 +40,28 @@ namespace chelp { class ResultSetBase : public cppu::OWeakObject, - public com::sun::star::lang::XComponent, - public com::sun::star::sdbc::XRow, - public com::sun::star::sdbc::XResultSet, - public com::sun::star::sdbc::XCloseable, - public com::sun::star::sdbc::XResultSetMetaDataSupplier, - public com::sun::star::beans::XPropertySet, - public com::sun::star::ucb::XContentAccess + public css::lang::XComponent, + public css::sdbc::XRow, + public css::sdbc::XResultSet, + public css::sdbc::XCloseable, + public css::sdbc::XResultSetMetaDataSupplier, + public css::beans::XPropertySet, + public css::ucb::XContentAccess { public: - ResultSetBase( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >& xProvider, - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq, - const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >& seqSort ); + ResultSetBase( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::ucb::XContentProvider >& xProvider, + const css::uno::Sequence< css::beans::Property >& seq, + const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort ); virtual ~ResultSetBase(); // XInterface - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Type& aType ) + throw( css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( @@ -77,24 +77,24 @@ namespace chelp { 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 && sal::static_int_cast( m_nRow ) < m_aItems.size() ) m_nWasNull = m_aItems[m_nRow]->wasNull(); @@ -106,8 +106,8 @@ namespace chelp { 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 && sal::static_int_cast( m_nRow ) < m_aItems.size() ) return m_aItems[m_nRow]->getString( columnIndex ); @@ -118,8 +118,8 @@ namespace chelp { 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 && sal::static_int_cast( m_nRow ) < m_aItems.size() ) return m_aItems[m_nRow]->getBoolean( columnIndex ); @@ -130,8 +130,8 @@ namespace chelp { 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 && sal::static_int_cast( m_nRow ) < m_aItems.size() ) return m_aItems[m_nRow]->getByte( columnIndex ); @@ -143,8 +143,8 @@ namespace chelp { 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 && sal::static_int_cast( m_nRow ) < m_aItems.size() ) return m_aItems[m_nRow]->getShort( columnIndex ); @@ -155,8 +155,8 @@ namespace chelp { 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 && sal::static_int_cast( m_nRow ) < m_aItems.size() ) return m_aItems[m_nRow]->getInt( columnIndex ); @@ -167,8 +167,8 @@ namespace chelp { 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 && sal::static_int_cast( m_nRow ) < m_aItems.size() ) return m_aItems[m_nRow]->getLong( columnIndex ); @@ -179,8 +179,8 @@ namespace chelp { 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 && sal::static_int_cast( m_nRow ) < m_aItems.size() ) return m_aItems[m_nRow]->getFloat( columnIndex ); @@ -191,8 +191,8 @@ namespace chelp { 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 && sal::static_int_cast( m_nRow ) < m_aItems.size() ) return m_aItems[m_nRow]->getDouble( columnIndex ); @@ -200,137 +200,137 @@ namespace chelp { 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 && sal::static_int_cast( m_nRow ) < 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 && sal::static_int_cast( m_nRow ) < 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 && sal::static_int_cast( m_nRow ) < 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 && sal::static_int_cast( m_nRow ) < 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 && sal::static_int_cast( m_nRow ) < 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 && sal::static_int_cast( m_nRow ) < 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 && sal::static_int_cast( m_nRow ) < 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 && sal::static_int_cast( m_nRow ) < 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 && sal::static_int_cast( m_nRow ) < 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 && sal::static_int_cast( m_nRow ) < 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 && sal::static_int_cast( m_nRow ) < 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 >(); } @@ -339,215 +339,215 @@ namespace chelp { 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; // XCloseable 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; protected: - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::ucb::XContentProvider > m_xProvider; sal_Int32 m_nRow; bool m_nWasNull; bool m_bRowCountFinal; - typedef std::vector< com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > > IdentSet; - typedef std::vector< com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > > ItemSet; + typedef std::vector< css::uno::Reference< css::ucb::XContentIdentifier > > IdentSet; + typedef std::vector< css::uno::Reference< css::sdbc::XRow > > ItemSet; typedef std::vector< OUString > PathSet; IdentSet m_aIdents; ItemSet m_aItems; PathSet m_aPath; - com::sun::star::uno::Sequence< com::sun::star::beans::Property > m_sProperty; - com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo > m_sSortingInfo; + css::uno::Sequence< css::beans::Property > m_sProperty; + css::uno::Sequence< css::ucb::NumberedSortingInfo > m_sSortingInfo; osl::Mutex m_aMutex; cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx index d161e9826cb1..0824613377b9 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx @@ -36,10 +36,10 @@ namespace chelp { { public: - ResultSetForQuery( const com::sun::star::uno::Reference& rxContext, - const com::sun::star::uno::Reference& xProvider, - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq, - const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >& seqSort, + ResultSetForQuery( const css::uno::Reference& rxContext, + const css::uno::Reference& xProvider, + const css::uno::Sequence< css::beans::Property >& seq, + const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort, URLParameter& aURLParameter, Databases* pDatabases ); diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx index 5058b9e8aefa..2c7bb60d7863 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx @@ -36,10 +36,10 @@ namespace chelp { { public: - ResultSetForRoot( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >& xProvider, - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq, - const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >& seqSort, + ResultSetForRoot( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::ucb::XContentProvider >& xProvider, + const css::uno::Sequence< css::beans::Property >& seq, + const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort, URLParameter& aURLParameter, Databases* pDatabases ); diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index bc5792149cec..75a54dc37187 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -80,7 +80,7 @@ using namespace chelp; URLParameter::URLParameter( const OUString& aURL, Databases* pDatabases ) - throw( com::sun::star::ucb::IllegalIdentifierException ) + throw( css::ucb::IllegalIdentifierException ) : m_pDatabases( pDatabases ), m_aURL( aURL ) { @@ -425,7 +425,7 @@ void URLParameter::open( const Command& aCommand, } -void URLParameter::parse() throw( com::sun::star::ucb::IllegalIdentifierException ) +void URLParameter::parse() throw( css::ucb::IllegalIdentifierException ) { m_aExpr = m_aURL; @@ -438,7 +438,7 @@ void URLParameter::parse() throw( com::sun::star::ucb::IllegalIdentifierExceptio ! query() || m_aLanguage.isEmpty() || m_aSystem.isEmpty() ) - throw com::sun::star::ucb::IllegalIdentifierException(); + throw css::ucb::IllegalIdentifierException(); } diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx index a20c7a24acd4..da0819252463 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx @@ -114,7 +114,7 @@ namespace chelp { URLParameter( const OUString& aURL, Databases* pDatabases ) - throw( com::sun::star::ucb::IllegalIdentifierException ); + throw( css::ucb::IllegalIdentifierException ); bool isActive() const { return !m_aActive.isEmpty() && m_aActive == "true"; } bool isQuery() const { return m_aId.isEmpty() && !m_aQuery.isEmpty(); } @@ -165,15 +165,15 @@ namespace chelp { OString getByName( const char* par ); - void open( const com::sun::star::ucb::Command& aCommand, + void open( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment, - const com::sun::star::uno::Reference< com::sun::star::io::XActiveDataSink >& xDataSink ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment, + const css::uno::Reference< css::io::XActiveDataSink >& xDataSink ); - void open( const com::sun::star::ucb::Command& aCommand, + void open( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xDataSink ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment, + const css::uno::Reference< css::io::XOutputStream >& xDataSink ); private: @@ -226,7 +226,7 @@ namespace chelp { void readHelpDataFile(); - void parse() throw( com::sun::star::ucb::IllegalIdentifierException ); + void parse() throw( css::ucb::IllegalIdentifierException ); bool scheme(); diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index f26c7f939aec..beab51903bd0 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -777,7 +777,7 @@ TVChildTarget::getConfiguration(const Reference< XComponentContext >& rxContext) { xProvider = theDefaultProvider::get( rxContext ); } - catch( const com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { OSL_ENSURE( xProvider.is(),"can not instantiate configuration" ); } @@ -807,7 +807,7 @@ TVChildTarget::getHierAccess( const Reference< XMultiServiceFactory >& sProvider ( sProvider->createInstanceWithArguments( sReaderService,seq ), UNO_QUERY ); } - catch( const com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } } @@ -828,7 +828,7 @@ TVChildTarget::getKey( const Reference< XHierarchicalNameAccess >& xHierAccess, aAny = xHierAccess->getByHierarchicalName( OUString::createFromAscii( key ) ); } - catch( const com::sun::star::container::NoSuchElementException& ) + catch( const css::container::NoSuchElementException& ) { } aAny >>= instPath; @@ -851,7 +851,7 @@ TVChildTarget::getBooleanKey(const Reference< xHierAccess->getByHierarchicalName( OUString::createFromAscii(key)); } - catch( const com::sun::star::container::NoSuchElementException& ) + catch( const css::container::NoSuchElementException& ) { } aAny >>= ret; @@ -1042,7 +1042,7 @@ inline bool isLetter( sal_Unicode c ) } void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< OUString > &rv, - com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ) + css::uno::Reference< css::deployment::XPackage > xPackage ) { rv.clear(); OUString aExtensionPath = xPackage->getURL(); -- cgit