summaryrefslogtreecommitdiff
path: root/vcl/source/gdi/sallayout.cxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-03-22 09:21:12 +0000
committerOliver Bolte <obo@openoffice.org>2006-03-22 09:21:12 +0000
commitfb4e8e3cc46a0646db0080bdaa96b986a1ca4ef9 (patch)
tree276ca4a5779b0668dc340567f93aa4b5e1da374c /vcl/source/gdi/sallayout.cxx
parentb5f697bd23bb2fe4dc87f7178a54b7855f523b59 (diff)
INTEGRATION: CWS vcl55 (1.75.56); FILE MERGED
2006/03/14 11:26:37 hdu 1.75.56.1: #i62919# allow justification space inside glyph cluster
Diffstat (limited to 'vcl/source/gdi/sallayout.cxx')
-rwxr-xr-xvcl/source/gdi/sallayout.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index c1f3938e6738..6a8d59853682 100755
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: sallayout.cxx,v $
*
- * $Revision: 1.75 $
+ * $Revision: 1.76 $
*
- * last change: $Author: hr $ $Date: 2006-01-26 18:09:48 $
+ * last change: $Author: obo $ $Date: 2006-03-22 10:21:12 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -974,10 +974,11 @@ void GenericSalLayout::ApplyDXArray( ImplLayoutArgs& rArgs )
pNewGlyphWidths[ i ] = 0;
bool bRTL;
- for( int nCharPos = -1; rArgs.GetNextPos( &nCharPos, &bRTL ); )
+ for( int nCharPos = i = -1; rArgs.GetNextPos( &nCharPos, &bRTL ); )
{
n = nCharPos - rArgs.mnMinCharPos;
- i = pLogCluster[ n ];
+ if( pLogCluster[ n ] >= 0 )
+ i = pLogCluster[ n ];
if( i >= 0 )
{
long nDelta = rArgs.mpDXArray[ n ] ;