editeng/source/editeng/impedit3.cxx | 1 + editeng/source/outliner/outliner.cxx | 2 +- svx/source/svdraw/svdotext.cxx | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit 9f61bda430ff71ea509697ba33014fb77150676a Author: matteocam <[email protected]> Date: Wed Aug 13 18:39:04 2014 +0200 Change in status word when text overflowing Change-Id: I92439e46b72b757f396f9116d46a646e0314f43a diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 8751d05..7ea5a51 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -554,6 +554,7 @@ void ImpEditEngine::CheckAutoPageSize() // which paragraph is the first to cause higher size of the box? UpdateOverflowingParaNum( nBoxHeight /*aPrevPaperSize.Height()*/ ); // XXX: currently only for horizontal text aStatus.SetPageOverflow(true); + aStatus.GetStatusWord() |= 0x00000100; } else { // No overflow if withing box boundaries diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 50fa881..38f66f2 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -2144,7 +2144,7 @@ OutlinerParaObject *Outliner::GetOverflowingParaObject() const if ( pEditEngine->GetOverflowingParaNum() > GetParagraphCount()-1) { fprintf(stderr, "[Overflowing] Ops, trying to retrieve para %d when max index is %d\n", - nCount, + pEditEngine->GetOverflowingParaNum(), GetParagraphCount()-1); return NULL; } diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 7bdbda4..fe9dcd6 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1935,7 +1935,8 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus ) const sal_uInt32 nStat = pEditStatus->GetStatusWord(); const bool bGrowX=(nStat & EE_STAT_TEXTWIDTHCHANGED) !=0; const bool bGrowY=(nStat & EE_STAT_TEXTHEIGHTCHANGED) !=0; - if(bTextFrame && (bGrowX || bGrowY)) + const bool bOverflow = (nStat & 0x00000100) != 0; + if(bTextFrame && (bGrowX || bGrowY || bOverflow)) { if ((bGrowX && IsAutoGrowWidth()) || (bGrowY && IsAutoGrowHeight())) { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
