diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-23 10:32:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-23 12:05:04 +0200 |
| commit | 1c909a13a0816e20d365000cc527d93e02633b0c (patch) | |
| tree | 7a402659f9696c01ceeca51c5ddd2127b3b0e815 /include/ucbhelper | |
| parent | d29e614ff9cd91c4e4a1bada6a21884e33323f8d (diff) | |
com::sun::star->css in include/ucbhelper to include/xmlscript
Change-Id: Iaa7f0b8455a601d3992c08cde0943c709c417256
Diffstat (limited to 'include/ucbhelper')
26 files changed, 851 insertions, 995 deletions
diff --git a/include/ucbhelper/activedatasink.hxx b/include/ucbhelper/activedatasink.hxx index 9cb6940be900..3e6c3ba427fd 100644 --- a/include/ucbhelper/activedatasink.hxx +++ b/include/ucbhelper/activedatasink.hxx @@ -28,7 +28,7 @@ namespace ucbhelper { /** - * This class implements the interface com::sun::star::io::XActiveDataSink. + * This class implements the interface css::io::XActiveDataSink. * Instances of this class can be passed with the parameters of an * "open" command. */ diff --git a/include/ucbhelper/activedatastreamer.hxx b/include/ucbhelper/activedatastreamer.hxx index 89eccba21d05..af6bae2ea8b9 100644 --- a/include/ucbhelper/activedatastreamer.hxx +++ b/include/ucbhelper/activedatastreamer.hxx @@ -29,7 +29,7 @@ namespace ucbhelper /** - * This class implements the interface com::sun::star::io::XActiveDataStreamer. + * This class implements the interface css::io::XActiveDataStreamer. * Instances of this class can be passed with the parameters of an * "open" command. */ diff --git a/include/ucbhelper/cancelcommandexecution.hxx b/include/ucbhelper/cancelcommandexecution.hxx index 9685d3938597..6e850d57d658 100644 --- a/include/ucbhelper/cancelcommandexecution.hxx +++ b/include/ucbhelper/cancelcommandexecution.hxx @@ -39,7 +39,7 @@ namespace ucbhelper If an Interaction Handler is given with the command environment and the handler handles the exception by selecting the supplied continuation, then this function will put the original exception supplied into a - com::sun::star::ucb::CommandFailedException and throw the + css::ucb::CommandFailedException and throw the CommandFailedException. If no handler was given or the handler was not able to handle the exception, then the given exception will be thrown directly. @@ -51,17 +51,17 @@ namespace ucbhelper @param xEnv is the command environment that may contain an Interaction Handler to use before throwing the appropriate exception. */ -UCBHELPER_DLLPUBLIC void cancelCommandExecution( const com::sun::star::uno::Any & rException, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & +UCBHELPER_DLLPUBLIC void cancelCommandExecution( const css::uno::Any & rException, + const css::uno::Reference< + css::ucb::XCommandEnvironment > & xEnv ) - throw( com::sun::star::uno::Exception ); + throw( css::uno::Exception ); /** Cancel the execution of a command by throwing the appropriate exception. If an Interaction Handler is given with the command environment and the handler handles the exception by selecting the supplied continuation, then this function will put the original exception supplied into a - com::sun::star::ucb::CommandFailedException and throw the + css::ucb::CommandFailedException and throw the CommandFailedException. If no handler was given or the handler was not able to handle the exception, then the given exception will be thrown directly. @@ -86,17 +86,12 @@ UCBHELPER_DLLPUBLIC void cancelCommandExecution( const com::sun::star::uno::Any Used as debugging aid only. Passed to the member 'Context' of the uno::Exception thrown by this function. */ -UCBHELPER_DLLPUBLIC void cancelCommandExecution( const com::sun::star::ucb::IOErrorCode eError, - const com::sun::star::uno::Sequence< - com::sun::star::uno::Any > & rArgs, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & - xEnv, +UCBHELPER_DLLPUBLIC void cancelCommandExecution( const css::ucb::IOErrorCode eError, + const css::uno::Sequence< css::uno::Any > & rArgs, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv, const OUString & rMessage = OUString(), - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandProcessor > & - xContext = 0 ) - throw( com::sun::star::uno::Exception ); + const css::uno::Reference< css::ucb::XCommandProcessor > & xContext = 0 ) + throw( css::uno::Exception ); } #endif // INCLUDED_UCBHELPER_CANCELCOMMANDEXECUTION_HXX diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx index 6f78aed22a6d..11bc5e3e4a89 100644 --- a/include/ucbhelper/commandenvironment.hxx +++ b/include/ucbhelper/commandenvironment.hxx @@ -30,7 +30,7 @@ struct CommandEnvironment_Impl; /** * This class implements the interface - * com::sun::star::ucb::XCommandEnvironement. Instances of this class can + * css::ucb::XCommandEnvironement. Instances of this class can * be used to supply environments to commands executed by UCB contents. */ class UCBHELPER_DLLPUBLIC CommandEnvironment : diff --git a/include/ucbhelper/content.hxx b/include/ucbhelper/content.hxx index 520ce2a17cb8..2cf186bb6631 100644 --- a/include/ucbhelper/content.hxx +++ b/include/ucbhelper/content.hxx @@ -99,12 +99,11 @@ class UCBHELPER_DLLPUBLIC Content rtl::Reference< Content_Impl > m_xImpl; protected: - ::com::sun::star::uno::Any createCursorAny( const ::com::sun::star::uno::Sequence< - OUString >& rPropertyNames, - ResultSetInclude eMode ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + css::uno::Any createCursorAny( const css::uno::Sequence< OUString >& rPropertyNames, + ResultSetInclude eMode ) + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); public: /** @@ -122,12 +121,10 @@ public: * errors. */ Content( const OUString& rURL, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& rEnv, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rCtx ) - throw ( ::com::sun::star::ucb::ContentCreationException, - ::com::sun::star::uno::RuntimeException ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& rEnv, + const css::uno::Reference< css::uno::XComponentContext >& rCtx ) + throw ( css::ucb::ContentCreationException, + css::uno::RuntimeException ); /** * Constructor. * @@ -137,14 +134,11 @@ public: * implementation to interact with the client and to propagate * errors. */ - Content( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContent >& rContent, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& rEnv, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rCtx ) - throw ( ::com::sun::star::ucb::ContentCreationException, - ::com::sun::star::uno::RuntimeException ); + Content( const css::uno::Reference< css::ucb::XContent >& rContent, + const css::uno::Reference< css::ucb::XCommandEnvironment >& rEnv, + const css::uno::Reference< css::uno::XComponentContext >& rCtx ) + throw ( css::ucb::ContentCreationException, + css::uno::RuntimeException ); /** * Copy Constructor. * @@ -179,10 +173,8 @@ public: */ static bool create( const OUString& rURL, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& rEnv, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rCtx, + const css::uno::Reference< css::ucb::XCommandEnvironment >& rEnv, + const css::uno::Reference< css::uno::XComponentContext >& rCtx, Content& rContent ); @@ -198,8 +190,7 @@ public: * * @return the XContent interface of the underlying UCB content. */ - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > - get() const; + css::uno::Reference< css::ucb::XContent > get() const; // Object identity. @@ -221,8 +212,7 @@ public: * * @return the command environment. */ - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& + const css::uno::Reference< css::ucb::XCommandEnvironment >& getCommandEnvironment() const; /** @@ -231,8 +221,7 @@ public: * @param xNewEnv is the new command environment. */ void setCommandEnvironment( - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xNewEnv ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xNewEnv ); // Access to supported commands/properties. @@ -245,11 +234,11 @@ public: * @return an XCommandInfo interface implementation, which can be used * to obtain meta data of the commands supported by this content. */ - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandInfo > + css::uno::Reference< css::ucb::XCommandInfo > getCommands() - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This methods provides access to meta data of the properties supported * by this content. @@ -257,12 +246,11 @@ public: * @return an XPropertSetInfo interface implementation, which can be used * to obtain meta data of the properties supported by this content. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo > + css::uno::Reference< css::beans::XPropertySetInfo > getProperties() - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); // Access to property value(s). @@ -275,11 +263,11 @@ public: * shall be obtained. * @return the property value. */ - ::com::sun::star::uno::Any + css::uno::Any getPropertyValue( const OUString& rPropertyName ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This method can be used to set a single property value. * @@ -288,28 +276,28 @@ public: * @return an any containing: * - No value indicates, that the property value was set * successfully. - * - com::sun::star::beans::UnknownPropertyException indicates, + * - css::beans::UnknownPropertyException indicates, * that the property is not known to the content implementation. - * - com::sun::star::beans::IllegalTypeException indicates, that + * - css::beans::IllegalTypeException indicates, that * the data type of the property value is not acceptable. - * - com::sun::star::lang::IllegalAccessException indicates, that + * - css::lang::IllegalAccessException indicates, that * the property is constant. - * - com::sun::star::lang::IllegalArgumentException indicates, + * - css::lang::IllegalArgumentException indicates, * that the property value is not acceptable. For instance, * setting an empty title may be illegal. * - Any other exception derived from - * com::sun::star::uno::Exception indicates, that the value was + * css::uno::Exception indicates, that the value was * not set successfully. For example, this can be a * com::sun:star::ucb::InteractiveAugmentedIOException * transporting the error code - * com::sun::star::ucb::IOErrorCode::ACCESS_DENIED. + * css::ucb::IOErrorCode::ACCESS_DENIED. */ - ::com::sun::star::uno::Any + css::uno::Any setPropertyValue( const OUString& rPropertyName, - const ::com::sun::star::uno::Any& rValue ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + const css::uno::Any& rValue ) + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This method can be used to read multiple property values. * @@ -317,12 +305,11 @@ public: * that the values shall be obtained. * @return the property values. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > - getPropertyValues( const ::com::sun::star::uno::Sequence< - OUString >& rPropertyNames ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + css::uno::Sequence< css::uno::Any > + getPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames ) + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This method can be used to read multiple property values. * @@ -330,12 +317,11 @@ public: * that the values shall be obtained. * @return the property values. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValuesInterface( const ::com::sun::star::uno::Sequence< - OUString >& rPropertyNames ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + css::uno::Reference< css::sdbc::XRow > + getPropertyValuesInterface( const css::uno::Sequence< OUString >& rPropertyNames ) + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This method can be used to set multiple property values. @@ -351,30 +337,28 @@ public: * An any containing: * - No value indicates, that the property value was set * successfully. - * - com::sun::star::beans::UnknownPropertyException indicates, + * - css::beans::UnknownPropertyException indicates, * that the property is not known to the content implementation. - * - com::sun::star::beans::IllegalTypeException indicates, that + * - css::beans::IllegalTypeException indicates, that * the data type of the property value is not acceptable. - * - com::sun::star::lang::IllegalAccessException indicates, that + * - css::lang::IllegalAccessException indicates, that * the property is constant. - * - com::sun::star::lang::IllegalArgumentException indicates, + * - css::lang::IllegalArgumentException indicates, * that the property value is not acceptable. For instance, * setting an empty title may be illegal. * - Any other exception derived from - * com::sun::star::uno::Exception indicates, that the value was + * css::uno::Exception indicates, that the value was * not set successfully. For example, this can be a * com::sun:star::ucb::InteractiveAugmentedIOException * transporting the error code - * com::sun::star::ucb::IOErrorCode::ACCESS_DENIED. + * css::ucb::IOErrorCode::ACCESS_DENIED. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > - setPropertyValues( const ::com::sun::star::uno::Sequence< - OUString >& rPropertyNames, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any >& rValues ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + css::uno::Sequence< css::uno::Any > + setPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames, + const css::uno::Sequence< css::uno::Any >& rValues ) + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); // General command execution. @@ -390,12 +374,12 @@ public: * specification. * @return the result of the command according to its specification. */ - ::com::sun::star::uno::Any + css::uno::Any executeCommand( const OUString& rCommandName, - const ::com::sun::star::uno::Any& rCommandArgument ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + const css::uno::Any& rCommandArgument ) + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); // Special commands. @@ -416,13 +400,12 @@ public: * com.cun.star.ucb.ContentResultSet, which can be used to * get access to the children of a content. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > - createCursor( const ::com::sun::star::uno::Sequence< - OUString >& rPropertyNames, + css::uno::Reference< css::sdbc::XResultSet > + createCursor( const css::uno::Sequence< OUString >& rPropertyNames, ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This methods gives access to the children of a folder content. * Additionally, the result set returned provides efficient access to @@ -438,23 +421,21 @@ public: * com.cun.star.ucb.DynamicResultSet, which can be used to * get access to the children of a content. */ - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XDynamicResultSet > - createDynamicCursor( const ::com::sun::star::uno::Sequence< - OUString >& rPropertyNames, - ResultSetInclude eMode - = INCLUDE_FOLDERS_AND_DOCUMENTS ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); - - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > - createSortedCursor( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames, - const ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::NumberedSortingInfo >& rSortInfo, - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompareFactory > rAnyCompareFactory, + css::uno::Reference< css::ucb::XDynamicResultSet > + createDynamicCursor( const css::uno::Sequence< OUString >& rPropertyNames, + ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS ) + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); + + css::uno::Reference< css::sdbc::XResultSet > + createSortedCursor( const css::uno::Sequence< OUString >& rPropertyNames, + const css::uno::Sequence< css::ucb::NumberedSortingInfo >& rSortInfo, + css::uno::Reference< css::ucb::XAnyCompareFactory > rAnyCompareFactory, ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This methods gives read access to the content stream of a content (i.e @@ -464,11 +445,11 @@ public: * @return an implementation of the interface XInputStream, which can * be used to read the content's data. */ - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > + css::uno::Reference< css::io::XInputStream > openStream() - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This methods gives read access to the content stream of a content (i.e * the content of a file located at the local file system). @@ -478,11 +459,11 @@ public: * @return an implementation of the interface XInputStream, which can * be used to read the content's data. */ - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > + css::uno::Reference< css::io::XInputStream > openStreamNoLock() - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This methods gives read/write access to the content stream of a content (i.e @@ -492,11 +473,11 @@ public: * @return an implementation of the interface XStream, which can * be used to read/write the content's data. */ - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > + css::uno::Reference< css::io::XStream > openWriteableStream() - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This methods gives read/write access to the content stream of a content (i.e * the content of a file located at the local file system). @@ -506,11 +487,11 @@ public: * @return an implementation of the interface XStream, which can * be used to read/write the content's data. */ - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > + css::uno::Reference< css::io::XStream > openWriteableStreamNoLock() - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This methods gives read access to the content stream of a content (i.e @@ -521,11 +502,10 @@ public: * which shall be used by the content to deliver the data. */ bool - openStream( const ::com::sun::star::uno::Reference< - ::com::sun::star::io::XActiveDataSink >& rSink ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + openStream( const css::uno::Reference< css::io::XActiveDataSink >& rSink ) + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This methods gives read access to the content stream of a content (i.e * the content of a file located at the local file system). @@ -535,11 +515,10 @@ public: * which shall be used by the content to deliver the data. */ bool - openStream( const ::com::sun::star::uno::Reference< - ::com::sun::star::io::XOutputStream >& rStream ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + openStream( const css::uno::Reference< css::io::XOutputStream >& rStream ) + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This methods gives write access to the content stream of a content (i.e * the content of a file located at the local file system). @@ -551,12 +530,11 @@ public: * shall be overwritten. */ void - writeStream( const ::com::sun::star::uno::Reference< - ::com::sun::star::io::XInputStream >& rStream, + writeStream( const css::uno::Reference< css::io::XInputStream >& rStream, bool bReplaceExisting ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This method returns the different types of contents this content @@ -565,11 +543,11 @@ public: * @return the content types or an empty sequence if no contents can be * created by this content. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::ContentInfo > + css::uno::Sequence< css::ucb::ContentInfo > queryCreatableContentsInfo() - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This method creates, initializes and inserts ( commits ) a new content @@ -596,14 +574,12 @@ public: */ bool insertNewContent( const OUString& rContentType, - const ::com::sun::star::uno::Sequence< - OUString >& rPropertyNames, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any >& rPropertyValues, + const css::uno::Sequence< OUString >& rPropertyNames, + const css::uno::Sequence< css::uno::Any >& rPropertyValues, Content& rNewContent ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This method creates, initializes and inserts (commits) a new content * inside this (the target folder) content. For example, it can be used to @@ -632,16 +608,13 @@ public: */ bool insertNewContent( const OUString& rContentType, - const ::com::sun::star::uno::Sequence< - OUString >& rPropertyNames, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any >& rPropertyValues, - const ::com::sun::star::uno::Reference< - ::com::sun::star::io::XInputStream >& rStream, + const css::uno::Sequence< OUString >& rPropertyNames, + const css::uno::Sequence< css::uno::Any >& rPropertyValues, + const css::uno::Reference< css::io::XInputStream >& rStream, Content& rNewContent ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This method transfers (copies/moves) a content. It creates a new @@ -682,9 +655,9 @@ public: const OUString & rCommentVersion = OUString( ), OUString* pResultURL = NULL, const OUString & rDocumentId = OUString( ) ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This method lock the resource. @@ -692,9 +665,9 @@ public: */ void lock() - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This method unlock the resource. @@ -702,9 +675,9 @@ public: */ void unlock() - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); // Required properties. @@ -717,9 +690,9 @@ public: */ bool isFolder() - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); /** * This method returns the value of the content's property "IsDocument". * @@ -728,9 +701,9 @@ public: */ bool isDocument() - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); + throw( css::ucb::CommandAbortedException, + css::uno::RuntimeException, + css::uno::Exception ); }; diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx index 07404a25cc7d..20b15c71f8aa 100644 --- a/include/ucbhelper/contenthelper.hxx +++ b/include/ucbhelper/contenthelper.hxx @@ -68,7 +68,7 @@ class ContentProviderImplHelper; * * Features of the base class implementation: * - standard interfaces ( XInterface, XTypeProvider, XServiceInfo ) - * - all required interfaces for service com::sun::star::ucb::Content + * - all required interfaces for service css::ucb::Content * - all required listener containers * ( XComponent, XPropertiesChangeNotifier, XPropertySetInfoChangeNotifier, * XCommandInfoChangeNotifier ) @@ -82,16 +82,16 @@ class ContentProviderImplHelper; */ class UCBHELPER_DLLPUBLIC ContentImplHelper : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::lang::XServiceInfo, - public com::sun::star::lang::XComponent, - public com::sun::star::ucb::XContent, - public com::sun::star::ucb::XCommandProcessor, - public com::sun::star::beans::XPropertiesChangeNotifier, - public com::sun::star::beans::XPropertyContainer, - public com::sun::star::beans::XPropertySetInfoChangeNotifier, - public com::sun::star::ucb::XCommandInfoChangeNotifier, - public com::sun::star::container::XChild + public css::lang::XTypeProvider, + public css::lang::XServiceInfo, + public css::lang::XComponent, + public css::ucb::XContent, + public css::ucb::XCommandProcessor, + public css::beans::XPropertiesChangeNotifier, + public css::beans::XPropertyContainer, + public css::beans::XPropertySetInfoChangeNotifier, + public css::ucb::XCommandInfoChangeNotifier, + public css::container::XChild { friend class PropertySetInfo; friend class CommandProcessorInfo; @@ -100,9 +100,9 @@ class UCBHELPER_DLLPUBLIC ContentImplHelper : protected: osl::Mutex m_aMutex; - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > + css::uno::Reference< css::ucb::XContentIdentifier > m_xIdentifier; rtl::Reference< ContentProviderImplHelper > m_xProvider; @@ -122,9 +122,8 @@ private: * @return a sequence containing the property meta data. */ UCBHELPER_DLLPRIVATE - virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > - getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) = 0; + virtual css::uno::Sequence< css::beans::Property > + getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) = 0; /** * Your implementation of this method must return a sequence containing @@ -134,9 +133,8 @@ private: * @return a sequence containing the command meta data. */ UCBHELPER_DLLPRIVATE - virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > - getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) = 0; + virtual css::uno::Sequence< css::ucb::CommandInfo > + getCommands( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) = 0; /** * The implementation of this method shall return the URL of the parent @@ -163,9 +161,8 @@ protected: * @return an XPropertySetInfo implementation object containing meta data * for the properties supported by this content. */ - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > - getPropertySetInfo( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv, + css::uno::Reference< css::beans::XPropertySetInfo > + getPropertySetInfo( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv, bool bCache = true ); /** @@ -179,9 +176,8 @@ protected: * @return an XCommandInfo implementation object containing meta data * for the commands supported by this content. */ - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandInfo > - getCommandInfo( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv, + css::uno::Reference< css::ucb::XCommandInfo > + getCommandInfo( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv, bool bCache = true ); /** @@ -190,8 +186,7 @@ protected: * @param evt is a sequence of property change events. */ void notifyPropertiesChange( - const com::sun::star::uno::Sequence< - com::sun::star::beans::PropertyChangeEvent >& evt ) const; + const css::uno::Sequence< css::beans::PropertyChangeEvent >& evt ) const; /** * This method can be used to propagate changes of the propertyset @@ -204,7 +199,7 @@ protected: * @param evt is a sequence of property change events. */ void notifyPropertySetInfoChange( - const com::sun::star::beans::PropertySetInfoChangeEvent& evt ) const; + const css::beans::PropertySetInfoChangeEvent& evt ) const; /** * This method can be used to propagate content events. @@ -212,7 +207,7 @@ protected: * @param evt is a sequence of content events. */ void notifyContentEvent( - const com::sun::star::ucb::ContentEvent& evt ) const; + const css::ucb::ContentEvent& evt ) const; /** * Use this method to announce the insertion of this content at @@ -238,8 +233,7 @@ protected: * @param rNewId is the new content identifier for the content. * @return a success indicator. */ - bool exchange( const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& rNewId ); + bool exchange( const css::uno::Reference< css::ucb::XContentIdentifier >& rNewId ); /** * Use this method to get access to the Additional Core Properties of @@ -252,8 +246,7 @@ protected: * @return the implementation of the service * com.sun.star.ucb.PersistentPropertySet. */ - com::sun::star::uno::Reference< - com::sun::star::ucb::XPersistentPropertySet > + css::uno::Reference< css::ucb::XPersistentPropertySet > getAdditionalPropertySet( bool bCreate ); /** @@ -308,11 +301,9 @@ public: * @param Identifier is the content identifier for the content. */ ContentImplHelper( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< ContentProviderImplHelper >& rxProvider, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier >& Identifier ); + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ); /** * Destructor. @@ -332,97 +323,87 @@ public: throw() override; // XTypeProvider - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; + throw( css::uno::RuntimeException, std::exception ) override = 0; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; + throw( css::uno::RuntimeException, std::exception ) override = 0; // 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 >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - removeEventListener( const com::sun::star::uno::Reference< - com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; // XContent - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > SAL_CALL + 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; virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException, std::exception ) override = 0; + throw( css::uno::RuntimeException, std::exception ) override = 0; virtual void SAL_CALL addContentEventListener( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeContentEventListener( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XContentEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; // XCommandProcessor virtual sal_Int32 SAL_CALL createCommandIdentifier() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Any SAL_CALL - execute( const com::sun::star::ucb::Command& aCommand, + throw( css::uno::RuntimeException, std::exception ) override; + 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 = 0; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception, + css::ucb::CommandAbortedException, + css::uno::RuntimeException, std::exception ) override = 0; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override = 0; + throw( css::uno::RuntimeException, std::exception ) override = 0; // XPropertiesChangeNotifier virtual void SAL_CALL addPropertiesChangeListener( - const com::sun::star::uno::Sequence< OUString >& PropertyNames, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertiesChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< OUString >& PropertyNames, + const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removePropertiesChangeListener( - const com::sun::star::uno::Sequence< OUString >& PropertyNames, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertiesChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< OUString >& PropertyNames, + const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; // XCommandInfoChangeNotifier virtual void SAL_CALL addCommandInfoChangeListener( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandInfoChangeListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeCommandInfoChangeListener( - const com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandInfoChangeListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; // XPropertyContainer @@ -439,11 +420,11 @@ public: virtual void SAL_CALL addProperty( const OUString& Name, sal_Int16 Attributes, - const com::sun::star::uno::Any& DefaultValue ) - throw( com::sun::star::beans::PropertyExistException, - com::sun::star::beans::IllegalTypeException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Any& DefaultValue ) + throw( css::beans::PropertyExistException, + css::beans::IllegalTypeException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException, std::exception ) override; /** * This method removes a property from the content according to the @@ -457,21 +438,19 @@ public: */ virtual void SAL_CALL removeProperty( const OUString& Name ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::beans::UnknownPropertyException, + css::beans::NotRemoveableException, + css::uno::RuntimeException, std::exception ) override; // XPropertySetInfoChangeNotifier virtual void SAL_CALL addPropertySetInfoChangeListener( - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySetInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removePropertySetInfoChangeListener( - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySetInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; // XChild @@ -480,19 +459,17 @@ public: * if such a parent exists. The implementation of this method uses your * implementation of getParentURL. */ - virtual com::sun::star::uno::Reference< - com::sun::star::uno::XInterface > SAL_CALL + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; /** * The implementation of this method always throws a NoSupportException. */ virtual void SAL_CALL - setParent( const com::sun::star::uno::Reference< - com::sun::star::uno::XInterface >& Parent ) - throw( com::sun::star::lang::NoSupportException, - com::sun::star::uno::RuntimeException, std::exception ) override; + setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) + throw( css::lang::NoSupportException, + css::uno::RuntimeException, std::exception ) override; // Non-interface methods. diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx index 9f05884efff0..29ff8676db7e 100644 --- a/include/ucbhelper/contentidentifier.hxx +++ b/include/ucbhelper/contentidentifier.hxx @@ -41,37 +41,37 @@ struct ContentIdentifier_Impl; */ class UCBHELPER_DLLPUBLIC ContentIdentifier : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::ucb::XContentIdentifier + public css::lang::XTypeProvider, + public css::ucb::XContentIdentifier { public: ContentIdentifier( const OUString& rURL ); virtual ~ContentIdentifier(); // XInterface - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL + queryInterface( const css::uno::Type & rType ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XContentIdentifier virtual OUString SAL_CALL getContentIdentifier() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getContentProviderScheme() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; private: ContentIdentifier_Impl* m_pImpl; diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx index e40c241f7cbb..929a9202c849 100644 --- a/include/ucbhelper/contentinfo.hxx +++ b/include/ucbhelper/contentinfo.hxx @@ -47,23 +47,22 @@ class ContentImplHelper; */ class PropertySetInfo : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::beans::XPropertySetInfo + public css::lang::XTypeProvider, + public css::beans::XPropertySetInfo { - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > + css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; - com::sun::star::uno::Sequence< com::sun::star::beans::Property >* + css::uno::Sequence< css::beans::Property >* m_pProps; osl::Mutex m_aMutex; ContentImplHelper* m_pContent; private: bool queryProperty( const OUString& rName, - com::sun::star::beans::Property& rProp ); + css::beans::Property& rProp ); public: - PropertySetInfo( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& rxEnv, + PropertySetInfo( const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv, ContentImplHelper* pContent ); virtual ~PropertySetInfo(); @@ -76,25 +75,25 @@ public: throw() override; // XTypeProvider - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XPropertySetInfo - virtual com::sun::star::uno::Sequence< - com::sun::star::beans::Property > SAL_CALL + virtual css::uno::Sequence< + css::beans::Property > SAL_CALL getProperties() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::beans::Property SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::beans::UnknownPropertyException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // Non-Interface methods. void reset(); @@ -113,25 +112,24 @@ public: */ class CommandProcessorInfo : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::ucb::XCommandInfo + public css::lang::XTypeProvider, + public css::ucb::XCommandInfo { - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > + css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; - com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo >* + css::uno::Sequence< css::ucb::CommandInfo >* m_pCommands; osl::Mutex m_aMutex; ContentImplHelper* m_pContent; private: bool queryCommand( const OUString& rName, - com::sun::star::ucb::CommandInfo& rCommand ); + css::ucb::CommandInfo& rCommand ); bool queryCommand( sal_Int32 nHandle, - com::sun::star::ucb::CommandInfo& rCommand ); + css::ucb::CommandInfo& rCommand ); public: - CommandProcessorInfo( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& rxEnv, + CommandProcessorInfo( const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv, ContentImplHelper* pContent ); virtual ~CommandProcessorInfo(); @@ -144,32 +142,32 @@ public: throw() override; // XTypeProvider - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XCommandInfo - virtual com::sun::star::uno::Sequence< - com::sun::star::ucb::CommandInfo > SAL_CALL + virtual css::uno::Sequence< + css::ucb::CommandInfo > SAL_CALL getCommands() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::ucb::CommandInfo SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::ucb::CommandInfo SAL_CALL getCommandInfoByName( const OUString& Name ) - throw( com::sun::star::ucb::UnsupportedCommandException, - com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::ucb::CommandInfo SAL_CALL + throw( css::ucb::UnsupportedCommandException, + css::uno::RuntimeException, std::exception ) override; + virtual css::ucb::CommandInfo SAL_CALL getCommandInfoByHandle( sal_Int32 Handle ) - throw( com::sun::star::ucb::UnsupportedCommandException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::ucb::UnsupportedCommandException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasCommandByName( const OUString& Name ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasCommandByHandle( sal_Int32 Handle ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // Non-Interface methods. void reset(); diff --git a/include/ucbhelper/fd_inputstream.hxx b/include/ucbhelper/fd_inputstream.hxx index 0a7351510c84..8dd0c544b45c 100644 --- a/include/ucbhelper/fd_inputstream.hxx +++ b/include/ucbhelper/fd_inputstream.hxx @@ -33,8 +33,8 @@ namespace ucbhelper { typedef ::cppu::WeakImplHelper2< - com::sun::star::io::XInputStream, - com::sun::star::io::XSeekable > FdInputStream_Base; + css::io::XInputStream, + css::io::XSeekable > FdInputStream_Base; /** Implements a seekable InputStream * working on a buffer. diff --git a/include/ucbhelper/getcomponentcontext.hxx b/include/ucbhelper/getcomponentcontext.hxx index 28e0dea5da60..7cdffd09bc8b 100644 --- a/include/ucbhelper/getcomponentcontext.hxx +++ b/include/ucbhelper/getcomponentcontext.hxx @@ -35,9 +35,9 @@ namespace ucbhelper { //TODO: a duplicate of comphelper::getComponentContext // (comphelper/processfactory.hxx) UCBHELPER_DLLPUBLIC -com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > +css::uno::Reference< css::uno::XComponentContext > getComponentContext( - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + css::uno::Reference< css::lang::XMultiServiceFactory > const & factory); } diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx index 6fe8ae3b63e3..3361ccb04274 100644 --- a/include/ucbhelper/interactionrequest.hxx +++ b/include/ucbhelper/interactionrequest.hxx @@ -60,13 +60,13 @@ struct InteractionRequest_Impl; * like authentication requests. */ class UCBHELPER_DLLPUBLIC InteractionRequest : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::task::XInteractionRequest + public css::lang::XTypeProvider, + public css::task::XInteractionRequest { InteractionRequest_Impl * m_pImpl; protected: - void setRequest( const com::sun::star::uno::Any & rRequest ); + void setRequest( const css::uno::Any & rRequest ); InteractionRequest(); virtual ~InteractionRequest(); @@ -77,7 +77,7 @@ public: * * @param rRequest is the exception describing the error. */ - InteractionRequest( const com::sun::star::uno::Any & rRequest ); + InteractionRequest( const css::uno::Any & rRequest ); /** * This method sets the continuations for the request. @@ -85,37 +85,32 @@ public: * @param rContinuations contains the possible continuations. */ void setContinuations( - const com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionContinuation > > & - rContinuations ); + const css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > & rContinuations ); // XInterface - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL + queryInterface( const css::uno::Type & rType ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + 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; // XInteractionRequest - virtual com::sun::star::uno::Any SAL_CALL + virtual css::uno::Any SAL_CALL getRequest() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionContinuation > > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // Non-interface methods. @@ -181,33 +176,33 @@ public: * the operation that caused the request. */ class UCBHELPER_DLLPUBLIC InteractionAbort : public InteractionContinuation, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::task::XInteractionAbort + public css::lang::XTypeProvider, + public css::task::XInteractionAbort { public: InteractionAbort( InteractionRequest * pRequest ) : InteractionContinuation( pRequest ) {} // XInterface - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL + queryInterface( const css::uno::Type & rType ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + 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; // XInteractionContinuation virtual void SAL_CALL select() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; }; @@ -218,33 +213,33 @@ public: * the operation that caused the request. */ class UCBHELPER_DLLPUBLIC InteractionRetry : public InteractionContinuation, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::task::XInteractionRetry + public css::lang::XTypeProvider, + public css::task::XInteractionRetry { public: InteractionRetry( InteractionRequest * pRequest ) : InteractionContinuation( pRequest ) {} // XInterface - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL + queryInterface( const css::uno::Type & rType ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + 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; // XInteractionContinuation virtual void SAL_CALL select() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; }; @@ -255,33 +250,33 @@ public: * the request. */ class UCBHELPER_DLLPUBLIC InteractionApprove : public InteractionContinuation, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::task::XInteractionApprove + public css::lang::XTypeProvider, + public css::task::XInteractionApprove { public: InteractionApprove( InteractionRequest * pRequest ) : InteractionContinuation( pRequest ) {} // XInterface - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL + queryInterface( const css::uno::Type & rType ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + 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; // XInteractionContinuation virtual void SAL_CALL select() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; }; @@ -292,33 +287,33 @@ public: * the request. */ class UCBHELPER_DLLPUBLIC InteractionDisapprove : public InteractionContinuation, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::task::XInteractionDisapprove + public css::lang::XTypeProvider, + public css::task::XInteractionDisapprove { public: InteractionDisapprove( InteractionRequest * pRequest ) : InteractionContinuation( pRequest ) {} // XInterface - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL + queryInterface( const css::uno::Type & rType ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + 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; // XInteractionContinuation virtual void SAL_CALL select() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; }; @@ -330,21 +325,21 @@ public: */ class UCBHELPER_DLLPUBLIC InteractionSupplyAuthentication : public InteractionContinuation, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::ucb::XInteractionSupplyAuthentication2 + public css::lang::XTypeProvider, + public css::ucb::XInteractionSupplyAuthentication2 { - com::sun::star::uno::Sequence< com::sun::star::ucb::RememberAuthentication > + css::uno::Sequence< css::ucb::RememberAuthentication > m_aRememberPasswordModes; - com::sun::star::uno::Sequence< com::sun::star::ucb::RememberAuthentication > + css::uno::Sequence< css::ucb::RememberAuthentication > m_aRememberAccountModes; OUString m_aRealm; OUString m_aUserName; OUString m_aPassword; OUString m_aAccount; - com::sun::star::ucb::RememberAuthentication m_eRememberPasswordMode; - com::sun::star::ucb::RememberAuthentication m_eDefaultRememberPasswordMode; - com::sun::star::ucb::RememberAuthentication m_eRememberAccountMode; - com::sun::star::ucb::RememberAuthentication m_eDefaultRememberAccountMode; + css::ucb::RememberAuthentication m_eRememberPasswordMode; + css::ucb::RememberAuthentication m_eDefaultRememberPasswordMode; + css::ucb::RememberAuthentication m_eRememberAccountMode; + css::ucb::RememberAuthentication m_eDefaultRememberAccountMode; bool m_bCanSetRealm : 1; bool m_bCanSetUserName : 1; bool m_bCanSetPassword : 1; @@ -367,7 +362,7 @@ public: * @param bCanSetAccount indicates, whether the account given with the * authentication request is read-only. * - * @see com::sun::star::ucb::AuthenticationRequest + * @see css::ucb::AuthenticationRequest */ inline InteractionSupplyAuthentication( InteractionRequest * pRequest, @@ -406,8 +401,8 @@ public: * @param bDefaultUseSystemCredentials specifies the default system * credentials usage preferred by the requesting client * - * @see com::sun::star::ucb::AuthenticationRequest - * @see com::sun::star::ucb::RememberAuthentication + * @see css::ucb::AuthenticationRequest + * @see css::ucb::RememberAuthentication */ inline InteractionSupplyAuthentication( InteractionRequest * pRequest, @@ -415,92 +410,85 @@ public: bool bCanSetUserName, bool bCanSetPassword, bool bCanSetAccount, - const com::sun::star::uno::Sequence< - com::sun::star::ucb::RememberAuthentication > & - rRememberPasswordModes, - const com::sun::star::ucb::RememberAuthentication - eDefaultRememberPasswordMode, - const com::sun::star::uno::Sequence< - com::sun::star::ucb::RememberAuthentication > & - rRememberAccountModes, - const com::sun::star::ucb::RememberAuthentication - eDefaultRememberAccountMode, + const css::uno::Sequence< css::ucb::RememberAuthentication > & rRememberPasswordModes, + const css::ucb::RememberAuthentication eDefaultRememberPasswordMode, + const css::uno::Sequence< css::ucb::RememberAuthentication > & rRememberAccountModes, + const css::ucb::RememberAuthentication eDefaultRememberAccountMode, bool bCanUseSystemCredentials, bool bDefaultUseSystemCredentials ); // XInterface - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL + queryInterface( const css::uno::Type & rType ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + 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; // XInteractionContinuation virtual void SAL_CALL select() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XInteractionSupplyAuthentication virtual sal_Bool SAL_CALL canSetRealm() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setRealm( const OUString& Realm ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL canSetUserName() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setUserName( const OUString& UserName ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL canSetPassword() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setPassword( const OUString& Password ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< - com::sun::star::ucb::RememberAuthentication > SAL_CALL + virtual css::uno::Sequence< + css::ucb::RememberAuthentication > SAL_CALL getRememberPasswordModes( - com::sun::star::ucb::RememberAuthentication& Default ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + css::ucb::RememberAuthentication& Default ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - setRememberPassword( com::sun::star::ucb::RememberAuthentication Remember ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + setRememberPassword( css::ucb::RememberAuthentication Remember ) + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL canSetAccount() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setAccount( const OUString& Account ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< - com::sun::star::ucb::RememberAuthentication > SAL_CALL + virtual css::uno::Sequence< css::ucb::RememberAuthentication > SAL_CALL getRememberAccountModes( - com::sun::star::ucb::RememberAuthentication& Default ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + css::ucb::RememberAuthentication& Default ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - setRememberAccount( com::sun::star::ucb::RememberAuthentication Remember ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + setRememberAccount( css::ucb::RememberAuthentication Remember ) + throw( css::uno::RuntimeException, std::exception ) override; // XInteractionSupplyAuthentication2 virtual sal_Bool SAL_CALL canUseSystemCredentials( sal_Bool& Default ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setUseSystemCredentials( sal_Bool UseSystemCredentials ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; // Non-interface methods. @@ -534,7 +522,7 @@ public: * * @return the remember-mode for the password. */ - const com::sun::star::ucb::RememberAuthentication & + const css::ucb::RememberAuthentication & getRememberPasswordMode() const { return m_eRememberPasswordMode; } bool getUseSystemCredentials() const { return m_bUseSystemCredentials; } @@ -548,16 +536,12 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication( bool bCanSetPassword, bool bCanSetAccount ) : InteractionContinuation( pRequest ), - m_aRememberPasswordModes( com::sun::star::uno::Sequence< - com::sun::star::ucb::RememberAuthentication >( 1 ) ), - m_aRememberAccountModes( com::sun::star::uno::Sequence< - com::sun::star::ucb::RememberAuthentication >( 1 ) ), - m_eRememberPasswordMode( com::sun::star::ucb::RememberAuthentication_NO ), - m_eDefaultRememberPasswordMode( - com::sun::star::ucb::RememberAuthentication_NO ), - m_eRememberAccountMode( com::sun::star::ucb::RememberAuthentication_NO ), - m_eDefaultRememberAccountMode( - com::sun::star::ucb::RememberAuthentication_NO ), + m_aRememberPasswordModes( css::uno::Sequence< css::ucb::RememberAuthentication >( 1 ) ), + m_aRememberAccountModes( css::uno::Sequence< css::ucb::RememberAuthentication >( 1 ) ), + m_eRememberPasswordMode( css::ucb::RememberAuthentication_NO ), + m_eDefaultRememberPasswordMode( css::ucb::RememberAuthentication_NO ), + m_eRememberAccountMode( css::ucb::RememberAuthentication_NO ), + m_eDefaultRememberAccountMode( css::ucb::RememberAuthentication_NO ), m_bCanSetRealm( bCanSetRealm ), m_bCanSetUserName( bCanSetUserName ), m_bCanSetPassword( bCanSetPassword ), @@ -567,9 +551,9 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication( m_bUseSystemCredentials( false ) { m_aRememberPasswordModes[ 0 ] - = com::sun::star::ucb::RememberAuthentication_NO; + = css::ucb::RememberAuthentication_NO; m_aRememberAccountModes [ 0 ] - = com::sun::star::ucb::RememberAuthentication_NO; + = css::ucb::RememberAuthentication_NO; } @@ -579,14 +563,10 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication( bool bCanSetUserName, bool bCanSetPassword, bool bCanSetAccount, - const com::sun::star::uno::Sequence< - com::sun::star::ucb::RememberAuthentication > & rRememberPasswordModes, - const com::sun::star::ucb::RememberAuthentication - eDefaultRememberPasswordMode, - const com::sun::star::uno::Sequence< - com::sun::star::ucb::RememberAuthentication > & rRememberAccountModes, - const com::sun::star::ucb::RememberAuthentication - eDefaultRememberAccountMode, + const css::uno::Sequence< css::ucb::RememberAuthentication > & rRememberPasswordModes, + const css::ucb::RememberAuthentication eDefaultRememberPasswordMode, + const css::uno::Sequence< css::ucb::RememberAuthentication > & rRememberAccountModes, + const css::ucb::RememberAuthentication eDefaultRememberAccountMode, bool bCanUseSystemCredentials, bool bDefaultUseSystemCredentials ) : InteractionContinuation( pRequest ), @@ -615,38 +595,38 @@ inline InteractionSupplyAuthentication::InteractionSupplyAuthentication( */ class InteractionReplaceExistingData : public InteractionContinuation, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::ucb::XInteractionReplaceExistingData + public css::lang::XTypeProvider, + public css::ucb::XInteractionReplaceExistingData { public: InteractionReplaceExistingData( InteractionRequest * pRequest ) : InteractionContinuation( pRequest ) {} // XInterface - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL + queryInterface( const css::uno::Type & rType ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + 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; // XInteractionContinuation virtual void SAL_CALL select() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; }; class UCBHELPER_DLLPUBLIC InteractionAuthFallback: public InteractionContinuation, - public com::sun::star::ucb::XInteractionAuthFallback + public css::ucb::XInteractionAuthFallback { OUString m_aCode; @@ -655,9 +635,9 @@ public: : InteractionContinuation( pRequest ) {} // XInterface - virtual com::sun::star::uno::Any SAL_CALL - queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL + queryInterface( const css::uno::Type & rType ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() @@ -665,7 +645,7 @@ public: // XInteractionContinuation virtual void SAL_CALL select() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XAuthFallback virtual void SAL_CALL setCode( const OUString& code ) diff --git a/include/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx index e142645bbafd..cf29462273d9 100644 --- a/include/ucbhelper/interceptedinteraction.hxx +++ b/include/ucbhelper/interceptedinteraction.hxx @@ -40,7 +40,7 @@ namespace ucbhelper{ only - or as base class if interactions must be modified. */ -class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionHandler > +class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper1< css::task::XInteractionHandler > { // types @@ -55,13 +55,13 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper /** @short contains the interaction request, which should be intercepted. */ - ::com::sun::star::uno::Any Request; + css::uno::Any Request; /** @short specify the fix continuation, which must be selected, if the interaction could be intercepted successfully. */ - ::com::sun::star::uno::Type Continuation; + css::uno::Type Continuation; /** @short specify, if both interactions must have the same type @@ -121,9 +121,9 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper influence the type check of the interception request. Its not used to check the continuation! */ - InterceptedRequest( sal_Int32 nHandle , - const ::com::sun::star::uno::Any& aRequest , - const ::com::sun::star::uno::Type& aContinuation, + InterceptedRequest( sal_Int32 nHandle , + const css::uno::Any& aRequest , + const css::uno::Type& aContinuation, bool bMatchExact ) { Handle = nHandle; @@ -163,7 +163,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper expecting th handle() was overwritten by a derived class. */ - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > m_xInterceptedHandler; + css::uno::Reference< css::task::XInteractionHandler > m_xInterceptedHandler; /** @short these list contains the requests, which should be intercepted. @@ -189,7 +189,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper @param lInterceptions the list of intercepted requests. */ - InterceptedInteraction(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xInterceptedHandler, + InterceptedInteraction(const css::uno::Reference< css::task::XInteractionHandler >& xInterceptedHandler, const ::std::vector< InterceptedRequest >& lInterceptions ); @@ -204,7 +204,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper the outside interaction handler, which should be intercepted here. */ - void setInterceptedHandler(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xInterceptedHandler); + void setInterceptedHandler(const css::uno::Reference< css::task::XInteractionHandler >& xInterceptedHandler); /** @short set a new list of intercepted interactions. @@ -231,9 +231,9 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper @return A valid reference to the continuation, if it could be located ... or an empty reference otherwise. */ - static ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > extractContinuation( - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& lContinuations, - const ::com::sun::star::uno::Type& aType ); + static css::uno::Reference< css::task::XInteractionContinuation > extractContinuation( + const css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > >& lContinuations, + const css::uno::Type& aType ); // useable for derived classes @@ -269,7 +269,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper will be used automatically for this request! */ virtual EInterceptionState intercepted(const InterceptedRequest& rRequest , - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xOrgRequest); + const css::uno::Reference< css::task::XInteractionRequest >& xOrgRequest); // uno interface @@ -293,8 +293,8 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper @param xRequest the interaction request, which should be intercepted. */ - virtual void SAL_CALL handle(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest) + throw(css::uno::RuntimeException, std::exception) override; // helper @@ -304,7 +304,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper /** @short implements the default handling: - intercept or forward to internal handler. */ - UCBHELPER_DLLPRIVATE void impl_handleDefault(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest); + UCBHELPER_DLLPRIVATE void impl_handleDefault(const css::uno::Reference< css::task::XInteractionRequest >& xRequest); /** @short implements the interception of requests. @@ -324,7 +324,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper @return A identifier, which inidicates if the request was intercepted, the continuation was found and selected ... or not. */ - UCBHELPER_DLLPRIVATE EInterceptionState impl_interceptRequest(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest); + UCBHELPER_DLLPRIVATE EInterceptionState impl_interceptRequest(const css::uno::Reference< css::task::XInteractionRequest >& xRequest); }; } // namespace ucbhelper diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx index 13ebe03ffcb7..0cf62a46fef3 100644 --- a/include/ucbhelper/macros.hxx +++ b/include/ucbhelper/macros.hxx @@ -40,17 +40,17 @@ #define XTYPEPROVIDER_COMMON_IMPL( Class ) \ -com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL \ +css::uno::Sequence< sal_Int8 > SAL_CALL \ Class::getImplementationId() \ - throw( com::sun::star::uno::RuntimeException, std::exception ) \ + throw( css::uno::RuntimeException, std::exception ) \ { \ return css::uno::Sequence<sal_Int8>(); \ } #define GETTYPES_IMPL_START( Class ) \ -com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL \ +css::uno::Sequence< css::uno::Type > SAL_CALL \ Class::getTypes() \ - throw( com::sun::star::uno::RuntimeException, std::exception ) \ + throw( css::uno::RuntimeException, std::exception ) \ { \ static cppu::OTypeCollection* pCollection = NULL; \ if ( !pCollection ) \ @@ -166,7 +166,7 @@ GETTYPES_IMPL_END #define XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ OUString SAL_CALL Class::getImplementationName() \ - throw( com::sun::star::uno::RuntimeException, std::exception ) \ + throw( css::uno::RuntimeException, std::exception ) \ { \ return getImplementationName_Static(); \ } \ @@ -178,42 +178,36 @@ OUString Class::getImplementationName_Static() \ \ sal_Bool SAL_CALL \ Class::supportsService( const OUString& ServiceName ) \ - throw( com::sun::star::uno::RuntimeException, std::exception ) \ + throw( css::uno::RuntimeException, std::exception ) \ { \ return cppu::supportsService( this, ServiceName ); \ } \ \ -com::sun::star::uno::Sequence< OUString > SAL_CALL \ +css::uno::Sequence< OUString > SAL_CALL \ Class::getSupportedServiceNames() \ - throw( com::sun::star::uno::RuntimeException, std::exception ) \ + throw( css::uno::RuntimeException, std::exception ) \ { \ return getSupportedServiceNames_Static(); \ } #define XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \ -static com::sun::star::uno::Reference< \ - com::sun::star::uno::XInterface > SAL_CALL \ -Class##_CreateInstance( const com::sun::star::uno::Reference< \ - com::sun::star::lang::XMultiServiceFactory> & rSMgr ) \ - throw( com::sun::star::uno::Exception ) \ +static css::uno::Reference< css::uno::XInterface > SAL_CALL \ +Class##_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) \ + throw( css::uno::Exception ) \ { \ - com::sun::star::lang::XServiceInfo* pX = \ - static_cast<com::sun::star::lang::XServiceInfo*>(new Class( rSMgr )); \ - return com::sun::star::uno::Reference< \ - com::sun::star::uno::XInterface >::query( pX ); \ + css::lang::XServiceInfo* pX = \ + static_cast<css::lang::XServiceInfo*>(new Class( rSMgr )); \ + return css::uno::Reference< css::uno::XInterface >::query( pX ); \ } #define XSERVICEINFO_CREATE_INSTANCE_IMPL_CTX( Class ) \ -static com::sun::star::uno::Reference< \ - com::sun::star::uno::XInterface > SAL_CALL \ -Class##_CreateInstance( const com::sun::star::uno::Reference< \ - com::sun::star::lang::XMultiServiceFactory> & rSMgr ) \ - throw( com::sun::star::uno::Exception ) \ +static css::uno::Reference< css::uno::XInterface > SAL_CALL \ +Class##_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) \ + throw( css::uno::Exception ) \ { \ - com::sun::star::lang::XServiceInfo* pX = \ - static_cast<com::sun::star::lang::XServiceInfo*>(new Class( ucbhelper::getComponentContext(rSMgr) )); \ - return com::sun::star::uno::Reference< \ - com::sun::star::uno::XInterface >::query( pX ); \ + css::lang::XServiceInfo* pX = \ + static_cast<css::lang::XServiceInfo*>(new Class( ucbhelper::getComponentContext(rSMgr) )); \ + return css::uno::Reference< css::uno::XInterface >::query( pX ); \ } @@ -223,13 +217,11 @@ Class##_CreateInstance( const com::sun::star::uno::Reference< \ #define ONE_INSTANCE_SERVICE_FACTORY_IMPL( Class ) \ -com::sun::star::uno::Reference< \ - com::sun::star::lang::XSingleServiceFactory > \ -Class::createServiceFactory( const com::sun::star::uno::Reference< \ - com::sun::star::lang::XMultiServiceFactory >& rxServiceMgr ) \ +css::uno::Reference< css::lang::XSingleServiceFactory > \ +Class::createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr ) \ { \ - return com::sun::star::uno::Reference< \ - com::sun::star::lang::XSingleServiceFactory >( \ + return css::uno::Reference< \ + css::lang::XSingleServiceFactory >( \ cppu::createOneInstanceFactory( \ rxServiceMgr, \ Class::getImplementationName_Static(), \ @@ -243,17 +235,17 @@ Class::createServiceFactory( const com::sun::star::uno::Reference< \ #define XSERVICEINFO_NOFACTORY_IMPL_0( Class, ImplName ) \ XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ \ -com::sun::star::uno::Sequence< OUString > \ +css::uno::Sequence< OUString > \ Class::getSupportedServiceNames_Static() // 1 service name #define XSERVICEINFO_NOFACTORY_IMPL_1( Class, ImplName, Service1 ) \ XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ \ -com::sun::star::uno::Sequence< OUString > \ +css::uno::Sequence< OUString > \ Class::getSupportedServiceNames_Static() \ { \ - com::sun::star::uno::Sequence< OUString > aSNS( 1 ); \ + css::uno::Sequence< OUString > aSNS( 1 ); \ aSNS.getArray()[ 0 ] = Service1; \ return aSNS; \ } @@ -265,7 +257,7 @@ Class::getSupportedServiceNames_Static() \ XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ XSERVICEINFO_CREATE_INSTANCE_IMPL_CTX( Class ) \ \ -com::sun::star::uno::Sequence< OUString > \ +css::uno::Sequence< OUString > \ Class::getSupportedServiceNames_Static() // 1 service name @@ -273,10 +265,10 @@ Class::getSupportedServiceNames_Static() XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \ \ -com::sun::star::uno::Sequence< OUString > \ +css::uno::Sequence< OUString > \ Class::getSupportedServiceNames_Static() \ { \ - com::sun::star::uno::Sequence< OUString > aSNS( 1 ); \ + css::uno::Sequence< OUString > aSNS( 1 ); \ aSNS.getArray()[ 0 ] = Service1; \ return aSNS; \ } @@ -286,10 +278,10 @@ Class::getSupportedServiceNames_Static() \ XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ XSERVICEINFO_CREATE_INSTANCE_IMPL_CTX( Class ) \ \ -com::sun::star::uno::Sequence< OUString > \ +css::uno::Sequence< OUString > \ Class::getSupportedServiceNames_Static() \ { \ - com::sun::star::uno::Sequence< OUString > aSNS( 1 ); \ + css::uno::Sequence< OUString > aSNS( 1 ); \ aSNS.getArray()[ 0 ] = Service1; \ return aSNS; \ } diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx index 745712ed629d..691936286df6 100644 --- a/include/ucbhelper/propertyvalueset.hxx +++ b/include/ucbhelper/propertyvalueset.hxx @@ -54,28 +54,24 @@ class PropertyValues; */ class UCBHELPER_DLLPUBLIC PropertyValueSet : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::sdbc::XRow, - public com::sun::star::sdbc::XColumnLocate + public css::lang::XTypeProvider, + public css::sdbc::XRow, + public css::sdbc::XColumnLocate { - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > - m_xContext; - com::sun::star::uno::Reference< com::sun::star::script::XTypeConverter > - m_xTypeConverter; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter; osl::Mutex m_aMutex; PropertyValues* m_pValues; bool m_bWasNull; bool m_bTriedToGetTypeConverter; private: - UCBHELPER_DLLPRIVATE const com::sun::star::uno::Reference< - com::sun::star::script::XTypeConverter >& + UCBHELPER_DLLPRIVATE const css::uno::Reference< css::script::XTypeConverter >& getTypeConverter(); public: PropertyValueSet( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~PropertyValueSet(); // XInterface @@ -87,144 +83,144 @@ public: throw() override; // XTypeProvider - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XRow virtual sal_Bool SAL_CALL wasNull() - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + 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; - virtual ::com::sun::star::util::Date SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::util::Time SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::util::DateTime SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::io::XInputStream > SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + 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; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::io::XInputStream > SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + 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; - virtual ::com::sun::star::uno::Any SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + 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; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::sdbc::XRef > SAL_CALL + const css::uno::Reference< + css::container::XNameAccess >& typeMap ) + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + 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; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::sdbc::XBlob > SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + 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; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::sdbc::XClob > SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + 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; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::sdbc::XArray > SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + 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; // XColumnLocate virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; // Non-interface methods void appendString( const OUString& rPropName, const OUString& rValue ); - void appendString( const ::com::sun::star::beans::Property& rProp, const OUString& rValue ) + void appendString( const css::beans::Property& rProp, const OUString& rValue ) { appendString( rProp.Name, rValue ); } void appendBoolean( const OUString& rPropName, bool bValue ); - void appendBoolean( const ::com::sun::star::beans::Property& rProp, bool bValue ) + void appendBoolean( const css::beans::Property& rProp, bool bValue ) { appendBoolean( rProp.Name, bValue ); } void appendLong( const OUString& rPropName, sal_Int64 nValue ); - void appendLong( const ::com::sun::star::beans::Property& rProp, sal_Int64 nValue ) + void appendLong( const css::beans::Property& rProp, sal_Int64 nValue ) { appendLong( rProp.Name, nValue ); } - void appendTimestamp( const OUString& rPropName, const ::com::sun::star::util::DateTime& rValue ); - void appendTimestamp( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::util::DateTime& rValue ) + void appendTimestamp( const OUString& rPropName, const css::util::DateTime& rValue ); + void appendTimestamp( const css::beans::Property& rProp, const css::util::DateTime& rValue ) { appendTimestamp( rProp.Name, rValue ); } - void appendObject( const OUString& rPropName, const ::com::sun::star::uno::Any& rValue ); - void appendObject( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Any& rValue ) + void appendObject( const OUString& rPropName, const css::uno::Any& rValue ); + void appendObject( const css::beans::Property& rProp, const css::uno::Any& rValue ) { appendObject( rProp.Name, rValue ); } void appendVoid( const OUString& rPropName ); - void appendVoid( const ::com::sun::star::beans::Property& rProp ) + void appendVoid( const css::beans::Property& rProp ) { appendVoid( rProp.Name ); } @@ -235,8 +231,7 @@ public: * * @param rSet is a property set containing the property values. */ - void appendPropertySet( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& rSet ); + void appendPropertySet( const css::uno::Reference< css::beans::XPropertySet >& rSet ); /** This method tries to append a single property value contained in a * property set to the value set. @@ -248,9 +243,8 @@ public: * given property pet. True, otherwise. */ bool appendPropertySetValue( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& rSet, - const ::com::sun::star::beans::Property& rProperty ); + const css::uno::Reference< css::beans::XPropertySet >& rSet, + const css::beans::Property& rProperty ); }; } diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx index d726eef57232..91c76f140560 100644 --- a/include/ucbhelper/providerhelper.hxx +++ b/include/ucbhelper/providerhelper.hxx @@ -64,9 +64,9 @@ typedef std::list< ContentImplHelperRef > ContentRefList; * XPropertyContainer interface ) */ class UCBHELPER_DLLPUBLIC ContentProviderImplHelper : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::lang::XServiceInfo, - public com::sun::star::ucb::XContentProvider + public css::lang::XTypeProvider, + public css::lang::XServiceInfo, + public css::ucb::XContentProvider { friend class ContentImplHelper; @@ -74,13 +74,12 @@ class UCBHELPER_DLLPUBLIC ContentProviderImplHelper : public cppu::OWeakObject, protected: osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; private: UCBHELPER_DLLPRIVATE void removeContent( ContentImplHelper* pContent ); - UCBHELPER_DLLPRIVATE ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XPropertySetRegistry > + UCBHELPER_DLLPRIVATE css::uno::Reference< css::ucb::XPropertySetRegistry > getAdditionalPropertySetRegistry(); UCBHELPER_DLLPRIVATE void cleanupRegisteredContents(); @@ -97,8 +96,7 @@ protected: * does not exist. */ rtl::Reference< ContentImplHelper > - queryExistingContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Identifier ); + queryExistingContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ); /** * This method returns a content with the given URL, if it already exists. @@ -126,8 +124,7 @@ protected: * @param the content instance that is to be registered. */ void registerNewContent( - const com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContent > & xContent ); + const css::uno::Reference< css::ucb::XContent > & xContent ); public: @@ -136,8 +133,7 @@ public: ContentProviderImplHelper( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~ContentProviderImplHelper(); @@ -152,25 +148,25 @@ public: // XTypeProvider - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; + throw( css::uno::RuntimeException, std::exception ) override = 0; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override = 0; + throw( css::uno::RuntimeException, std::exception ) override = 0; // XContentProvider @@ -187,18 +183,14 @@ public: * - Return the possibly existing content.Create and return a new * content, otherwise */ - 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 = 0; + 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 = 0; virtual sal_Int32 SAL_CALL - compareContentIds( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Id1, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Id2 ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + compareContentIds( const css::uno::Reference< css::ucb::XContentIdentifier >& Id1, + const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) + throw( css::uno::RuntimeException, std::exception ) override; // Non-interface methods. @@ -230,8 +222,7 @@ public: * be created in case it does not exist. * @return the propertyset containing the Additional Core Properties. */ - ::com::sun::star::uno::Reference< - com::sun::star::ucb::XPersistentPropertySet > + css::uno::Reference< css::ucb::XPersistentPropertySet > getAdditionalPropertySet( const OUString& rKey, bool bCreate ); /** diff --git a/include/ucbhelper/proxydecider.hxx b/include/ucbhelper/proxydecider.hxx index 3da828795e31..aa19d483fcc9 100644 --- a/include/ucbhelper/proxydecider.hxx +++ b/include/ucbhelper/proxydecider.hxx @@ -76,8 +76,7 @@ public: * * @param rxSMgr is a Service Manager. */ - InternetProxyDecider( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext ); + InternetProxyDecider( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); /** * Destructor. diff --git a/include/ucbhelper/registerucb.hxx b/include/ucbhelper/registerucb.hxx index 2fbf1e8baf0d..60ab221b39f6 100644 --- a/include/ucbhelper/registerucb.hxx +++ b/include/ucbhelper/registerucb.hxx @@ -89,16 +89,12 @@ typedef std::vector< ContentProviderData > ContentProviderDataList; */ UCBHELPER_DLLPUBLIC bool registerAtUcb( - com::sun::star::uno::Reference< - com::sun::star::ucb::XContentProviderManager > const & - rManager, - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > const & - rxContext, + css::uno::Reference< css::ucb::XContentProviderManager > const & rManager, + css::uno::Reference< css::uno::XComponentContext > const & rxContext, OUString const & rName, OUString const & rArguments, OUString const & rTemplate) - throw (com::sun::star::uno::RuntimeException); + throw (css::uno::RuntimeException); } #endif // INCLUDED_UCBHELPER_REGISTERUCB_HXX diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx index 727f9789c041..7d1e21690b9d 100644 --- a/include/ucbhelper/resultset.hxx +++ b/include/ucbhelper/resultset.hxx @@ -60,15 +60,15 @@ struct ResultSet_Impl; */ class UCBHELPER_DLLPUBLIC ResultSet : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::lang::XServiceInfo, - public com::sun::star::lang::XComponent, - public com::sun::star::ucb::XContentAccess, - public com::sun::star::sdbc::XResultSet, - public com::sun::star::sdbc::XResultSetMetaDataSupplier, - public com::sun::star::sdbc::XRow, - public com::sun::star::sdbc::XCloseable, - public com::sun::star::beans::XPropertySet + public css::lang::XTypeProvider, + public css::lang::XServiceInfo, + public css::lang::XComponent, + public css::ucb::XContentAccess, + public css::sdbc::XResultSet, + public css::sdbc::XResultSetMetaDataSupplier, + public css::sdbc::XRow, + public css::sdbc::XCloseable, + public css::beans::XPropertySet { ResultSet_Impl* m_pImpl; @@ -82,10 +82,8 @@ public: * @param rDataSupplier is a supplier for the resultset data. */ ResultSet( - 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::uno::XComponentContext >& rxContext, + const css::uno::Sequence< css::beans::Property >& rProperties, const rtl::Reference< ResultSetDataSupplier >& rDataSupplier ); /** * Construction. @@ -98,13 +96,10 @@ public: * ... */ ResultSet( - 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::uno::XComponentContext >& rxContext, + const css::uno::Sequence< css::beans::Property >& rProperties, const rtl::Reference< ResultSetDataSupplier >& rDataSupplier, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& rxEnv ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv ); virtual ~ResultSet(); // XInterface @@ -116,12 +111,12 @@ public: throw() override; // XTypeProvider - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -137,253 +132,238 @@ public: // 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 >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - removeEventListener( const com::sun::star::uno::Reference< - com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; // XContentAccess virtual OUString SAL_CALL queryContentIdentifierString() - 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 queryContentIdentifier() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent() - 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() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; // XResultSet virtual sal_Bool SAL_CALL next() - 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() - 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() - 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() - 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() - 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() - 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() - 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() - 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() - 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() - 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() - 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() - 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() - 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() - 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() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::uno::XInterface > SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; // XRow virtual sal_Bool SAL_CALL wasNull() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + 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; - virtual com::sun::star::util::Date SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::util::Time SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::util::DateTime SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + 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; - virtual com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + 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; - virtual com::sun::star::uno::Any SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + 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; - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XRef > SAL_CALL + const css::uno::Reference< css::container::XNameAccess >& typeMap ) + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + 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; - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XBlob > SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + 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; - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XClob > SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + 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; - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XArray > SAL_CALL + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; + 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; // XCloseable virtual void SAL_CALL close() - 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; // Non-interface methods. @@ -396,7 +376,7 @@ public: * @param rEvt is a property change event. */ void propertyChanged( - const com::sun::star::beans::PropertyChangeEvent& rEvt ); + const css::beans::PropertyChangeEvent& rEvt ); /** * This method should be called by the data supplier for the result set @@ -419,7 +399,7 @@ public: * * @return a sequence of properties. */ - const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& + const css::uno::Sequence< css::beans::Property >& getProperties(); /** @@ -428,8 +408,7 @@ public: * * @return an environment or an empty reference. */ - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& + const css::uno::Reference< css::ucb::XCommandEnvironment >& getEnvironment(); }; @@ -475,8 +454,7 @@ public: * of the supplier; must be non-negative. * @return the content's identifier. */ - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > + virtual css::uno::Reference< css::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ) = 0; /** @@ -486,7 +464,7 @@ public: * of the supplier; must be non-negative. * @return the content. */ - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > + virtual css::uno::Reference< css::ucb::XContent > queryContent( sal_uInt32 nIndex ) = 0; /** @@ -544,7 +522,7 @@ public: * of the supplier. * @return the object for accessing the property values. */ - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > + virtual css::uno::Reference< css::sdbc::XRow > queryPropertyValues( sal_uInt32 nIndex ) = 0; /** @@ -581,7 +559,7 @@ public: * @exception ResultSetException thrown, if an error has occurred */ virtual void validate() - throw( com::sun::star::ucb::ResultSetException ) = 0; + throw( css::ucb::ResultSetException ) = 0; }; } diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx index 2442066c4597..1420b702305b 100644 --- a/include/ucbhelper/resultsethelper.hxx +++ b/include/ucbhelper/resultsethelper.hxx @@ -50,32 +50,28 @@ namespace ucbhelper { * * Features of the base class implementation: * - standard interfaces ( XInterface, XTypeProvider, XServiceInfo ) - * - all required interfaces for service com::sun::star::ucb::DynamicResultSet + * - all required interfaces for service css::ucb::DynamicResultSet */ class UCBHELPER_DLLPUBLIC ResultSetImplHelper : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::lang::XServiceInfo, - public com::sun::star::ucb::XDynamicResultSet + public css::lang::XTypeProvider, + public css::lang::XServiceInfo, + public css::ucb::XDynamicResultSet { cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; bool m_bStatic; bool m_bInitDone; protected: - osl::Mutex m_aMutex; - com::sun::star::ucb::OpenCommandArgument2 m_aCommand; - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; + osl::Mutex m_aMutex; + css::ucb::OpenCommandArgument2 m_aCommand; + css::uno::Reference< css::uno::XComponentContext > m_xContext; // Resultset #1 - com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet > m_xResultSet1; + css::uno::Reference< css::sdbc::XResultSet > m_xResultSet1; // Resultset #2 - com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet > m_xResultSet2; + css::uno::Reference< css::sdbc::XResultSet > m_xResultSet2; // Resultset changes listener. - com::sun::star::uno::Reference< - com::sun::star::ucb::XDynamicResultSetListener > m_xListener; + css::uno::Reference< css::ucb::XDynamicResultSetListener > m_xListener; private: UCBHELPER_DLLPRIVATE void init( bool bStatic ); @@ -125,9 +121,9 @@ public: * this resultset. */ ResultSetImplHelper( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, - const com::sun::star::ucb::OpenCommandArgument2& rCommand ); + const css::uno::Reference< + css::uno::XComponentContext >& rxContext, + const css::ucb::OpenCommandArgument2& rCommand ); /** * Destructor. @@ -143,12 +139,12 @@ public: throw() override; // XTypeProvider - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -164,34 +160,29 @@ public: // XComponent ( base class of XDynamicResultSet ) 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 >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - removeEventListener( const com::sun::star::uno::Reference< - com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) + throw( css::uno::RuntimeException, std::exception ) override; // XDynamicResultSet - virtual com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet > SAL_CALL + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getStaticResultSet() - throw( com::sun::star::ucb::ListenerAlreadySetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::ucb::ListenerAlreadySetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - setListener( const com::sun::star::uno::Reference< - com::sun::star::ucb::XDynamicResultSetListener >& Listener ) - throw( com::sun::star::ucb::ListenerAlreadySetException, - com::sun::star::uno::RuntimeException, std::exception ) override; + setListener( const css::uno::Reference< css::ucb::XDynamicResultSetListener >& Listener ) + throw( css::ucb::ListenerAlreadySetException, + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - connectToCache( const com::sun::star::uno::Reference< - com::sun::star::ucb::XDynamicResultSet > & xCache ) - throw( com::sun::star::ucb::ListenerAlreadySetException, - com::sun::star::ucb::AlreadyInitializedException, - com::sun::star::ucb::ServiceNotFoundException, - com::sun::star::uno::RuntimeException, std::exception ) override; + connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache ) + throw( css::ucb::ListenerAlreadySetException, + css::ucb::AlreadyInitializedException, + css::ucb::ServiceNotFoundException, + css::uno::RuntimeException, std::exception ) override; /** * The implementation of this method always returns 0. Override this @@ -199,7 +190,7 @@ public: */ virtual sal_Int16 SAL_CALL getCapabilities() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; }; diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx index 9fcbfd425dbd..730bdf1a5ab9 100644 --- a/include/ucbhelper/resultsetmetadata.hxx +++ b/include/ucbhelper/resultsetmetadata.hxx @@ -116,7 +116,7 @@ ResultSetColumnData::ResultSetColumnData() isCaseSensitive( true ), isSearchable( false ), isCurrency( false ), - isNullable( ::com::sun::star::sdbc::ColumnValue::NULLABLE ), + isNullable( css::sdbc::ColumnValue::NULLABLE ), isSigned( false ), columnDisplaySize( 16 ), precision( -1 ), @@ -132,22 +132,20 @@ ResultSetColumnData::ResultSetColumnData() /** * This is an implementation of the interface XResultSetMetaData. It can be * used to implement the interface - * com::sun::star::sdbc::XResultSetMetaDataSupplier, which is required for + * css::sdbc::XResultSetMetaDataSupplier, which is required for * implementations of service com.sun.star.ucb.ContentResultSet. */ class UCBHELPER_DLLPUBLIC ResultSetMetaData : public ::cppu::OWeakObject, - public ::com::sun::star::lang::XTypeProvider, - public ::com::sun::star::sdbc::XResultSetMetaData + public css::lang::XTypeProvider, + public css::sdbc::XResultSetMetaData { private: ucbhelper_impl::ResultSetMetaData_Impl* m_pImpl; protected: - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property > m_aProps; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Sequence< css::beans::Property > m_aProps; bool m_bReadOnly; public: @@ -162,10 +160,8 @@ public: * is read-only. */ ResultSetMetaData( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProps, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Sequence< css::beans::Property >& rProps, bool bReadOnly = true ); /** @@ -182,10 +178,8 @@ public: * rColumnData[ 1 ] corresponds to data in rProps[ 1 ], ... */ ResultSetMetaData( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProps, + const css::uno::Reference< css::uno::XComponentContext >& rxContext, + const css::uno::Sequence< css::beans::Property >& rProps, const std::vector< ResultSetColumnData >& rColumnData ); /** @@ -202,12 +196,12 @@ public: throw() override; // XTypeProvider - virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::uno::RuntimeException, std::exception ) override; // XResultSetMetaData @@ -218,8 +212,8 @@ public: */ virtual sal_Int32 SAL_CALL getColumnCount() - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * Checks whether column is automatically numbered, which makes it * read-only. @@ -230,8 +224,8 @@ public: */ virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * Checks whether column is case sensitive. * @@ -241,8 +235,8 @@ public: */ virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * Checks whether the value stored in column can be used in a * WHERE clause. @@ -253,8 +247,8 @@ public: */ virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * Checks whether column is a cash value. * @@ -264,22 +258,22 @@ public: */ virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * Checks whether a NULL can be stored in column. * - * @see com::sun::star::sdbc::ColumnValue + * @see css::sdbc::ColumnValue * * @param column is the number of the column for that a value shall * be returned. The first column is 1, the second is 2, ... - * @return ::com::sun::star::sdbc::ColumnValue::NULLABLE, if a NULL + * @return css::sdbc::ColumnValue::NULLABLE, if a NULL * can be stored in the column. */ virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * Checks whether the value stored in column is a signed number. * @@ -289,8 +283,8 @@ public: */ virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * Gets the normal maximum width in characters for column. * @@ -300,8 +294,8 @@ public: */ virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * Gets the suggested column title for column, to be used in print- * outs and displays. @@ -312,8 +306,8 @@ public: */ virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * Gets the name of column. * @@ -323,8 +317,8 @@ public: */ virtual OUString SAL_CALL getColumnName( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * Gets the schema name for the table from which column of this * result set was derived. @@ -337,8 +331,8 @@ public: */ virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * For number types, getprecision gets the number of decimal digits * in column. @@ -352,8 +346,8 @@ public: */ virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * Gets the number of digits to the right of the decimal point for * values in column. @@ -364,8 +358,8 @@ public: */ virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * Gets the name of the table from which column of this result set * was derived or "" if there is none (for example, for a join). @@ -378,8 +372,8 @@ public: */ virtual OUString SAL_CALL getTableName( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL /** * Gets the catalog name for the table from which column of this @@ -392,8 +386,8 @@ public: * @return the catalog name for column or an empty string. */ getCatalogName( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * Gets the JDBC type for the value stored in column. ... The STRUCT * and DISTINCT type codes are always returned for structured and @@ -407,8 +401,8 @@ public: */ virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * Gets the type name used by this particular data source for the * values stored in column. If the type code for the type of value @@ -421,8 +415,8 @@ public: */ virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * Indicates whether a column is definitely not writable. * @@ -432,8 +426,8 @@ public: */ virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * Indicates whether it is possible for a write on the column to succeed. * @@ -443,8 +437,8 @@ public: */ virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * Indicates whether a write on the column will definitely succeed. * @@ -454,12 +448,12 @@ public: */ virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; /** * Returns the fully-qualified name of the service whose instances * are manufactured if the method - * com::sun::star::sdbc::ResultSet::getObject is called to retrieve a + * css::sdbc::ResultSet::getObject is called to retrieve a * value from the column. * * @param column is the number of the column for that a value shall @@ -469,8 +463,8 @@ public: */ virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) - throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::sdbc::SQLException, + css::uno::RuntimeException, std::exception ) override; }; } // namespace ucbhelper diff --git a/include/ucbhelper/simpleauthenticationrequest.hxx b/include/ucbhelper/simpleauthenticationrequest.hxx index 1018c4bf132b..3a14090206ec 100644 --- a/include/ucbhelper/simpleauthenticationrequest.hxx +++ b/include/ucbhelper/simpleauthenticationrequest.hxx @@ -43,8 +43,8 @@ namespace ucbhelper { * Read-write values: username, password, account * All remember-authentication values: RememberAuthentication_NO * - * @see com::sun::star::ucb::AuthenticationRequest - * @see com::sun::star::ucb::RememberAuthentication + * @see css::ucb::AuthenticationRequest + * @see css::ucb::RememberAuthentication * @see InteractionAbort * @see InteractionRetry * @see InteractionSupplyAuthentication @@ -55,7 +55,7 @@ class UCBHELPER_DLLPUBLIC SimpleAuthenticationRequest : public ucbhelper::Intera ucbhelper::InteractionSupplyAuthentication > m_xAuthSupplier; private: - void initialize( const ::com::sun::star::ucb::URLAuthenticationRequest & rRequest, + void initialize( const css::ucb::URLAuthenticationRequest & rRequest, bool bCanSetRealm, bool bCanSetUserName, bool bCanSetPassword, diff --git a/include/ucbhelper/simplecertificatevalidationrequest.hxx b/include/ucbhelper/simplecertificatevalidationrequest.hxx index 3117826e6191..c78115e0a31d 100644 --- a/include/ucbhelper/simplecertificatevalidationrequest.hxx +++ b/include/ucbhelper/simplecertificatevalidationrequest.hxx @@ -38,7 +38,7 @@ namespace ucbhelper { * * Read-write values: certificateValidity, certificate * - * @see com::sun::star::ucb::CertificateValidationRequest + * @see css::ucb::CertificateValidationRequest * @see InteractionApproved * @see InteractionRetry */ @@ -52,7 +52,7 @@ public: * @param pCertificate contains the server certificate. */ SimpleCertificateValidationRequest( const sal_Int32 & lCertificateValidity, - const com::sun::star::uno::Reference<com::sun::star::security::XCertificate>& certificate, + const css::uno::Reference<css::security::XCertificate>& certificate, const OUString & hostname ); }; diff --git a/include/ucbhelper/simpleinteractionrequest.hxx b/include/ucbhelper/simpleinteractionrequest.hxx index f6806052c0bc..ea08902d3be7 100644 --- a/include/ucbhelper/simpleinteractionrequest.hxx +++ b/include/ucbhelper/simpleinteractionrequest.hxx @@ -70,7 +70,7 @@ public: * This can be any of the CONTINUATION_* constants combinations * listed above. */ - SimpleInteractionRequest( const com::sun::star::uno::Any & rRequest, + SimpleInteractionRequest( const css::uno::Any & rRequest, const sal_Int32 nContinuations ); /** diff --git a/include/ucbhelper/simpleioerrorrequest.hxx b/include/ucbhelper/simpleioerrorrequest.hxx index 87ce17c45a74..764b57bce2d9 100644 --- a/include/ucbhelper/simpleioerrorrequest.hxx +++ b/include/ucbhelper/simpleioerrorrequest.hxx @@ -35,7 +35,7 @@ namespace ucbhelper { * instance contains an InteractiveIOException and one interaction * continuation: "Abort". * - * @see com::sun::star::ucb::InteractiveIOException + * @see css::ucb::InteractiveIOException * @see InteractionAbort */ class SimpleIOErrorRequest : public ucbhelper::InteractionRequest @@ -53,12 +53,10 @@ public: * of the error code. Refer to com/sun/star/ucb/IOErrorCode.idl * for details. */ - SimpleIOErrorRequest( const com::sun::star::ucb::IOErrorCode eError, - const com::sun::star::uno::Sequence< - com::sun::star::uno::Any > & rArgs, + SimpleIOErrorRequest( const css::ucb::IOErrorCode eError, + const css::uno::Sequence< css::uno::Any > & rArgs, const OUString & rMessage, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandProcessor > & xContext + const css::uno::Reference< css::ucb::XCommandProcessor > & xContext ); }; diff --git a/include/ucbhelper/simplenameclashresolverequest.hxx b/include/ucbhelper/simplenameclashresolverequest.hxx index c773097a961e..da9b761f5129 100644 --- a/include/ucbhelper/simplenameclashresolverequest.hxx +++ b/include/ucbhelper/simplenameclashresolverequest.hxx @@ -35,7 +35,7 @@ class InteractionSupplyName; * continuations: "Abort" and "SupplyName". Another continuation * ("ReplaceExistingData") may be supplied optionally. * - * @see com::sun::star::ucb::NameClashResolveRequest + * @see css::ucb::NameClashResolveRequest * @see InteractionAbort * @see InteractioneplaceExistingData */ diff --git a/include/ucbhelper/std_inputstream.hxx b/include/ucbhelper/std_inputstream.hxx index d442c34088a3..5c217ccb9546 100644 --- a/include/ucbhelper/std_inputstream.hxx +++ b/include/ucbhelper/std_inputstream.hxx @@ -29,8 +29,8 @@ namespace ucbhelper */ class UCBHELPER_DLLPUBLIC StdInputStream : public cppu::OWeakObject, - public com::sun::star::io::XInputStream, - public com::sun::star::io::XSeekable + public css::io::XInputStream, + public css::io::XSeekable { public: |