[Libreoffice-commits] core.git: bin/find-mergedlib-can-be-private.py include/vcl

[Noel Grandin (via logerrit)]

 bin/find-mergedlib-can-be-private.py |    7 ++++++-
 include/vcl/spinfld.hxx              |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit e0720d253460a2715d89c98db01e11c9d429c6d1
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Mar 9 14:12:45 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Mon Mar 9 15:26:54 2020 +0100

    make SpinField DLLPUBLIC again
    
    to fix Window --enabled-mergedlibs
    
    Change-Id: I0459798449e63c5e77a7b2e961520317d2383527
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90218
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Jenkins

diff --git a/bin/find-mergedlib-can-be-private.py b/bin/find-mergedlib-can-be-private.py
index ba09996b4757..ac9d96712391 100755
--- a/bin/find-mergedlib-can-be-private.py
+++ b/bin/find-mergedlib-can-be-private.py
@@ -143,7 +143,12 @@ pool = multiprocessing.Pool(multiprocessing.cpu_count())
 classes_with_exported_symbols = set(pool.map(extract_class, list(exported_symbols)))
 classes_with_imported_symbols = set(pool.map(extract_class, list(imported_symbols)))
 
+# Some stuff is particular to Windows, so won't be found by a Linux analysis, so remove
+# those classes.
+can_be_private_classes = classes_with_exported_symbols - classes_with_imported_symbols;
+can_be_private_classes.discard("SpinField")
+
 with open("bin/find-mergedlib-can-be-private.classes.results", "wt") as f:
-    for sym in sorted(classes_with_exported_symbols - classes_with_imported_symbols):
+    for sym in sorted(can_be_private_classes):
         if sym.startswith("std::") or sym.startswith("void std::"): continue
         f.write(sym + "\n")
diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx
index 860c44b6245c..eb9e3be59455 100644
--- a/include/vcl/spinfld.hxx
+++ b/include/vcl/spinfld.hxx
@@ -26,7 +26,7 @@
 #include <config_options.h>
 
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) SpinField : public Edit
+class VCL_DLLPUBLIC SpinField : public Edit
 {
 public:
     explicit        SpinField( vcl::Window* pParent, WinBits nWinStyle );