[Libreoffice-commits] core.git: sw/source
Jan Holesovsky
kendy at collabora.com
Tue May 30 10:42:33 UTC 2017
sw/source/uibase/app/apphdl.cxx | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 345be1519e96be63624bf58ca5de0fe9abe16edd
Author: Jan Holesovsky <kendy at collabora.com>
Date: Tue May 30 10:19:16 2017 +0200
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 <kendy at collabora.com>
Tested-by: Jenkins <ci at libreoffice.org>
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()))
{
More information about the Libreoffice-commits
mailing list