Author: alg Date: Tue Apr 15 09:20:07 2014 New Revision: 1587482 URL: http://svn.apache.org/r1587482 Log: i124638 As a first step, avoid crash when a TabPage is not found for a TabDialog, assert this
Modified: openoffice/trunk/main/sfx2/source/dialog/tabdlg.cxx Modified: openoffice/trunk/main/sfx2/source/dialog/tabdlg.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/dialog/tabdlg.cxx?rev=1587482&r1=1587481&r2=1587482&view=diff ============================================================================== --- openoffice/trunk/main/sfx2/source/dialog/tabdlg.cxx (original) +++ openoffice/trunk/main/sfx2/source/dialog/tabdlg.cxx Tue Apr 15 09:20:07 2014 @@ -1406,10 +1406,11 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl //UUUU fallback to 1st page when requested one does not exist if(!pDataObject && pTabCtrl->GetPageCount()) { + OSL_ENSURE(false, "Requested TabPage not found in the TabDialog, fallback to 1st page (!)"); pTabCtrl->SetCurPageId(pTabCtrl->GetPageId(0)); nId = pTabCtrl->GetCurPageId(); pTabPage = dynamic_cast< SfxTabPage* >(pTabCtrl->GetTabPage(nId)); - Data_Impl* pDataObject = Find(*pImpl->pData, nId); + pDataObject = Find(*pImpl->pData, nId); } DBG_ASSERT( pDataObject, "Id nicht bekannt" );