summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2005-09-28 10:33:46 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2005-09-28 10:33:46 +0000
commitdf77274fabaf0109e6932784e3468e15b525e181 (patch)
treeafb8fce525b15ca01364e23dc6f71da59f0619ee
parent6e1b80d036e0f75a9e5330d785ba617dfe6021b1 (diff)
INTEGRATION: CWS swqbf35 (1.95.152); FILE MERGED
2005/09/23 02:39:11 fme 1.95.152.2: RESYNC: (1.95-1.96); FILE MERGED 2005/07/04 08:19:00 fme 1.95.152.1: #i37132# RTL portions should not paint compressed blanks because this moves the text right in x direction by the amount of the width of the blank
-rw-r--r--svx/source/editeng/impedit3.cxx13
1 files changed, 11 insertions, 2 deletions
diff --git a/svx/source/editeng/impedit3.cxx b/svx/source/editeng/impedit3.cxx
index c38c7607ecc2..a9787b2d4022 100644
--- a/svx/source/editeng/impedit3.cxx
+++ b/svx/source/editeng/impedit3.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: impedit3.cxx,v $
*
- * $Revision: 1.98 $
+ * $Revision: 1.99 $
*
- * last change: $Author: hr $ $Date: 2005-09-23 14:26:02 $
+ * last change: $Author: hr $ $Date: 2005-09-28 11:33:46 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -3182,6 +3182,15 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
}
else
{
+ // --> FME 2005-06-17 #i37132# RTL portions with
+ // compressed blank should not paint this blank:
+ if ( pTextPortion->IsRightToLeft() && nTextLen >= 2 &&
+ pDXArray[ nTextLen - 1 ] ==
+ pDXArray[ nTextLen - 2 ] &&
+ ' ' == aText.GetChar( nTextStart + nTextLen - 1 ) )
+ --nTextLen;
+ // <--
+
// output directly
aTmpFont.QuickDrawText( pOutDev, aRealOutPos, aText, nTextStart, nTextLen, pDXArray );
}