svx/source/dialog/optgrid.cxx | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
New commits: commit cd7ee2410a42da4b702cb32f57e038ba7d9f0854 Author: Caolán McNamara <[email protected]> AuthorDate: Wed May 1 20:27:00 2024 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu May 2 12:31:32 2024 +0200 always check return of SfxViewFrame::Current() Change-Id: If35fe03c775aec12ec534d02d58596aebcec764f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166985 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit caf719c59c6dc8db2b6a0eab8d47760277f112a3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166902 Reviewed-by: Michael Stahl <[email protected]> diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 2226eaa4e23c..66ddc8c4e5e8 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -161,17 +161,19 @@ SvxGridTabPage::SvxGridTabPage(weld::Container* pPage, weld::DialogController* p if (m_Emode != HTML_MODE) { - SfxViewFrame* pCurrent = SfxViewFrame::Current(); - OUString aModuleName = vcl::CommandInfoProvider::GetModuleIdentifier(pCurrent->GetFrame().GetFrameInterface()); - std::u16string_view sModulename = aModuleName.subView(aModuleName.lastIndexOf('.') + 1); - if (sModulename.starts_with(u"Text")) - m_Emode = WRITER_MODE; - else if (sModulename.starts_with(u"Spreadsheet")) - m_Emode = CALC_MODE; - else if (sModulename.starts_with(u"Presentation")) - m_Emode = IMPRESS_MODE; - else if (sModulename.starts_with(u"Drawing")) - m_Emode = DRAW_MODE; + if (SfxViewFrame* pCurrent = SfxViewFrame::Current()) + { + OUString aModuleName = vcl::CommandInfoProvider::GetModuleIdentifier(pCurrent->GetFrame().GetFrameInterface()); + std::u16string_view sModulename = aModuleName.subView(aModuleName.lastIndexOf('.') + 1); + if (sModulename.starts_with(u"Text")) + m_Emode = WRITER_MODE; + else if (sModulename.starts_with(u"Spreadsheet")) + m_Emode = CALC_MODE; + else if (sModulename.starts_with(u"Presentation")) + m_Emode = IMPRESS_MODE; + else if (sModulename.starts_with(u"Drawing")) + m_Emode = DRAW_MODE; + } } m_xCbxRotate->connect_toggled(LINK(this, SvxGridTabPage, ClickRotateHdl_Impl));
