summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2019-04-01 00:25:16 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2019-04-01 00:49:12 +0200
commit85456fae54029edd26df2277a9eec5e2fe3d9739 (patch)
treefd55ad48b34c66f0b839edcbc952a8a5a0752c72 /sc
parent1d35b89e7581e12024769d19bfb6d6eb2c3274b8 (diff)
tdf#120703 PVS: Silence V522 warnings
V522 There might be dereferencing of a potential null pointer. Change-Id: Ie617b41a8f8d334022cf5313b242a236baedba48 Reviewed-on: https://gerrit.libreoffice.org/70017 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/tool/chgtrack.cxx5
-rw-r--r--sc/source/ui/pagedlg/areasdlg.cxx6
2 files changed, 6 insertions, 5 deletions
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index f25d6bb27bbc..5f165aab0172 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -4483,8 +4483,9 @@ ScChangeTrack* ScChangeTrack::Clone( ScDocument* pDocument ) const
break;
case SC_CAT_MOVE:
{
- const ScChangeActionMove* pMove = dynamic_cast< const ScChangeActionMove* >( pAction );
- OSL_ENSURE( pMove, "ScChangeTrack::Clone: pMove is null!" );
+ assert(dynamic_cast<const ScChangeActionMove*>(pAction)
+ && "ScChangeTrack::Clone: pMove is null!");
+ auto pMove = static_cast<const ScChangeActionMove*>(pAction);
pClonedAction = new ScChangeActionMove(
pAction->GetActionNumber(),
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 6b46dd41790b..de0196609adf 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -124,9 +124,9 @@ ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Win
get(pBtnCancel,"cancel");
ScTabViewShell* pScViewSh = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() );
- ScDocShell* pScDocSh = dynamic_cast<ScDocShell*>( SfxObjectShell::Current() );
-
- OSL_ENSURE( pScDocSh, "Current DocumentShell not found :-(" );
+ SfxObjectShell* pSfxObjSh = SfxObjectShell::Current();
+ assert(dynamic_cast<ScDocShell*>(pSfxObjSh) && "Current DocumentShell not found :-(");
+ ScDocShell* pScDocSh = static_cast<ScDocShell*>(pSfxObjSh);
pDoc = &pScDocSh->GetDocument();