include/basic/basmgr.hxx | 2 +-
include/connectivity/paramwrapper.hxx | 2 +-
include/connectivity/sdbcx/VCollection.hxx | 2 +-
include/ucbhelper/interactionrequest.hxx | 6 +++---
include/vcl/IDialogRenderable.hxx | 2 +-
include/vcl/metaact.hxx | 8 ++++----
6 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit cc584681cae755c6de07f343093259bbe034392a
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue Jul 20 11:54:05 2021 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Feb 16 09:49:56 2023 +0000
set visibility of classes in mergelib+asan case
Change-Id: I2eb80d0b3002f174deea0d8657cb0cdbdec5be8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147144
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx
index 1d0fc37c0a85..7aec06cb92fd 100644
--- a/include/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
@@ -94,7 +94,7 @@ struct LibraryContainerInfo
#define LIB_NOTFOUND 0xFFFF
-class UNLESS_MERGELIBS(BASIC_DLLPUBLIC) BasicManager final : public
SfxBroadcaster
+class BASIC_DLLPUBLIC BasicManager final : public SfxBroadcaster
{
friend class LibraryContainer_Impl;
friend class StarBasicAccess_Impl;
diff --git a/include/connectivity/paramwrapper.hxx
b/include/connectivity/paramwrapper.hxx
index bf16e0851fcb..b862a619af85 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 0f5a0b3fbcb9..997df0dd2242 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 78fc31f7a23b..16e9eda38b96 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 c820d93b560c..06357c74a7eb 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -501,7 +501,7 @@ public:
void SetLen(sal_Int32 rLen) { mnLen = rLen; }
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaTextArrayAction final : public
MetaAction
+class VCL_DLLPUBLIC MetaTextArrayAction final : public MetaAction
{
private:
@@ -729,7 +729,7 @@ public:
void SetSize(const Size& rSz) { maSz = rSz; }
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaBmpScalePartAction final : public
MetaAction
+class VCL_DLLPUBLIC MetaBmpScalePartAction final : public MetaAction
{
private:
@@ -836,7 +836,7 @@ public:
bool IsTransparent() const override { return
GetBitmapEx().IsAlpha(); }
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaBmpExScalePartAction final : public
MetaAction
+class VCL_DLLPUBLIC MetaBmpExScalePartAction final : public MetaAction
{
private:
@@ -1084,7 +1084,7 @@ public:
void SetHatch(const Hatch& rHatch) { maHatch = rHatch; }
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaWallpaperAction final : public
MetaAction
+class VCL_DLLPUBLIC MetaWallpaperAction final : public MetaAction
{
private:
