diff options
| author | Rene Engelhard <rene@debian.org> | 2021-10-10 08:20:57 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-10-10 20:32:40 +0200 |
| commit | 4a9ecab08c1ea6879919cb807e243ac1899f61f3 (patch) | |
| tree | 3dff564c67f4ed69d74389579427e339241f3bb7 /include | |
| parent | e354e36c9e3f3c418973819208e0bf3e327b7c7c (diff) | |
fix (cppunit test) build with --enable-mergelibs
S=/home/rene/LibreOffice/git/master && I=$S/instdir && W=$S/workdir && /usr/bin/ccache x86_64-linux-gnu-g++ -pthread -shared -Wl,-z,noexecstack -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/cppunit/BackendTest.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_backend_test.so
/home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/outdev.o: in function `VclOutdevTest::testDrawPixel()':
././vcl/qa/cppunit/outdev.cxx:1091: undefined reference to `typeinfo for MetaPixelAction'
/usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/outdev.o: in function `VclOutdevTest::testDrawRect()':
././vcl/qa/cppunit/outdev.cxx:1203: undefined reference to `typeinfo for MetaRoundRectAction'
/usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/outdev.o: in function `VclOutdevTest::testDrawEllipse()':
././vcl/qa/cppunit/outdev.cxx:1225: undefined reference to `typeinfo for MetaEllipseAction'
/usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/outdev.o: in function `VclOutdevTest::testDrawPie()':
././vcl/qa/cppunit/outdev.cxx:1243: undefined reference to `typeinfo for MetaPieAction'
/usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/outdev.o: in function `VclOutdevTest::testDrawChord()':
././vcl/qa/cppunit/outdev.cxx:1263: undefined reference to `typeinfo for MetaChordAction'
/usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/outdev.o: in function `VclOutdevTest::testDrawArc()':
././vcl/qa/cppunit/outdev.cxx:1284: undefined reference to `typeinfo for MetaArcAction'
Change-Id: I65f79d726de553d894c848a89cf1dd97d5e45b54
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123329
Tested-by: Jenkins
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/metaact.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index dc14179712e1..ca977a18e1e9 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -101,7 +101,7 @@ protected: static void WriteColor(SvStream& rIStm, ::Color aColor); }; -class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPixelAction final : public MetaAction +class VCL_DLLPUBLIC MetaPixelAction final : public MetaAction { private: Point maPt; @@ -218,7 +218,7 @@ public: void SetRect(const tools::Rectangle& rRect) { maRect = rRect; } }; -class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaRoundRectAction final : public MetaAction +class VCL_DLLPUBLIC MetaRoundRectAction final : public MetaAction { private: @@ -252,7 +252,7 @@ public: void SetVertRound(sal_uInt32 rVertRound) { mnVertRound = rVertRound; } }; -class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaEllipseAction final : public MetaAction +class VCL_DLLPUBLIC MetaEllipseAction final : public MetaAction { private: @@ -279,7 +279,7 @@ public: void SetRect(const tools::Rectangle& rRect) { maRect = rRect; } }; -class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaArcAction final : public MetaAction +class VCL_DLLPUBLIC MetaArcAction final : public MetaAction { private: @@ -313,7 +313,7 @@ public: void SetEndPoint(const Point& rPoint) { maEndPt = rPoint; } }; -class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPieAction final : public MetaAction +class VCL_DLLPUBLIC MetaPieAction final : public MetaAction { private: @@ -347,7 +347,7 @@ public: void SetEndPoint(const Point& rPoint) { maEndPt = rPoint; } }; -class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaChordAction final : public MetaAction +class VCL_DLLPUBLIC MetaChordAction final : public MetaAction { private: |