diff options
Diffstat (limited to 'ucb/source/ucp/tdoc')
| -rw-r--r-- | ucb/source/ucp/tdoc/tdoc_content.hxx | 198 | ||||
| -rw-r--r-- | ucb/source/ucp/tdoc/tdoc_datasupplier.hxx | 14 | ||||
| -rw-r--r-- | ucb/source/ucp/tdoc/tdoc_docmgr.hxx | 74 | ||||
| -rw-r--r-- | ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx | 36 | ||||
| -rw-r--r-- | ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/tdoc/tdoc_provider.hxx | 46 | ||||
| -rw-r--r-- | ucb/source/ucp/tdoc/tdoc_resultset.hxx | 5 | ||||
| -rw-r--r-- | ucb/source/ucp/tdoc/tdoc_stgelems.hxx | 522 | ||||
| -rw-r--r-- | ucb/source/ucp/tdoc/tdoc_storage.hxx | 120 |
9 files changed, 461 insertions, 556 deletions
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx index aa513b442259..1ae0e658e383 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.hxx +++ b/ucb/source/ucp/tdoc/tdoc_content.hxx @@ -73,7 +73,7 @@ public: const OUString & getTitle() const { return m_aTitle; } void setTitle( const OUString & rTitle ) { m_aTitle = rTitle; } - com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > + css::uno::Sequence< css::ucb::ContentInfo > getCreatableContentsInfo() const; bool isContentCreator() const; @@ -87,7 +87,7 @@ private: class Content : public ::ucbhelper::ContentImplHelper, - public com::sun::star::ucb::XContentCreator + public css::ucb::XContentCreator { enum ContentState { TRANSIENT, // created via createNewContent, // but did not process "insert" yet @@ -100,25 +100,19 @@ class Content : public ::ucbhelper::ContentImplHelper, ContentProvider* m_pProvider; private: - Content( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier, + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, const ContentProperties & rProps ); - Content( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier, - const com::sun::star::ucb::ContentInfo& Info ); - - 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; + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, + const css::ucb::ContentInfo& Info ); + + 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; static bool hasData( ContentProvider* pProvider, const Uri & rUri ); @@ -127,23 +121,18 @@ private: static bool loadData( ContentProvider* pProvider, const Uri & rUri, ContentProperties& rProps ); - bool storeData( const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream >& xData, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw ( ::com::sun::star::ucb::CommandFailedException, - ::com::sun::star::task::DocumentPasswordRequest, + bool storeData( const css::uno::Reference< css::io::XInputStream >& xData, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw ( css::ucb::CommandFailedException, + css::task::DocumentPasswordRequest, css::uno::RuntimeException ); - bool renameData( const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& xOldId, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& xNewId ); + bool renameData( const css::uno::Reference< css::ucb::XContentIdentifier >& xOldId, + const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId ); bool removeData(); bool copyData( const Uri & rSourceUri, const OUString & rNewName ); - ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier > + css::uno::Reference< css::ucb::XContentIdentifier > makeNewIdentifier( const OUString& rTitle ); typedef rtl::Reference< Content > ContentRef; @@ -151,83 +140,66 @@ private: void queryChildren( ContentRefList& rChildren ); bool exchangeIdentity( - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& xNewId ); + const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValues( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProperties ); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > + css::uno::Reference< css::sdbc::XRow > + getPropertyValues( const css::uno::Sequence< css::beans::Property >& rProperties ); + css::uno::Sequence< css::uno::Any > setPropertyValues( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& rValues, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception, std::exception ); - - com::sun::star::uno::Any - open( const ::com::sun::star::ucb::OpenCommandArgument2& rArg, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw( ::com::sun::star::uno::Exception ); - - void insert( const ::com::sun::star::uno::Reference< - ::com::sun::star::io::XInputStream >& xData, + const css::uno::Sequence< css::beans::PropertyValue >& rValues, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception, std::exception ); + + css::uno::Any + open( const css::ucb::OpenCommandArgument2& rArg, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw( css::uno::Exception ); + + void insert( const css::uno::Reference< css::io::XInputStream >& xData, sal_Int32 nNameClashResolve, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception ); void destroy( bool bDeletePhysical, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception, std::exception ); - - void transfer( const ::com::sun::star::ucb::TransferInfo& rInfo, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception, std::exception ); - - static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValues( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProperties, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception, std::exception ); + + void transfer( const css::ucb::TransferInfo& rInfo, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception, std::exception ); + + static css::uno::Reference< css::sdbc::XRow > + getPropertyValues( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Sequence< css::beans::Property >& rProperties, const ContentProperties& rData, ContentProvider* pProvider, const OUString& rContentId ); static bool commitStorage( - const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & xStorage ); + const css::uno::Reference< css::embed::XStorage > & xStorage ); static bool closeOutputStream( - const com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & xOut ); + const css::uno::Reference< css::io::XOutputStream > & xOut ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - getInputStream( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & - xEnv ) + css::uno::Reference< css::io::XInputStream > + getInputStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( css::ucb::CommandFailedException, css::task::DocumentPasswordRequest, css::uno::RuntimeException ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > + css::uno::Reference< css::io::XOutputStream > getTruncatedOutputStream( - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( css::ucb::CommandFailedException, css::task::DocumentPasswordRequest, css::uno::RuntimeException ); - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > + css::uno::Reference< css::ucb::XContent > queryChildContent( const OUString & rRelativeChildUri ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > - getStream( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) + css::uno::Reference< css::io::XStream > + getStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( css::ucb::CommandFailedException, css::task::DocumentPasswordRequest, css::uno::RuntimeException ); @@ -235,20 +207,16 @@ private: public: // Create existing content. Fail, if not already exists. static Content* create( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier ); + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ); // Create new content. Fail, if already exists. static Content* create( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier, - const com::sun::star::ucb::ContentInfo& Info ); + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, + const css::ucb::ContentInfo& Info ); virtual ~Content(); @@ -269,56 +237,50 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + 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; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL getIdentifier() - 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; // Additional interfaces // XContentCreator - virtual com::sun::star::uno::Sequence< - com::sun::star::ucb::ContentInfo > SAL_CALL + virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL - createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + createNewContent( const css::ucb::ContentInfo& Info ) + throw( css::uno::RuntimeException, std::exception ) override; // Non-interface methods. - static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValues( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProperties, + static css::uno::Reference< css::sdbc::XRow > + getPropertyValues( const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Sequence< css::beans::Property >& rProperties, ContentProvider* pProvider, const OUString& rContentId ); diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx index 9facfc074ac9..1bb38c4ec59f 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx @@ -39,17 +39,15 @@ private: public: ResultSetDataSupplier( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rContent, - sal_Int32 nOpenMode = com::sun::star::ucb::OpenMode::ALL ); + sal_Int32 nOpenMode = css::ucb::OpenMode::ALL ); virtual ~ResultSetDataSupplier(); virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > + virtual css::uno::Reference< css::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > + virtual css::uno::Reference< css::ucb::XContent > queryContent( sal_uInt32 nIndex ) override; virtual bool getResult( sal_uInt32 nIndex ) override; @@ -58,14 +56,14 @@ public: virtual sal_uInt32 currentCount() override; virtual bool isCountFinal() override; - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > + virtual css::uno::Reference< css::sdbc::XRow > queryPropertyValues( sal_uInt32 nIndex ) override; virtual void releasePropertyValues( sal_uInt32 nIndex ) override; virtual void close() override; virtual void validate() - throw( com::sun::star::ucb::ResultSetException ) override; + throw( css::ucb::ResultSetException ) override; }; } // namespace tdoc_ucp diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx index c914d645e66e..801e61e265db 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx @@ -51,19 +51,15 @@ namespace tdoc_ucp { struct StorageInfo { OUString aTitle; - com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > xStorage; - com::sun::star::uno::Reference< - com::sun::star::frame::XModel > xModel; + css::uno::Reference< css::embed::XStorage > xStorage; + css::uno::Reference< css::frame::XModel > xModel; StorageInfo() {}; // needed for STL map only. StorageInfo( const OUString & rTitle, - const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & rxStorage, - const com::sun::star::uno::Reference< - com::sun::star::frame::XModel > & rxModel ) + const css::uno::Reference< css::embed::XStorage > & rxStorage, + const css::uno::Reference< css::frame::XModel > & rxModel ) : aTitle( rTitle ), xStorage( rxStorage ), xModel( rxModel ) {} }; @@ -83,10 +79,10 @@ namespace tdoc_ucp { class OfficeDocumentsManager : - public cppu::WeakImplHelper< com::sun::star::document::XDocumentEventListener > + public cppu::WeakImplHelper< css::document::XDocumentEventListener > { class OfficeDocumentsCloseListener : - public cppu::WeakImplHelper< com::sun::star::util::XCloseListener > + public cppu::WeakImplHelper< css::util::XCloseListener > { public: @@ -95,19 +91,19 @@ namespace tdoc_ucp { // util::XCloseListener virtual void SAL_CALL queryClosing( - const ::com::sun::star::lang::EventObject& Source, + const css::lang::EventObject& Source, sal_Bool GetsOwnership ) - throw (::com::sun::star::util::CloseVetoException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::util::CloseVetoException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL notifyClosing( - 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; // lang::XEventListener (base of util::XCloseListener) 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; void Dispose() { m_pManager = 0; } @@ -117,8 +113,7 @@ namespace tdoc_ucp { public: OfficeDocumentsManager( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & rxContext, + const css::uno::Reference< css::uno::XComponentContext > & rxContext, OfficeDocumentsEventListener * pDocEventListener ); virtual ~OfficeDocumentsManager(); @@ -126,26 +121,25 @@ namespace tdoc_ucp { // document::XDocumentEventListener virtual void SAL_CALL documentEventOccured( - const com::sun::star::document::DocumentEvent & Event ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::document::DocumentEvent & Event ) + throw ( css::uno::RuntimeException, std::exception ) override; // lang::XEventListener (base of document::XDocumentEventListener) 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; // Non-interface - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > + css::uno::Reference< css::embed::XStorage > queryStorage( const OUString & rDocId ); static OUString queryDocumentId( - const com::sun::star::uno::Reference< - com::sun::star::frame::XModel > & xModel ); + const css::uno::Reference< css::frame::XModel > & xModel ); - com::sun::star::uno::Reference< com::sun::star::frame::XModel > + css::uno::Reference< css::frame::XModel > queryDocumentModel( const OUString & rDocId ); - com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > queryDocuments(); OUString @@ -155,33 +149,25 @@ namespace tdoc_ucp { void buildDocumentsList(); bool isOfficeDocument( - const com::sun::star::uno::Reference< - com::sun::star::uno::XInterface > & xDoc ); + const css::uno::Reference< css::uno::XInterface > & xDoc ); static bool isDocumentPreview( - const com::sun::star::uno::Reference< - com::sun::star::frame::XModel > & xModel ); + const css::uno::Reference< css::frame::XModel > & xModel ); static bool isWithoutOrInTopLevelFrame( - const com::sun::star::uno::Reference< - com::sun::star::frame::XModel > & xModel ); + const css::uno::Reference< css::frame::XModel > & xModel ); bool isBasicIDE( - const com::sun::star::uno::Reference< - com::sun::star::frame::XModel > & xModel ); + const css::uno::Reference< css::frame::XModel > & xModel ); static bool isHelpDocument( - const com::sun::star::uno::Reference< - com::sun::star::frame::XModel > & xModel ); + const css::uno::Reference< css::frame::XModel > & xModel ); osl::Mutex m_aMtx; - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< - com::sun::star::frame::XGlobalEventBroadcaster > m_xDocEvtNotifier; - com::sun::star::uno::Reference< - com::sun::star::frame::XModuleManager2 > m_xModuleMgr; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::frame::XGlobalEventBroadcaster > m_xDocEvtNotifier; + css::uno::Reference< css::frame::XModuleManager2 > m_xModuleMgr; DocumentList m_aDocs; OfficeDocumentsEventListener * m_pDocEventListener; ::rtl::Reference<OfficeDocumentsCloseListener> m_xDocCloseListener; diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx index d67cd90b2ed5..fdff4bf01721 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx @@ -30,47 +30,41 @@ namespace tdoc_ucp { class DocumentContentFactory : public cppu::WeakImplHelper< - com::sun::star::frame::XTransientDocumentsDocumentContentFactory, - com::sun::star::lang::XServiceInfo > + css::frame::XTransientDocumentsDocumentContentFactory, + css::lang::XServiceInfo > { public: - explicit DocumentContentFactory( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& rXSMgr ); + explicit DocumentContentFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rXSMgr ); virtual ~DocumentContentFactory(); // 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; // XTransientDocumentsDocumentContentFactory - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL - createDocumentContent( const ::com::sun::star::uno::Reference< - com::sun::star::frame::XModel >& Model ) - throw ( com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + createDocumentContent( const css::uno::Reference< css::frame::XModel >& Model ) + throw ( css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception ) override; // Non-UNO interfaces static OUString getImplementationName_Static(); - static com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static com::sun::star::uno::Reference< - com::sun::star::lang::XSingleServiceFactory > - createServiceFactory( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > & rxServiceMgr ); + static css::uno::Reference< css::lang::XSingleServiceFactory > + createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory > & rxServiceMgr ); private: - com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > m_xSMgr; + css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMgr; }; } // namespace tdoc_ucp diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx index 4a10ee2f6811..f4bfae216646 100644 --- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx +++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx @@ -82,7 +82,7 @@ namespace tdoc_ucp { { public: DocumentPasswordRequest( - com::sun::star::task::PasswordRequestMode eMode, + css::task::PasswordRequestMode eMode, const OUString & rDocumentName ); }; diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx index c1000b7a7fc6..3fa3f91d6ee5 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.hxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx @@ -58,12 +58,11 @@ class StorageElementFactory; class ContentProvider : public ::ucbhelper::ContentProviderImplHelper, - public com::sun::star::frame::XTransientDocumentsDocumentContentFactory, + public css::frame::XTransientDocumentsDocumentContentFactory, public OfficeDocumentsEventListener { public: - explicit ContentProvider( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext ); + explicit ContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~ContentProvider(); // XInterface @@ -96,56 +95,53 @@ public: css::lang::XMultiServiceFactory >& rxServiceMgr ); // XContentProvider - virtual com::sun::star::uno::Reference< - com::sun::star::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; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) + throw( css::ucb::IllegalIdentifierException, + css::uno::RuntimeException, std::exception ) override; // XTransientDocumentsDocumentContentFactory - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL - createDocumentContent( const ::com::sun::star::uno::Reference< - com::sun::star::frame::XModel >& Model ) - throw ( com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + createDocumentContent( const css::uno::Reference< + css::frame::XModel >& Model ) + throw ( css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception ) override; // Non-UNO interfaces - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > + css::uno::Reference< css::embed::XStorage > queryStorage( const OUString & rUri, StorageAccessMode eMode ) const; - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > + css::uno::Reference< css::embed::XStorage > queryStorageClone( const OUString & rUri ) const; - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + css::uno::Reference< css::io::XInputStream > queryInputStream( const OUString & rUri, const OUString & rPassword ) const - throw ( com::sun::star::packages::WrongPasswordException, + throw ( css::packages::WrongPasswordException, css::uno::RuntimeException ); - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > + css::uno::Reference< css::io::XOutputStream > queryOutputStream( const OUString & rUri, const OUString & rPassword, bool bTruncate ) const - throw ( com::sun::star::packages::WrongPasswordException, + throw ( css::packages::WrongPasswordException, css::uno::RuntimeException ); - com::sun::star::uno::Reference< com::sun::star::io::XStream > + css::uno::Reference< css::io::XStream > queryStream( const OUString & rUri, const OUString & rPassword, bool bTruncate ) const - throw ( com::sun::star::packages::WrongPasswordException, + throw ( css::packages::WrongPasswordException, css::uno::RuntimeException ); bool queryNamesOfChildren( const OUString & rUri, - com::sun::star::uno::Sequence< OUString > & rNames ) const; + css::uno::Sequence< OUString > & rNames ) const; // storage properties OUString queryStorageTitle( const OUString & rUri ) const; - com::sun::star::uno::Reference< com::sun::star::frame::XModel > + css::uno::Reference< css::frame::XModel > queryDocumentModel( const OUString & rUri ) const; // interface OfficeDocumentsEventListener diff --git a/ucb/source/ucp/tdoc/tdoc_resultset.hxx b/ucb/source/ucp/tdoc/tdoc_resultset.hxx index c740534bf398..cbaec16cbba7 100644 --- a/ucb/source/ucp/tdoc/tdoc_resultset.hxx +++ b/ucb/source/ucp/tdoc/tdoc_resultset.hxx @@ -37,10 +37,9 @@ private: 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 css::ucb::OpenCommandArgument2& rCommand ); }; } diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx index 2aab25863482..f92b86fa037c 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx @@ -49,22 +49,19 @@ class ParentStorageHolder : public MutexHolder { public: ParentStorageHolder( - const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & xParentStorage, + const css::uno::Reference< css::embed::XStorage > & xParentStorage, const OUString & rUri ); bool isParentARootStorage() const { return m_bParentIsRootStorage; } - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > + css::uno::Reference< css::embed::XStorage > getParentStorage() const { return m_xParentStorage; } - void setParentStorage( const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & xStg ) + void setParentStorage( const css::uno::Reference< css::embed::XStorage > & xStg ) { osl::MutexGuard aGuard( m_aMutex ); m_xParentStorage = xStg; } private: - com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > m_xParentStorage; + css::uno::Reference< css::embed::XStorage > m_xParentStorage; bool m_bParentIsRootStorage; }; @@ -72,29 +69,26 @@ private: typedef cppu::WeakImplHelper< - com::sun::star::embed::XStorage, - com::sun::star::embed::XTransactedObject > StorageUNOBase; + css::embed::XStorage, + css::embed::XTransactedObject > StorageUNOBase; class Storage : public StorageUNOBase, public ParentStorageHolder { public: Storage( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & rxContext, + const css::uno::Reference< css::uno::XComponentContext > & rxContext, const rtl::Reference< StorageElementFactory > & xFactory, const OUString & rUri, - const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & xParentStorage, - const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & xStorageToWrap ); + const css::uno::Reference< css::embed::XStorage > & xParentStorage, + const css::uno::Reference< css::embed::XStorage > & xStorageToWrap ); virtual ~Storage(); bool isDocumentStorage() const { return m_bIsDocumentStorage; } // XInterface - virtual com::sun::star::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type& aType ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type& aType ) + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() @@ -102,199 +96,189 @@ public: // XTypeProvider (implemnented by base, but needs to be overridden for // delegating to aggregate) - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; // XComponent ( one of XStorage bases ) 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; 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; // XNameAccess ( one of XStorage bases ) - 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; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + throw ( css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + 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; // XElementAccess (base of 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; virtual sal_Bool SAL_CALL hasElements() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; // XStorage virtual void SAL_CALL - copyToStorage( const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage >& xDest ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL + copyToStorage( const css::uno::Reference< css::embed::XStorage >& xDest ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::io::XStream > SAL_CALL openStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::packages::WrongPasswordException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::io::XStream > SAL_CALL openEncryptedStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPassword ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::packages::NoEncryptionException, - com::sun::star::packages::WrongPasswordException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< com::sun::star::embed::XStorage > SAL_CALL + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::NoEncryptionException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::embed::XStorage > SAL_CALL openStorageElement( const OUString& aStorName, sal_Int32 nOpenMode ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneStreamElement( const OUString& aStreamName ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::packages::WrongPasswordException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneEncryptedStreamElement( const OUString& aStreamName, const OUString& aPassword ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::packages::NoEncryptionException, - com::sun::star::packages::WrongPasswordException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::packages::NoEncryptionException, + css::packages::WrongPasswordException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - copyLastCommitTo( const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage >& xTargetStorage ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + copyLastCommitTo( const css::uno::Reference< + css::embed::XStorage >& xTargetStorage ) + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL copyStorageElementLastCommitTo( const OUString& aStorName, - const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & + const css::uno::Reference< + css::embed::XStorage > & xTargetStorage ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isStreamElement( const OUString& aElementName ) - throw ( com::sun::star::container::NoSuchElementException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::embed::InvalidStorageException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::container::NoSuchElementException, + css::lang::IllegalArgumentException, + css::embed::InvalidStorageException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isStorageElement( const OUString& aElementName ) - throw ( com::sun::star::container::NoSuchElementException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::embed::InvalidStorageException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::container::NoSuchElementException, + css::lang::IllegalArgumentException, + css::embed::InvalidStorageException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeElement( const OUString& aElementName ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::container::NoSuchElementException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL renameElement( const OUString& aEleName, const OUString& aNewName ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::container::NoSuchElementException, - com::sun::star::container::ElementExistException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::container::ElementExistException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL copyElementTo( const OUString& aElementName, - const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage >& xDest, + const css::uno::Reference< css::embed::XStorage >& xDest, const OUString& aNewName ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::container::NoSuchElementException, - com::sun::star::container::ElementExistException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::container::ElementExistException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL moveElementTo( const OUString& aElementName, - const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage >& xDest, + const css::uno::Reference< css::embed::XStorage >& xDest, const OUString& rNewName ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::container::NoSuchElementException, - com::sun::star::container::ElementExistException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::container::NoSuchElementException, + css::container::ElementExistException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException, std::exception ) override; // XTransactedObject virtual void SAL_CALL commit() - throw ( com::sun::star::io::IOException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::io::IOException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL revert() - throw ( com::sun::star::io::IOException, - com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::io::IOException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception ) override; private: explicit Storage( const rtl::Reference< Storage > & rFactory ); // n.i. rtl::Reference< StorageElementFactory > m_xFactory; - com::sun::star::uno::Reference< - com::sun::star::uno::XAggregation > m_xAggProxy; - com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > m_xWrappedStorage; - com::sun::star::uno::Reference< - com::sun::star::embed::XTransactedObject > m_xWrappedTransObj; - com::sun::star::uno::Reference< - com::sun::star::lang::XComponent > m_xWrappedComponent; - com::sun::star::uno::Reference< - com::sun::star::lang::XTypeProvider > m_xWrappedTypeProv; + css::uno::Reference< css::uno::XAggregation > m_xAggProxy; + css::uno::Reference< css::embed::XStorage > m_xWrappedStorage; + css::uno::Reference< css::embed::XTransactedObject > m_xWrappedTransObj; + css::uno::Reference< css::lang::XComponent > m_xWrappedComponent; + css::uno::Reference< css::lang::XTypeProvider > m_xWrappedTypeProv; bool m_bIsDocumentStorage; StorageElementFactory::StorageMap::iterator m_aContainerIt; @@ -307,225 +291,213 @@ private: typedef cppu::WeakImplHelper< - com::sun::star::io::XOutputStream, - com::sun::star::lang::XComponent > OutputStreamUNOBase; + css::io::XOutputStream, + css::lang::XComponent > OutputStreamUNOBase; class OutputStream : public OutputStreamUNOBase, public ParentStorageHolder { public: OutputStream( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & rxContext, + const css::uno::Reference< css::uno::XComponentContext > & rxContext, const OUString & rUri, - const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & xParentStorage, - const com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & xStreamToWrap ); + const css::uno::Reference< css::embed::XStorage > & xParentStorage, + const css::uno::Reference< css::io::XOutputStream > & xStreamToWrap ); virtual ~OutputStream(); // XInterface - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( const com::sun::star::uno::Type& aType ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL + queryInterface( const css::uno::Type& aType ) + throw ( css::uno::RuntimeException, std::exception ) override; // XTypeProvider (implemnented by base, but needs to be overridden for // delegating to aggregate) - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; // XOutputStream virtual 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; virtual 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; // Note: We need to intercept this one. virtual void SAL_CALL closeOutput( ) - 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; // XComponent // Note: We need to intercept this one. 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; 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; private: - com::sun::star::uno::Reference< - com::sun::star::uno::XAggregation > m_xAggProxy; - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > m_xWrappedStream; - com::sun::star::uno::Reference< - com::sun::star::lang::XComponent > m_xWrappedComponent; - com::sun::star::uno::Reference< - com::sun::star::lang::XTypeProvider > m_xWrappedTypeProv; + css::uno::Reference< + css::uno::XAggregation > m_xAggProxy; + css::uno::Reference< + css::io::XOutputStream > m_xWrappedStream; + css::uno::Reference< + css::lang::XComponent > m_xWrappedComponent; + css::uno::Reference< + css::lang::XTypeProvider > m_xWrappedTypeProv; }; -typedef cppu::WeakImplHelper< com::sun::star::io::XStream, - com::sun::star::io::XOutputStream, - com::sun::star::io::XTruncate, - com::sun::star::io::XInputStream, - com::sun::star::lang::XComponent > +typedef cppu::WeakImplHelper< css::io::XStream, + css::io::XOutputStream, + css::io::XTruncate, + css::io::XInputStream, + css::lang::XComponent > StreamUNOBase; class Stream : public StreamUNOBase, public ParentStorageHolder { public: Stream( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & rxContext, + const css::uno::Reference< css::uno::XComponentContext > & rxContext, const OUString & rUri, - const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & xParentStorage, - const com::sun::star::uno::Reference< - com::sun::star::io::XStream > & xStreamToWrap ); + const css::uno::Reference< css::embed::XStorage > & xParentStorage, + const css::uno::Reference< css::io::XStream > & xStreamToWrap ); virtual ~Stream(); // XInterface - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( const com::sun::star::uno::Type& aType ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL + queryInterface( const css::uno::Type& aType ) + throw ( css::uno::RuntimeException, std::exception ) override; // XTypeProvider (implemnented by base, but needs to be overridden for // delegating to aggregate) - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; // 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; // XOutputStream virtual 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; virtual 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; virtual void SAL_CALL closeOutput() - 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; // 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 virtual sal_Int32 SAL_CALL - readBytes( com::sun::star::uno::Sequence< sal_Int8 >& aData, + 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, + 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; // XComponent // Note: We need to intercept this one. 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; 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; private: void commitChanges() - throw( com::sun::star::io::IOException ); - - com::sun::star::uno::Reference< - com::sun::star::uno::XAggregation > m_xAggProxy; - com::sun::star::uno::Reference< - com::sun::star::io::XStream > m_xWrappedStream; - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > m_xWrappedOutputStream; - com::sun::star::uno::Reference< - com::sun::star::io::XTruncate > m_xWrappedTruncate; - com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > m_xWrappedInputStream; - com::sun::star::uno::Reference< - com::sun::star::lang::XComponent > m_xWrappedComponent; - com::sun::star::uno::Reference< - com::sun::star::lang::XTypeProvider > m_xWrappedTypeProv; + throw( css::io::IOException ); + + css::uno::Reference< + css::uno::XAggregation > m_xAggProxy; + css::uno::Reference< + css::io::XStream > m_xWrappedStream; + css::uno::Reference< + css::io::XOutputStream > m_xWrappedOutputStream; + css::uno::Reference< + css::io::XTruncate > m_xWrappedTruncate; + css::uno::Reference< + css::io::XInputStream > m_xWrappedInputStream; + css::uno::Reference< + css::lang::XComponent > m_xWrappedComponent; + css::uno::Reference< + css::lang::XTypeProvider > m_xWrappedTypeProv; }; } // namespace tdoc_ucp diff --git a/ucb/source/ucp/tdoc/tdoc_storage.hxx b/ucb/source/ucp/tdoc/tdoc_storage.hxx index 9c2fcd7cbbeb..ff4fdaab774f 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.hxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.hxx @@ -44,94 +44,93 @@ namespace tdoc_ucp { { public: StorageElementFactory( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & rxContext, + const css::uno::Reference< css::uno::XComponentContext > & rxContext, const rtl::Reference< OfficeDocumentsManager > & xDocsMgr ); virtual ~StorageElementFactory(); - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > + css::uno::Reference< css::embed::XStorage > createTemporaryStorage() - throw ( com::sun::star::uno::Exception, - com::sun::star::uno::RuntimeException ); + throw ( css::uno::Exception, + css::uno::RuntimeException ); - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > + css::uno::Reference< css::embed::XStorage > createStorage( const OUString & rUri, StorageAccessMode eMode ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException ); + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException ); - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + css::uno::Reference< css::io::XInputStream > createInputStream( const OUString & rUri, const OUString & rPassword ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::packages::WrongPasswordException, - com::sun::star::uno::RuntimeException ); - - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::packages::WrongPasswordException, + css::uno::RuntimeException ); + + css::uno::Reference< css::io::XOutputStream > createOutputStream( const OUString & rUri, const OUString & rPassword, bool bTruncate ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::packages::WrongPasswordException, - com::sun::star::uno::RuntimeException ); - - com::sun::star::uno::Reference< com::sun::star::io::XStream > + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::packages::WrongPasswordException, + css::uno::RuntimeException ); + + css::uno::Reference< css::io::XStream > createStream( const OUString & rUri, const OUString & rPassword, bool bTruncate ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::packages::WrongPasswordException, - com::sun::star::uno::RuntimeException ); + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::packages::WrongPasswordException, + css::uno::RuntimeException ); private: friend class Storage; void releaseElement( Storage * pElement ); - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > + css::uno::Reference< css::embed::XStorage > queryParentStorage( const OUString & rUri, StorageAccessMode eMode ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException ); - - com::sun::star::uno::Reference< com::sun::star::embed::XStorage > - queryStorage( const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & xParentStorage, + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException ); + + css::uno::Reference< css::embed::XStorage > + queryStorage( const css::uno::Reference< + css::embed::XStorage > & xParentStorage, const OUString & rUri, StorageAccessMode eMode ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException ); - - com::sun::star::uno::Reference< com::sun::star::io::XStream > - queryStream( const com::sun::star::uno::Reference< - com::sun::star::embed::XStorage > & xParentStorage, + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::uno::RuntimeException ); + + css::uno::Reference< css::io::XStream > + queryStream( const css::uno::Reference< + css::embed::XStorage > & xParentStorage, const OUString & rPassword, const OUString & rUri, StorageAccessMode eMode, bool bTruncate /* ignored for read-only streams */ ) - throw ( com::sun::star::embed::InvalidStorageException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::packages::WrongPasswordException, - com::sun::star::uno::RuntimeException ); + throw ( css::embed::InvalidStorageException, + css::lang::IllegalArgumentException, + css::io::IOException, + css::embed::StorageWrappedTargetException, + css::packages::WrongPasswordException, + css::uno::RuntimeException ); struct ltstrbool { @@ -155,8 +154,7 @@ namespace tdoc_ucp { StorageMap m_aMap; osl::Mutex m_aMutex; rtl::Reference< OfficeDocumentsManager > m_xDocsMgr; - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; }; } // namespace tdoc_ucp |