diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-06-30 09:13:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-30 09:46:16 +0100 |
| commit | 4523dd0544d762961435429167e41a0834b60cea (patch) | |
| tree | 56a642851053dbb73cc8e383ac29411382d6cc8b /sd | |
| parent | 390ec50cbe3e0b8c15db6504b5bdd36dc3f3fb61 (diff) | |
Called C++ object pointer is null
Change-Id: I88efc4be6ff869ef97a2b398d43f7b7914debfc6
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/func/fuinsfil.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index b4d725649604..7ba47c463c84 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -664,7 +664,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) ::sd::ViewShellBase* pBase = ::sd::ViewShellBase::GetViewShellBase ( pViewFrame); - OSL_ASSERT (pBase!=NULL); + assert(pBase!=NULL); ::boost::shared_ptr<sd::ViewShell> pViewSh = pBase->GetMainViewShell(); SdOptions* pOptions = GetSdOptions(pDoc->GetDocumentType()); diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 4d172e02f431..7514812e1442 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -449,7 +449,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) pOutliner->SetPaperSize(pPage->GetSize()); SvStream* pStream = pMedium->GetInStream(); - DBG_ASSERT( pStream, "No InStream!" ); + assert(pStream && "No InStream!"); pStream->Seek( 0 ); sal_uLong nErr = pOutliner->Read( *pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes() ); @@ -469,7 +469,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) pPage = (SdPage*)(&(pPage->TRG_GetMasterPage())); } - DBG_ASSERT(pPage, "page not found"); + assert(pPage && "page not found"); // if editing is going on right now, let it flow into this text object OutlinerView* pOutlinerView = mpView->GetTextEditOutlinerView(); |