strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Windows --enable-mergelibs=more build

Browse source 
after

    commit 68f55fc9a1
    Author: Vasily Melenchuk <vasily.melenchuk@cib.de>
    Date:   Wed Oct 25 22:26:14 2023 +0300
    vcl:  interface for WinAPI FlashWindow() function

and

    commit 621e162053
    Author: Noel Grandin <noel.grandin@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.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2024-03-05 11:59:14 +02:00 committed by Noel Grandin
parent c5ac0ffae4
commit 66fefd9a7d
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/vcl/opengl/OpenGLHelper.hxx
View file

@ -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);
/**

2
include/vcl/window.hxx
View file

@ -1120,7 +1120,7 @@ public:
virtual void DumpAsPropertyTree(tools::JsonWriter&);
virtual void FlashWindow() const {};
virtual void FlashWindow() const;
/** @name Accessibility
*/

2
vcl/source/window/window3.cxx
View file

@ -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: */