editeng/source/outliner/overflowingtxt.cxx | 2 +- svx/source/svdraw/svdedxv.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 6fc58c5c561b5f3f02a9317a470c73ce63e3fcf8 Author: matteocam <matteo.campane...@gmail.com> Date: Mon Jul 13 16:55:17 2015 -0400 Fix juxtaposing special case in deep merge Change-Id: I67bb19b45f503abcb863f378132b58bc81b603a1 diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx index efaaa9b..7df78b0 100644 --- a/editeng/source/outliner/overflowingtxt.cxx +++ b/editeng/source/outliner/overflowingtxt.cxx @@ -79,7 +79,7 @@ OutlinerParaObject *impGetDeeplyMergedParaObject(Outliner *pOutl, pOutl->SetText(*pPObj1); return impGetJuxtaposedParaObject( pOutl, - pOutl->CreateParaObject(0, nLastPara1 - 1), + pOutl->CreateParaObject(0, nParaCount - 1), pPObj2); } commit d13e5209a7e074210b8555aadd892623dc9ff086 Author: matteocam <matteo.campane...@gmail.com> Date: Mon Jul 13 16:49:18 2015 -0400 Change cursor Change-Id: I893008684b640e90e07b3e770780a395c12267ca diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 3abebed..7314e41 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -554,7 +554,7 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent() SdrBeginTextEdit(pNextLink); // OutlinerView has changed, so we update the pointer pOLV = GetTextEditOutlinerView(); - //pOLV->SetSelection(pTextChain->GetPostChainingSel(pTextObj)); // XXX + pOLV->SetSelection(pTextChain->GetPostChainingSel(pTextObj)); // XXX break; case CursorChainingEvent::TO_PREV_LINK: _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits