diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-09-07 19:16:32 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-09-07 21:31:27 +0300 |
| commit | a9c136b963134a0aa7cf20159acc1bc545f1d40e (patch) | |
| tree | dbc7c4edd2b833fe0d2fce01bab5dee5ca8dd052 | |
| parent | 37a3fc1ca2a08e41dcf39946d891e7e315106d64 (diff) | |
Do not change the OBJ_CAPTION code path
(and fix static method call)
Change-Id: I5a73695eaa8b6b5b3506acd34b303dea28cfb5e5
| -rw-r--r-- | sw/source/uibase/ribbar/conrect.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sw/source/uibase/ribbar/conrect.cxx b/sw/source/uibase/ribbar/conrect.cxx index aef87a5c4c20..cc12af761798 100644 --- a/sw/source/uibase/ribbar/conrect.cxx +++ b/sw/source/uibase/ribbar/conrect.cxx @@ -47,9 +47,9 @@ ConstRectangle::ConstRectangle( SwWrtShell* pWrtShell, SwEditWin* pEditWin, bool ConstRectangle::MouseButtonDown(const MouseEvent& rMEvt) { - bool bReturn; + bool bReturn = SwDrawBase::MouseButtonDown(rMEvt); - if ((bReturn = SwDrawBase::MouseButtonDown(rMEvt))) + if (bReturn) { if (m_pWin->GetSdrDrawMode() == OBJ_CAPTION) { @@ -60,14 +60,15 @@ bool ConstRectangle::MouseButtonDown(const MouseEvent& rMEvt) m_pSh->GetDrawView()->SetFrameDragSingles(m_pView->IsDrawSelMode()); } } - - SdrObject* pObj = m_pView->GetDrawView()->GetCreateObj(); - - if (pObj) + else { - SfxItemSet aAttr(pObj->GetModel()->GetItemPool()); - m_pSh->SetLineEnds(aAttr, pObj, m_nSlotId); - pObj->SetMergedItemSet(aAttr); + SdrObject* pObj = m_pView->GetDrawView()->GetCreateObj(); + if (pObj) + { + SfxItemSet aAttr(pObj->GetModel()->GetItemPool()); + SwFEShell::SetLineEnds(aAttr, pObj, m_nSlotId); + pObj->SetMergedItemSet(aAttr); + } } } |