INTEGRATION: CWS vcl36 (1.189.8); FILE MERGED

2005/03/15 17:43:58 pl 1.189.8.6: RESYNC: (1.192-1.194); FILE MERGED
2005/02/14 16:49:58 hdu 1.189.8.5: #i42253# add support for japanese IPA fonts
2005/02/03 16:22:00 hdu 1.189.8.4: #i41672# no automatic digit substitution
2005/02/02 16:51:59 pl 1.189.8.3: RESYNC: (1.190-1.192); FILE MERGED
2005/01/25 16:00:10 pl 1.189.8.2: RESYNC: (1.189-1.190); FILE MERGED
2005/01/25 11:44:40 hdu 1.189.8.1: #i40502# take care of the font color duality in the metafile case

1 files changed, 19 insertions, 11 deletions

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 52868dc16b98..f968e428cb5d 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: outdev3.cxx,v $
  *
- *  $Revision: 1.194 $
+ *  $Revision: 1.195 $
  *
- *  last change: $Author: kz $ $Date: 2005-02-23 18:27:30 $
+ *  last change: $Author: kz $ $Date: 2005-03-18 17:51:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -450,6 +450,11 @@ static sal_Unicode const aHGPMinchoLSun[] = { 'h','g','p', 0x660E, 0x671D, 'l',
 static sal_Unicode const aHGGothicBSun[] = { 'h', 'g', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 'b', 's', 'u', 'n', 0 };
 static sal_Unicode const aHGPGothicBSun[] = { 'h', 'g', 'p', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 'b', 's', 'u', 'n', 0 };
 static sal_Unicode const aHGHeiseiMin[] = { 'h', 'g', 0x5E73, 0x6210, 0x660E, 0x671D, 0x4F53, 0, 'h', 'g', 0x5E73, 0x6210, 0x660E, 0x671D, 0x4F53, 'w', '3', 'x', '1', '2', 0, 0 };
+static sal_Unicode const aIPAMincho[] =  { 'i', 'p', 'a', 0x660E, 0x671D, 0 };
+static sal_Unicode const aIPAPMincho[] = { 'i', 'p', 'a', 'p', 0x660E, 0x671D, 0 };
+static sal_Unicode const aIPAGothic[] =  { 'i', 'p', 'a',  0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
+static sal_Unicode const aIPAPGothic[] =  { 'i', 'p', 'a', 'p', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
+static sal_Unicode const aIPAUIGothic[] =  { 'i', 'p', 'a', 'u', 'i', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
 static sal_Unicode const aSazanamiMincho[] = { 0x3055, 0x3056, 0x306A, 0x307F, 0x660E, 0x671D, 0, 0 };
 static sal_Unicode const aSazanamiGothic[] = { 0x3055, 0x3056, 0x306A, 0x307F, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0, 0 };
 static sal_Unicode const aKochiMincho[] = { 0x6771, 0x98A8, 0x660E, 0x671D, 0, 0 };
@@ -582,6 +587,11 @@ static ImplLocalizedFontName aImplLocalizedNamesList[] =
 {   "hgpmincholsun",        aHGPMinchoLSun },
 {   "hgpgothicbsun",        aHGPGothicBSun },
 {   "hgheiseimin",          aHGHeiseiMin },
+{   "ipamincho",            aIPAMincho },
+{   "ipapmincho",           aIPAPMincho },
+{   "ipagothic",            aIPAGothic },
+{   "ipapgothic",           aIPAPGothic },
+{   "ipauigothic",          aIPAUIGothic },
 {   "sazanamimincho",       aSazanamiMincho },
 {   "sazanamigothic",       aSazanamiGothic },
 {   "kochimincho",          aKochiMincho },
@@ -3030,7 +3040,7 @@ ImplFontEntry* ImplFontCache::GetFallback( ImplDevFontList* pFontList,
             "arialunicodems", "cyberbit", "code2000", "",
             "andalesansui", "",
             "starsymbol", "opensymbol", "",
-            "msmincho", "fzmingti", "fzheiti", "sazanamimincho", "kochimincho", "",
+            "msmincho", "fzmingti", "fzheiti", "ipamincho", "sazanamimincho", "kochimincho", "",
             "sunbatang", "sundotum", "baekmukdotum", "gulim", "batang", "dotum", "",
             "hgmincholightj", "msunglightsc", "msunglighttc", "hymyeongjolightk", "",
             "tahoma", "timesnewroman", "lucidatypewriter", "lucidasans", "nimbussansl", "",
@@ -5196,11 +5206,10 @@ void OutputDevice::SetFont( const Font& rNewFont )
 
     if ( mpMetaFile )
     {
-        const Color& rTextFillColor = aFont.GetFillColor();
-
         mpMetaFile->AddAction( new MetaFontAction( aFont ) );
+        // the color and alignment actions don't belong here
+        // TODO: get rid of them without breaking anything...
         mpMetaFile->AddAction( new MetaTextAlignAction( aFont.GetAlign() ) );
-        mpMetaFile->AddAction( new MetaTextColorAction( aFont.GetColor() ) );
         mpMetaFile->AddAction( new MetaTextFillColorAction( aFont.GetFillColor(), !aFont.IsTransparent() ) );
     }
 
@@ -5215,11 +5224,13 @@ void OutputDevice::SetFont( const Font& rNewFont )
         // Optimization MT/HDU: COL_TRANSPARENT means SetFont should ignore the font color,
         // because SetTextColor() is used for this.
         // #i28759# maTextColor might have been changed behind our back, commit then, too.
-        if ( aFont.GetColor() != COL_TRANSPARENT &&
-             ( maFont.GetColor() != aFont.GetColor() || aFont.GetColor() != maTextColor ) )
+        if( aFont.GetColor() != COL_TRANSPARENT
+        && (aFont.GetColor() != maFont.GetColor() || aFont.GetColor() != maTextColor ) )
         {
             maTextColor = aFont.GetColor();
             mbInitTextColor = TRUE;
+            if( mpMetaFile )
+                mpMetaFile->AddAction( new MetaTextColorAction( aFont.GetColor() ) );
         }
         maFont      = aFont;
         mbNewFont   = TRUE;
@@ -5265,9 +5276,6 @@ void OutputDevice::SetDigitLanguage( LanguageType eTextLanguage )
     if( mpMetaFile )
         mpMetaFile->AddAction( new MetaTextLanguageAction( eTextLanguage ) );
 
-    if( eTextLanguage == LANGUAGE_SYSTEM )
-        eTextLanguage = GetSystemLanguage();
-
     meTextLanguage = eTextLanguage;
 
     if( mpAlphaVDev )