[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source
matteocam
matteo.campanelli at gmail.com
Thu Aug 7 13:03:48 PDT 2014
editeng/source/editeng/impedit.hxx | 1 +
editeng/source/editeng/impedit3.cxx | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit c016277686979e769a403cbac6d0cee1b68c5425
Author: matteocam <matteo.campanelli at gmail.com>
Date: Thu Aug 7 22:02:57 2014 +0200
Moved debugging output for UpdateOverflowingParaNum in the right place
Change-Id: If8a58e434794639f7fcdffbe4a71c92ffd460234
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 426d235..de32cbd 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -1023,6 +1023,7 @@ public:
sal_Int32 GetOverflowingParaNum() const { return mnOverflowingPara; }
void SetOverflowingParaNum(sal_Int32 nPara) { mnOverflowingPara = nPara; }
void ClearOverflowingParaNum() { mnOverflowingPara = -1; }
+ void UpdateOverflowingParaNum(sal_Int32);
};
inline EPaM ImpEditEngine::CreateEPaM( const EditPaM& rPaM )
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 4c27985..973ae96 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -432,8 +432,6 @@ void ImpEditEngine::FormatDoc()
// XXX: This may not work all the time: imp. edit engine is a shared resource!!
// Can it be that two boxes modify it before it's used?
UpdateOverflowingParaNum( nPara );
-
- fprintf(stderr, "[CHAINING] Setting first overflowing para: %d\n", nPara);
}
// InvalidRect set only once...
@@ -4609,8 +4607,10 @@ void ImpEditEngine::ImplExpandCompressedPortions( EditLine* pLine, ParaPortion*
void ImpEditEngine::UpdateOverflowingParaNum(sal_Int32 nPara)
{
// update if not already updated
- if ( mnOverflowingPara == -1 )
+ if ( mnOverflowingPara == -1 ) {
mnOverflowingPara = nPara;
+ fprintf(stderr, "[CHAINING] Setting first overflowing para: %d\n", nPara);
+ }
// XXX: where is this reset?
}
More information about the Libreoffice-commits
mailing list