diff options
| author | Gokce Kuler <gokcekuler@gmail.com> | 2021-02-13 00:50:33 +0300 |
|---|---|---|
| committer | Gülşah Köse <gulsah.kose@collabora.com> | 2021-02-26 08:57:18 +0100 |
| commit | f50b5eb2ac667f73d131a59107e24bd651f67f01 (patch) | |
| tree | 84828e828a3d030b4fbc546a66a318df0148879c | |
| parent | 2a3d436aa2fa7df3dc027e7c410ea8c34b908deb (diff) | |
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.kose@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111562
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
| -rw-r--r-- | sd/source/ui/dlg/BulletAndPositionDlg.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx index 498ea1befcc5..8b8ec797e223 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,12 @@ SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const Sf if (pMetricItem) SetMetric(static_cast<FieldUnit>(pMetricItem->GetValue())); + // tdf#137406: Crash when clicking "Apply to Master" in Slide Master mode on Bullets and Numbering dialog + DocumentType aDocumentType = pView->GetDoc().GetDocumentType(); + EditMode aEditmode = static_cast<::sd::DrawViewShell*>(pView->GetViewShell())->GetEditMode(); + if (aDocumentType == DocumentType::Impress && aEditmode == EditMode::MasterPage) + m_xApplyToMaster->hide(); + // End PageCreated Reset(&rSet); |