diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-03-07 14:30:54 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-03-07 16:12:59 +0000 |
| commit | 7e741f28e5b9d869096b1814108a252006bc23e0 (patch) | |
| tree | 2ac81c955d49164de0f4038b68e3b4325ea8a3bc /sd | |
| parent | 91843f612208fc7d2641072a095efc6de0d0babf (diff) | |
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
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx index 512fd1dbdce0..58fa05f86f49 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx @@ -553,8 +553,11 @@ void MasterPagesSelector::Execute (SfxRequest& rRequest) case SID_TP_EDIT_MASTER: { using namespace ::com::sun::star; - uno::Reference<drawing::XDrawPage> xSelectedMaster ( - GetSelectedMasterPage()->getUnoPage(), uno::UNO_QUERY); + uno::Reference<drawing::XDrawPage> xSelectedMaster; + SdPage* pMasterPage = GetSelectedMasterPage(); + assert(pMasterPage); //rhbz#902884 + if (pMasterPage) + xSelectedMaster = uno::Reference<drawing::XDrawPage>(pMasterPage->getUnoPage(), uno::UNO_QUERY); SfxViewFrame* pViewFrame = mrBase.GetViewFrame(); if (pViewFrame != NULL && xSelectedMaster.is()) { |