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 | |
| parent | d29e614ff9cd91c4e4a1bada6a21884e33323f8d (diff) | |
com::sun::star->css in include/ucbhelper to include/xmlscript
Change-Id: Iaa7f0b8455a601d3992c08cde0943c709c417256
174 files changed, 2311 insertions, 2737 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: diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx index d62fba0a40b1..6c950930d3df 100644 --- a/include/uno/mapping.hxx +++ b/include/uno/mapping.hxx @@ -165,7 +165,7 @@ public: @return mapped interface */ inline void * SAL_CALL mapInterface( - void * pInterface, const ::com::sun::star::uno::Type & rType ) const; + void * pInterface, const css::uno::Type & rType ) const; /** Maps an interface from one environment to another. @@ -190,7 +190,7 @@ public: @param pInterface source interface @param rType type of interface to be mapped */ - inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, const ::com::sun::star::uno::Type & rType ) const; + inline void SAL_CALL mapInterface( void ** ppOut, void * pInterface, const css::uno::Type & rType ) const; }; inline Mapping::Mapping( @@ -254,7 +254,7 @@ inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) } inline void Mapping::mapInterface( - void ** ppOut, void * pInterface, const ::com::sun::star::uno::Type & rType ) const + void ** ppOut, void * pInterface, const css::uno::Type & rType ) const { typelib_TypeDescription * pTD = 0; TYPELIB_DANGER_GET( &pTD, rType.getTypeLibType() ); @@ -274,7 +274,7 @@ inline void * Mapping::mapInterface( } inline void * Mapping::mapInterface( - void * pInterface, const ::com::sun::star::uno::Type & rType ) const + void * pInterface, const css::uno::Type & rType ) const { void * pOut = 0; mapInterface( &pOut, pInterface, rType ); diff --git a/include/unotest/bootstrapfixturebase.hxx b/include/unotest/bootstrapfixturebase.hxx index f489e71c6398..a5e137c2d0c4 100644 --- a/include/unotest/bootstrapfixturebase.hxx +++ b/include/unotest/bootstrapfixturebase.hxx @@ -39,17 +39,17 @@ protected: OUString m_aWorkdirRootURL; OUString m_aWorkdirRootPath; - com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> m_xContext; - com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> m_xSFactory; - com::sun::star::uno::Reference<com::sun::star::lang::XMultiComponentFactory> m_xFactory; + css::uno::Reference<css::uno::XComponentContext> m_xContext; + css::uno::Reference<css::lang::XMultiServiceFactory> m_xSFactory; + css::uno::Reference<css::lang::XMultiComponentFactory> m_xFactory; public: BootstrapFixtureBase(); virtual ~BootstrapFixtureBase(); - com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> + css::uno::Reference<css::uno::XComponentContext> getComponentContext() { return m_xContext; } - com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> + css::uno::Reference<css::lang::XMultiServiceFactory> getMultiServiceFactory() { return m_xSFactory; } OUString getSrcRootURL() { return m_aSrcRootURL; } diff --git a/include/unotest/officeconnection.hxx b/include/unotest/officeconnection.hxx index 844c61bae55a..eb00d261a299 100644 --- a/include/unotest/officeconnection.hxx +++ b/include/unotest/officeconnection.hxx @@ -45,7 +45,7 @@ public: void tearDown(); - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > getComponentContext() const { return context_;} // Must not be called before setUp or after tearDown: @@ -53,7 +53,7 @@ public: private: oslProcess process_; - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > context_; }; diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx index 33e3a88f6f06..f71872b9ed77 100644 --- a/include/unotools/accessiblerelationsethelper.hxx +++ b/include/unotools/accessiblerelationsethelper.hxx @@ -45,9 +45,7 @@ namespace utl <code>AccessibleRelationSet</code> service. */ class UNOTOOLS_DLLPUBLIC AccessibleRelationSetHelper - : public cppu::WeakImplHelper1< - ::com::sun::star::accessibility::XAccessibleRelationSet - > + : public cppu::WeakImplHelper1< css::accessibility::XAccessibleRelationSet > { public: //===== internal ======================================================== @@ -65,7 +63,7 @@ public: Returns the number of relations or zero if there are none. */ virtual sal_Int32 SAL_CALL getRelationCount( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Returns the relation of this relation set that is specified by the given index. @@ -80,10 +78,10 @@ public: has the type INVALID. */ - virtual ::com::sun::star::accessibility::AccessibleRelation SAL_CALL + virtual css::accessibility::AccessibleRelation SAL_CALL getRelation( sal_Int32 nIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; /** Tests whether the relation set contains a relation matching the specified key. @@ -98,7 +96,7 @@ public: given type and <FALSE/> if there is no such relation in the set. */ virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Retrieve and return the relation with the given relation type. @@ -111,27 +109,27 @@ public: of) this relation is returned. Otherwise a relation with the type INVALID is returned. */ - virtual ::com::sun::star::accessibility::AccessibleRelation SAL_CALL + virtual css::accessibility::AccessibleRelation SAL_CALL getRelationByType( sal_Int16 aRelationType ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; void AddRelation( - const ::com::sun::star::accessibility::AccessibleRelation& rRelation) - throw (::com::sun::star::uno::RuntimeException); + const css::accessibility::AccessibleRelation& rRelation) + throw (css::uno::RuntimeException); //===== XTypeProvider =================================================== /** Returns a sequence of all supported interfaces. */ - 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; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a implementation id. */ - 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; + throw (css::uno::RuntimeException, std::exception) override; protected: /// Mutex guarding this object. diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx index 0417a601295b..7d5accac0e6f 100644 --- a/include/unotools/accessiblestatesethelper.hxx +++ b/include/unotools/accessiblestatesethelper.hxx @@ -44,9 +44,7 @@ namespace utl <code>AccessibleStateSet</code> service. */ class UNOTOOLS_DLLPUBLIC AccessibleStateSetHelper - : public cppu::WeakImplHelper1< - ::com::sun::star::accessibility::XAccessibleStateSet - > + : public cppu::WeakImplHelper1< css::accessibility::XAccessibleStateSet > { public: //===== internal ======================================================== @@ -77,7 +75,7 @@ public: <FALSE/> if there is at least one state set in it. */ virtual sal_Bool SAL_CALL isEmpty () - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Checks if the given state is a member of the state set of this object. @@ -91,7 +89,7 @@ public: state set and <FALSE/> otherwise. */ virtual sal_Bool SAL_CALL contains (sal_Int16 aState) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; /** Checks if all of the given states are in this object's state set. @@ -109,37 +107,37 @@ public: object's state set. */ virtual sal_Bool SAL_CALL containsAll ( - const ::com::sun::star::uno::Sequence<sal_Int16>& rStateSet) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence<sal_Int16>& rStateSet) + throw (css::uno::RuntimeException, std::exception) override; /** Returns a sequence of all states. */ - virtual com::sun::star::uno::Sequence<sal_Int16> SAL_CALL getStates() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates() + throw (css::uno::RuntimeException, std::exception) override; /** Adds a state to the set. */ void AddState(sal_Int16 aState) - throw (::com::sun::star::uno::RuntimeException); + throw (css::uno::RuntimeException); /** Removes a state from the set if the set contains the state, otherwise nothing is done. */ void RemoveState(sal_Int16 aState) - throw (::com::sun::star::uno::RuntimeException); + throw (css::uno::RuntimeException); //===== XTypeProvider =================================================== /** Returns a sequence of all supported interfaces. */ - 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; + throw (css::uno::RuntimeException, std::exception) override; /** Returns a implementation id. */ - 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; + throw (css::uno::RuntimeException, std::exception) override; protected: /// Mutex guarding this object. diff --git a/include/unotools/calendarwrapper.hxx b/include/unotools/calendarwrapper.hxx index ceffdea6b607..cd4f63509bba 100644 --- a/include/unotools/calendarwrapper.hxx +++ b/include/unotools/calendarwrapper.hxx @@ -41,21 +41,21 @@ namespace com { namespace sun { namespace star { class UNOTOOLS_DLLPUBLIC CalendarWrapper { - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCalendar4 > xC; + css::uno::Reference< css::i18n::XCalendar4 > xC; DateTime aEpochStart; // 1Jan1970 public: CalendarWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext + const css::uno::Reference< css::uno::XComponentContext > & rxContext ); ~CalendarWrapper(); // wrapper implementations of XCalendar - void loadDefaultCalendar( const ::com::sun::star::lang::Locale& rLocale ); - void loadCalendar( const OUString& rUniqueID, const ::com::sun::star::lang::Locale& rLocale ); - ::com::sun::star::uno::Sequence< OUString > getAllCalendars( const ::com::sun::star::lang::Locale& rLocale ) const; + void loadDefaultCalendar( const css::lang::Locale& rLocale ); + void loadCalendar( const OUString& rUniqueID, const css::lang::Locale& rLocale ); + css::uno::Sequence< OUString > getAllCalendars( const css::lang::Locale& rLocale ) const; OUString getUniqueID() const; /// set UTC date/time void setDateTime( double fTimeInDays ); @@ -82,11 +82,11 @@ public: // wrapper implementations of XCalendar3 - ::com::sun::star::i18n::Calendar2 getLoadedCalendar() const; - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > getDays() const; - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > getMonths() const; - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > getGenitiveMonths() const; - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > getPartitiveMonths() const; + css::i18n::Calendar2 getLoadedCalendar() const; + css::uno::Sequence< css::i18n::CalendarItem2 > getDays() const; + css::uno::Sequence< css::i18n::CalendarItem2 > getMonths() const; + css::uno::Sequence< css::i18n::CalendarItem2 > getGenitiveMonths() const; + css::uno::Sequence< css::i18n::CalendarItem2 > getPartitiveMonths() const; // wrapper implementations of XCalendar4 diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx index cdf9d0716794..32092dcffc04 100644 --- a/include/unotools/charclass.hxx +++ b/include/unotools/charclass.hxx @@ -38,35 +38,35 @@ namespace com { namespace sun { namespace star { }}} const sal_Int32 nCharClassAlphaType = - ::com::sun::star::i18n::KCharacterType::UPPER | - ::com::sun::star::i18n::KCharacterType::LOWER | - ::com::sun::star::i18n::KCharacterType::TITLE_CASE; + css::i18n::KCharacterType::UPPER | + css::i18n::KCharacterType::LOWER | + css::i18n::KCharacterType::TITLE_CASE; const sal_Int32 nCharClassAlphaTypeMask = nCharClassAlphaType | - ::com::sun::star::i18n::KCharacterType::PRINTABLE | - ::com::sun::star::i18n::KCharacterType::BASE_FORM; + css::i18n::KCharacterType::PRINTABLE | + css::i18n::KCharacterType::BASE_FORM; const sal_Int32 nCharClassLetterType = nCharClassAlphaType | - ::com::sun::star::i18n::KCharacterType::LETTER; + css::i18n::KCharacterType::LETTER; const sal_Int32 nCharClassLetterTypeMask = nCharClassAlphaTypeMask | - ::com::sun::star::i18n::KCharacterType::LETTER; + css::i18n::KCharacterType::LETTER; const sal_Int32 nCharClassNumericType = - ::com::sun::star::i18n::KCharacterType::DIGIT; + css::i18n::KCharacterType::DIGIT; const sal_Int32 nCharClassNumericTypeMask = nCharClassNumericType | - ::com::sun::star::i18n::KCharacterType::PRINTABLE | - ::com::sun::star::i18n::KCharacterType::BASE_FORM; + css::i18n::KCharacterType::PRINTABLE | + css::i18n::KCharacterType::BASE_FORM; class UNOTOOLS_DLLPUBLIC CharClass { LanguageTag maLanguageTag; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification > xCC; + css::uno::Reference< css::i18n::XCharacterClassification > xCC; mutable ::osl::Mutex aMutex; CharClass(const CharClass&) = delete; @@ -75,7 +75,7 @@ class UNOTOOLS_DLLPUBLIC CharClass public: /// Preferred ctor with service manager specified CharClass( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext, + const css::uno::Reference< css::uno::XComponentContext > & rxContext, const LanguageTag& rLanguageTag ); /// Deprecated ctor, tries to get a process service manager or to load the @@ -153,7 +153,7 @@ public: sal_Int32 getCharacterType( const OUString& rStr, sal_Int32 nPos ) const; sal_Int32 getStringType( const OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const; - ::com::sun::star::i18n::ParseResult parseAnyToken( + css::i18n::ParseResult parseAnyToken( const OUString& rStr, sal_Int32 nPos, sal_Int32 nStartCharFlags, @@ -161,7 +161,7 @@ public: sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) const; - ::com::sun::star::i18n::ParseResult parsePredefinedToken( + css::i18n::ParseResult parsePredefinedToken( sal_Int32 nTokenType, const OUString& rStr, sal_Int32 nPos, @@ -183,7 +183,7 @@ public: private: - const ::com::sun::star::lang::Locale & getMyLocale() const; + const css::lang::Locale & getMyLocale() const; }; #endif // INCLUDED_UNOTOOLS_CHARCLASS_HXX diff --git a/include/unotools/closeveto.hxx b/include/unotools/closeveto.hxx index fe5521618a71..5c5adc5ac3e3 100644 --- a/include/unotools/closeveto.hxx +++ b/include/unotools/closeveto.hxx @@ -38,7 +38,7 @@ namespace utl class UNOTOOLS_DLLPUBLIC CloseVeto { public: - CloseVeto( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_closeable, + CloseVeto( const css::uno::Reference< css::uno::XInterface >& i_closeable, bool bHasOwnership = false); ~CloseVeto(); diff --git a/include/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx index cdc57765e263..b5216afd2f86 100644 --- a/include/unotools/cmdoptions.hxx +++ b/include/unotools/cmdoptions.hxx @@ -107,7 +107,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtCommandOptions : public utl::detail: notified, if configuration was changed. *//*-*****************************************************************************************************/ - void EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); + void EstablisFrameCallback(const css::uno::Reference< css::frame::XFrame >& xFrame); private: diff --git a/include/unotools/collatorwrapper.hxx b/include/unotools/collatorwrapper.hxx index e1fe3edba13e..a644f3899a48 100644 --- a/include/unotools/collatorwrapper.hxx +++ b/include/unotools/collatorwrapper.hxx @@ -30,20 +30,13 @@ namespace com { namespace sun { namespace star { namespace uno { class UNOTOOLS_DLLPUBLIC CollatorWrapper { private: - - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext - > mxServiceFactory; - - ::com::sun::star::uno::Reference< - ::com::sun::star::i18n::XCollator - > mxInternationalCollator; + css::uno::Reference< css::uno::XComponentContext > mxServiceFactory; + css::uno::Reference< css::i18n::XCollator > mxInternationalCollator; public: CollatorWrapper ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > &rxContext); + const css::uno::Reference< css::uno::XComponentContext > &rxContext); ~CollatorWrapper(); @@ -51,18 +44,18 @@ class UNOTOOLS_DLLPUBLIC CollatorWrapper compareString ( const OUString& s1, const OUString& s2) const; - ::com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > listCollatorAlgorithms ( - const ::com::sun::star::lang::Locale& rLocale) const; + const css::lang::Locale& rLocale) const; sal_Int32 loadDefaultCollator ( - const ::com::sun::star::lang::Locale& rLocale, sal_Int32 nOption); + const css::lang::Locale& rLocale, sal_Int32 nOption); sal_Int32 loadCollatorAlgorithm ( const OUString& rAlgorithm, - const ::com::sun::star::lang::Locale& rLocale, sal_Int32 nOption); + const css::lang::Locale& rLocale, sal_Int32 nOption); protected: diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx index 60bde91fcee0..554f51ed6e78 100644 --- a/include/unotools/compatibility.hxx +++ b/include/unotools/compatibility.hxx @@ -123,7 +123,7 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options @onerror We return an empty list. *//*-*****************************************************************************************************/ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > GetList() const; + css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > GetList() const; /*-**************************************************************************************************** @short append a new item diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx index 9d5e4ba8afd0..b7be7fe42d17 100644 --- a/include/unotools/configitem.hxx +++ b/include/unotools/configitem.hxx @@ -77,9 +77,9 @@ namespace utl friend class ConfigManager; const OUString sSubTree; - com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess> + css::uno::Reference< css::container::XHierarchicalNameAccess> m_xHierarchyAccess; - com::sun::star::uno::Reference< com::sun::star::util::XChangesListener > + css::uno::Reference< css::util::XChangesListener > xChangeLstnr; ConfigItemMode m_nMode; bool m_bIsModified; @@ -88,7 +88,7 @@ namespace utl void RemoveChangesListener(); void CallNotify( - const com::sun::star::uno::Sequence<OUString>& aPropertyNames); + const css::uno::Sequence<OUString>& aPropertyNames); // In special mode ALL_LOCALES we must support reading/writing of localized cfg entries as Sequence< PropertyValue >. // These methods are helper to convert given lists of names and Any-values. @@ -100,15 +100,15 @@ namespace utl // LOCALE VALUE // "de" "Mein Name" // "en-US" "my name" - void impl_packLocalizedProperties ( const com::sun::star::uno::Sequence< OUString >& lInNames , - const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& lInValues , - com::sun::star::uno::Sequence< com::sun::star::uno::Any >& lOutValues ); - void impl_unpackLocalizedProperties ( const com::sun::star::uno::Sequence< OUString >& lInNames , - const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& lInValues , - com::sun::star::uno::Sequence< OUString >& lOutNames , - com::sun::star::uno::Sequence< com::sun::star::uno::Any >& lOutValues ); - - com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess> + void impl_packLocalizedProperties ( const css::uno::Sequence< OUString >& lInNames , + const css::uno::Sequence< css::uno::Any >& lInValues , + css::uno::Sequence< css::uno::Any >& lOutValues ); + void impl_unpackLocalizedProperties ( const css::uno::Sequence< OUString >& lInNames , + const css::uno::Sequence< css::uno::Any >& lInValues , + css::uno::Sequence< OUString >& lOutNames , + css::uno::Sequence< css::uno::Any >& lOutValues ); + + css::uno::Reference< css::container::XHierarchicalNameAccess> GetTree(); /** writes the changed values into the sub tree. Private and only called from non-virtual public Commit(). */ @@ -121,15 +121,15 @@ namespace utl void SetModified (); // mark item as modified void ClearModified(); // reset state after commit! - com::sun::star::uno::Sequence< com::sun::star::uno::Any> - GetProperties(const com::sun::star::uno::Sequence< OUString >& rNames); + css::uno::Sequence< css::uno::Any> + GetProperties(const css::uno::Sequence< OUString >& rNames); - com::sun::star::uno::Sequence< sal_Bool > - GetReadOnlyStates(const com::sun::star::uno::Sequence< OUString >& rNames); + css::uno::Sequence< sal_Bool > + GetReadOnlyStates(const css::uno::Sequence< OUString >& rNames); bool PutProperties( - const com::sun::star::uno::Sequence< OUString >& rNames, - const com::sun::star::uno::Sequence< com::sun::star::uno::Any>& rValues); + const css::uno::Sequence< OUString >& rNames, + const css::uno::Sequence< css::uno::Any>& rValues); /** enables notifications about changes on selected sub nodes/values @@ -139,7 +139,7 @@ namespace utl @see Notify @see DisableNotification */ - bool EnableNotification(const com::sun::star::uno::Sequence< OUString >& rNames, + bool EnableNotification(const css::uno::Sequence< OUString >& rNames, bool bEnableInternalNotification = false); /** disables notifications about changes on sub nodes/values, which previosly had been enabled with EnableNotification @@ -149,20 +149,20 @@ namespace utl void DisableNotification(); //returns all members of a node in a specific format - com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > GetNodeNames(const OUString& rNode); //returns all members of a node in a specific format - com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > GetNodeNames(const OUString& rNode, ConfigNameFormat eFormat); // remove all members of a set bool ClearNodeSet(const OUString& rNode); // remove selected members of a set bool ClearNodeElements(const OUString& rNode, - com::sun::star::uno::Sequence< OUString >& rElements); + css::uno::Sequence< OUString >& rElements); // change or add members to a set - bool SetSetProperties(const OUString& rNode, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rValues); + bool SetSetProperties(const OUString& rNode, const css::uno::Sequence< css::beans::PropertyValue >& rValues); // remove, change or add members of a set - bool ReplaceSetProperties(const OUString& rNode, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rValues); + bool ReplaceSetProperties(const OUString& rNode, const css::uno::Sequence< css::beans::PropertyValue >& rValues); // add a new node without setting any properties bool AddNode(const OUString& rNode, const OUString& rNewNode); @@ -171,7 +171,7 @@ namespace utl /** is called from the ConfigManager before application ends of from the PropertyChangeListener if the sub tree broadcasts changes. */ - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames)=0; + virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames)=0; const OUString& GetSubTreeName() const {return sSubTree;} diff --git a/include/unotools/configmgr.hxx b/include/unotools/configmgr.hxx index 92ae409b3882..bf425885b083 100644 --- a/include/unotools/configmgr.hxx +++ b/include/unotools/configmgr.hxx @@ -57,16 +57,14 @@ public: SAL_DLLPRIVATE static ConfigManager & getConfigManager(); - SAL_DLLPRIVATE static com::sun::star::uno::Reference< - com::sun::star::container::XHierarchicalNameAccess> + SAL_DLLPRIVATE static css::uno::Reference< css::container::XHierarchicalNameAccess> acquireTree(utl::ConfigItem & item); SAL_DLLPRIVATE ConfigManager(); SAL_DLLPRIVATE ~ConfigManager(); - SAL_DLLPRIVATE com::sun::star::uno::Reference< - com::sun::star::container::XHierarchicalNameAccess > + SAL_DLLPRIVATE css::uno::Reference< css::container::XHierarchicalNameAccess > addConfigItem(utl::ConfigItem & item); SAL_DLLPRIVATE void removeConfigItem(utl::ConfigItem & item); diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx index ea088c4faafd..9fcde9f4a602 100644 --- a/include/unotools/confignode.hxx +++ b/include/unotools/confignode.hxx @@ -46,30 +46,29 @@ namespace utl class UNOTOOLS_DLLPUBLIC OConfigurationNode : public ::utl::OEventListenerAdapter { private: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess > + css::uno::Reference< css::container::XHierarchicalNameAccess > m_xHierarchyAccess; /// accessing children grandchildren (mandatory interface of our UNO object) - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > + css::uno::Reference< css::container::XNameAccess > m_xDirectAccess; /// accessing children (mandatory interface of our UNO object) - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > + css::uno::Reference< css::container::XNameReplace > m_xReplaceAccess; /// replacing child values - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > + css::uno::Reference< css::container::XNameContainer > m_xContainerAccess; /// modifying set nodes (optional interface of our UNO object) - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > m_xDummy; - bool m_bEscapeNames; /// escape names before accessing children ? + bool m_bEscapeNames; /// escape names before accessing children ? - OUString - m_sCompletePath; + OUString m_sCompletePath; - OConfigurationNode insertNode(const OUString& _rName,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xNode) const throw(); + OConfigurationNode insertNode(const OUString& _rName,const css::uno::Reference< css::uno::XInterface >& _xNode) const throw(); protected: /// constructs a node object with an interface representing a node OConfigurationNode( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxNode + const css::uno::Reference< css::uno::XInterface >& _rxNode ); - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& + const css::uno::Reference< css::container::XNameAccess >& getUNONode() const { return m_xDirectAccess; } public: @@ -124,11 +123,9 @@ namespace utl Unfortunately, this implies that if a void value is returned, you won't have a clue if this means "the path does not exist" (besides the assertion made :), or if the value is really void. */ - ::com::sun::star::uno::Any - getNodeValue(const OUString& _rPath) const throw(); + css::uno::Any getNodeValue(const OUString& _rPath) const throw(); - ::com::sun::star::uno::Any - getNodeValue( const sal_Char* _pAsciiPath ) const + css::uno::Any getNodeValue( const sal_Char* _pAsciiPath ) const { return getNodeValue( OUString::createFromAscii( _pAsciiPath ) ); } @@ -139,15 +136,15 @@ namespace utl node. @return sal_True if and only if the write was successful. */ - bool setNodeValue(const OUString& _rPath, const ::com::sun::star::uno::Any& _rValue) const throw(); + bool setNodeValue(const OUString& _rPath, const css::uno::Any& _rValue) const throw(); - bool setNodeValue( const sal_Char* _pAsciiPath, const ::com::sun::star::uno::Any& _rValue ) const + bool setNodeValue( const sal_Char* _pAsciiPath, const css::uno::Any& _rValue ) const { return setNodeValue( OUString::createFromAscii( _pAsciiPath ), _rValue ); } /// return the names of the existing children - ::com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > getNodeNames() const throw(); /** enables or disables name escaping when accessing direct children<p/> @@ -185,7 +182,7 @@ namespace utl protected: // OEventListenerAdapter - virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource ) override; + virtual void _disposing( const css::lang::EventObject& _rSource ) override; protected: enum NAMEORIGIN @@ -205,13 +202,13 @@ namespace utl */ class UNOTOOLS_DLLPUBLIC OConfigurationTreeRoot : public OConfigurationNode { - ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesBatch > + css::uno::Reference< css::util::XChangesBatch > m_xCommitter; protected: /** ctor for a readonly node */ OConfigurationTreeRoot( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxRootNode + const css::uno::Reference< css::uno::XInterface >& _rxRootNode ); public: @@ -258,7 +255,7 @@ namespace utl @see createWithServiceFactory */ static OConfigurationTreeRoot createWithProvider( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxConfProvider, + const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxConfProvider, const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, @@ -277,7 +274,7 @@ namespace utl @param _nDepth depth for node retrieval @param _eMode specifies which privileges should be applied when retrieving the node */ - static OConfigurationTreeRoot createWithComponentContext(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + static OConfigurationTreeRoot createWithComponentContext(const css::uno::Reference< css::uno::XComponentContext >& _rxContext, const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, bool _bLazyWrite = true); /** tolerant version of the <member>createWithServiceFactory</member> @@ -286,7 +283,7 @@ namespace utl the configuration could be initialized, errors in the creation of the specific node (e.g. because the given node path does not exist) are still asserted.</p> */ - static OConfigurationTreeRoot tryCreateWithComponentContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, + static OConfigurationTreeRoot tryCreateWithComponentContext( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, bool _bLazyWrite = true ); /** commit all changes made on the subtree the object is the root for<p/> diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx index 0104e66b98b7..a481c65548b1 100644 --- a/include/unotools/configvaluecontainer.hxx +++ b/include/unotools/configvaluecontainer.hxx @@ -89,7 +89,7 @@ namespace utl specifies the number of levels to access under the node given by <arg>_pConfigLocation</arg> */ OConfigurationValueContainer( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB, + const css::uno::Reference< css::uno::XComponentContext >& _rxORB, ::osl::Mutex& _rAccessSafety, const sal_Char* _pConfigLocation, const CVCFlags _nAccessFlags = CVCFlags::UPDATE_ACCESS | CVCFlags::LAZY_UPDATE, @@ -116,7 +116,7 @@ namespace utl void registerExchangeLocation( const sal_Char* _pRelativePathAscii, void* _pContainer, - const ::com::sun::star::uno::Type& _rValueType + const css::uno::Type& _rValueType ); public: diff --git a/include/unotools/digitgroupingiterator.hxx b/include/unotools/digitgroupingiterator.hxx index 12f8dc163b3d..c6eaf1cafb99 100644 --- a/include/unotools/digitgroupingiterator.hxx +++ b/include/unotools/digitgroupingiterator.hxx @@ -60,7 +60,7 @@ namespace utl { class DigitGroupingIterator { - const ::com::sun::star::uno::Sequence< sal_Int32 > maGroupings; + const css::uno::Sequence< sal_Int32 > maGroupings; sal_Int32 mnGroup; // current active grouping sal_Int32 mnDigits; // current active digits per group @@ -121,7 +121,7 @@ class DigitGroupingIterator public: - explicit DigitGroupingIterator( const ::com::sun::star::uno::Sequence< sal_Int32 > & rGroupings ) + explicit DigitGroupingIterator( const css::uno::Sequence< sal_Int32 > & rGroupings ) : maGroupings( rGroupings) { initGrouping(); @@ -164,14 +164,14 @@ public: digit. For example, for grouping in thousands and nIntegerDigits==7 the sequence returned would be {1,0,0,1,0,0,0} so the caller would add a separator after the 1st and the 4th digit. */ - static ::com::sun::star::uno::Sequence< sal_Bool > createForwardSequence( + static css::uno::Sequence< sal_Bool > createForwardSequence( sal_Int32 nIntegerDigits, - const ::com::sun::star::uno::Sequence< sal_Int32 > & rGroupings ) + const css::uno::Sequence< sal_Int32 > & rGroupings ) { if (nIntegerDigits <= 0) - return ::com::sun::star::uno::Sequence< sal_Bool >(); + return css::uno::Sequence< sal_Bool >(); DigitGroupingIterator aIterator( rGroupings); - ::com::sun::star::uno::Sequence< sal_Bool > aSeq( nIntegerDigits); + css::uno::Sequence< sal_Bool > aSeq( nIntegerDigits); sal_Bool* pArr = aSeq.getArray(); for (sal_Int32 j = 0; --nIntegerDigits >= 0; ++j) { diff --git a/include/unotools/dynamicmenuoptions.hxx b/include/unotools/dynamicmenuoptions.hxx index 9e3aef3d5b77..4b04a40521a3 100644 --- a/include/unotools/dynamicmenuoptions.hxx +++ b/include/unotools/dynamicmenuoptions.hxx @@ -87,7 +87,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtDynamicMenuOptions : public utl::det @onerror We return an empty list. *//*-*****************************************************************************************************/ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > GetMenu( EDynamicMenuType eMenu ) const; + css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > GetMenu( EDynamicMenuType eMenu ) const; private: /*-**************************************************************************************************** diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx index 38a38b880452..cfe6026d03af 100644 --- a/include/unotools/eventcfg.hxx +++ b/include/unotools/eventcfg.hxx @@ -65,20 +65,20 @@ enum class GlobalEventId class GlobalEventConfig_Impl; class UNOTOOLS_DLLPUBLIC GlobalEventConfig: - public ::cppu::WeakImplHelper2 < ::com::sun::star::document::XEventsSupplier, ::com::sun::star::container::XNameReplace > + public ::cppu::WeakImplHelper2 < css::document::XEventsSupplier, css::container::XNameReplace > { public: GlobalEventConfig( ); virtual ~GlobalEventConfig( ); static ::osl::Mutex& GetOwnStaticMutex(); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; static OUString GetEventName( GlobalEventId nID ); private: diff --git a/include/unotools/eventlisteneradapter.hxx b/include/unotools/eventlisteneradapter.hxx index 26c1ef45dba4..78408ed2b46b 100644 --- a/include/unotools/eventlisteneradapter.hxx +++ b/include/unotools/eventlisteneradapter.hxx @@ -46,11 +46,11 @@ namespace utl OEventListenerAdapter(); virtual ~OEventListenerAdapter(); - void startComponentListening( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxComp ); - void stopComponentListening( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxComp ); + void startComponentListening( const css::uno::Reference< css::lang::XComponent >& _rxComp ); + void stopComponentListening( const css::uno::Reference< css::lang::XComponent >& _rxComp ); void stopAllComponentListening( ); - virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource ) = 0; + virtual void _disposing( const css::lang::EventObject& _rSource ) = 0; }; } // namespace utl diff --git a/include/unotools/fltrcfg.hxx b/include/unotools/fltrcfg.hxx index b1aa2f8ab2b0..ceb4d9764636 100644 --- a/include/unotools/fltrcfg.hxx +++ b/include/unotools/fltrcfg.hxx @@ -28,7 +28,7 @@ class UNOTOOLS_DLLPUBLIC SvtFilterOptions : public utl::ConfigItem private: SvtFilterOptions_Impl* pImp; - const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + const css::uno::Sequence<OUString>& GetPropertyNames(); virtual void ImplCommit() override; @@ -36,7 +36,7 @@ public: SvtFilterOptions(); virtual ~SvtFilterOptions(); - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) override; + virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override; void Load(); void SetLoadWordBasicCode( bool bFlag ); diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx index c13e4a5a4138..a37242932dfa 100644 --- a/include/unotools/fontcfg.hxx +++ b/include/unotools/fontcfg.hxx @@ -94,9 +94,9 @@ namespace utl class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration { - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + css::uno::Reference< css::lang::XMultiServiceFactory > m_xConfigProvider; - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > + css::uno::Reference< css::container::XNameAccess > m_xConfigAccess; struct LocaleAccess @@ -105,7 +105,7 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration // used to get rid of upper/lower case problems OUString aConfigLocaleString; // xAccess is mutable to be able to be filled on demand - mutable com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xAccess; + mutable css::uno::Reference< css::container::XNameAccess > xAccess; }; std::unordered_map< OUString, LocaleAccess, OUStringHash > m_aConfig; @@ -137,13 +137,13 @@ struct UNOTOOLS_DLLPUBLIC FontNameAttr class UNOTOOLS_DLLPUBLIC FontSubstConfiguration { private: - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + css::uno::Reference< css::lang::XMultiServiceFactory > m_xConfigProvider; - com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > + css::uno::Reference< css::container::XNameAccess > m_xConfigAccess; struct LocaleSubst { - OUString aConfigLocaleString; + OUString aConfigLocaleString; mutable bool bConfigRead; // note: aSubstAttributes must be sorted alphabetically by Name // searches on the substitutes are done with Name as key, where @@ -157,14 +157,14 @@ private: typedef std::unordered_set< OUString, OUStringHash > UniqueSubstHash; mutable UniqueSubstHash maSubstHash; - void fillSubstVector( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& rFont, + void fillSubstVector( const css::uno::Reference< css::container::XNameAccess >& rFont, const OUString& rType, std::vector< OUString >& rSubstVector ) const; - FontWeight getSubstWeight( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& rFont, + FontWeight getSubstWeight( const css::uno::Reference< css::container::XNameAccess >& rFont, const OUString& rType ) const; - FontWidth getSubstWidth( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& rFont, + FontWidth getSubstWidth( const css::uno::Reference< css::container::XNameAccess >& rFont, const OUString& rType ) const; - ImplFontAttrs getSubstType( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& rFont, + ImplFontAttrs getSubstType( const css::uno::Reference< css::container::XNameAccess >& rFont, const OUString& rType ) const; void readLocaleSubst( const OUString& rBcp47 ) const; public: diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx index e90ba592a4de..71a8d3cb67ef 100644 --- a/include/unotools/historyoptions.hxx +++ b/include/unotools/historyoptions.hxx @@ -81,7 +81,7 @@ public: @param eHistory select right history. @return A list of history items is returned. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > GetList(EHistoryType eHistory) const; + css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > GetList(EHistoryType eHistory) const; /** Append a new item to the specified list. diff --git a/include/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx index 903a8a462a0b..30ca525e1523 100644 --- a/include/unotools/intlwrapper.hxx +++ b/include/unotools/intlwrapper.hxx @@ -48,7 +48,7 @@ class UNOTOOLS_DLLPUBLIC IntlWrapper private: LanguageTag maLanguageTag; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; LocaleDataWrapper* pLocaleData; CollatorWrapper* pCollator; @@ -59,7 +59,7 @@ private: public: IntlWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext, + const css::uno::Reference< css::uno::XComponentContext > & rxContext, const LanguageTag& rLanguageTag ); IntlWrapper( diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx index 46a407464871..0f9acb9af6b4 100644 --- a/include/unotools/lingucfg.hxx +++ b/include/unotools/lingucfg.hxx @@ -37,11 +37,11 @@ class SvtLinguConfigItem; struct UNOTOOLS_DLLPUBLIC SvtLinguOptions { - ::com::sun::star::uno::Sequence< OUString > aActiveDics; - ::com::sun::star::uno::Sequence< OUString > aActiveConvDics; + css::uno::Sequence< OUString > aActiveDics; + css::uno::Sequence< OUString > aActiveConvDics; - bool bROActiveDics; - bool bROActiveConvDics; + bool bROActiveDics; + bool bROActiveConvDics; // Hyphenator service specific options sal_Int16 nHyphMinLeading, @@ -130,11 +130,11 @@ struct UNOTOOLS_DLLPUBLIC SvtLinguOptions struct UNOTOOLS_DLLPUBLIC SvtLinguConfigDictionaryEntry { // the URL's pointing to the location of the files the dictionary consists of - com::sun::star::uno::Sequence< OUString > aLocations; + css::uno::Sequence< OUString > aLocations; // the name of the dictionary format implement OUString aFormatName; // the list of languages (ISO names) the dictionary can be used for - com::sun::star::uno::Sequence< OUString > aLocaleNames; + css::uno::Sequence< OUString > aLocaleNames; }; class UNOTOOLS_DLLPUBLIC SvtLinguConfig: public utl::detail::Options @@ -145,9 +145,9 @@ class UNOTOOLS_DLLPUBLIC SvtLinguConfig: public utl::detail::Options SvtLinguConfigItem & GetConfigItem() const { return const_cast< SvtLinguConfig * >( this )->GetConfigItem(); } // configuration update access for the 'Linguistic' main node - mutable com::sun::star::uno::Reference< com::sun::star::util::XChangesBatch > m_xMainUpdateAccess; + mutable css::uno::Reference< css::util::XChangesBatch > m_xMainUpdateAccess; - com::sun::star::uno::Reference< com::sun::star::util::XChangesBatch > GetMainUpdateAccess() const; + css::uno::Reference< css::util::XChangesBatch > GetMainUpdateAccess() const; OUString GetVendorImageUrl_Impl( const OUString &rServiceImplName, const OUString &rImageName ) const; @@ -160,27 +160,27 @@ public: // borrowed from utl::ConfigItem - com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > GetNodeNames( const OUString &rNode ); - com::sun::star::uno::Sequence< com::sun::star::uno::Any > + css::uno::Sequence< css::uno::Any > GetProperties( - const com::sun::star::uno::Sequence< OUString > &rNames ); + const css::uno::Sequence< OUString > &rNames ); bool ReplaceSetProperties( const OUString &rNode, - const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rValues ); + const css::uno::Sequence< css::beans::PropertyValue >& rValues ); - com::sun::star::uno::Any + css::uno::Any GetProperty( const OUString &rPropertyName ) const; - com::sun::star::uno::Any + css::uno::Any GetProperty( sal_Int32 nPropertyHandle ) const; bool SetProperty( const OUString &rPropertyName, - const com::sun::star::uno::Any &rValue ); + const css::uno::Any &rValue ); bool SetProperty( sal_Int32 nPropertyHandle, - const com::sun::star::uno::Any &rValue ); + const css::uno::Any &rValue ); bool GetOptions( SvtLinguOptions &rOptions ) const; @@ -190,13 +190,13 @@ public: //! the following functions work on the 'ServiceManager' sub node of the //! linguistic configuration only //! - bool GetElementNamesFor( const OUString &rNodeName, com::sun::star::uno::Sequence< OUString > &rElementNames ) const; + bool GetElementNamesFor( const OUString &rNodeName, css::uno::Sequence< OUString > &rElementNames ) const; - bool GetSupportedDictionaryFormatsFor( const OUString &rSetName, const OUString &rSetEntry, com::sun::star::uno::Sequence< OUString > &rFormatList ) const; + bool GetSupportedDictionaryFormatsFor( const OUString &rSetName, const OUString &rSetEntry, css::uno::Sequence< OUString > &rFormatList ) const; bool GetDictionaryEntry( const OUString &rNodeName, SvtLinguConfigDictionaryEntry &rDicEntry ) const; - com::sun::star::uno::Sequence< OUString > GetDisabledDictionaries() const; + css::uno::Sequence< OUString > GetDisabledDictionaries() const; std::vector< SvtLinguConfigDictionaryEntry > GetActiveDictionariesByFormat( const OUString &rFormatName ); diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx index 1664ad847fca..a1f559149129 100644 --- a/include/unotools/localedatawrapper.hxx +++ b/include/unotools/localedatawrapper.hxx @@ -53,17 +53,17 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper { static sal_uInt8 nLocaleDataChecking; // 0:=dontknow, 1:=yes, 2:=no - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData4 > xLD; - LanguageTag maLanguageTag; - std::shared_ptr< ::com::sun::star::i18n::Calendar2 > xDefaultCalendar; - ::com::sun::star::i18n::LocaleDataItem aLocaleDataItem; - ::com::sun::star::uno::Sequence< OUString > aReservedWordSeq; - ::com::sun::star::uno::Sequence< OUString > aDateAcceptancePatterns; - ::com::sun::star::uno::Sequence< sal_Int32 > aGrouping; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::i18n::XLocaleData4 > xLD; + LanguageTag maLanguageTag; + std::shared_ptr< css::i18n::Calendar2 > xDefaultCalendar; + css::i18n::LocaleDataItem aLocaleDataItem; + css::uno::Sequence< OUString > aReservedWordSeq; + css::uno::Sequence< OUString > aDateAcceptancePatterns; + css::uno::Sequence< sal_Int32 > aGrouping; // cached items - OUString aLocaleItem[::com::sun::star::i18n::LocaleItem::COUNT]; - OUString aReservedWord[::com::sun::star::i18n::reservedWords::COUNT]; + OUString aLocaleItem[css::i18n::LocaleItem::COUNT]; + OUString aReservedWord[css::i18n::reservedWords::COUNT]; OUString aCurrSymbol; OUString aCurrBankSymbol; int nDateFormat; @@ -108,7 +108,7 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper public: LocaleDataWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext, + const css::uno::Reference< css::uno::XComponentContext > & rxContext, const LanguageTag& rLanguageTag ); LocaleDataWrapper( @@ -121,8 +121,8 @@ public: non-existent if this LocaleDataWrapper was created without one and lives "on the grassland". The CalendarWrapper ctor can handle that though. */ - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & getComponentContext() + const css::uno::Reference< + css::uno::XComponentContext > & getComponentContext() const { return m_xContext; } /// set a new Locale to request @@ -136,25 +136,25 @@ public: // Wrapper implementations of service LocaleData - ::com::sun::star::i18n::LanguageCountryInfo getLanguageCountryInfo() const; - ::com::sun::star::i18n::LocaleDataItem getLocaleItem() const; + css::i18n::LanguageCountryInfo getLanguageCountryInfo() const; + css::i18n::LocaleDataItem getLocaleItem() const; /// NOTE: this wraps XLocaleData3::getAllCalendars2() in fact. - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Calendar2 > getAllCalendars() const; + css::uno::Sequence< css::i18n::Calendar2 > getAllCalendars() const; /// NOTE: this wraps XLocaleData2::getAllCurrencies2() in fact. - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 > getAllCurrencies() const; - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement > getAllFormats() const; - ::com::sun::star::i18n::ForbiddenCharacters getForbiddenCharacters() const; - ::com::sun::star::uno::Sequence< OUString > getReservedWord() const; - ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > getAllInstalledLocaleNames() const; - ::com::sun::star::uno::Sequence< OUString > getDateAcceptancePatterns() const; + css::uno::Sequence< css::i18n::Currency2 > getAllCurrencies() const; + css::uno::Sequence< css::i18n::FormatElement > getAllFormats() const; + css::i18n::ForbiddenCharacters getForbiddenCharacters() const; + css::uno::Sequence< OUString > getReservedWord() const; + css::uno::Sequence< css::lang::Locale > getAllInstalledLocaleNames() const; + css::uno::Sequence< OUString > getDateAcceptancePatterns() const; /** Override locale's date acceptance patterns. An empty sequence resets the patterns to the locale's pattern sequence. */ - void setDateAcceptancePatterns( const ::com::sun::star::uno::Sequence< OUString > & rPatterns ); + void setDateAcceptancePatterns( const css::uno::Sequence< OUString > & rPatterns ); /// same as the wrapper implementation but static - static ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > getInstalledLocaleNames(); + static css::uno::Sequence< css::lang::Locale > getInstalledLocaleNames(); /** Get LanguageTypes for all installed locales which are unambiguous convertible back and forth between locale ISO strings and MS-LCID @@ -163,19 +163,19 @@ public: matching, excluding already known problems. (e.g. used in number formatter dialog init) */ - static ::com::sun::star::uno::Sequence< sal_uInt16 > getInstalledLanguageTypes(); + static css::uno::Sequence< sal_uInt16 > getInstalledLanguageTypes(); /// maps the LocaleData string to the International enum MeasurementSystem mapMeasurementStringToEnum( const OUString& rMS ) const; /// Convenience method to obtain the default calendar. - const std::shared_ptr< ::com::sun::star::i18n::Calendar2 > getDefaultCalendar() const; + const std::shared_ptr< css::i18n::Calendar2 > getDefaultCalendar() const; /// Convenience method to obtain the day names of the default calendar. - const ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > getDefaultCalendarDays() const; + const css::uno::Sequence< css::i18n::CalendarItem2 > getDefaultCalendarDays() const; /// Convenience method to obtain the month names of the default calendar. - const ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > getDefaultCalendarMonths() const; + const css::uno::Sequence< css::i18n::CalendarItem2 > getDefaultCalendarMonths() const; /** Obtain digit grouping. The usually known grouping by thousands (#,###) is actually only one of possible groupings. Another one, for example, @@ -187,44 +187,44 @@ public: Indian grouping. The sal_Int32* getConstArray() can be passed directly to the ::rtl::math::doubleToString() methods as argument for the pGroups parameter. */ - const ::com::sun::star::uno::Sequence< sal_Int32 > getDigitGrouping() const; + const css::uno::Sequence< sal_Int32 > getDigitGrouping() const; // Functionality of class International methods, LocaleItem const OUString& getDateSep() const - { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DATE_SEPARATOR ); } + { return getOneLocaleItem( css::i18n::LocaleItem::DATE_SEPARATOR ); } const OUString& getNumThousandSep() const - { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::THOUSAND_SEPARATOR ); } + { return getOneLocaleItem( css::i18n::LocaleItem::THOUSAND_SEPARATOR ); } const OUString& getNumDecimalSep() const - { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DECIMAL_SEPARATOR ); } + { return getOneLocaleItem( css::i18n::LocaleItem::DECIMAL_SEPARATOR ); } const OUString& getTimeSep() const - { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_SEPARATOR ); } + { return getOneLocaleItem( css::i18n::LocaleItem::TIME_SEPARATOR ); } const OUString& getTime100SecSep() const - { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_100SEC_SEPARATOR ); } + { return getOneLocaleItem( css::i18n::LocaleItem::TIME_100SEC_SEPARATOR ); } const OUString& getListSep() const - { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LIST_SEPARATOR ); } + { return getOneLocaleItem( css::i18n::LocaleItem::LIST_SEPARATOR ); } const OUString& getQuotationMarkStart() const - { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::SINGLE_QUOTATION_START ); } + { return getOneLocaleItem( css::i18n::LocaleItem::SINGLE_QUOTATION_START ); } const OUString& getQuotationMarkEnd() const - { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::SINGLE_QUOTATION_END ); } + { return getOneLocaleItem( css::i18n::LocaleItem::SINGLE_QUOTATION_END ); } const OUString& getDoubleQuotationMarkStart() const - { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DOUBLE_QUOTATION_START ); } + { return getOneLocaleItem( css::i18n::LocaleItem::DOUBLE_QUOTATION_START ); } const OUString& getDoubleQuotationMarkEnd() const - { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DOUBLE_QUOTATION_END ); } + { return getOneLocaleItem( css::i18n::LocaleItem::DOUBLE_QUOTATION_END ); } MeasurementSystem getMeasurementSystemEnum() const - { return mapMeasurementStringToEnum( getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::MEASUREMENT_SYSTEM ) ); } + { return mapMeasurementStringToEnum( getOneLocaleItem( css::i18n::LocaleItem::MEASUREMENT_SYSTEM ) ); } const OUString& getTimeAM() const - { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_AM ); } + { return getOneLocaleItem( css::i18n::LocaleItem::TIME_AM ); } const OUString& getTimePM() const - { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_PM ); } + { return getOneLocaleItem( css::i18n::LocaleItem::TIME_PM ); } const OUString& getLongDateDayOfWeekSep() const - { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_DAY_OF_WEEK_SEPARATOR ); } + { return getOneLocaleItem( css::i18n::LocaleItem::LONG_DATE_DAY_OF_WEEK_SEPARATOR ); } const OUString& getLongDateDaySep() const - { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_DAY_SEPARATOR ); } + { return getOneLocaleItem( css::i18n::LocaleItem::LONG_DATE_DAY_SEPARATOR ); } const OUString& getLongDateMonthSep() const - { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_MONTH_SEPARATOR ); } + { return getOneLocaleItem( css::i18n::LocaleItem::LONG_DATE_MONTH_SEPARATOR ); } const OUString& getLongDateYearSep() const - { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_YEAR_SEPARATOR ); } + { return getOneLocaleItem( css::i18n::LocaleItem::LONG_DATE_YEAR_SEPARATOR ); } // currency const OUString& getCurrSymbol() const; @@ -298,16 +298,16 @@ public: // reserved words const OUString& getTrueWord() const - { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::TRUE_WORD ); } + { return getOneReservedWord( css::i18n::reservedWords::TRUE_WORD ); } const OUString& getFalseWord() const - { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::FALSE_WORD ); } + { return getOneReservedWord( css::i18n::reservedWords::FALSE_WORD ); } const OUString& getAboveWord() const - { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::ABOVE_WORD ); } + { return getOneReservedWord( css::i18n::reservedWords::ABOVE_WORD ); } const OUString& getBelowWord() const - { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::BELOW_WORD ); } + { return getOneReservedWord( css::i18n::reservedWords::BELOW_WORD ); } /// return a quarter abbreviation string matching nQuarter (0..3) => "Q1" .. "Q2" const OUString& getQuarterAbbreviation( sal_Int16 nQuarter ) const - { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::QUARTER1_ABBREVIATION + nQuarter ); } + { return getOneReservedWord( css::i18n::reservedWords::QUARTER1_ABBREVIATION + nQuarter ); } /** Return whether locale data checks are enabled. Checks are enabled if the environment variable @@ -336,7 +336,7 @@ public: private: - const ::com::sun::star::lang::Locale & getMyLocale() const; + const css::lang::Locale & getMyLocale() const; static void evaluateLocaleDataChecking(); }; diff --git a/include/unotools/localfilehelper.hxx b/include/unotools/localfilehelper.hxx index 31cd395db6d8..e96b5a571f28 100644 --- a/include/unotools/localfilehelper.hxx +++ b/include/unotools/localfilehelper.hxx @@ -29,7 +29,7 @@ namespace utl class UNOTOOLS_DLLPUBLIC LocalFileHelper { public: - static ::com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > GetFolderContents( const OUString& rFolder, bool bFolder ); }; diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx index 32abafddbf63..f24ed86f8c44 100644 --- a/include/unotools/mediadescriptor.hxx +++ b/include/unotools/mediadescriptor.hxx @@ -36,7 +36,7 @@ namespace comphelper { class IDocPasswordVerifier; } namespace utl { -/** @short can be used to work with a ::com::sun::star::document::MediaDescriptor +/** @short can be used to work with a css::document::MediaDescriptor struct. @descr It wraps a unordered_map around the Sequence< css::beans::PropertyValue >, which @@ -110,7 +110,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap the default ctors of the compiler :-(. */ MediaDescriptor(); - MediaDescriptor(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lSource); + MediaDescriptor(const css::uno::Sequence< css::beans::PropertyValue >& lSource); /** @short it checks if the descriptor already has a valid InputStream item and creates a new one, if not. @@ -177,7 +177,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap sequence of the 'ComponentData' property, otherwise an empty Any. */ - ::com::sun::star::uno::Any getComponentDataEntry( + css::uno::Any getComponentDataEntry( const OUString& rName ) const; /** Inserts a value into the sequence contained in the property @@ -197,7 +197,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap */ void setComponentDataEntry( const OUString& rName, - const ::com::sun::star::uno::Any& rValue ); + const css::uno::Any& rValue ); /** Removes a value from the sequence contained in the property 'ComponentData' of the media descriptor. @@ -253,7 +253,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap passed password verifier. If empty, no valid password has been found, or the user has chossen to cancel password input. */ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > requestAndVerifyDocPassword( + css::uno::Sequence< css::beans::NamedValue > requestAndVerifyDocPassword( comphelper::IDocPasswordVerifier& rVerifier, comphelper::DocPasswordRequestType eRequestType, const ::std::vector< OUString >* pDefaultPasswords = 0 ); @@ -281,8 +281,8 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap if the given PostData stream is <NULL/>. */ SAL_DLLPRIVATE bool impl_openStreamWithPostData( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& _rxPostData - ) throw(::com::sun::star::uno::RuntimeException); + const css::uno::Reference< css::io::XInputStream >& _rxPostData + ) throw(css::uno::RuntimeException); /** @short tries to open a stream by using the given URL. @@ -308,7 +308,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap SAL_DLLPRIVATE bool impl_openStreamWithURL( const OUString& sURL, bool bLockFile - ) throw(::com::sun::star::uno::RuntimeException); + ) throw(css::uno::RuntimeException); /** @short it checks if the descriptor already has a valid InputStream item and creates a new one, if not. diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx index 23e975cec01d..c884908c8688 100644 --- a/include/unotools/moduleoptions.hxx +++ b/include/unotools/moduleoptions.hxx @@ -134,7 +134,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: @return A suitable enum value. See EFactory above. */ static EFactory ClassifyFactoryByURL(const OUString& sURL , - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lMediaDescriptor); + const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor); /** @short return the corresponding application ID for the given properties. @@ -149,7 +149,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: @return A suitable enum value. See EFactory above. */ - static EFactory ClassifyFactoryByModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel); + static EFactory ClassifyFactoryByModel(const css::uno::Reference< css::frame::XModel >& xModel); static OUString GetFactoryShortName(EFactory eFactory); @@ -164,7 +164,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: static bool IsBasicIDE () { return true; } bool IsDataBase () const; - ::com::sun::star::uno::Sequence < OUString > GetAllServiceNames(); + css::uno::Sequence < OUString > GetAllServiceNames(); private: UNOTOOLS_DLLPRIVATE static ::osl::Mutex& impl_GetOwnStaticMutex(); diff --git a/include/unotools/nativenumberwrapper.hxx b/include/unotools/nativenumberwrapper.hxx index a6582d27292b..10f6c5deec74 100644 --- a/include/unotools/nativenumberwrapper.hxx +++ b/include/unotools/nativenumberwrapper.hxx @@ -30,13 +30,13 @@ namespace com { namespace sun { namespace star { class UNOTOOLS_DLLPUBLIC NativeNumberWrapper { - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XNativeNumberSupplier > xNNS; + css::uno::Reference< css::i18n::XNativeNumberSupplier > xNNS; NativeNumberWrapper( const NativeNumberWrapper& ) = delete; NativeNumberWrapper& operator=( const NativeNumberWrapper& ) = delete; public: NativeNumberWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext + const css::uno::Reference< css::uno::XComponentContext > & rxContext ); ~NativeNumberWrapper(); @@ -45,15 +45,15 @@ public: OUString getNativeNumberString( const OUString& rNumberString, - const ::com::sun::star::lang::Locale& rLocale, + const css::lang::Locale& rLocale, sal_Int16 nNativeNumberMode ) const; - ::com::sun::star::i18n::NativeNumberXmlAttributes convertToXmlAttributes( - const ::com::sun::star::lang::Locale& rLocale, + css::i18n::NativeNumberXmlAttributes convertToXmlAttributes( + const css::lang::Locale& rLocale, sal_Int16 nNativeNumberMode ) const; sal_Int16 convertFromXmlAttributes( - const ::com::sun::star::i18n::NativeNumberXmlAttributes& rAttr ) const; + const css::i18n::NativeNumberXmlAttributes& rAttr ) const; }; diff --git a/include/unotools/numberformatcodewrapper.hxx b/include/unotools/numberformatcodewrapper.hxx index b41233407d41..08d97fc02097 100644 --- a/include/unotools/numberformatcodewrapper.hxx +++ b/include/unotools/numberformatcodewrapper.hxx @@ -31,28 +31,28 @@ namespace com { namespace sun { namespace star { class UNOTOOLS_DLLPUBLIC NumberFormatCodeWrapper { - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XNumberFormatCode > xNFC; - ::com::sun::star::lang::Locale aLocale; + css::uno::Reference< css::i18n::XNumberFormatCode > xNFC; + css::lang::Locale aLocale; NumberFormatCodeWrapper( const NumberFormatCodeWrapper& ) = delete; NumberFormatCodeWrapper& operator=( const NumberFormatCodeWrapper& ) = delete; public: NumberFormatCodeWrapper( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext, - const ::com::sun::star::lang::Locale& rLocale + const css::uno::Reference< css::uno::XComponentContext > & rxContext, + const css::lang::Locale& rLocale ); ~NumberFormatCodeWrapper(); /// set a new Locale - void setLocale( const ::com::sun::star::lang::Locale& rLocale ); + void setLocale( const css::lang::Locale& rLocale ); // Wrapper implementations of class NumberFormatCodeMapper - ::com::sun::star::i18n::NumberFormatCode getFormatCode( sal_Int16 nFormatIndex ) const; - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > getAllFormatCode( sal_Int16 nFormatUsage ) const; - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > getAllFormatCodes() const; + css::i18n::NumberFormatCode getFormatCode( sal_Int16 nFormatIndex ) const; + css::uno::Sequence< css::i18n::NumberFormatCode > getAllFormatCode( sal_Int16 nFormatUsage ) const; + css::uno::Sequence< css::i18n::NumberFormatCode > getAllFormatCodes() const; }; diff --git a/include/unotools/progresshandlerwrap.hxx b/include/unotools/progresshandlerwrap.hxx index 05f7d8b514d0..61aff766709c 100644 --- a/include/unotools/progresshandlerwrap.hxx +++ b/include/unotools/progresshandlerwrap.hxx @@ -27,20 +27,20 @@ namespace utl { -class UNOTOOLS_DLLPUBLIC ProgressHandlerWrap : public ::cppu::WeakImplHelper1< ::com::sun::star::ucb::XProgressHandler > +class UNOTOOLS_DLLPUBLIC ProgressHandlerWrap : public ::cppu::WeakImplHelper1< css::ucb::XProgressHandler > { - ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > m_xStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > m_xStatusIndicator; public: - ProgressHandlerWrap( ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > xSI ); + ProgressHandlerWrap( css::uno::Reference< css::task::XStatusIndicator > xSI ); // XProgressHandler - virtual void SAL_CALL push( const ::com::sun::star::uno::Any& Status ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL update( const ::com::sun::star::uno::Any& Status ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL push( const css::uno::Any& Status ) + throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update( const css::uno::Any& Status ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL pop() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; }; } // namespace utl diff --git a/include/unotools/securityoptions.hxx b/include/unotools/securityoptions.hxx index 77e4720cf20f..8e8fe91d7a77 100644 --- a/include/unotools/securityoptions.hxx +++ b/include/unotools/securityoptions.hxx @@ -85,7 +85,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail MA_RUN }; - typedef ::com::sun::star::uno::Sequence< OUString > Certificate; + typedef css::uno::Sequence< OUString > Certificate; /* // MT: Doesn't work for sequence... @@ -139,8 +139,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail @onerror No error should occur! *//*-*****************************************************************************************************/ - ::com::sun::star::uno::Sequence< OUString > GetSecureURLs( ) const; - void SetSecureURLs( const ::com::sun::star::uno::Sequence< OUString >& seqURLList ); + css::uno::Sequence< OUString > GetSecureURLs( ) const; + void SetSecureURLs( const css::uno::Sequence< OUString >& seqURLList ); /*-**************************************************************************************************** @short interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/StarOfficeBasic" @@ -188,8 +188,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail bool isTrustedLocationUriForUpdatingLinks(OUString const & uri) const; - ::com::sun::star::uno::Sequence< Certificate > GetTrustedAuthors ( ) const; - void SetTrustedAuthors ( const ::com::sun::star::uno::Sequence< Certificate >& rAuthors ); + css::uno::Sequence< Certificate > GetTrustedAuthors ( ) const; + void SetTrustedAuthors ( const css::uno::Sequence< Certificate >& rAuthors ); // for bool options only! bool IsOptionSet ( EOption eOption ) const; diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx index 7226822e942f..9a293dee9759 100644 --- a/include/unotools/sharedunocomponent.hxx +++ b/include/unotools/sharedunocomponent.hxx @@ -43,8 +43,7 @@ namespace utl */ class UNOTOOLS_DLLPUBLIC DisposableComponent { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > - m_xComponent; + css::uno::Reference< css::lang::XComponent > m_xComponent; public: /** constructs a ->DisposableComponent instance @@ -52,7 +51,7 @@ namespace utl @param _rxComponent the component whose life time should be controlled by the instance. Must not be <NULL/>. */ - DisposableComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); + DisposableComponent( const css::uno::Reference< css::uno::XInterface >& _rxComponent ); /** disposes the component represented by the instance @@ -88,7 +87,7 @@ namespace utl @param _rxComponent the component whose life time should be controlled by the instance. Must not be <NULL/>. */ - CloseableComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); + CloseableComponent( const css::uno::Reference< css::uno::XInterface >& _rxComponent ); /** destroys resources associated with this instance, and disposes the component @@ -141,8 +140,8 @@ namespace utl typedef std::shared_ptr<Component> ComponentPointer; private: - ComponentPointer m_xComponent; - ::com::sun::star::uno::Reference< INTERFACE > m_xTypedComponent; + ComponentPointer m_xComponent; + css::uno::Reference< INTERFACE > m_xTypedComponent; public: enum AssignmentMode @@ -156,32 +155,32 @@ namespace utl { } - explicit inline SharedUNOComponent( const ::com::sun::star::uno::Reference< INTERFACE >& _rxComponent, AssignmentMode eMode = TakeOwnership ) + explicit inline SharedUNOComponent( const css::uno::Reference< INTERFACE >& _rxComponent, AssignmentMode eMode = TakeOwnership ) { reset( _rxComponent, eMode ); } - inline SharedUNOComponent( const ::com::sun::star::uno::XInterface* _pInterface, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ) + inline SharedUNOComponent( const css::uno::XInterface* _pInterface, css::uno::UnoReference_QueryThrow _queryThrow ) { set( _pInterface, _queryThrow ); } - inline SharedUNOComponent( const ::com::sun::star::uno::BaseReference & _rRef, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ) + inline SharedUNOComponent( const css::uno::BaseReference & _rRef, css::uno::UnoReference_QueryThrow _queryThrow ) { set( _rRef, _queryThrow ); } - inline SharedUNOComponent( const ::com::sun::star::uno::Any& _rAny, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ) + inline SharedUNOComponent( const css::uno::Any& _rAny, css::uno::UnoReference_QueryThrow _queryThrow ) { set( _rAny, _queryThrow ); } - inline SharedUNOComponent( const SharedUNOComponent& _rxComponent, ::com::sun::star::uno::UnoReference_SetThrow _setThrow ) + inline SharedUNOComponent( const SharedUNOComponent& _rxComponent, css::uno::UnoReference_SetThrow _setThrow ) { set( _rxComponent, _setThrow ); } -// SharedUNOComponent& operator=( const ::com::sun::star::uno::Reference< INTERFACE >& _rxComponent ); +// SharedUNOComponent& operator=( const css::uno::Reference< INTERFACE >& _rxComponent ); // This operator is intentionally not implemented. There is no canonic ownership after this operator // would have been applied: Should the SharedUNOComponent have the ownership of the component, // or shouldn't it? Hard to guess, and probably wrong in 50 percent of all cases, anyway. So, @@ -191,26 +190,26 @@ namespace utl /** assigns a new component, and releases the old one */ - void reset( const ::com::sun::star::uno::Reference< INTERFACE >& _rxComponent, AssignmentMode _eMode = TakeOwnership ); + void reset( const css::uno::Reference< INTERFACE >& _rxComponent, AssignmentMode _eMode = TakeOwnership ); - inline bool set( const ::com::sun::star::uno::BaseReference& _rRef, ::com::sun::star::uno::UnoReference_Query _query ); + inline bool set( const css::uno::BaseReference& _rRef, css::uno::UnoReference_Query _query ); - inline void set( const ::com::sun::star::uno::XInterface* _pInterface, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ); - inline void set( const ::com::sun::star::uno::BaseReference & _rRef, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ); - inline void set( const ::com::sun::star::uno::Any& _rAny, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ); + inline void set( const css::uno::XInterface* _pInterface, css::uno::UnoReference_QueryThrow _queryThrow ); + inline void set( const css::uno::BaseReference & _rRef, css::uno::UnoReference_QueryThrow _queryThrow ); + inline void set( const css::uno::Any& _rAny, css::uno::UnoReference_QueryThrow _queryThrow ); - inline void set( const INTERFACE* _pInterface, ::com::sun::star::uno::UnoReference_SetThrow _setThrow ); - inline void set( const ::com::sun::star::uno::Reference< INTERFACE >& _rRef, ::com::sun::star::uno::UnoReference_SetThrow _setThrow ); - inline void set( const SharedUNOComponent& _rComp, ::com::sun::star::uno::UnoReference_SetThrow _setThrow ); + inline void set( const INTERFACE* _pInterface, css::uno::UnoReference_SetThrow _setThrow ); + inline void set( const css::uno::Reference< INTERFACE >& _rRef, css::uno::UnoReference_SetThrow _setThrow ); + inline void set( const SharedUNOComponent& _rComp, css::uno::UnoReference_SetThrow _setThrow ); INTERFACE* SAL_CALL operator->() const; - operator const ::com::sun::star::uno::Reference< INTERFACE >&() const + operator const css::uno::Reference< INTERFACE >&() const { return m_xTypedComponent; } - const ::com::sun::star::uno::Reference< INTERFACE >& getTyped() const + const css::uno::Reference< INTERFACE >& getTyped() const { return m_xTypedComponent; } @@ -235,7 +234,7 @@ namespace utl // assignments template < class INTERFACE, class COMPONENT > - void SharedUNOComponent< INTERFACE, COMPONENT >::reset( const ::com::sun::star::uno::Reference< INTERFACE >& _rxComponent, AssignmentMode _eMode ) + void SharedUNOComponent< INTERFACE, COMPONENT >::reset( const css::uno::Reference< INTERFACE >& _rxComponent, AssignmentMode _eMode ) { m_xComponent.reset(_eMode == TakeOwnership ? new COMPONENT( _rxComponent ) : NULL); m_xTypedComponent = _rxComponent; @@ -243,62 +242,62 @@ namespace utl // comparison operators template < class INTERFACE, class COMPONENT > - bool operator==( const ::com::sun::star::uno::Reference< INTERFACE >& _rLHS, const SharedUNOComponent< INTERFACE, COMPONENT >& _rRHS ) + bool operator==( const css::uno::Reference< INTERFACE >& _rLHS, const SharedUNOComponent< INTERFACE, COMPONENT >& _rRHS ) { return _rLHS == _rRHS.getTyped(); } template < class INTERFACE, class COMPONENT > - bool operator==( const SharedUNOComponent< INTERFACE, COMPONENT >& _rLHS, const ::com::sun::star::uno::Reference< INTERFACE >& _rRHS ) + bool operator==( const SharedUNOComponent< INTERFACE, COMPONENT >& _rLHS, const css::uno::Reference< INTERFACE >& _rRHS ) { return _rLHS.getTyped() == _rRHS; } // conversion to Any template < class INTERFACE, class COMPONENT > - inline void SAL_CALL operator <<= ( ::com::sun::star::uno::Any & rAny, const SharedUNOComponent< INTERFACE, COMPONENT >& value ) + inline void SAL_CALL operator <<= ( css::uno::Any & rAny, const SharedUNOComponent< INTERFACE, COMPONENT >& value ) { rAny <<= value.getTyped(); } template < class INTERFACE, class COMPONENT > - inline ::com::sun::star::uno::Any SAL_CALL makeAny( const SharedUNOComponent< INTERFACE, COMPONENT >& value ) + inline css::uno::Any SAL_CALL makeAny( const SharedUNOComponent< INTERFACE, COMPONENT >& value ) { return makeAny( value.getTyped() ); } template < class INTERFACE, class COMPONENT > - void SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::XInterface* _pInterface, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ) + void SharedUNOComponent< INTERFACE, COMPONENT >::set( const css::uno::XInterface* _pInterface, css::uno::UnoReference_QueryThrow _queryThrow ) { - reset( ::com::sun::star::uno::Reference< INTERFACE >( _pInterface, _queryThrow ), TakeOwnership ); + reset( css::uno::Reference< INTERFACE >( _pInterface, _queryThrow ), TakeOwnership ); } template < class INTERFACE, class COMPONENT > - void SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::BaseReference & _rRef, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ) + void SharedUNOComponent< INTERFACE, COMPONENT >::set( const css::uno::BaseReference & _rRef, css::uno::UnoReference_QueryThrow _queryThrow ) { - reset( ::com::sun::star::uno::Reference< INTERFACE >( _rRef, _queryThrow ), TakeOwnership ); + reset( css::uno::Reference< INTERFACE >( _rRef, _queryThrow ), TakeOwnership ); } template < class INTERFACE, class COMPONENT > - void SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::Any& _rAny, ::com::sun::star::uno::UnoReference_QueryThrow _queryThrow ) + void SharedUNOComponent< INTERFACE, COMPONENT >::set( const css::uno::Any& _rAny, css::uno::UnoReference_QueryThrow _queryThrow ) { - reset( ::com::sun::star::uno::Reference< INTERFACE >( _rAny, _queryThrow ), TakeOwnership ); + reset( css::uno::Reference< INTERFACE >( _rAny, _queryThrow ), TakeOwnership ); } template < class INTERFACE, class COMPONENT > - void SharedUNOComponent< INTERFACE, COMPONENT >::set( const INTERFACE* _pInterface, ::com::sun::star::uno::UnoReference_SetThrow _setThrow ) + void SharedUNOComponent< INTERFACE, COMPONENT >::set( const INTERFACE* _pInterface, css::uno::UnoReference_SetThrow _setThrow ) { - reset( ::com::sun::star::uno::Reference< INTERFACE >( _pInterface, _setThrow ), TakeOwnership ); + reset( css::uno::Reference< INTERFACE >( _pInterface, _setThrow ), TakeOwnership ); } template < class INTERFACE, class COMPONENT > - void SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::Reference< INTERFACE >& _rRef, ::com::sun::star::uno::UnoReference_SetThrow _setThrow ) + void SharedUNOComponent< INTERFACE, COMPONENT >::set( const css::uno::Reference< INTERFACE >& _rRef, css::uno::UnoReference_SetThrow _setThrow ) { - reset( ::com::sun::star::uno::Reference< INTERFACE >( _rRef, _setThrow ), TakeOwnership ); + reset( css::uno::Reference< INTERFACE >( _rRef, _setThrow ), TakeOwnership ); } template < class INTERFACE, class COMPONENT > - void SharedUNOComponent< INTERFACE, COMPONENT >::set( const SharedUNOComponent& _rComp, ::com::sun::star::uno::UnoReference_SetThrow _setThrow ) + void SharedUNOComponent< INTERFACE, COMPONENT >::set( const SharedUNOComponent& _rComp, css::uno::UnoReference_SetThrow _setThrow ) { *this = _rComp; // provoke an exception in case the component is NULL @@ -306,9 +305,9 @@ namespace utl } template < class INTERFACE, class COMPONENT > - bool SharedUNOComponent< INTERFACE, COMPONENT >::set( const ::com::sun::star::uno::BaseReference& _rRef, ::com::sun::star::uno::UnoReference_Query _query ) + bool SharedUNOComponent< INTERFACE, COMPONENT >::set( const css::uno::BaseReference& _rRef, css::uno::UnoReference_Query _query ) { - reset( ::com::sun::star::uno::Reference< INTERFACE >( _rRef, _query ) ); + reset( css::uno::Reference< INTERFACE >( _rRef, _query ) ); return is(); } diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx index 76e53df7690d..92690bdfa68b 100644 --- a/include/unotools/textsearch.hxx +++ b/include/unotools/textsearch.hxx @@ -104,14 +104,14 @@ public: class UNOTOOLS_DLLPUBLIC TextSearch { - static ::com::sun::star::uno::Reference< ::com::sun::star::util::XTextSearch > - getXTextSearch( const ::com::sun::star::util::SearchOptions& rPara ); + static css::uno::Reference< css::util::XTextSearch > + getXTextSearch( const css::util::SearchOptions& rPara ); - com::sun::star::uno::Reference < com::sun::star::util::XTextSearch > + css::uno::Reference < css::util::XTextSearch > xTextSearch; void Init( const SearchParam & rParam, - const ::com::sun::star::lang::Locale& rLocale ); + const css::lang::Locale& rLocale ); public: // rText is the string being searched for @@ -119,7 +119,7 @@ public: TextSearch( const SearchParam & rPara, LanguageType nLanguage ); TextSearch( const SearchParam & rPara, const CharClass& rCClass ); - TextSearch( const ::com::sun::star::util::SearchOptions& rPara ); + TextSearch( const css::util::SearchOptions& rPara ); ~TextSearch(); /* search in the (selected) text the search string: @@ -143,16 +143,16 @@ public: */ bool SearchForward( const OUString &rStr, sal_Int32* pStart, sal_Int32* pEnd, - ::com::sun::star::util::SearchResult* pRes = 0 ); + css::util::SearchResult* pRes = 0 ); bool SearchBackward( const OUString &rStr, sal_Int32* pStart, sal_Int32* pEnd, - ::com::sun::star::util::SearchResult* pRes = 0 ); + css::util::SearchResult* pRes = 0 ); - void SetLocale( const ::com::sun::star::util::SearchOptions& rOpt, - const ::com::sun::star::lang::Locale& rLocale ); + void SetLocale( const css::util::SearchOptions& rOpt, + const css::lang::Locale& rLocale ); /* replace back references in the replace string by the sub expressions from the search result */ - void ReplaceBackReferences( OUString& rReplaceStr, const OUString &rStr, const ::com::sun::star::util::SearchResult& rResult ); + void ReplaceBackReferences( OUString& rReplaceStr, const OUString &rStr, const css::util::SearchResult& rResult ); }; diff --git a/include/unotools/transliterationwrapper.hxx b/include/unotools/transliterationwrapper.hxx index 9f93477bac13..900ce9f8c0eb 100644 --- a/include/unotools/transliterationwrapper.hxx +++ b/include/unotools/transliterationwrapper.hxx @@ -36,8 +36,7 @@ namespace utl class UNOTOOLS_DLLPUBLIC TransliterationWrapper { - ::com::sun::star::uno::Reference< - ::com::sun::star::i18n::XExtendedTransliteration > xTrans; + css::uno::Reference< css::i18n::XExtendedTransliteration > xTrans; LanguageTag aLanguageTag; sal_uInt32 nType; mutable bool bFirstCall; @@ -49,8 +48,7 @@ class UNOTOOLS_DLLPUBLIC TransliterationWrapper void setLanguageLocaleImpl( sal_uInt16 nLang ); public: - TransliterationWrapper( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > & rxContext, + TransliterationWrapper( const css::uno::Reference< css::uno::XComponentContext > & rxContext, sal_uInt32 nType ); ~TransliterationWrapper(); @@ -83,12 +81,12 @@ public: string is returned. */ OUString transliterate( const OUString& rStr, sal_Int32 nStart, sal_Int32 nLen, - ::com::sun::star::uno::Sequence <sal_Int32>* pOffset ) const; + css::uno::Sequence <sal_Int32>* pOffset ) const; // Wrapper implementations of class Transliteration OUString transliterate( const OUString& rStr, sal_uInt16 nLanguage, sal_Int32 nStart, sal_Int32 nLen, - ::com::sun::star::uno::Sequence <sal_Int32>* pOffset ); + css::uno::Sequence <sal_Int32>* pOffset ); /** If two strings are equal per this transliteration. Returns the number of matched code points in any case, even if strings diff --git a/include/unotools/ucbhelper.hxx b/include/unotools/ucbhelper.hxx index 6234e8e58bb6..1b25c54369e6 100644 --- a/include/unotools/ucbhelper.hxx +++ b/include/unotools/ucbhelper.hxx @@ -52,7 +52,7 @@ UNOTOOLS_DLLPUBLIC bool GetTitle( UNOTOOLS_DLLPUBLIC bool Kill(OUString const & url); -UNOTOOLS_DLLPUBLIC com::sun::star::uno::Any GetProperty( +UNOTOOLS_DLLPUBLIC css::uno::Any GetProperty( OUString const & url, OUString const & property); UNOTOOLS_DLLPUBLIC bool MakeFolder( @@ -61,8 +61,8 @@ UNOTOOLS_DLLPUBLIC bool MakeFolder( /// like mkdir -p UNOTOOLS_DLLPUBLIC bool ensureFolder( - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xCtx, - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > xEnv, + css::uno::Reference< css::uno::XComponentContext > xCtx, + css::uno::Reference< css::ucb::XCommandEnvironment > xEnv, const OUString& rFolder, ucbhelper::Content & result) throw(); /// @return the value of the "Size" property of the given content, or zero if diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx index b6c3a1c42ada..dac41c3f2812 100644 --- a/include/unotools/ucbstreamhelper.hxx +++ b/include/unotools/ucbstreamhelper.hxx @@ -55,15 +55,15 @@ namespace utl static SvStream* CreateStream( const OUString& rFileName, StreamMode eOpenMode, UcbLockBytesHandler* pHandler=0 ); static SvStream* CreateStream( const OUString& rFileName, StreamMode eOpenMode, - ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >, + css::uno::Reference < css::task::XInteractionHandler >, UcbLockBytesHandler* pHandler=0 ); static SvStream* CreateStream( const OUString& rFileName, StreamMode eOpenMode, bool bFileExists, UcbLockBytesHandler* pHandler=0 ); - static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xStream ); - static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > xStream ); - static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xStream, bool bCloseStream ); - static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > xStream, bool bCloseStream ); + static SvStream* CreateStream( css::uno::Reference < css::io::XInputStream > xStream ); + static SvStream* CreateStream( css::uno::Reference < css::io::XStream > xStream ); + static SvStream* CreateStream( css::uno::Reference < css::io::XInputStream > xStream, bool bCloseStream ); + static SvStream* CreateStream( css::uno::Reference < css::io::XStream > xStream, bool bCloseStream ); }; } diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx index 0a39b70bef90..e2b57cd6261b 100644 --- a/include/unotools/viewoptions.hxx +++ b/include/unotools/viewoptions.hxx @@ -205,8 +205,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op Every view can handle its own user defined data set. @onerror In the non-product version, an assertion is made. In a product version, errors are silently ignored. *//*-*****************************************************************************************************/ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetUserData( ) const; - void SetUserData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& lData ); + css::uno::Sequence< css::beans::NamedValue > GetUserData( ) const; + void SetUserData( const css::uno::Sequence< css::beans::NamedValue >& lData ); /*-**************************************************************************************************** @short use it to set/get ONE special user data item directly @@ -215,9 +215,9 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op @onerror In the non-product version, an assertion is made. In a product version, errors are silently ignored. *//*-*****************************************************************************************************/ - ::com::sun::star::uno::Any GetUserItem( const OUString& sName ) const; - void SetUserItem( const OUString& sName , - const ::com::sun::star::uno::Any& aValue ); + css::uno::Any GetUserItem( const OUString& sName ) const; + void SetUserItem( const OUString& sName , + const css::uno::Any& aValue ); // private methods diff --git a/include/unotools/xmlaccelcfg.hxx b/include/unotools/xmlaccelcfg.hxx index 722511295647..7f5c56527afe 100644 --- a/include/unotools/xmlaccelcfg.hxx +++ b/include/unotools/xmlaccelcfg.hxx @@ -33,7 +33,7 @@ struct SvtAcceleratorConfigItem #include <list> typedef ::std::list < SvtAcceleratorConfigItem > SvtAcceleratorItemList; -class OReadAccelatorDocumentHandler : public ::com::sun::star::xml::sax::XDocumentHandler, +class OReadAccelatorDocumentHandler : public css::xml::sax::XDocumentHandler, public ::cppu::OWeakObject { public: @@ -50,37 +50,37 @@ class OReadAccelatorDocumentHandler : public ::com::sun::star::xml::sax::XDocume { OWeakObject::acquire(); } virtual void SAL_CALL release() throw() override { OWeakObject::release(); } - 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; // XDocumentHandler virtual void SAL_CALL startDocument() - throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() - throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL startElement( const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > &xAttribs ) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > &xAttribs ) + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endElement(const OUString& aName) throw - ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + ( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL characters(const OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setDocumentLocator( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > &xLocator) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::xml::sax::XLocator > &xLocator) + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; private: OUString getErrorLineString(); int m_nElementDepth; - bool m_bAcceleratorMode; - bool m_bItemCloseExpected; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; + bool m_bAcceleratorMode; + bool m_bItemCloseExpected; + css::uno::Reference< css::xml::sax::XLocator > m_xLocator; SvtAcceleratorItemList& m_aReadAcceleratorList; }; diff --git a/include/vbahelper/vbaapplicationbase.hxx b/include/vbahelper/vbaapplicationbase.hxx index bc3683821b2c..7f46069f4b5e 100644 --- a/include/vbahelper/vbaapplicationbase.hxx +++ b/include/vbahelper/vbaapplicationbase.hxx @@ -49,7 +49,7 @@ public: virtual void SAL_CALL setInteractive( sal_Bool bInteractive ) throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL OnKey( const OUString& Key, const ::com::sun::star::uno::Any& Procedure ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL OnKey( const OUString& Key, const css::uno::Any& Procedure ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getVersion() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getVBE() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/vbahelper/vbareturntypes.hxx b/include/vbahelper/vbareturntypes.hxx index 2c5b3871606d..151ca5547d8a 100644 --- a/include/vbahelper/vbareturntypes.hxx +++ b/include/vbahelper/vbareturntypes.hxx @@ -39,8 +39,8 @@ namespace ooo T1 mnValue; public: DefaultReturnHelper( const T1& nValue ) : mnValue( nValue ) {} - virtual void SAL_CALL setValue( T1 nValue ) throw (::com::sun::star::uno::RuntimeException) { mnValue = nValue; } - virtual T1 SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException) { return mnValue; } + virtual void SAL_CALL setValue( T1 nValue ) throw (css::uno::RuntimeException) { mnValue = nValue; } + virtual T1 SAL_CALL getValue() throw (css::uno::RuntimeException) { return mnValue; } OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return OUString("Value"); } }; diff --git a/include/vcl/FilterConfigItem.hxx b/include/vcl/FilterConfigItem.hxx index 567377f3d98c..f12eec5b9016 100644 --- a/include/vcl/FilterConfigItem.hxx +++ b/include/vcl/FilterConfigItem.hxx @@ -34,32 +34,32 @@ class VCL_DLLPUBLIC FilterConfigItem { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xUpdatableView; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropSet; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aFilterData; + css::uno::Reference< css::uno::XInterface > xUpdatableView; + css::uno::Reference< css::beans::XPropertySet > xPropSet; + css::uno::Sequence< css::beans::PropertyValue > aFilterData; bool bModified; - static bool ImplGetPropertyValue( ::com::sun::star::uno::Any& rAny, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet, + static bool ImplGetPropertyValue( css::uno::Any& rAny, + const css::uno::Reference< css::beans::XPropertySet >& rXPropSet, const OUString& rPropName, bool bTestPropertyAvailability ); void ImpInitTree( const OUString& rTree ); - static ::com::sun::star::beans::PropertyValue* GetPropertyValue( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rPropSeq, + static css::beans::PropertyValue* GetPropertyValue( + css::uno::Sequence< css::beans::PropertyValue >& rPropSeq, const OUString& rName ); static bool WritePropertyValue( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rPropSeq, - const ::com::sun::star::beans::PropertyValue& rPropValue ); + css::uno::Sequence< css::beans::PropertyValue >& rPropSeq, + const css::beans::PropertyValue& rPropValue ); public: FilterConfigItem( const OUString& rSubTree ); - FilterConfigItem( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData ); - FilterConfigItem( const OUString& rSubTree, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData ); + FilterConfigItem( css::uno::Sequence< css::beans::PropertyValue >* pFilterData ); + FilterConfigItem( const OUString& rSubTree, css::uno::Sequence< css::beans::PropertyValue >* pFilterData ); /// Writes config in destructor ~FilterConfigItem(); /// Writes config and sets unmodified state again. @@ -79,10 +79,10 @@ public: void WriteBool( const OUString& rKey, bool bValue ); void WriteInt32( const OUString& rKey, sal_Int32 nValue ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetFilterData() const { return aFilterData;} + css::uno::Sequence< css::beans::PropertyValue > GetFilterData() const { return aFilterData;} // GetStatusIndicator is returning the "StatusIndicator" property of the FilterData sequence - ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > GetStatusIndicator() const; + css::uno::Reference< css::task::XStatusIndicator > GetStatusIndicator() const; }; #endif // INCLUDED_VCL_FILTERCONFIGITEM_HXX diff --git a/include/vcl/canvastools.hxx b/include/vcl/canvastools.hxx index 96e8ee08301d..f3af8bf340e3 100644 --- a/include/vcl/canvastools.hxx +++ b/include/vcl/canvastools.hxx @@ -79,15 +79,13 @@ namespace vcl /** Create an XBitmap from VCL BitmapEx */ - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > - VCL_DLLPUBLIC xBitmapFromBitmapEx( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, - const ::BitmapEx& inputBitmap ); + css::uno::Reference< css::rendering::XBitmap > + VCL_DLLPUBLIC xBitmapFromBitmapEx( const css::uno::Reference< css::rendering::XGraphicDevice >& xGraphicDevice, + const ::BitmapEx& inputBitmap ); /** Create a BitmapEx from an XBitmap */ - ::BitmapEx VCL_DLLPUBLIC bitmapExFromXBitmap( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XIntegerReadOnlyBitmap >& xInputBitmap ); + ::BitmapEx VCL_DLLPUBLIC bitmapExFromXBitmap( const css::uno::Reference< css::rendering::XIntegerReadOnlyBitmap >& xInputBitmap ); // Color conversions (vcl/tools Color <-> canvas standard color space) @@ -97,7 +95,7 @@ namespace vcl Note that this method assumes a color space equivalent to the one returned from createStandardColorSpace() */ - ::com::sun::star::uno::Sequence< double > + css::uno::Sequence< double > VCL_DLLPUBLIC colorToStdColorSpaceSequence( const Color& rColor ); /** Convert color to device color sequence @@ -108,10 +106,9 @@ namespace vcl @param xColorSpace Color space to convert into */ - ::com::sun::star::uno::Sequence< double > - VCL_DLLPUBLIC colorToDoubleSequence( const Color& rColor, - const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XColorSpace >& xColorSpace ); + css::uno::Sequence< double > + VCL_DLLPUBLIC colorToDoubleSequence( const Color& rColor, + const css::uno::Reference< css::rendering::XColorSpace >& xColorSpace ); /** Convert from standard device color space to VCL/Tools color @@ -119,7 +116,7 @@ namespace vcl the one returned from createStandardColorSpace() */ Color VCL_DLLPUBLIC stdColorSpaceSequenceToColor( - const ::com::sun::star::uno::Sequence< double >& rColor ); + const css::uno::Sequence< double >& rColor ); /** Convert color to device color sequence @@ -129,9 +126,8 @@ namespace vcl @param xColorSpace Color space to convert from */ - Color VCL_DLLPUBLIC doubleSequenceToColor( const ::com::sun::star::uno::Sequence< double >& rColor, - const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XColorSpace >& xColorSpace ); + Color VCL_DLLPUBLIC doubleSequenceToColor( const css::uno::Sequence< double >& rColor, + const css::uno::Reference< css::rendering::XColorSpace >& xColorSpace ); /// Convert [0,1] double value to [0,255] int inline sal_Int8 toByteColor( double val ) @@ -147,23 +143,22 @@ namespace vcl } /// Create a standard color space suitable for VCL RGB color - ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XColorSpace> VCL_DLLPUBLIC createStandardColorSpace(); + css::uno::Reference< css::rendering::XColorSpace> VCL_DLLPUBLIC createStandardColorSpace(); // Geometry conversions (vcl/tools <-> x) // geometry::Real - ::com::sun::star::geometry::RealSize2D VCL_DLLPUBLIC size2DFromSize( const Size& ); + css::geometry::RealSize2D VCL_DLLPUBLIC size2DFromSize( const Size& ); - Size VCL_DLLPUBLIC sizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D& ); + Size VCL_DLLPUBLIC sizeFromRealSize2D( const css::geometry::RealSize2D& ); // geometry::Integer - ::com::sun::star::geometry::IntegerSize2D VCL_DLLPUBLIC integerSize2DFromSize( const Size& ); + css::geometry::IntegerSize2D VCL_DLLPUBLIC integerSize2DFromSize( const Size& ); - Size VCL_DLLPUBLIC sizeFromIntegerSize2D( const ::com::sun::star::geometry::IntegerSize2D& ); - Point VCL_DLLPUBLIC pointFromIntegerPoint2D( const ::com::sun::star::geometry::IntegerPoint2D& ); - Rectangle VCL_DLLPUBLIC rectangleFromIntegerRectangle2D( const ::com::sun::star::geometry::IntegerRectangle2D& ); + Size VCL_DLLPUBLIC sizeFromIntegerSize2D( const css::geometry::IntegerSize2D& ); + Point VCL_DLLPUBLIC pointFromIntegerPoint2D( const css::geometry::IntegerPoint2D& ); + Rectangle VCL_DLLPUBLIC rectangleFromIntegerRectangle2D( const css::geometry::IntegerRectangle2D& ); // basegfx::B2D Size VCL_DLLPUBLIC sizeFromB2DSize( const ::basegfx::B2DVector& ); diff --git a/include/vcl/configsettings.hxx b/include/vcl/configsettings.hxx index c91354ae72b9..265d287787f5 100644 --- a/include/vcl/configsettings.hxx +++ b/include/vcl/configsettings.hxx @@ -39,7 +39,7 @@ namespace vcl private: std::unordered_map< OUString, SmallOUStrMap, OUStringHash > m_aSettings; - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) override; + virtual void Notify( const css::uno::Sequence< OUString >& rPropertyNames ) override; void getValues(); SettingsConfigItem(); diff --git a/include/vcl/dndhelp.hxx b/include/vcl/dndhelp.hxx index 4e5036652a41..2043102de169 100644 --- a/include/vcl/dndhelp.hxx +++ b/include/vcl/dndhelp.hxx @@ -55,35 +55,35 @@ class VCL_DLLPUBLIC DragAndDropClient public: virtual ~DragAndDropClient(); - // ::com::sun::star::datatransfer::dnd::XDragGestureListener - virtual void dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) - throw (::com::sun::star::uno::RuntimeException, + // css::datatransfer::dnd::XDragGestureListener + virtual void dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) + throw (css::uno::RuntimeException, std::exception); - // ::com::sun::star::datatransfer::dnd::XDragSourceListener - virtual void dragDropEnd(const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) - throw (::com::sun::star::uno::RuntimeException, + // css::datatransfer::dnd::XDragSourceListener + virtual void dragDropEnd(const css::datatransfer::dnd::DragSourceDropEvent& dsde ) + throw (css::uno::RuntimeException, std::exception); - // ::com::sun::star::datatransfer::dnd::XDropTargetListener - virtual void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) - throw (::com::sun::star::uno::RuntimeException, + // css::datatransfer::dnd::XDropTargetListener + virtual void drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) + throw (css::uno::RuntimeException, std::exception); - virtual void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) - throw (::com::sun::star::uno::RuntimeException, + virtual void dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) + throw (css::uno::RuntimeException, std::exception); - virtual void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) - throw (::com::sun::star::uno::RuntimeException, + virtual void dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) + throw (css::uno::RuntimeException, std::exception); - virtual void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) - throw (::com::sun::star::uno::RuntimeException, + virtual void dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) + throw (css::uno::RuntimeException, std::exception); }; class VCL_DLLPUBLIC DragAndDropWrapper : - public ::com::sun::star::datatransfer::dnd::XDragGestureListener, - public ::com::sun::star::datatransfer::dnd::XDragSourceListener, - public ::com::sun::star::datatransfer::dnd::XDropTargetListener, + public css::datatransfer::dnd::XDragGestureListener, + public css::datatransfer::dnd::XDragSourceListener, + public css::datatransfer::dnd::XDropTargetListener, public ::cppu::OWeakObject { private: @@ -93,30 +93,30 @@ public: DragAndDropWrapper( DragAndDropClient* pClient ); virtual ~DragAndDropWrapper(); - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } - void SAL_CALL release() throw() override { OWeakObject::release(); } - - // ::com::sun::star::lang::XEventListener - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::datatransfer::dnd::XDragGestureListener - void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::datatransfer::dnd::XDragSourceListener - void SAL_CALL dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::datatransfer::dnd::XDropTargetListener - void SAL_CALL drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } + void SAL_CALL release() throw() override { OWeakObject::release(); } + + // css::lang::XEventListener + void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + + // css::datatransfer::dnd::XDragGestureListener + void SAL_CALL dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) throw (css::uno::RuntimeException, std::exception) override; + + // css::datatransfer::dnd::XDragSourceListener + void SAL_CALL dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL dragEnter( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL dragExit( const css::datatransfer::dnd::DragSourceEvent& dse ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL dragOver( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DragSourceDragEvent& dsde ) throw (css::uno::RuntimeException, std::exception) override; + + // css::datatransfer::dnd::XDropTargetListener + void SAL_CALL drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (css::uno::RuntimeException, std::exception) override; }; }} // namespace vcl::unohelper diff --git a/include/vcl/embeddedfontshelper.hxx b/include/vcl/embeddedfontshelper.hxx index b02431e81d14..cae59da32ab7 100644 --- a/include/vcl/embeddedfontshelper.hxx +++ b/include/vcl/embeddedfontshelper.hxx @@ -46,7 +46,7 @@ public: @param key key to xor the data with, from the start until the key's length (not repeated) @param eot whether the data is compressed in Embedded OpenType format */ - static bool addEmbeddedFont( com::sun::star::uno::Reference< com::sun::star::io::XInputStream > stream, + static bool addEmbeddedFont( css::uno::Reference< css::io::XInputStream > stream, const OUString& fontName, const char* extra, std::vector< unsigned char > key = std::vector< unsigned char >(), bool eot = false); diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index 13ded2d0064d..153ad9503717 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -132,7 +132,7 @@ public: const Point& GetPosPixel() const { return maPos; } MouseEventModifiers GetMode() const { return mnMode; } /** inits this vcl KeyEvent with all settings from the given awt event **/ - MouseEvent( const ::com::sun::star::awt::MouseEvent& rEvent ); + MouseEvent( const css::awt::MouseEvent& rEvent ); sal_uInt16 GetClicks() const { return mnClicks; } diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index 58ec9040db6b..45a7bf6b7b2e 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -76,8 +76,8 @@ public: virtual void Reformat(); virtual void ReformatAll(); - virtual void SetLocale( const ::com::sun::star::lang::Locale& rLocale ); - const ::com::sun::star::lang::Locale& GetLocale() const; + virtual void SetLocale( const css::lang::Locale& rLocale ); + const css::lang::Locale& GetLocale() const; const LanguageTag& GetLanguageTag() const; const AllSettings& GetFieldSettings() const; @@ -333,7 +333,7 @@ public: virtual void Reformat() override; virtual void ReformatAll() override; - virtual void SetLocale( const ::com::sun::star::lang::Locale& rLocale ) override; + virtual void SetLocale( const css::lang::Locale& rLocale ) override; void SetExtDateFormat( ExtDateFieldFormat eFormat ); diff --git a/include/vcl/fltcall.hxx b/include/vcl/fltcall.hxx index 48f7ac973534..e5d6ca66e412 100644 --- a/include/vcl/fltcall.hxx +++ b/include/vcl/fltcall.hxx @@ -39,7 +39,7 @@ struct FltCallDialogParameter OUString aFilterExt; // In and Out PropertySequence for all filter dialogs - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aFilterData; + css::uno::Sequence< css::beans::PropertyValue > aFilterData; FltCallDialogParameter( vcl::Window* pW, ResMgr* pRsMgr, FieldUnit eFiUni ) : pWindow ( pW ), diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index c7d2ceba7b95..ebd59dc8c142 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -96,7 +96,7 @@ public: Graphic( const SvgDataPtr& rSvgDataPtr ); Graphic( const Animation& rAnimation ); Graphic( const GDIMetaFile& rMtf ); - Graphic( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic ); + Graphic( const css::uno::Reference< css::graphic::XGraphic >& rxGraphic ); virtual ~Graphic(); Graphic& operator=( const Graphic& rGraphic ); @@ -126,7 +126,7 @@ public: Animation GetAnimation() const; const GDIMetaFile& GetGDIMetaFile() const; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > GetXGraphic() const; + css::uno::Reference< css::graphic::XGraphic > GetXGraphic() const; Size GetPrefSize() const; void SetPrefSize( const Size& rPrefSize ); diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 05dfed3608e7..fe4e0e0edefe 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -310,7 +310,7 @@ public: SvStream& rStream, sal_uInt16 nFormat, sal_uInt16 * pDeterminedFormat, GraphicFilterImportFlags nImportFlags, - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData, + css::uno::Sequence< css::beans::PropertyValue >* pFilterData, WMF_EXTERNALHEADER *pExtHeader = NULL ); void Abort() { bAbort = true; } diff --git a/include/vcl/i18nhelp.hxx b/include/vcl/i18nhelp.hxx index 8ca39f05f4d5..7e22bd9571b3 100644 --- a/include/vcl/i18nhelp.hxx +++ b/include/vcl/i18nhelp.hxx @@ -50,12 +50,12 @@ class VCL_DLLPUBLIC I18nHelper private: ::osl::Mutex maMutex; LanguageTag maLanguageTag; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; LocaleDataWrapper* mpLocaleDataWrapper; utl::TransliterationWrapper* mpTransliterationWrapper; - bool mbTransliterateIgnoreCase; + bool mbTransliterateIgnoreCase; SAL_DLLPRIVATE void ImplDestroyWrappers(); @@ -66,7 +66,7 @@ protected: public: - I18nHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const LanguageTag& rLanguageTag ); + I18nHelper( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const LanguageTag& rLanguageTag ); ~I18nHelper(); sal_Int32 CompareString( const OUString& rStr1, const OUString& rStr2 ) const; diff --git a/include/vcl/keycodes.hxx b/include/vcl/keycodes.hxx index bfb1be48c4e5..58cbf966b922 100644 --- a/include/vcl/keycodes.hxx +++ b/include/vcl/keycodes.hxx @@ -27,130 +27,130 @@ #include <o3tl/typed_flags_set.hxx> // Key-Gruppen -#define KEYGROUP_NUM ((sal_uInt16)::com::sun::star::awt::KeyGroup::NUM) -#define KEYGROUP_ALPHA ((sal_uInt16)::com::sun::star::awt::KeyGroup::ALPHA) -#define KEYGROUP_FKEYS ((sal_uInt16)::com::sun::star::awt::KeyGroup::FKEYS) -#define KEYGROUP_CURSOR ((sal_uInt16)::com::sun::star::awt::KeyGroup::CURSOR) -#define KEYGROUP_MISC ((sal_uInt16)::com::sun::star::awt::KeyGroup::MISC) -#define KEYGROUP_TYPE ((sal_uInt16)::com::sun::star::awt::KeyGroup::TYPE) +#define KEYGROUP_NUM ((sal_uInt16)css::awt::KeyGroup::NUM) +#define KEYGROUP_ALPHA ((sal_uInt16)css::awt::KeyGroup::ALPHA) +#define KEYGROUP_FKEYS ((sal_uInt16)css::awt::KeyGroup::FKEYS) +#define KEYGROUP_CURSOR ((sal_uInt16)css::awt::KeyGroup::CURSOR) +#define KEYGROUP_MISC ((sal_uInt16)css::awt::KeyGroup::MISC) +#define KEYGROUP_TYPE ((sal_uInt16)css::awt::KeyGroup::TYPE) // Key-Codes -#define KEY_0 ((sal_uInt16)::com::sun::star::awt::Key::NUM0) -#define KEY_1 ((sal_uInt16)::com::sun::star::awt::Key::NUM1) -#define KEY_2 ((sal_uInt16)::com::sun::star::awt::Key::NUM2) -#define KEY_3 ((sal_uInt16)::com::sun::star::awt::Key::NUM3) -#define KEY_4 ((sal_uInt16)::com::sun::star::awt::Key::NUM4) -#define KEY_5 ((sal_uInt16)::com::sun::star::awt::Key::NUM5) -#define KEY_6 ((sal_uInt16)::com::sun::star::awt::Key::NUM6) -#define KEY_7 ((sal_uInt16)::com::sun::star::awt::Key::NUM7) -#define KEY_8 ((sal_uInt16)::com::sun::star::awt::Key::NUM8) -#define KEY_9 ((sal_uInt16)::com::sun::star::awt::Key::NUM9) +#define KEY_0 ((sal_uInt16)css::awt::Key::NUM0) +#define KEY_1 ((sal_uInt16)css::awt::Key::NUM1) +#define KEY_2 ((sal_uInt16)css::awt::Key::NUM2) +#define KEY_3 ((sal_uInt16)css::awt::Key::NUM3) +#define KEY_4 ((sal_uInt16)css::awt::Key::NUM4) +#define KEY_5 ((sal_uInt16)css::awt::Key::NUM5) +#define KEY_6 ((sal_uInt16)css::awt::Key::NUM6) +#define KEY_7 ((sal_uInt16)css::awt::Key::NUM7) +#define KEY_8 ((sal_uInt16)css::awt::Key::NUM8) +#define KEY_9 ((sal_uInt16)css::awt::Key::NUM9) -#define KEY_A ((sal_uInt16)::com::sun::star::awt::Key::A) -#define KEY_B ((sal_uInt16)::com::sun::star::awt::Key::B) -#define KEY_C ((sal_uInt16)::com::sun::star::awt::Key::C) -#define KEY_D ((sal_uInt16)::com::sun::star::awt::Key::D) -#define KEY_E ((sal_uInt16)::com::sun::star::awt::Key::E) -#define KEY_F ((sal_uInt16)::com::sun::star::awt::Key::F) -#define KEY_G ((sal_uInt16)::com::sun::star::awt::Key::G) -#define KEY_H ((sal_uInt16)::com::sun::star::awt::Key::H) -#define KEY_I ((sal_uInt16)::com::sun::star::awt::Key::I) -#define KEY_J ((sal_uInt16)::com::sun::star::awt::Key::J) -#define KEY_K ((sal_uInt16)::com::sun::star::awt::Key::K) -#define KEY_L ((sal_uInt16)::com::sun::star::awt::Key::L) -#define KEY_M ((sal_uInt16)::com::sun::star::awt::Key::M) -#define KEY_N ((sal_uInt16)::com::sun::star::awt::Key::N) -#define KEY_O ((sal_uInt16)::com::sun::star::awt::Key::O) -#define KEY_P ((sal_uInt16)::com::sun::star::awt::Key::P) -#define KEY_Q ((sal_uInt16)::com::sun::star::awt::Key::Q) -#define KEY_R ((sal_uInt16)::com::sun::star::awt::Key::R) -#define KEY_S ((sal_uInt16)::com::sun::star::awt::Key::S) -#define KEY_T ((sal_uInt16)::com::sun::star::awt::Key::T) -#define KEY_U ((sal_uInt16)::com::sun::star::awt::Key::U) -#define KEY_V ((sal_uInt16)::com::sun::star::awt::Key::V) -#define KEY_W ((sal_uInt16)::com::sun::star::awt::Key::W) -#define KEY_X ((sal_uInt16)::com::sun::star::awt::Key::X) -#define KEY_Y ((sal_uInt16)::com::sun::star::awt::Key::Y) -#define KEY_Z ((sal_uInt16)::com::sun::star::awt::Key::Z) +#define KEY_A ((sal_uInt16)css::awt::Key::A) +#define KEY_B ((sal_uInt16)css::awt::Key::B) +#define KEY_C ((sal_uInt16)css::awt::Key::C) +#define KEY_D ((sal_uInt16)css::awt::Key::D) +#define KEY_E ((sal_uInt16)css::awt::Key::E) +#define KEY_F ((sal_uInt16)css::awt::Key::F) +#define KEY_G ((sal_uInt16)css::awt::Key::G) +#define KEY_H ((sal_uInt16)css::awt::Key::H) +#define KEY_I ((sal_uInt16)css::awt::Key::I) +#define KEY_J ((sal_uInt16)css::awt::Key::J) +#define KEY_K ((sal_uInt16)css::awt::Key::K) +#define KEY_L ((sal_uInt16)css::awt::Key::L) +#define KEY_M ((sal_uInt16)css::awt::Key::M) +#define KEY_N ((sal_uInt16)css::awt::Key::N) +#define KEY_O ((sal_uInt16)css::awt::Key::O) +#define KEY_P ((sal_uInt16)css::awt::Key::P) +#define KEY_Q ((sal_uInt16)css::awt::Key::Q) +#define KEY_R ((sal_uInt16)css::awt::Key::R) +#define KEY_S ((sal_uInt16)css::awt::Key::S) +#define KEY_T ((sal_uInt16)css::awt::Key::T) +#define KEY_U ((sal_uInt16)css::awt::Key::U) +#define KEY_V ((sal_uInt16)css::awt::Key::V) +#define KEY_W ((sal_uInt16)css::awt::Key::W) +#define KEY_X ((sal_uInt16)css::awt::Key::X) +#define KEY_Y ((sal_uInt16)css::awt::Key::Y) +#define KEY_Z ((sal_uInt16)css::awt::Key::Z) -#define KEY_F1 ((sal_uInt16)::com::sun::star::awt::Key::F1) -#define KEY_F2 ((sal_uInt16)::com::sun::star::awt::Key::F2) -#define KEY_F3 ((sal_uInt16)::com::sun::star::awt::Key::F3) -#define KEY_F4 ((sal_uInt16)::com::sun::star::awt::Key::F4) -#define KEY_F5 ((sal_uInt16)::com::sun::star::awt::Key::F5) -#define KEY_F6 ((sal_uInt16)::com::sun::star::awt::Key::F6) -#define KEY_F7 ((sal_uInt16)::com::sun::star::awt::Key::F7) -#define KEY_F8 ((sal_uInt16)::com::sun::star::awt::Key::F8) -#define KEY_F9 ((sal_uInt16)::com::sun::star::awt::Key::F9) -#define KEY_F10 ((sal_uInt16)::com::sun::star::awt::Key::F10) -#define KEY_F11 ((sal_uInt16)::com::sun::star::awt::Key::F11) -#define KEY_F12 ((sal_uInt16)::com::sun::star::awt::Key::F12) -#define KEY_F13 ((sal_uInt16)::com::sun::star::awt::Key::F13) -#define KEY_F14 ((sal_uInt16)::com::sun::star::awt::Key::F14) -#define KEY_F15 ((sal_uInt16)::com::sun::star::awt::Key::F15) -#define KEY_F16 ((sal_uInt16)::com::sun::star::awt::Key::F16) -#define KEY_F17 ((sal_uInt16)::com::sun::star::awt::Key::F17) -#define KEY_F18 ((sal_uInt16)::com::sun::star::awt::Key::F18) -#define KEY_F19 ((sal_uInt16)::com::sun::star::awt::Key::F19) -#define KEY_F20 ((sal_uInt16)::com::sun::star::awt::Key::F20) -#define KEY_F21 ((sal_uInt16)::com::sun::star::awt::Key::F21) -#define KEY_F22 ((sal_uInt16)::com::sun::star::awt::Key::F22) -#define KEY_F23 ((sal_uInt16)::com::sun::star::awt::Key::F23) -#define KEY_F24 ((sal_uInt16)::com::sun::star::awt::Key::F24) -#define KEY_F25 ((sal_uInt16)::com::sun::star::awt::Key::F25) -#define KEY_F26 ((sal_uInt16)::com::sun::star::awt::Key::F26) +#define KEY_F1 ((sal_uInt16)css::awt::Key::F1) +#define KEY_F2 ((sal_uInt16)css::awt::Key::F2) +#define KEY_F3 ((sal_uInt16)css::awt::Key::F3) +#define KEY_F4 ((sal_uInt16)css::awt::Key::F4) +#define KEY_F5 ((sal_uInt16)css::awt::Key::F5) +#define KEY_F6 ((sal_uInt16)css::awt::Key::F6) +#define KEY_F7 ((sal_uInt16)css::awt::Key::F7) +#define KEY_F8 ((sal_uInt16)css::awt::Key::F8) +#define KEY_F9 ((sal_uInt16)css::awt::Key::F9) +#define KEY_F10 ((sal_uInt16)css::awt::Key::F10) +#define KEY_F11 ((sal_uInt16)css::awt::Key::F11) +#define KEY_F12 ((sal_uInt16)css::awt::Key::F12) +#define KEY_F13 ((sal_uInt16)css::awt::Key::F13) +#define KEY_F14 ((sal_uInt16)css::awt::Key::F14) +#define KEY_F15 ((sal_uInt16)css::awt::Key::F15) +#define KEY_F16 ((sal_uInt16)css::awt::Key::F16) +#define KEY_F17 ((sal_uInt16)css::awt::Key::F17) +#define KEY_F18 ((sal_uInt16)css::awt::Key::F18) +#define KEY_F19 ((sal_uInt16)css::awt::Key::F19) +#define KEY_F20 ((sal_uInt16)css::awt::Key::F20) +#define KEY_F21 ((sal_uInt16)css::awt::Key::F21) +#define KEY_F22 ((sal_uInt16)css::awt::Key::F22) +#define KEY_F23 ((sal_uInt16)css::awt::Key::F23) +#define KEY_F24 ((sal_uInt16)css::awt::Key::F24) +#define KEY_F25 ((sal_uInt16)css::awt::Key::F25) +#define KEY_F26 ((sal_uInt16)css::awt::Key::F26) -#define KEY_DOWN ((sal_uInt16)::com::sun::star::awt::Key::DOWN) -#define KEY_UP ((sal_uInt16)::com::sun::star::awt::Key::UP) -#define KEY_LEFT ((sal_uInt16)::com::sun::star::awt::Key::LEFT) -#define KEY_RIGHT ((sal_uInt16)::com::sun::star::awt::Key::RIGHT) -#define KEY_HOME ((sal_uInt16)::com::sun::star::awt::Key::HOME) -#define KEY_END ((sal_uInt16)::com::sun::star::awt::Key::END) -#define KEY_PAGEUP ((sal_uInt16)::com::sun::star::awt::Key::PAGEUP) -#define KEY_PAGEDOWN ((sal_uInt16)::com::sun::star::awt::Key::PAGEDOWN) +#define KEY_DOWN ((sal_uInt16)css::awt::Key::DOWN) +#define KEY_UP ((sal_uInt16)css::awt::Key::UP) +#define KEY_LEFT ((sal_uInt16)css::awt::Key::LEFT) +#define KEY_RIGHT ((sal_uInt16)css::awt::Key::RIGHT) +#define KEY_HOME ((sal_uInt16)css::awt::Key::HOME) +#define KEY_END ((sal_uInt16)css::awt::Key::END) +#define KEY_PAGEUP ((sal_uInt16)css::awt::Key::PAGEUP) +#define KEY_PAGEDOWN ((sal_uInt16)css::awt::Key::PAGEDOWN) -#define KEY_RETURN ((sal_uInt16)::com::sun::star::awt::Key::RETURN) -#define KEY_ESCAPE ((sal_uInt16)::com::sun::star::awt::Key::ESCAPE) -#define KEY_TAB ((sal_uInt16)::com::sun::star::awt::Key::TAB) -#define KEY_BACKSPACE ((sal_uInt16)::com::sun::star::awt::Key::BACKSPACE) -#define KEY_SPACE ((sal_uInt16)::com::sun::star::awt::Key::SPACE) -#define KEY_INSERT ((sal_uInt16)::com::sun::star::awt::Key::INSERT) -#define KEY_DELETE ((sal_uInt16)::com::sun::star::awt::Key::DELETE) +#define KEY_RETURN ((sal_uInt16)css::awt::Key::RETURN) +#define KEY_ESCAPE ((sal_uInt16)css::awt::Key::ESCAPE) +#define KEY_TAB ((sal_uInt16)css::awt::Key::TAB) +#define KEY_BACKSPACE ((sal_uInt16)css::awt::Key::BACKSPACE) +#define KEY_SPACE ((sal_uInt16)css::awt::Key::SPACE) +#define KEY_INSERT ((sal_uInt16)css::awt::Key::INSERT) +#define KEY_DELETE ((sal_uInt16)css::awt::Key::DELETE) -#define KEY_ADD ((sal_uInt16)::com::sun::star::awt::Key::ADD) -#define KEY_SUBTRACT ((sal_uInt16)::com::sun::star::awt::Key::SUBTRACT) -#define KEY_MULTIPLY ((sal_uInt16)::com::sun::star::awt::Key::MULTIPLY) -#define KEY_DIVIDE ((sal_uInt16)::com::sun::star::awt::Key::DIVIDE) -#define KEY_POINT ((sal_uInt16)::com::sun::star::awt::Key::POINT) -#define KEY_COMMA ((sal_uInt16)::com::sun::star::awt::Key::COMMA) -#define KEY_LESS ((sal_uInt16)::com::sun::star::awt::Key::LESS) -#define KEY_GREATER ((sal_uInt16)::com::sun::star::awt::Key::GREATER) -#define KEY_EQUAL ((sal_uInt16)::com::sun::star::awt::Key::EQUAL) +#define KEY_ADD ((sal_uInt16)css::awt::Key::ADD) +#define KEY_SUBTRACT ((sal_uInt16)css::awt::Key::SUBTRACT) +#define KEY_MULTIPLY ((sal_uInt16)css::awt::Key::MULTIPLY) +#define KEY_DIVIDE ((sal_uInt16)css::awt::Key::DIVIDE) +#define KEY_POINT ((sal_uInt16)css::awt::Key::POINT) +#define KEY_COMMA ((sal_uInt16)css::awt::Key::COMMA) +#define KEY_LESS ((sal_uInt16)css::awt::Key::LESS) +#define KEY_GREATER ((sal_uInt16)css::awt::Key::GREATER) +#define KEY_EQUAL ((sal_uInt16)css::awt::Key::EQUAL) -#define KEY_OPEN ((sal_uInt16)::com::sun::star::awt::Key::OPEN) -#define KEY_CUT ((sal_uInt16)::com::sun::star::awt::Key::CUT) -#define KEY_COPY ((sal_uInt16)::com::sun::star::awt::Key::COPY) -#define KEY_PASTE ((sal_uInt16)::com::sun::star::awt::Key::PASTE) -#define KEY_UNDO ((sal_uInt16)::com::sun::star::awt::Key::UNDO) -#define KEY_REPEAT ((sal_uInt16)::com::sun::star::awt::Key::REPEAT) -#define KEY_FIND ((sal_uInt16)::com::sun::star::awt::Key::FIND) -#define KEY_PROPERTIES ((sal_uInt16)::com::sun::star::awt::Key::PROPERTIES) -#define KEY_FRONT ((sal_uInt16)::com::sun::star::awt::Key::FRONT) -#define KEY_CONTEXTMENU ((sal_uInt16)::com::sun::star::awt::Key::CONTEXTMENU) -#define KEY_MENU ((sal_uInt16)::com::sun::star::awt::Key::MENU) -#define KEY_HELP ((sal_uInt16)::com::sun::star::awt::Key::HELP) -#define KEY_HANGUL_HANJA ((sal_uInt16)::com::sun::star::awt::Key::HANGUL_HANJA) -#define KEY_DECIMAL ((sal_uInt16)::com::sun::star::awt::Key::DECIMAL) -#define KEY_TILDE ((sal_uInt16)::com::sun::star::awt::Key::TILDE) -#define KEY_QUOTELEFT ((sal_uInt16)::com::sun::star::awt::Key::QUOTELEFT) -#define KEY_BRACKETLEFT ((sal_uInt16)::com::sun::star::awt::Key::BRACKETLEFT) -#define KEY_BRACKETRIGHT ((sal_uInt16)::com::sun::star::awt::Key::BRACKETRIGHT) -#define KEY_SEMICOLON ((sal_uInt16)::com::sun::star::awt::Key::SEMICOLON) -#define KEY_QUOTERIGHT ((sal_uInt16)::com::sun::star::awt::Key::QUOTERIGHT) +#define KEY_OPEN ((sal_uInt16)css::awt::Key::OPEN) +#define KEY_CUT ((sal_uInt16)css::awt::Key::CUT) +#define KEY_COPY ((sal_uInt16)css::awt::Key::COPY) +#define KEY_PASTE ((sal_uInt16)css::awt::Key::PASTE) +#define KEY_UNDO ((sal_uInt16)css::awt::Key::UNDO) +#define KEY_REPEAT ((sal_uInt16)css::awt::Key::REPEAT) +#define KEY_FIND ((sal_uInt16)css::awt::Key::FIND) +#define KEY_PROPERTIES ((sal_uInt16)css::awt::Key::PROPERTIES) +#define KEY_FRONT ((sal_uInt16)css::awt::Key::FRONT) +#define KEY_CONTEXTMENU ((sal_uInt16)css::awt::Key::CONTEXTMENU) +#define KEY_MENU ((sal_uInt16)css::awt::Key::MENU) +#define KEY_HELP ((sal_uInt16)css::awt::Key::HELP) +#define KEY_HANGUL_HANJA ((sal_uInt16)css::awt::Key::HANGUL_HANJA) +#define KEY_DECIMAL ((sal_uInt16)css::awt::Key::DECIMAL) +#define KEY_TILDE ((sal_uInt16)css::awt::Key::TILDE) +#define KEY_QUOTELEFT ((sal_uInt16)css::awt::Key::QUOTELEFT) +#define KEY_BRACKETLEFT ((sal_uInt16)css::awt::Key::BRACKETLEFT) +#define KEY_BRACKETRIGHT ((sal_uInt16)css::awt::Key::BRACKETRIGHT) +#define KEY_SEMICOLON ((sal_uInt16)css::awt::Key::SEMICOLON) +#define KEY_QUOTERIGHT ((sal_uInt16)css::awt::Key::QUOTERIGHT) -#define KEY_CAPSLOCK ((sal_uInt16)::com::sun::star::awt::Key::CAPSLOCK) -#define KEY_NUMLOCK ((sal_uInt16)::com::sun::star::awt::Key::NUMLOCK) -#define KEY_SCROLLLOCK ((sal_uInt16)::com::sun::star::awt::Key::SCROLLLOCK) +#define KEY_CAPSLOCK ((sal_uInt16)css::awt::Key::CAPSLOCK) +#define KEY_NUMLOCK ((sal_uInt16)css::awt::Key::NUMLOCK) +#define KEY_SCROLLLOCK ((sal_uInt16)css::awt::Key::SCROLLLOCK) // extended Modifier-Keys (only used for modkey events) #define MODKEY_LSHIFT 0x0001 diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx index b5dfe23ca569..bd1cc7515655 100644 --- a/include/vcl/lazydelete.hxx +++ b/include/vcl/lazydelete.hxx @@ -271,24 +271,24 @@ namespace vcl template <typename I> class DeleteUnoReferenceOnDeinit : public vcl::DeleteOnDeinitBase { - ::com::sun::star::uno::Reference<I> m_xI; + css::uno::Reference<I> m_xI; virtual void doCleanup() override { set(NULL); } public: - DeleteUnoReferenceOnDeinit(const ::com::sun::star::uno::Reference<I>& r_xI ) : m_xI( r_xI ) { + DeleteUnoReferenceOnDeinit(const css::uno::Reference<I>& r_xI ) : m_xI( r_xI ) { addDeinitContainer( this ); } virtual ~DeleteUnoReferenceOnDeinit() {} - ::com::sun::star::uno::Reference<I> get() { return m_xI; } + css::uno::Reference<I> get() { return m_xI; } - void set (const ::com::sun::star::uno::Reference<I>& r_xNew ) + void set (const css::uno::Reference<I>& r_xNew ) { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> xComponent (m_xI, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::lang::XComponent> xComponent (m_xI, css::uno::UNO_QUERY); m_xI = r_xNew; if (xComponent.is()) try { xComponent->dispose(); } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { } } diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx index 9f7438b72a05..e73b747cbdce 100644 --- a/include/vcl/lineinfo.hxx +++ b/include/vcl/lineinfo.hxx @@ -45,7 +45,7 @@ struct ImplLineInfo long mnDistance; basegfx::B2DLineJoin meLineJoin; - com::sun::star::drawing::LineCap meLineCap; + css::drawing::LineCap meLineCap; ImplLineInfo(); ImplLineInfo( const ImplLineInfo& rImplLineInfo ); @@ -102,8 +102,8 @@ public: void SetLineJoin(basegfx::B2DLineJoin eLineJoin); basegfx::B2DLineJoin GetLineJoin() const { return mpImplLineInfo->meLineJoin; } - void SetLineCap(com::sun::star::drawing::LineCap eLineCap); - com::sun::star::drawing::LineCap GetLineCap() const { return mpImplLineInfo->meLineCap; } + void SetLineCap(css::drawing::LineCap eLineCap); + css::drawing::LineCap GetLineCap() const { return mpImplLineInfo->meLineCap; } bool IsDefault() const; diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx index 27fbbdd281c0..be86fa9e3603 100644 --- a/include/vcl/mnemonic.hxx +++ b/include/vcl/mnemonic.hxx @@ -60,7 +60,7 @@ class VCL_DLLPUBLIC MnemonicGenerator private: // 0 == Mnemonic; >0 == count of characters sal_uInt8 maMnemonics[MAX_MNEMONICS]; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification > mxCharClass; + css::uno::Reference< css::i18n::XCharacterClassification > mxCharClass; protected: SAL_DLLPRIVATE sal_uInt16 ImplGetMnemonicIndex( sal_Unicode c ); @@ -71,7 +71,7 @@ public: void RegisterMnemonic( const OUString& rKey ); OUString CreateMnemonic( const OUString& rKey ); - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification > GetCharClass(); + css::uno::Reference< css::i18n::XCharacterClassification > GetCharClass(); // returns a string where all '~'-characters and CJK mnemonics of the form (~A) are completely removed static OUString EraseAllMnemonicChars( const OUString& rStr ); diff --git a/include/vcl/oldprintadaptor.hxx b/include/vcl/oldprintadaptor.hxx index 927deb3a8ee7..8f04f195a45f 100644 --- a/include/vcl/oldprintadaptor.hxx +++ b/include/vcl/oldprintadaptor.hxx @@ -36,7 +36,7 @@ namespace vcl void EndPage(); virtual int getPageCount() const override; - virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getPageParameters( int i_nPage ) const override; + virtual css::uno::Sequence< css::beans::PropertyValue > getPageParameters( int i_nPage ) const override; virtual void printPage( int i_nPage ) const override; }; } diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx index 528f5fc1c403..268e6198273a 100644 --- a/include/vcl/pdfextoutdevdata.hxx +++ b/include/vcl/pdfextoutdevdata.hxx @@ -73,7 +73,7 @@ struct GlobalSyncData; class VCL_DLLPUBLIC PDFExtOutDevData : public ExtOutDevData { - const OutputDevice& mrOutDev; + const OutputDevice& mrOutDev; bool mbTaggedPDF; bool mbExportNotes; @@ -85,9 +85,9 @@ class VCL_DLLPUBLIC PDFExtOutDevData : public ExtOutDevData bool mbExportBookmarks; bool mbExportHiddenSlides; bool mbExportNDests; //i56629 - sal_Int32 mnFormsFormat; - sal_Int32 mnPage; - com::sun::star::lang::Locale maDocLocale; + sal_Int32 mnFormsFormat; + sal_Int32 mnPage; + css::lang::Locale maDocLocale; PageSyncData* mpPageSyncData; GlobalSyncData* mpGlobalSyncData; @@ -143,8 +143,8 @@ public: bool GetIsReduceImageResolution() const { return mbReduceImageResolution;} void SetIsReduceImageResolution( const bool bReduceImageResolution ); - const com::sun::star::lang::Locale& GetDocumentLocale() const { return maDocLocale;} - void SetDocumentLocale( const com::sun::star::lang::Locale& rLoc ); + const css::lang::Locale& GetDocumentLocale() const { return maDocLocale;} + void SetDocumentLocale( const css::lang::Locale& rLoc ); std::vector< PDFExtOutDevBookmarkEntry >& GetBookmarks() { return maBookmarks;} diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index 592c4239e7de..f6ed9a322b46 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -73,7 +73,7 @@ class VCL_DLLPUBLIC PDFOutputStream { public: virtual ~PDFOutputStream(); - virtual void write( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xStream ) = 0; + virtual void write( const css::uno::Reference< css::io::XOutputStream >& xStream ) = 0; }; class VCL_DLLPUBLIC PDFWriter @@ -624,16 +624,16 @@ The following structure describes the permissions used in PDF security PDFWriter::PDFDocInfo DocumentInfo; bool SignPDF; - OUString SignLocation; - OUString SignPassword; - OUString SignReason; - OUString SignContact; - com::sun::star::lang::Locale DocumentLocale; // defines the document default language + OUString SignLocation; + OUString SignPassword; + OUString SignReason; + OUString SignContact; + css::lang::Locale DocumentLocale; // defines the document default language sal_uInt32 DPIx, DPIy; // how to handle MapMode( MAP_PIXEL ) // 0 here specifies a default handling PDFWriter::ColorMode ColorMode; - com::sun::star::uno::Reference< com::sun::star::security::XCertificate> SignCertificate; - OUString SignTSA; + css::uno::Reference< css::security::XCertificate> SignCertificate; + OUString SignTSA; PDFWriterContext() : RelFsys( false ), //i56629, i49415?, i64585? @@ -668,7 +668,7 @@ The following structure describes the permissions used in PDF security {} }; - PDFWriter( const PDFWriterContext& rContext, const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >& ); + PDFWriter( const PDFWriterContext& rContext, const css::uno::Reference< css::beans::XMaterialHolder >& ); ~PDFWriter(); /** Returns an OutputDevice for formatting @@ -714,7 +714,7 @@ The following structure describes the permissions used in PDF security /* sets the document locale originally passed with the context to a new value * only affects the output if used before calling Emit. */ - void SetDocumentLocale( const com::sun::star::lang::Locale& rDocLocale ); + void SetDocumentLocale( const css::lang::Locale& rDocLocale ); /* finishes the file */ bool Emit(); @@ -726,7 +726,7 @@ The following structure describes the permissions used in PDF security */ std::set< ErrorCode > GetErrors(); - static com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > + static css::uno::Reference< css::beans::XMaterialHolder > InitEncryption( const OUString& i_rOwnerPassword, const OUString& i_rUserPassword, bool b128Bit diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx index 92edf09eed2e..43dec319ff80 100644 --- a/include/vcl/ppdparser.hxx +++ b/include/vcl/ppdparser.hxx @@ -232,10 +232,10 @@ public: // helper function OUString translateKey( const OUString& i_rKey, - const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const; + const css::lang::Locale& i_rLocale = css::lang::Locale() ) const; OUString translateOption( const OUString& i_rKey, const OUString& i_rOption, - const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const; + const css::lang::Locale& i_rLocale = css::lang::Locale() ) const; }; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 199d298a020b..6246335b2aff 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -513,9 +513,9 @@ public: virtual css::uno::Sequence< css::beans::PropertyValue > getPageParameters( int i_nPage ) const = 0; virtual void printPage(int i_nPage) const = 0; /// App must override this virtual void jobStarted(); // will be called after a possible dialog has been shown and the real printjob starts - virtual void jobFinished( com::sun::star::view::PrintableState ); + virtual void jobFinished( css::view::PrintableState ); - com::sun::star::view::PrintableState getJobState() const; + css::view::PrintableState getJobState() const; void abortJob(); @@ -544,7 +544,7 @@ public: VCL_PLUGIN_PUBLIC bool getPrinterModified() const; SAL_DLLPRIVATE void pushPropertiesToPrinter(); SAL_DLLPRIVATE void resetPaperToLastConfigured(); - VCL_PLUGIN_PUBLIC void setJobState( com::sun::star::view::PrintableState ); + VCL_PLUGIN_PUBLIC void setJobState( css::view::PrintableState ); SAL_DLLPRIVATE bool setupPrinter( vcl::Window* i_pDlgParent ); SAL_DLLPRIVATE int getPageCountProtected() const; diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index 8d8e7f7de8b5..dd1752b673fc 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -104,8 +104,8 @@ private: TEIMEInfos* mpIMEInfos; - ::com::sun::star::lang::Locale maLocale; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > mxBreakIterator; + css::lang::Locale maLocale; + css::uno::Reference< css::i18n::XBreakIterator > mxBreakIterator; css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > mxISC; Rectangle maInvalidRect; @@ -162,7 +162,7 @@ protected: // gets not exported. First and second parameter swapped to have a different signatur. SAL_DLLPRIVATE TextPaM ImpInsertText( sal_Unicode c, const TextSelection& rSel, bool bOverwrite = false, bool bIsUserInput = false ); // some other new functions needed that must not be exported to remain compatible - SAL_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XExtendedInputSequenceChecker > GetInputSequenceChecker(); + SAL_DLLPRIVATE css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > GetInputSequenceChecker(); SAL_DLLPRIVATE bool IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelection& rCurSel ) const; // broadcast or adjust selections @@ -308,9 +308,9 @@ public: void Draw( OutputDevice* pDev, const Point& rPos ); - void SetLocale( const ::com::sun::star::lang::Locale& rLocale ); - ::com::sun::star::lang::Locale GetLocale(); - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > GetBreakIterator(); + void SetLocale( const css::lang::Locale& rLocale ); + css::lang::Locale GetLocale(); + css::uno::Reference< css::i18n::XBreakIterator > GetBreakIterator(); static bool DoesKeyChangeText( const KeyEvent& rKeyEvent ); static bool IsSimpleCharInput( const KeyEvent& rKeyEvent ); diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index 65146d1dc410..4fa335cca908 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -84,12 +84,12 @@ protected: VirtualDevice* GetVirtualDevice(); // DragAndDropClient - virtual void dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void dragDropEnd( const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void dragEnter( const ::com::sun::star::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void dragExit( const ::com::sun::star::datatransfer::dnd::DropTargetEvent& dte ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void dragGestureRecognized( const css::datatransfer::dnd::DragGestureEvent& dge ) throw (css::uno::RuntimeException, std::exception) override; + virtual void dragDropEnd( const css::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (css::uno::RuntimeException, std::exception) override; + virtual void drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw (css::uno::RuntimeException, std::exception) override; + virtual void dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw (css::uno::RuntimeException, std::exception) override; + virtual void dragExit( const css::datatransfer::dnd::DropTargetEvent& dte ) throw (css::uno::RuntimeException, std::exception) override; + virtual void dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (css::uno::RuntimeException, std::exception) override; using DragAndDropClient::dragEnter; using DragAndDropClient::dragExit; diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx index 88a4c7823d08..2ea99d4462e1 100644 --- a/include/vcl/threadex.hxx +++ b/include/vcl/threadex.hxx @@ -84,14 +84,14 @@ private: try { m_result.reset( m_func() ); } - catch (::com::sun::star::uno::Exception &) { + catch (css::uno::Exception &) { // only UNO exceptions can be dispatched: m_exc = ::cppu::getCaughtException(); } return 0; } - ::com::sun::star::uno::Any m_exc; + css::uno::Any m_exc; FuncT const m_func; // using boost::optional here omits the need that ResultT is default // constructable: @@ -120,14 +120,14 @@ private: try { m_func(); } - catch (::com::sun::star::uno::Exception &) { + catch (css::uno::Exception &) { // only UNO exceptions can be dispatched: m_exc = ::cppu::getCaughtException(); } return 0; } - ::com::sun::star::uno::Any m_exc; + css::uno::Any m_exc; FuncT const m_func; }; diff --git a/include/vcl/unohelp.hxx b/include/vcl/unohelp.hxx index c1496928c8f4..c7ef4419c7ea 100644 --- a/include/vcl/unohelp.hxx +++ b/include/vcl/unohelp.hxx @@ -50,9 +50,9 @@ namespace vcl { namespace unohelper { -VCL_DLLPUBLIC ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > CreateBreakIterator(); -VCL_DLLPUBLIC ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCharacterClassification> CreateCharacterClassification(); -VCL_DLLPUBLIC void NotifyAccessibleStateEventGlobally( const ::com::sun::star::accessibility::AccessibleEventObject& rEventObject ); +VCL_DLLPUBLIC css::uno::Reference < css::i18n::XBreakIterator > CreateBreakIterator(); +VCL_DLLPUBLIC css::uno::Reference < css::i18n::XCharacterClassification> CreateCharacterClassification(); +VCL_DLLPUBLIC void NotifyAccessibleStateEventGlobally( const css::accessibility::AccessibleEventObject& rEventObject ); }} // namespace vcl::unohelper #endif // INCLUDED_VCL_UNOHELP_HXX diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx index 0fd4d2574f55..abd5f62ec2bf 100644 --- a/include/vcl/unohelp2.hxx +++ b/include/vcl/unohelp2.hxx @@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace datatransfer { namesp namespace vcl { namespace unohelper { class VCL_DLLPUBLIC TextDataObject : - public ::com::sun::star::datatransfer::XTransferable, + public css::datatransfer::XTransferable, public ::cppu::OWeakObject { private: @@ -45,20 +45,20 @@ namespace vcl { namespace unohelper { OUString& GetString() { return maText; } - // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } - void SAL_CALL release() throw() override { OWeakObject::release(); } + // css::uno::XInterface + css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } + void SAL_CALL release() throw() override { OWeakObject::release(); } - // ::com::sun::star::datatransfer::XTransferable - ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; - ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::datatransfer::XTransferable + css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) throw(css::uno::RuntimeException, std::exception) override; /// copies a given string to a given clipboard static void CopyStringTo( const OUString& rContent, - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard + const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& rxClipboard ); }; diff --git a/include/vcl/unowrap.hxx b/include/vcl/unowrap.hxx index 84035e90eadc..066c700d518f 100644 --- a/include/vcl/unowrap.hxx +++ b/include/vcl/unowrap.hxx @@ -60,20 +60,20 @@ public: virtual void Destroy() = 0; // Toolkit - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > GetVCLToolkit() = 0; + virtual css::uno::Reference< css::awt::XToolkit > GetVCLToolkit() = 0; // Graphics - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > CreateGraphics( OutputDevice* pOutDev ) = 0; + virtual css::uno::Reference< css::awt::XGraphics > CreateGraphics( OutputDevice* pOutDev ) = 0; virtual void ReleaseAllGraphics( OutputDevice* pOutDev ) = 0; // Window - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( vcl::Window* pWindow, bool bCreate ) = 0; - virtual void SetWindowInterface( vcl::Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ) = 0; + virtual css::uno::Reference< css::awt::XWindowPeer> GetWindowInterface( vcl::Window* pWindow, bool bCreate ) = 0; + virtual void SetWindowInterface( vcl::Window* pWindow, css::uno::Reference< css::awt::XWindowPeer > xIFace ) = 0; virtual void WindowDestroyed( vcl::Window* pWindow ) = 0; // Accessibility - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible( Menu* pMenu, bool bIsMenuBar ) = 0; protected: diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx index e564100f9a48..1b65eb6764aa 100644 --- a/include/vcl/vclevent.hxx +++ b/include/vcl/vclevent.hxx @@ -241,12 +241,12 @@ public: class VCL_DLLPUBLIC VclAccessibleEvent: public VclSimpleEvent { public: - VclAccessibleEvent( sal_uLong n, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible ); + VclAccessibleEvent( sal_uLong n, const css::uno::Reference< css::accessibility::XAccessible >& rxAccessible ); virtual ~VclAccessibleEvent(); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible() const { return mxAccessible;} + css::uno::Reference< css::accessibility::XAccessible > GetAccessible() const { return mxAccessible;} private: - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxAccessible; + css::uno::Reference< css::accessibility::XAccessible > mxAccessible; }; #endif // INCLUDED_VCL_VCLEVENT_HXX diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 0123c3b28e6c..7a7d0a273d2d 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -785,7 +785,7 @@ private: SAL_DLLPRIVATE void ImplPaintToDevice( ::OutputDevice* pTargetOutDev, const Point& rPos ); - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > + SAL_DLLPRIVATE css::uno::Reference< css::rendering::XCanvas > ImplGetCanvas( const Size& rFullscreenSize, bool bFullscreen, bool bSpriteCanvas ) const; public: @@ -1256,26 +1256,26 @@ public: const Point& rDestOff, VirtualDevice& rSaveDevice ); const SystemEnvData* GetSystemData() const; - ::com::sun::star::uno::Any GetSystemDataAny() const; + css::uno::Any GetSystemDataAny() const; // API to set/query the component interfaces - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > + virtual css::uno::Reference< css::awt::XWindowPeer > GetComponentInterface( bool bCreate = true ); - void SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ); + void SetComponentInterface( css::uno::Reference< css::awt::XWindowPeer > xIFace ); /** @name Accessibility */ ///@{ public: - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible(); - void SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ); + void SetAccessible( css::uno::Reference< css::accessibility::XAccessible > ); vcl::Window* GetAccessibleParentWindow() const; sal_uInt16 GetAccessibleChildWindowCount(); @@ -1361,10 +1361,10 @@ private: Size get_ungrouped_preferred_size() const; public: /// request XCanvas render interface for this window - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > + css::uno::Reference< css::rendering::XCanvas > GetCanvas() const; /// request XSpriteCanvas render interface for this window - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > + css::uno::Reference< css::rendering::XSpriteCanvas > GetSpriteCanvas() const; /* records all DrawText operations within the passed rectangle; @@ -1374,22 +1374,22 @@ public: // set and retrieve for Toolkit VCLXWindow* GetWindowPeer() const; - void SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xPeer, VCLXWindow* pVCLXWindow ); + void SetWindowPeer( css::uno::Reference< css::awt::XWindowPeer > xPeer, VCLXWindow* pVCLXWindow ); // remember if it was generated by Toolkit bool IsCreatedWithToolkit() const; void SetCreatedWithToolkit( bool b ); // Drag and Drop interfaces - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > GetDropTarget(); - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > GetDragSource(); - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > GetDragGestureRecognizer(); + css::uno::Reference< css::datatransfer::dnd::XDropTarget > GetDropTarget(); + css::uno::Reference< css::datatransfer::dnd::XDragSource > GetDragSource(); + css::uno::Reference< css::datatransfer::dnd::XDragGestureRecognizer > GetDragGestureRecognizer(); // Clipboard/Selection interfaces - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetClipboard(); + css::uno::Reference< css::datatransfer::clipboard::XClipboard > GetClipboard(); /// Sets a custom clipboard for the window's frame, instead of creating it on-demand using css::datatransfer::clipboard::SystemClipboard. void SetClipboard(css::uno::Reference<css::datatransfer::clipboard::XClipboard> xClipboard); - ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetPrimarySelection(); + css::uno::Reference< css::datatransfer::clipboard::XClipboard > GetPrimarySelection(); /* * Widgets call this to inform their owner container that the widget wants diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx index 0165d32c0d13..c3fed0ce47e8 100644 --- a/include/vcl/wrkwin.hxx +++ b/include/vcl/wrkwin.hxx @@ -59,7 +59,7 @@ private: mbFullScreenMode:1; SAL_DLLPRIVATE void ImplInitWorkWindowData(); - SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, const css::uno::Any& aSystemWorkWindowToken ); private: WorkWindow( const WorkWindow& rWin ) = delete; @@ -72,7 +72,7 @@ protected: public: explicit WorkWindow( vcl::Window* pParent, WinBits nStyle = WB_STDWORK ); - explicit WorkWindow( vcl::Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK ); + explicit WorkWindow( vcl::Window* pParent, const css::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK ); explicit WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version virtual ~WorkWindow(); virtual void dispose() override; diff --git a/include/vcl/xtextedt.hxx b/include/vcl/xtextedt.hxx index d54a6496d7e9..f7fd91e06cd2 100644 --- a/include/vcl/xtextedt.hxx +++ b/include/vcl/xtextedt.hxx @@ -40,7 +40,7 @@ public: virtual ~ExtTextEngine(); TextSelection MatchGroup( const TextPaM& rCursor ) const; - bool Search( TextSelection& rSel, const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bForward = true ); + bool Search( TextSelection& rSel, const css::util::SearchOptions& rSearchOptions, bool bForward = true ); }; class VCL_DLLPUBLIC ExtTextView : public TextView @@ -49,13 +49,13 @@ protected: bool ImpIndentBlock( bool bRight ); public: - ExtTextView( ExtTextEngine* pEng, vcl::Window* pWindow ); - virtual ~ExtTextView(); + ExtTextView( ExtTextEngine* pEng, vcl::Window* pWindow ); + virtual ~ExtTextView(); bool MatchGroup(); - bool Search( const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bForward ); - sal_uInt16 Replace( const ::com::sun::star::util::SearchOptions& rSearchOptions, bool bAll, bool bForward ); + bool Search( const css::util::SearchOptions& rSearchOptions, bool bForward ); + sal_uInt16 Replace( const css::util::SearchOptions& rSearchOptions, bool bAll, bool bForward ); bool IndentBlock(); bool UnindentBlock(); diff --git a/include/xmloff/DashStyle.hxx b/include/xmloff/DashStyle.hxx index eafe70e16399..060d81932a48 100644 --- a/include/xmloff/DashStyle.hxx +++ b/include/xmloff/DashStyle.hxx @@ -42,9 +42,8 @@ public: ~XMLDashStyleImport(); void importXML( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList, - ::com::sun::star::uno::Any& rValue, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + css::uno::Any& rValue, OUString& rStrName ); }; @@ -58,7 +57,7 @@ public: ~XMLDashStyleExport(); bool exportXML( const OUString& rStrName, - const ::com::sun::star::uno::Any& rValue ); + const css::uno::Any& rValue ); }; #endif // INCLUDED_XMLOFF_DASHSTYLE_HXX diff --git a/include/xmloff/DocumentSettingsContext.hxx b/include/xmloff/DocumentSettingsContext.hxx index ec0f6544ce98..968acc1564b8 100644 --- a/include/xmloff/DocumentSettingsContext.hxx +++ b/include/xmloff/DocumentSettingsContext.hxx @@ -36,14 +36,12 @@ class XMLOFF_DLLPUBLIC XMLDocumentSettingsContext : public SvXMLImportContext public: XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList); virtual ~XMLDocumentSettingsContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; private: diff --git a/include/xmloff/EnumPropertyHdl.hxx b/include/xmloff/EnumPropertyHdl.hxx index 935d317400e3..521b8fa0a87e 100644 --- a/include/xmloff/EnumPropertyHdl.hxx +++ b/include/xmloff/EnumPropertyHdl.hxx @@ -31,14 +31,14 @@ class XMLOFF_DLLPUBLIC XMLEnumPropertyHdl : public XMLPropertyHandler { private: const SvXMLEnumMapEntry* mpEnumMap; - const ::com::sun::star::uno::Type & mrType; + const css::uno::Type & mrType; public: - XMLEnumPropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ) : mpEnumMap( pEnumMap ), mrType( rType ) {} + XMLEnumPropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const css::uno::Type & rType ) : mpEnumMap( pEnumMap ), mrType( rType ) {} virtual ~XMLEnumPropertyHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_ENUMPROPERTYHDL_HXX diff --git a/include/xmloff/GradientStyle.hxx b/include/xmloff/GradientStyle.hxx index ef3eaf87b894..84fdb9be105c 100644 --- a/include/xmloff/GradientStyle.hxx +++ b/include/xmloff/GradientStyle.hxx @@ -43,9 +43,8 @@ public: ~XMLGradientStyleImport(); bool importXML( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList, - ::com::sun::star::uno::Any& rValue, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + css::uno::Any& rValue, OUString& rStrName ); }; @@ -60,7 +59,7 @@ public: bool exportXML( const OUString& rStrName, - const ::com::sun::star::uno::Any& rValue ); + const css::uno::Any& rValue ); }; #endif // INCLUDED_XMLOFF_GRADIENTSTYLE_HXX diff --git a/include/xmloff/HatchStyle.hxx b/include/xmloff/HatchStyle.hxx index 44721e0fe126..e5e9e403d551 100644 --- a/include/xmloff/HatchStyle.hxx +++ b/include/xmloff/HatchStyle.hxx @@ -43,9 +43,8 @@ public: ~XMLHatchStyleImport(); bool importXML( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - ::com::sun::star::uno::Any& rValue, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + css::uno::Any& rValue, OUString& rStrName ); }; @@ -57,7 +56,7 @@ public: XMLHatchStyleExport( SvXMLExport& rExport ); ~XMLHatchStyleExport(); - bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue ); + bool exportXML( const OUString& rStrName, const css::uno::Any& rValue ); }; #endif // _XMLOFF_HATCHELEMENT_HXX diff --git a/include/xmloff/ImageStyle.hxx b/include/xmloff/ImageStyle.hxx index d3fa5c2d2142..6bf64718e7c3 100644 --- a/include/xmloff/ImageStyle.hxx +++ b/include/xmloff/ImageStyle.hxx @@ -37,15 +37,15 @@ public: XMLImageStyle(); ~XMLImageStyle(); - void exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue, SvXMLExport& rExport ); - bool importXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::com::sun::star::uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport ); + void exportXML( const OUString& rStrName, const css::uno::Any& rValue, SvXMLExport& rExport ); + bool importXML( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, css::uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport ); private: - SAL_DLLPRIVATE void ImpExportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue, + SAL_DLLPRIVATE void ImpExportXML( const OUString& rStrName, const css::uno::Any& rValue, SvXMLExport& rExport ); - SAL_DLLPRIVATE bool ImpImportXML( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, - ::com::sun::star::uno::Any& rValue, OUString& rStrName, + SAL_DLLPRIVATE bool ImpImportXML( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + css::uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport ); }; diff --git a/include/xmloff/MarkerStyle.hxx b/include/xmloff/MarkerStyle.hxx index 7ec72d1cbc1f..3779202ce658 100644 --- a/include/xmloff/MarkerStyle.hxx +++ b/include/xmloff/MarkerStyle.hxx @@ -43,9 +43,8 @@ public: ~XMLMarkerStyleImport(); bool importXML( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList, - ::com::sun::star::uno::Any& rValue, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + css::uno::Any& rValue, OUString& rStrName ); }; @@ -59,7 +58,7 @@ public: void exportXML( const OUString& rStrName, - const ::com::sun::star::uno::Any& rValue ); + const css::uno::Any& rValue ); }; #endif // INCLUDED_XMLOFF_MARKERSTYLE_HXX diff --git a/include/xmloff/NamedBoolPropertyHdl.hxx b/include/xmloff/NamedBoolPropertyHdl.hxx index 7bd8a35f2a3c..2a9471bdd5ee 100644 --- a/include/xmloff/NamedBoolPropertyHdl.hxx +++ b/include/xmloff/NamedBoolPropertyHdl.hxx @@ -47,8 +47,8 @@ public: virtual ~XMLNamedBoolPropertyHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_NAMEDBOOLPROPERTYHDL_HXX diff --git a/include/xmloff/ProgressBarHelper.hxx b/include/xmloff/ProgressBarHelper.hxx index 6de978c8cb56..7eeed4ebc7c1 100644 --- a/include/xmloff/ProgressBarHelper.hxx +++ b/include/xmloff/ProgressBarHelper.hxx @@ -32,19 +32,19 @@ class XMLOFF_DLLPUBLIC ProgressBarHelper { - ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator > xStatusIndicator; - sal_Int32 nRange; - sal_Int32 nReference; - sal_Int32 nValue; - bool bStrict; + css::uno::Reference < css::task::XStatusIndicator > xStatusIndicator; + sal_Int32 nRange; + sal_Int32 nReference; + sal_Int32 nValue; + bool bStrict; // #96469#; if the value goes over the Range the progressbar starts again - bool bRepeat; + bool bRepeat; #ifdef DBG_UTIL - bool bFailure; + bool bFailure; #endif public: - ProgressBarHelper(const ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator>& xStatusIndicator, + ProgressBarHelper(const css::uno::Reference < css::task::XStatusIndicator>& xStatusIndicator, const bool bStrict); ~ProgressBarHelper(); diff --git a/include/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx index e96b500b30a6..79f4d1dc05af 100644 --- a/include/xmloff/SchXMLImportHelper.hxx +++ b/include/xmloff/SchXMLImportHelper.hxx @@ -64,7 +64,7 @@ class SvXMLImport; class SchXMLImportHelper : public salhelper::SimpleReferenceObject { private: - com::sun::star::uno::Reference< com::sun::star::chart::XChartDocument > mxChartDoc; + css::uno::Reference< css::chart::XChartDocument > mxChartDoc; SvXMLStylesContext* mpAutoStyles; SvXMLTokenMap* mpChartDocElemTokenMap; @@ -93,10 +93,8 @@ public: SvXMLImportContext* CreateChartContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< - com::sun::star::frame::XModel >& rChartModel, - const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XAttributeList >& rAttrList ); + const css::uno::Reference< css::frame::XModel >& rChartModel, + const css::uno::Reference< css::xml::sax::XAttributeList >& rAttrList ); /** set the auto-style context that will be used to retrieve auto-styles used inside the following <chart:chart> element to parse @@ -104,8 +102,7 @@ public: void SetAutoStylesContext( SvXMLStylesContext* pAutoStyles ) { mpAutoStyles = pAutoStyles; } SvXMLStylesContext* GetAutoStylesContext() const { return mpAutoStyles; } - const com::sun::star::uno::Reference< - com::sun::star::chart::XChartDocument >& GetChartDocument() + const css::uno::Reference< css::chart::XChartDocument >& GetChartDocument() { return mxChartDoc; } const SvXMLTokenMap& GetDocElemTokenMap(); @@ -135,19 +132,15 @@ public: following new chart types are again be added at the end (by passing false). */ - static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries > GetNewDataSeries( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xDoc, + static css::uno::Reference< css::chart2::XDataSeries > GetNewDataSeries( + const css::uno::Reference< css::chart2::XChartDocument > & xDoc, sal_Int32 nCoordinateSystemIndex, const OUString & rChartTypeName, bool bPushLastChartType = false ); static void DeleteDataSeries( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries, - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartDocument > & xDoc ); + const css::uno::Reference< css::chart2::XDataSeries >& xSeries, + const css::uno::Reference< css::chart2::XChartDocument > & xDoc ); }; #endif // INCLUDED_XMLOFF_SCHXMLIMPORTHELPER_HXX diff --git a/include/xmloff/SchXMLSeriesHelper.hxx b/include/xmloff/SchXMLSeriesHelper.hxx index e8e56393c54a..567ad0c4c2b6 100644 --- a/include/xmloff/SchXMLSeriesHelper.hxx +++ b/include/xmloff/SchXMLSeriesHelper.hxx @@ -35,36 +35,25 @@ class XMLOFF_DLLPUBLIC SchXMLSeriesHelper { public: - static ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > > + static ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > getDataSeriesFromDiagram( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram ); - static ::std::map< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >, sal_Int32 > + const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); + static ::std::map< css::uno::Reference< css::chart2::XDataSeries >, sal_Int32 > getDataSeriesIndexMapFromDiagram( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram ); + const css::uno::Reference< css::chart2::XDiagram > & xDiagram ); static bool isCandleStickSeries( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); + const css::uno::Reference< css::chart2::XDataSeries >& xSeries + , const css::uno::Reference< css::frame::XModel >& xChartModel ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > createOldAPISeriesPropertySet( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); + static css::uno::Reference< css::beans::XPropertySet > createOldAPISeriesPropertySet( + const css::uno::Reference< css::chart2::XDataSeries >& xSeries + , const css::uno::Reference< css::frame::XModel >& xChartModel ); - static ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > createOldAPIDataPointPropertySet( - const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDataSeries >& xSeries + static css::uno::Reference< css::beans::XPropertySet > createOldAPIDataPointPropertySet( + const css::uno::Reference< css::chart2::XDataSeries >& xSeries , sal_Int32 nPointIndex - , const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel >& xChartModel ); + , const css::uno::Reference< css::frame::XModel >& xChartModel ); }; // INCLUDED_XMLOFF_SCHXMLSERIESHELPER_HXX diff --git a/include/xmloff/SettingsExportHelper.hxx b/include/xmloff/SettingsExportHelper.hxx index 97cacb5dbba6..1c454d7ac91b 100644 --- a/include/xmloff/SettingsExportHelper.hxx +++ b/include/xmloff/SettingsExportHelper.hxx @@ -44,7 +44,7 @@ class XMLOFF_DLLPUBLIC XMLSettingsExportHelper { ::xmloff::XMLSettingsExportContext& m_rContext; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringSubstitution > mxStringSubsitution; + css::uno::Reference< css::util::XStringSubstitution > mxStringSubsitution; const OUString msPrinterIndependentLayout; const OUString msColorTableURL; @@ -54,9 +54,9 @@ class XMLOFF_DLLPUBLIC XMLSettingsExportHelper const OUString msGradientTableURL; const OUString msBitmapTableURL; - void ManipulateSetting( com::sun::star::uno::Any& rAny, const OUString& rName ) const; + void ManipulateSetting( css::uno::Any& rAny, const OUString& rName ) const; - void CallTypeFunction(const com::sun::star::uno::Any& rAny, + void CallTypeFunction(const css::uno::Any& rAny, const OUString& rName) const; void exportBool(const bool bValue, const OUString& rName) const; @@ -66,28 +66,28 @@ class XMLOFF_DLLPUBLIC XMLSettingsExportHelper void exportLong(const sal_Int64 nValue, const OUString& rName) const; void exportDouble(const double fValue, const OUString& rName) const; void exportString(const OUString& sValue, const OUString& rName) const; - void exportDateTime(const com::sun::star::util::DateTime& aValue, const OUString& rName) const; + void exportDateTime(const css::util::DateTime& aValue, const OUString& rName) const; void exportSequencePropertyValue( - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps, + const css::uno::Sequence<css::beans::PropertyValue>& aProps, const OUString& rName) const; void exportbase64Binary( - const com::sun::star::uno::Sequence<sal_Int8>& aProps, + const css::uno::Sequence<sal_Int8>& aProps, const OUString& rName) const; - void exportMapEntry(const com::sun::star::uno::Any& rAny, + void exportMapEntry(const css::uno::Any& rAny, const OUString& rName, const bool bNameAccess) const; void exportNameAccess( - const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& rNamed, + const css::uno::Reference<css::container::XNameAccess>& rNamed, const OUString& rName) const; void exportIndexAccess( - const com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess>& rIndexed, + const css::uno::Reference<css::container::XIndexAccess>& rIndexed, const OUString& rName) const; void exportSymbolDescriptors( - const com::sun::star::uno::Sequence < com::sun::star::formula::SymbolDescriptor > &rProps, + const css::uno::Sequence < css::formula::SymbolDescriptor > &rProps, const OUString& rName) const; void exportForbiddenCharacters( - const com::sun::star::uno::Any &rAny, + const css::uno::Any &rAny, const OUString& rName) const; public: @@ -95,7 +95,7 @@ public: ~XMLSettingsExportHelper(); void exportAllSettings( - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps, + const css::uno::Sequence<css::beans::PropertyValue>& aProps, const OUString& rName) const; }; diff --git a/include/xmloff/SinglePropertySetInfoCache.hxx b/include/xmloff/SinglePropertySetInfoCache.hxx index 28ed54698556..04b42fcb12b1 100644 --- a/include/xmloff/SinglePropertySetInfoCache.hxx +++ b/include/xmloff/SinglePropertySetInfoCache.hxx @@ -40,14 +40,11 @@ public: ~SinglePropertySetInfoCache() {}; bool hasProperty( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& rPropSet, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo >& rPropSetInfo ); + const css::uno::Reference< css::beans::XPropertySet >& rPropSet, + css::uno::Reference< css::beans::XPropertySetInfo >& rPropSetInfo ); inline bool hasProperty( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet>& rPropSet ); + const css::uno::Reference< css::beans::XPropertySet>& rPropSet ); }; inline SinglePropertySetInfoCache::SinglePropertySetInfoCache( @@ -57,11 +54,9 @@ inline SinglePropertySetInfoCache::SinglePropertySetInfoCache( } inline bool SinglePropertySetInfoCache::hasProperty( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet>& rPropSet ) + const css::uno::Reference< css::beans::XPropertySet>& rPropSet ) { - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo > xInfo; + css::uno::Reference< css::beans::XPropertySetInfo > xInfo; return hasProperty( rPropSet, xInfo ); } diff --git a/include/xmloff/WordWrapPropertyHdl.hxx b/include/xmloff/WordWrapPropertyHdl.hxx index a5e6cec6dea7..51cbaa9f3dad 100644 --- a/include/xmloff/WordWrapPropertyHdl.hxx +++ b/include/xmloff/WordWrapPropertyHdl.hxx @@ -38,8 +38,8 @@ public: XMLWordWrapPropertyHdl( SvXMLImport* pImport ); virtual ~XMLWordWrapPropertyHdl(); - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; #endif // INCLUDED_XMLOFF_WORDWRAPPROPERTYHDL_HXX diff --git a/include/xmloff/XMLBase64ImportContext.hxx b/include/xmloff/XMLBase64ImportContext.hxx index ed561138c874..435dead747e2 100644 --- a/include/xmloff/XMLBase64ImportContext.hxx +++ b/include/xmloff/XMLBase64ImportContext.hxx @@ -30,8 +30,7 @@ namespace com { namespace sun { namespace star { namespace io { class XMLOFF_DLLPUBLIC XMLBase64ImportContext : public SvXMLImportContext { - ::com::sun::star::uno::Reference< - ::com::sun::star::io::XOutputStream > xOut; + css::uno::Reference< css::io::XOutputStream > xOut; OUString sBase64CharsLeft; public: @@ -39,10 +38,8 @@ public: XMLBase64ImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList, - const ::com::sun::star::uno::Reference< - ::com::sun::star::io::XOutputStream >& rOut ); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::io::XOutputStream >& rOut ); virtual ~XMLBase64ImportContext(); diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx index 4c9627bee03b..415c5730923c 100644 --- a/include/xmloff/XMLCharContext.hxx +++ b/include/xmloff/XMLCharContext.hxx @@ -39,14 +39,14 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, sal_Unicode c, bool bCount ); XMLCharContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, sal_Int16 nControl ); virtual ~XMLCharContext(); diff --git a/include/xmloff/XMLConstantsPropertyHandler.hxx b/include/xmloff/XMLConstantsPropertyHandler.hxx index 76f422435532..b8a0da555c66 100644 --- a/include/xmloff/XMLConstantsPropertyHandler.hxx +++ b/include/xmloff/XMLConstantsPropertyHandler.hxx @@ -48,13 +48,13 @@ public: /// Imports the given value in cas of the given XML-data-type virtual bool importXML( const OUString& rStrImpValue, - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; /// Exports the given value in cas of the given XML-data-type virtual bool exportXML( OUString& rStrExpValue, - const ::com::sun::star::uno::Any& rValue, + const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; }; diff --git a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx index 3609e6780f98..ad0a9a662063 100644 --- a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx +++ b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx @@ -26,57 +26,54 @@ #include <cppuhelper/implbase3.hxx> class XMLEmbeddedObjectExportFilter : public ::cppu::WeakImplHelper3< - ::com::sun::star::xml::sax::XExtendedDocumentHandler, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XInitialization> + css::xml::sax::XExtendedDocumentHandler, + css::lang::XServiceInfo, + css::lang::XInitialization> { - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XDocumentHandler > xHandler; - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XExtendedDocumentHandler > xExtHandler; + css::uno::Reference< css::xml::sax::XDocumentHandler > xHandler; + css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > xExtHandler; public: - XMLEmbeddedObjectExportFilter( const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XDocumentHandler > & rHandler ) throw(); + XMLEmbeddedObjectExportFilter( const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler ) throw(); virtual ~XMLEmbeddedObjectExportFilter () throw(); - // ::com::sun::star::xml::sax::XDocumentHandler + // css::xml::sax::XDocumentHandler virtual void SAL_CALL startDocument() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL startElement(const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endElement(const OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL characters(const OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; - // ::com::sun::star::xml::sax::XExtendedDocumentHandler - virtual void SAL_CALL startCDATA() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL endCDATA() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::xml::sax::XExtendedDocumentHandler + virtual void SAL_CALL startCDATA() throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL endCDATA() throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL comment(const OUString& sComment) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL allowLineBreak() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL unknown(const OUString& sString) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - 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 getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; }; diff --git a/include/xmloff/XMLEventExport.hxx b/include/xmloff/XMLEventExport.hxx index a65aa5d60a87..58740e0752b7 100644 --- a/include/xmloff/XMLEventExport.hxx +++ b/include/xmloff/XMLEventExport.hxx @@ -84,30 +84,25 @@ public: void AddTranslationTable( const XMLEventNameTranslation* pTransTable ); /// export the events (calls EventExport::Export(Reference<XNameAcess>) ) - void Export( ::com::sun::star::uno::Reference< - ::com::sun::star::document::XEventsSupplier> & xAccess, + void Export( css::uno::Reference<css::document::XEventsSupplier> & xAccess, bool bUseWhitespace = true); /// export the events (calls EventExport::Export(Reference<XNameAcess>) ) - void Export( ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameReplace> & xAccess, + void Export( css::uno::Reference<css::container::XNameReplace> & xAccess, bool bUseWhitespace = true); /// export the events (writes <office:events> element) - void Export( ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameAccess> & xAccess, + void Export( css::uno::Reference<css::container::XNameAccess> & xAccess, bool bUseWhitespace = true); /// export the events, but write <officeooo:events> element /// (for new file format additions) - void ExportExt( ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameAccess> & xAccess, + void ExportExt( css::uno::Reference<css::container::XNameAccess> & xAccess, bool bUseWhitespace = true); /// export a single event (writes <office:events> element) void ExportSingleEvent( - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& rEventValues, + css::uno::Sequence<css::beans::PropertyValue>& rEventValues, const OUString& rApiEventName, bool bUseWhitespace = true ); @@ -115,8 +110,7 @@ private: /// export one event (start container-element if necessary) SAL_DLLPRIVATE void ExportEvent( - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& rEventValues, + css::uno::Sequence<css::beans::PropertyValue>& rEventValues, const XMLEventName& rXmlEventName, bool bUseWhitespace, bool& rExported); diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx index a30b8e816b05..2e8b1fbc0534 100644 --- a/include/xmloff/XMLEventsImportContext.hxx +++ b/include/xmloff/XMLEventsImportContext.hxx @@ -39,8 +39,7 @@ namespace com { namespace sun { namespace star { typedef ::std::pair< OUString, - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> > EventNameValuesPair; + css::uno::Sequence<css::beans::PropertyValue> > EventNameValuesPair; typedef ::std::vector< EventNameValuesPair > EventsVector; @@ -56,8 +55,7 @@ class XMLOFF_DLLPUBLIC XMLEventsImportContext : public SvXMLImportContext { protected: // the event XNameReplace; may be empty - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameReplace> xEvents; + css::uno::Reference<css::container::XNameReplace> xEvents; // if no XNameReplace is given, use this vector to collect events EventsVector aCollectEvents; @@ -75,55 +73,47 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::document::XEventsSupplier> & xEventsSupplier); + const css::uno::Reference<css::document::XEventsSupplier> & xEventsSupplier); XMLEventsImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameReplace> & xNameRepl); + const css::uno::Reference<css::container::XNameReplace> & xNameRepl); virtual ~XMLEventsImportContext(); void AddEventValues( const OUString& rEventName, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rValues); + const css::uno::Sequence<css::beans::PropertyValue> & rValues); /// if the import operates in delayed mode, you can use this method /// to set all events that have been read on the XEventsSupplier void SetEvents( - const ::com::sun::star::uno::Reference< - ::com::sun::star::document::XEventsSupplier> & xEventsSupplier); + const css::uno::Reference<css::document::XEventsSupplier> & xEventsSupplier); /// if the import operates in delayed mode, you can use this method /// to set all events that have been read on the XNameReplace void SetEvents( - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameReplace> & xNameRepl); + const css::uno::Reference<css::container::XNameReplace> & xNameRepl); /// if the import operates indelayed mode, you can use this method /// to obtain the value sequence for a specific event bool GetEventSequence( const OUString& rName, - ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> & rSequence ); + css::uno::Sequence<css::beans::PropertyValue> & rSequence ); protected: virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; virtual void EndElement() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & xAttrList ) override; + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; }; #endif diff --git a/include/xmloff/XMLFontStylesContext.hxx b/include/xmloff/XMLFontStylesContext.hxx index a2de6a8fed7f..62755475553e 100644 --- a/include/xmloff/XMLFontStylesContext.hxx +++ b/include/xmloff/XMLFontStylesContext.hxx @@ -48,8 +48,7 @@ protected: virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; public: @@ -57,8 +56,7 @@ public: XMLFontStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, rtl_TextEncoding eDfltEnc ); virtual ~XMLFontStylesContext(); diff --git a/include/xmloff/XMLGraphicsDefaultStyle.hxx b/include/xmloff/XMLGraphicsDefaultStyle.hxx index f8a19d267471..b1a6d806e806 100644 --- a/include/xmloff/XMLGraphicsDefaultStyle.hxx +++ b/include/xmloff/XMLGraphicsDefaultStyle.hxx @@ -36,16 +36,15 @@ public: XMLGraphicsDefaultStyle( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList, - SvXMLStylesContext& rStyles); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + SvXMLStylesContext& rStyles); virtual ~XMLGraphicsDefaultStyle(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; // This method is called for every default style virtual void SetDefaults() override; diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx index f2ec924bcfa5..d52f1bf50ec4 100644 --- a/include/xmloff/XMLPageExport.hxx +++ b/include/xmloff/XMLPageExport.hxx @@ -58,8 +58,7 @@ class XMLOFF_DLLPUBLIC XMLPageExport : public salhelper::SimpleReferenceObject const OUString sIsPhysical; const OUString sFollowStyle; - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameAccess > xPageStyles; + css::uno::Reference< css::container::XNameAccess > xPageStyles; ::std::vector< XMLPageExportNameEntry > aNameVector; SAL_DLLPRIVATE bool findPageMasterName( const OUString& rStyleName, OUString& rPMName ) const; @@ -73,18 +72,15 @@ protected: SvXMLExport& GetExport() { return rExport; } void collectPageMasterAutoStyle( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet, + const css::uno::Reference< css::beans::XPropertySet > & rPropSet, OUString& rPageMasterName ); virtual void exportMasterPageContent( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet, + const css::uno::Reference< css::beans::XPropertySet > & rPropSet, bool bAutoStyles ); bool exportStyle( - const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle >& rStyle, + const css::uno::Reference< css::style::XStyle >& rStyle, bool bAutoStyles ); void exportStyles( bool bUsed, bool bAutoStyles ); diff --git a/include/xmloff/XMLSettingsExportContext.hxx b/include/xmloff/XMLSettingsExportContext.hxx index b79104a29dff..346553a0a057 100644 --- a/include/xmloff/XMLSettingsExportContext.hxx +++ b/include/xmloff/XMLSettingsExportContext.hxx @@ -46,7 +46,7 @@ namespace xmloff virtual void Characters( const OUString& i_rCharacters ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + virtual css::uno::Reference< css::uno::XComponentContext > GetComponentContext() const = 0; protected: diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx index 3f0728869378..0047d99e0b48 100644 --- a/include/xmloff/XMLShapeStyleContext.hxx +++ b/include/xmloff/XMLShapeStyleContext.hxx @@ -48,7 +48,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily = XML_STYLE_FAMILY_SD_GRAPHICS_ID); virtual ~XMLShapeStyleContext(); @@ -56,13 +56,12 @@ public: SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void Finish( bool bOverwrite ) override; virtual void FillPropertySet( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ) override; + const css::uno::Reference< css::beans::XPropertySet > & rPropSet ) override; }; #endif // INCLUDED_XMLOFF_XMLSHAPESTYLECONTEXT_HXX diff --git a/include/xmloff/XMLTextListAutoStylePool.hxx b/include/xmloff/XMLTextListAutoStylePool.hxx index 87eee3238241..cb0b90c0c0fc 100644 --- a/include/xmloff/XMLTextListAutoStylePool.hxx +++ b/include/xmloff/XMLTextListAutoStylePool.hxx @@ -48,7 +48,7 @@ class XMLOFF_DLLPUBLIC XMLTextListAutoStylePool /** this is an optional NumRule compare component for applications where the NumRules don't have names */ - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > mxNumRuleCompare; + css::uno::Reference< css::ucb::XAnyCompare > mxNumRuleCompare; SAL_DLLPRIVATE sal_uInt32 Find( XMLTextListAutoStylePoolEntry_Impl* pEntry ) const; @@ -60,12 +60,10 @@ public: void RegisterName( const OUString& rName ); OUString Add( - const ::com::sun::star::uno::Reference < - ::com::sun::star::container::XIndexReplace > & rNumRules ); + const css::uno::Reference< css::container::XIndexReplace > & rNumRules ); OUString Find( - const ::com::sun::star::uno::Reference < - ::com::sun::star::container::XIndexReplace > & rNumRules ) const; + const css::uno::Reference< css::container::XIndexReplace > & rNumRules ) const; OUString Find( const OUString& rInternalName ) const; void exportXML() const; diff --git a/include/xmloff/XMLTextMasterPageContext.hxx b/include/xmloff/XMLTextMasterPageContext.hxx index 5680238b652a..1a8e2c94530e 100644 --- a/include/xmloff/XMLTextMasterPageContext.hxx +++ b/include/xmloff/XMLTextMasterPageContext.hxx @@ -36,7 +36,7 @@ class XMLOFF_DLLPUBLIC XMLTextMasterPageContext : public SvXMLStyleContext OUString sFollow; OUString sPageMasterName; - ::com::sun::star::uno::Reference < ::com::sun::star::style::XStyle > xStyle; + css::uno::Reference < css::style::XStyle > xStyle; bool bInsertHeader; bool bInsertFooter; @@ -51,31 +51,28 @@ class XMLOFF_DLLPUBLIC XMLTextMasterPageContext : public SvXMLStyleContext bool bHeaderFirstInserted; bool bFooterFirstInserted; - SAL_DLLPRIVATE ::com::sun::star::uno::Reference < - ::com::sun::star::style::XStyle > Create(); + SAL_DLLPRIVATE css::uno::Reference< css::style::XStyle > Create(); protected: - ::com::sun::star::uno::Reference < - ::com::sun::star::style::XStyle > GetStyle() { return xStyle; } + css::uno::Reference< css::style::XStyle > GetStyle() { return xStyle; } public: TYPEINFO_OVERRIDE(); XMLTextMasterPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, bool bOverwrite ); virtual ~XMLTextMasterPageContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual SvXMLImportContext *CreateHeaderFooterContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, const bool bFooter, const bool bLeft, const bool bFirst ); diff --git a/include/xmloff/XMLTextMasterPageExport.hxx b/include/xmloff/XMLTextMasterPageExport.hxx index 6ca0eee0eff0..77b06468b568 100644 --- a/include/xmloff/XMLTextMasterPageExport.hxx +++ b/include/xmloff/XMLTextMasterPageExport.hxx @@ -49,13 +49,11 @@ class XMLOFF_DLLPUBLIC XMLTextMasterPageExport : public XMLPageExport protected: virtual void exportHeaderFooterContent( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XText >& rText, + const css::uno::Reference< css::text::XText >& rText, bool bAutoStyles, bool bExportParagraph = true ); virtual void exportMasterPageContent( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet, + const css::uno::Reference< css::beans::XPropertySet > & rPropSet, bool bAutoStyles ) override; public: diff --git a/include/xmloff/XMLTextMasterStylesContext.hxx b/include/xmloff/XMLTextMasterStylesContext.hxx index dad9700dc432..a922bf91baab 100644 --- a/include/xmloff/XMLTextMasterStylesContext.hxx +++ b/include/xmloff/XMLTextMasterStylesContext.hxx @@ -29,13 +29,12 @@ class XMLOFF_DLLPUBLIC XMLTextMasterStylesContext : public SvXMLStylesContext protected: virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, - sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + sal_uInt16 nPrefix, + const OUString& rLocalName, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const override; @@ -44,8 +43,7 @@ public: XMLTextMasterStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList); virtual ~XMLTextMasterStylesContext(); }; diff --git a/include/xmloff/XMLTextShapeImportHelper.hxx b/include/xmloff/XMLTextShapeImportHelper.hxx index a6754ab26b28..7480da16b1c8 100644 --- a/include/xmloff/XMLTextShapeImportHelper.hxx +++ b/include/xmloff/XMLTextShapeImportHelper.hxx @@ -38,12 +38,9 @@ public: virtual ~XMLTextShapeImportHelper(); virtual void addShape( - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape >& rShape, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList, - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& rShapes ) override; + css::uno::Reference< css::drawing::XShape >& rShape, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes ) override; }; #endif diff --git a/include/xmloff/XMLTextShapeStyleContext.hxx b/include/xmloff/XMLTextShapeStyleContext.hxx index 61a13bc56f5c..e140c1ff5be4 100644 --- a/include/xmloff/XMLTextShapeStyleContext.hxx +++ b/include/xmloff/XMLTextShapeStyleContext.hxx @@ -43,8 +43,7 @@ public: XMLTextShapeStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle = false ); virtual ~XMLTextShapeStyleContext(); @@ -52,7 +51,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void CreateAndInsert( bool bOverwrite ) override; diff --git a/include/xmloff/animationexport.hxx b/include/xmloff/animationexport.hxx index f6641447563b..4142910edfb2 100644 --- a/include/xmloff/animationexport.hxx +++ b/include/xmloff/animationexport.hxx @@ -39,11 +39,11 @@ class XMLOFF_DLLPUBLIC AnimationsExporter : public salhelper::SimpleReferenceObj AnimationsExporterImpl* mpImpl; public: - AnimationsExporter( SvXMLExport& rExport, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPageProps ); + AnimationsExporter( SvXMLExport& rExport, const css::uno::Reference< css::beans::XPropertySet >& xPageProps ); virtual ~AnimationsExporter(); - void prepare( ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > xRootNode ); - void exportAnimations( ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > xRootNode ); + void prepare( css::uno::Reference< css::animations::XAnimationNode > xRootNode ); + void exportAnimations( css::uno::Reference< css::animations::XAnimationNode > xRootNode ); }; } diff --git a/include/xmloff/animexp.hxx b/include/xmloff/animexp.hxx index b5a575c05d2e..3b44a18370fe 100644 --- a/include/xmloff/animexp.hxx +++ b/include/xmloff/animexp.hxx @@ -35,8 +35,8 @@ public: XMLAnimationsExporter( XMLShapeExport* pShapeExp ); virtual ~XMLAnimationsExporter(); - void prepare( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, SvXMLExport& rExport ); - void collect( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, SvXMLExport& rExport ); + void prepare( css::uno::Reference< css::drawing::XShape > xShape, SvXMLExport& rExport ); + void collect( css::uno::Reference< css::drawing::XShape > xShape, SvXMLExport& rExport ); void exportAnimations( SvXMLExport& rExport ); }; diff --git a/include/xmloff/attrlist.hxx b/include/xmloff/attrlist.hxx index 1daea8d313e5..6eca0ce7af17 100644 --- a/include/xmloff/attrlist.hxx +++ b/include/xmloff/attrlist.hxx @@ -36,41 +36,41 @@ struct SvXMLAttributeList_Impl; class XMLOFF_DLLPUBLIC SvXMLAttributeList : public ::cppu::WeakImplHelper3< - ::com::sun::star::xml::sax::XAttributeList, - ::com::sun::star::util::XCloneable, - ::com::sun::star::lang::XUnoTunnel> + css::xml::sax::XAttributeList, + css::util::XCloneable, + css::lang::XUnoTunnel> { SvXMLAttributeList_Impl *m_pImpl; public: SvXMLAttributeList(); SvXMLAttributeList( const SvXMLAttributeList& ); - SvXMLAttributeList( const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList> & rAttrList ); + SvXMLAttributeList( const css::uno::Reference< + css::xml::sax::XAttributeList> & rAttrList ); virtual ~SvXMLAttributeList(); - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - static SvXMLAttributeList* getImplementation( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ) throw(); + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); + static SvXMLAttributeList* getImplementation( css::uno::Reference< css::uno::XInterface > ) throw(); // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::xml::sax::XAttributeList - virtual sal_Int16 SAL_CALL getLength() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getValueByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::xml::sax::XAttributeList + virtual sal_Int16 SAL_CALL getLength() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getValueByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override; - // ::com::sun::star::util::XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::util::XCloneable + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw( css::uno::RuntimeException, std::exception ) override; // methods that are not contained in any interface void AddAttribute( const OUString &sName , const OUString &sValue ); void Clear(); void RemoveAttribute( const OUString& sName ); - void AppendAttributeList( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & ); + void AppendAttributeList( const css::uno::Reference< css::xml::sax::XAttributeList > & ); void SetValueByIndex( sal_Int16 i, const OUString& rValue ); void RemoveAttributeByIndex( sal_Int16 i ); void RenameAttributeByIndex( sal_Int16 i, const OUString& rNewName ); diff --git a/include/xmloff/controlpropertyhdl.hxx b/include/xmloff/controlpropertyhdl.hxx index 41fdec36a82e..685f4078e411 100644 --- a/include/xmloff/controlpropertyhdl.hxx +++ b/include/xmloff/controlpropertyhdl.hxx @@ -46,8 +46,8 @@ namespace xmloff public: ORotationAngleHandler(); - virtual bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override; - virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override; + virtual bool importXML( const OUString& _rStrImpValue, css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override; + virtual bool exportXML( OUString& _rStrExpValue, const css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override; }; @@ -58,8 +58,8 @@ namespace xmloff public: OFontWidthHandler(); - virtual bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override; - virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override; + virtual bool importXML( const OUString& _rStrImpValue, css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override; + virtual bool exportXML( OUString& _rStrExpValue, const css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override; }; @@ -76,8 +76,8 @@ namespace xmloff OControlBorderHandler( const BorderFacet _eFacet ); - virtual bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override; - virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override; + virtual bool importXML( const OUString& _rStrImpValue, css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override; + virtual bool exportXML( OUString& _rStrExpValue, const css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override; private: BorderFacet m_eFacet; @@ -91,8 +91,8 @@ namespace xmloff public: OControlTextEmphasisHandler(); - virtual bool importXML( const OUString& _rStrImpValue, ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override; - virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override; + virtual bool importXML( const OUString& _rStrImpValue, css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override; + virtual bool exportXML( OUString& _rStrExpValue, const css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override; }; diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx index 05c0a69792fb..1aeb85b70494 100644 --- a/include/xmloff/formlayerexport.hxx +++ b/include/xmloff/formlayerexport.hxx @@ -75,7 +75,7 @@ namespace xmloff @see examineForms */ bool seekPage( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage); + const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage); /** get the id for the given control @@ -89,7 +89,7 @@ namespace xmloff */ OUString getControlId( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl); + const css::uno::Reference< css::beans::XPropertySet >& _rxControl); /** retrieves the style name for the control's number style. @@ -103,7 +103,7 @@ namespace xmloff @see seekPage */ OUString getControlNumberStyle( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl ); + const css::uno::Reference< css::beans::XPropertySet >& _rxControl ); /** examines the forms collection given. @@ -113,7 +113,7 @@ namespace xmloff the draw page to examine. The object will be queried for a com.sun.star.form::XFormsSupplier interface to obtain the forms container. */ - void examineForms(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage); + void examineForms(const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage); /** exports the structure of a form layer @@ -134,7 +134,7 @@ namespace xmloff the draw page to examine. The object will be queried for a com.sun.star.form::XFormsSupplier interface to obtain the forms container. */ - void exportForms(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage); + void exportForms(const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage); /** exports the XForms model data */ @@ -142,7 +142,7 @@ namespace xmloff /** determines whether the given page contains logical forms */ - static bool pageContainsForms( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage ); + static bool pageContainsForms( const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage ); /** determines whether the given page contains XForm instances */ @@ -163,7 +163,7 @@ namespace xmloff to the form layer exporter.<br/> Of course you have to do this before calling <member>exportForms</member></p> */ - void excludeFromExport( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxControl ); + void excludeFromExport( const css::uno::Reference< css::awt::XControlModel >& _rxControl ); }; diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx index dcb35932488a..344bd4fc39b9 100644 --- a/include/xmloff/formlayerimport.hxx +++ b/include/xmloff/formlayerimport.hxx @@ -61,7 +61,7 @@ namespace xmloff @see endPage */ void startPage( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& _rxDrawPage); + const css::uno::Reference< css::drawing::XDrawPage >& _rxDrawPage); /** creates an import context for the office:forms element */ @@ -81,7 +81,7 @@ namespace xmloff SvXMLImportContext* createContext( const sal_uInt16 _nPrefix, const OUString& _rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttribs); + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttribs); /** lookup a control given by id. @@ -91,7 +91,7 @@ namespace xmloff @see startPage */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > lookupControl(const OUString& _rId); /** end importing the forms of the current page @@ -114,7 +114,7 @@ namespace xmloff the style name for the control's number style */ void applyControlNumberStyle( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, const OUString& _rControlNumerStyleName ); diff --git a/include/xmloff/maptype.hxx b/include/xmloff/maptype.hxx index a942b1cc3bfc..212b771ecfe2 100644 --- a/include/xmloff/maptype.hxx +++ b/include/xmloff/maptype.hxx @@ -106,11 +106,11 @@ struct XMLPropertyMapEntry struct XMLPropertyState { sal_Int32 mnIndex; - ::com::sun::star::uno::Any maValue; + css::uno::Any maValue; XMLPropertyState( sal_Int32 nIndex ) : mnIndex( nIndex ) {} - XMLPropertyState( sal_Int32 nIndex, const ::com::sun::star::uno::Any& rValue ) + XMLPropertyState( sal_Int32 nIndex, const css::uno::Any& rValue ) : mnIndex( nIndex ), maValue( rValue ) {} XMLPropertyState( const XMLPropertyState& rPropState ) : mnIndex( rPropState.mnIndex ), maValue( rPropState.maValue ) {} diff --git a/include/xmloff/numehelp.hxx b/include/xmloff/numehelp.hxx index 81477e903707..8d5aeca272a6 100644 --- a/include/xmloff/numehelp.hxx +++ b/include/xmloff/numehelp.hxx @@ -65,7 +65,7 @@ typedef std::set<XMLNumberFormat, LessNumberFormat> XMLNumberFormatSet; class XMLOFF_DLLPUBLIC XMLNumberFormatAttributesExportHelper { - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > xNumberFormats; + css::uno::Reference< css::util::XNumberFormats > xNumberFormats; SvXMLExport* pExport; const OUString sStandardFormat; const OUString sType; @@ -79,8 +79,8 @@ class XMLOFF_DLLPUBLIC XMLNumberFormatAttributesExportHelper const OUString msCurrencyAbbreviation; XMLNumberFormatSet aNumberFormats; public: - XMLNumberFormatAttributesExportHelper(::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier); - XMLNumberFormatAttributesExportHelper(::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier, + XMLNumberFormatAttributesExportHelper(css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier); + XMLNumberFormatAttributesExportHelper(css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier, SvXMLExport& rExport ); ~XMLNumberFormatAttributesExportHelper(); @@ -91,9 +91,9 @@ public: const OUString& rCurrencySymbol, bool bExportValue = true); static bool GetCurrencySymbol(const sal_Int32 nNumberFormat, OUString& rCurrencySymbol, - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xNumberFormatsSupplier); + css::uno::Reference< css::util::XNumberFormatsSupplier > & xNumberFormatsSupplier); static sal_Int16 GetCellType(const sal_Int32 nNumberFormat, bool& bIsStandard, - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xNumberFormatsSupplier); + css::uno::Reference< css::util::XNumberFormatsSupplier > & xNumberFormatsSupplier); static void SetNumberFormatAttributes(SvXMLExport& rXMLExport, const sal_Int32 nNumberFormat, const double& rValue, diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx index 06bf3ed09480..f0c36af90a3c 100644 --- a/include/xmloff/prstylei.hxx +++ b/include/xmloff/prstylei.hxx @@ -44,9 +44,9 @@ class XMLOFF_DLLPUBLIC XMLPropStyleContext : public SvXMLStyleContext private: const OUString msIsPhysical; const OUString msFollowStyle; - ::std::vector< XMLPropertyState > maProperties; - ::com::sun::star::uno::Reference < ::com::sun::star::style::XStyle > mxStyle; - SvXMLImportContextRef mxStyles; + ::std::vector< XMLPropertyState > maProperties; + css::uno::Reference < css::style::XStyle > mxStyle; + SvXMLImportContextRef mxStyles; //UUUU static OldFillStyleDefinitionSet maStandardSet; @@ -92,8 +92,7 @@ protected: // Override this method to create a new style. It's called by // CreateInsert to create a style if a style with the requested family and // name couldn't be found. - virtual ::com::sun::star::uno::Reference < - ::com::sun::star::style::XStyle > Create(); + virtual css::uno::Reference< css::style::XStyle > Create(); public: @@ -101,7 +100,7 @@ public: XMLPropStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily = 0, bool bDefaultStyle=false ); virtual ~XMLPropStyleContext(); @@ -109,21 +108,18 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void FillPropertySet( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ); + const css::uno::Reference< css::beans::XPropertySet > & rPropSet ); const SvXMLStylesContext *GetStyles() const { return static_cast<const SvXMLStylesContext *>(&mxStyles); } const ::std::vector< XMLPropertyState > & GetProperties() const { return maProperties; } - const ::com::sun::star::uno::Reference < - ::com::sun::star::style::XStyle >& + const css::uno::Reference< css::style::XStyle >& GetStyle() const { return mxStyle; } void SetStyle( - const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle >& xStl) { mxStyle = xStl; } + const css::uno::Reference< css::style::XStyle >& xStl) { mxStyle = xStl; } virtual void SetDefaults() override; diff --git a/include/xmloff/settingsstore.hxx b/include/xmloff/settingsstore.hxx index 259897b18e65..151d57da8bf7 100644 --- a/include/xmloff/settingsstore.hxx +++ b/include/xmloff/settingsstore.hxx @@ -21,16 +21,16 @@ class DocumentSettingsSerializer { public: // Import objects and update properties (eliding URLs) - virtual com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> + virtual css::uno::Sequence<css::beans::PropertyValue> filterStreamsFromStorage( OUString const & referer, - const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > &xStorage, - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps ) = 0; + const css::uno::Reference< css::embed::XStorage > &xStorage, + const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps ) = 0; // Export objects and update properties with relative URLs into this storage - virtual com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> + virtual css::uno::Sequence<css::beans::PropertyValue> filterStreamsToStorage( - const com::sun::star::uno::Reference< com::sun::star::embed::XStorage > &xStorage, - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps ) = 0; + const css::uno::Reference< css::embed::XStorage > &xStorage, + const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps ) = 0; protected: ~DocumentSettingsSerializer() {} diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx index a7f62e40d8e4..f754282eaa40 100644 --- a/include/xmloff/shapeexport.hxx +++ b/include/xmloff/shapeexport.hxx @@ -135,7 +135,7 @@ struct ImplXMLShapeExportInfo sal_Int32 mnFamily; XmlShapeType meShapeType; - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xCustomShapeReplacement; + css::uno::Reference< css::drawing::XShape > xCustomShapeReplacement; ImplXMLShapeExportInfo() : mnFamily( XML_STYLE_FAMILY_SD_GRAPHICS_ID ), meShapeType( XmlShapeTypeNotYetSet ) {} }; @@ -144,7 +144,7 @@ struct ImplXMLShapeExportInfo typedef std::vector< ImplXMLShapeExportInfo > ImplXMLShapeExportInfoVector; /** a map to store all cache data for already collected XShapes */ -typedef std::map< com::sun::star::uno::Reference < com::sun::star::drawing::XShapes >, ImplXMLShapeExportInfoVector > ShapesInfos; +typedef std::map< css::uno::Reference < css::drawing::XShapes >, ImplXMLShapeExportInfoVector > ShapesInfos; class SvXMLExport; class SvXMLExportPropertyMapper; @@ -207,66 +207,66 @@ private: OUStringBuffer msBuffer; - SAL_DLLPRIVATE void ImpCalcShapeType(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType& eShapeType); + SAL_DLLPRIVATE void ImpCalcShapeType(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType& eShapeType); - SAL_DLLPRIVATE void ImpExportNewTrans(const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet, XMLShapeExportFlags nFeatures, com::sun::star::awt::Point* pRefPoint); - SAL_DLLPRIVATE void ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix& rMatrix, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet); - SAL_DLLPRIVATE void ImpExportNewTrans_DecomposeAndRefPoint(const ::basegfx::B2DHomMatrix& rMat, ::basegfx::B2DTuple& rTRScale, double& fTRShear, double& fTRRotate, ::basegfx::B2DTuple& rTRTranslate, com::sun::star::awt::Point* pRefPoint); + SAL_DLLPRIVATE void ImpExportNewTrans(const css::uno::Reference< css::beans::XPropertySet >& xPropSet, XMLShapeExportFlags nFeatures, css::awt::Point* pRefPoint); + SAL_DLLPRIVATE void ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix& rMatrix, const css::uno::Reference< css::beans::XPropertySet >& xPropSet); + SAL_DLLPRIVATE void ImpExportNewTrans_DecomposeAndRefPoint(const ::basegfx::B2DHomMatrix& rMat, ::basegfx::B2DTuple& rTRScale, double& fTRShear, double& fTRRotate, ::basegfx::B2DTuple& rTRTranslate, css::awt::Point* pRefPoint); SAL_DLLPRIVATE void ImpExportNewTrans_FeaturesAndWrite(::basegfx::B2DTuple& rTRScale, double fTRShear, double fTRRotate, ::basegfx::B2DTuple& rTRTranslate, const XMLShapeExportFlags nFeatures); - SAL_DLLPRIVATE bool ImpExportPresentationAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet, const OUString& rClass ); - SAL_DLLPRIVATE void ImpExportText( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, TextPNS eExtensionNS = TextPNS::ODF ); - SAL_DLLPRIVATE void ImpExportEvents( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); - SAL_DLLPRIVATE void ImpExportDescription( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); // #i68101# - SAL_DLLPRIVATE void ImpExportGluePoints( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); + SAL_DLLPRIVATE bool ImpExportPresentationAttributes( const css::uno::Reference< css::beans::XPropertySet >& xPropSet, const OUString& rClass ); + SAL_DLLPRIVATE void ImpExportText( const css::uno::Reference< css::drawing::XShape >& xShape, TextPNS eExtensionNS = TextPNS::ODF ); + SAL_DLLPRIVATE void ImpExportEvents( const css::uno::Reference< css::drawing::XShape >& xShape ); + SAL_DLLPRIVATE void ImpExportDescription( const css::uno::Reference< css::drawing::XShape >& xShape ); // #i68101# + SAL_DLLPRIVATE void ImpExportGluePoints( const css::uno::Reference< css::drawing::XShape >& xShape ); // single shape exporters - SAL_DLLPRIVATE void ImpExportGroupShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExport3DSceneShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportRectangleShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportLineShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportEllipseShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportPolygonShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportTextBoxShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportGraphicObjectShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportChartShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL, SvXMLAttributeList* pAttrList = NULL ); - SAL_DLLPRIVATE void ImpExportControlShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportConnectorShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportMeasureShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportOLE2Shape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL, SvXMLAttributeList* pAttrList = NULL ); - SAL_DLLPRIVATE void ImpExportPageShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportCaptionShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExport3DShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportFrameShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportPluginShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportAppletShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportCustomShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportMediaShape( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); - SAL_DLLPRIVATE void ImpExportTableShape(const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, com::sun::star::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportGroupShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExport3DSceneShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportRectangleShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportLineShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportEllipseShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportPolygonShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportTextBoxShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportGraphicObjectShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportChartShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL, SvXMLAttributeList* pAttrList = NULL ); + SAL_DLLPRIVATE void ImpExportControlShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportConnectorShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportMeasureShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportOLE2Shape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL, SvXMLAttributeList* pAttrList = NULL ); + SAL_DLLPRIVATE void ImpExportPageShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportCaptionShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExport3DShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportFrameShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportPluginShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportAppletShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportCustomShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportMediaShape( const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); + SAL_DLLPRIVATE void ImpExportTableShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = NULL ); public: XMLShapeExport(SvXMLExport& rExp, SvXMLExportPropertyMapper *pExtMapper=0 ); virtual ~XMLShapeExport(); // This method collects all automatic styles for the given XShape void collectShapeAutoStyles( - const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape); + const css::uno::Reference < css::drawing::XShape >& xShape); // This method exports the given XShape void exportShape( - const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape, + const css::uno::Reference < css::drawing::XShape >& xShape, XMLShapeExportFlags nFeatures = SEF_DEFAULT, - com::sun::star::awt::Point* pRefPoint = NULL, + css::awt::Point* pRefPoint = NULL, SvXMLAttributeList* pAttrList = NULL ); // This method collects all automatic styles for the shapes inside the given XShapes collection void collectShapesAutoStyles( - const com::sun::star::uno::Reference < com::sun::star::drawing::XShapes >& xShapes); + const css::uno::Reference < css::drawing::XShapes >& xShapes); // This method exports all XShape inside the given XShapes collection void exportShapes( - const com::sun::star::uno::Reference < com::sun::star::drawing::XShapes >& xShapes, + const css::uno::Reference < css::drawing::XShapes >& xShapes, XMLShapeExportFlags nFeatures = SEF_DEFAULT, - com::sun::star::awt::Point* pRefPoint = NULL + css::awt::Point* pRefPoint = NULL ); /** initializes some internal structures for fast access to the given XShapes collection @@ -280,7 +280,7 @@ public: @see exportShapes */ void seekShapes( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes ) throw(); + const css::uno::Reference< css::drawing::XShapes >& xShapes ) throw(); void exportAutoStyles(); @@ -306,20 +306,20 @@ public: void setPresentationStylePrefix( const OUString& rPrefix ) { msPresentationStylePrefix = rPrefix; } /** helper for chart that adds all attributes of a 3d scene element to the export */ - void export3DSceneAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet ); + void export3DSceneAttributes( const css::uno::Reference< css::beans::XPropertySet >& xPropSet ); /** helper for chart that exports all lamps from the propertyset */ - void export3DLamps( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet ); + void export3DLamps( const css::uno::Reference< css::beans::XPropertySet >& xPropSet ); /** sj: replacing CustomShapes with standard objects that are also supported in OpenOffice.org format */ - com::sun::star::uno::Reference < com::sun::star::drawing::XShape > checkForCustomShapeReplacement( - const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& ); + css::uno::Reference < css::drawing::XShape > checkForCustomShapeReplacement( + const css::uno::Reference < css::drawing::XShape >& ); /** helper to export the style for graphic defaults */ void ExportGraphicDefaults(); /** is called before a shape element for the given XShape is exported */ - virtual void onExport( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape ); + virtual void onExport( const css::uno::Reference < css::drawing::XShape >& xShape ); const rtl::Reference< XMLTableExport >& GetShapeTableExport(); }; diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index ca685da25a6c..b8c34d18fac4 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -189,7 +189,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList); virtual ~SdXML3DLightContext(); sal_Int32 GetDiffuseColor() { return maDiffuseColor; } @@ -209,14 +209,14 @@ protected: maList; // local parameters which need to be read - com::sun::star::drawing::HomogenMatrix mxHomMat; + css::drawing::HomogenMatrix mxHomMat; bool mbSetTransform; - com::sun::star::drawing::ProjectionMode mxPrjMode; + css::drawing::ProjectionMode mxPrjMode; sal_Int32 mnDistance; sal_Int32 mnFocalLength; sal_Int32 mnShadowSlant; - com::sun::star::drawing::ShadeMode mxShadeMode; + css::drawing::ShadeMode mxShadeMode; sal_Int32 maAmbientColor; bool mbLightingMode; @@ -232,13 +232,13 @@ public: ~SdXML3DSceneAttributesHelper(); /** creates a 3d light context and adds it to the internal list for later processing */ - SvXMLImportContext * create3DLightContext( sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList); + SvXMLImportContext * create3DLightContext( sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList); /** this should be called for each scene attribute */ void processSceneAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); /** this sets the scene attributes at this propertyset */ - void setSceneAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet ); + void setSceneAttributes( const css::uno::Reference< css::beans::XPropertySet >& xPropSet ); }; @@ -246,9 +246,9 @@ public: class SvXMLShapeContext : public SvXMLImportContext { protected: - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; - bool mbTemporaryShape; - OUString msHyperlink; + css::uno::Reference< css::drawing::XShape > mxShape; + bool mbTemporaryShape; + OUString msHyperlink; public: SvXMLShapeContext( SvXMLImport& rImp, sal_uInt16 nPrfx, @@ -256,7 +256,7 @@ public: TYPEINFO_OVERRIDE(); - const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& getShape() const { return mxShape; } + const css::uno::Reference< css::drawing::XShape >& getShape() const { return mxShape; } void setHyperlink( const OUString& rHyperlink ); }; @@ -273,7 +273,7 @@ class XMLOFF_DLLPUBLIC XMLShapeImportHelper : public salhelper::SimpleReferenceO XMLShapeImportPageContextImpl* mpPageContext; - com::sun::star::uno::Reference< com::sun::star::frame::XModel > mxModel; + css::uno::Reference< css::frame::XModel > mxModel; // PropertySetMappers and factory XMLSdPropHdlFactory* mpSdPropHdlFactory; @@ -309,30 +309,30 @@ protected: public: XMLShapeImportHelper( SvXMLImport& rImporter, - const com::sun::star::uno::Reference< com::sun::star::frame::XModel>& rModel, + const css::uno::Reference< css::frame::XModel>& rModel, SvXMLImportPropertyMapper *pExtMapper=0 ); virtual ~XMLShapeImportHelper(); SvXMLShapeContext* CreateGroupChildContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, bool bTemporaryShape = false); SvXMLShapeContext* CreateFrameChildContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xFrameAttrList); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes, + const css::uno::Reference< css::xml::sax::XAttributeList >& xFrameAttrList); static SvXMLImportContext* CreateFrameChildContext( SvXMLImportContext *pThisContext, sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); SvXMLShapeContext* Create3DSceneChildContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes); const SvXMLTokenMap& GetGroupShapeElemTokenMap(); const SvXMLTokenMap& GetFrameShapeElemTokenMap(); @@ -356,60 +356,60 @@ public: // this function is called whenever the implementation classes like to add this new // shape to the given XShapes. virtual void addShape( - com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); + css::uno::Reference< css::drawing::XShape >& rShape, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes); // this function is called whenever the implementation classes have finished importing // a shape to the given XShapes. The shape is already inserted into its XShapes and // all properties and styles are set. virtual void finishShape( - com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); + css::uno::Reference< css::drawing::XShape >& rShape, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + css::uno::Reference< css::drawing::XShapes >& rShapes); // helper functions for z-order sorting - void pushGroupForSorting( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ); + void pushGroupForSorting( css::uno::Reference< css::drawing::XShapes >& rShapes ); void popGroupAndSort(); - void shapeWithZIndexAdded( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, + void shapeWithZIndexAdded( css::uno::Reference< css::drawing::XShape >& rShape, sal_Int32 nZIndex ); - void addShapeConnection( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rConnectorShape, + void addShapeConnection( css::uno::Reference< css::drawing::XShape >& rConnectorShape, bool bStart, const OUString& rDestShapeId, sal_Int32 nDestGlueId ); /** adds a mapping for a glue point identifier from an xml file to the identifier created after inserting the new glue point into the core. The saved mappings can be retrieved by getGluePointId() */ - void addGluePointMapping( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, + void addGluePointMapping( css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nSourceId, sal_Int32 nDestinnationId ); /** find mapping for given DestinationID. This allows to extract the original draw:id imported with a draw:glue-point */ sal_Int32 findGluePointMapping( - const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, + const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nDestinnationId ) const; /** moves all current DestinationId's for rXShape by n */ - void moveGluePointMapping( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, const sal_Int32 n ); + void moveGluePointMapping( const css::uno::Reference< css::drawing::XShape >& xShape, const sal_Int32 n ); /** retrieves a mapping for a glue point identifier from the current xml file to the identifier created after inserting the new glue point into the core. The mapping must be initialized first with addGluePointMapping() */ - sal_Int32 getGluePointId( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, sal_Int32 nSourceId ); + sal_Int32 getGluePointId( const css::uno::Reference< css::drawing::XShape >& xShape, sal_Int32 nSourceId ); /** this method must be calling before the first shape is imported for the given page. Calls to this method can be nested */ - void startPage( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ); + void startPage( css::uno::Reference< css::drawing::XShapes >& rShapes ); /** this method must be calling after the last shape is imported for the given page Calls to this method can be nested */ - void endPage( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ); + void endPage( css::uno::Reference< css::drawing::XShapes >& rShapes ); void restoreConnections(); /** creates a property mapper for external chaining */ static SvXMLImportPropertyMapper* CreateShapePropMapper( - const com::sun::star::uno::Reference< com::sun::star::frame::XModel>& rModel, SvXMLImport& rImport ); + const css::uno::Reference< css::frame::XModel>& rModel, SvXMLImport& rImport ); /** defines if the import should increment the progress bar or not */ void enableHandleProgressBar( bool bEnable = true ); diff --git a/include/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx index 7d9d6eedb61f..ebab3816aa0f 100644 --- a/include/xmloff/styleexp.hxx +++ b/include/xmloff/styleexp.hxx @@ -70,20 +70,17 @@ private: protected: bool exportStyle( - const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle, + const css::uno::Reference< css::style::XStyle > & rStyle, const OUString& rXMLFamily, const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xStyles, + const css::uno::Reference< css::container::XNameAccess > & xStyles, const OUString* pPrefix = 0L ); virtual void exportStyleAttributes( - const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ); + const css::uno::Reference< css::style::XStyle > & rStyle ); virtual void exportStyleContent( - const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ); + const css::uno::Reference< css::style::XStyle > & rStyle ); public: XMLStyleExport( SvXMLExport& rExp, @@ -104,8 +101,7 @@ public: // const OUString* pPrefix = 0L); bool exportDefaultStyle( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & xPropSet, + const css::uno::Reference< css::beans::XPropertySet > & xPropSet, const OUString& rXMLFamily, const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper ); diff --git a/include/xmloff/table/XMLTableExport.hxx b/include/xmloff/table/XMLTableExport.hxx index 2b354b20abbe..73ad0e32e5dc 100644 --- a/include/xmloff/table/XMLTableExport.hxx +++ b/include/xmloff/table/XMLTableExport.hxx @@ -45,7 +45,7 @@ class SvXMLExport; class SvXMLExportPropertyMapper; -typedef std::map< const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >, OUString > TableStyleMap; +typedef std::map< const css::uno::Reference< css::uno::XInterface >, OUString > TableStyleMap; struct XMLTableInfo { @@ -62,10 +62,10 @@ public: virtual ~XMLTableExport(); // This method collects all automatic styles for the given table - void collectTableAutoStyles(const com::sun::star::uno::Reference < com::sun::star::table::XColumnRowRange >& xColumnRowRange); + void collectTableAutoStyles(const css::uno::Reference < css::table::XColumnRowRange >& xColumnRowRange); // This method exports the given table - void exportTable(const com::sun::star::uno::Reference < com::sun::star::table::XColumnRowRange >& xColumnRowRange); + void exportTable(const css::uno::Reference < css::table::XColumnRowRange >& xColumnRowRange); // export the styles from the cell style family void exportTableStyles(); @@ -89,10 +89,10 @@ protected: const SvXMLExport& GetExport() const { return mrExport; } private: - SAL_DLLPRIVATE void ImpExportText( const com::sun::star::uno::Reference < com::sun::star::table::XCell >& xCell ); + SAL_DLLPRIVATE void ImpExportText( const css::uno::Reference < css::table::XCell >& xCell ); - void ExportCell( const com::sun::star::uno::Reference < com::sun::star::table::XCell >& xCell, const std::shared_ptr< XMLTableInfo >& pTableInfo, const OUString& sDefaultCellStyle ); - void ExportTableColumns( const com::sun::star::uno::Reference < com::sun::star::container::XIndexAccess >& xtableColumns, const std::shared_ptr< XMLTableInfo >& pTableInfo ); + void ExportCell( const css::uno::Reference < css::table::XCell >& xCell, const std::shared_ptr< XMLTableInfo >& pTableInfo, const OUString& sDefaultCellStyle ); + void ExportTableColumns( const css::uno::Reference < css::container::XIndexAccess >& xtableColumns, const std::shared_ptr< XMLTableInfo >& pTableInfo ); }; diff --git a/include/xmloff/table/XMLTableImport.hxx b/include/xmloff/table/XMLTableImport.hxx index 8e6bb2659627..81052c7c58c7 100644 --- a/include/xmloff/table/XMLTableImport.hxx +++ b/include/xmloff/table/XMLTableImport.hxx @@ -47,9 +47,9 @@ public: virtual ~XMLTableImport(); SvXMLImportContext* CreateTableContext( sal_uInt16 nPrfx, const OUString& rLName, - ::com::sun::star::uno::Reference< ::com::sun::star::table::XColumnRowRange >& xColumnRowRange ); + css::uno::Reference< css::table::XColumnRowRange >& xColumnRowRange ); - SvXMLStyleContext* CreateTableTemplateContext( sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + SvXMLStyleContext* CreateTableTemplateContext( sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); rtl::Reference< SvXMLImportPropertyMapper > GetCellImportPropertySetMapper() const { return mxCellImportPropertySetMapper; } rtl::Reference< SvXMLImportPropertyMapper > GetRowImportPropertySetMapper() const { return mxRowImportPropertySetMapper; } diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index d507e508f926..dd3afd774505 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -382,8 +382,7 @@ protected: virtual SvXMLImportContext *CreateTableChildContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); // access, lazy initialization and destruction of backpatchers // Code is implemented in XMLPropertyBackpatcher.cxx @@ -394,8 +393,7 @@ protected: public: XMLTextImportHelper( - ::com::sun::star::uno::Reference < - ::com::sun::star::frame::XModel> const& rModel, + css::uno::Reference< css::frame::XModel > const& rModel, SvXMLImport& rImport, bool const bInsertMode = false, bool const bStylesOnlyMode = false, bool const bProgress = false, bool const bBlockMode = false, @@ -404,8 +402,7 @@ public: virtual ~XMLTextImportHelper(); void SetCursor( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextCursor >& rCursor ); + const css::uno::Reference< css::text::XTextCursor >& rCursor ); void ResetCursor(); void SetAutoStyles( SvXMLStylesContext *pStyles ); @@ -413,8 +410,7 @@ public: SvXMLImportContext *CreateTextChildContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, XMLTextType eType = XML_TEXT_TYPE_SHAPE ); SvXMLTokenMap const& GetTextElemTokenMap(); @@ -430,12 +426,9 @@ public: const SvXMLTokenMap& GetTextListBlockElemTokenMap(); const SvXMLTokenMap& GetTextFieldAttrTokenMap(); // impl: txtfldi.cxx - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XText > & GetText(); - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextCursor > & GetCursor(); - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange > & GetCursorAsRange(); + css::uno::Reference< css::text::XText > & GetText(); + css::uno::Reference< css::text::XTextCursor > & GetCursor(); + css::uno::Reference< css::text::XTextRange > & GetCursorAsRange(); bool IsInsertMode() const; bool IsStylesOnlyMode() const; @@ -457,15 +450,13 @@ public: void DeleteParagraph(); void InsertControlCharacter( sal_Int16 nControl ); - void InsertTextContent( ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & xContent); + void InsertTextContent( css::uno::Reference< css::text::XTextContent > & xContent); // Add parameter <bOutlineLevelAttrFound> (#i73509#) // Add parameter <bSetListAttrs> in order to suppress the handling of the list attributes (#i80724#) OUString SetStyleAndAttrs( SvXMLImport& rImport, - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextCursor >& rCursor, + const css::uno::Reference< css::text::XTextCursor >& rCursor, const OUString& rStyleName, bool bPara, bool bOutlineLevelAttrFound = false, @@ -488,8 +479,7 @@ public: void SetHyperlink( SvXMLImport& rImport, - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextCursor >& rCursor, + const css::uno::Reference< css::text::XTextCursor >& rCursor, const OUString& rHRef, const OUString& rName, const OUString& rTargetFrameName, @@ -498,8 +488,7 @@ public: XMLEventsImportContext* pEvents = NULL); void SetRuby( SvXMLImport& rImport, - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextCursor >& rCursor, + const css::uno::Reference< css::text::XTextCursor >& rCursor, const OUString& rStyleName, const OUString& rTextStyleName, const OUString& rText ); @@ -519,31 +508,24 @@ public: XMLPropStyleContext* FindPageMaster( const OUString& rName ) const; - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameContainer> & GetParaStyles() const; + const css::uno::Reference< css::container::XNameContainer> & GetParaStyles() const; - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameContainer> & GetTextStyles() const; + const css::uno::Reference< css::container::XNameContainer> & GetTextStyles() const; - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameContainer> & + const css::uno::Reference< css::container::XNameContainer> & GetNumberingStyles() const; - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameContainer> & GetFrameStyles() const; + const css::uno::Reference< css::container::XNameContainer> & GetFrameStyles() const; - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameContainer> & GetPageStyles() const; + const css::uno::Reference< css::container::XNameContainer> & GetPageStyles() const; - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexReplace > & + const css::uno::Reference< css::container::XIndexReplace > & GetChapterNumbering() const; bool HasFrameByName( const OUString& rName ) const; void ConnectFrameChains( const OUString& rFrmName, const OUString& rNextFrmName, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet >& rFrmPropSet ); + const css::uno::Reference< css::beans::XPropertySet >& rFrmPropSet ); rtl::Reference< SvXMLImportPropertyMapper > const& GetParaImportPropertySetMapper() const; @@ -565,8 +547,7 @@ public: /// save the start of a range reference void InsertBookmarkStartRange( const OUString & sName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange> & rRange, + const css::uno::Reference< css::text::XTextRange> & rRange, OUString const& i_rXmlId, std::shared_ptr< ::xmloff::ParsedRDFaAttributes > & i_rpRDFaAttributes); @@ -574,18 +555,16 @@ public: /// process the start of a range reference bool FindAndRemoveBookmarkStartRange( const OUString & sName, - ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextRange> & o_rRange, + css::uno::Reference< css::text::XTextRange> & o_rRange, OUString & o_rXmlId, - std::shared_ptr< ::xmloff::ParsedRDFaAttributes > & - o_rpRDFaAttributes); + std::shared_ptr< ::xmloff::ParsedRDFaAttributes > & o_rpRDFaAttributes); OUString FindActiveBookmarkName(); void pushFieldCtx( const OUString& name, const OUString& type ); void popFieldCtx(); void addFieldParam( const OUString& name, const OUString& value ); - void setCurrentFieldParamsTo(::com::sun::star::uno::Reference< ::com::sun::star::text::XFormField> &xFormField); + void setCurrentFieldParamsTo(css::uno::Reference< css::text::XFormField> &xFormField); OUString getCurrentFieldType(); bool hasCurrentFieldCtx(); @@ -600,8 +579,7 @@ public: // Code is implemented in XMLPropertyBackpatcher.cxx void ProcessFootnoteReference( const OUString& sXMLId, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropSet); + const css::uno::Reference< css::beans::XPropertySet> & xPropSet); /// insert new sequence ID /// Also fixup open references from backpatch list to this ID. @@ -614,30 +592,26 @@ public: // Code is implemented in XMLPropertyBackpatcher.cxx void ProcessSequenceReference( const OUString& sXMLId, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropSet); + const css::uno::Reference< css::beans::XPropertySet> & xPropSet); bool IsInFrame() const; virtual bool IsInHeaderFooter() const; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> + virtual css::uno::Reference< css::beans::XPropertySet> createAndInsertOLEObject( SvXMLImport& rImport, const OUString& rHRef, const OUString &rStyleName, const OUString &rTblName, sal_Int32 nWidth, sal_Int32 nHeight ); - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> + virtual css::uno::Reference< css::beans::XPropertySet> createAndInsertOOoLink( SvXMLImport& rImport, const OUString& rHRef, const OUString &rStyleName, const OUString &rTblName, sal_Int32 nWidth, sal_Int32 nHeight ); - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> + virtual css::uno::Reference< css::beans::XPropertySet> createAndInsertApplet( const OUString &rName, const OUString &rCode, @@ -645,15 +619,13 @@ public: const OUString& rHRef, sal_Int32 nWidth, sal_Int32 nHeight ); - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> + virtual css::uno::Reference< css::beans::XPropertySet> createAndInsertPlugin( const OUString &rMimeType, const OUString& rHRef, sal_Int32 nWidth, sal_Int32 nHeight ); - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> + virtual css::uno::Reference< css::beans::XPropertySet> createAndInsertFloatingFrame( const OUString &rName, const OUString &rHRef, @@ -661,8 +633,7 @@ public: sal_Int32 nWidth, sal_Int32 nHeight ); virtual void endAppletOrPlugin( - const com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> &rPropSet, + const css::uno::Reference< css::beans::XPropertySet> &rPropSet, ::std::map < const OUString, OUString > &rParamMap ); // applet helper methods @@ -681,14 +652,13 @@ public: /// redline comment const OUString& rComment, /// date+time - const ::com::sun::star::util::DateTime& rDateTime, + const css::util::DateTime& rDateTime, /// merge last paras bool bMergeLastParagraph); - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextCursor> RedlineCreateText( + virtual css::uno::Reference< css::text::XTextCursor> RedlineCreateText( /// needed to get the document - ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > & rOldCursor, + css::uno::Reference< css::text::XTextCursor > & rOldCursor, /// ID used to RedlineAdd() call const OUString& rId); @@ -704,7 +674,7 @@ public: virtual void SetShowChanges( bool bShowChanges ); virtual void SetRecordChanges( bool bRecordChanges ); virtual void SetChangesProtectionKey( - const ::com::sun::star::uno::Sequence<sal_Int8> & rProtectionKey ); + const css::uno::Sequence<sal_Int8> & rProtectionKey ); /// get the last open redline ID OUString GetOpenRedlineId(); diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index 55c77564ea9f..3bf3427e1d22 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -114,9 +114,9 @@ public: void exportTextRangeSpan( - const ::com::sun::star::uno::Reference< com::sun::star::text::XTextRange > & rTextRange, - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xPropSet, - ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > & xPropSetInfo, + const css::uno::Reference< css::text::XTextRange > & rTextRange, + css::uno::Reference< css::beans::XPropertySet > & xPropSet, + css::uno::Reference < css::beans::XPropertySetInfo > & xPropSetInfo, const bool bIsUICharStyle, const bool bHasAutoStyle, const OUString& sStyle, @@ -246,165 +246,126 @@ public: } OUString FindTextStyleAndHyperlink( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet, + const css::uno::Reference< css::beans::XPropertySet > & rPropSet, bool& rbHyperlink, bool& rbHasCharStyle, bool& rbHasAutoStyle, const XMLPropertyState** pAddState = NULL) const; bool addHyperlinkAttributes( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertyState > & rPropState, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ); + const css::uno::Reference< css::beans::XPropertySet > & rPropSet, + const css::uno::Reference< css::beans::XPropertyState > & rPropState, + const css::uno::Reference< css::beans::XPropertySetInfo > & rPropSetInfo ); void exportTextRangeEnumeration( - const ::com::sun::star::uno::Reference < - ::com::sun::star::container::XEnumeration > & rRangeEnum, + const css::uno::Reference< css::container::XEnumeration > & rRangeEnum, bool bAutoStyles, bool bProgress, bool bPrvChrIsSpc = true ); protected: XMLShapeExportFlags addTextFrameAttributes( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet >& rPropSet, + const css::uno::Reference< css::beans::XPropertySet >& rPropSet, bool bShape, OUString *pMinHeightValue = 0, OUString *pMinWidthValue = 0 ); virtual void exportStyleAttributes( - const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ) override; + const css::uno::Reference< css::style::XStyle > & rStyle ) override; void exportPageFrames( bool bAutoStyles, bool bProgress ); void exportFrameFrames( bool bAutoStyles, bool bProgress, - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextFrame > *pParentTxtFrame = 0 ); + const css::uno::Reference< css::text::XTextFrame > *pParentTxtFrame = 0 ); void exportNumStyles( bool bUsed ); void exportText( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XText > & rText, + const css::uno::Reference < + css::text::XText > & rText, bool bAutoStyles, bool bProgress, bool bExportParagraph, TextPNS eExtensionNS = TextPNS::ODF ); void exportText( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XText > & rText, - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rBaseSection, + const css::uno::Reference< css::text::XText > & rText, + const css::uno::Reference< css::text::XTextSection > & rBaseSection, bool bAutoStyles, bool bProgress, bool bExportParagraph, TextPNS eExtensionNS = TextPNS::ODF ); bool exportTextContentEnumeration( - const ::com::sun::star::uno::Reference < - ::com::sun::star::container::XEnumeration > & rContentEnum, + const css::uno::Reference< css::container::XEnumeration > & rContentEnum, bool bAutoStyles, - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rBaseSection, + const css::uno::Reference< css::text::XTextSection > & rBaseSection, bool bProgress, bool bExportParagraph = true, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > *pRangePropSet = 0, + const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = 0, bool bExportLevels = true, TextPNS eExtensionNS = TextPNS::ODF); void exportParagraph( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rTextContent, + const css::uno::Reference< css::text::XTextContent > & rTextContent, bool bAutoStyles, bool bProgress, bool bExportParagraph, MultiPropertySetHelper& rPropSetHelper, TextPNS eExtensionNS = TextPNS::ODF); virtual void exportTable( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rTextContent, + const css::uno::Reference< css::text::XTextContent > & rTextContent, bool bAutoStyles, bool bProgress ); void exportTextField( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextRange > & rTextRange, + const css::uno::Reference< css::text::XTextRange > & rTextRange, bool bAutoStyles, bool bProgress ); void exportTextField( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextField> & xTextField, + const css::uno::Reference< css::text::XTextField> & xTextField, const bool bAutoStyles, const bool bProgress, const bool bRecursive ); void exportAnyTextFrame( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rTextContent, + const css::uno::Reference< css::text::XTextContent > & rTextContent, FrameType eTxpe, bool bAutoStyles, bool bProgress, bool bExportContent, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > *pRangePropSet = 0 ); + const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = 0 ); void _exportTextFrame( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo, + const css::uno::Reference< css::beans::XPropertySet > & rPropSet, + const css::uno::Reference< css::beans::XPropertySetInfo > & rPropSetInfo, bool bProgress ); inline void exportTextFrame( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rTextContent, + const css::uno::Reference< css::text::XTextContent > & rTextContent, bool bAutoStyles, bool bProgress, bool bExportContent, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > *pRangePropSet = 0 ); + const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = 0 ); inline void exportShape( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rTextContent, + const css::uno::Reference< css::text::XTextContent > & rTextContent, bool bAutoStyles, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > *pRangePropSet = 0 ); + const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = 0 ); void exportContour( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ); + const css::uno::Reference< css::beans::XPropertySet > & rPropSet, + const css::uno::Reference< css::beans::XPropertySetInfo > & rPropSetInfo ); void _exportTextGraphic( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ); + const css::uno::Reference< css::beans::XPropertySet > & rPropSet, + const css::uno::Reference< css::beans::XPropertySetInfo > & rPropSetInfo ); inline void exportTextGraphic( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rTextContent, + const css::uno::Reference< css::text::XTextContent > & rTextContent, bool bAutoStyles, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > *pRangePropSet = 0 ); + const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = 0 ); virtual void _collectTextEmbeddedAutoStyles( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet ); + const css::uno::Reference< css::beans::XPropertySet > & rPropSet ); virtual void _exportTextEmbedded( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ); + const css::uno::Reference< css::beans::XPropertySet > & rPropSet, + const css::uno::Reference< css::beans::XPropertySetInfo > & rPropSetInfo ); inline void exportTextEmbedded( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rTextContent, + const css::uno::Reference< css::text::XTextContent > & rTextContent, bool bAutoStyles, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > *pRangePropSet = 0 ); + const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = 0 ); /// export a footnote and styles void exportTextFootnote( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet, + const css::uno::Reference< css::beans::XPropertySet > & rPropSet, const OUString& sString, bool bAutoStyles, bool bProgress ); /// helper for exportTextFootnote void exportTextFootnoteHelper( - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XFootnote > & rPropSet, - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XText> & rText, + const css::uno::Reference< css::text::XFootnote > & rPropSet, + const css::uno::Reference< css::text::XText> & rText, const OUString& sString, bool bAutoStyles, bool bIsEndnote, bool bProgress ); @@ -413,25 +374,21 @@ protected: void exportTextFootnoteConfiguration(); void exportTextFootnoteConfigurationHelper( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rFootnoteSupplier, + const css::uno::Reference< css::beans::XPropertySet> & rFootnoteSupplier, bool bIsEndnote); void exportTextMark( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & xPropSet, + const css::uno::Reference< css::beans::XPropertySet> & xPropSet, const OUString& rProperty, const enum ::xmloff::token::XMLTokenEnum pElements[], bool bAutoStyles); void exportSoftPageBreak( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, + const css::uno::Reference< css::beans::XPropertySet> & rPropSet, bool bAutoStyles); void exportTextRange( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextRange > & rTextRange, + const css::uno::Reference< css::text::XTextRange > & rTextRange, bool bAutoStyles, bool& rPrevCharWasSpace, FieldmarkType& openFieldmarkType ); @@ -442,10 +399,8 @@ protected: /// check if current section or current list has changed; /// calls exortListChange as appropriate void exportListAndSectionChange( - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rOldSection, - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rNewSection, + css::uno::Reference< css::text::XTextSection > & rOldSection, + const css::uno::Reference< css::text::XTextSection > & rNewSection, const XMLTextNumRuleInfo& rOldList, const XMLTextNumRuleInfo& rNewList, bool bAutoStyles ); @@ -453,34 +408,28 @@ protected: /// overload for exportListAndSectionChange; /// takes new content rather than new section. void exportListAndSectionChange( - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rOldSection, - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rNewContent, + css::uno::Reference< css::text::XTextSection > & rOldSection, + const css::uno::Reference< css::text::XTextContent > & rNewContent, const XMLTextNumRuleInfo& rOldList, const XMLTextNumRuleInfo& rNewList, bool bAutoStyles ); void exportListAndSectionChange( - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rOldSection, + css::uno::Reference< css::text::XTextSection > & rOldSection, MultiPropertySetHelper& rPropSetHelper, sal_Int16 nTextSectionId, - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rNewContent, + const css::uno::Reference< css::text::XTextContent > & rNewContent, const XMLTextNumRuleInfo& rOldList, const XMLTextNumRuleInfo& rNewList, bool bAutoStyles ); /// export a ruby void exportRuby( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPortionPropSet, + const css::uno::Reference< css::beans::XPropertySet> & rPortionPropSet, bool bAutoStyles ); /// export a text:meta void exportMeta( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & i_xPortion, + const css::uno::Reference< css::beans::XPropertySet> & i_xPortion, bool i_bAutoStyles, bool i_isProgress ); public: @@ -495,20 +444,17 @@ public: void Add( sal_uInt16 nFamily, MultiPropertySetHelper& rPropSetHelper, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet, + const css::uno::Reference< css::beans::XPropertySet > & rPropSet, const XMLPropertyState** pAddState = NULL ); void Add( sal_uInt16 nFamily, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet, + const css::uno::Reference< css::beans::XPropertySet > & rPropSet, const XMLPropertyState** pAddState = NULL, bool bDontSeek = false ); /// find style name for specified family and parent OUString Find( sal_uInt16 nFamily, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > & rPropSet, + const css::uno::Reference< css::beans::XPropertySet > & rPropSet, const OUString& rParent, const XMLPropertyState** pAddState = NULL ) const; @@ -531,8 +477,7 @@ public: /// export the (text field) declarations for a particular XText void exportTextDeclarations( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XText > & rText ); + const css::uno::Reference< css::text::XText > & rText ); /// true: export only those declarations that are used; /// false: export all declarations @@ -544,8 +489,7 @@ public: /// Export the list of change information (enclosed by <tracked-changes>) /// (or the necessary automatic styles) - void exportTrackedChanges(const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XText > & rText, + void exportTrackedChanges(const css::uno::Reference< css::text::XText > & rText, bool bAutoStyle ); /// Record tracked changes for this particular XText @@ -554,8 +498,7 @@ public: /// be exported separately via the exportTrackedChanges(bool, /// Reference<XText>) method. void recordTrackedChangesForXText( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XText > & rText ); + const css::uno::Reference< css::text::XText > & rText ); /// Stop recording tracked changes. @@ -572,8 +515,7 @@ public: // This method collects all automatic styles for the given XText void collectTextAutoStyles( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XText > & rText, + const css::uno::Reference< css::text::XText > & rText, bool bIsProgress = false, bool bExportParagraph = true ) { @@ -581,10 +523,8 @@ public: } void collectTextAutoStyles( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XText > & rText, - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rBaseSection, + const css::uno::Reference< css::text::XText > & rText, + const css::uno::Reference< css::text::XTextSection > & rBaseSection, bool bIsProgress = false, bool bExportParagraph = true ) { @@ -599,16 +539,15 @@ public: // This method exports all automatic styles that have been collected. void exportTextAutoStyles(); - void exportEvents( const ::com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet > & rPropSet ); + void exportEvents( const css::uno::Reference< css::beans::XPropertySet > & rPropSet ); // Implement Title/Description Elements UI (#i73249#) - void exportTitleAndDescription( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet, - const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo ); + void exportTitleAndDescription( const css::uno::Reference< css::beans::XPropertySet > & rPropSet, + const css::uno::Reference< css::beans::XPropertySetInfo > & rPropSetInfo ); // This method exports the given XText void exportText( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XText > & rText, + const css::uno::Reference< css::text::XText > & rText, bool bIsProgress = false, bool bExportParagraph = true, TextPNS eExtensionNS = TextPNS::ODF) { @@ -616,10 +555,8 @@ public: } void exportText( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XText > & rText, - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextSection > & rBaseSection, + const css::uno::Reference< css::text::XText > & rText, + const css::uno::Reference< css::text::XTextSection > & rBaseSection, bool bIsProgress = false, bool bExportParagraph = true, TextPNS eExtensionNS = TextPNS::ODF) @@ -632,8 +569,7 @@ public: exportPageFrames( false, bIsProgress ); } void exportFramesBoundToFrame( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextFrame >& rParentTxtFrame, + const css::uno::Reference< css::text::XTextFrame >& rParentTxtFrame, bool bIsProgress = false ) { exportFrameFrames( false, bIsProgress, &rParentTxtFrame ); @@ -662,8 +598,7 @@ public: * XMLSectionExport, which is only available here. */ void PreventExportOfControlsInMuteSections( - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexAccess> & rShapes, + const css::uno::Reference< css::container::XIndexAccess> & rShapes, rtl::Reference<xmloff::OFormLayerXMLExport> xFormExport ); SinglePropertySetInfoCache& GetCharStyleNamesPropInfoCache() { return aCharStyleNamesPropInfoCache; } @@ -683,44 +618,36 @@ inline const XMLTextListAutoStylePool& } inline void XMLTextParagraphExport::exportTextFrame( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rTextContent, + const css::uno::Reference< css::text::XTextContent > & rTextContent, bool bAutoStyles, bool bIsProgress, bool bExportContent, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > *pRangePropSet) + const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet) { exportAnyTextFrame( rTextContent, FT_TEXT, bAutoStyles, bIsProgress, bExportContent, pRangePropSet ); } inline void XMLTextParagraphExport::exportTextGraphic( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rTextContent, + const css::uno::Reference< css::text::XTextContent > & rTextContent, bool bAutoStyles, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > *pRangePropSet ) + const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet ) { exportAnyTextFrame( rTextContent, FT_GRAPHIC, bAutoStyles, false, true, pRangePropSet ); } inline void XMLTextParagraphExport::exportTextEmbedded( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rTextContent, + const css::uno::Reference< css::text::XTextContent > & rTextContent, bool bAutoStyles, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > *pRangePropSet ) + const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet ) { exportAnyTextFrame( rTextContent, FT_EMBEDDED, bAutoStyles, false, true, pRangePropSet ); } inline void XMLTextParagraphExport::exportShape( - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextContent > & rTextContent, + const css::uno::Reference< css::text::XTextContent > & rTextContent, bool bAutoStyles, - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet > *pRangePropSet ) + const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet ) { exportAnyTextFrame( rTextContent, FT_SHAPE, bAutoStyles, false, true, pRangePropSet ); diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx index e616573407b6..c3b990fb0789 100644 --- a/include/xmloff/txtstyli.hxx +++ b/include/xmloff/txtstyli.hxx @@ -67,8 +67,7 @@ public: XMLTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle = false ); virtual ~XMLTextStyleContext(); @@ -76,7 +75,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; const OUString& GetListStyle() const { return sListStyleName; } // XML import: reconstrution of assignment of paragraph style to outline levels (#i69629#) @@ -96,8 +95,7 @@ public: // override FillPropertySet, so we can get at the combined characters virtual void FillPropertySet( - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ) override; + const css::uno::Reference< css::beans::XPropertySet > & rPropSet ) override; inline bool HasCombinedCharactersLetter() { return bHasCombinedCharactersLetter; } diff --git a/include/xmloff/unoatrcn.hxx b/include/xmloff/unoatrcn.hxx index ddb71e72afa3..59c2c2026e3b 100644 --- a/include/xmloff/unoatrcn.hxx +++ b/include/xmloff/unoatrcn.hxx @@ -30,15 +30,15 @@ #include <cppuhelper/implbase3.hxx> -extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SvUnoAttributeContainer_CreateInstance(); +extern css::uno::Reference< css::uno::XInterface > SvUnoAttributeContainer_CreateInstance(); class SvXMLAttrContainerData; class XMLOFF_DLLPUBLIC SvUnoAttributeContainer: public ::cppu::WeakAggImplHelper3< - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::container::XNameContainer > + css::lang::XServiceInfo, + css::lang::XUnoTunnel, + css::container::XNameContainer > { private: SvXMLAttrContainerData* mpContainer; @@ -52,31 +52,31 @@ public: SvXMLAttrContainerData* GetContainerImpl() const { return mpContainer; } - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::container::XElementAccess + virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception ) override; - // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const OUString& aName) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::container::XNameAccess + virtual css::uno::Any SAL_CALL getByName(const OUString& aName) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override; - // ::com::sun::star::container::XNameReplace - virtual void SAL_CALL replaceByName(const OUString& aName, const ::com::sun::star::uno::Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::container::XNameReplace + virtual void SAL_CALL replaceByName(const OUString& aName, const css::uno::Any& aElement) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - // ::com::sun::star::container::XNameContainer - virtual void SAL_CALL insertByName(const OUString& aName, const ::com::sun::star::uno::Any& aElement) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeByName(const OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::container::XNameContainer + virtual void SAL_CALL insertByName(const OUString& aName, const css::uno::Any& aElement) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::lang::XServiceInfo + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; - friend ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SvUnoAttributeContainer_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr ) throw( ::com::sun::star::uno::Exception ); + friend css::uno::Reference< css::uno::XInterface > SvUnoAttributeContainer_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception ); }; #endif diff --git a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx index 2bde5003c7c0..28156d0570d7 100644 --- a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx +++ b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx @@ -31,7 +31,7 @@ namespace comphelper { -typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > IdMap_t; +typedef ::std::map< OUString, css::uno::Reference< css::uno::XInterface > > IdMap_t; class XMLOFF_DLLPUBLIC UnoInterfaceToUniqueIdentifierMapper { @@ -41,38 +41,38 @@ public: /** returns a unique identifier for the given uno object. IF a uno object is registered more than once, the returned identifier is always the same. */ - const OUString& registerReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface ); + const OUString& registerReference( const css::uno::Reference< css::uno::XInterface >& rInterface ); /** registers the given uno object with the given identifier. @returns false, if the given identifier already exists and is not associated with the given interface */ - bool registerReference( const OUString& rIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface ); + bool registerReference( const OUString& rIdentifier, const css::uno::Reference< css::uno::XInterface >& rInterface ); /** always registers the given uno object with the given identifier. In contrast to registerReference(), this here overwrites any earlier registration of the same identifier */ - void registerReferenceAlways( const rtl::OUString& rIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface ); + void registerReferenceAlways( const rtl::OUString& rIdentifier, const css::uno::Reference< css::uno::XInterface >& rInterface ); /** @returns the identifier for the given uno object. If this uno object is not already registered, an empty string is returned */ - const OUString& getIdentifier( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface ) const; + const OUString& getIdentifier( const css::uno::Reference< css::uno::XInterface >& rInterface ) const; /** @returns the uno object that is registered with the given identifier. If no uno object is registered with the given identifier, an empty reference is returned. */ - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& getReference( const OUString& rIdentifier ) const; + const css::uno::Reference< css::uno::XInterface >& getReference( const OUString& rIdentifier ) const; private: - bool findReference( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface, IdMap_t::const_iterator& rIter ) const; + bool findReference( const css::uno::Reference< css::uno::XInterface >& rInterface, IdMap_t::const_iterator& rIter ) const; bool findIdentifier( const OUString& rIdentifier, IdMap_t::const_iterator& rIter ) const; - void insertReference( const OUString& rIdentifier, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rInterface ); + void insertReference( const OUString& rIdentifier, const css::uno::Reference< css::uno::XInterface >& rInterface ); IdMap_t maEntries; sal_Int32 mnNextId; diff --git a/include/xmloff/xformsexport.hxx b/include/xmloff/xformsexport.hxx index 6fdfb1abaffd..bba51b2af13b 100644 --- a/include/xmloff/xformsexport.hxx +++ b/include/xmloff/xformsexport.hxx @@ -35,18 +35,18 @@ namespace com { namespace sun { namespace star { /** export an XForms model. */ void SAL_DLLPRIVATE exportXForms( SvXMLExport& ); -OUString SAL_DLLPRIVATE getXFormsBindName( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xBinding ); +OUString SAL_DLLPRIVATE getXFormsBindName( const css::uno::Reference<css::beans::XPropertySet>& xBinding ); -OUString SAL_DLLPRIVATE getXFormsListBindName( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xBinding ); +OUString SAL_DLLPRIVATE getXFormsListBindName( const css::uno::Reference<css::beans::XPropertySet>& xBinding ); -OUString SAL_DLLPRIVATE getXFormsSubmissionName( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xBinding ); +OUString SAL_DLLPRIVATE getXFormsSubmissionName( const css::uno::Reference<css::beans::XPropertySet>& xBinding ); /** returns the settings of the given XForms container, to be exported as document specific settings */ void XMLOFF_DLLPUBLIC getXFormsSettings( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rXForms, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _out_rSettings + const css::uno::Reference< css::container::XNameAccess >& _rXForms, + css::uno::Sequence< css::beans::PropertyValue >& _out_rSettings ); #endif diff --git a/include/xmloff/xformsimport.hxx b/include/xmloff/xformsimport.hxx index f63b383a7635..4aa509d3d502 100644 --- a/include/xmloff/xformsimport.hxx +++ b/include/xmloff/xformsimport.hxx @@ -45,8 +45,8 @@ XMLOFF_DLLPUBLIC SvXMLImportContext* createXFormsModelContext( * @param pair<XForms binding ID, reference to control> */ void bindXFormsValueBinding( - com::sun::star::uno::Reference<com::sun::star::frame::XModel>, - std::pair<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>,OUString> ); + css::uno::Reference<css::frame::XModel>, + std::pair<css::uno::Reference<css::beans::XPropertySet>,OUString> ); /** perform the actual binding of an XForms-binding as list source with a list control @@ -54,22 +54,22 @@ void bindXFormsValueBinding( * @param pair<XForms binding ID, reference to control> */ void bindXFormsListBinding( - com::sun::star::uno::Reference<com::sun::star::frame::XModel>, - std::pair<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>,OUString> ); + css::uno::Reference<css::frame::XModel>, + std::pair<css::uno::Reference<css::beans::XPropertySet>,OUString> ); /** perform the actual binding of an XForms submission with the suitable control * @param document which contains the XForms-model(s) * @param pair<XForms submission ID, reference to control> */ void bindXFormsSubmission( - com::sun::star::uno::Reference<com::sun::star::frame::XModel>, - std::pair<com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>,OUString> ); + css::uno::Reference<css::frame::XModel>, + std::pair<css::uno::Reference<css::beans::XPropertySet>,OUString> ); /** applies the given settings to the given XForms container */ void XMLOFF_DLLPUBLIC applyXFormsSettings( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rXForms, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rSettings + const css::uno::Reference< css::container::XNameAccess >& _rXForms, + const css::uno::Sequence< css::beans::PropertyValue >& _rSettings ); #endif diff --git a/include/xmloff/xmlaustp.hxx b/include/xmloff/xmlaustp.hxx index 812f69ffef93..d7e8f4ac99cc 100644 --- a/include/xmloff/xmlaustp.hxx +++ b/include/xmloff/xmlaustp.hxx @@ -48,18 +48,18 @@ protected: SvXMLAttributeList& rAttrList, sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties, - const SvXMLExportPropertyMapper& rPropExp - , const SvXMLUnitConverter& rUnitConverter, + const SvXMLExportPropertyMapper& rPropExp, + const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const; // this methode is executed after Properties Export, so you can e.g. export a map or so on virtual void exportStyleContent( - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, + const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler, sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties, - const SvXMLExportPropertyMapper& rPropExp - , const SvXMLUnitConverter& rUnitConverter, + const SvXMLExportPropertyMapper& rPropExp, + const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const; @@ -89,13 +89,13 @@ public: /// retrieve the registered names (names + families) void GetRegisteredNames( - com::sun::star::uno::Sequence<sal_Int32>& aFamilies, - com::sun::star::uno::Sequence<OUString>& aNames ); + css::uno::Sequence<sal_Int32>& aFamilies, + css::uno::Sequence<OUString>& aNames ); /// register (families + names) void RegisterNames( - com::sun::star::uno::Sequence<sal_Int32>& aFamilies, - com::sun::star::uno::Sequence<OUString>& aNames ); + css::uno::Sequence<sal_Int32>& aFamilies, + css::uno::Sequence<OUString>& aNames ); /// Add an item set to the pool and return its generated name. OUString Add( sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties ); @@ -110,8 +110,8 @@ public: OUString Find( sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties ) const; /** Export all item sets ofs a certain class in the order in that they have been added. */ - void exportXML( sal_Int32 nFamily - , const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, + void exportXML( sal_Int32 nFamily, + const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap ) const; diff --git a/include/xmloff/xmlerror.hxx b/include/xmloff/xmlerror.hxx index 853af45923af..96cace370dd8 100644 --- a/include/xmloff/xmlerror.hxx +++ b/include/xmloff/xmlerror.hxx @@ -114,8 +114,7 @@ public: /// add a new entry to the list of error messages void AddRecord( sal_Int32 nId, /// error ID == error flags + error class + error number - const ::com::sun::star::uno::Sequence< - OUString> & rParams, /// parameters for error message + const css::uno::Sequence< OUString> & rParams, /// parameters for error message const OUString& rExceptionMessage, /// original exception string sal_Int32 nRow, /// XLocator: file row number sal_Int32 nColumn, /// XLocator: file column number @@ -124,18 +123,16 @@ public: void AddRecord( sal_Int32 nId, /// error ID == error flags + error class + error number - const ::com::sun::star::uno::Sequence< - OUString> & rParams, /// parameters for error message + const css::uno::Sequence<OUString> & rParams, /// parameters for error message const OUString& rExceptionMessage, /// original exception string - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XLocator> & rLocator); /// location + const css::uno::Reference<css::xml::sax::XLocator> & rLocator); /// location /** * throw a SAXParseException that describes the first error that matches * the given mask */ void ThrowErrorAsSAXException( sal_Int32 nIdMask ) - throw( ::com::sun::star::xml::sax::SAXParseException ); + throw( css::xml::sax::SAXParseException ); }; #endif diff --git a/include/xmloff/xmlevent.hxx b/include/xmloff/xmlevent.hxx index d3acf0eff261..0a2220d8e03a 100644 --- a/include/xmloff/xmlevent.hxx +++ b/include/xmloff/xmlevent.hxx @@ -96,9 +96,8 @@ public: virtual void Export( SvXMLExport& rExport, /// the current XML export const OUString& rEventQName, /// the XML name of the event - ::com::sun::star::uno::Sequence< /// the values for the event - ::com::sun::star::beans::PropertyValue> & rValues, - bool bUseWhitespace) = 0; /// create whitespace around elements? + css::uno::Sequence<css::beans::PropertyValue> & rValues, /// the values for the event + bool bUseWhitespace) = 0; /// create whitespace around elements? }; @@ -129,8 +128,7 @@ public: SvXMLImport& rImport, /// import context sal_uInt16 nPrefix, /// element: namespace prefix const OUString& rLocalName, /// element: local name - const ::com::sun::star::uno::Reference< /// attribute list - ::com::sun::star::xml::sax::XAttributeList> & xAttrList, + const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList, /// attribute list /// the context for the enclosing <script:events> element XMLEventsImportContext* rEvents, /// the event name (as understood by the API) diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index 3a51c24e5df8..7698d01b3490 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -108,30 +108,30 @@ namespace o3tl } class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6< - ::com::sun::star::document::XFilter, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::document::XExporter, - ::com::sun::star::lang::XInitialization, - ::com::sun::star::container::XNamed, - ::com::sun::star::lang::XUnoTunnel> + css::document::XFilter, + css::lang::XServiceInfo, + css::document::XExporter, + css::lang::XInitialization, + css::container::XNamed, + css::lang::XUnoTunnel> { SvXMLExport_Impl *mpImpl; // dummy - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; OUString m_implementationName; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler; // the handlers - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XExtendedDocumentHandler > mxExtHandler; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > mxNumberFormatsSupplier; - ::com::sun::star::uno::Reference< ::com::sun::star::document::XGraphicObjectResolver > mxGraphicResolver; - ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedObjectResolver > mxEmbeddedResolver; - ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > mxStatusIndicator; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxExportInfo; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > mxEventListener; + css::uno::Reference< css::frame::XModel > mxModel; + css::uno::Reference< css::xml::sax::XDocumentHandler > mxHandler; // the handlers + css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > mxExtHandler; + css::uno::Reference< css::util::XNumberFormatsSupplier > mxNumberFormatsSupplier; + css::uno::Reference< css::document::XGraphicObjectResolver > mxGraphicResolver; + css::uno::Reference< css::document::XEmbeddedObjectResolver > mxEmbeddedResolver; + css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator; + css::uno::Reference< css::beans::XPropertySet > mxExportInfo; + css::uno::Reference< css::lang::XEventListener > mxEventListener; SvXMLAttributeList *mpAttrList; // a common attribute list - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > mxAttrList; // and an interface of it + css::uno::Reference< css::xml::sax::XAttributeList > mxAttrList; // and an interface of it OUString msOrigFileName; // the original URL OUString msGraphicObjectProtocol; @@ -180,7 +180,7 @@ private: // <office:master-styles> SAL_DLLPRIVATE void ImplExportContent(); // <office:body> virtual void SetBodyAttributes(); - void GetViewSettingsAndViews(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps); + void GetViewSettingsAndViews(css::uno::Sequence<css::beans::PropertyValue>& rProps); protected: void setExportFlags( SvXMLExportFlags nExportFlags ) { mnExportFlags = nExportFlags; } @@ -233,13 +233,13 @@ protected: virtual XMLPageExport* CreatePageExport(); virtual XMLFontAutoStylePool* CreateFontAutoStylePool(); xmloff::OFormLayerXMLExport* CreateFormExport(); - virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps); - virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps); + virtual void GetViewSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps); + virtual void GetConfigurationSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps); struct SettingsGroup { - ::xmloff::token::XMLTokenEnum eGroupName; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSettings; + ::xmloff::token::XMLTokenEnum eGroupName; + css::uno::Sequence< css::beans::PropertyValue > aSettings; SettingsGroup() :eGroupName( ::xmloff::token::XML_TOKEN_INVALID ) @@ -249,7 +249,7 @@ protected: SettingsGroup( const ::xmloff::token::XMLTokenEnum _eGroupName, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rSettings ) + const css::uno::Sequence< css::beans::PropertyValue >& _rSettings ) :eGroupName( _eGroupName ) ,aSettings( _rSettings ) { @@ -265,64 +265,64 @@ protected: */ virtual sal_Int32 GetDocumentSpecificSettings( ::std::list< SettingsGroup >& _out_rSettings ); - const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedObjectResolver >& GetEmbeddedResolver() const { return mxEmbeddedResolver; } - inline void SetEmbeddedResolver( com::sun::star::uno::Reference< com::sun::star::document::XEmbeddedObjectResolver >& _xEmbeddedResolver ); + const css::uno::Reference< css::document::XEmbeddedObjectResolver >& GetEmbeddedResolver() const { return mxEmbeddedResolver; } + inline void SetEmbeddedResolver( css::uno::Reference< css::document::XEmbeddedObjectResolver >& _xEmbeddedResolver ); - const ::com::sun::star::uno::Reference< ::com::sun::star::document::XGraphicObjectResolver >& GetGraphicResolver() const { return mxGraphicResolver; } - void SetGraphicResolver( com::sun::star::uno::Reference< com::sun::star::document::XGraphicObjectResolver >& _xGraphicResolver ); + const css::uno::Reference< css::document::XGraphicObjectResolver >& GetGraphicResolver() const { return mxGraphicResolver; } + void SetGraphicResolver( css::uno::Reference< css::document::XGraphicObjectResolver >& _xGraphicResolver ); - void SetDocHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > &rHandler ); + void SetDocHandler( const css::uno::Reference< css::xml::sax::XDocumentHandler > &rHandler ); public: SvXMLExport( sal_Int16 const eDefaultMeasureUnit /*css::util::MeasureUnit*/, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, const enum ::xmloff::token::XMLTokenEnum eClass = xmloff::token::XML_TOKEN_INVALID, SvXMLExportFlags nExportFlag = SvXMLExportFlags::ALL ); SvXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, const OUString& rFileName, sal_Int16 const eDefaultMeasureUnit /*css::util::MeasureUnit*/, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler); + const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler); SvXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, const OUString& rFileName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > &, + const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler, + const css::uno::Reference< css::frame::XModel > &, FieldUnit const eDefaultFieldUnit ); virtual ~SvXMLExport(); - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - static SvXMLExport* getImplementation( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ) throw(); + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); + static SvXMLExport* getImplementation( css::uno::Reference< css::uno::XInterface > ) throw(); // XExporter - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // XFilter - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel() throw(css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) final override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) final override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) final override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) final override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) final override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) final override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; /** ensures that the given namespace is in scope at the next started element. @@ -386,7 +386,7 @@ public: also switches nPrefix XML_NAMESPACE_FO to XML_NAMESPACE_STYLE */ void AddLanguageTagAttributes( sal_uInt16 nPrefix, sal_uInt16 nPrefixRfc, - const ::com::sun::star::lang::Locale& rLocale, bool bWriteEmpty, + const css::lang::Locale& rLocale, bool bWriteEmpty, enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_LANGUAGE ); /** Same as AddLanguageTagAttributes() but with LanguageTag parameter @@ -397,16 +397,16 @@ public: enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_LANGUAGE ); // add several attributes to the common attribute list - void AddAttributeList( const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + void AddAttributeList( const css::uno::Reference< + css::xml::sax::XAttributeList >& xAttrList ); // Get common attribute list as implementation or interface. SvXMLAttributeList &GetAttrList() { return *mpAttrList; } - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & GetXAttrList() { return mxAttrList; } + const css::uno::Reference< css::xml::sax::XAttributeList > & GetXAttrList() { return mxAttrList; } // Get document handler. This methods are not const, because the // reference allowes modifications through the handler. - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & GetDocHandler() { return mxHandler; } + const css::uno::Reference< css::xml::sax::XDocumentHandler > & GetDocHandler() { return mxHandler; } // Get original URL. const OUString& GetOrigFileName() const { return msOrigFileName; } @@ -430,14 +430,14 @@ public: virtual OUString getDataStyleName(const sal_Int32 nNumberFormat, bool bTimeFormat = false ) const; sal_Int32 dataStyleForceSystemLanguage(sal_Int32 nFormat) const; - virtual void exportAnnotationMeta( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape); + virtual void exportAnnotationMeta( const css::uno::Reference < css::drawing::XShape >& xShape); // Get XModel - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & + const css::uno::Reference< css::frame::XModel > & GetModel() const { return mxModel; } // Get XNumberFormatsSupplier - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & GetNumberFormatsSupplier() { return mxNumberFormatsSupplier; } - inline void SetNumberFormatsSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& _xNumberFormatSupplier) + css::uno::Reference< css::util::XNumberFormatsSupplier > & GetNumberFormatsSupplier() { return mxNumberFormatsSupplier; } + inline void SetNumberFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier >& _xNumberFormatSupplier) { mxNumberFormatsSupplier = _xNumberFormatSupplier; if ( mxNumberFormatsSupplier.is() && mxHandler.is() ) @@ -469,9 +469,9 @@ public: inline bool HasFormExport(); // get XPropertySet with export information - inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getExportInfo() const { return mxExportInfo; } + inline css::uno::Reference< css::beans::XPropertySet > getExportInfo() const { return mxExportInfo; } - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > GetStatusIndicator() { return mxStatusIndicator; } + css::uno::Reference< css::task::XStatusIndicator > GetStatusIndicator() { return mxStatusIndicator; } /// get Event export, with handlers for script types "None" and /// "StarBasic" already registered; other handlers may be registered, too. @@ -500,8 +500,7 @@ public: SvXMLExportFlags getExportFlags() const { return mnExportFlags; } bool ExportEmbeddedOwnObject( - ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XComponent >& rComp ); + css::uno::Reference<css::lang::XComponent >& rComp ); OUString GetRelativeReference(const OUString& rValue); @@ -528,16 +527,15 @@ public: /// error ID, may contain an error flag sal_Int32 nId, /// string parameters for the error message - const ::com::sun::star::uno::Sequence< OUString> & rMsgParams, + const css::uno::Sequence< OUString> & rMsgParams, /// original exception message (if applicable) const OUString& rExceptionMessage, /// error location (if applicable) - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XLocator> & rLocator ); + const css::uno::Reference<css::xml::sax::XLocator> & rLocator ); void SetError( sal_Int32 nId, - const ::com::sun::star::uno::Sequence< OUString> & rMsgParams); + const css::uno::Sequence< OUString> & rMsgParams); /** return current error flags (logical 'or' of all error flags so far) */ SvXMLErrorFlags GetErrorFlags() { return mnErrorFlags; } @@ -546,7 +544,7 @@ public: ::comphelper::UnoInterfaceToUniqueIdentifierMapper& getInterfaceToIdentifierMapper(); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getComponentContext() { return m_xContext;} + css::uno::Reference< css::uno::XComponentContext > getComponentContext() { return m_xContext;} // Shapes in Writer cannot be named via context menu (#i51726#) SvtModuleOptions::EFactory GetModelType() const @@ -557,7 +555,7 @@ public: // Written OpenDocument file format doesn't fit to the created text document (#i69627#) bool writeOutlineStyleAsNormalListStyle() const; - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetTargetStorage(); + css::uno::Reference< css::embed::XStorage > GetTargetStorage(); /// returns the currently configured default version for odf export SvtSaveOptions::ODFDefaultVersion getDefaultVersion() const; @@ -575,12 +573,10 @@ public: sal_uInt16 const nLegacyPrefix, OUString const& rValue); /// add xml:id attribute (for RDF metadata) - void AddAttributeXmlId(::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface> const & i_xIfc); + void AddAttributeXmlId(css::uno::Reference<css::uno::XInterface> const & i_xIfc); /// add RDFa attributes for a metadatable text content - void AddAttributesRDFa( ::com::sun::star::uno::Reference< - ::com::sun::star::text::XTextContent> const & i_xTextContent); + void AddAttributesRDFa( css::uno::Reference<css::text::XTextContent> const & i_xTextContent); bool exportTextNumberElement() const; @@ -650,13 +646,13 @@ inline bool SvXMLExport::HasFormExport() } inline void SvXMLExport::SetEmbeddedResolver( - com::sun::star::uno::Reference< com::sun::star::document::XEmbeddedObjectResolver >& _xEmbeddedResolver ) + css::uno::Reference< css::document::XEmbeddedObjectResolver >& _xEmbeddedResolver ) { mxEmbeddedResolver = _xEmbeddedResolver; } inline void SvXMLExport::SetGraphicResolver( - com::sun::star::uno::Reference< com::sun::star::document::XGraphicObjectResolver >& _xGraphicResolver ) + css::uno::Reference< css::document::XGraphicObjectResolver >& _xGraphicResolver ) { mxGraphicResolver = _xGraphicResolver; } diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx index 91d323cbe605..ad44774845e9 100644 --- a/include/xmloff/xmlexppr.hxx +++ b/include/xmloff/xmlexppr.hxx @@ -70,8 +70,7 @@ protected: virtual void ContextFilter( bool bEnableFoFontFamily, ::std::vector< XMLPropertyState >& rProperties, - ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > rPropSet ) const; + css::uno::Reference<css::beans::XPropertySet > rPropSet ) const; /** fills the given attribute list with the items in the given set */ void _exportXML( sal_uInt16 nPropType, sal_uInt16& rPropTypeFlags, diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx index 2b1d00890331..fa31930b6b77 100644 --- a/include/xmloff/xmlictxt.hxx +++ b/include/xmloff/xmlictxt.hxx @@ -79,12 +79,12 @@ public: * CreateContext method is called to create a new default context. */ virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); /** StartElement is called after a context has been constructed and * before a elements context is parsed. It may be used for actions that * require virtual methods. The default is to do nothing. */ - virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); /** EndElement is called before a context will be destructed, but * after a elements context has been parsed. It may be used for actions @@ -95,7 +95,7 @@ public: * current element. The default is to ignore them. */ virtual void Characters( const OUString& rChars ); - // ::com::sun::star::xml::sax::XFastContextHandler: + // css::xml::sax::XFastContextHandler: virtual void SAL_CALL startFastElement (sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 453fe5fc6b49..04a6e7223828 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -104,22 +104,22 @@ namespace o3tl class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper7< - ::com::sun::star::xml::sax::XExtendedDocumentHandler, - ::com::sun::star::xml::sax::XFastDocumentHandler, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XInitialization, - ::com::sun::star::document::XImporter, - ::com::sun::star::document::XFilter, - ::com::sun::star::lang::XUnoTunnel> + css::xml::sax::XExtendedDocumentHandler, + css::xml::sax::XFastDocumentHandler, + css::lang::XServiceInfo, + css::lang::XInitialization, + css::document::XImporter, + css::document::XFilter, + css::lang::XUnoTunnel> { friend class SvXMLImportContext; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > mxLocator; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > mxNumberFormatsSupplier; - ::com::sun::star::uno::Reference< ::com::sun::star::document::XGraphicObjectResolver > mxGraphicResolver; - ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedObjectResolver > mxEmbeddedResolver; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxImportInfo; + css::uno::Reference< css::xml::sax::XLocator > mxLocator; + css::uno::Reference< css::frame::XModel > mxModel; + css::uno::Reference< css::util::XNumberFormatsSupplier > mxNumberFormatsSupplier; + css::uno::Reference< css::document::XGraphicObjectResolver > mxGraphicResolver; + css::uno::Reference< css::document::XEmbeddedObjectResolver > mxEmbeddedResolver; + css::uno::Reference< css::beans::XPropertySet > mxImportInfo; rtl::Reference< XMLTextImportHelper > mxTextImport; rtl::Reference< XMLShapeImportHelper > mxShapeImport; @@ -131,14 +131,14 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper7< SvXMLImportContextRef mxAutoStyles; SvXMLImportContextRef mxMasterStyles; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxGradientHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxHatchHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxBitmapHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxTransGradientHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxMarkerHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxDashHelper; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > mxNumberStyles; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > mxEventListener; + css::uno::Reference< css::container::XNameContainer > mxGradientHelper; + css::uno::Reference< css::container::XNameContainer > mxHatchHelper; + css::uno::Reference< css::container::XNameContainer > mxBitmapHelper; + css::uno::Reference< css::container::XNameContainer > mxTransGradientHelper; + css::uno::Reference< css::container::XNameContainer > mxMarkerHelper; + css::uno::Reference< css::container::XNameContainer > mxDashHelper; + css::uno::Reference< css::container::XNameContainer > mxNumberStyles; + css::uno::Reference< css::lang::XEventListener > mxEventListener; SvXMLImport_Impl *mpImpl; // dummy @@ -161,7 +161,7 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper7< protected: - ::com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > mxStatusIndicator; + css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator; bool mbIsFormsSupported; bool mbIsTableShapeSupported; bool mbIsGraphicLoadOnDemandSupported; @@ -170,7 +170,7 @@ protected: // before a context for the current element has been pushed. virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); virtual SvXMLImportContext *CreateFastContext( sal_Int32 Element, const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList >& xAttrList ); @@ -190,11 +190,11 @@ protected: bool IsODFVersionConsistent( const OUString& aODFVersion ); - const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedObjectResolver >& GetEmbeddedResolver() const { return mxEmbeddedResolver; } - inline void SetEmbeddedResolver( com::sun::star::uno::Reference< com::sun::star::document::XEmbeddedObjectResolver >& _xEmbeddedResolver ); + const css::uno::Reference< css::document::XEmbeddedObjectResolver >& GetEmbeddedResolver() const { return mxEmbeddedResolver; } + inline void SetEmbeddedResolver( css::uno::Reference< css::document::XEmbeddedObjectResolver >& _xEmbeddedResolver ); - const ::com::sun::star::uno::Reference< ::com::sun::star::document::XGraphicObjectResolver >& GetGraphicResolver() const { return mxGraphicResolver; } - void SetGraphicResolver( com::sun::star::uno::Reference< com::sun::star::document::XGraphicObjectResolver >& _xGraphicResolver ); + const css::uno::Reference< css::document::XGraphicObjectResolver >& GetGraphicResolver() const { return mxGraphicResolver; } + void SetGraphicResolver( css::uno::Reference< css::document::XGraphicObjectResolver >& _xGraphicResolver ); void _CreateNumberFormatsSupplier(); @@ -203,37 +203,37 @@ protected: public: // SvXMLImport( sal_uInt16 nImportFlags = IMPORT_ALL ) throw(); SvXMLImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, OUString const & implementationName, SvXMLImportFlags nImportFlags = SvXMLImportFlags::ALL ) throw(); virtual ~SvXMLImport() throw(); - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); + static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - // ::com::sun::star::xml::sax::XDocumentHandler + // css::xml::sax::XDocumentHandler virtual void SAL_CALL startDocument() - throw (::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, + throw (css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL endDocument() - throw(::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, + throw(css::xml::sax::SAXException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL startElement(const OUString& aName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endElement(const OUString& aName) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL characters(const OUString& aChars) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; // ::css::xml::sax::XFastContextHandler virtual void SAL_CALL startFastElement(sal_Int32 Element, @@ -257,42 +257,42 @@ public: const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; - // ::com::sun::star::xml::sax::XExtendedDocumentHandler - virtual void SAL_CALL startCDATA() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL endCDATA() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::xml::sax::XExtendedDocumentHandler + virtual void SAL_CALL startCDATA() throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL endCDATA() throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL comment(const OUString& sComment) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL allowLineBreak() - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL unknown(const OUString& sString) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // XFilter - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancel( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) final override; + throw(css::uno::RuntimeException, std::exception) final override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) final override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw(::com::sun::star::uno::RuntimeException, std::exception) final override; + throw(css::uno::RuntimeException, std::exception) final override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) + throw(css::uno::RuntimeException, std::exception) final override; // may be called by certain subclasses that handle document meta-data // override to provide customized handling of document statistics // the base class implementation initializes the progress bar and should // be called by overriding methods - virtual void SetStatistics(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > & i_rStats); + virtual void SetStatistics(const css::uno::Sequence< css::beans::NamedValue > & i_rStats); // get import helper for text inline rtl::Reference< XMLTextImportHelper > GetTextImport(); @@ -309,7 +309,7 @@ public: inline rtl::Reference< ::xmloff::OFormLayerXMLImport > GetFormImport(); // get XPropertySet with import information - inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getImportInfo() const { return mxImportInfo; } + inline css::uno::Reference< css::beans::XPropertySet > getImportInfo() const { return mxImportInfo; } // get import helper for events XMLEventImportHelper& GetEventImport(); @@ -318,18 +318,18 @@ public: const SvXMLNamespaceMap& GetNamespaceMap() const { return *mpNamespaceMap; } const SvXMLUnitConverter& GetMM100UnitConverter() const { return *mpUnitConv; } SvXMLUnitConverter& GetMM100UnitConverter() { return *mpUnitConv; } - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & GetLocator() const { return mxLocator; } - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & + const css::uno::Reference< css::xml::sax::XLocator > & GetLocator() const { return mxLocator; } + const css::uno::Reference< css::frame::XModel > & GetModel() const { return mxModel; } - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & GetGradientHelper(); - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & GetHatchHelper(); - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & GetBitmapHelper(); - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & GetTransGradientHelper(); - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & GetMarkerHelper(); - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & GetDashHelper(); - inline ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & GetNumberFormatsSupplier(); - inline void SetNumberFormatsSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& _xNumberFormatSupplier) + const css::uno::Reference< css::container::XNameContainer > & GetGradientHelper(); + const css::uno::Reference< css::container::XNameContainer > & GetHatchHelper(); + const css::uno::Reference< css::container::XNameContainer > & GetBitmapHelper(); + const css::uno::Reference< css::container::XNameContainer > & GetTransGradientHelper(); + const css::uno::Reference< css::container::XNameContainer > & GetMarkerHelper(); + const css::uno::Reference< css::container::XNameContainer > & GetDashHelper(); + inline css::uno::Reference< css::util::XNumberFormatsSupplier > & GetNumberFormatsSupplier(); + inline void SetNumberFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier >& _xNumberFormatSupplier) { mxNumberFormatsSupplier = _xNumberFormatSupplier; } @@ -337,20 +337,20 @@ public: // Convert a local packe URL into either a graphic manager or a // internal package URL. The later one happens only if bLoadURL is true OUString ResolveGraphicObjectURL( const OUString& rURL, bool bLoadOnDemand ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > + css::uno::Reference< css::io::XOutputStream > GetStreamForGraphicObjectURLFromBase64(); OUString ResolveGraphicObjectURLFromBase64( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOut ); + const css::uno::Reference< css::io::XOutputStream >& rOut ); bool IsPackageURL( const OUString& rURL ) const; OUString ResolveEmbeddedObjectURL( const OUString& rURL, const OUString& rClassId ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > + css::uno::Reference< css::io::XOutputStream > GetStreamForEmbeddedObjectURLFromBase64(); OUString ResolveEmbeddedObjectURLFromBase64(); // get source storage we're importing from (if available) - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > + css::uno::Reference< css::embed::XStorage > GetSourceStorage(); void AddStyleDisplayName( sal_uInt16 nFamily, @@ -363,10 +363,10 @@ public: void AddNumberStyle(sal_Int32 nKey, const OUString& sName); - virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps); - virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps); + virtual void SetViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& aViewProps); + virtual void SetConfigurationSettings(const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps); virtual void SetDocumentSpecificSettings(const OUString& _rSettingsGroupName, - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& _rSettings); + const css::uno::Sequence<css::beans::PropertyValue>& _rSettings); XMLFontStylesContext *GetFontDecls(); SvXMLStylesContext *GetStyles(); @@ -396,16 +396,15 @@ public: /// error ID, may contain an error flag sal_Int32 nId, /// string parameters for the error message - const ::com::sun::star::uno::Sequence< OUString > & rMsgParams, + const css::uno::Sequence< OUString > & rMsgParams, /// original exception message (if applicable) const OUString& rExceptionMessage, /// error location (if applicable) - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XLocator> & rLocator ); + const css::uno::Reference< css::xml::sax::XLocator> & rLocator ); void SetError( sal_Int32 nId, - const ::com::sun::star::uno::Sequence< OUString> & rMsgParams); + const css::uno::Sequence< OUString> & rMsgParams); void SetError( sal_Int32 nId ); void SetError( sal_Int32 nId, const OUString& rMsg1 ); @@ -416,7 +415,7 @@ public: ::comphelper::UnoInterfaceToUniqueIdentifierMapper& getInterfaceToIdentifierMapper(); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > GetComponentContext() const; // Convert drawing object positions from OOo file format to OASIS file format and vice versa (#i28749#) @@ -431,12 +430,12 @@ public: OUString GetStreamName() const; /// set the XmlId attribute of given UNO object (for RDF metadata) - void SetXmlId(::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface> const & i_xIfc, + void SetXmlId(css::uno::Reference< + css::uno::XInterface> const & i_xIfc, OUString const & i_rXmlId); /// Add a RDFa statement; parameters are XML attribute values - void AddRDFa( ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable> i_xObject, + void AddRDFa( css::uno::Reference< css::rdf::XMetadatable> i_xObject, OUString const & i_rAbout, OUString const & i_rProperty, OUString const & i_rContent, @@ -551,18 +550,18 @@ inline rtl::Reference< ::xmloff::OFormLayerXMLImport > SvXMLImport::GetFormImpor } inline void SvXMLImport::SetEmbeddedResolver( - com::sun::star::uno::Reference< com::sun::star::document::XEmbeddedObjectResolver >& _xEmbeddedResolver ) + css::uno::Reference< css::document::XEmbeddedObjectResolver >& _xEmbeddedResolver ) { mxEmbeddedResolver = _xEmbeddedResolver; } inline void SvXMLImport::SetGraphicResolver( - com::sun::star::uno::Reference< com::sun::star::document::XGraphicObjectResolver >& _xGraphicResolver ) + css::uno::Reference< css::document::XGraphicObjectResolver >& _xGraphicResolver ) { mxGraphicResolver = _xGraphicResolver; } -inline ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & SvXMLImport::GetNumberFormatsSupplier() +inline css::uno::Reference< css::util::XNumberFormatsSupplier > & SvXMLImport::GetNumberFormatsSupplier() { if ( ! mxNumberFormatsSupplier.is() && mxModel.is() ) _CreateNumberFormatsSupplier(); diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx index 9011c21a3645..8469fe3f0df5 100644 --- a/include/xmloff/xmlimppr.hxx +++ b/include/xmloff/xmlimppr.hxx @@ -84,8 +84,7 @@ public: */ void importXML( ::std::vector< XMLPropertyState >& rProperties, - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > xAttrList, + css::uno::Reference< css::xml::sax::XAttributeList > xAttrList, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, sal_uInt32 nPropType, @@ -106,19 +105,17 @@ public: void CheckSpecialContext( const ::std::vector< XMLPropertyState >& rProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& rPropSet, + const css::uno::Reference< css::beans::XPropertySet >& rPropSet, _ContextID_Index_Pair* pSpecialContextIds ) const; bool FillPropertySet( const ::std::vector< XMLPropertyState >& rProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& rPropSet, + const css::uno::Reference< css::beans::XPropertySet >& rPropSet, _ContextID_Index_Pair* pSpecialContextIds = NULL ) const; void FillPropertySequence( const ::std::vector< XMLPropertyState >& aProperties, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rValues ) + css::uno::Sequence< css::beans::PropertyValue >& rValues ) const; inline const rtl::Reference< XMLPropertySetMapper >& @@ -130,10 +127,8 @@ public: * Exceptions will be asserted. */ static bool _FillPropertySet( const ::std::vector<XMLPropertyState> & rProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rPropSet, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo> & rPropSetInfo, + const css::uno::Reference< css::beans::XPropertySet> & rPropSet, + const css::uno::Reference< css::beans::XPropertySetInfo> & rPropSetInfo, const rtl::Reference<XMLPropertySetMapper> & rPropMapper, SvXMLImport& rImport, @@ -145,10 +140,8 @@ public: * If unsuccessul, set return value. */ static bool _FillMultiPropertySet( const ::std::vector<XMLPropertyState> & rProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XMultiPropertySet> & rMultiPropSet, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo> & rPropSetInfo, + const css::uno::Reference< css::beans::XMultiPropertySet> & rMultiPropSet, + const css::uno::Reference< css::beans::XPropertySetInfo> & rPropSetInfo, const rtl::Reference<XMLPropertySetMapper> & rPropMapper, // parameters for use by txtstyli.cxx; allows efficient @@ -159,8 +152,7 @@ public: * If unsuccessul, set return value. */ static bool _FillTolerantMultiPropertySet( const ::std::vector<XMLPropertyState> & rProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XTolerantMultiPropertySet> & rTolPropSet, + const css::uno::Reference< css::beans::XTolerantMultiPropertySet> & rTolPropSet, const rtl::Reference<XMLPropertySetMapper> & rPropMapper, SvXMLImport& rImport, @@ -171,12 +163,11 @@ public: static void _PrepareForMultiPropertySet( const ::std::vector<XMLPropertyState> & rProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySetInfo> & rPropSetInfo, + const css::uno::Reference< css::beans::XPropertySetInfo> & rPropSetInfo, const rtl::Reference<XMLPropertySetMapper> & rPropMapper, _ContextID_Index_Pair* pSpecialContextIds, - ::com::sun::star::uno::Sequence< OUString >& rNames, - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues); + css::uno::Sequence< OUString >& rNames, + css::uno::Sequence< css::uno::Any >& rValues); }; diff --git a/include/xmloff/xmlmetae.hxx b/include/xmloff/xmlmetae.hxx index e61fae7b28cb..4fb72d029555 100644 --- a/include/xmloff/xmlmetae.hxx +++ b/include/xmloff/xmlmetae.hxx @@ -47,22 +47,21 @@ class SvXMLExport; </p> */ class XMLOFF_DLLPUBLIC SvXMLMetaExport : public ::cppu::WeakImplHelper1< - ::com::sun::star::xml::sax::XDocumentHandler > + css::xml::sax::XDocumentHandler > { private: SvXMLExport& mrExport; - ::com::sun::star::uno::Reference< - ::com::sun::star::document::XDocumentProperties> mxDocProps; + css::uno::Reference< css::document::XDocumentProperties> mxDocProps; /// counts levels of the xml document. necessary for special handling. int m_level; /// preserved namespaces. necessary because we do not write the root node. - std::vector< ::com::sun::star::beans::StringPair > m_preservedNSs; + std::vector< css::beans::StringPair > m_preservedNSs; SAL_DLLPRIVATE void SimpleStringElement( const OUString& rText, sal_uInt16 nNamespace, enum ::xmloff::token::XMLTokenEnum eElementName ); SAL_DLLPRIVATE void SimpleDateTimeElement( - const ::com::sun::star::util::DateTime & rDate, sal_uInt16 nNamespace, + const css::util::DateTime & rDate, sal_uInt16 nNamespace, enum ::xmloff::token::XMLTokenEnum eElementName ); /// currently unused; for exporting via the XDocumentProperties interface @@ -70,8 +69,7 @@ private: public: SvXMLMetaExport( SvXMLExport& i_rExport, - const ::com::sun::star::uno::Reference< - ::com::sun::star::document::XDocumentProperties>& i_rDocProps); + const css::uno::Reference< css::document::XDocumentProperties>& i_rDocProps); virtual ~SvXMLMetaExport(); @@ -79,39 +77,39 @@ public: void Export(); static OUString GetISODateTimeString( - const ::com::sun::star::util::DateTime& rDateTime ); + const css::util::DateTime& rDateTime ); - // ::com::sun::star::xml::sax::XDocumentHandler: + // css::xml::sax::XDocumentHandler: virtual void SAL_CALL startDocument() - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::xml::sax::SAXException, std::exception) override; + throw (css::uno::RuntimeException, + css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL endDocument() - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::xml::sax::SAXException, std::exception) override; + throw (css::uno::RuntimeException, + css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL startElement(const OUString & i_rName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & i_xAttribs) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::xml::sax::SAXException, std::exception) override; + const css::uno::Reference< + css::xml::sax::XAttributeList > & i_xAttribs) + throw (css::uno::RuntimeException, + css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL endElement(const OUString & i_rName) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::xml::sax::SAXException, std::exception) override; + throw (css::uno::RuntimeException, + css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL characters(const OUString & i_rChars) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::xml::sax::SAXException, std::exception) override; + throw (css::uno::RuntimeException, + css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL ignorableWhitespace( const OUString & i_rWhitespaces) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::xml::sax::SAXException, std::exception) override; + throw (css::uno::RuntimeException, + css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL processingInstruction( const OUString & i_rTarget, const OUString & i_rData) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::xml::sax::SAXException, std::exception) override; + throw (css::uno::RuntimeException, + css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL setDocumentLocator( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XLocator > & i_xLocator) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::xml::sax::SAXException, std::exception) override; + const css::uno::Reference< + css::xml::sax::XLocator > & i_xLocator) + throw (css::uno::RuntimeException, + css::xml::sax::SAXException, std::exception) override; }; diff --git a/include/xmloff/xmlmetai.hxx b/include/xmloff/xmlmetai.hxx index 240d3fd4c9ff..12ec431ba6af 100644 --- a/include/xmloff/xmlmetai.hxx +++ b/include/xmloff/xmlmetai.hxx @@ -36,32 +36,27 @@ class XMLOFF_DLLPUBLIC SvXMLMetaDocumentContext : public virtual SvXMLImportContext { private: - ::com::sun::star::uno::Reference< - ::com::sun::star::document::XDocumentProperties> mxDocProps; - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::dom::XSAXDocumentBuilder2> mxDocBuilder; + css::uno::Reference< css::document::XDocumentProperties> mxDocProps; + css::uno::Reference< css::xml::dom::XSAXDocumentBuilder2> mxDocBuilder; public: SvXMLMetaDocumentContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::document::XDocumentProperties>& xDocProps); + const css::uno::Reference< css::document::XDocumentProperties>& xDocProps); virtual ~SvXMLMetaDocumentContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; - virtual void StartElement( const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; public: static void setBuildId(const OUString & rGenerator, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xImportInfo ); + const css::uno::Reference< css::beans::XPropertySet>& xImportInfo ); }; #endif // _ INCLUDED_XMLOFF_XMLMETAI_HXX diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx index 2301e00df6ed..44124ed6c5ca 100644 --- a/include/xmloff/xmlnume.hxx +++ b/include/xmloff/xmlnume.hxx @@ -51,8 +51,7 @@ class XMLOFF_DLLPUBLIC SvxXMLNumRuleExport SAL_DLLPRIVATE void exportLevelStyle( sal_Int32 nLevel, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& rProps, + const css::uno::Sequence< css::beans::PropertyValue>& rProps, bool bOutline=false ); protected: @@ -60,8 +59,7 @@ protected: /// Override this to add attributes to the <list-style> element. SAL_DLLPRIVATE virtual void AddListStyleAttributes(); - SAL_DLLPRIVATE bool exportStyle( const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle >& rStyle ); + SAL_DLLPRIVATE bool exportStyle( const css::uno::Reference< css::style::XStyle >& rStyle ); SAL_DLLPRIVATE void exportOutline(); SvXMLExport& GetExport() { return rExport; } @@ -73,8 +71,7 @@ public: // should be private but sw::StoredChapterNumberingExport needs it void exportLevelStyles( - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexReplace > & xNumRule, + const css::uno::Reference< css::container::XIndexReplace > & xNumRule, bool bOutline=false ); void exportStyles( bool bUsed, @@ -82,8 +79,7 @@ public: bool bExportChapterNumbering = true ); void exportNumberingRule( const OUString& rName, bool bIsHidden, - const ::com::sun::star::uno::Reference< - ::com::sun::star::container::XIndexReplace > & xNumRule ); + const css::uno::Reference< css::container::XIndexReplace > & xNumRule ); }; #endif // INCLUDED_XMLOFF_XMLNUME_HXX diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx index 2463b6ea95d3..3ece1bc82400 100644 --- a/include/xmloff/xmlnumfe.hxx +++ b/include/xmloff/xmlnumfe.hxx @@ -90,7 +90,7 @@ private: SAL_DLLPRIVATE void WriteRepeatedElement_Impl( sal_Unicode ch ); SAL_DLLPRIVATE bool WriteTextWithCurrency_Impl( const OUString& rString, - const ::com::sun::star::lang::Locale& rLocale ); + const css::lang::Locale& rLocale ); SAL_DLLPRIVATE void ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt32 nKey, sal_uInt16 nPart, bool bDefPart ); @@ -98,11 +98,9 @@ private: public: SvXMLNumFmtExport( SvXMLExport& rExport, - const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XNumberFormatsSupplier >& rSupp ); + const css::uno::Reference< css::util::XNumberFormatsSupplier >& rSupp ); SvXMLNumFmtExport( SvXMLExport& rExport, - const ::com::sun::star::uno::Reference< - ::com::sun::star::util::XNumberFormatsSupplier >& rSupp, + const css::uno::Reference< css::util::XNumberFormatsSupplier >& rSupp, const OUString& rPrefix ); virtual ~SvXMLNumFmtExport(); @@ -116,8 +114,8 @@ public: // get the style name that was generated for a key OUString GetStyleName( sal_uInt32 nKey ); - void GetWasUsed(com::sun::star::uno::Sequence<sal_Int32>& rWasUsed); - void SetWasUsed(const com::sun::star::uno::Sequence<sal_Int32>& rWasUsed); + void GetWasUsed(css::uno::Sequence<sal_Int32>& rWasUsed); + void SetWasUsed(const css::uno::Sequence<sal_Int32>& rWasUsed); diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx index a9795041a784..7f057284be5e 100644 --- a/include/xmloff/xmlnumfi.hxx +++ b/include/xmloff/xmlnumfi.hxx @@ -76,20 +76,20 @@ class SvXMLNumFmtHelper public: SvXMLNumFmtHelper( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& rSupp, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + const css::uno::Reference< css::util::XNumberFormatsSupplier >& rSupp, + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); SvXMLNumFmtHelper( SvNumberFormatter* pNumberFormatter, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); ~SvXMLNumFmtHelper(); SvXMLStyleContext* CreateChildContext( SvXMLImport& rImport, - sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, - SvXMLStylesContext& rStyles); + sal_uInt16 nPrefix, + const OUString& rLocalName, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + SvXMLStylesContext& rStyles); SvXMLNumImpData* getData() { return pData; } @@ -129,7 +129,7 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext // OUString sMapName; OUString sCalendar; LanguageType nFormatLang; - com::sun::star::lang::Locale aLocale; + css::lang::Locale aLocale; bool bAutoOrder; bool bFromSystem; bool bTruncate; @@ -156,31 +156,31 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext SAL_DLLPRIVATE sal_Int32 PrivateGetKey(); public: - SvXMLNumFormatContext( SvXMLImport& rImport, sal_uInt16 nPrfx, + SvXMLNumFormatContext( SvXMLImport& rImport, + sal_uInt16 nPrfx, const OUString& rLName, - SvXMLNumImpData* pNewData, sal_uInt16 nNewType, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + SvXMLNumImpData* pNewData, + sal_uInt16 nNewType, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles ); - SvXMLNumFormatContext( SvXMLImport& rImport, sal_uInt16 nPrfx, + SvXMLNumFormatContext( SvXMLImport& rImport, + sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, const sal_Int32 nKey, SvXMLStylesContext& rStyles ); virtual ~SvXMLNumFormatContext(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void CreateAndInsert(bool bOverwrite) override; virtual void Finish(bool bOverwrite) override; SvXMLNumImpData* GetData() const { return pData; } sal_Int32 GetKey(); sal_Int32 CreateAndInsert( SvNumberFormatter* pFormatter ); - sal_Int32 CreateAndInsert( com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >& xFormatsSupplier ); + sal_Int32 CreateAndInsert( css::uno::Reference< css::util::XNumberFormatsSupplier >& xFormatsSupplier ); sal_uInt16 GetType() const { return nType; } // SvXMLStylesTokens bool HasLongDoW() const { return bHasLongDoW; } diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx index cbe7edf8770a..cea785ac8900 100644 --- a/include/xmloff/xmlnumi.hxx +++ b/include/xmloff/xmlnumi.hxx @@ -37,8 +37,7 @@ class XMLOFF_DLLPUBLIC SvxXMLListStyleContext const OUString sNumberingRules; const OUString sIsContinuousNumbering; - ::com::sun::star::uno::Reference < - ::com::sun::star::container::XIndexReplace > xNumRules; + css::uno::Reference< css::container::XIndexReplace > xNumRules; SvxXMLListStyle_Impl *pLevelStyles; @@ -57,10 +56,10 @@ public: TYPEINFO_OVERRIDE(); SvxXMLListStyleContext( - SvXMLImport& rImport, sal_uInt16 nPrfx, + SvXMLImport& rImport, + sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, bool bOutl = false ); virtual ~SvxXMLListStyleContext(); @@ -68,26 +67,20 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; void FillUnoNumRule( - const css::uno::Reference< - css::container::XIndexReplace> & rNumRule) const; + const css::uno::Reference< css::container::XIndexReplace> & rNumRule) const; - const ::com::sun::star::uno::Reference < - ::com::sun::star::container::XIndexReplace >& GetNumRules() const + const css::uno::Reference< css::container::XIndexReplace >& GetNumRules() const { return xNumRules; } - static ::com::sun::star::uno::Reference < - ::com::sun::star::container::XIndexReplace > + static css::uno::Reference< css::container::XIndexReplace > CreateNumRule( - const ::com::sun::star::uno::Reference < - ::com::sun::star::frame::XModel > & rModel ); + const css::uno::Reference< css::frame::XModel > & rModel ); static void SetDefaultStyle( - const ::com::sun::star::uno::Reference < - ::com::sun::star::container::XIndexReplace > & rNumRule, + const css::uno::Reference< css::container::XIndexReplace > & rNumRule, sal_Int16 nLevel, bool bOrdered ); diff --git a/include/xmloff/xmlprcon.hxx b/include/xmloff/xmlprcon.hxx index 4ba1be45583b..e322a2238126 100644 --- a/include/xmloff/xmlprcon.hxx +++ b/include/xmloff/xmlprcon.hxx @@ -41,7 +41,7 @@ public: SvXMLPropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState > &rProps, const rtl::Reference < SvXMLImportPropertyMapper > &rMap, @@ -51,14 +51,14 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; // This method is called from this instance implementation of // CreateChildContext if the element matches an entry in the // SvXMLImportItemMapper with the mid flag MID_FLAG_ELEMENT_ITEM_IMPORT virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp ); diff --git a/include/xmloff/xmlprhdl.hxx b/include/xmloff/xmlprhdl.hxx index b57da8740ed4..c2c9d8e5aabb 100644 --- a/include/xmloff/xmlprhdl.hxx +++ b/include/xmloff/xmlprhdl.hxx @@ -45,12 +45,12 @@ public: /** Compares two Any's in case of the given XML-data-type. By default the Any-equal-operator is called. */ - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; + virtual bool equals( const css::uno::Any& r1, const css::uno::Any& r2 ) const; /// Imports the given value in cas of the given XML-data-type - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0; + virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0; /// Exports the given value in cas of the given XML-data-type - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0; + virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const =0; }; #endif // INCLUDED_XMLOFF_XMLPRHDL_HXX diff --git a/include/xmloff/xmlscripti.hxx b/include/xmloff/xmlscripti.hxx index bad1e87280a9..1cbce08a7f97 100644 --- a/include/xmloff/xmlscripti.hxx +++ b/include/xmloff/xmlscripti.hxx @@ -31,20 +31,19 @@ namespace com { namespace sun { namespace star { namespace frame { class XMLOFF_DLLPUBLIC XMLScriptContext : public SvXMLImportContext { private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; + css::uno::Reference< css::frame::XModel > m_xModel; public: - XMLScriptContext( SvXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel>& rDocModel ); + XMLScriptContext( SvXMLImport& rImport, + sal_uInt16 nPrfx, + const OUString& rLName, + const css::uno::Reference< css::frame::XModel>& rDocModel ); virtual ~XMLScriptContext(); // Create child element. virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; }; diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx index 2d2e1e76adcd..f3aa917fb5b9 100644 --- a/include/xmloff/xmlstyle.hxx +++ b/include/xmloff/xmlstyle.hxx @@ -94,8 +94,7 @@ public: SvXMLStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList >& xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, sal_uInt16 nFamily=0, bool bDefaultStyle = false ); @@ -103,12 +102,10 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; virtual void StartElement( - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; const OUString& GetName() const { return maName; } const OUString& GetDisplayName() const { return maDisplayName.getLength() ? maDisplayName : maName; } @@ -163,17 +160,13 @@ class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext SvXMLTokenMap *mpStyleStylesElemTokenMap; - ::com::sun::star::uno::Reference < - ::com::sun::star::container::XNameContainer > mxParaStyles; + css::uno::Reference< css::container::XNameContainer > mxParaStyles; - ::com::sun::star::uno::Reference < - ::com::sun::star::container::XNameContainer > mxTextStyles; + css::uno::Reference< css::container::XNameContainer > mxTextStyles; - ::com::sun::star::uno::Reference < - ::com::sun::star::style::XAutoStyleFamily > mxParaAutoStyles; + css::uno::Reference< css::style::XAutoStyleFamily > mxParaAutoStyles; - ::com::sun::star::uno::Reference < - ::com::sun::star::style::XAutoStyleFamily > mxTextAutoStyles; + css::uno::Reference< css::style::XAutoStyleFamily > mxTextAutoStyles; rtl::Reference < SvXMLImportPropertyMapper > mxParaImpPropMapper; rtl::Reference < SvXMLImportPropertyMapper > mxTextImpPropMapper; @@ -194,19 +187,16 @@ protected: virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const; @@ -215,8 +205,7 @@ public: SvXMLStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList, + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, bool bAutomatic = false ); virtual ~SvXMLStylesContext(); @@ -224,8 +213,7 @@ public: // Create child element. virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; // Override this method to insert styles into the document. virtual void EndElement() override; @@ -241,12 +229,11 @@ public: virtual rtl::Reference < SvXMLImportPropertyMapper > GetImportPropertyMapper( sal_uInt16 nFamily ) const; - virtual ::com::sun::star::uno::Reference < - ::com::sun::star::container::XNameContainer > + virtual css::uno::Reference< css::container::XNameContainer > GetStylesContainer( sal_uInt16 nFamily ) const; virtual OUString GetServiceName( sal_uInt16 nFamily ) const; - ::com::sun::star::uno::Reference < ::com::sun::star::style::XAutoStyleFamily > + css::uno::Reference< css::style::XAutoStyleFamily > GetAutoStyles( sal_uInt16 nFamily ) const; void CopyAutoStylesToDoc(); void CopyStylesToDoc( bool bOverwrite, bool bFinish = true ); diff --git a/include/xmloff/xmltabe.hxx b/include/xmloff/xmltabe.hxx index 833700544828..140d3b634c34 100644 --- a/include/xmloff/xmltabe.hxx +++ b/include/xmloff/xmltabe.hxx @@ -36,7 +36,7 @@ class SvxXMLTabStopExport protected: - void exportTabStop( const ::com::sun::star::style::TabStop* pTabStop ); + void exportTabStop( const css::style::TabStop* pTabStop ); public: @@ -44,7 +44,7 @@ public: virtual ~SvxXMLTabStopExport(); // core API - void Export( const ::com::sun::star::uno::Any& rAny ); + void Export( const css::uno::Any& rAny ); }; diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx index 74bc8143c519..2074622d8864 100644 --- a/include/xmloff/xmluconv.hxx +++ b/include/xmloff/xmluconv.hxx @@ -89,8 +89,7 @@ public: default unit for numerical measures, the XML measure unit is the default unit for textual measures */ SvXMLUnitConverter( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, sal_Int16 eCoreMeasureUnit /*css::util::MeasureUnit*/, sal_Int16 eXMLMeasureUnit /*css::util::MeasureUnit*/); @@ -108,8 +107,7 @@ public: sal_Int16 GetXMLMeasureUnit() const; /** gets XNumberingTypeInfo */ - const ::com::sun::star::uno::Reference< - ::com::sun::star::text::XNumberingTypeInfo >& getNumTypeInfo() const; + const css::uno::Reference< css::text::XNumberingTypeInfo >& getNumTypeInfo() const; /** convert string to measure with meCoreMeasureUnit, using optional min and max values*/ @@ -154,7 +152,7 @@ public: /** get the Null Date of the XModel and set it to the UnitConverter */ bool setNullDate ( - const com::sun::star::uno::Reference <com::sun::star::frame::XModel>& xModel); + const css::uno::Reference <css::frame::XModel>& xModel); /** convert double to ISO Date Time String */ void convertDateTime( OUStringBuffer& rBuffer, @@ -170,12 +168,12 @@ public: /** convert double to ISO Date Time String */ static void convertDateTime( OUStringBuffer& rBuffer, const double& fDateTime, - const com::sun::star::util::Date& aNullDate, - bool bAddTimeIf0AM = false); + const css::util::Date& aNullDate, + bool bAddTimeIf0AM = false); /** convert ISO Date Time String to double */ static bool convertDateTime( double& fDateTime, const OUString& rString, - const com::sun::star::util::Date& aNullDate); + const css::util::Date& aNullDate); /** convert string to ::basegfx::B3DVector */ @@ -187,19 +185,19 @@ public: const ::basegfx::B3DVector& rVector ); /** convert string to Position3D */ - bool convertPosition3D( com::sun::star::drawing::Position3D& rPosition, + bool convertPosition3D( css::drawing::Position3D& rPosition, const OUString& rValue ); /** convert Position3D to string */ void convertPosition3D( OUStringBuffer &rBuffer, - const com::sun::star::drawing::Position3D& rVector ); + const css::drawing::Position3D& rVector ); /** convert num-forat and num-letter-sync values to NumberingType */ bool convertNumFormat( sal_Int16& rType, - const OUString& rNumFormat, - const OUString& rNumLetterSync, - bool bNumberNone = false ) const; + const OUString& rNumFormat, + const OUString& rNumLetterSync, + bool bNumberNone = false ) const; /** convert NumberingType to num-forat and num-letter-sync values */ void convertNumFormat( OUStringBuffer& rBuffer, @@ -207,10 +205,10 @@ public: static void convertNumLetterSync( OUStringBuffer& rBuffer, sal_Int16 nType ); - static void convertPropertySet(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps, - const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& aProperties); - static void convertPropertySet(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& rProperties, - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps); + static void convertPropertySet(css::uno::Sequence<css::beans::PropertyValue>& rProps, + const css::uno::Reference<css::beans::XPropertySet>& aProperties); + static void convertPropertySet(css::uno::Reference<css::beans::XPropertySet>& rProperties, + const css::uno::Sequence<css::beans::PropertyValue>& aProps); OUString encodeStyleName( const OUString& rName, bool *pEncoded=0 ) const; diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx index 940aa15218b3..c66c592d4976 100644 --- a/include/xmlscript/xml_helper.hxx +++ b/include/xmlscript/xml_helper.hxx @@ -39,7 +39,7 @@ namespace xmlscript class XMLSCRIPT_DLLPUBLIC XMLElement - : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XAttributeList > + : public ::cppu::WeakImplHelper1< css::xml::sax::XAttributeList > { public: inline XMLElement( OUString const & name ) @@ -51,13 +51,13 @@ public: @param xElem element reference */ void SAL_CALL addSubElement( - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > const & xElem ); + css::uno::Reference< css::xml::sax::XAttributeList > const & xElem ); /** Gets sub element of given index. The index follows order in which sub elements were added. @param nIndex index of sub element */ - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > SAL_CALL getSubElement( sal_Int32 nIndex ); + css::uno::Reference< css::xml::sax::XAttributeList > SAL_CALL getSubElement( sal_Int32 nIndex ); /** Adds an attribute to elements. @@ -71,27 +71,27 @@ public: @param xOut document handler to be written to */ void SAL_CALL dump( - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > const & xOut ); + css::uno::Reference< css::xml::sax::XDocumentHandler > const & xOut ); /** Dumps out sub elements (and all further sub elements). @param xOut document handler to be written to */ void SAL_CALL dumpSubElements( - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > const & xOut ); + css::uno::Reference< css::xml::sax::XDocumentHandler > const & xOut ); // XAttributeList virtual sal_Int16 SAL_CALL getLength() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getNameByIndex( sal_Int16 nPos ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getTypeByIndex( sal_Int16 nPos ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getTypeByName( OUString const & rName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getValueByIndex( sal_Int16 nPos ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getValueByName( OUString const & rName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; protected: OUString _name; @@ -99,8 +99,8 @@ protected: ::std::vector< OUString > _attrNames; ::std::vector< OUString > _attrValues; - ::std::vector< ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > > _subElems; + ::std::vector< css::uno::Reference< + css::xml::sax::XAttributeList > > _subElems; }; @@ -110,11 +110,11 @@ protected: ##################################################################################################*/ -XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > +XMLSCRIPT_DLLPUBLIC css::uno::Reference< css::io::XInputStream > SAL_CALL createInputStream( ::rtl::ByteSequence const & rInData ); -XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > +XMLSCRIPT_DLLPUBLIC css::uno::Reference< css::io::XOutputStream > SAL_CALL createOutputStream( ::rtl::ByteSequence * pOutData ); diff --git a/include/xmlscript/xmldlg_imexp.hxx b/include/xmlscript/xmldlg_imexp.hxx index 92dd0f0c6765..3436e1b8c562 100644 --- a/include/xmlscript/xmldlg_imexp.hxx +++ b/include/xmlscript/xmldlg_imexp.hxx @@ -33,42 +33,29 @@ namespace xmlscript { XMLSCRIPT_DLLPUBLIC void SAL_CALL exportDialogModel( - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XExtendedDocumentHandler > const & xOut, - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameContainer > const & xDialogModel, - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > const & xDocument ); + css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > const & xOut, + css::uno::Reference< css::container::XNameContainer > const & xDialogModel, + css::uno::Reference< css::frame::XModel > const & xDocument ); -XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > +XMLSCRIPT_DLLPUBLIC css::uno::Reference< css::xml::sax::XDocumentHandler > SAL_CALL importDialogModel( - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameContainer > const & xDialogModel, - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext, - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > const & xDocument ); + css::uno::Reference< css::container::XNameContainer > const & xDialogModel, + css::uno::Reference< css::uno::XComponentContext > const & xContext, + css::uno::Reference< css::frame::XModel > const & xDocument ); // additional functions for convenience -XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStreamProvider > +XMLSCRIPT_DLLPUBLIC css::uno::Reference< css::io::XInputStreamProvider > SAL_CALL exportDialogModel( - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameContainer > const & xDialogModel, - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext, - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > const & xDocument ); + css::uno::Reference< css::container::XNameContainer > const & xDialogModel, + css::uno::Reference< css::uno::XComponentContext > const & xContext, + css::uno::Reference< css::frame::XModel > const & xDocument ); XMLSCRIPT_DLLPUBLIC void SAL_CALL importDialogModel( - ::com::sun::star::uno::Reference< - ::com::sun::star::io::XInputStream > const & xInput, - ::com::sun::star::uno::Reference< - ::com::sun::star::container::XNameContainer > const & xDialogModel, - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext > const & xContext, - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel > const & xDocument ); + css::uno::Reference< css::io::XInputStream > const & xInput, + css::uno::Reference< css::container::XNameContainer > const & xDialogModel, + css::uno::Reference< css::uno::XComponentContext > const & xContext, + css::uno::Reference< css::frame::XModel > const & xDocument ); } diff --git a/include/xmlscript/xmllib_imexp.hxx b/include/xmlscript/xmllib_imexp.hxx index 2820fa017ebc..f30b69449b34 100644 --- a/include/xmlscript/xmllib_imexp.hxx +++ b/include/xmlscript/xmllib_imexp.hxx @@ -40,7 +40,7 @@ struct XMLSCRIPT_DLLPUBLIC LibDescriptor bool bLink; bool bReadOnly; bool bPasswordProtected; - ::com::sun::star::uno::Sequence< OUString > aElementNames; + css::uno::Sequence< OUString > aElementNames; bool bPreload; }; @@ -58,23 +58,21 @@ struct XMLSCRIPT_DLLPUBLIC LibDescriptorArray XMLSCRIPT_DLLPUBLIC void SAL_CALL exportLibraryContainer( - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XWriter > const & xOut, + css::uno::Reference< css::xml::sax::XWriter > const & xOut, const LibDescriptorArray* pLibArray ); -XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XDocumentHandler > +XMLSCRIPT_DLLPUBLIC css::uno::Reference< + css::xml::sax::XDocumentHandler > SAL_CALL importLibraryContainer( LibDescriptorArray* pLibArray ); XMLSCRIPT_DLLPUBLIC void SAL_CALL exportLibrary( - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XWriter > const & xOut, + css::uno::Reference< css::xml::sax::XWriter > const & xOut, const LibDescriptor& rLib ); -XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XDocumentHandler > +XMLSCRIPT_DLLPUBLIC css::uno::Reference< + css::xml::sax::XDocumentHandler > SAL_CALL importLibrary( LibDescriptor& rLib ); } diff --git a/include/xmlscript/xmlmod_imexp.hxx b/include/xmlscript/xmlmod_imexp.hxx index 74274a71b257..412487b279e5 100644 --- a/include/xmlscript/xmlmod_imexp.hxx +++ b/include/xmlscript/xmlmod_imexp.hxx @@ -42,12 +42,10 @@ struct XMLSCRIPT_DLLPUBLIC ModuleDescriptor XMLSCRIPT_DLLPUBLIC void SAL_CALL exportScriptModule( - ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XWriter > const & xOut, + css::uno::Reference< css::xml::sax::XWriter > const & xOut, const ModuleDescriptor& rMod ); -XMLSCRIPT_DLLPUBLIC ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XDocumentHandler > +XMLSCRIPT_DLLPUBLIC css::uno::Reference< css::xml::sax::XDocumentHandler > SAL_CALL importScriptModule( ModuleDescriptor& rMod ); } |