Rebased ref, commits from common ancestor:
commit f4b618401a447b7bd80c343787ac60101dd33fab
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue Jul 20 11:54:05 2021 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Jul 20 13:19:16 2021 +0200
these classes are used from non-merged libs
Change-Id: I2eb80d0b3002f174deea0d8657cb0cdbdec5be8f
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();
diff --git a/include/ucbhelper/interactionrequest.hxx
b/include/ucbhelper/interactionrequest.hxx
index fa4185e2ad1b..63979f250762 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -222,7 +222,7 @@ public:
* along with an interaction request to indicate the possibility to approve
* the request.
*/
-class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) InteractionApprove final : public
InteractionContinuation,
+class UCBHELPER_DLLPUBLIC InteractionApprove final : public
InteractionContinuation,
public css::lang::XTypeProvider,
public css::task::XInteractionApprove
{
@@ -255,7 +255,7 @@ public:
* along with an interaction request to indicate the possibility to disapprove
* the request.
*/
-class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) InteractionDisapprove final :
public InteractionContinuation,
+class UCBHELPER_DLLPUBLIC InteractionDisapprove final : public
InteractionContinuation,
public css::lang::XTypeProvider,
public css::task::XInteractionDisapprove
{
@@ -288,7 +288,7 @@ public:
* passed along with an authentication interaction request to enable the
* interaction handler to supply the missing authentication data.
*/
-class UNLESS_MERGELIBS(UCBHELPER_DLLPUBLIC) InteractionSupplyAuthentication
final :
+class UCBHELPER_DLLPUBLIC InteractionSupplyAuthentication final :
public InteractionContinuation,
public css::lang::XTypeProvider,
public css::ucb::XInteractionSupplyAuthentication2
diff --git a/include/vcl/IDialogRenderable.hxx
b/include/vcl/IDialogRenderable.hxx
index 68a573574186..bb5480f1bf4f 100644
--- a/include/vcl/IDialogRenderable.hxx
+++ b/include/vcl/IDialogRenderable.hxx
@@ -27,7 +27,7 @@ typedef std::pair<const OString, const OString>
LOKPayloadItem;
typedef sal_uInt32 LOKWindowId;
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) ILibreOfficeKitNotifier
+class VCL_DLLPUBLIC ILibreOfficeKitNotifier
{
public:
virtual ~ILibreOfficeKitNotifier();
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 2e508ff1fdbb..ddfd8613762d 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -97,7 +97,7 @@ public:
static MetaAction* ReadMetaAction( SvStream& rIStm, ImplMetaReadData*
pData );
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPixelAction final : public MetaAction
+class VCL_DLLPUBLIC MetaPixelAction final : public MetaAction
{
private:
Point maPt;
@@ -215,7 +215,7 @@ public:
const tools::Rectangle& GetRect() const { return maRect; }
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaRoundRectAction final : public
MetaAction
+class VCL_DLLPUBLIC MetaRoundRectAction final : public MetaAction
{
private:
@@ -497,7 +497,7 @@ public:
sal_Int32 GetLen() const { return mnLen; }
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaTextArrayAction final : public
MetaAction
+class VCL_DLLPUBLIC MetaTextArrayAction final : public MetaAction
{
private:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
