diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-20 16:07:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-03-23 12:05:36 +0100 |
| commit | 01159643623de55f9e1de84d568032ca919dbd8f (patch) | |
| tree | ce16c0be84c8648eae7afb69196b02393bc71c2f /include/ucbhelper | |
| parent | f6f37e3341f2a3ad292af1a923dbc33d81e439c9 (diff) | |
make more classes private in mergedlibs mode
Change-Id: I486922d0652f26fa7ee56f5fe308e19fe5ff137e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90856
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/ucbhelper')
| -rw-r--r-- | include/ucbhelper/activedatasink.hxx | 3 | ||||
| -rw-r--r-- | include/ucbhelper/interactionrequest.hxx | 7 | ||||
| -rw-r--r-- | include/ucbhelper/simplenameclashresolverequest.hxx | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/include/ucbhelper/activedatasink.hxx b/include/ucbhelper/activedatasink.hxx index 35446a023a66..c71066421e2e 100644 --- a/include/ucbhelper/activedatasink.hxx +++ b/include/ucbhelper/activedatasink.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_UCBHELPER_ACTIVEDATASINK_HXX #define INCLUDED_UCBHELPER_ACTIVEDATASINK_HXX +#include <config_options.h> #include <com/sun/star/io/XActiveDataSink.hpp> #include <ucbhelper/ucbhelperdllapi.h> #include <cppuhelper/implbase.hxx> @@ -35,7 +36,7 @@ class SAL_DLLPUBLIC_TEMPLATE ActiveDataSink_Base : public cppu::WeakImplHelper< * Instances of this class can be passed with the parameters of an * "open" command. */ -class UCBHELPER_DLLPUBLIC ActiveDataSink final : public ActiveDataSink_Base +class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) ActiveDataSink final : public ActiveDataSink_Base { css::uno::Reference< css::io::XInputStream > m_xStream; diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx index facd9342363a..fa4185e2ad1b 100644 --- a/include/ucbhelper/interactionrequest.hxx +++ b/include/ucbhelper/interactionrequest.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_UCBHELPER_INTERACTIONREQUEST_HXX #define INCLUDED_UCBHELPER_INTERACTIONREQUEST_HXX +#include <config_options.h> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/task/XInteractionRequest.hpp> #include <com/sun/star/task/XInteractionAbort.hpp> @@ -221,7 +222,7 @@ public: * along with an interaction request to indicate the possibility to approve * the request. */ -class UCBHELPER_DLLPUBLIC InteractionApprove final : public InteractionContinuation, +class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) InteractionApprove final : public InteractionContinuation, public css::lang::XTypeProvider, public css::task::XInteractionApprove { @@ -254,7 +255,7 @@ public: * along with an interaction request to indicate the possibility to disapprove * the request. */ -class UCBHELPER_DLLPUBLIC InteractionDisapprove final : public InteractionContinuation, +class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) InteractionDisapprove final : public InteractionContinuation, public css::lang::XTypeProvider, public css::task::XInteractionDisapprove { @@ -287,7 +288,7 @@ public: * passed along with an authentication interaction request to enable the * interaction handler to supply the missing authentication data. */ -class UCBHELPER_DLLPUBLIC InteractionSupplyAuthentication final : +class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) InteractionSupplyAuthentication final : public InteractionContinuation, public css::lang::XTypeProvider, public css::ucb::XInteractionSupplyAuthentication2 diff --git a/include/ucbhelper/simplenameclashresolverequest.hxx b/include/ucbhelper/simplenameclashresolverequest.hxx index 04a00e7479aa..05b36dbd31ba 100644 --- a/include/ucbhelper/simplenameclashresolverequest.hxx +++ b/include/ucbhelper/simplenameclashresolverequest.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_UCBHELPER_SIMPLENAMECLASHRESOLVEREQUEST_HXX #define INCLUDED_UCBHELPER_SIMPLENAMECLASHRESOLVEREQUEST_HXX +#include <config_options.h> #include <rtl/ref.hxx> #include <ucbhelper/interactionrequest.hxx> #include <ucbhelper/ucbhelperdllapi.h> @@ -39,7 +40,7 @@ class InteractionSupplyName; * @see InteractionAbort * @see InteractioneplaceExistingData */ -class UCBHELPER_DLLPUBLIC SimpleNameClashResolveRequest final : public ucbhelper::InteractionRequest +class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) SimpleNameClashResolveRequest final : public ucbhelper::InteractionRequest { rtl::Reference< InteractionSupplyName > m_xNameSupplier; |