add some more libs to libmerged

Desktop / LibreOffice - Noel Grandin [collabora.co.uk] - 11 February 2020 12:51 UTC

and fix a consequent symbol name clash in basctl

Change-Id: Idc836fcbb379e1046a60008391635eb6241b27c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88188

40fe721462df add some more libs to libmerged
basctl/Library_basctl.mk | 4 ++++
basctl/source/basicide/basidesh.cxx | 6 ++++--
solenv/gbuild/extensions/pre_MergedLibsList.mk | 7 +++++++
3 files changed, 15 insertions(+), 2 deletions(-)

Upstream: cgit.freedesktop.org


  • Share