summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-08-25 15:15:05 +0000
committerKurt Zenker <kz@openoffice.org>2005-08-25 15:15:05 +0000
commitc8e7bbdbbc60bf00883e6bec2b6e2eaa41ff79a4 (patch)
tree0f1412123ce333c64385d9b4f966d1f365c81733 /vcl
parent701a4883d0036aefadb292747a1f0bc7ff4a052a (diff)
INTEGRATION: CWS gslpatches4 (1.65.134); FILE MERGED
2005/07/15 10:46:38 hdu 1.65.134.1: #i14069# fix glyph cluster start flags for diacritics
Diffstat (limited to 'vcl')
-rwxr-xr-xvcl/source/gdi/sallayout.cxx11
1 files changed, 7 insertions, 4 deletions
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 92c27ad2b41c..65998390de4a 100755
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: sallayout.cxx,v $
*
- * $Revision: 1.66 $
+ * $Revision: 1.67 $
*
- * last change: $Author: kz $ $Date: 2005-08-25 15:37:51 $
+ * last change: $Author: kz $ $Date: 2005-08-25 16:15:05 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1340,11 +1340,14 @@ void GenericSalLayout::SortGlyphItems()
// keep data of misplaced item
GlyphItem aGI = *pGR;
// make room for misplaced item
- do pGL[1] = pGL[0];
- while( (--pGL >= mpGlyphItems) && (nXPos < pGL->maLinearPos.X()) );
+ do {
+ pGL[1] = pGL[0];
+ pGL[1].mnFlags |= GlyphItem::IS_IN_CLUSTER;
+ } while( (--pGL >= mpGlyphItems) && (nXPos < pGL->maLinearPos.X()) );
// move misplaced item to proper slot
pGL[1] = aGI;
// TODO: fix glyph cluster start flags
+ pGL[1].mnFlags &= ~GlyphItem::IS_IN_CLUSTER;
}
}