#100000# join from CWS licenseprint

2 files changed, 7 insertions, 5 deletions

diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index ae75a627987c..98fc57dad525 100755
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sallayout.cxx,v $
  *
- *  $Revision: 1.47 $
+ *  $Revision: 1.48 $
  *
- *  last change: $Author: hjs $ $Date: 2003-08-18 15:14:18 $
+ *  last change: $Author: hr $ $Date: 2003-08-20 15:01:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1669,6 +1669,8 @@ int MultiSalLayout::GetNextGlyphs( int nLen, long* pGlyphIdxAry, Point& rPos,
         }
     }
 
+    // #111016# reset to base level font when done
+    mpLayouts[0]->InitFont();
     return 0;
 }
 
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 85e8f91035aa..a6bd4148b45c 100755
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: winlayout.cxx,v $
  *
- *  $Revision: 1.71 $
+ *  $Revision: 1.72 $
  *
- *  last change: $Author: hdu $ $Date: 2003-07-22 12:05:31 $
+ *  last change: $Author: hr $ $Date: 2003-08-20 15:02:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -647,7 +647,7 @@ int SimpleWinLayout::GetNextGlyphs( int nLen, long* pGlyphs, Point& rPos, int& n
 
     // calculate glyph position relative to layout base
     // TODO: avoid for nStart!=0 case by reusing rPos
-    long nXOffset = 0;
+    long nXOffset = mnBaseAdv;
     for( int i = 0; i < nStart; ++i )
         nXOffset += mpGlyphAdvances[ i ];