include/vcl/toolkit/fixed.hxx | 2 +- include/vcl/toolkit/prgsbar.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit da9d5b7e604d397b69971214e7753ee7b73cb1a2 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Sep 19 14:03:20 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Sep 19 15:16:43 2025 +0200 tdf#104833 update check: Fix --enable-mergelibs build Fix build for the case where both autogen options --enable-mergelibs and --enable-online-update are used. After commit 96ba07a515e1c346bdfa2cd91e87fe7afdf56e91 Author: Michael Weghorn <[email protected]> Date: Wed Sep 17 11:32:25 2025 +0200 tdf#104833 update check: Use ProgressBar methods directly , this was seen failing as follows in the daily build [1]: /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/src_master/extensions/source/update/check/updatehdl.cxx:244: undefined reference to `ProgressBar::SetValue(unsigned short)' /opt/rh/gcc-toolset-12/root/usr/libexec/gcc/x86_64-redhat-linux/12/ld: /tmp/cchzxrtC.ltrans2.ltrans.o: in function `UpdateHandler::updateState(UpdateState)': /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/src_master/extensions/source/update/check/updatehdl.cxx:564: undefined reference to `ProgressBar::SetValue(unsigned short)' /opt/rh/gcc-toolset-12/root/usr/libexec/gcc/x86_64-redhat-linux/12/ld: /tmp/cchzxrtC.ltrans2.ltrans.o: in function `UpdateHandler::createDialog()': /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/src_master/extensions/source/update/check/updatehdl.cxx:1241: undefined reference to `typeinfo for ProgressBar' /opt/rh/gcc-toolset-12/root/usr/libexec/gcc/x86_64-redhat-linux/12/ld: /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/src_master/extensions/source/update/check/updatehdl.cxx:1243: undefined reference to `typeinfo for FixedText' /opt/rh/gcc-toolset-12/root/usr/libexec/gcc/x86_64-redhat-linux/12/ld: /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/src_master/extensions/source/update/check/updatehdl.cxx:1245: undefined reference to `FixedText::set_mnemonic_widget(vcl::Window*)' /opt/rh/gcc-toolset-12/root/usr/libexec/gcc/x86_64-redhat-linux/12/ld: /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/src_master/extensions/source/update/check/updatehdl.cxx:1247: undefined reference to `typeinfo for FixedText' /opt/rh/gcc-toolset-12/root/usr/libexec/gcc/x86_64-redhat-linux/12/ld: /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/src_master/extensions/source/update/check/updatehdl.cxx:1249: undefined reference to `FixedText::set_mnemonic_widget(vcl::Window*)' collect2: error: ld returned 1 exit status [1] https://ci.libreoffice.org/job/lo_daily_tb_linux/1415/consoleFull#-117369509718ea88b4-cafc-4624-83a7-468a3ab5c53a Change-Id: I53b6584e25d89a52aed0c14161891c790dff3315 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191200 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/include/vcl/toolkit/fixed.hxx b/include/vcl/toolkit/fixed.hxx index 88f88d691042..fb1452fabf02 100644 --- a/include/vcl/toolkit/fixed.hxx +++ b/include/vcl/toolkit/fixed.hxx @@ -28,7 +28,7 @@ #include <vcl/ctrl.hxx> #include <vcl/image.hxx> -class UNLESS_MERGELIBS(VCL_DLLPUBLIC) FixedText : public Control +class VCL_DLLPUBLIC FixedText : public Control { private: sal_Int32 m_nMaxWidthChars; diff --git a/include/vcl/toolkit/prgsbar.hxx b/include/vcl/toolkit/prgsbar.hxx index bced6fc9e259..48b368f0e7c8 100644 --- a/include/vcl/toolkit/prgsbar.hxx +++ b/include/vcl/toolkit/prgsbar.hxx @@ -50,7 +50,7 @@ ************************************************************************/ -class UNLESS_MERGELIBS(VCL_DLLPUBLIC) ProgressBar final : public vcl::Window +class VCL_DLLPUBLIC ProgressBar final : public vcl::Window { public: enum class BarStyle
