font properties CJK and CTL added

3 files changed, 112 insertions, 69 deletions

diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 233d250da04f..26cb7df82125 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoprnms.hxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: os $ $Date: 2000-11-08 12:19:40 $
+ *  last change: $Author: os $ $Date: 2000-11-09 14:12:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,11 +87,6 @@ extern const SwPropNameLen  __FAR_DATA  UNO_NAME_FOLLOW_STYLE;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_IS_PHYSICAL                      ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_IS_AUTO_UPDATE                       ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_DISPLAY_NAME                     ;
-extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_NAME                       ;
-extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_STYLE_NAME               ;
-extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_FAMILY                   ;
-extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_CHAR_SET                 ;
-extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_PITCH                    ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_PARA_GRAPHIC_URL                   ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_PARA_GRAPHIC_FILTER                ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_HEADER_GRAPHIC_URL                 ;
@@ -140,8 +135,37 @@ extern const SwPropNameLen __FAR_DATA UNO_NAME_SUFFIX                         ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_PREFIX                         ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_PARENT_NUMBERING               ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_START_WITH                       ;
+
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_NAME                       ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_STYLE_NAME               ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_FAMILY                   ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_CHAR_SET                 ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_PITCH                    ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_POSTURE                   ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_WEIGHT                      ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_HEIGHT                          ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_LOCALE                          ;
+
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_NAME_ASIAN                     ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN               ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_FAMILY_ASIAN                   ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN                 ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_PITCH_ASIAN                    ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_POSTURE_ASIAN                   ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_WEIGHT_ASIAN                        ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_HEIGHT_ASIAN                        ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_LOCALE_ASIAN                        ;
+
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_NAME_COMPLEX                       ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX               ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_FAMILY_COMPLEX                   ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX                 ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FONT_PITCH_COMPLEX                    ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_POSTURE_COMPLEX                   ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_WEIGHT_COMPLEX                      ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_HEIGHT_COMPLEX                          ;
+extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_LOCALE_COMPLEX                          ;
+
 extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_AUTO_KERNING                ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_UNDERLINE                       ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_ESCAPEMENT                      ;
@@ -151,14 +175,12 @@ extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_STRIKEOUT
 extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_CROSSED_OUT                     ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_NO_HYPHENATION                  ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_AUTO_ESCAPEMENT                 ;
-extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_HEIGHT                          ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_PROP_FONT_HEIGHT              ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_DIFF_FONT_HEIGHT              ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_ESCAPEMENT_HEIGHT             ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_COLOR                       ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_FLASH                           ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_KERNING                     ;
-extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_LOCALE                          ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_BACK_COLOR                  ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_CHAR_BACK_TRANSPARENT        ;
 extern const SwPropNameLen __FAR_DATA UNO_NAME_PARA_LINE_SPACING                    ;
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index dcdad3474806..3839c371d039 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unomap.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: os $ $Date: 2000-11-09 10:46:12 $
+ *  last change: $Author: os $ $Date: 2000-11-09 14:13:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -346,6 +346,8 @@
 #endif
 
 using namespace ::com::sun::star;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -455,7 +457,38 @@ void SwUnoPropertyMapProvider::Sort(sal_uInt16 nId)
     qsort(aMapArr[nId], i, sizeof(SfxItemPropertyMap), lcl_CompareMap);
 }
 
