sd/source/ui/dlg/BulletAndPositionDlg.cxx | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit ed6033cb0b5fef681015fe574761ebe3fd60be5b
Author: Gokce Kuler <gokceku...@gmail.com>
AuthorDate: Sat Feb 13 00:50:33 2021 +0300
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Feb 16 13:20:18 2021 +0100
tdf#137406 removed Apply to Master button in Slide Master mode
Change-Id: Ic19c38a5e6e561cae45cd0a40cfe56d7002efe9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110835
Tested-by: Jenkins
Reviewed-by: Gülşah Köse <gulsah.k...@collabora.com>
(cherry picked from commit 9887674044e17c4925caa07f197d74233be810d2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110870
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110941
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index 498ea1befcc5..ac14f6e333ac 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -47,6 +47,7 @@
#include <cui/cuicharmap.hxx>
#include <BulletAndPositionDlg.hxx>
#include <sdresid.hxx>
+#include <DrawViewShell.hxx>
#define SHOW_NUMBERING 0
#define SHOW_BULLET 1
@@ -197,6 +198,13 @@
SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const Sf
if (pMetricItem)
SetMetric(static_cast<FieldUnit>(pMetricItem->GetValue()));
+ DocumentType aDocumentType = pView->GetDoc().GetDocumentType();
+
+ // tdf#137406: Crash when clicking "Apply to Master" in Slide Master mode
on Bullets and Numbering dialog
+ EditMode aEditmode =
static_cast<::sd::DrawViewShell*>(pView->GetViewShell())->GetEditMode();
+ if (aDocumentType == DocumentType::Impress && aEditmode ==
EditMode::MasterPage)
+ m_xApplyToMaster->hide();
+
// End PageCreated
Reset(&rSet);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
