diff options
| author | Gokce Kuler <gokcekuler@gmail.com> | 2021-02-13 00:50:33 +0300 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2021-02-17 09:06:29 +0100 |
| commit | ff4a65a15080b63ee13aa2818fb9700858e58eba (patch) | |
| tree | f542002035169aac717febfb2cb3fd2bdc6212e6 | |
| parent | c810c0aacb38d038bd058651f0b56138dedfe9c8 (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>
(cherry picked from commit 9887674044e17c4925caa07f197d74233be810d2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110870
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit 18d22eaf191b854508f4f34b57e931c26d2f34db)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110914
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
| -rw-r--r-- | sd/source/ui/dlg/BulletAndPositionDlg.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx index bb67585ce8eb..2cb3e1c84ddb 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 @@ -204,6 +205,10 @@ SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const Sf m_xApplyToMaster->hide(); m_xSlideRB->set_label(SdResId(STR_PAGE_NAME)); } + // 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 |