+#define _STANDARD_FONT_PROPERTIES \
+    { SW_PROP_NAME(UNO_NAME_CHAR_HEIGHT),           RES_CHRATR_FONTSIZE  ,  &::getCppuType((Float*)0),          PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},      \
+    { SW_PROP_NAME(UNO_NAME_CHAR_WEIGHT),           RES_CHRATR_WEIGHT    ,  &::getCppuType((Float*)0),              PropertyAttribute::MAYBEVOID, MID_WEIGHT},                    \
+    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_NAME),        RES_CHRATR_FONT,        &::getCppuType((OUString*)0),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },                  \
+    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_STYLE_NAME),  RES_CHRATR_FONT,        &::getCppuType((OUString*)0), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },                    \
+    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_FAMILY),      RES_CHRATR_FONT,        &::getCppuType((sal_Int16*)0),                  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },    \
+    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_CHAR_SET),    RES_CHRATR_FONT,        &::getCppuType((sal_Int16*)0),  PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },                    \
+    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_PITCH),       RES_CHRATR_FONT,        &::getCppuType((sal_Int16*)0),                  PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },     \
+    { SW_PROP_NAME(UNO_NAME_CHAR_POSTURE),          RES_CHRATR_POSTURE   ,  &::getCppuType((FontSlant*)0),          PropertyAttribute::MAYBEVOID, MID_POSTURE},                   \
+    { SW_PROP_NAME(UNO_NAME_CHAR_LOCALE),           RES_CHRATR_LANGUAGE ,   &::getCppuType((Locale*)0)  ,       PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
 
+#define _CJK_FONT_PROPERTIES \
+    { SW_PROP_NAME(UNO_NAME_CHAR_HEIGHT_ASIAN),         RES_CHRATR_CJK_FONTSIZE  ,  &::getCppuType((Float*)0),          PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},   \
+    { SW_PROP_NAME(UNO_NAME_CHAR_WEIGHT_ASIAN),         RES_CHRATR_CJK_WEIGHT    ,  &::getCppuType((Float*)0),              PropertyAttribute::MAYBEVOID, MID_WEIGHT},                 \
+    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_NAME_ASIAN),      RES_CHRATR_CJK_FONT,        &::getCppuType((OUString*)0),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },               \
+    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN),RES_CHRATR_CJK_FONT,        &::getCppuType((OUString*)0), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },                 \
+    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_FAMILY_ASIAN),    RES_CHRATR_CJK_FONT,        &::getCppuType((sal_Int16*)0),                  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },    \
+    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN),  RES_CHRATR_CJK_FONT,        &::getCppuType((sal_Int16*)0),  PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },                 \
+    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_PITCH_ASIAN),     RES_CHRATR_CJK_FONT,        &::getCppuType((sal_Int16*)0),                  PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },     \
+    { SW_PROP_NAME(UNO_NAME_CHAR_POSTURE_ASIAN),        RES_CHRATR_CJK_POSTURE   ,  &::getCppuType((FontSlant*)0),          PropertyAttribute::MAYBEVOID, MID_POSTURE},                \
+    { SW_PROP_NAME(UNO_NAME_CHAR_LOCALE_ASIAN),         RES_CHRATR_CJK_LANGUAGE ,   &::getCppuType((Locale*)0)  ,       PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
+
+#define _CTL_FONT_PROPERTIES \
+    { SW_PROP_NAME(UNO_NAME_CHAR_HEIGHT_COMPLEX),           RES_CHRATR_CTL_FONTSIZE  ,  &::getCppuType((Float*)0),          PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},\
+    { SW_PROP_NAME(UNO_NAME_CHAR_WEIGHT_COMPLEX),           RES_CHRATR_CTL_WEIGHT    ,  &::getCppuType((Float*)0),              PropertyAttribute::MAYBEVOID, MID_WEIGHT},              \
+    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_NAME_COMPLEX),        RES_CHRATR_CTL_FONT,        &::getCppuType((OUString*)0),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },            \
+    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX),  RES_CHRATR_CTL_FONT,        &::getCppuType((OUString*)0), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },              \
+    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_FAMILY_COMPLEX),      RES_CHRATR_CTL_FONT,        &::getCppuType((sal_Int16*)0),                  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },    \
+    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX),    RES_CHRATR_CTL_FONT,        &::getCppuType((sal_Int16*)0),  PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },              \
+    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_PITCH_COMPLEX),       RES_CHRATR_CTL_FONT,        &::getCppuType((sal_Int16*)0),                  PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },     \
+    { SW_PROP_NAME(UNO_NAME_CHAR_POSTURE_COMPLEX),          RES_CHRATR_CTL_POSTURE   ,  &::getCppuType((FontSlant*)0),          PropertyAttribute::MAYBEVOID, MID_POSTURE},             \
+    { SW_PROP_NAME(UNO_NAME_CHAR_LOCALE_COMPLEX),           RES_CHRATR_CTL_LANGUAGE ,   &::getCppuType((Locale*)0)  ,       PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
 /* -----------------24.06.98 18:12-------------------
  *
  * --------------------------------------------------*/
@@ -476,14 +509,6 @@ void SwUnoPropertyMapProvider::Sort(sal_uInt16 nId)
         { SW_PROP_NAME(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT),        RES_CHRATR_ESCAPEMENT,  &::getCppuType((const sal_Int8*)0)  ,       PropertyAttribute::MAYBEVOID, MID_ESC_HEIGHT},                                               \
         { SW_PROP_NAME(UNO_NAME_CHAR_AUTO_ESCAPEMENT),          RES_CHRATR_ESCAPEMENT,  &::getBooleanCppuType()  ,              PropertyAttribute::MAYBEVOID, MID_AUTO_ESC  },                                                \
         { SW_PROP_NAME(UNO_NAME_CHAR_FLASH              ),  RES_CHRATR_BLINK    ,   &::getBooleanCppuType()  ,          PropertyAttribute::MAYBEVOID,     0},                                                                 \
-        { SW_PROP_NAME(UNO_NAME_CHAR_HEIGHT),                   RES_CHRATR_FONTSIZE  ,  &::getCppuType((const Float*)0),            PropertyAttribute::MAYBEVOID, MID_FONTHEIGHT|CONVERT_TWIPS},                                 \
-        { SW_PROP_NAME(UNO_NAME_CHAR_WEIGHT),                   RES_CHRATR_WEIGHT    ,  &::getCppuType((const Float*)0),            PropertyAttribute::MAYBEVOID, MID_WEIGHT},                                                   \
-        { SW_PROP_NAME(UNO_NAME_CHAR_FONT_NAME),                RES_CHRATR_FONT,        &::getCppuType((const OUString*)0),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },                                            \
-        { SW_PROP_NAME(UNO_NAME_CHAR_FONT_STYLE_NAME),          RES_CHRATR_FONT,        &::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },                                              \
-        { SW_PROP_NAME(UNO_NAME_CHAR_FONT_FAMILY),          RES_CHRATR_FONT,        &::getCppuType((const sal_Int16*)0),                    PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },                                         \
-        { SW_PROP_NAME(UNO_NAME_CHAR_FONT_CHAR_SET),            RES_CHRATR_FONT,        &::getCppuType((const sal_Int16*)0),    PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },                                            \
-        { SW_PROP_NAME(UNO_NAME_CHAR_FONT_PITCH),           RES_CHRATR_FONT,        &::getCppuType((const sal_Int16*)0),                    PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },                                          \
-        { SW_PROP_NAME(UNO_NAME_CHAR_POSTURE),              RES_CHRATR_POSTURE   ,  &::getCppuType((const awt::FontSlant*)0),       PropertyAttribute::MAYBEVOID, MID_POSTURE},                                                  \
         { SW_PROP_NAME(UNO_NAME_CHAR_UNDERLINE),            RES_CHRATR_UNDERLINE ,  &::getCppuType((const sal_Int16*)0),            PropertyAttribute::MAYBEVOID, MID_UNDERLINE},                                                \
         { SW_PROP_NAME(UNO_NAME_PARA_GRAPHIC_URL      ),        RES_BACKGROUND,         &::getCppuType((const OUString*)0),         PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_URL    },                                          \
         { SW_PROP_NAME(UNO_NAME_PARA_GRAPHIC_FILTER  ),         RES_BACKGROUND,         &::getCppuType((const OUString*)0),         PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_FILTER    },                                       \
@@ -491,8 +516,10 @@ void SwUnoPropertyMapProvider::Sort(sal_uInt16 nId)
         { SW_PROP_NAME(UNO_NAME_PARA_LEFT_MARGIN),          RES_LR_SPACE,           &::getCppuType((const sal_Int32*)0),            PropertyAttribute::MAYBEVOID, MID_TXT_LMARGIN|CONVERT_TWIPS},                                   \
         { SW_PROP_NAME(UNO_NAME_PARA_RIGHT_MARGIN),             RES_LR_SPACE,           &::getCppuType((const sal_Int32*)0),            PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS},                                  \
         { SW_PROP_NAME(UNO_NAME_PARA_FIRST_LINE_INDENT),        RES_LR_SPACE,           &::getCppuType((const sal_Int32*)0),            PropertyAttribute::MAYBEVOID, MID_FIRST_LINE_INDENT|CONVERT_TWIPS},                         \
+        _STANDARD_FONT_PROPERTIES \
+        _CJK_FONT_PROPERTIES \
+        _CTL_FONT_PROPERTIES \
         { SW_PROP_NAME(UNO_NAME_CHAR_KERNING            ),  RES_CHRATR_KERNING    , &::getCppuType((const sal_Int16*)0)  ,          PropertyAttribute::MAYBEVOID,   0},                                                           \
-        { SW_PROP_NAME(UNO_NAME_CHAR_LOCALE         ),      RES_CHRATR_LANGUAGE ,   &::getCppuType((const lang::Locale*)0)  ,       PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },                                            \
         { SW_PROP_NAME(UNO_NAME_CHAR_NO_HYPHENATION     ),  RES_CHRATR_NOHYPHEN ,   &::getBooleanCppuType()  ,          PropertyAttribute::MAYBEVOID,     0},                                                                 \
         { SW_PROP_NAME(UNO_NAME_CHAR_SHADOWED),             RES_CHRATR_SHADOWED  ,  &::getBooleanCppuType()  ,          PropertyAttribute::MAYBEVOID, 0},                                                                     \
         { SW_PROP_NAME(UNO_NAME_CHAR_STYLE_NAME),           RES_TXTATR_CHARFMT,     &::getCppuType((const OUString*)0),         PropertyAttribute::MAYBEVOID,     0},                                                         \
@@ -615,19 +642,11 @@ const SfxItemPropertyMap*   SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
                     { SW_PROP_NAME(UNO_NAME_CHAR_ESCAPEMENT),           RES_CHRATR_ESCAPEMENT,  &::getCppuType((const sal_Int16*)0),            PROPERTY_NONE, MID_ESC          },
                     { SW_PROP_NAME(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT),        RES_CHRATR_ESCAPEMENT,  &::getCppuType((const sal_Int8*)0)  ,       PROPERTY_NONE, MID_ESC_HEIGHT},
                     { SW_PROP_NAME(UNO_NAME_CHAR_FLASH           ),     RES_CHRATR_BLINK    ,   &::getBooleanCppuType()  ,          PROPERTY_NONE,     0},
-                    { SW_PROP_NAME(UNO_NAME_CHAR_HEIGHT),                   RES_CHRATR_FONTSIZE  ,  &::getCppuType((const Float*)0),            PROPERTY_NONE, MID_FONTHEIGHT|CONVERT_TWIPS},
-                    { SW_PROP_NAME(UNO_NAME_CHAR_PROP_FONT_HEIGHT),     RES_CHRATR_FONTSIZE  ,  &::getCppuType((const sal_Int16*)0),            PROPERTY_NONE,MID_FONTHEIGHT_PROP|CONVERT_TWIPS },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_DIFF_FONT_HEIGHT),     RES_CHRATR_FONTSIZE  ,  &::getCppuType((const Float*)0),            PROPERTY_NONE,MID_FONTHEIGHT_DIFF|CONVERT_TWIPS },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_NAME),                RES_CHRATR_FONT,        &::getCppuType((const OUString*)0),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_STYLE_NAME),          RES_CHRATR_FONT,        &::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_FAMILY),          RES_CHRATR_FONT,        &::getCppuType((const sal_Int16*)0),                    PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_CHAR_SET),            RES_CHRATR_FONT,        &::getCppuType((const sal_Int16*)0),    PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_PITCH),           RES_CHRATR_FONT,        &::getCppuType((const sal_Int16*)0),                    PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_WEIGHT),                   RES_CHRATR_WEIGHT    ,  &::getCppuType((const Float*)0),    PROPERTY_NONE, MID_WEIGHT},
-                    { SW_PROP_NAME(UNO_NAME_CHAR_POSTURE),              RES_CHRATR_POSTURE   ,  &::getCppuType((const awt::FontSlant*)0),   PROPERTY_NONE, MID_POSTURE},
+                    _STANDARD_FONT_PROPERTIES
+                    _CJK_FONT_PROPERTIES
+                    _CTL_FONT_PROPERTIES
                     { SW_PROP_NAME(UNO_NAME_CHAR_UNDERLINE),            RES_CHRATR_UNDERLINE ,  &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, MID_UNDERLINE},
                     { SW_PROP_NAME(UNO_NAME_CHAR_KERNING       ),           RES_CHRATR_KERNING    , &::getCppuType((const sal_Int16*)0)  ,          PROPERTY_NONE,  0},
-                    { SW_PROP_NAME(UNO_NAME_CHAR_LOCALE         ),      RES_CHRATR_LANGUAGE ,   &::getCppuType((const lang::Locale*)0)  ,       PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
                     { SW_PROP_NAME(UNO_NAME_CHAR_NO_HYPHENATION     ),      RES_CHRATR_NOHYPHEN ,   &::getBooleanCppuType()  ,          PROPERTY_NONE,     0},
                     { SW_PROP_NAME(UNO_NAME_CHAR_SHADOWED),             RES_CHRATR_SHADOWED  ,  &::getBooleanCppuType()  ,          PROPERTY_NONE, 0},
                     { SW_PROP_NAME(UNO_NAME_CHAR_CONTOURED),                RES_CHRATR_CONTOUR,     &::getBooleanCppuType()  ,          PROPERTY_NONE, 0},
@@ -667,16 +686,9 @@ const SfxItemPropertyMap*   SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
                     { SW_PROP_NAME(UNO_NAME_CHAR_ESCAPEMENT),           RES_CHRATR_ESCAPEMENT,  &::getCppuType((const sal_Int16*)0),            PROPERTY_NONE, MID_ESC          },
                     { SW_PROP_NAME(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT),        RES_CHRATR_ESCAPEMENT,  &::getCppuType((const sal_Int8*)0)  ,       PROPERTY_NONE, MID_ESC_HEIGHT},
                     { SW_PROP_NAME(UNO_NAME_CHAR_FLASH              ),  RES_CHRATR_BLINK    ,   &::getBooleanCppuType()  ,          PROPERTY_NONE,     0},
-                    { SW_PROP_NAME(UNO_NAME_CHAR_HEIGHT),                   RES_CHRATR_FONTSIZE  ,  &::getCppuType((const Float*)0),            PROPERTY_NONE, MID_FONTHEIGHT|CONVERT_TWIPS},
-                    { SW_PROP_NAME(UNO_NAME_CHAR_PROP_FONT_HEIGHT),     RES_CHRATR_FONTSIZE  ,  &::getCppuType((const sal_Int16*)0),            PROPERTY_NONE,MID_FONTHEIGHT_PROP|CONVERT_TWIPS },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_DIFF_FONT_HEIGHT),     RES_CHRATR_FONTSIZE  ,  &::getCppuType((const Float*)0),            PROPERTY_NONE,MID_FONTHEIGHT_DIFF|CONVERT_TWIPS },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_NAME),                RES_CHRATR_FONT,        &::getCppuType((const OUString*)0),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_STYLE_NAME),          RES_CHRATR_FONT,        &::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_FAMILY),          RES_CHRATR_FONT,        &::getCppuType((const sal_Int16*)0),                    PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_CHAR_SET),            RES_CHRATR_FONT,        &::getCppuType((const sal_Int16*)0),    PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_PITCH),           RES_CHRATR_FONT,        &::getCppuType((const sal_Int16*)0),                    PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_WEIGHT),                   RES_CHRATR_WEIGHT    ,  &::getCppuType((const Float*)0),    PROPERTY_NONE, MID_WEIGHT},
-                    { SW_PROP_NAME(UNO_NAME_CHAR_POSTURE),              RES_CHRATR_POSTURE   ,  &::getCppuType((const awt::FontSlant*)0),   PROPERTY_NONE, MID_POSTURE},
+                    _STANDARD_FONT_PROPERTIES
+                    _CJK_FONT_PROPERTIES
+                    _CTL_FONT_PROPERTIES
                     { SW_PROP_NAME(UNO_NAME_CHAR_UNDERLINE),            RES_CHRATR_UNDERLINE ,  &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, MID_UNDERLINE},
                     { SW_PROP_NAME(UNO_NAME_PARA_LEFT_MARGIN),          RES_LR_SPACE,           &::getCppuType((const sal_Int32*)0), PROPERTY_NONE, MID_TXT_LMARGIN|CONVERT_TWIPS},
                     { SW_PROP_NAME(UNO_NAME_PARA_RIGHT_MARGIN),             RES_LR_SPACE,           &::getCppuType((const sal_Int32*)0), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
@@ -685,7 +697,6 @@ const SfxItemPropertyMap*   SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
                     { SW_PROP_NAME(UNO_NAME_PARA_FIRST_LINE_INDENT),        RES_LR_SPACE,           &::getCppuType((const sal_Int32*)0), PROPERTY_NONE, MID_FIRST_LINE_INDENT|CONVERT_TWIPS},
                     { SW_PROP_NAME(UNO_NAME_PARA_FIRST_LINE_INDENT_RELATIVE),   RES_LR_SPACE,       &::getCppuType((const sal_Int32*)0), PROPERTY_NONE, MID_FIRST_LINE_REL_INDENT|CONVERT_TWIPS},
                     { SW_PROP_NAME(UNO_NAME_CHAR_KERNING            ),  RES_CHRATR_KERNING    , &::getCppuType((const sal_Int16*)0)  ,          PROPERTY_NONE,  0},
-                    { SW_PROP_NAME(UNO_NAME_CHAR_LOCALE         ),      RES_CHRATR_LANGUAGE ,   &::getCppuType((const lang::Locale*)0)  ,       PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
                     { SW_PROP_NAME(UNO_NAME_CHAR_NO_HYPHENATION     ),  RES_CHRATR_NOHYPHEN ,   &::getBooleanCppuType()  ,          PROPERTY_NONE,     0},
                     { SW_PROP_NAME(UNO_NAME_CHAR_SHADOWED),             RES_CHRATR_SHADOWED  ,  &::getBooleanCppuType()  ,          PROPERTY_NONE, 0},
                     { SW_PROP_NAME(UNO_NAME_CHAR_CONTOURED),                RES_CHRATR_CONTOUR,     &::getBooleanCppuType()  ,          PROPERTY_NONE, 0},
@@ -1006,20 +1017,14 @@ const SfxItemPropertyMap*   SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
                     { SW_PROP_NAME(UNO_NAME_CHAR_ESCAPEMENT),           RES_CHRATR_ESCAPEMENT,  &::getCppuType((const sal_Int16*)0),            PROPERTY_NONE, MID_ESC          },
                     { SW_PROP_NAME(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT),        RES_CHRATR_ESCAPEMENT,  &::getCppuType((const sal_Int8*)0)  ,       PROPERTY_NONE, MID_ESC_HEIGHT},
                     { SW_PROP_NAME(UNO_NAME_CHAR_FLASH              ),  RES_CHRATR_BLINK    ,   &::getBooleanCppuType()  ,          PROPERTY_NONE,     0},
-                    { SW_PROP_NAME(UNO_NAME_CHAR_HEIGHT),                   RES_CHRATR_FONTSIZE  ,  &::getCppuType((const Float*)0),            PROPERTY_NONE, MID_FONTHEIGHT},
-                    { SW_PROP_NAME(UNO_NAME_CHAR_WEIGHT),                   RES_CHRATR_WEIGHT    ,  &::getCppuType((const Float*)0),    PROPERTY_NONE, MID_WEIGHT},
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_NAME),                RES_CHRATR_FONT,        &::getCppuType((const OUString*)0),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_STYLE_NAME),          RES_CHRATR_FONT,        &::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_FAMILY),          RES_CHRATR_FONT,        &::getCppuType((const sal_Int16*)0),                    PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_CHAR_SET),            RES_CHRATR_FONT,        &::getCppuType((const sal_Int16*)0),    PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_PITCH),           RES_CHRATR_FONT,        &::getCppuType((const sal_Int16*)0),                    PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_POSTURE),              RES_CHRATR_POSTURE   ,  &::getCppuType((const awt::FontSlant*)0),   PROPERTY_NONE, MID_POSTURE},
+                    _STANDARD_FONT_PROPERTIES
+                    _CJK_FONT_PROPERTIES
+                    _CTL_FONT_PROPERTIES
                     { SW_PROP_NAME(UNO_NAME_CHAR_UNDERLINE),            RES_CHRATR_UNDERLINE ,  &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, MID_UNDERLINE},
                     { SW_PROP_NAME(UNO_NAME_PARA_LEFT_MARGIN),          RES_LR_SPACE,           &::getCppuType((const sal_Int32*)0), PROPERTY_NONE, MID_TXT_LMARGIN|CONVERT_TWIPS},
                     { SW_PROP_NAME(UNO_NAME_PARA_RIGHT_MARGIN),             RES_LR_SPACE,           &::getCppuType((const sal_Int32*)0), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
                     { SW_PROP_NAME(UNO_NAME_PARA_FIRST_LINE_INDENT),        RES_LR_SPACE,           &::getCppuType((const sal_Int32*)0), PROPERTY_NONE, MID_FIRST_LINE_INDENT|CONVERT_TWIPS},
                     { SW_PROP_NAME(UNO_NAME_CHAR_KERNING            ),  RES_CHRATR_KERNING    , &::getCppuType((const sal_Int16*)0)  ,          PROPERTY_NONE,  0},
-                    { SW_PROP_NAME(UNO_NAME_CHAR_LOCALE         ),      RES_CHRATR_LANGUAGE ,   &::getCppuType((const lang::Locale*)0)  ,       PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
                     { SW_PROP_NAME(UNO_NAME_CHAR_NO_HYPHENATION     ),  RES_CHRATR_NOHYPHEN ,   &::getBooleanCppuType()  ,          PROPERTY_NONE,     0},
                     { SW_PROP_NAME(UNO_NAME_CHAR_SHADOWED),             RES_CHRATR_SHADOWED  ,  &::getBooleanCppuType()  ,          PROPERTY_NONE, 0},
                     { SW_PROP_NAME(UNO_NAME_CHAR_STYLE_NAME),           RES_TXTATR_CHARFMT,     &::getCppuType((const OUString*)0),         PropertyAttribute::MAYBEVOID,     0},
@@ -1592,20 +1597,14 @@ const SfxItemPropertyMap*   SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16
                     { SW_PROP_NAME(UNO_NAME_CHAR_ESCAPEMENT),           RES_CHRATR_ESCAPEMENT,  &::getCppuType((const sal_Int16*)0),            PROPERTY_NONE, MID_ESC          },
                     { SW_PROP_NAME(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT),        RES_CHRATR_ESCAPEMENT,  &::getCppuType((const sal_Int8*)0)  ,       PROPERTY_NONE, MID_ESC_HEIGHT},
                     { SW_PROP_NAME(UNO_NAME_CHAR_FLASH              ),  RES_CHRATR_BLINK    ,   &::getBooleanCppuType()  ,          PROPERTY_NONE,     0},
-                    { SW_PROP_NAME(UNO_NAME_CHAR_HEIGHT),                   RES_CHRATR_FONTSIZE  ,  &::getCppuType((const Float*)0),            PROPERTY_NONE, MID_FONTHEIGHT},
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_NAME),                RES_CHRATR_FONT,        &::getCppuType((const OUString*)0),  PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY_NAME },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_STYLE_NAME),          RES_CHRATR_FONT,        &::getCppuType((const OUString*)0), PropertyAttribute::MAYBEVOID, MID_FONT_STYLE_NAME },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_FAMILY),          RES_CHRATR_FONT,        &::getCppuType((const sal_Int16*)0),                    PropertyAttribute::MAYBEVOID, MID_FONT_FAMILY   },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_CHAR_SET),            RES_CHRATR_FONT,        &::getCppuType((const sal_Int16*)0),    PropertyAttribute::MAYBEVOID, MID_FONT_CHAR_SET },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_FONT_PITCH),           RES_CHRATR_FONT,        &::getCppuType((const sal_Int16*)0),                    PropertyAttribute::MAYBEVOID, MID_FONT_PITCH   },
-                    { SW_PROP_NAME(UNO_NAME_CHAR_WEIGHT),                   RES_CHRATR_WEIGHT    ,  &::getCppuType((const Float*)0),    PROPERTY_NONE, MID_WEIGHT},
-                    { SW_PROP_NAME(UNO_NAME_CHAR_POSTURE),              RES_CHRATR_POSTURE   ,  &::getCppuType((const awt::FontSlant*)0),   PROPERTY_NONE, MID_POSTURE},
+                    _STANDARD_FONT_PROPERTIES
+                    _CJK_FONT_PROPERTIES
+                    _CTL_FONT_PROPERTIES
                     { SW_PROP_NAME(UNO_NAME_CHAR_UNDERLINE),            RES_CHRATR_UNDERLINE ,  &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, MID_UNDERLINE},
                     { SW_PROP_NAME(UNO_NAME_PARA_LEFT_MARGIN),          RES_LR_SPACE,           &::getCppuType((const sal_Int32*)0), PROPERTY_NONE, MID_TXT_LMARGIN|CONVERT_TWIPS},
                     { SW_PROP_NAME(UNO_NAME_PARA_RIGHT_MARGIN),             RES_LR_SPACE,           &::getCppuType((const sal_Int32*)0), PROPERTY_NONE, MID_R_MARGIN|CONVERT_TWIPS},
                     { SW_PROP_NAME(UNO_NAME_PARA_FIRST_LINE_INDENT),        RES_LR_SPACE,           &::getCppuType((const sal_Int32*)0), PROPERTY_NONE, MID_FIRST_LINE_INDENT|CONVERT_TWIPS},
                     { SW_PROP_NAME(UNO_NAME_CHAR_KERNING            ),  RES_CHRATR_KERNING    , &::getCppuType((const sal_Int16*)0)  ,          PROPERTY_NONE,  0},
