[Libreoffice-commits] .: sw/source
Takeshi Abe
tabe at kemper.freedesktop.org
Fri Aug 12 08:09:32 PDT 2011
sw/source/ui/uiview/view2.cxx | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit f5d273bf9892cf25bec8ea3d9dd6736880a05d8c
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sat Aug 13 00:08:03 2011 +0900
cppcheck: possible null pointer dereference: pDlg
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index b7cec7a..89245c8 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -1541,12 +1541,13 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
{
pDlg = pFact->CreateSvxZoomDialog(&GetViewFrame()->GetWindow(), aCoreSet);
OSL_ENSURE(pDlg, "Dialogdiet fail!");
+ if (pDlg)
+ {
+ pDlg->SetLimits( MINZOOM, MAXZOOM );
+ if( pDlg->Execute() != RET_CANCEL )
+ pSet = pDlg->GetOutputItemSet();
+ }
}
-
- pDlg->SetLimits( MINZOOM, MAXZOOM );
-
- if( pDlg->Execute() != RET_CANCEL )
- pSet = pDlg->GetOutputItemSet();
}
// PAGES01
More information about the Libreoffice-commits
mailing list