sw/source/ui/dialog/swdlgfact.cxx | 8 ++++++++ sw/source/ui/dialog/swdlgfact.hxx | 7 +++++++ 2 files changed, 15 insertions(+)
New commits: commit 385302035c410e93a2b0868b43906a3a4eee55bf Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Oct 1 09:34:33 2025 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed Oct 1 15:04:28 2025 +0200 Fix Emscripten -fsanitize=address build ...which failed with > wasm-ld: error: instdir/program/libswuilo.a(swdlgfact.o): undefined symbol: SwMailMergeWizard::run() > wasm-ld: error: instdir/program/libswuilo.a(changedb.o): undefined symbol: SwDBTreeList::~SwDBTreeList() > wasm-ld: error: instdir/program/libswuilo.a(changedb.o): undefined symbol: SwDBTreeList::GetDBName(rtl::OUString&, rtl::OUString&, unsigned char*) > emcc: error: '~/emsdk/4.0.15/emsdk/llvm/git/build_main_64/bin/wasm-ld @/tmp/emscripten_i5rpaw1n.rsp.utf-8' failed (returned 1) > make[1]: *** [desktop/Executable_soffice_bin.mk:10: instdir/program/soffice.js] Error 1 (which a plain Emscripten build never complained about presumably because of differences in dead code elimination during linking; and which no longer is an issue on master presumably since e04d5aef350a2cee7bdc7d661be1d10a90d75086 "Simplify abstract dialog impls using vcl::AbstractDialogImpl* in sw") Change-Id: Ifd2c3176af1e3aa9778c81735140fb3e238e2a68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191707 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 4ed228a58633..5107f9a8406b 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -964,6 +964,8 @@ void AbstractSwWordCountFloatDlg_Impl::SetCounts(const SwDocStat &rCurrCnt, cons m_xDlg->SetCounts(rCurrCnt, rDocStat); } +#if HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS + AbstractMailMergeWizard_Impl::~AbstractMailMergeWizard_Impl() { } @@ -996,6 +998,8 @@ sal_uInt16 AbstractMailMergeWizard_Impl::GetRestartPage() const return m_xDlg->GetRestartPage(); } +#endif + std::optional<SwLanguageListItem> AbstractSwTranslateLangSelectDlg_Impl::GetSelectedLanguage() { #if HAVE_FEATURE_CURL && !ENABLE_WASM_STRIP_EXTRA @@ -1005,6 +1009,8 @@ std::optional<SwLanguageListItem> AbstractSwTranslateLangSelectDlg_Impl::GetSele #endif } +#if HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS + short AbstractChangeDbDialog_Impl::Execute() { assert(false); @@ -1016,6 +1022,8 @@ bool AbstractChangeDbDialog_Impl::StartExecuteAsync(AsyncContext &rCtx) return weld::GenericDialogController::runAsync(m_xDlg, rCtx.maEndDialogFn); } +#endif + VclPtr<AbstractSwInsertAbstractDlg> SwAbstractDialogFactory_Impl::CreateSwInsertAbstractDlg(weld::Window* pParent) { return VclPtr<AbstractSwInsertAbstractDlg_Impl>::Create(std::make_unique<SwInsertAbstractDlg>(pParent)); diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 3875fe8d997f..5c7fde5585c7 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -59,6 +59,9 @@ #include <pagenumberdlg.hxx> #include <changedb.hxx> +#include <config_features.h> +#include <config_fuzzers.h> + class SwInsertAbstractDlg; class SwAsciiFilterDlg; @@ -732,6 +735,8 @@ public: virtual std::shared_ptr<SfxDialogController> GetController() override; }; +#if HAVE_FEATURE_DBCONNECTIVITY && !ENABLE_FUZZERS + class SwMailMergeWizard; class AbstractMailMergeWizard_Impl : public AbstractMailMergeWizard { @@ -764,6 +769,8 @@ public: virtual void UpdateFields() override { m_xDlg->UpdateFields(); } }; +#endif + //AbstractDialogFactory_Impl implementations class SwAbstractDialogFactory_Impl : public SwAbstractDialogFactory