-                    { SW_PROP_NAME(UNO_NAME_CHAR_LOCALE         ),      RES_CHRATR_LANGUAGE ,   &::getCppuType((const lang::Locale*)0)  ,       PropertyAttribute::MAYBEVOID,  MID_LANG_LOCALE },
                     { SW_PROP_NAME(UNO_NAME_CHAR_NO_HYPHENATION     ),  RES_CHRATR_NOHYPHEN ,   &::getBooleanCppuType()  ,          PROPERTY_NONE,     0},
                     { SW_PROP_NAME(UNO_NAME_CHAR_SHADOWED),             RES_CHRATR_SHADOWED  ,  &::getBooleanCppuType()  ,          PROPERTY_NONE, 0},
                     { SW_PROP_NAME(UNO_NAME_CHAR_STYLE_NAME),           RES_TXTATR_CHARFMT,     &::getCppuType((const OUString*)0),         PropertyAttribute::MAYBEVOID,     0},
diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx
index 7b8dcd14ea72..df2a4be209a1 100644
--- a/sw/source/core/unocore/unoprnms.cxx
+++ b/sw/source/core/unocore/unoprnms.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoprnms.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: os $ $Date: 2000-11-08 12:42:49 $
+ *  last change: $Author: os $ $Date: 2000-11-09 14:13:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,11 +83,6 @@ const SwPropNameLen __FAR_DATA  UNO_NAME_FOLLOW_STYLE(MAP_CHAR_LEN("FollowStyle"
 const SwPropNameLen __FAR_DATA  UNO_NAME_IS_PHYSICAL                            (MAP_CHAR_LEN("IsPhysical"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_IS_AUTO_UPDATE                         (MAP_CHAR_LEN("IsAutoUpdate"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_DISPLAY_NAME                           (MAP_CHAR_LEN("DisplayName"));
-const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_NAME                         (MAP_CHAR_LEN("CharFontName"));
-const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_STYLE_NAME                   (MAP_CHAR_LEN("CharFontStyleName"));
-const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_FAMILY                       (MAP_CHAR_LEN("CharFontFamily"));
-const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_CHAR_SET                     (MAP_CHAR_LEN("CharFontCharSet"));
-const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_PITCH                        (MAP_CHAR_LEN("CharFontPitch"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_PARA_GRAPHIC_URL                       (MAP_CHAR_LEN("ParaBackGraphicURL"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_PARA_GRAPHIC_FILTER                    (MAP_CHAR_LEN("ParaBackGraphicFilter"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_HEADER_GRAPHIC_URL                     (MAP_CHAR_LEN("HeaderBackGraphicURL"));
@@ -136,8 +131,37 @@ const SwPropNameLen __FAR_DATA  UNO_NAME_SUFFIX
 const SwPropNameLen __FAR_DATA  UNO_NAME_PREFIX                                 (MAP_CHAR_LEN("Prefix"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_PARENT_NUMBERING                       (MAP_CHAR_LEN("ParentNumbering"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_START_WITH                             (MAP_CHAR_LEN("StartWith"));
+
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_HEIGHT                            (MAP_CHAR_LEN("CharHeight"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_NAME                         (MAP_CHAR_LEN("CharFontName"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_STYLE_NAME                   (MAP_CHAR_LEN("CharFontStyleName"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_FAMILY                       (MAP_CHAR_LEN("CharFontFamily"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_CHAR_SET                     (MAP_CHAR_LEN("CharFontCharSet"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_PITCH                        (MAP_CHAR_LEN("CharFontPitch"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_POSTURE                           (MAP_CHAR_LEN("CharPosture"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_WEIGHT                            (MAP_CHAR_LEN("CharWeight"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_LOCALE                            (MAP_CHAR_LEN("CharLocale"));
+
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_HEIGHT_ASIAN                      (MAP_CHAR_LEN("CharHeightAsian"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_NAME_ASIAN                   (MAP_CHAR_LEN("CharFontNameAsian"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN             (MAP_CHAR_LEN("CharFontStyleNameAsian"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_FAMILY_ASIAN                 (MAP_CHAR_LEN("CharFontFamilyAsian"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_CHAR_SET_ASIAN               (MAP_CHAR_LEN("CharFontCharSetAsian"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_PITCH_ASIAN                  (MAP_CHAR_LEN("CharFontPitchAsian"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_POSTURE_ASIAN                     (MAP_CHAR_LEN("CharPostureAsian"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_WEIGHT_ASIAN                      (MAP_CHAR_LEN("CharWeightAsian"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_LOCALE_ASIAN                      (MAP_CHAR_LEN("CharLocaleAsian"));
+
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_HEIGHT_COMPLEX                    (MAP_CHAR_LEN("CharHeightComplex"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_NAME_COMPLEX                 (MAP_CHAR_LEN("CharFontNameComplex"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_STYLE_NAME_COMPLEX           (MAP_CHAR_LEN("CharFontStyleNameComplex"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_FAMILY_COMPLEX               (MAP_CHAR_LEN("CharFontFamilyComplex"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_CHAR_SET_COMPLEX             (MAP_CHAR_LEN("CharFontCharSetComplex"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FONT_PITCH_COMPLEX                (MAP_CHAR_LEN("CharFontPitchComplex"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_POSTURE_COMPLEX                   (MAP_CHAR_LEN("CharPostureComplex"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_WEIGHT_COMPLEX                    (MAP_CHAR_LEN("CharWeightComplex"));
+const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_LOCALE_COMPLEX                    (MAP_CHAR_LEN("CharLocaleComplex"));
+
 const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_AUTO_KERNING                      (MAP_CHAR_LEN("CharAutoKerning"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_UNDERLINE                         (MAP_CHAR_LEN("CharUnderline"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_ESCAPEMENT                        (MAP_CHAR_LEN("CharEscapement"));
@@ -147,14 +171,12 @@ const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_STRIKEOUT
 const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_CROSSED_OUT                       (MAP_CHAR_LEN("CharCrossedOut"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_NO_HYPHENATION                    (MAP_CHAR_LEN("CharNoHyphenation"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_AUTO_ESCAPEMENT                   (MAP_CHAR_LEN("CharAutoEscapement"));
-const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_HEIGHT                            (MAP_CHAR_LEN("CharHeight"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_PROP_FONT_HEIGHT                  (MAP_CHAR_LEN("CharPropFontHeight"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_DIFF_FONT_HEIGHT                  (MAP_CHAR_LEN("CharDiffFontHeight"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_ESCAPEMENT_HEIGHT                 (MAP_CHAR_LEN("CharEscapementHeight"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_COLOR                             (MAP_CHAR_LEN("CharColor"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_FLASH                             (MAP_CHAR_LEN("CharFlash"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_KERNING                           (MAP_CHAR_LEN("CharKerning"));
-const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_LOCALE                            (MAP_CHAR_LEN("CharLocale"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_BACK_COLOR                        (MAP_CHAR_LEN("CharBackColor"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_CHAR_BACK_TRANSPARENT          (MAP_CHAR_LEN("CharBackTransparent"));
 const SwPropNameLen __FAR_DATA  UNO_NAME_PARA_LINE_SPACING                      (MAP_CHAR_LEN("ParaLineSpacing"));