include/vcl/metaact.hxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c26c9115245a7ed9a6117924d22fcd5634217b99
Author: Rene Engelhard <r...@debian.org>
AuthorDate: Tue Oct 12 19:50:32 2021 +0200
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Wed Oct 13 19:39:20 2021 +0200
fix (cppunit test) build with --enable-mergelibs again
=/home/rene/LibreOffice/git/master && I=$S/instdir && W=$S/workdir &&
/usr/bin/ccache x86_64-linux-gnu-g++ -pthread -shared -Wl,-z,noexecstack
-flto=4 -fuse-linker-plugin -O2 -Wl,-z,origin '-Wl,-rpath,$ORIGIN/../Library'
-Wl,-rpath-link,$I/program -Wl,-z,defs -Wl,-rpath-link,/lib:/usr/lib
-Wl,-z,combreloc -Wl,--hash-style=gnu -Wl,-Bsymbolic-functions
-L$W/LinkTarget/StaticLibrary -L$I/sdk/lib -L$I/program -L$I/program
-L$W/LinkTarget/Library -Wl,-z,relro $W/CxxObject/vcl/qa/api/XGraphicTest.o
-Wl,--start-group -lcppunit -Wl,--end-group -Wl,--no-as-needed
-lmergedlo -luno_cppu -luno_cppuhelpergcc3 -luno_sal -ltest -lunotest -o
$W/LinkTarget/CppunitTest/libtest_vcl_apitests.so
/usr/bin/ld: /tmp/cc9oq9Pr.ltrans2.ltrans.o: in function
`VclOutdevTest::testDrawPolyLine()':
<artificial>:(.text+0x9e91): undefined reference to `typeinfo for
MetaPolyLineAction'
/usr/bin/ld: <artificial>:(.text+0xa115): undefined reference to `typeinfo
for MetaPolyLineAction'
/usr/bin/ld: <artificial>:(.text+0xa824): undefined reference to `typeinfo
for MetaPolyLineAction'
collect2: error: ld returned 1 exit status
make[4]: ***
[/home/rene/LibreOffice/git/master/solenv/gbuild/LinkTarget.mk:799:
/home/rene/LibreOffice/git/master/workdir/LinkTarget/CppunitTest/libtest_vcl_outdev.so]
Error 1
make[4]: *** Waiting for unfinished jobs....
Change-Id: I0c22c2b2786660060e39fb272396a6d9af20433f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123530
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
Tested-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 6d10d5d2635d..c51c1e790a85 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -377,7 +377,7 @@ public:
void SetEndPoint(const Point& rPoint) { maEndPt = rPoint; }
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPolyLineAction final : public
MetaAction
+class VCL_DLLPUBLIC MetaPolyLineAction final : public MetaAction
{
private:
