summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorGokce Kuler <gokcekuler@gmail.com>2021-02-13 00:50:33 +0300
committerXisco Fauli <xiscofauli@libreoffice.org>2021-02-15 17:10:48 +0100
commit18d22eaf191b854508f4f34b57e931c26d2f34db (patch)
tree7a7482c8285faa5ad8c702bb4a28adde7674ae0b /sd
parent0c5adc7926c771fbed932e02df9d8aefebd02694 (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>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/dlg/BulletAndPositionDlg.cxx5
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