#90802# localization of 'Typeface' listbox entries in SmSymDefineDialog

3 files changed, 136 insertions, 75 deletions

diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 83cb1a0cc9b1..ca1c4e7b8dca 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dialog.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: tl $ $Date: 2001-07-30 10:51:29 $
+ *  last change: $Author: tl $ $Date: 2001-08-09 12:24:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -144,27 +144,77 @@
 // Da der FontStyle besser �ber die Attribute gesetzt/abgefragt wird als �ber
 // den StyleName bauen wir uns hier unsere eigene �bersetzung
 // Attribute <-> StyleName
-// Die Bits des Index stellen die Attribute dar:
-// Bit 0 : italic
-// Bit 1 : bold
 //
 
-static XubString __READONLY_DATA  aStyleName[4] =
+class SmFontStyles
 {
-    C2S("normal"),  C2S("italic"),
-    C2S("bold"),    C2S("bold italic")
+    String  aNormal;
+    String  aBold;
+    String  aItalic;
+    String  aBoldItalic;
+    String  aEmpty;
+
+public:
+    SmFontStyles();
+
+    USHORT          GetCount() const    { return 4; }
+    const String &  GetStyleName( const Font &rFont ) const;
+    const String &  GetStyleName( USHORT nIdx ) const;
 };
 
-USHORT aStyleNameCount = sizeof(aStyleName) / sizeof(aStyleName[0]);
+
+SmFontStyles::SmFontStyles() :
+    aNormal ( ResId( RID_FONTREGULAR, SM_MOD()->GetResMgr() ) ),
+    aBold   ( ResId( RID_FONTBOLD,    SM_MOD()->GetResMgr() ) ),
+    aItalic ( ResId( RID_FONTITALIC,  SM_MOD()->GetResMgr() ) )
+{
+//    SM_MOD()->GetResMgr().FreeResource();
+
+    aBoldItalic = aBold;
+    aBoldItalic.AppendAscii( ", " );
+    aBoldItalic += aItalic;
+}
+
+
+const String & SmFontStyles::GetStyleName( const Font &rFont ) const
+{
+    BOOL bBold   = rFont.GetWeight() == WEIGHT_BOLD,
+         bItalic = rFont.GetItalic() == ITALIC_NORMAL;
+    if (bBold && bItalic)
+        return aBoldItalic;
+    else if (bItalic)
+        return aItalic;
+    else if (bBold)
+        return aBold;
+    else
+        return aNormal;
+}
+
+
+const String & SmFontStyles::GetStyleName( USHORT nIdx ) const
+{
+    // 0 = "normal",  1 = "italic",
+    // 2 = "bold",    3 = "bold italic"
+
+    DBG_ASSERT( nIdx < GetCount(), "index out of range" );
+    switch (nIdx)
+    {
+        case 0 : return aNormal;
+        case 1 : return aItalic;
+        case 2 : return aBold;
+        case 3 : return aBoldItalic;
+    }
+    return aEmpty;
+}
 
 
-const XubString GetFontStyleName(const Font &rFont)
+const SmFontStyles & GetFontStyles()
 {
-    USHORT  nIndex =  2 * (rFont.GetWeight() == WEIGHT_BOLD)
-                    + 1 * (rFont.GetItalic() == ITALIC_NORMAL);
-    return aStyleName[nIndex];
+    static const SmFontStyles aImpl;
+    return aImpl;
 }
 
