svx/source/svdraw/svdotxed.cxx | 7 ++++---
vcl/source/outdev/text.cxx | 2 ++
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 31e66b9856671bb12e89997dae5df11c2235de3e
Author: matteocam <matteo.campane...@gmail.com>
Date: Thu Aug 7 22:24:36 2014 +0200
Some minor changes
Change-Id: I90e8df3405e95c6295add0532fb6fa49c6517325
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index b25a324..9151fe4 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -277,8 +277,6 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
pNewText = rOutl.CreateParaObject( 0, nParaAnz );
}
- // we do not need the bookmark at the overflowing check anymore.
- rOutl.ClearOverflowingParaNum();
// need to end edit mode early since SetOutlinerParaObject already
// uses GetCurrentBoundRect() which needs to take the text into account
@@ -287,6 +285,9 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
SetOutlinerParaObject(pNewText);
}
+ // we do not need the bookmark at the overflowing check anymore.
+ rOutl.ClearOverflowingParaNum();
+
pEdtOutl = NULL;
rOutl.Clear();
sal_uInt32 nStat = rOutl.GetControlWord();
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 7a587a6..b5177aa 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -966,11 +966,13 @@ void OutputDevice::DrawTextArray( const Point& rStartPt,
const OUString& rStr,
const sal_Int32* pDXAry,
sal_Int32 nIndex, sal_Int32 nLen )
{
+ /*
if ( maFont.IsTransparent() )
fprintf(stderr, "[Actually transparent font] Real color = %x\n",
maFont.GetFillColor().GetColor() );
fprintf(stderr, "TextFillColor printing %c is %x\n",
(char) rStr.toChar(),
GetTextFillColor().GetColor());
+ */
if(nLen == 0x0FFFF)
{
commit 8e0e4419c0224528155dbc778826622042df3200
Author: matteocam <matteo.campane...@gmail.com>
Date: Thu Aug 7 22:14:50 2014 +0200
Moved clearing for mnOverflowPara in the right place
Change-Id: I3fd78af6d7338c6ce7c75c97148ab791118862eb
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index b32a8be..b25a324 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -268,9 +268,6 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
// set overflowing text for SdrChainedTextPrimitive2D
pNextText = rOutl.GetOverflowingParaObject();
mpOverflowingText = pNextText;
- // we do not need the bookmark at the overflowing check anymore.
- rOutl.ClearOverflowingParaNum();
-
// TODO: factor the lines of code above in a single function
}
@@ -280,6 +277,9 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
pNewText = rOutl.CreateParaObject( 0, nParaAnz );
}
+ // we do not need the bookmark at the overflowing check anymore.
+ rOutl.ClearOverflowingParaNum();
+
// need to end edit mode early since SetOutlinerParaObject already
// uses GetCurrentBoundRect() which needs to take the text into account
// to work correct
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
