From 345be1519e96be63624bf58ca5de0fe9abe16edd Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Tue, 30 May 2017 10:19:16 +0200 Subject: tdf#107729: Disable toolbar items that are not available yet. Otherwise trying to use them crashes LibreOffice. Change-Id: I268e5b783905ec7aaaf50cbc629fd44e6341bf8d Reviewed-on: https://gerrit.libreoffice.org/38184 Reviewed-by: Jan Holesovsky Tested-by: Jenkins --- sw/source/uibase/app/apphdl.cxx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 79e4fb4d8ceb..23b9b5bdec25 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -224,6 +224,9 @@ void SwModule::StateOther(SfxItemSet &rSet) // #i51949# hide e-Mail option if e-Mail is not supported // #i63267# printing might be disabled if (!xConfigItem || + !xConfigItem->GetResultSet().is() || + xConfigItem->GetCurrentDBData().sDataSource.isEmpty() || + xConfigItem->GetCurrentDBData().sCommand.isEmpty() || (nWhich == FN_MAILMERGE_PRINT_DOCUMENTS && Application::GetSettings().GetMiscSettings().GetDisablePrinting()) || (nWhich == FN_MAILMERGE_EMAIL_DOCUMENTS && !xConfigItem->IsMailAvailable())) { -- cgit