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/connectivity | |
| 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/connectivity')
| -rw-r--r-- | include/connectivity/paramwrapper.hxx | 3 | ||||
| -rw-r--r-- | include/connectivity/sdbcx/VCollection.hxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx index 3586fbac5e7a..1d55ea38d0d4 100644 --- a/include/connectivity/paramwrapper.hxx +++ b/include/connectivity/paramwrapper.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_PARAMWRAPPER_HXX #define INCLUDED_CONNECTIVITY_PARAMWRAPPER_HXX +#include <config_options.h> #include <connectivity/dbtoolsdllapi.hxx> #include <connectivity/FValue.hxx> @@ -50,7 +51,7 @@ namespace param /** wraps a parameter column as got from an SQLQueryComposer, so that it has an additional property "Value", which is forwarded to an XParameters interface */ - class OOO_DLLPUBLIC_DBTOOLS ParameterWrapper final : public ::cppu::OWeakObject + class UNLESS_MERGELIBS(OOO_DLLPUBLIC_DBTOOLS) ParameterWrapper final : public ::cppu::OWeakObject ,public css::lang::XTypeProvider ,public ::comphelper::OMutexAndBroadcastHelper ,public ::cppu::OPropertySetHelper diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx index 94e9e5f27166..525066876156 100644 --- a/include/connectivity/sdbcx/VCollection.hxx +++ b/include/connectivity/sdbcx/VCollection.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SDBCX_VCOLLECTION_HXX #define INCLUDED_CONNECTIVITY_SDBCX_VCOLLECTION_HXX +#include <config_options.h> #include <cppuhelper/implbase10.hxx> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp> @@ -59,7 +60,7 @@ namespace connectivity typedef css::uno::Reference< css::beans::XPropertySet > ObjectType; - class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE IObjectCollection + class UNLESS_MERGELIBS(OOO_DLLPUBLIC_DBTOOLS) SAL_NO_VTABLE IObjectCollection { public: virtual ~IObjectCollection(); |