[Libreoffice-commits] core.git: include/vcl

[Stephan Bergmann (via logerrit)]

 include/vcl/QueueInfo.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 587bd6676938787477421a7dbd38341b657c1230
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Jun 26 14:27:48 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Jun 26 15:54:02 2020 +0200

    QueueInfo must be VCL_DLLPUBLIC now also for --enable-mergelibs
    
    ...after 1a6b0f167d8ecba3b3d07fd48c43394e38b58702 "vcl: split off QueueInfo to
    own files" made its member functions non-inline; see e.g.,
    <https://ci.libreoffice.org/job/lo_callgrind_linux/8949/>:
    
    > /usr/bin/ld: /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/workdir/CxxObject/sw/source/ui/dbui/mmresultdialogs.o: in function `SwMMResultPrintDialog::PrinterChangeHdl_Impl(weld::ComboBox&)':
    > /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/sw/source/ui/dbui/mmresultdialogs.cxx:754: undefined reference to `QueueInfo::GetPrinterName() const'
    > /usr/bin/ld: /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/sw/source/ui/dbui/mmresultdialogs.cxx:755: undefined reference to `QueueInfo::GetDriver() const'
    > collect2: error: ld returned 1 exit status
    > /home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/sw/Library_swui.mk:20: recipe for target '/home/buildslave/lode/jenkins/workspace/lo_callgrind_linux/instdir/program/libswuilo.so' failed
    
    Change-Id: I26b0591142c8936ed82488bdbcebb098208c705c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97223
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/vcl/QueueInfo.hxx b/include/vcl/QueueInfo.hxx
index dff5c448ce2d..5817f5c06ee7 100644
--- a/include/vcl/QueueInfo.hxx
+++ b/include/vcl/QueueInfo.hxx
@@ -29,7 +29,7 @@
 
 class Printer;
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) QueueInfo
+class VCL_DLLPUBLIC QueueInfo
 {
     friend class Printer;