mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make SpinField DLLPUBLIC again

Browse Source 
to fix Window --enabled-mergedlibs

Change-Id: I0459798449e63c5e77a7b2e961520317d2383527
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90218
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Jenkins
This commit is contained in:
Noel Grandin
2020-03-09 14:12:45 +02:00
committed by Thorsten Behrens
parent fca333820d
commit e0720d2534
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/find-mergedlib-can-be-private.py
View File

@@ -143,7 +143,12 @@ pool = multiprocessing.Pool(multiprocessing.cpu_count())
classes_with_exported_symbols = set(pool.map(extract_class, list(exported_symbols))) classes_with_exported_symbols = set(pool.map(extract_class, list(exported_symbols)))
classes_with_imported_symbols = set(pool.map(extract_class, list(imported_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: 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 if sym.startswith("std::") or sym.startswith("void std::"): continue
f.write(sym + "\n") f.write(sym + "\n")

2
include/vcl/spinfld.hxx
View File

@@ -26,7 +26,7 @@
#include <config_options.h> #include <config_options.h>
class UNLESS_MERGELIBS(VCL_DLLPUBLIC) SpinField : public Edit class VCL_DLLPUBLIC SpinField : public Edit
{ {
public: public:
explicit SpinField( vcl::Window* pParent, WinBits nWinStyle ); explicit SpinField( vcl::Window* pParent, WinBits nWinStyle );