include/vcl/opengl/OpenGLHelper.hxx | 4 ++--
include/vcl/window.hxx | 2 +-
vcl/source/window/window3.cxx | 2 ++
3 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 66fefd9a7d646d993ba8a2106c712865fe4e0ae1
Author: Noel Grandin <noelgran...@collabora.co.uk>
AuthorDate: Tue Mar 5 11:59:14 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Mar 5 13:00:03 2024 +0100
Fix Windows --enable-mergelibs=more build
after
commit 68f55fc9a1aa8c0f403761e39e7531ae298ea79e
Author: Vasily Melenchuk <vasily.melenc...@cib.de>
Date: Wed Oct 25 22:26:14 2023 +0300
vcl: interface for WinAPI FlashWindow() function
and
commit 621e16205363c1eea0be57017997396dee63df4b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Fri Mar 1 15:58:23 2024 +0200
add UNLESS_MERGELIBS_MORE and use to reduce symbol visibility
Change-Id: I32660173d255b4b49a346c56fadf998968580a61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164416
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/vcl/opengl/OpenGLHelper.hxx
b/include/vcl/opengl/OpenGLHelper.hxx
index e213bfccf14e..8aee4d16ca4f 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -43,7 +43,7 @@
} while (false)
// All member functions static and VCL_DLLPUBLIC. Basically a glorified
namespace.
-struct UNLESS_MERGELIBS_MORE(VCL_DLLPUBLIC) OpenGLHelper
+struct VCL_DLLPUBLIC OpenGLHelper
{
OpenGLHelper() = delete; // Should not be instantiated
@@ -100,7 +100,7 @@ public:
__attribute__ ((format (printf, 2, 3)))
#endif
static void debugMsgPrint(const int nType, const char *pFormat, ...);
- IF_MERGELIBS_MORE(VCL_DLLPUBLIC) static void
debugMsgStream(std::ostringstream const &pStream);
+ static void debugMsgStream(std::ostringstream const &pStream);
static void debugMsgStreamWarn(std::ostringstream const &pStream);
/**
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index f451d6f3038b..cfceab59102c 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1120,7 +1120,7 @@ public:
virtual void DumpAsPropertyTree(tools::JsonWriter&);
- virtual void FlashWindow() const {};
+ virtual void FlashWindow() const;
/** @name Accessibility
*/
diff --git a/vcl/source/window/window3.cxx b/vcl/source/window/window3.cxx
index 30c41f5e20f0..44b3d4642850 100644
--- a/vcl/source/window/window3.cxx
+++ b/vcl/source/window/window3.cxx
@@ -215,6 +215,8 @@ Color Window::GetBackgroundColor() const { return
GetOutDev()->GetBackgroundColo
void Window::EnableRTL(bool bEnable) { GetOutDev()->EnableRTL(bEnable); }
+void Window::FlashWindow() const {}
+
} /* namespace vcl */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