+/////////////////////////////////////////////////////////////////
 
 void SetFontStyle(const XubString &rStyleName, Font &rFont)
 {
@@ -174,10 +224,11 @@ void SetFontStyle(const XubString &rStyleName, Font &rFont)
     if (rStyleName.Len())
     {
         USHORT i;
-        for (i = 0;  i < aStyleNameCount;  i++)
-            if (rStyleName.CompareTo(aStyleName[i]) == COMPARE_EQUAL)
+        const SmFontStyles &rStyles = GetFontStyles();
+        for (i = 0;  i < rStyles.GetCount();  i++)
+            if (rStyleName.CompareTo( rStyles.GetStyleName(i) ) == COMPARE_EQUAL)
                 break;
-        DBG_ASSERT(i < aStyleNameCount, "Sm : StyleName unbekannt");
+        DBG_ASSERT(i < rStyles.GetCount(), "style-name unknown");
         nIndex = i;
     }
 
@@ -1614,8 +1665,9 @@ void SmSymDefineDialog::FillStyles(BOOL bDeleteText)
     {
         //aStyles.Fill(aText, &aFontList);
         // eigene StyleName's verwenden
-        for (USHORT i = 0;  i < aStyleNameCount;  i++)
-            aStyles.InsertEntry( aStyleName[i] );
+        const SmFontStyles &rStyles = GetFontStyles();
+        for (USHORT i = 0;  i < rStyles.GetCount();  i++)
+            aStyles.InsertEntry( rStyles.GetStyleName(i) );
 
         DBG_ASSERT(aStyles.GetEntryCount() > 0, "Sm : keine Styles vorhanden");
         aStyles.SetText( aStyles.GetEntry(0) );
@@ -1886,8 +1938,10 @@ void SmSymDefineDialog::UpdateButtons()
         bEqual = pOrigSymbol
                     && aSymbolSetName.EqualsIgnoreCaseAscii(aOldSymbolSetName.GetText())
                     && aSymbolName.Equals(pOrigSymbol->GetName())
-                    && aFonts.GetSelectEntry().EqualsIgnoreCaseAscii(pOrigSymbol->GetFace().GetName())
-                    && aStyles.GetText().EqualsIgnoreCaseAscii(GetFontStyleName(pOrigSymbol->GetFace()))
+                    && aFonts.GetSelectEntry().EqualsIgnoreCaseAscii(
+                            pOrigSymbol->GetFace().GetName())
+                    && aStyles.GetText().EqualsIgnoreCaseAscii(
+                            GetFontStyles().GetStyleName(pOrigSymbol->GetFace()))
                     && aCharsetDisplay.GetSelectCharacter() == pOrigSymbol->GetCharacter();
 
         // hinzuf�gen nur wenn es noch kein Symbol desgleichen Namens gibt
@@ -2147,7 +2201,7 @@ BOOL SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
                 // Font und Style entsprechend w�hlen
                 const Font &rFont = pSymbol->GetFace();
                 SelectFont(rFont.GetName(), FALSE);
-                SelectStyle(GetFontStyleName(rFont), FALSE);
+                SelectStyle(GetFontStyles().GetStyleName(rFont), FALSE);
 
                 // da das setzen des Fonts �ber den Style Namen des SymbolsFonts nicht
                 // so gut klappt (er kann zB leer sein obwohl der Font selbst 'bold' und
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index 1c30bbbf6ba6..bea8a233311b 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: smres.src,v $
  *
- *  $Revision: 1.43 $
+ *  $Revision: 1.44 $
  *
- *  last change: $Author: rt $ $Date: 2001-08-08 10:13:58 $
+ *  last change: $Author: tl $ $Date: 2001-08-09 12:24:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -3515,84 +3515,84 @@ QueryBox RID_DEFAULTSAVEQUERY
 
 String RID_FONTREGULAR
 {
-    Text = ", Normal" ;
+    Text = "Normal" ;
     Text [ ENGLISH ] = "Standard" ;
     Text [ norwegian ] = "Standard" ;
     Text [ italian ] = "Standard" ;
     Text [ portuguese_brazilian ] = "Padr?o" ;
-    Text [ portuguese ] = ", Padr�o" ;
-    Text [ finnish ] = ", Vakio" ;
-    Text [ danish ] = ", Normal" ;
+    Text [ portuguese ] = "Padr�o" ;
+    Text [ finnish ] = "Vakio" ;
+    Text [ danish ] = "Normal" ;
     Text [ french ] = "Par d�faut" ;
-    Text [ swedish ] = ", Normal" ;
-    Text [ dutch ] = ", Normaal" ;
-    Text [ spanish ] = ", Predeterminado" ;
-    Text [ english_us ] = ", Standard" ;
-    Text[ chinese_simplified ] = ", 普通";
-    Text[ russian ] = ", �������";
-    Text[ polish ] = ", Domy�lnie";
-    Text[ japanese ] = ",通常";
+    Text [ swedish ] = "Normal" ;
+    Text [ dutch ] = "Normaal" ;
+    Text [ spanish ] = "Predeterminado" ;
+    Text [ english_us ] = "Standard" ;
+    Text[ chinese_simplified ] = "普通";
+    Text[ russian ] = "�������";
+    Text[ polish ] = "Domy�lnie";
+    Text[ japanese ] = "通常";
     Text[ chinese_traditional ] = "，普通";
-    Text[ arabic ] = "���� ,";
-    Text[ greek ] = ", ��������";
-    Text[ korean ] = ", 보통";
-    Text[ turkish ] = ", standart";
+    Text[ arabic ] = "����";
+    Text[ greek ] = "��������";
+    Text[ korean ] = "보통";
+    Text[ turkish ] = "standart";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = ", Est�ndar";
+    Text[ catalan ] = "Est�ndar";
 };
 String RID_FONTITALIC
 {
-    Text = ", Kursiv" ;
+    Text = "Kursiv" ;
     Text [ ENGLISH ] = "Italic" ;
     Text [ norwegian ] = "Kursiv" ;
-    Text [ italian ] = ", Corsivo" ;
+    Text [ italian ] = "Corsivo" ;
     Text [ portuguese_brazilian ] = "It?lico" ;
-    Text [ portuguese ] = ", It�lico" ;
-    Text [ finnish ] = ", Kursivoi" ;
-    Text [ danish ] = ", Kursiv" ;
+    Text [ portuguese ] = "It�lico" ;
+    Text [ finnish ] = "Kursivoi" ;
+    Text [ danish ] = "Kursiv" ;
     Text [ french ] = "Italique" ;
-    Text [ swedish ] = ", Kursiv" ;
-    Text [ dutch ] = ", Cursief" ;
-    Text [ spanish ] = ", Cursiva" ;
-    Text [ english_us ] = ", Italic" ;
-    Text[ chinese_simplified ] = ", 斜体";
-    Text[ russian ] = ", ���������";
+    Text [ swedish ] = "Kursiv" ;
+    Text [ dutch ] = "Cursief" ;
+    Text [ spanish ] = "Cursiva" ;
+    Text [ english_us ] = "Italic" ;
+    Text[ chinese_simplified ] = "斜体";
+    Text[ russian ] = "���������";
     Text[ polish ] = "Kursywa";
-    Text[ japanese ] = ",斜体";
-    Text[ chinese_traditional ] = ", 斜體";
+    Text[ japanese ] = "斜体";
+    Text[ chinese_traditional ] = "斜體";
     Text[ arabic ] = "����";
-    Text[ greek ] = ", ������";
+    Text[ greek ] = "������";
     Text[ korean ] = "이탤릭체";
-    Text[ turkish ] = ", italik";
+    Text[ turkish ] = "italik";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = ", Cursiva";
+    Text[ catalan ] = "Cursiva";
 };
 String RID_FONTBOLD
 {
-    Text = ", Fett" ;
+    Text = "Fett" ;
     Text [ ENGLISH ] = "Bold" ;
     Text [ norwegian ] = "Fet" ;
     Text [ italian ] = "Grassetto" ;
     Text [ portuguese_brazilian ] = "Negrito" ;
-    Text [ portuguese ] = ", Negrito" ;
-    Text [ finnish ] = ", Lihavoi" ;
-    Text [ danish ] = ", Fed" ;
+    Text [ portuguese ] = "Negrito" ;
+    Text [ finnish ] = "Lihavoi" ;
+    Text [ danish ] = "Fed" ;
     Text [ french ] = "Gras" ;
-    Text [ swedish ] = ", Fett" ;
-    Text [ dutch ] = ", Vet" ;
-    Text [ spanish ] = ", Negrita" ;
-    Text [ english_us ] = ", Bold" ;
-    Text[ chinese_simplified ] = ", 粗体";
-    Text[ russian ] = ", ������";
-    Text[ polish ] = ", Pogrubienie";
-    Text[ japanese ] = ",太字";
-    Text[ chinese_traditional ] = ", 粗體";
+    Text [ swedish ] = "Fett" ;
+    Text [ dutch ] = "Vet" ;
+    Text [ spanish ] = "Negrita" ;
+    Text [ english_us ] = "Bold" ;
+    Text[ chinese_simplified ] = "粗体";
+    Text[ russian ] = "������";
+    Text[ polish ] = "Pogrubienie";
+    Text[ japanese ] = "太字";
+    Text[ chinese_traditional ] = "粗體";
     Text[ arabic ] = "����";
-    Text[ greek ] = ";������";
-    Text[ korean ] = ", 굵게";
-    Text[ turkish ] = ", kal�n";
+    Text[ greek ] = "������";
+    Text[ korean ] = "굵게";
+    Text[ turkish ] = "kal�n";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = ", Negrita";
+    Text[ catalan ] = "Negrita";
 };
 String RID_APPLICATION
 {
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 42040db6dbab..1a58e3d4a88e 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: utility.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: tl $ $Date: 2001-08-08 11:22:18 $
+ *  last change: $Author: tl $ $Date: 2001-08-09 12:24:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -556,15 +556,22 @@ String SmFontPickList::GetStringItem(void *pItem)
 {
     Font   *pFont;
     String  aString;
+    const sal_Char *pDelim = ", ";
 
     pFont = (Font *)pItem;
 
     aString = pFont->GetName();
 
     if (pFont->GetItalic() != ITALIC_NONE)
+    {
+        aString.AppendAscii( pDelim );
         aString += String(SmResId(RID_FONTITALIC));
+    }
     if (pFont->GetWeight() == WEIGHT_BOLD)
+    {
+        aString.AppendAscii( pDelim );
         aString += String(SmResId(RID_FONTBOLD));
+    }
 
     return (aString);
 }