diff options
Diffstat (limited to 'include/ucbhelper')
| -rw-r--r-- | include/ucbhelper/activedatasink.hxx | 13 | ||||
| -rw-r--r-- | include/ucbhelper/commandenvironment.hxx | 21 | ||||
| -rw-r--r-- | include/ucbhelper/content.hxx | 237 | ||||
| -rw-r--r-- | include/ucbhelper/contentidentifier.hxx | 15 | ||||
| -rw-r--r-- | include/ucbhelper/simpleinteractionrequest.hxx | 22 | ||||
| -rw-r--r-- | include/ucbhelper/simplenameclashresolverequest.hxx | 14 | ||||
| -rw-r--r-- | include/ucbhelper/ucbhelperdllapi.h | 4 |
7 files changed, 146 insertions, 180 deletions
diff --git a/include/ucbhelper/activedatasink.hxx b/include/ucbhelper/activedatasink.hxx index c71066421e2e..391be2c91d4a 100644 --- a/include/ucbhelper/activedatasink.hxx +++ b/include/ucbhelper/activedatasink.hxx @@ -27,9 +27,11 @@ namespace ucbhelper { - // workaround for incremental linking bugs in MSVC2015 -class SAL_DLLPUBLIC_TEMPLATE ActiveDataSink_Base : public cppu::WeakImplHelper< css::io::XActiveDataSink > {}; +class SAL_DLLPUBLIC_TEMPLATE ActiveDataSink_Base + : public cppu::WeakImplHelper<css::io::XActiveDataSink> +{ +}; /** * This class implements the interface css::io::XActiveDataSink. @@ -38,13 +40,14 @@ class SAL_DLLPUBLIC_TEMPLATE ActiveDataSink_Base : public cppu::WeakImplHelper< */ class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) ActiveDataSink final : public ActiveDataSink_Base { - css::uno::Reference< css::io::XInputStream > m_xStream; + css::uno::Reference<css::io::XInputStream> m_xStream; public: // XActiveDataSink methods. - virtual void SAL_CALL setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream ) override; + virtual void SAL_CALL + setInputStream(const css::uno::Reference<css::io::XInputStream>& aStream) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream() override; + virtual css::uno::Reference<css::io::XInputStream> SAL_CALL getInputStream() override; }; } /* namespace ucbhelper */ diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx index a09d70e5a9e7..efdc9ea66908 100644 --- a/include/ucbhelper/commandenvironment.hxx +++ b/include/ucbhelper/commandenvironment.hxx @@ -30,7 +30,10 @@ namespace ucbhelper struct CommandEnvironment_Impl; // workaround for incremental linking bugs in MSVC2015 -class SAL_DLLPUBLIC_TEMPLATE CommandEnvironment_Base : public cppu::WeakImplHelper< css::ucb::XCommandEnvironment > {}; +class SAL_DLLPUBLIC_TEMPLATE CommandEnvironment_Base + : public cppu::WeakImplHelper<css::ucb::XCommandEnvironment> +{ +}; /** * This class implements the interface @@ -42,8 +45,8 @@ class UCBHELPER_DLLPUBLIC CommandEnvironment final : public CommandEnvironment_B std::unique_ptr<CommandEnvironment_Impl> m_pImpl; private: - CommandEnvironment( const CommandEnvironment& ) = delete; - CommandEnvironment& operator=( const CommandEnvironment& ) = delete; + CommandEnvironment(const CommandEnvironment&) = delete; + CommandEnvironment& operator=(const CommandEnvironment&) = delete; public: /** @@ -54,17 +57,19 @@ public: * @param rxProgressHandler is the implementation of a Progress * Handler or an empty reference. */ - CommandEnvironment( const css::uno::Reference< css::task::XInteractionHandler >& rxInteractionHandler, - const css::uno::Reference< css::ucb::XProgressHandler >& rxProgressHandler ); + CommandEnvironment( + const css::uno::Reference<css::task::XInteractionHandler>& rxInteractionHandler, + const css::uno::Reference<css::ucb::XProgressHandler>& rxProgressHandler); /** * Destructor. */ virtual ~CommandEnvironment() override; - // XCommandEnvironment - virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() override; + // XCommandEnvironment + virtual css::uno::Reference<css::task::XInteractionHandler> + SAL_CALL getInteractionHandler() override; - virtual css::uno::Reference< css::ucb::XProgressHandler > SAL_CALL getProgressHandler() override; + virtual css::uno::Reference<css::ucb::XProgressHandler> SAL_CALL getProgressHandler() override; }; } /* namespace ucbhelper */ diff --git a/include/ucbhelper/content.hxx b/include/ucbhelper/content.hxx index f382373f98b4..6f4a7b2d4316 100644 --- a/include/ucbhelper/content.hxx +++ b/include/ucbhelper/content.hxx @@ -24,42 +24,48 @@ #include <com/sun/star/uno/Sequence.h> #include <ucbhelper/ucbhelperdllapi.h> -namespace com::sun::star::beans { - class XPropertySetInfo; +namespace com::sun::star::beans +{ +class XPropertySetInfo; } -namespace com::sun::star::io { - class XActiveDataSink; - class XOutputStream; - class XInputStream; - class XStream; +namespace com::sun::star::io +{ +class XActiveDataSink; +class XOutputStream; +class XInputStream; +class XStream; } -namespace com::sun::star::sdbc { - class XResultSet; - class XRow; +namespace com::sun::star::sdbc +{ +class XResultSet; +class XRow; } -namespace com::sun::star::ucb { - class XCommandEnvironment; - class XCommandInfo; - class XContent; - class XDynamicResultSet; - class XAnyCompareFactory; - struct ContentInfo; - struct NumberedSortingInfo; +namespace com::sun::star::ucb +{ +class XCommandEnvironment; +class XCommandInfo; +class XContent; +class XDynamicResultSet; +class XAnyCompareFactory; +struct ContentInfo; +struct NumberedSortingInfo; } -namespace com::sun::star::uno { - class XComponentContext; +namespace com::sun::star::uno +{ +class XComponentContext; } -namespace com::sun::star::uno { class Any; } +namespace com::sun::star::uno +{ +class Any; +} namespace ucbhelper { - - /** * These are the possible values for the parameter eMode of method * ucbhelper::Content::createCursor. @@ -79,10 +85,9 @@ enum class InsertOperation { Copy, // copy source data Move, // move source data - Checkin // check-in source data + Checkin // check-in source data }; - class Content_Impl; /** @@ -92,13 +97,13 @@ class Content_Impl; */ class UCBHELPER_DLLPUBLIC Content final { - rtl::Reference< Content_Impl > m_xImpl; + rtl::Reference<Content_Impl> m_xImpl; /// @throws css::ucb::CommandAbortedException /// @throws css::uno::RuntimeException, /// @throws css::uno::Exception - css::uno::Any createCursorAny( const css::uno::Sequence< OUString >& rPropertyNames, - ResultSetInclude eMode ); + css::uno::Any createCursorAny(const css::uno::Sequence<OUString>& rPropertyNames, + ResultSetInclude eMode); public: /** @@ -117,9 +122,8 @@ public: * @throws css::ucb::ContentCreationException * @throws css::uno::RuntimeException */ - Content( const OUString& rURL, - const css::uno::Reference< css::ucb::XCommandEnvironment >& rEnv, - const css::uno::Reference< css::uno::XComponentContext >& rCtx ); + Content(const OUString& rURL, const css::uno::Reference<css::ucb::XCommandEnvironment>& rEnv, + const css::uno::Reference<css::uno::XComponentContext>& rCtx); /** * Constructor. * @@ -131,15 +135,15 @@ public: * @throws css::ucb::ContentCreationException * @throws css::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 ); + 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); /** * Copy Constructor. * * @param rContent is the content this content shall be a copy of. */ - Content( const Content& rOther ); + Content(const Content& rOther); /** * Move constructor. @@ -156,7 +160,7 @@ public: * * @param rContent is the content this content shall be a copy of. */ - Content& operator=( const Content& rOther ); + Content& operator=(const Content& rOther); /** * Move assignment operator. @@ -176,16 +180,13 @@ public: * @param rContent will be filled by this method with the content created. * @return true, if the operation was successful - false, otherwise. */ - static bool - create( const OUString& rURL, - const css::uno::Reference< css::ucb::XCommandEnvironment >& rEnv, - const css::uno::Reference< css::uno::XComponentContext >& rCtx, - Content& rContent ); - + static bool create(const OUString& rURL, + const css::uno::Reference<css::ucb::XCommandEnvironment>& rEnv, + const css::uno::Reference<css::uno::XComponentContext>& rCtx, + Content& rContent); // Direct access to UCB content. - /** * This method provides access to the "native" UCB content interface(s). * This is useful in case the convenience methods provided by this @@ -195,12 +196,10 @@ public: * * @return the XContent interface of the underlying UCB content. */ - css::uno::Reference< css::ucb::XContent > get() const; - + css::uno::Reference<css::ucb::XContent> get() const; // Object identity. - /** * This method returns the URL of the content. * @@ -208,30 +207,24 @@ public: */ const OUString& getURL() const; - // Command environment. - /** * This method returns the environment to use when executing commands. * * @return the command environment. */ - const css::uno::Reference< css::ucb::XCommandEnvironment >& - getCommandEnvironment() const; + const css::uno::Reference<css::ucb::XCommandEnvironment>& getCommandEnvironment() const; /** * This method sets a new command environment. * * @param xNewEnv is the new command environment. */ - void setCommandEnvironment( - const css::uno::Reference< css::ucb::XCommandEnvironment >& xNewEnv ); - + void setCommandEnvironment(const css::uno::Reference<css::ucb::XCommandEnvironment>& xNewEnv); // Access to supported commands/properties. - /** * This methods provides access to meta data of the commands supported * by this content. @@ -242,8 +235,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Reference< css::ucb::XCommandInfo > - getCommands(); + css::uno::Reference<css::ucb::XCommandInfo> getCommands(); /** * This methods provides access to meta data of the properties supported * by this content. @@ -254,13 +246,10 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Reference< css::beans::XPropertySetInfo > - getProperties(); - + css::uno::Reference<css::beans::XPropertySetInfo> getProperties(); // Access to property value(s). - /** * This method can be used to read a single property value. * @@ -271,8 +260,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Any - getPropertyValue( const OUString& rPropertyName ); + css::uno::Any getPropertyValue(const OUString& rPropertyName); /** * This method can be used to set a single property value. * @@ -300,9 +288,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Any - setPropertyValue( const OUString& rPropertyName, - const css::uno::Any& rValue ); + css::uno::Any setPropertyValue(const OUString& rPropertyName, const css::uno::Any& rValue); /** * This method can be used to read multiple property values. * @@ -313,8 +299,8 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Sequence< css::uno::Any > - getPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames ); + css::uno::Sequence<css::uno::Any> + getPropertyValues(const css::uno::Sequence<OUString>& rPropertyNames); /** * This method can be used to read multiple property values. * @@ -325,8 +311,8 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Reference< css::sdbc::XRow > - getPropertyValuesInterface( const css::uno::Sequence< OUString >& rPropertyNames ); + css::uno::Reference<css::sdbc::XRow> + getPropertyValuesInterface(const css::uno::Sequence<OUString>& rPropertyNames); /** * This method can be used to set multiple property values. @@ -361,14 +347,12 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Sequence< css::uno::Any > - setPropertyValues( const css::uno::Sequence< OUString >& rPropertyNames, - const css::uno::Sequence< css::uno::Any >& rValues ); - + css::uno::Sequence<css::uno::Any> + setPropertyValues(const css::uno::Sequence<OUString>& rPropertyNames, + const css::uno::Sequence<css::uno::Any>& rValues); // General command execution. - /** * This method can be used to execute any command supported by the * content. @@ -382,14 +366,11 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Any - executeCommand( const OUString& rCommandName, - const css::uno::Any& rCommandArgument ); - + css::uno::Any executeCommand(const OUString& rCommandName, + const css::uno::Any& rCommandArgument); // Special commands. - /** * This methods gives access to the children of a folder content. * Additionally, the result set returned provides efficient access to @@ -408,9 +389,9 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Reference< css::sdbc::XResultSet > - createCursor( const css::uno::Sequence< OUString >& rPropertyNames, - ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS ); + css::uno::Reference<css::sdbc::XResultSet> + createCursor(const css::uno::Sequence<OUString>& rPropertyNames, + ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS); /** * This methods gives access to the children of a folder content. * Additionally, the result set returned provides efficient access to @@ -429,18 +410,18 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Reference< css::ucb::XDynamicResultSet > - createDynamicCursor( const css::uno::Sequence< OUString >& rPropertyNames, - ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS ); + css::uno::Reference<css::ucb::XDynamicResultSet> + createDynamicCursor(const css::uno::Sequence<OUString>& rPropertyNames, + ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS); /// @throws css::ucb::CommandAbortedException /// @throws css::uno::RuntimeException /// @throws css::uno::Exception - css::uno::Reference< css::sdbc::XResultSet > - createSortedCursor( const css::uno::Sequence< OUString >& rPropertyNames, - const css::uno::Sequence< css::ucb::NumberedSortingInfo >& rSortInfo, - const css::uno::Reference< css::ucb::XAnyCompareFactory >& rAnyCompareFactory, - ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS ); + css::uno::Reference<css::sdbc::XResultSet> + createSortedCursor(const css::uno::Sequence<OUString>& rPropertyNames, + const css::uno::Sequence<css::ucb::NumberedSortingInfo>& rSortInfo, + const css::uno::Reference<css::ucb::XAnyCompareFactory>& rAnyCompareFactory, + ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS); /** * This methods gives read access to the content stream of a content (i.e @@ -453,8 +434,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Reference< css::io::XInputStream > - openStream(); + css::uno::Reference<css::io::XInputStream> openStream(); /** * 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). @@ -467,8 +447,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Reference< css::io::XInputStream > - openStreamNoLock(); + css::uno::Reference<css::io::XInputStream> openStreamNoLock(); /** * This methods gives read/write access to the content stream of a content (i.e @@ -481,8 +460,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Reference< css::io::XStream > - openWriteableStream(); + css::uno::Reference<css::io::XStream> openWriteableStream(); /** * 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). @@ -495,8 +473,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Reference< css::io::XStream > - openWriteableStreamNoLock(); + css::uno::Reference<css::io::XStream> openWriteableStreamNoLock(); /** * This methods gives read access to the content stream of a content (i.e @@ -509,8 +486,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - bool - openStream( const css::uno::Reference< css::io::XActiveDataSink >& rSink ); + bool openStream(const css::uno::Reference<css::io::XActiveDataSink>& rSink); /** * 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). @@ -522,8 +498,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - bool - openStream( const css::uno::Reference< css::io::XOutputStream >& rStream ); + bool openStream(const css::uno::Reference<css::io::XOutputStream>& rStream); /** * 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). @@ -537,9 +512,8 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - void - writeStream( const css::uno::Reference< css::io::XInputStream >& rStream, - bool bReplaceExisting ); + void writeStream(const css::uno::Reference<css::io::XInputStream>& rStream, + bool bReplaceExisting); /** * This method returns the different types of contents this content @@ -551,8 +525,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - css::uno::Sequence< css::ucb::ContentInfo > - queryCreatableContentsInfo(); + css::uno::Sequence<css::ucb::ContentInfo> queryCreatableContentsInfo(); /** * This method creates, initializes and inserts ( commits ) a new content @@ -580,11 +553,10 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - bool - insertNewContent( const OUString& rContentType, - const css::uno::Sequence< OUString >& rPropertyNames, - const css::uno::Sequence< css::uno::Any >& rPropertyValues, - Content& rNewContent ); + bool insertNewContent(const OUString& rContentType, + const css::uno::Sequence<OUString>& rPropertyNames, + const css::uno::Sequence<css::uno::Any>& rPropertyValues, + Content& rNewContent); /** * This method creates, initializes and inserts (commits) a new content * inside this (the target folder) content. For example, it can be used to @@ -614,12 +586,11 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - bool - insertNewContent( const OUString& rContentType, - const css::uno::Sequence< OUString >& rPropertyNames, - const css::uno::Sequence< css::uno::Any >& rPropertyValues, - const css::uno::Reference< css::io::XInputStream >& rStream, - Content& rNewContent ); + bool insertNewContent(const OUString& rContentType, + const css::uno::Sequence<OUString>& rPropertyNames, + const css::uno::Sequence<css::uno::Any>& rPropertyValues, + const css::uno::Reference<css::io::XInputStream>& rStream, + Content& rNewContent); /** * This method transfers (copies/moves) a content. It creates a new @@ -653,16 +624,12 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - void - transferContent( const Content& rSourceContent, - InsertOperation eOperation, - const OUString & rTitle, - const sal_Int32 nNameClashAction, - const OUString & rMimeType = OUString( ), - bool bMajorVersion = false, - const OUString & rCommentVersion = OUString( ), - OUString* pResultURL = nullptr, - const OUString & rDocumentId = OUString( ) ) const; + void transferContent(const Content& rSourceContent, InsertOperation eOperation, + const OUString& rTitle, const sal_Int32 nNameClashAction, + const OUString& rMimeType = OUString(), bool bMajorVersion = false, + const OUString& rCommentVersion = OUString(), + OUString* pResultURL = nullptr, + const OUString& rDocumentId = OUString()) const; /** * This method lock the resource. @@ -671,8 +638,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - void - lock(); + void lock(); /** * This method unlock the resource. @@ -681,12 +647,10 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - void - unlock(); + void unlock(); // Required properties. - /** * This method returns the value of the content's property "IsFolder". * @@ -696,8 +660,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - bool - isFolder(); + bool isFolder(); /** * This method returns the value of the content's property "IsDocument". * @@ -707,9 +670,7 @@ public: * @throws css::uno::RuntimeException * @throws css::uno::Exception */ - bool - isDocument(); - + bool isDocument(); }; } /* namespace ucbhelper */ diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx index 20f3b5e3db48..9b538829fb03 100644 --- a/include/ucbhelper/contentidentifier.hxx +++ b/include/ucbhelper/contentidentifier.hxx @@ -25,31 +25,26 @@ #include <ucbhelper/ucbhelperdllapi.h> #include <memory> - namespace ucbhelper { - struct ContentIdentifier_Impl; - /** * This class implements a simple identifier object for UCB contents. * It mainly stores and returns the URL as it was passed to the constructor - * The only difference is that the URL scheme will be lower cased. This can * be done, because URL schemes are never case sensitive. */ -class UCBHELPER_DLLPUBLIC ContentIdentifier final : - public cppu::WeakImplHelper<css::ucb::XContentIdentifier> +class UCBHELPER_DLLPUBLIC ContentIdentifier final + : public cppu::WeakImplHelper<css::ucb::XContentIdentifier> { public: - ContentIdentifier( const OUString& rURL ); + ContentIdentifier(const OUString& rURL); virtual ~ContentIdentifier() override; // XContentIdentifier - virtual OUString SAL_CALL - getContentIdentifier() override; - virtual OUString SAL_CALL - getContentProviderScheme() override; + virtual OUString SAL_CALL getContentIdentifier() override; + virtual OUString SAL_CALL getContentProviderScheme() override; private: std::unique_ptr<ContentIdentifier_Impl> m_pImpl; diff --git a/include/ucbhelper/simpleinteractionrequest.hxx b/include/ucbhelper/simpleinteractionrequest.hxx index eb09bcce8051..25656202288b 100644 --- a/include/ucbhelper/simpleinteractionrequest.hxx +++ b/include/ucbhelper/simpleinteractionrequest.hxx @@ -29,25 +29,28 @@ * SimpleInteractionRequest::getResponse(). */ -enum class ContinuationFlags { +enum class ContinuationFlags +{ /** The request was not (yet) handled by the interaction handler. */ - NONE = 0, + NONE = 0, /** The interaction handler selected XInteractionAbort. */ - Abort = 1, + Abort = 1, /** The interaction handler selected XInteractionRetry. */ - Retry = 2, + Retry = 2, /** The interaction handler selected XInteractionApprove. */ - Approve = 4, + Approve = 4, /** The interaction handler selected XInteractionDisapprove. */ Disapprove = 8, }; namespace o3tl { - template<> struct typed_flags<ContinuationFlags> : is_typed_flags<ContinuationFlags, 0x0f> {}; +template <> struct typed_flags<ContinuationFlags> : is_typed_flags<ContinuationFlags, 0x0f> +{ +}; } -namespace ucbhelper { - +namespace ucbhelper +{ /** * This class implements a simple interaction request. The user must not deal * with XInteractionContinuations directly, but can use constants that are @@ -73,8 +76,7 @@ public: * This can be any of the CONTINUATION_* constants combinations * listed above. */ - SimpleInteractionRequest( const css::uno::Any & rRequest, - const ContinuationFlags nContinuations ); + SimpleInteractionRequest(const css::uno::Any& rRequest, const ContinuationFlags nContinuations); /** * After passing this request to XInteractionHandler::handle, this method diff --git a/include/ucbhelper/simplenameclashresolverequest.hxx b/include/ucbhelper/simplenameclashresolverequest.hxx index 05b36dbd31ba..f6826b43d1b2 100644 --- a/include/ucbhelper/simplenameclashresolverequest.hxx +++ b/include/ucbhelper/simplenameclashresolverequest.hxx @@ -25,8 +25,8 @@ #include <ucbhelper/interactionrequest.hxx> #include <ucbhelper/ucbhelperdllapi.h> -namespace ucbhelper { - +namespace ucbhelper +{ class InteractionSupplyName; /** @@ -40,9 +40,10 @@ class InteractionSupplyName; * @see InteractionAbort * @see InteractioneplaceExistingData */ -class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) SimpleNameClashResolveRequest final : public ucbhelper::InteractionRequest +class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) SimpleNameClashResolveRequest final + : public ucbhelper::InteractionRequest { - rtl::Reference< InteractionSupplyName > m_xNameSupplier; + rtl::Reference<InteractionSupplyName> m_xNameSupplier; virtual ~SimpleNameClashResolveRequest() override; @@ -54,15 +55,14 @@ public: * the clashing resource. * @param rClashingName contains the clashing name. */ - SimpleNameClashResolveRequest( const OUString & rTargetFolderURL, - const OUString & rClashingName ); + SimpleNameClashResolveRequest(const OUString& rTargetFolderURL, const OUString& rClashingName); /** * This method returns the new name that was supplied by the interaction * handler. * * @return the new name, if supplied. */ - OUString const & getNewName() const; + OUString const& getNewName() const; }; } // namespace ucbhelper diff --git a/include/ucbhelper/ucbhelperdllapi.h b/include/ucbhelper/ucbhelperdllapi.h index bebc94781661..739d76d0e7eb 100644 --- a/include/ucbhelper/ucbhelperdllapi.h +++ b/include/ucbhelper/ucbhelperdllapi.h @@ -23,9 +23,9 @@ #include <sal/types.h> #if defined(UCBHELPER_DLLIMPLEMENTATION) -#define UCBHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#define UCBHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else -#define UCBHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#define UCBHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define UCBHELPER_DLLPRIVATE SAL_DLLPRIVATE |