Kaydet (Commit) 7e741f28 authored tarafından Caolán McNamara's avatar Caolán McNamara

Related: rhbz#902884 check for GetSelectedMasterPage failure anyway

backtrace doesn't indicate that its NULL however, but the rest of
our GetSelectedMasterPage check for NULL so fix that anyway

Change-Id: I9e0b15f4a18523ff1e787ef230de1ca227aa2980
üst 91843f61
...@@ -553,8 +553,11 @@ void MasterPagesSelector::Execute (SfxRequest& rRequest) ...@@ -553,8 +553,11 @@ void MasterPagesSelector::Execute (SfxRequest& rRequest)
case SID_TP_EDIT_MASTER: case SID_TP_EDIT_MASTER:
{ {
using namespace ::com::sun::star; using namespace ::com::sun::star;
uno::Reference<drawing::XDrawPage> xSelectedMaster ( uno::Reference<drawing::XDrawPage> xSelectedMaster;
GetSelectedMasterPage()->getUnoPage(), uno::UNO_QUERY); SdPage* pMasterPage = GetSelectedMasterPage();
assert(pMasterPage); //rhbz#902884
if (pMasterPage)
xSelectedMaster = uno::Reference<drawing::XDrawPage>(pMasterPage->getUnoPage(), uno::UNO_QUERY);
SfxViewFrame* pViewFrame = mrBase.GetViewFrame(); SfxViewFrame* pViewFrame = mrBase.GetViewFrame();
if (pViewFrame != NULL && xSelectedMaster.is()) if (pViewFrame != NULL && xSelectedMaster.is())
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment