diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-14 11:30:27 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-14 11:31:06 +0200 |
| commit | a24b62dc02cd21a992e78c551de594f7167fe7b7 (patch) | |
| tree | c8c131f70ceca98c78af33d653dfebf658f4dcd7 /sw | |
| parent | 640c6745b0696e3bf9eb59899d5015b6ca828036 (diff) | |
warning C4701: potentially uninitialized local variable
Change-Id: Ic3377b51faa2a83cd78bce43a56f323dc3a70085
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/uiview/viewdraw.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index 2b93959cfe86..e10de8e71927 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -457,7 +457,6 @@ static bool lcl_isTextBox(SdrObject* pObject) bool SwView::EnterDrawTextMode(const Point& aDocPos) { - SdrPageView* pPV; SwWrtShell *pSh = &GetWrtShell(); SdrView *pSdrView = pSh->GetDrawView(); OSL_ENSURE( pSdrView, "EnterDrawTextMode without DrawView?" ); @@ -467,10 +466,10 @@ bool SwView::EnterDrawTextMode(const Point& aDocPos) sal_uInt16 nOld = pSdrView->GetHitTolerancePixel(); pSdrView->SetHitTolerancePixel( 2 ); - SdrObject* pObj = (pSdrView->IsMarkedHit(aDocPos) && - !pSdrView->PickHandle(aDocPos) && IsTextTool()) ? - pSdrView->PickObj(aDocPos, pSdrView->getHitTolLog(), pPV, SdrSearchOptions::PICKTEXTEDIT) : - nullptr; + SdrObject* pObj = nullptr; + SdrPageView* pPV = nullptr; + if (pSdrView->IsMarkedHit(aDocPos) && !pSdrView->PickHandle(aDocPos) && IsTextTool()) + pObj = pSdrView->PickObj(aDocPos, pSdrView->getHitTolLog(), pPV, SdrSearchOptions::PICKTEXTEDIT); if (pObj && // To allow SwDrawVirtObj text objects to be activated, allow their type, too. |