diff options
| author | Andras Timar <andras.timar@collabora.com> | 2021-07-20 11:54:05 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-07-20 13:33:38 +0200 |
| commit | 55a8ec167ee4a5899b927ecf2ad8b1e3b0b297d0 (patch) | |
| tree | 0b97c71e34948fd933589bec19f2a43644c0d95e /include/connectivity | |
| parent | 312c5cfa72ec8dab30994176fba352f1bad3c5a1 (diff) | |
these classes are used from non-merged libs
Change-Id: I2eb80d0b3002f174deea0d8657cb0cdbdec5be8f
Diffstat (limited to 'include/connectivity')
| -rw-r--r-- | include/connectivity/paramwrapper.hxx | 2 | ||||
| -rw-r--r-- | include/connectivity/sdbcx/VCollection.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx index 1911431b256f..734264714b4c 100644 --- a/include/connectivity/paramwrapper.hxx +++ b/include/connectivity/paramwrapper.hxx @@ -49,7 +49,7 @@ namespace dbtools::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 UNLESS_MERGELIBS(OOO_DLLPUBLIC_DBTOOLS) ParameterWrapper final : public ::cppu::OWeakObject + class 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 9e94d83cb964..7333b84f92e5 100644 --- a/include/connectivity/sdbcx/VCollection.hxx +++ b/include/connectivity/sdbcx/VCollection.hxx @@ -58,7 +58,7 @@ namespace connectivity::sdbcx typedef css::uno::Reference< css::beans::XPropertySet > ObjectType; - class UNLESS_MERGELIBS(OOO_DLLPUBLIC_DBTOOLS) SAL_NO_VTABLE IObjectCollection + class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE IObjectCollection { public: virtual ~IObjectCollection(); |