summaryrefslogtreecommitdiff
path: root/sd/source/ui/func
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/func')
-rw-r--r--sd/source/ui/func/fuexecuteinteraction.cxx2
-rw-r--r--sd/source/ui/func/fuexpand.cxx2
-rw-r--r--sd/source/ui/func/fuinsfil.cxx2
-rw-r--r--sd/source/ui/func/fulinend.cxx1
-rw-r--r--sd/source/ui/func/funavig.cxx1
5 files changed, 6 insertions, 2 deletions
diff --git a/sd/source/ui/func/fuexecuteinteraction.cxx b/sd/source/ui/func/fuexecuteinteraction.cxx
index 6dacef089d56..0970740f06cf 100644
--- a/sd/source/ui/func/fuexecuteinteraction.cxx
+++ b/sd/source/ui/func/fuexecuteinteraction.cxx
@@ -78,6 +78,8 @@ void FuExecuteInteraction::DoExecute(SfxRequest&)
|| dynamic_cast<const DrawView*>(mpView) == nullptr)
return;
+ assert(mpDocSh);
+
SdAnimationInfo* pInfo = SdDrawDocument::GetAnimationInfo(pObj);
if (!pInfo)
return;
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index 822174ed94b4..17e0e0fed1ad 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -104,7 +104,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
if (pActualOutline)
{
- const bool bUndo = mpView->IsUndoEnabled();
+ const bool bUndo = mpView && mpView->IsUndoEnabled();
if( bUndo )
mpView->BegUndo(SdResId(STR_UNDO_EXPAND_PAGE));
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 790c3d0c8d00..20d52abd26ec 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -581,7 +581,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
aOutliner.SetPaperSize(Size(0x7fffffff, 0x7fffffff));
SvStream* pStream = pMedium->GetInStream();
- DBG_ASSERT( pStream, "No InStream!" );
+ assert(pStream && "No InStream!");
pStream->Seek( 0 );
ErrCode nErr = aOutliner.Read(*pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes());
diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx
index 088e8e9d24c2..629c18935023 100644
--- a/sd/source/ui/func/fulinend.cxx
+++ b/sd/source/ui/func/fulinend.cxx
@@ -57,6 +57,7 @@ void FuLineEnd::DoExecute( SfxRequest& )
return;
const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
+ assert(pObj);
const SdrObject* pNewObj;
rtl::Reference<SdrObject> pConvPolyObj;
diff --git a/sd/source/ui/func/funavig.cxx b/sd/source/ui/func/funavig.cxx
index a160d94c7140..ca7565c8ba49 100644
--- a/sd/source/ui/func/funavig.cxx
+++ b/sd/source/ui/func/funavig.cxx
@@ -56,6 +56,7 @@ rtl::Reference<FuPoor> FuNavigation::Create( ViewShell* pViewSh, ::sd::Window* p
void FuNavigation::DoExecute( SfxRequest& rReq )
{
+ assert(mpViewShell);
bool bSlideShow = SlideShow::IsRunning( mpViewShell->GetViewShellBase() )
&& !SlideShow::IsInteractiveSlideshow( &mpViewShell->GetViewShellBase() ); // IASS