diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-07-01 09:59:26 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-01 10:56:14 +0100 |
commit | 5ace3f3b4f2f916d8b2acab1b5cc0fe2a5a19dee (patch) | |
tree | 00cdcfc6ef33bc558bda62935d46377f033975d6 /svx | |
parent | 62cb50fd9b97358114dcc4d0c1afdcdd04341b0c (diff) |
clang scan-build: various warnings
Change-Id: I4bdfb074b3cf6fcb49765322308dfa4b9ed67713
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/form/fmshimp.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdopath.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 967628e42b6f..ba76540339e8 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -2386,7 +2386,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn // current Page/Controller FmFormPage* pCurrentPage = m_pShell->GetCurPage(); - DBG_ASSERT(pCurrentPage!=NULL, "FmXFormShell::OnSearchContextRequest : no page !"); + assert(pCurrentPage && "FmXFormShell::OnSearchContextRequest : no page !"); // Search all SdrControls of this page... OUString sControlSource, aName; diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 8c96c9fcb56d..9a2e18fc1e2a 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -795,7 +795,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const // now check symmetric plus handles if (bControl) { // cases 5,6,7,8 - sal_uInt16 nSt=nPnt; // the associated support point + sal_uInt16 nSt; // the associated support point sal_uInt16 nFix=nPnt; // the opposing control point if (bIsNextControl) { // if the next one is a control point, the on before has to be a support point nSt=nPrevPnt; |