editeng/source/outliner/outliner.cxx | 2 +- editeng/source/outliner/overflowingtxt.cxx | 4 +++- include/editeng/overflowingtxt.hxx | 3 ++- svx/source/svdraw/svdedxv.cxx | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-)
New commits: commit b602f532c8b9b022366a561e1b61ab198321bb20 Author: matteocam <matteo.campane...@gmail.com> Date: Mon Aug 10 13:26:38 2015 +0200 Removed warnings from editeng Change-Id: I045ec6348277fd958d91169931ba4a0194f76a51 diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 68a17c2..bf4ab34 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -2089,7 +2089,7 @@ NonOverflowingText *Outliner::GetNonOverflowingText() const // last non-overflowing paragraph is before the first overflowing one sal_Int32 nCount = pEditEngine->GetOverflowingParaNum(); - sal_Int32 nOverflowLine = pEditEngine->GetOverflowingLineNum(); + //sal_Int32 nOverflowLine = pEditEngine->GetOverflowingLineNum(); // XXX: Unused for now // Defensive check: oveflowing para index beyond actual # of paragraphs? if ( nCount > GetParagraphCount()-1) { diff --git a/include/editeng/overflowingtxt.hxx b/include/editeng/overflowingtxt.hxx index 76a9623..a2fb6c0 100644 --- a/include/editeng/overflowingtxt.hxx +++ b/include/editeng/overflowingtxt.hxx @@ -72,8 +72,9 @@ private: friend class Outliner; const EditTextObject *mpContentTextObj; - const bool mbLastParaInterrupted; const ESelection maContentSel; + const bool mbLastParaInterrupted; + }; commit 6343fe5bcb5efcf3992e6614d5262bae48262505 Author: matteocam <matteo.campane...@gmail.com> Date: Mon Aug 10 13:24:24 2015 +0200 Remove Warning for cursor handling Change-Id: I193ec852d965738d1b29b4c8c0c82c4bb7451a5b diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx index 34f1bb4..92c6ca8 100644 --- a/editeng/source/outliner/overflowingtxt.cxx +++ b/editeng/source/outliner/overflowingtxt.cxx @@ -160,7 +160,9 @@ OutlinerParaObject *NonOverflowingText::ToParaObject(Outliner *pOutliner) const ESelection NonOverflowingText::GetOverflowPointSel() const { - return getLastPositionSel(mpContentTextObj); + //return getLastPositionSel(mpContentTextObj); + // XXX: Not sure this can work properly + return maContentSel; } // The equivalent of ToParaObject for OverflowingText. Here we are prepending the overflowing text to the old dest box's text diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index c731052..7ac8413 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1299,7 +1299,7 @@ bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const TextChainCursorManager *SdrObjEditView::ImpHandleMotionThroughBoxesKeyInput( const KeyEvent& rKEvt, - vcl::Window* pWin, + vcl::Window*, bool *bOutHandled) { *bOutHandled = false; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits