[Libreoffice-commits] core.git: sc/source sd/source sfx2/source starmath/source sw/source

Andres Gomez agomez at igalia.com
Fri Sep 20 01:44:04 PDT 2013


 sc/source/ui/unoobj/docuno.cxx      |   80 -
 sd/source/ui/unoidl/unomodel.cxx    |   50 -
 sfx2/source/doc/sfxbasemodel.cxx    |   64 -
 starmath/source/unomodel.cxx        |  130 +--
 sw/source/core/unocore/unomap.cxx   |  198 ++--
 sw/source/core/unocore/unoprnms.cxx | 1540 ++++++++++++++++++------------------
 6 files changed, 1032 insertions(+), 1030 deletions(-)

New commits:
commit 44c5fcb7eb4077740ef497ff4bb6c4cf23224dbf
Author: Andres Gomez <agomez at igalia.com>
Date:   Tue Sep 17 18:30:54 2013 +0300

    indent: Just some indenting for better reading
    
    Change-Id: Id840dd00c71afc1930e6bb9b634e888b88fe7391
    Reviewed-on: https://gerrit.libreoffice.org/6001
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 59b0749..d151edc 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -115,46 +115,46 @@ static const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap()
 {
     static const SfxItemPropertyMapEntry aDocOptPropertyMap_Impl[] =
     {
-        {MAP_CHAR_LEN(SC_UNO_APPLYFMDES),        0, &getBooleanCppuType(),                                    0, 0},
-        {MAP_CHAR_LEN(SC_UNO_AREALINKS),         0, &getCppuType((uno::Reference<sheet::XAreaLinks>*)0),      0, 0},
-        {MAP_CHAR_LEN(SC_UNO_AUTOCONTFOC),       0, &getBooleanCppuType(),                                    0, 0},
-        {MAP_CHAR_LEN(SC_UNO_BASICLIBRARIES),    0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0},
-        {MAP_CHAR_LEN(SC_UNO_DIALOGLIBRARIES),   0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0},
-        {MAP_CHAR_LEN(SC_UNO_VBAGLOBNAME),       0, &getCppuType(static_cast< const OUString * >(0)),    beans::PropertyAttribute::READONLY, 0},
-        {MAP_CHAR_LEN(SC_UNO_CALCASSHOWN),       PROP_UNO_CALCASSHOWN, &getBooleanCppuType(),                                    0, 0},
-        {MAP_CHAR_LEN(SC_UNONAME_CLOCAL),        0, &getCppuType((lang::Locale*)0),                           0, 0},
-        {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL),        0, &getCppuType((lang::Locale*)0),                           0, 0},
-        {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL),        0, &getCppuType((lang::Locale*)0),                           0, 0},
-        {MAP_CHAR_LEN(SC_UNO_COLLABELRNG),       0, &getCppuType((uno::Reference<sheet::XLabelRanges>*)0),    0, 0},
-        {MAP_CHAR_LEN(SC_UNO_DDELINKS),          0, &getCppuType((uno::Reference<container::XNameAccess>*)0), 0, 0},
-        {MAP_CHAR_LEN(SC_UNO_DEFTABSTOP),        PROP_UNO_DEFTABSTOP, &getCppuType((sal_Int16*)0),                              0, 0},
-        {MAP_CHAR_LEN(SC_UNO_EXTERNALDOCLINKS),  0, &getCppuType((uno::Reference<sheet::XExternalDocLinks>*)0), 0, 0},
-        {MAP_CHAR_LEN(SC_UNO_FORBIDDEN),         0, &getCppuType((uno::Reference<i18n::XForbiddenCharacters>*)0), beans::PropertyAttribute::READONLY, 0},
-        {MAP_CHAR_LEN(SC_UNO_HASDRAWPAGES),      0, &getBooleanCppuType(),                                    beans::PropertyAttribute::READONLY, 0},
-        {MAP_CHAR_LEN(SC_UNO_IGNORECASE),        PROP_UNO_IGNORECASE, &getBooleanCppuType(),                                    0, 0},
-        {MAP_CHAR_LEN(SC_UNO_ITERENABLED),       PROP_UNO_ITERENABLED, &getBooleanCppuType(),                                    0, 0},
-        {MAP_CHAR_LEN(SC_UNO_ITERCOUNT),         PROP_UNO_ITERCOUNT, &getCppuType((sal_Int32*)0),                              0, 0},
-        {MAP_CHAR_LEN(SC_UNO_ITEREPSILON),       PROP_UNO_ITEREPSILON, &getCppuType((double*)0),                                 0, 0},
-        {MAP_CHAR_LEN(SC_UNO_LOOKUPLABELS),      PROP_UNO_LOOKUPLABELS, &getBooleanCppuType(),                                    0, 0},
-        {MAP_CHAR_LEN(SC_UNO_MATCHWHOLE),        PROP_UNO_MATCHWHOLE, &getBooleanCppuType(),                                    0, 0},
-        {MAP_CHAR_LEN(SC_UNO_NAMEDRANGES),       0, &getCppuType((uno::Reference<sheet::XNamedRanges>*)0),    0, 0},
-        {MAP_CHAR_LEN(SC_UNO_DATABASERNG),       0, &getCppuType((uno::Reference<sheet::XDatabaseRanges>*)0), 0, 0},
-        {MAP_CHAR_LEN(SC_UNO_NULLDATE),          PROP_UNO_NULLDATE, &getCppuType((util::Date*)0),                             0, 0},
-        {MAP_CHAR_LEN(SC_UNO_ROWLABELRNG),       0, &getCppuType((uno::Reference<sheet::XLabelRanges>*)0),    0, 0},
-        {MAP_CHAR_LEN(SC_UNO_SHEETLINKS),        0, &getCppuType((uno::Reference<container::XNameAccess>*)0), 0, 0},
-        {MAP_CHAR_LEN(SC_UNO_SPELLONLINE),       PROP_UNO_SPELLONLINE, &getBooleanCppuType(),                                    0, 0},
-        {MAP_CHAR_LEN(SC_UNO_STANDARDDEC),       PROP_UNO_STANDARDDEC, &getCppuType((sal_Int16*)0),                              0, 0},
-        {MAP_CHAR_LEN(SC_UNO_REGEXENABLED),      PROP_UNO_REGEXENABLED, &getBooleanCppuType(),                                    0, 0},
-        {MAP_CHAR_LEN(SC_UNO_RUNTIMEUID),        0, &getCppuType(static_cast< const OUString * >(0)),    beans::PropertyAttribute::READONLY, 0},
-        {MAP_CHAR_LEN(SC_UNO_HASVALIDSIGNATURES),0, &getBooleanCppuType(),                                    beans::PropertyAttribute::READONLY, 0},
-        {MAP_CHAR_LEN(SC_UNO_ISLOADED),          0, &getBooleanCppuType(),                                    0, 0},
-        {MAP_CHAR_LEN(SC_UNO_ISUNDOENABLED),     0, &getBooleanCppuType(),                                    0, 0},
-        {MAP_CHAR_LEN(SC_UNO_ISADJUSTHEIGHTENABLED), 0, &getBooleanCppuType(),                                0, 0},
-        {MAP_CHAR_LEN(SC_UNO_ISEXECUTELINKENABLED), 0, &getBooleanCppuType(),                                 0, 0},
-        {MAP_CHAR_LEN(SC_UNO_ISCHANGEREADONLYENABLED), 0, &getBooleanCppuType(),                              0, 0},
-        {MAP_CHAR_LEN(SC_UNO_REFERENCEDEVICE),   0, &getCppuType((uno::Reference<awt::XDevice>*)0),           beans::PropertyAttribute::READONLY, 0},
-        {MAP_CHAR_LEN("BuildId"),                0, &::getCppuType(static_cast< const OUString * >(0)), 0, 0},
-        {MAP_CHAR_LEN(SC_UNO_CODENAME),        0, &getCppuType(static_cast< const OUString * >(0)),    0, 0},
+        {MAP_CHAR_LEN(SC_UNO_APPLYFMDES),              0, &getBooleanCppuType(),                                             0, 0},
+        {MAP_CHAR_LEN(SC_UNO_AREALINKS),               0, &getCppuType((uno::Reference<sheet::XAreaLinks>*)0),               0, 0},
+        {MAP_CHAR_LEN(SC_UNO_AUTOCONTFOC),             0, &getBooleanCppuType(),                                             0, 0},
+        {MAP_CHAR_LEN(SC_UNO_BASICLIBRARIES),          0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0),     beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(SC_UNO_DIALOGLIBRARIES),         0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0),     beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(SC_UNO_VBAGLOBNAME),             0, &getCppuType(static_cast< const OUString * >(0)),                  beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(SC_UNO_CALCASSHOWN),             PROP_UNO_CALCASSHOWN, &getBooleanCppuType(),                          0, 0},
+        {MAP_CHAR_LEN(SC_UNONAME_CLOCAL),              0, &getCppuType((lang::Locale*)0),                                    0, 0},
+        {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL),              0, &getCppuType((lang::Locale*)0),                                    0, 0},
+        {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL),              0, &getCppuType((lang::Locale*)0),                                    0, 0},
+        {MAP_CHAR_LEN(SC_UNO_COLLABELRNG),             0, &getCppuType((uno::Reference<sheet::XLabelRanges>*)0),             0, 0},
+        {MAP_CHAR_LEN(SC_UNO_DDELINKS),                0, &getCppuType((uno::Reference<container::XNameAccess>*)0),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_DEFTABSTOP),              PROP_UNO_DEFTABSTOP, &getCppuType((sal_Int16*)0),                     0, 0},
+        {MAP_CHAR_LEN(SC_UNO_EXTERNALDOCLINKS),        0, &getCppuType((uno::Reference<sheet::XExternalDocLinks>*)0),        0, 0},
+        {MAP_CHAR_LEN(SC_UNO_FORBIDDEN),               0, &getCppuType((uno::Reference<i18n::XForbiddenCharacters>*)0),      beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(SC_UNO_HASDRAWPAGES),            0, &getBooleanCppuType(),                                             beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(SC_UNO_IGNORECASE),              PROP_UNO_IGNORECASE, &getBooleanCppuType(),                           0, 0},
+        {MAP_CHAR_LEN(SC_UNO_ITERENABLED),             PROP_UNO_ITERENABLED, &getBooleanCppuType(),                          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_ITERCOUNT),               PROP_UNO_ITERCOUNT, &getCppuType((sal_Int32*)0),                      0, 0},
+        {MAP_CHAR_LEN(SC_UNO_ITEREPSILON),             PROP_UNO_ITEREPSILON, &getCppuType((double*)0),                       0, 0},
+        {MAP_CHAR_LEN(SC_UNO_LOOKUPLABELS),            PROP_UNO_LOOKUPLABELS, &getBooleanCppuType(),                         0, 0},
+        {MAP_CHAR_LEN(SC_UNO_MATCHWHOLE),              PROP_UNO_MATCHWHOLE, &getBooleanCppuType(),                           0, 0},
+        {MAP_CHAR_LEN(SC_UNO_NAMEDRANGES),             0, &getCppuType((uno::Reference<sheet::XNamedRanges>*)0),             0, 0},
+        {MAP_CHAR_LEN(SC_UNO_DATABASERNG),             0, &getCppuType((uno::Reference<sheet::XDatabaseRanges>*)0),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_NULLDATE),                PROP_UNO_NULLDATE, &getCppuType((util::Date*)0),                      0, 0},
+        {MAP_CHAR_LEN(SC_UNO_ROWLABELRNG),             0, &getCppuType((uno::Reference<sheet::XLabelRanges>*)0),             0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SHEETLINKS),              0, &getCppuType((uno::Reference<container::XNameAccess>*)0),          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_SPELLONLINE),             PROP_UNO_SPELLONLINE, &getBooleanCppuType(),                          0, 0},
+        {MAP_CHAR_LEN(SC_UNO_STANDARDDEC),             PROP_UNO_STANDARDDEC, &getCppuType((sal_Int16*)0),                    0, 0},
+        {MAP_CHAR_LEN(SC_UNO_REGEXENABLED),            PROP_UNO_REGEXENABLED, &getBooleanCppuType(),                         0, 0},
+        {MAP_CHAR_LEN(SC_UNO_RUNTIMEUID),              0, &getCppuType(static_cast< const OUString * >(0)),                  beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(SC_UNO_HASVALIDSIGNATURES),      0, &getBooleanCppuType(),                                             beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN(SC_UNO_ISLOADED),                0, &getBooleanCppuType(),                                             0, 0},
+        {MAP_CHAR_LEN(SC_UNO_ISUNDOENABLED),           0, &getBooleanCppuType(),                                             0, 0},
+        {MAP_CHAR_LEN(SC_UNO_ISADJUSTHEIGHTENABLED),   0, &getBooleanCppuType(),                                             0, 0},
+        {MAP_CHAR_LEN(SC_UNO_ISEXECUTELINKENABLED),    0, &getBooleanCppuType(),                                             0, 0},
+        {MAP_CHAR_LEN(SC_UNO_ISCHANGEREADONLYENABLED), 0, &getBooleanCppuType(),                                             0, 0},
+        {MAP_CHAR_LEN(SC_UNO_REFERENCEDEVICE),         0, &getCppuType((uno::Reference<awt::XDevice>*)0),                    beans::PropertyAttribute::READONLY, 0},
+        {MAP_CHAR_LEN("BuildId"),                      0, &::getCppuType(static_cast< const OUString * >(0)),                0, 0},
+        {MAP_CHAR_LEN(SC_UNO_CODENAME),                0, &getCppuType(static_cast< const OUString * >(0)),                  0, 0},
         {MAP_CHAR_LEN(SC_UNO_INTEROPGRABBAG),          0, SEQTYPE(::getCppuType((uno::Sequence< beans::PropertyValue >*)0)), 0, 0},
 
         {0,0,0,0,0,0}
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index e4683aa..c5af062 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -160,19 +160,19 @@ void SdUnoForbiddenCharsTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) t
 
 ///////////////////////////////////////////////////////////////////////
 
-const sal_Int32 WID_MODEL_LANGUAGE = 1;
-const sal_Int32 WID_MODEL_TABSTOP  = 2;
-const sal_Int32 WID_MODEL_VISAREA  = 3;
-const sal_Int32 WID_MODEL_MAPUNIT  = 4;
-const sal_Int32 WID_MODEL_FORBCHARS= 5;
-const sal_Int32 WID_MODEL_CONTFOCUS = 6;
-const sal_Int32 WID_MODEL_DSGNMODE  = 7;
-const sal_Int32 WID_MODEL_BASICLIBS = 8;
-const sal_Int32 WID_MODEL_RUNTIMEUID = 9;
-const sal_Int32 WID_MODEL_BUILDID = 10;
+const sal_Int32 WID_MODEL_LANGUAGE           =  1;
+const sal_Int32 WID_MODEL_TABSTOP            =  2;
+const sal_Int32 WID_MODEL_VISAREA            =  3;
+const sal_Int32 WID_MODEL_MAPUNIT            =  4;
+const sal_Int32 WID_MODEL_FORBCHARS          =  5;
+const sal_Int32 WID_MODEL_CONTFOCUS          =  6;
+const sal_Int32 WID_MODEL_DSGNMODE           =  7;
+const sal_Int32 WID_MODEL_BASICLIBS          =  8;
+const sal_Int32 WID_MODEL_RUNTIMEUID         =  9;
+const sal_Int32 WID_MODEL_BUILDID            = 10;
 const sal_Int32 WID_MODEL_HASVALIDSIGNATURES = 11;
-const sal_Int32 WID_MODEL_DIALOGLIBS = 12;
-const sal_Int32 WID_MODEL_FONTS = 13;
+const sal_Int32 WID_MODEL_DIALOGLIBS         = 12;
+const sal_Int32 WID_MODEL_FONTS              = 13;
 const sal_Int32 WID_MODEL_INTEROPGRABBAG     = 14;
 
 #ifndef SEQTYPE
@@ -188,19 +188,19 @@ const SvxItemPropertySet* ImplGetDrawModelPropertySet()
     // Attention: the first parameter HAS TO BE sorted!!!
     const static SfxItemPropertyMapEntry aDrawModelPropertyMap_Impl[] =
     {
-        { MAP_CHAR_LEN("BuildId"),                      WID_MODEL_BUILDID,  &::getCppuType(static_cast< const OUString * >(0)), 0, 0},
-        { MAP_CHAR_LEN(sUNO_Prop_CharLocale),           WID_MODEL_LANGUAGE, &::getCppuType((const lang::Locale*)0),     0,  0},
-        { MAP_CHAR_LEN(sUNO_Prop_TabStop),              WID_MODEL_TABSTOP,  &::getCppuType((const sal_Int32*)0),        0,  0},
-        { MAP_CHAR_LEN(sUNO_Prop_VisibleArea),          WID_MODEL_VISAREA,  &::getCppuType((const awt::Rectangle*)0),   0,  0},
-        { MAP_CHAR_LEN(sUNO_Prop_MapUnit),              WID_MODEL_MAPUNIT,  &::getCppuType((const sal_Int16*)0),        beans::PropertyAttribute::READONLY, 0},
-        { MAP_CHAR_LEN(sUNO_Prop_ForbiddenCharacters),  WID_MODEL_FORBCHARS,&::getCppuType((const uno::Reference< i18n::XForbiddenCharacters > *)0), beans::PropertyAttribute::READONLY, 0 },
-        { MAP_CHAR_LEN(sUNO_Prop_AutomContFocus ),  WID_MODEL_CONTFOCUS,    &::getBooleanCppuType(),                    0,  0},
-        { MAP_CHAR_LEN(sUNO_Prop_ApplyFrmDsgnMode), WID_MODEL_DSGNMODE,     &::getBooleanCppuType(),                    0,  0},
-        { MAP_CHAR_LEN("BasicLibraries"),               WID_MODEL_BASICLIBS,&::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), beans::PropertyAttribute::READONLY, 0 },
-        { MAP_CHAR_LEN("DialogLibraries"),              WID_MODEL_DIALOGLIBS,   &::getCppuType((const uno::Reference< script::XLibraryContainer > *)0), beans::PropertyAttribute::READONLY, 0 },
-        { MAP_CHAR_LEN(sUNO_Prop_RuntimeUID),           WID_MODEL_RUNTIMEUID,   &::getCppuType(static_cast< const OUString * >(0)), beans::PropertyAttribute::READONLY, 0 },
-        { MAP_CHAR_LEN(sUNO_Prop_HasValidSignatures),   WID_MODEL_HASVALIDSIGNATURES, &::getCppuType(static_cast< const sal_Bool * >(0)), beans::PropertyAttribute::READONLY, 0 },
-        { MAP_CHAR_LEN("Fonts"),                        WID_MODEL_FONTS,   SEQTYPE(::getCppuType((uno::Sequence<uno::Any>*)0)), beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("BuildId"),                      WID_MODEL_BUILDID,            &::getCppuType(static_cast< const OUString * >(0)),                      0, 0},
+        { MAP_CHAR_LEN(sUNO_Prop_CharLocale),           WID_MODEL_LANGUAGE,           &::getCppuType((const lang::Locale*)0),                                  0, 0},
+        { MAP_CHAR_LEN(sUNO_Prop_TabStop),              WID_MODEL_TABSTOP,            &::getCppuType((const sal_Int32*)0),                                     0, 0},
+        { MAP_CHAR_LEN(sUNO_Prop_VisibleArea),          WID_MODEL_VISAREA,            &::getCppuType((const awt::Rectangle*)0),                                0, 0},
+        { MAP_CHAR_LEN(sUNO_Prop_MapUnit),              WID_MODEL_MAPUNIT,            &::getCppuType((const sal_Int16*)0),                                     beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(sUNO_Prop_ForbiddenCharacters),  WID_MODEL_FORBCHARS,          &::getCppuType((const uno::Reference< i18n::XForbiddenCharacters > *)0), beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(sUNO_Prop_AutomContFocus ),      WID_MODEL_CONTFOCUS,          &::getBooleanCppuType(),                                                 0, 0},
+        { MAP_CHAR_LEN(sUNO_Prop_ApplyFrmDsgnMode),     WID_MODEL_DSGNMODE,           &::getBooleanCppuType(),                                                 0, 0},
+        { MAP_CHAR_LEN("BasicLibraries"),               WID_MODEL_BASICLIBS,          &::getCppuType((const uno::Reference< script::XLibraryContainer > *)0),  beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("DialogLibraries"),              WID_MODEL_DIALOGLIBS,         &::getCppuType((const uno::Reference< script::XLibraryContainer > *)0),  beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(sUNO_Prop_RuntimeUID),           WID_MODEL_RUNTIMEUID,         &::getCppuType(static_cast< const OUString * >(0)),                      beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN(sUNO_Prop_HasValidSignatures),   WID_MODEL_HASVALIDSIGNATURES, &::getCppuType(static_cast< const sal_Bool * >(0)),                      beans::PropertyAttribute::READONLY, 0},
+        { MAP_CHAR_LEN("Fonts"),                        WID_MODEL_FONTS,              SEQTYPE(::getCppuType((uno::Sequence<uno::Any>*)0)),                     beans::PropertyAttribute::READONLY, 0},
         { MAP_CHAR_LEN(sUNO_Prop_InteropGrabBag),       WID_MODEL_INTEROPGRABBAG,     SEQTYPE(::getCppuType((uno::Sequence< beans::PropertyValue >*)0)),       0, 0},
         { 0,0,0,0,0,0 }
     };
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index c7d7dcb..4224e3e 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -182,38 +182,38 @@ void SAL_CALL SfxDocInfoListener_Impl::disposing( const lang::EventObject& )
 struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument
 {
     // counter for SfxBaseModel instances created.
-    static sal_Int64                                        g_nInstanceCounter      ;
-    SfxObjectShellRef                                       m_pObjectShell          ;
-    OUString                                         m_sURL                  ;
-    OUString                                         m_sRuntimeUID           ;
-    OUString                                         m_aPreusedFilterName;
-    ::cppu::OMultiTypeInterfaceContainerHelper              m_aInterfaceContainer   ;
-    Reference< XInterface >                       m_xParent               ;
-    Reference< frame::XController >                    m_xCurrent              ;
-    Reference< document::XDocumentProperties >         m_xDocumentProperties;
-    Reference< script::XStarBasicAccess >              m_xStarBasicAccess      ;
-    Reference< container::XNameReplace >               m_xEvents               ;
-    Sequence< beans::PropertyValue>                    m_seqArguments          ;
-    Sequence< Reference< frame::XController > >   m_seqControllers        ;
-    Reference< container::XIndexAccess >               m_contViewData          ;
-    sal_uInt16                                              m_nControllerLockCount  ;
-    sal_Bool                                                m_bClosed               ;
-    sal_Bool                                                m_bClosing              ;
-    sal_Bool                                                m_bSaving               ;
-    sal_Bool                                                m_bSuicide              ;
-    sal_Bool                                                m_bInitialized          ;
-    sal_Bool                                                m_bExternalTitle        ;
-    sal_Bool                                                m_bModifiedSinceLastSave;
-    Reference< view::XPrintable>       m_xPrintable            ;
-    Reference< script::provider::XScriptProvider >     m_xScriptProvider;
-    Reference< ui::XUIConfigurationManager2 >          m_xUIConfigurationManager;
-    ::rtl::Reference< ::sfx2::DocumentStorageModifyListener >   m_pStorageModifyListen;
-    OUString                                         m_sModuleIdentifier;
-    Reference< frame::XTitle >               m_xTitleHelper;
-    Reference< frame::XUntitledNumbers >     m_xNumberedControllers;
-    Reference< rdf::XDocumentMetadataAccess>           m_xDocumentMetadata;
-    ::rtl::Reference< ::sfx2::DocumentUndoManager >         m_pDocumentUndoManager;
-    Sequence< document::CmisProperty>                    m_cmisProperties;
+    static sal_Int64                                           g_nInstanceCounter       ;
+    SfxObjectShellRef                                          m_pObjectShell           ;
+    OUString                                                   m_sURL                   ;
+    OUString                                                   m_sRuntimeUID            ;
+    OUString                                                   m_aPreusedFilterName     ;
+    ::cppu::OMultiTypeInterfaceContainerHelper                 m_aInterfaceContainer    ;
+    Reference< XInterface >                                    m_xParent                ;
+    Reference< frame::XController >                            m_xCurrent               ;
+    Reference< document::XDocumentProperties >                 m_xDocumentProperties    ;
+    Reference< script::XStarBasicAccess >                      m_xStarBasicAccess       ;
+    Reference< container::XNameReplace >                       m_xEvents                ;
+    Sequence< beans::PropertyValue>                            m_seqArguments           ;
+    Sequence< Reference< frame::XController > >                m_seqControllers         ;
+    Reference< container::XIndexAccess >                       m_contViewData           ;
+    sal_uInt16                                                 m_nControllerLockCount   ;
+    sal_Bool                                                   m_bClosed                ;
+    sal_Bool                                                   m_bClosing               ;
+    sal_Bool                                                   m_bSaving                ;
+    sal_Bool                                                   m_bSuicide               ;
+    sal_Bool                                                   m_bInitialized           ;
+    sal_Bool                                                   m_bExternalTitle         ;
+    sal_Bool                                                   m_bModifiedSinceLastSave ;
+    Reference< view::XPrintable>                               m_xPrintable             ;
+    Reference< script::provider::XScriptProvider >             m_xScriptProvider        ;
+    Reference< ui::XUIConfigurationManager2 >                  m_xUIConfigurationManager;
+    ::rtl::Reference< ::sfx2::DocumentStorageModifyListener >  m_pStorageModifyListen   ;
+    OUString                                                   m_sModuleIdentifier      ;
+    Reference< frame::XTitle >                                 m_xTitleHelper           ;
+    Reference< frame::XUntitledNumbers >                       m_xNumberedControllers   ;
+    Reference< rdf::XDocumentMetadataAccess>                   m_xDocumentMetadata      ;
+    ::rtl::Reference< ::sfx2::DocumentUndoManager >            m_pDocumentUndoManager   ;
+    Sequence< document::CmisProperty>                          m_cmisProperties         ;
     SfxGrabBagItem*                                            m_pGrabBagItem           ;
 
     IMPL_SfxBaseModel_DataContainer( ::osl::Mutex& rMutex, SfxObjectShell* pObjectShell )
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index c4edfd7..bc802e8 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -244,73 +244,73 @@ static PropertySetInfo * lcl_createModelPropertyInfo ()
 {
     static PropertyMapEntry aModelPropertyInfoMap[] =
     {
-        { RTL_CONSTASCII_STRINGPARAM( "Alignment"                          ), HANDLE_ALIGNMENT                          ,       &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, 0},
-        { RTL_CONSTASCII_STRINGPARAM( "BaseFontHeight"                  ), HANDLE_BASE_FONT_HEIGHT                   ,      &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, 0},
-        { RTL_CONSTASCII_STRINGPARAM( "BasicLibraries"                  ), HANDLE_BASIC_LIBRARIES                   ,      &::getCppuType((const uno::Reference< script::XLibraryContainer > *)0),    PropertyAttribute::READONLY, 0},
-        { RTL_CONSTASCII_STRINGPARAM( "BottomMargin"                      ), HANDLE_BOTTOM_MARGIN                      ,        &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_BOTTOMSPACE             },
-        { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameFixed"            ), HANDLE_CUSTOM_FONT_NAME_FIXED             ,       &::getCppuType((const OUString*)0),     PROPERTY_NONE, FNT_FIXED          },
-        { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameSans"              ), HANDLE_CUSTOM_FONT_NAME_SANS              ,      &::getCppuType((const OUString*)0),     PROPERTY_NONE, FNT_SANS        },
-        { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameSerif"             ), HANDLE_CUSTOM_FONT_NAME_SERIF             ,      &::getCppuType((const OUString*)0),     PROPERTY_NONE, FNT_SERIF          },
-        { RTL_CONSTASCII_STRINGPARAM( "DialogLibraries"                 ), HANDLE_DIALOG_LIBRARIES                   ,      &::getCppuType((const uno::Reference< script::XLibraryContainer > *)0),    PropertyAttribute::READONLY, 0},
-        { RTL_CONSTASCII_STRINGPARAM( "FontFixedIsBold"),     HANDLE_CUSTOM_FONT_FIXED_WEIGHT    ,  &::getBooleanCppuType(),  PROPERTY_NONE, FNT_FIXED},
-        { RTL_CONSTASCII_STRINGPARAM( "FontFixedIsItalic"), HANDLE_CUSTOM_FONT_FIXED_POSTURE   ,  &::getBooleanCppuType(),  PROPERTY_NONE, FNT_FIXED},
-        { RTL_CONSTASCII_STRINGPARAM( "FontFunctionsIsBold"),    HANDLE_FONT_FUNCTIONS_WEIGHT    ,  &::getBooleanCppuType(),            PROPERTY_NONE, FNT_FUNCTION},
-        { RTL_CONSTASCII_STRINGPARAM( "FontFunctionsIsItalic"),   HANDLE_FONT_FUNCTIONS_POSTURE   ,  &::getBooleanCppuType(),  PROPERTY_NONE, FNT_FUNCTION},
-        { RTL_CONSTASCII_STRINGPARAM( "FontNameFunctions"                ), HANDLE_FONT_NAME_FUNCTIONS                ,         &::getCppuType((const OUString*)0),     PROPERTY_NONE, FNT_FUNCTION },
-        { RTL_CONSTASCII_STRINGPARAM( "FontNameNumbers"                  ), HANDLE_FONT_NAME_NUMBERS                  ,         &::getCppuType((const OUString*)0),     PROPERTY_NONE, FNT_NUMBER        },
-        { RTL_CONSTASCII_STRINGPARAM( "FontNameText"                     ), HANDLE_FONT_NAME_TEXT                     ,         &::getCppuType((const OUString*)0),     PROPERTY_NONE, FNT_TEXT        },
-        { RTL_CONSTASCII_STRINGPARAM( "FontNameVariables"                ), HANDLE_FONT_NAME_VARIABLES                ,         &::getCppuType((const OUString*)0),     PROPERTY_NONE, FNT_VARIABLE },
-        { RTL_CONSTASCII_STRINGPARAM( "FontNumbersIsBold"),  HANDLE_FONT_NUMBERS_WEIGHT    ,  &::getBooleanCppuType(),              PROPERTY_NONE, FNT_NUMBER},
-        { RTL_CONSTASCII_STRINGPARAM( "FontNumbersIsItalic"),   HANDLE_FONT_NUMBERS_POSTURE   ,  &::getBooleanCppuType(),  PROPERTY_NONE, FNT_NUMBER},
-        { RTL_CONSTASCII_STRINGPARAM( "FontSansIsBold"),     HANDLE_CUSTOM_FONT_SANS_WEIGHT    ,  &::getBooleanCppuType(),              PROPERTY_NONE, FNT_SANS},
-        { RTL_CONSTASCII_STRINGPARAM( "FontSansIsItalic"),   HANDLE_CUSTOM_FONT_SANS_POSTURE   ,  &::getBooleanCppuType(),  PROPERTY_NONE, FNT_SANS},
-        { RTL_CONSTASCII_STRINGPARAM( "FontSerifIsBold"),    HANDLE_CUSTOM_FONT_SERIF_WEIGHT    ,  &::getBooleanCppuType(),             PROPERTY_NONE,  FNT_SERIF},
-        { RTL_CONSTASCII_STRINGPARAM( "FontSerifIsItalic"),   HANDLE_CUSTOM_FONT_SERIF_POSTURE   ,  &::getBooleanCppuType(),  PROPERTY_NONE, FNT_SERIF},
-        { RTL_CONSTASCII_STRINGPARAM( "FontTextIsBold"),     HANDLE_FONT_TEXT_WEIGHT    ,  &::getBooleanCppuType(),             PROPERTY_NONE, FNT_TEXT},
-        { RTL_CONSTASCII_STRINGPARAM( "FontTextIsItalic"),   HANDLE_FONT_TEXT_POSTURE   ,  &::getBooleanCppuType(),  PROPERTY_NONE, FNT_TEXT},
-        { RTL_CONSTASCII_STRINGPARAM( "FontVariablesIsBold"),    HANDLE_FONT_VARIABLES_WEIGHT    ,  &::getBooleanCppuType(),            PROPERTY_NONE, FNT_VARIABLE},
-        { RTL_CONSTASCII_STRINGPARAM( "FontVariablesIsItalic"),   HANDLE_FONT_VARIABLES_POSTURE,  &::getBooleanCppuType(),  PROPERTY_NONE, FNT_VARIABLE},
-        { RTL_CONSTASCII_STRINGPARAM( "Formula"                           ),    HANDLE_FORMULA                             ,        &::getCppuType((const OUString*)0),     PROPERTY_NONE, 0},
-        { RTL_CONSTASCII_STRINGPARAM( "IsScaleAllBrackets"              ), HANDLE_IS_SCALE_ALL_BRACKETS              ,      &::getBooleanCppuType(),    PROPERTY_NONE, 0},
-        { RTL_CONSTASCII_STRINGPARAM( "IsTextMode"                       ), HANDLE_IS_TEXT_MODE                       ,         &::getBooleanCppuType(),    PROPERTY_NONE, 0},
-        { RTL_CONSTASCII_STRINGPARAM( "GreekCharStyle" ),                   HANDLE_GREEK_CHAR_STYLE,    &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, 0},
-        { RTL_CONSTASCII_STRINGPARAM( "LeftMargin"                        ), HANDLE_LEFT_MARGIN                        ,        &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_LEFTSPACE                 },
-        { RTL_CONSTASCII_STRINGPARAM( "PrinterName"                    ), HANDLE_PRINTER_NAME                        ,      &::getCppuType((const OUString*)0),     PROPERTY_NONE, 0                  },
-        { RTL_CONSTASCII_STRINGPARAM( "PrinterSetup"                       ), HANDLE_PRINTER_SETUP                       ,      &::getCppuType((const Sequence < sal_Int8 >*)0),    PROPERTY_NONE, 0                  },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeBracketDistance"          ), HANDLE_RELATIVE_BRACKET_DISTANCE          ,         &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_BRACKETSPACE },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeBracketExcessSize"       ), HANDLE_RELATIVE_BRACKET_EXCESS_SIZE       ,      &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_BRACKETSIZE  },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightFunctions"     ), HANDLE_RELATIVE_FONT_HEIGHT_FUNCTIONS     ,      &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, SIZ_FUNCTION},
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightIndices"       ), HANDLE_RELATIVE_FONT_HEIGHT_INDICES       ,      &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, SIZ_INDEX      },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightLimits"        ), HANDLE_RELATIVE_FONT_HEIGHT_LIMITS        ,      &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, SIZ_LIMITS    },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightOperators"     ), HANDLE_RELATIVE_FONT_HEIGHT_OPERATORS     ,      &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, SIZ_OPERATOR},
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightText"            ), HANDLE_RELATIVE_FONT_HEIGHT_TEXT          ,        &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, SIZ_TEXT   },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionBarExcessLength"), HANDLE_RELATIVE_FRACTION_BAR_EXCESS_LENGTH,       &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_FRACTION        },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionBarLineWeight"  ), HANDLE_RELATIVE_FRACTION_BAR_LINE_WEIGHT  ,       &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_STROKEWIDTH  },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionDenominatorDepth"), HANDLE_RELATIVE_FRACTION_DENOMINATOR_DEPTH,      &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_DENOMINATOR  },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionNumeratorHeight" ), HANDLE_RELATIVE_FRACTION_NUMERATOR_HEIGHT ,      &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_NUMERATOR          },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeIndexSubscript"           ), HANDLE_RELATIVE_INDEX_SUBSCRIPT           ,         &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_SUBSCRIPT          },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeIndexSuperscript"         ), HANDLE_RELATIVE_INDEX_SUPERSCRIPT         ,         &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_SUPERSCRIPT  },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeLineSpacing"              ), HANDLE_RELATIVE_LINE_SPACING              ,         &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_VERTICAL        },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeLowerLimitDistance"      ), HANDLE_RELATIVE_LOWER_LIMIT_DISTANCE      ,      &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_LOWERLIMIT        },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeMatrixColumnSpacing"     ), HANDLE_RELATIVE_MATRIX_COLUMN_SPACING     ,      &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_MATRIXCOL},
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeMatrixLineSpacing"       ), HANDLE_RELATIVE_MATRIX_LINE_SPACING       ,      &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_MATRIXROW},
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeOperatorExcessSize"      ), HANDLE_RELATIVE_OPERATOR_EXCESS_SIZE      ,      &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_OPERATORSIZE        },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeOperatorSpacing"          ), HANDLE_RELATIVE_OPERATOR_SPACING          ,         &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_OPERATORSPACE},
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeRootSpacing"              ), HANDLE_RELATIVE_ROOT_SPACING              ,         &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_ROOT               },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeScaleBracketExcessSize" ), HANDLE_RELATIVE_SCALE_BRACKET_EXCESS_SIZE ,       &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_NORMALBRACKETSIZE},
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeSpacing"                   ), HANDLE_RELATIVE_SPACING                   ,        &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_HORIZONTAL        },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeSymbolMinimumHeight"     ), HANDLE_RELATIVE_SYMBOL_MINIMUM_HEIGHT     ,      &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_ORNAMENTSPACE         },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeSymbolPrimaryHeight"     ), HANDLE_RELATIVE_SYMBOL_PRIMARY_HEIGHT     ,      &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_ORNAMENTSIZE        },
-        { RTL_CONSTASCII_STRINGPARAM( "RelativeUpperLimitDistance"      ),  HANDLE_RELATIVE_UPPER_LIMIT_DISTANCE     ,      &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_UPPERLIMIT        },
-        { RTL_CONSTASCII_STRINGPARAM( "RightMargin"                       ),    HANDLE_RIGHT_MARGIN                  ,      &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_RIGHTSPACE               },
-        { RTL_CONSTASCII_STRINGPARAM( "RuntimeUID"                      ), HANDLE_RUNTIME_UID                        ,      &::getCppuType(static_cast< const OUString * >(0)),    PropertyAttribute::READONLY, 0 },
-        { RTL_CONSTASCII_STRINGPARAM( "Symbols"                       ),        HANDLE_SYMBOLS                       ,      &::getCppuType((const Sequence < SymbolDescriptor > *)0),   PROPERTY_NONE, 0  },
-        { RTL_CONSTASCII_STRINGPARAM( "UserDefinedSymbolsInUse"       ),        HANDLE_USED_SYMBOLS                  ,      &::getCppuType((const Sequence < SymbolDescriptor > *)0),   PropertyAttribute::READONLY, 0  },
-        { RTL_CONSTASCII_STRINGPARAM( "TopMargin"                         ),    HANDLE_TOP_MARGIN                    ,      &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_TOPSPACE               },
+        { RTL_CONSTASCII_STRINGPARAM( "Alignment"                        ), HANDLE_ALIGNMENT                          ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "BaseFontHeight"                   ), HANDLE_BASE_FONT_HEIGHT                   ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "BasicLibraries"                   ), HANDLE_BASIC_LIBRARIES                    ,  &::getCppuType((const uno::Reference< script::XLibraryContainer > *)0),  PropertyAttribute::READONLY,  0       },
+        { RTL_CONSTASCII_STRINGPARAM( "BottomMargin"                     ), HANDLE_BOTTOM_MARGIN                      ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_BOTTOMSPACE       },
+        { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameFixed"              ), HANDLE_CUSTOM_FONT_NAME_FIXED             ,  &::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_FIXED             },
+        { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameSans"               ), HANDLE_CUSTOM_FONT_NAME_SANS              ,  &::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_SANS              },
+        { RTL_CONSTASCII_STRINGPARAM( "CustomFontNameSerif"              ), HANDLE_CUSTOM_FONT_NAME_SERIF             ,  &::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_SERIF             },
+        { RTL_CONSTASCII_STRINGPARAM( "DialogLibraries"                  ), HANDLE_DIALOG_LIBRARIES                   ,  &::getCppuType((const uno::Reference< script::XLibraryContainer > *)0),  PropertyAttribute::READONLY,  0       },
+        { RTL_CONSTASCII_STRINGPARAM( "FontFixedIsBold"                  ), HANDLE_CUSTOM_FONT_FIXED_WEIGHT           ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_FIXED             },
+        { RTL_CONSTASCII_STRINGPARAM( "FontFixedIsItalic"                ), HANDLE_CUSTOM_FONT_FIXED_POSTURE          ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_FIXED             },
+        { RTL_CONSTASCII_STRINGPARAM( "FontFunctionsIsBold"              ), HANDLE_FONT_FUNCTIONS_WEIGHT              ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_FUNCTION          },
+        { RTL_CONSTASCII_STRINGPARAM( "FontFunctionsIsItalic"            ), HANDLE_FONT_FUNCTIONS_POSTURE             ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_FUNCTION          },
+        { RTL_CONSTASCII_STRINGPARAM( "FontNameFunctions"                ), HANDLE_FONT_NAME_FUNCTIONS                ,  &::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_FUNCTION          },
+        { RTL_CONSTASCII_STRINGPARAM( "FontNameNumbers"                  ), HANDLE_FONT_NAME_NUMBERS                  ,  &::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_NUMBER            },
+        { RTL_CONSTASCII_STRINGPARAM( "FontNameText"                     ), HANDLE_FONT_NAME_TEXT                     ,  &::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_TEXT              },
+        { RTL_CONSTASCII_STRINGPARAM( "FontNameVariables"                ), HANDLE_FONT_NAME_VARIABLES                ,  &::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  FNT_VARIABLE          },
+        { RTL_CONSTASCII_STRINGPARAM( "FontNumbersIsBold"                ), HANDLE_FONT_NUMBERS_WEIGHT                ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_NUMBER            },
+        { RTL_CONSTASCII_STRINGPARAM( "FontNumbersIsItalic"              ), HANDLE_FONT_NUMBERS_POSTURE               ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_NUMBER            },
+        { RTL_CONSTASCII_STRINGPARAM( "FontSansIsBold"                   ), HANDLE_CUSTOM_FONT_SANS_WEIGHT            ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_SANS              },
+        { RTL_CONSTASCII_STRINGPARAM( "FontSansIsItalic"                 ), HANDLE_CUSTOM_FONT_SANS_POSTURE           ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_SANS              },
+        { RTL_CONSTASCII_STRINGPARAM( "FontSerifIsBold"                  ), HANDLE_CUSTOM_FONT_SERIF_WEIGHT           ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_SERIF             },
+        { RTL_CONSTASCII_STRINGPARAM( "FontSerifIsItalic"                ), HANDLE_CUSTOM_FONT_SERIF_POSTURE          ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_SERIF             },
+        { RTL_CONSTASCII_STRINGPARAM( "FontTextIsBold"                   ), HANDLE_FONT_TEXT_WEIGHT                   ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_TEXT              },
+        { RTL_CONSTASCII_STRINGPARAM( "FontTextIsItalic"                 ), HANDLE_FONT_TEXT_POSTURE                  ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_TEXT              },
+        { RTL_CONSTASCII_STRINGPARAM( "FontVariablesIsBold"              ), HANDLE_FONT_VARIABLES_WEIGHT              ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_VARIABLE          },
+        { RTL_CONSTASCII_STRINGPARAM( "FontVariablesIsItalic"            ), HANDLE_FONT_VARIABLES_POSTURE             ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  FNT_VARIABLE          },
+        { RTL_CONSTASCII_STRINGPARAM( "Formula"                          ), HANDLE_FORMULA                            ,  &::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "IsScaleAllBrackets"               ), HANDLE_IS_SCALE_ALL_BRACKETS              ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "IsTextMode"                       ), HANDLE_IS_TEXT_MODE                       ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "GreekCharStyle"                   ), HANDLE_GREEK_CHAR_STYLE                   ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "LeftMargin"                       ), HANDLE_LEFT_MARGIN                        ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_LEFTSPACE         },
+        { RTL_CONSTASCII_STRINGPARAM( "PrinterName"                      ), HANDLE_PRINTER_NAME                       ,  &::getCppuType((const OUString*)0),                                      PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "PrinterSetup"                     ), HANDLE_PRINTER_SETUP                      ,  &::getCppuType((const Sequence < sal_Int8 >*)0),                         PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeBracketDistance"          ), HANDLE_RELATIVE_BRACKET_DISTANCE          ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_BRACKETSPACE      },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeBracketExcessSize"        ), HANDLE_RELATIVE_BRACKET_EXCESS_SIZE       ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_BRACKETSIZE       },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightFunctions"      ), HANDLE_RELATIVE_FONT_HEIGHT_FUNCTIONS     ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_FUNCTION          },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightIndices"        ), HANDLE_RELATIVE_FONT_HEIGHT_INDICES       ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_INDEX             },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightLimits"         ), HANDLE_RELATIVE_FONT_HEIGHT_LIMITS        ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_LIMITS            },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightOperators"      ), HANDLE_RELATIVE_FONT_HEIGHT_OPERATORS     ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_OPERATOR          },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeFontHeightText"           ), HANDLE_RELATIVE_FONT_HEIGHT_TEXT          ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  SIZ_TEXT              },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionBarExcessLength"  ), HANDLE_RELATIVE_FRACTION_BAR_EXCESS_LENGTH,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_FRACTION          },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionBarLineWeight"    ), HANDLE_RELATIVE_FRACTION_BAR_LINE_WEIGHT  ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_STROKEWIDTH       },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionDenominatorDepth" ), HANDLE_RELATIVE_FRACTION_DENOMINATOR_DEPTH,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_DENOMINATOR       },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeFractionNumeratorHeight"  ), HANDLE_RELATIVE_FRACTION_NUMERATOR_HEIGHT ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_NUMERATOR         },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeIndexSubscript"           ), HANDLE_RELATIVE_INDEX_SUBSCRIPT           ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_SUBSCRIPT         },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeIndexSuperscript"         ), HANDLE_RELATIVE_INDEX_SUPERSCRIPT         ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_SUPERSCRIPT       },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeLineSpacing"              ), HANDLE_RELATIVE_LINE_SPACING              ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_VERTICAL          },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeLowerLimitDistance"       ), HANDLE_RELATIVE_LOWER_LIMIT_DISTANCE      ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_LOWERLIMIT        },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeMatrixColumnSpacing"      ), HANDLE_RELATIVE_MATRIX_COLUMN_SPACING     ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_MATRIXCOL         },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeMatrixLineSpacing"        ), HANDLE_RELATIVE_MATRIX_LINE_SPACING       ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_MATRIXROW         },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeOperatorExcessSize"       ), HANDLE_RELATIVE_OPERATOR_EXCESS_SIZE      ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_OPERATORSIZE      },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeOperatorSpacing"          ), HANDLE_RELATIVE_OPERATOR_SPACING          ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_OPERATORSPACE     },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeRootSpacing"              ), HANDLE_RELATIVE_ROOT_SPACING              ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_ROOT              },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeScaleBracketExcessSize"   ), HANDLE_RELATIVE_SCALE_BRACKET_EXCESS_SIZE ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_NORMALBRACKETSIZE },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeSpacing"                  ), HANDLE_RELATIVE_SPACING                   ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_HORIZONTAL        },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeSymbolMinimumHeight"      ), HANDLE_RELATIVE_SYMBOL_MINIMUM_HEIGHT     ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_ORNAMENTSPACE     },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeSymbolPrimaryHeight"      ), HANDLE_RELATIVE_SYMBOL_PRIMARY_HEIGHT     ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_ORNAMENTSIZE      },
+        { RTL_CONSTASCII_STRINGPARAM( "RelativeUpperLimitDistance"       ), HANDLE_RELATIVE_UPPER_LIMIT_DISTANCE      ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_UPPERLIMIT        },
+        { RTL_CONSTASCII_STRINGPARAM( "RightMargin"                      ), HANDLE_RIGHT_MARGIN                       ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_RIGHTSPACE        },
+        { RTL_CONSTASCII_STRINGPARAM( "RuntimeUID"                       ), HANDLE_RUNTIME_UID                        ,  &::getCppuType(static_cast< const OUString * >(0)),                      PropertyAttribute::READONLY,  0       },
+        { RTL_CONSTASCII_STRINGPARAM( "Symbols"                          ), HANDLE_SYMBOLS                            ,  &::getCppuType((const Sequence < SymbolDescriptor > *)0),                PROPERTY_NONE,  0                     },
+        { RTL_CONSTASCII_STRINGPARAM( "UserDefinedSymbolsInUse"          ), HANDLE_USED_SYMBOLS                       ,  &::getCppuType((const Sequence < SymbolDescriptor > *)0),                PropertyAttribute::READONLY,  0       },
+        { RTL_CONSTASCII_STRINGPARAM( "TopMargin"                        ), HANDLE_TOP_MARGIN                         ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  DIS_TOPSPACE          },
         // #i33095# Security Options
-        { RTL_CONSTASCII_STRINGPARAM( "LoadReadonly" ), HANDLE_LOAD_READONLY, &::getBooleanCppuType(), PROPERTY_NONE, 0 },
+        { RTL_CONSTASCII_STRINGPARAM( "LoadReadonly"                     ), HANDLE_LOAD_READONLY                      ,  &::getBooleanCppuType(),                                                 PROPERTY_NONE,  0                     },
         // #i972#
-        { RTL_CONSTASCII_STRINGPARAM( "BaseLine"), HANDLE_BASELINE, &::getCppuType((const sal_Int16*)0), PROPERTY_NONE, 0},
+        { RTL_CONSTASCII_STRINGPARAM( "BaseLine"                         ), HANDLE_BASELINE                           ,  &::getCppuType((const sal_Int16*)0),                                     PROPERTY_NONE,  0                     },
         { RTL_CONSTASCII_STRINGPARAM( "InteropGrabBag"                   ), HANDLE_INTEROP_GRAB_BAG                   ,  SEQTYPE(::getCppuType((uno::Sequence< beans::PropertyValue >*)0)),       PROPERTY_NONE,  0                     },
         { NULL, 0, 0, NULL, 0, 0 }
     };
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index 9658b52..6c4c3c9 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -145,108 +145,108 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider()
 // UNO_NAME_BREAK_TYPE and UNO_NAME_PAGE_DESC_NAME which can not be used
 // by the SwXTextTableCursor
 #define COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN_01 \
-        { SW_PROP_NMID(UNO_NAME_PARRSID), RES_PARATR_RSID, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, 0 }, \
-        { SW_PROP_NMID(UNO_NAME_PARA_IS_HYPHENATION), RES_PARATR_HYPHENZONE,        CPPU_E2T(CPPUTYPE_BOOLEAN),     PropertyAttribute::MAYBEVOID, MID_IS_HYPHEN         },                                        \
-        { SW_PROP_NMID(UNO_NAME_PARA_HYPHENATION_MAX_LEADING_CHARS), RES_PARATR_HYPHENZONE,         CPPU_E2T(CPPUTYPE_INT16),   PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_LEAD   },                              \
-        { SW_PROP_NMID(UNO_NAME_PARA_HYPHENATION_MAX_TRAILING_CHARS), RES_PARATR_HYPHENZONE,        CPPU_E2T(CPPUTYPE_INT16),   PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_TRAIL  },                              \
-        { SW_PROP_NMID(UNO_NAME_PARA_HYPHENATION_MAX_HYPHENS), RES_PARATR_HYPHENZONE,       CPPU_E2T(CPPUTYPE_INT16),   PropertyAttribute::MAYBEVOID, MID_HYPHEN_MAX_HYPHENS},                              \
-        { SW_PROP_NMID(UNO_NAME_CHAR_AUTO_KERNING), RES_CHRATR_AUTOKERN  ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PropertyAttribute::MAYBEVOID,     0},                                                                 \
-        { SW_PROP_NMID(UNO_NAME_CHAR_BACK_COLOR), RES_CHRATR_BACKGROUND,    CPPU_E2T(CPPUTYPE_INT32),           PropertyAttribute::MAYBEVOID ,MID_BACK_COLOR         },                                           \
-        { SW_PROP_NMID(UNO_NAME_PARA_BACK_COLOR), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_INT32),           PropertyAttribute::MAYBEVOID ,MID_BACK_COLOR         },                                           \
-        { SW_PROP_NMID(UNO_NAME_CHAR_CASE_MAP), RES_CHRATR_CASEMAP,     CPPU_E2T(CPPUTYPE_INT16),           PropertyAttribute::MAYBEVOID, 0},                                                            \
-        { SW_PROP_NMID(UNO_NAME_CHAR_COLOR), RES_CHRATR_COLOR,      CPPU_E2T(CPPUTYPE_INT32),           PropertyAttribute::MAYBEVOID, 0},                                                           \
-        { SW_PROP_NMID(UNO_NAME_CHAR_STRIKEOUT), RES_CHRATR_CROSSEDOUT,  CPPU_E2T(CPPUTYPE_INT16),                  PropertyAttribute::MAYBEVOID, MID_CROSS_OUT},                                              \
-        { SW_PROP_NMID(UNO_NAME_CHAR_CROSSED_OUT), RES_CHRATR_CROSSEDOUT,  CPPU_E2T(CPPUTYPE_BOOLEAN)  ,        PropertyAttribute::MAYBEVOID, MID_CROSSED_OUT},                                                       \
-        { SW_PROP_NMID(UNO_NAME_CHAR_ESCAPEMENT), RES_CHRATR_ESCAPEMENT,  CPPU_E2T(CPPUTYPE_INT16),             PropertyAttribute::MAYBEVOID, MID_ESC           },                                                   \
-        { SW_PROP_NMID(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT), RES_CHRATR_ESCAPEMENT,     CPPU_E2T(CPPUTYPE_INT8)  ,          PropertyAttribute::MAYBEVOID, MID_ESC_HEIGHT},                                               \
-        { SW_PROP_NMID(UNO_NAME_CHAR_AUTO_ESCAPEMENT), RES_CHRATR_ESCAPEMENT,  CPPU_E2T(CPPUTYPE_BOOLEAN)  ,            PropertyAttribute::MAYBEVOID, MID_AUTO_ESC  },                                                \
-        { SW_PROP_NMID(UNO_NAME_CHAR_FLASH), RES_CHRATR_BLINK   ,   CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PropertyAttribute::MAYBEVOID,     0},                                                                 \
-        { SW_PROP_NMID(UNO_NAME_CHAR_HIDDEN), RES_CHRATR_HIDDEN, CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PropertyAttribute::MAYBEVOID,     0},\
-        { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE), RES_CHRATR_UNDERLINE ,  CPPU_E2T(CPPUTYPE_INT16),              PropertyAttribute::MAYBEVOID, MID_TL_STYLE},                                                \
-        { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE_COLOR), RES_CHRATR_UNDERLINE ,  CPPU_E2T(CPPUTYPE_INT32),            PropertyAttribute::MAYBEVOID, MID_TL_COLOR},                                                \
-        { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE_HAS_COLOR), RES_CHRATR_UNDERLINE ,  CPPU_E2T(CPPUTYPE_BOOLEAN),              PropertyAttribute::MAYBEVOID, MID_TL_HASCOLOR},                                                \
-        { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE), RES_CHRATR_OVERLINE ,  CPPU_E2T(CPPUTYPE_INT16),              PropertyAttribute::MAYBEVOID, MID_TL_STYLE},                                                \
-        { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE_COLOR), RES_CHRATR_OVERLINE ,  CPPU_E2T(CPPUTYPE_INT32),            PropertyAttribute::MAYBEVOID, MID_TL_COLOR},                                                \
-        { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE_HAS_COLOR), RES_CHRATR_OVERLINE ,  CPPU_E2T(CPPUTYPE_BOOLEAN),              PropertyAttribute::MAYBEVOID, MID_TL_HASCOLOR},                                                \
-        { SW_PROP_NMID(UNO_NAME_PARA_GRAPHIC_URL), RES_BACKGROUND,      CPPU_E2T(CPPUTYPE_OUSTRING),        PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_URL    },                                          \
-        { SW_PROP_NMID(UNO_NAME_PARA_GRAPHIC_FILTER), RES_BACKGROUND,       CPPU_E2T(CPPUTYPE_OUSTRING),        PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_FILTER    },                                       \
-        { SW_PROP_NMID(UNO_NAME_PARA_GRAPHIC_LOCATION), RES_BACKGROUND,         CPPU_E2T(CPPUTYPE_GRAPHICLOC), PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_POSITION},                                \
-        { SW_PROP_NMID(UNO_NAME_PARA_LEFT_MARGIN), RES_LR_SPACE,            CPPU_E2T(CPPUTYPE_INT32),           PropertyAttribute::MAYBEVOID, MID_TXT_LMARGIN|CONVERT_TWIPS},                                   \
-        { SW_PROP_NMID(UNO_NAME_PARA_RIGHT_MARGIN), RES_LR_SPACE,           CPPU_E2T(CPPUTYPE_INT32),           PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS},                                  \
-        { SW_PROP_NMID(UNO_NAME_PARA_IS_AUTO_FIRST_LINE_INDENT), RES_LR_SPACE,           CPPU_E2T(CPPUTYPE_BOOLEAN),      PropertyAttribute::MAYBEVOID, MID_FIRST_AUTO},                                      \
-        { SW_PROP_NMID(UNO_NAME_PARA_FIRST_LINE_INDENT), RES_LR_SPACE,           CPPU_E2T(CPPUTYPE_INT32),      PropertyAttribute::MAYBEVOID, MID_FIRST_LINE_INDENT|CONVERT_TWIPS},                         \
+        { SW_PROP_NMID(UNO_NAME_PARRSID),                             RES_PARATR_RSID,               CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_IS_HYPHENATION),                 RES_PARATR_HYPHENZONE,         CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, MID_IS_HYPHEN                          }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_HYPHENATION_MAX_LEADING_CHARS),  RES_PARATR_HYPHENZONE,         CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_LEAD                    }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_HYPHENATION_MAX_TRAILING_CHARS), RES_PARATR_HYPHENZONE,         CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, MID_HYPHEN_MIN_TRAIL                   }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_HYPHENATION_MAX_HYPHENS),        RES_PARATR_HYPHENZONE,         CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, MID_HYPHEN_MAX_HYPHENS                 }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_AUTO_KERNING),                   RES_CHRATR_AUTOKERN,           CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_BACK_COLOR),                     RES_CHRATR_BACKGROUND,         CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, MID_BACK_COLOR                         }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_BACK_COLOR),                     RES_BACKGROUND,                CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, MID_BACK_COLOR                         }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_CASE_MAP),                       RES_CHRATR_CASEMAP,            CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_COLOR),                          RES_CHRATR_COLOR,              CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_STRIKEOUT),                      RES_CHRATR_CROSSEDOUT,         CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, MID_CROSS_OUT                          }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_CROSSED_OUT),                    RES_CHRATR_CROSSEDOUT,         CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, MID_CROSSED_OUT                        }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_ESCAPEMENT),                     RES_CHRATR_ESCAPEMENT,         CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, MID_ESC                                }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_ESCAPEMENT_HEIGHT),              RES_CHRATR_ESCAPEMENT,         CPPU_E2T(CPPUTYPE_INT8),          PropertyAttribute::MAYBEVOID, MID_ESC_HEIGHT                         }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_AUTO_ESCAPEMENT),                RES_CHRATR_ESCAPEMENT,         CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, MID_AUTO_ESC                           }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_FLASH),                          RES_CHRATR_BLINK,              CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_HIDDEN),                         RES_CHRATR_HIDDEN,             CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE),                      RES_CHRATR_UNDERLINE,          CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, MID_TL_STYLE                           }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE_COLOR),                RES_CHRATR_UNDERLINE,          CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, MID_TL_COLOR                           }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_UNDERLINE_HAS_COLOR),            RES_CHRATR_UNDERLINE,          CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, MID_TL_HASCOLOR                        }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE),                       RES_CHRATR_OVERLINE,           CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, MID_TL_STYLE                           }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE_COLOR),                 RES_CHRATR_OVERLINE,           CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, MID_TL_COLOR                           }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_OVERLINE_HAS_COLOR),             RES_CHRATR_OVERLINE,           CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, MID_TL_HASCOLOR                        }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_GRAPHIC_URL),                    RES_BACKGROUND,                CPPU_E2T(CPPUTYPE_OUSTRING),      PropertyAttribute::MAYBEVOID, MID_GRAPHIC_URL                        }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_GRAPHIC_FILTER),                 RES_BACKGROUND,                CPPU_E2T(CPPUTYPE_OUSTRING),      PropertyAttribute::MAYBEVOID, MID_GRAPHIC_FILTER                     }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_GRAPHIC_LOCATION),               RES_BACKGROUND,                CPPU_E2T(CPPUTYPE_GRAPHICLOC),    PropertyAttribute::MAYBEVOID, MID_GRAPHIC_POSITION                   }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_LEFT_MARGIN),                    RES_LR_SPACE,                  CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, MID_TXT_LMARGIN        | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_RIGHT_MARGIN),                   RES_LR_SPACE,                  CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, MID_R_MARGIN           | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_IS_AUTO_FIRST_LINE_INDENT),      RES_LR_SPACE,                  CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, MID_FIRST_AUTO                         }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_FIRST_LINE_INDENT),              RES_LR_SPACE,                  CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, MID_FIRST_LINE_INDENT  | CONVERT_TWIPS }, \
         _STANDARD_FONT_PROPERTIES \
         _CJK_FONT_PROPERTIES \
         _CTL_FONT_PROPERTIES \
-        { SW_PROP_NMID(UNO_NAME_CHAR_KERNING), RES_CHRATR_KERNING    ,  CPPU_E2T(CPPUTYPE_INT16)  ,         PropertyAttribute::MAYBEVOID,   CONVERT_TWIPS},                                                           \
-        { SW_PROP_NMID(UNO_NAME_CHAR_NO_HYPHENATION), RES_CHRATR_NOHYPHEN   ,   CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PropertyAttribute::MAYBEVOID,     0},                                                                 \
-        { SW_PROP_NMID(UNO_NAME_CHAR_SHADOWED), RES_CHRATR_SHADOWED  ,  CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PropertyAttribute::MAYBEVOID, 0},                                                                     \
-        { SW_PROP_NMID(UNO_NAME_CHAR_CONTOURED), RES_CHRATR_CONTOUR,    CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PropertyAttribute::MAYBEVOID, 0},                                                                 \
-        { SW_PROP_NMID(UNO_NAME_DROP_CAP_FORMAT), RES_PARATR_DROP,        CPPU_E2T(CPPUTYPE_DROPCAPFMT)  , PropertyAttribute::MAYBEVOID, MID_DROPCAP_FORMAT|CONVERT_TWIPS},                        \
-        { SW_PROP_NMID(UNO_NAME_DROP_CAP_WHOLE_WORD), RES_PARATR_DROP,        CPPU_E2T(CPPUTYPE_BOOLEAN)  ,         PropertyAttribute::MAYBEVOID, MID_DROPCAP_WHOLE_WORD },                                               \
-        { SW_PROP_NMID(UNO_NAME_DROP_CAP_CHAR_STYLE_NAME), RES_PARATR_DROP,        CPPU_E2T(CPPUTYPE_OUSTRING)  ,       PropertyAttribute::MAYBEVOID, MID_DROPCAP_CHAR_STYLE_NAME },                                  \
-        { SW_PROP_NMID(UNO_NAME_PARA_KEEP_TOGETHER), RES_KEEP,              CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PropertyAttribute::MAYBEVOID,     0},                                                                 \
-        { SW_PROP_NMID(UNO_NAME_PARA_SPLIT), RES_PARATR_SPLIT,      CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PropertyAttribute::MAYBEVOID,     0},                                                                 \
-        { SW_PROP_NMID(UNO_NAME_PARA_WIDOWS), RES_PARATR_WIDOWS,        CPPU_E2T(CPPUTYPE_INT8),PropertyAttribute::MAYBEVOID,     0},                                                                  \
-        { SW_PROP_NMID(UNO_NAME_PARA_ORPHANS), RES_PARATR_ORPHANS,      CPPU_E2T(CPPUTYPE_INT8),PropertyAttribute::MAYBEVOID,     0},                                                                 \
-        { SW_PROP_NMID(UNO_NAME_PAGE_NUMBER_OFFSET), RES_PAGEDESC,              CPPU_E2T(CPPUTYPE_INT16),       PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGENUMOFFSET},                                   \
-        { SW_PROP_NMID(UNO_NAME_PARA_ADJUST), RES_PARATR_ADJUST,      CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, MID_PARA_ADJUST},                                              \
-        { SW_PROP_NMID(UNO_NAME_PARA_EXPAND_SINGLE_WORD), RES_PARATR_ADJUST,        CPPU_E2T(CPPUTYPE_BOOLEAN)  ,       PropertyAttribute::MAYBEVOID, MID_EXPAND_SINGLE   },                                                  \
-        { SW_PROP_NMID(UNO_NAME_PARA_LAST_LINE_ADJUST), RES_PARATR_ADJUST, CPPU_E2T(CPPUTYPE_INT16),                PropertyAttribute::MAYBEVOID, MID_LAST_LINE_ADJUST},                                         \
-        { SW_PROP_NMID(UNO_NAME_PARA_LINE_NUMBER_COUNT), RES_LINENUMBER,    CPPU_E2T(CPPUTYPE_BOOLEAN),             PropertyAttribute::MAYBEVOID ,MID_LINENUMBER_COUNT      },                                                \
-        { SW_PROP_NMID(UNO_NAME_PARA_LINE_NUMBER_START_VALUE), RES_LINENUMBER, CPPU_E2T(CPPUTYPE_INT32),                    PropertyAttribute::MAYBEVOID ,MID_LINENUMBER_STARTVALUE},                                    \
-        { SW_PROP_NMID(UNO_NAME_PARA_LINE_SPACING), RES_PARATR_LINESPACING, CPPU_E2T(CPPUTYPE_LINESPACE),       PropertyAttribute::MAYBEVOID,     CONVERT_TWIPS},                                      \
-        { SW_PROP_NMID(UNO_NAME_PARA_REGISTER_MODE_ACTIVE), RES_PARATR_REGISTER,CPPU_E2T(CPPUTYPE_BOOLEAN)  ,           PropertyAttribute::MAYBEVOID, 0},                                                                 \
-        { SW_PROP_NMID(UNO_NAME_PARA_TOP_MARGIN), RES_UL_SPACE,             CPPU_E2T(CPPUTYPE_INT32),           PropertyAttribute::MAYBEVOID, MID_UP_MARGIN|CONVERT_TWIPS},                                  \
-        { SW_PROP_NMID(UNO_NAME_PARA_BOTTOM_MARGIN), RES_UL_SPACE,          CPPU_E2T(CPPUTYPE_INT32),           PropertyAttribute::MAYBEVOID, MID_LO_MARGIN|CONVERT_TWIPS},                                 \
-        { SW_PROP_NMID(UNO_NAME_PARA_CONTEXT_MARGIN), RES_UL_SPACE,          CPPU_E2T(CPPUTYPE_BOOLEAN),           PropertyAttribute::MAYBEVOID, MID_CTX_MARGIN},                                 \
-        { SW_PROP_NMID(UNO_NAME_CHAR_BACK_TRANSPARENT), RES_CHRATR_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN),              PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_TRANSPARENT        },                                                \
-        { SW_PROP_NMID(UNO_NAME_PARA_BACK_TRANSPARENT), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_BOOLEAN),                 PropertyAttribute::MAYBEVOID ,MID_GRAPHIC_TRANSPARENT        },                                                \
-        { SW_PROP_NMID(UNO_NAME_NUMBERING_STYLE_NAME), RES_PARATR_NUMRULE,  CPPU_E2T(CPPUTYPE_OUSTRING),         PropertyAttribute::MAYBEVOID,   0},                                                           \
-        { SW_PROP_NMID(UNO_NAME_CHAR_WORD_MODE), RES_CHRATR_WORDLINEMODE,CPPU_E2T(CPPUTYPE_BOOLEAN)  ,          PropertyAttribute::MAYBEVOID,     0},                                                             \
-        { SW_PROP_NMID(UNO_NAME_CHAR_LEFT_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PropertyAttribute::MAYBEVOID, LEFT_BORDER  |CONVERT_TWIPS },\
-        { SW_PROP_NMID(UNO_NAME_CHAR_RIGHT_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PropertyAttribute::MAYBEVOID, RIGHT_BORDER |CONVERT_TWIPS },\
-        { SW_PROP_NMID(UNO_NAME_CHAR_TOP_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PropertyAttribute::MAYBEVOID, TOP_BORDER   |CONVERT_TWIPS },\
-        { SW_PROP_NMID(UNO_NAME_CHAR_BOTTOM_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PropertyAttribute::MAYBEVOID, BOTTOM_BORDER|CONVERT_TWIPS },\
-        { SW_PROP_NMID(UNO_NAME_CHAR_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, BORDER_DISTANCE|CONVERT_TWIPS },\
-        { SW_PROP_NMID(UNO_NAME_CHAR_LEFT_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },\
-        { SW_PROP_NMID(UNO_NAME_CHAR_RIGHT_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },\
-        { SW_PROP_NMID(UNO_NAME_CHAR_TOP_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },\
-        { SW_PROP_NMID(UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },\
-        { SW_PROP_NMID(UNO_NAME_CHAR_SHADOW_FORMAT), RES_CHRATR_SHADOW, CPPU_E2T(CPPUTYPE_SHADOWFMT), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS},\
-        { SW_PROP_NMID(UNO_NAME_LEFT_BORDER), RES_BOX,              CPPU_E2T(CPPUTYPE_BORDERLINE),      PropertyAttribute::MAYBEVOID, LEFT_BORDER  |CONVERT_TWIPS },                            \
-        { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER), RES_BOX,             CPPU_E2T(CPPUTYPE_BORDERLINE),      PropertyAttribute::MAYBEVOID, RIGHT_BORDER |CONVERT_TWIPS },                                \
-        { SW_PROP_NMID(UNO_NAME_TOP_BORDER), RES_BOX,               CPPU_E2T(CPPUTYPE_BORDERLINE),      PropertyAttribute::MAYBEVOID, TOP_BORDER   |CONVERT_TWIPS },                            \
-        { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER), RES_BOX,                CPPU_E2T(CPPUTYPE_BORDERLINE),      PropertyAttribute::MAYBEVOID, BOTTOM_BORDER|CONVERT_TWIPS },                                \
-        { SW_PROP_NMID(UNO_NAME_BORDER_DISTANCE), RES_BOX,              CPPU_E2T(CPPUTYPE_INT32),           PropertyAttribute::MAYBEVOID, BORDER_DISTANCE|CONVERT_TWIPS },                               \
-        { SW_PROP_NMID(UNO_NAME_LEFT_BORDER_DISTANCE), RES_BOX,                CPPU_E2T(CPPUTYPE_INT32),        PropertyAttribute::MAYBEVOID, LEFT_BORDER_DISTANCE  |CONVERT_TWIPS },                                                            \
-        { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER_DISTANCE), RES_BOX,                CPPU_E2T(CPPUTYPE_INT32),        PropertyAttribute::MAYBEVOID, RIGHT_BORDER_DISTANCE |CONVERT_TWIPS },                                                            \
-        { SW_PROP_NMID(UNO_NAME_TOP_BORDER_DISTANCE), RES_BOX,                CPPU_E2T(CPPUTYPE_INT32),    PropertyAttribute::MAYBEVOID, TOP_BORDER_DISTANCE   |CONVERT_TWIPS },                                                        \
-        { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER_DISTANCE), RES_BOX,                CPPU_E2T(CPPUTYPE_INT32),    PropertyAttribute::MAYBEVOID, BOTTOM_BORDER_DISTANCE|CONVERT_TWIPS },                                                        \
-        { SW_PROP_NMID(UNO_NAME_PARA_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER, CPPU_E2T(CPPUTYPE_REFNAMECNT), PropertyAttribute::MAYBEVOID, 0 },                                   \
-        { SW_PROP_NMID(UNO_NAME_TEXT_USER_DEFINED_ATTRIBUTES), RES_TXTATR_UNKNOWN_CONTAINER, CPPU_E2T(CPPUTYPE_REFNAMECNT), PropertyAttribute::MAYBEVOID, 0 },                               \
-        { SW_PROP_NMID(UNO_NAME_PARA_SHADOW_FORMAT), RES_SHADOW,            CPPU_E2T(CPPUTYPE_SHADOWFMT),   PROPERTY_NONE, CONVERT_TWIPS}, \
-        { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_IS_ON), RES_CHRATR_TWO_LINES,          CPPU_E2T(CPPUTYPE_BOOLEAN),     PropertyAttribute::MAYBEVOID, MID_TWOLINES}, \
-        { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_PREFIX), RES_CHRATR_TWO_LINES,             CPPU_E2T(CPPUTYPE_OUSTRING),    PropertyAttribute::MAYBEVOID, MID_START_BRACKET}, \
-        { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_SUFFIX), RES_CHRATR_TWO_LINES,             CPPU_E2T(CPPUTYPE_OUSTRING),    PropertyAttribute::MAYBEVOID, MID_END_BRACKET}, \
-        { SW_PROP_NMID(UNO_NAME_CHAR_EMPHASIS), RES_CHRATR_EMPHASIS_MARK,           CPPU_E2T(CPPUTYPE_INT16),   PropertyAttribute::MAYBEVOID, MID_EMPHASIS},\
-        { SW_PROP_NMID(UNO_NAME_PARA_IS_HANGING_PUNCTUATION), RES_PARATR_HANGINGPUNCTUATION,  CPPU_E2T(CPPUTYPE_BOOLEAN),    PropertyAttribute::MAYBEVOID ,0  },    \
-        { SW_PROP_NMID(UNO_NAME_PARA_IS_CHARACTER_DISTANCE), RES_PARATR_SCRIPTSPACE,         CPPU_E2T(CPPUTYPE_BOOLEAN),    PropertyAttribute::MAYBEVOID ,0  },    \
-        { SW_PROP_NMID(UNO_NAME_PARA_IS_FORBIDDEN_RULES), RES_PARATR_FORBIDDEN_RULES,     CPPU_E2T(CPPUTYPE_BOOLEAN),    PropertyAttribute::MAYBEVOID ,0  }, \
-        { SW_PROP_NMID(UNO_NAME_PARA_VERT_ALIGNMENT), RES_PARATR_VERTALIGN,CPPU_E2T(CPPUTYPE_INT16),    PropertyAttribute::MAYBEVOID,     0      },  \
-        { SW_PROP_NMID(UNO_NAME_CHAR_ROTATION), RES_CHRATR_ROTATE,      CPPU_E2T(CPPUTYPE_INT16),   PropertyAttribute::MAYBEVOID,     MID_ROTATE      },  \
-        { SW_PROP_NMID(UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE), RES_CHRATR_ROTATE,       CPPU_E2T(CPPUTYPE_BOOLEAN),     PropertyAttribute::MAYBEVOID,         MID_FITTOLINE  },  \
-        { SW_PROP_NMID(UNO_NAME_CHAR_SCALE_WIDTH), RES_CHRATR_SCALEW,       CPPU_E2T(CPPUTYPE_INT16),   PropertyAttribute::MAYBEVOID,          0 },  \
-        { SW_PROP_NMID(UNO_NAME_RUBY_TEXT), RES_TXTATR_CJK_RUBY,    CPPU_E2T(CPPUTYPE_OUSTRING),    PropertyAttribute::MAYBEVOID,          MID_RUBY_TEXT },  \
-        { SW_PROP_NMID(UNO_NAME_RUBY_ADJUST), RES_TXTATR_CJK_RUBY,  CPPU_E2T(CPPUTYPE_INT16),   PropertyAttribute::MAYBEVOID,          MID_RUBY_ADJUST },  \
-        { SW_PROP_NMID(UNO_NAME_RUBY_CHAR_STYLE_NAME), RES_TXTATR_CJK_RUBY, CPPU_E2T(CPPUTYPE_OUSTRING),    PropertyAttribute::MAYBEVOID,          MID_RUBY_CHARSTYLE },  \
-        { SW_PROP_NMID(UNO_NAME_RUBY_IS_ABOVE), RES_TXTATR_CJK_RUBY,    CPPU_E2T(CPPUTYPE_BOOLEAN),  PropertyAttribute::MAYBEVOID,         MID_RUBY_ABOVE },  \
-        { SW_PROP_NMID(UNO_NAME_CHAR_RELIEF), RES_CHRATR_RELIEF,      CPPU_E2T(CPPUTYPE_INT16),    PropertyAttribute::MAYBEVOID,      MID_RELIEF }, \
-        { SW_PROP_NMID(UNO_NAME_SNAP_TO_GRID), RES_PARATR_SNAPTOGRID, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID, 0 }, \
-        { SW_PROP_NMID(UNO_NAME_PARA_IS_CONNECT_BORDER), RES_PARATR_CONNECT_BORDER, CPPU_E2T(CPPUTYPE_BOOLEAN), PropertyAttribute::MAYBEVOID, 0}, \
-        { SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 }, \
-        { SW_PROP_NMID(UNO_NAME_CHAR_SHADING_VALUE), RES_CHRATR_BACKGROUND,      CPPU_E2T(CPPUTYPE_INT32),    PROPERTY_NONE,      MID_SHADING_VALUE }, \
-        { SW_PROP_NMID(UNO_NAME_PARA_INTEROP_GRAB_BAG), RES_PARATR_GRABBAG, CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PROPERTY_NONE, 0 }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_KERNING),                        RES_CHRATR_KERNING,            CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, CONVERT_TWIPS                          }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_NO_HYPHENATION),                 RES_CHRATR_NOHYPHEN,           CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_SHADOWED),                       RES_CHRATR_SHADOWED,           CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_CONTOURED),                      RES_CHRATR_CONTOUR,            CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_DROP_CAP_FORMAT),                     RES_PARATR_DROP,               CPPU_E2T(CPPUTYPE_DROPCAPFMT),    PropertyAttribute::MAYBEVOID, MID_DROPCAP_FORMAT     | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_DROP_CAP_WHOLE_WORD),                 RES_PARATR_DROP,               CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, MID_DROPCAP_WHOLE_WORD                 }, \
+        { SW_PROP_NMID(UNO_NAME_DROP_CAP_CHAR_STYLE_NAME),            RES_PARATR_DROP,               CPPU_E2T(CPPUTYPE_OUSTRING),      PropertyAttribute::MAYBEVOID, MID_DROPCAP_CHAR_STYLE_NAME            }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_KEEP_TOGETHER),                  RES_KEEP,                      CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_SPLIT),                          RES_PARATR_SPLIT,              CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_WIDOWS),                         RES_PARATR_WIDOWS,             CPPU_E2T(CPPUTYPE_INT8),          PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_ORPHANS),                        RES_PARATR_ORPHANS,            CPPU_E2T(CPPUTYPE_INT8),          PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_PAGE_NUMBER_OFFSET),                  RES_PAGEDESC,                  CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, MID_PAGEDESC_PAGENUMOFFSET             }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_ADJUST),                         RES_PARATR_ADJUST,             CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, MID_PARA_ADJUST                        }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_EXPAND_SINGLE_WORD),             RES_PARATR_ADJUST,             CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, MID_EXPAND_SINGLE                      }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_LAST_LINE_ADJUST),               RES_PARATR_ADJUST,             CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, MID_LAST_LINE_ADJUST                   }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_LINE_NUMBER_COUNT),              RES_LINENUMBER,                CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, MID_LINENUMBER_COUNT                   }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_LINE_NUMBER_START_VALUE),        RES_LINENUMBER,                CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, MID_LINENUMBER_STARTVALUE              }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_LINE_SPACING),                   RES_PARATR_LINESPACING,        CPPU_E2T(CPPUTYPE_LINESPACE),     PropertyAttribute::MAYBEVOID, CONVERT_TWIPS                          }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_REGISTER_MODE_ACTIVE),           RES_PARATR_REGISTER,           CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_TOP_MARGIN),                     RES_UL_SPACE,                  CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, MID_UP_MARGIN          | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_BOTTOM_MARGIN),                  RES_UL_SPACE,                  CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, MID_LO_MARGIN          | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_CONTEXT_MARGIN),                 RES_UL_SPACE,                  CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, MID_CTX_MARGIN                         }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_BACK_TRANSPARENT),               RES_CHRATR_BACKGROUND,         CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, MID_GRAPHIC_TRANSPARENT                }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_BACK_TRANSPARENT),               RES_BACKGROUND,                CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, MID_GRAPHIC_TRANSPARENT                }, \
+        { SW_PROP_NMID(UNO_NAME_NUMBERING_STYLE_NAME),                RES_PARATR_NUMRULE,            CPPU_E2T(CPPUTYPE_OUSTRING),      PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_WORD_MODE),                      RES_CHRATR_WORDLINEMODE,       CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_LEFT_BORDER),                    RES_CHRATR_BOX,                CPPU_E2T(CPPUTYPE_BORDERLINE),    PropertyAttribute::MAYBEVOID, LEFT_BORDER            | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_RIGHT_BORDER),                   RES_CHRATR_BOX,                CPPU_E2T(CPPUTYPE_BORDERLINE),    PropertyAttribute::MAYBEVOID, RIGHT_BORDER           | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_TOP_BORDER),                     RES_CHRATR_BOX,                CPPU_E2T(CPPUTYPE_BORDERLINE),    PropertyAttribute::MAYBEVOID, TOP_BORDER             | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_BOTTOM_BORDER),                  RES_CHRATR_BOX,                CPPU_E2T(CPPUTYPE_BORDERLINE),    PropertyAttribute::MAYBEVOID, BOTTOM_BORDER          | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_BORDER_DISTANCE),                RES_CHRATR_BOX,                CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, BORDER_DISTANCE        | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_LEFT_BORDER_DISTANCE),           RES_CHRATR_BOX,                CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, LEFT_BORDER_DISTANCE   | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_RIGHT_BORDER_DISTANCE),          RES_CHRATR_BOX,                CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, RIGHT_BORDER_DISTANCE  | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_TOP_BORDER_DISTANCE),            RES_CHRATR_BOX,                CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, TOP_BORDER_DISTANCE    | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_BOTTOM_BORDER_DISTANCE),         RES_CHRATR_BOX,                CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_SHADOW_FORMAT),                  RES_CHRATR_SHADOW,             CPPU_E2T(CPPUTYPE_SHADOWFMT),     PropertyAttribute::MAYBEVOID, CONVERT_TWIPS                          }, \
+        { SW_PROP_NMID(UNO_NAME_LEFT_BORDER),                         RES_BOX,                       CPPU_E2T(CPPUTYPE_BORDERLINE),    PropertyAttribute::MAYBEVOID, LEFT_BORDER            | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER),                        RES_BOX,                       CPPU_E2T(CPPUTYPE_BORDERLINE),    PropertyAttribute::MAYBEVOID, RIGHT_BORDER           | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_TOP_BORDER),                          RES_BOX,                       CPPU_E2T(CPPUTYPE_BORDERLINE),    PropertyAttribute::MAYBEVOID, TOP_BORDER             | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER),                       RES_BOX,                       CPPU_E2T(CPPUTYPE_BORDERLINE),    PropertyAttribute::MAYBEVOID, BOTTOM_BORDER          | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_BORDER_DISTANCE),                     RES_BOX,                       CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, BORDER_DISTANCE        | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_LEFT_BORDER_DISTANCE),                RES_BOX,                       CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, LEFT_BORDER_DISTANCE   | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_RIGHT_BORDER_DISTANCE),               RES_BOX,                       CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, RIGHT_BORDER_DISTANCE  | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_TOP_BORDER_DISTANCE),                 RES_BOX,                       CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, TOP_BORDER_DISTANCE    | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_BOTTOM_BORDER_DISTANCE),              RES_BOX,                       CPPU_E2T(CPPUTYPE_INT32),         PropertyAttribute::MAYBEVOID, BOTTOM_BORDER_DISTANCE | CONVERT_TWIPS }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_USER_DEFINED_ATTRIBUTES),        RES_UNKNOWNATR_CONTAINER,      CPPU_E2T(CPPUTYPE_REFNAMECNT),    PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_TEXT_USER_DEFINED_ATTRIBUTES),        RES_TXTATR_UNKNOWN_CONTAINER,  CPPU_E2T(CPPUTYPE_REFNAMECNT),    PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_SHADOW_FORMAT),                  RES_SHADOW,                    CPPU_E2T(CPPUTYPE_SHADOWFMT),     PROPERTY_NONE,                CONVERT_TWIPS                          }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_IS_ON),                  RES_CHRATR_TWO_LINES,          CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, MID_TWOLINES                           }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_PREFIX),                 RES_CHRATR_TWO_LINES,          CPPU_E2T(CPPUTYPE_OUSTRING),      PropertyAttribute::MAYBEVOID, MID_START_BRACKET                      }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_COMBINE_SUFFIX),                 RES_CHRATR_TWO_LINES,          CPPU_E2T(CPPUTYPE_OUSTRING),      PropertyAttribute::MAYBEVOID, MID_END_BRACKET                        }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_EMPHASIS),                       RES_CHRATR_EMPHASIS_MARK,      CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, MID_EMPHASIS                           }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_IS_HANGING_PUNCTUATION),         RES_PARATR_HANGINGPUNCTUATION, CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_IS_CHARACTER_DISTANCE),          RES_PARATR_SCRIPTSPACE,        CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_IS_FORBIDDEN_RULES),             RES_PARATR_FORBIDDEN_RULES,    CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_VERT_ALIGNMENT),                 RES_PARATR_VERTALIGN,          CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_ROTATION),                       RES_CHRATR_ROTATE,             CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, MID_ROTATE                             }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_ROTATION_IS_FIT_TO_LINE),        RES_CHRATR_ROTATE,             CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, MID_FITTOLINE                          }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_SCALE_WIDTH),                    RES_CHRATR_SCALEW,             CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_RUBY_TEXT),                           RES_TXTATR_CJK_RUBY,           CPPU_E2T(CPPUTYPE_OUSTRING),      PropertyAttribute::MAYBEVOID, MID_RUBY_TEXT                          }, \
+        { SW_PROP_NMID(UNO_NAME_RUBY_ADJUST),                         RES_TXTATR_CJK_RUBY,           CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, MID_RUBY_ADJUST                        }, \
+        { SW_PROP_NMID(UNO_NAME_RUBY_CHAR_STYLE_NAME),                RES_TXTATR_CJK_RUBY,           CPPU_E2T(CPPUTYPE_OUSTRING),      PropertyAttribute::MAYBEVOID, MID_RUBY_CHARSTYLE                     }, \
+        { SW_PROP_NMID(UNO_NAME_RUBY_IS_ABOVE),                       RES_TXTATR_CJK_RUBY,           CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, MID_RUBY_ABOVE                         }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_RELIEF),                         RES_CHRATR_RELIEF,             CPPU_E2T(CPPUTYPE_INT16),         PropertyAttribute::MAYBEVOID, MID_RELIEF                             }, \
+        { SW_PROP_NMID(UNO_NAME_SNAP_TO_GRID),                        RES_PARATR_SNAPTOGRID,         CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_IS_CONNECT_BORDER),              RES_PARATR_CONNECT_BORDER,     CPPU_E2T(CPPUTYPE_BOOLEAN),       PropertyAttribute::MAYBEVOID, 0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_WRITING_MODE),                        RES_FRAMEDIR,                  CPPU_E2T(CPPUTYPE_INT16),         PROPERTY_NONE,                0                                      }, \
+        { SW_PROP_NMID(UNO_NAME_CHAR_SHADING_VALUE),                  RES_CHRATR_BACKGROUND,         CPPU_E2T(CPPUTYPE_INT32),         PROPERTY_NONE,                MID_SHADING_VALUE                      }, \
+        { SW_PROP_NMID(UNO_NAME_PARA_INTEROP_GRAB_BAG),               RES_PARATR_GRABBAG,            CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PROPERTY_NONE,                0                                      }, \
 
 #define COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN \
         COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN_01 \
diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx
index fc55add..1bdac49 100644
--- a/sw/source/core/unocore/unoprnms.cxx
+++ b/sw/source/core/unocore/unoprnms.cxx
@@ -25,782 +25,784 @@
 
 const SwPropNameTab aPropNameTab = {
 
-/* 0001 FOLLOW_STYLE */                 {MAP_CHAR_LEN("FollowStyle")},
-/* 0002 IS_PHYSICAL */                  {MAP_CHAR_LEN("IsPhysical")},
-/* 0003 IS_AUTO_UPDATE */               {MAP_CHAR_LEN("IsAutoUpdate")},
-/* 0004 DISPLAY_NAME */                 {MAP_CHAR_LEN("DisplayName")},
-/* 0005 PARA_GRAPHIC_URL */             {MAP_CHAR_LEN("ParaBackGraphicURL")},
-/* 0006 PARA_GRAPHIC_FILTER */          {MAP_CHAR_LEN("ParaBackGraphicFilter")},
-/* 0007 HEADER_GRAPHIC_URL */           {MAP_CHAR_LEN("HeaderBackGraphicURL")},
-/* 0008 HEADER_GRAPHIC_FILTER */        {MAP_CHAR_LEN("HeaderBackGraphicFilter")},
-/* 0009 FOOTER_GRAPHIC_URL */           {MAP_CHAR_LEN("FooterBackGraphicURL")},
-/* 0010 FOOTER_GRAPHIC_FILTER */        {MAP_CHAR_LEN("FooterBackGraphicFilter")},
-/* 0011 BACK_GRAPHIC_URL */             {MAP_CHAR_LEN("BackGraphicURL")},
-/* 0012 BACK_GRAPHIC_FILTER */          {MAP_CHAR_LEN("BackGraphicFilter")},
-/* 0013 BACK_GRAPHIC_LOCATION */        {MAP_CHAR_LEN("BackGraphicLocation")},
-/* 0014 BACK_GRAPHIC_BITMAP */          {MAP_CHAR_LEN("BackGraphicBitmap")},
-/* 0015 GRAPHIC_URL */                  {MAP_CHAR_LEN("GraphicURL")},
-/* 0016 GRAPHIC_FILTER */               {MAP_CHAR_LEN("GraphicFilter")},
-/* 0017 GRAPHIC_LOCATION */             {MAP_CHAR_LEN("GraphicLocation")},
-/* 0018 GRAPHIC_SIZE */                 {MAP_CHAR_LEN("GraphicSize")},
-/* 0019 GRAPHIC_BITMAP */               {MAP_CHAR_LEN("GraphicBitmap")},
-/* 0020 BULLET_FONT */                  {MAP_CHAR_LEN("BulletFont")},
-/* 0021 PARA_GRAPHIC_LOCATION */        {MAP_CHAR_LEN("ParaBackGraphicLocation")},
-/* 0022 HEADER_GRAPHIC_LOCATION */      {MAP_CHAR_LEN("HeaderBackGraphicLocation")},
-/* 0023 FOOTER_GRAPHIC_LOCATION */      {MAP_CHAR_LEN("FooterBackGraphicLocation")},
-/* 0024 PARA_LEFT_PARA_MARGIN */        {MAP_CHAR_LEN("ParaLeftParaMargin")},
-/* 0025 PARA_RIGHT_PARA_MARGIN */       {MAP_CHAR_LEN("ParaRightParaMargin")},
-/* 0026 PARA_LEFT_MARGIN */             {MAP_CHAR_LEN("ParaLeftMargin")},
-/* 0027 PARA_RIGHT_MARGIN */            {MAP_CHAR_LEN("ParaRightMargin")},
-/* 0028 PARA_LEFT_MARGIN_RELATIVE */    {MAP_CHAR_LEN("ParaLeftMarginRelative")},
-/* 0029 PARA_RIGHT_MARGIN_RELATIVE */   {MAP_CHAR_LEN("ParaRightMarginRelative")},
-/* 0030 PARA_IS_AUTO_FIRST_LINE_INDENT */       {MAP_CHAR_LEN("ParaIsAutoFirstLineIndent")},
-/* 0031 PARA_FIRST_LINE_INDENT */       {MAP_CHAR_LEN("ParaFirstLineIndent")},
-/* 0032 PARA_FIRST_LINE_INDENT_RELATIVE */      {MAP_CHAR_LEN("ParaFirstLineIndentRelative")},
-/* 0033 PARA_IS_HYPHENATION */          {MAP_CHAR_LEN("ParaIsHyphenation")},
-/* 0034 PARA_HYPHENATION_MAX_LEADING_CHARS */   {MAP_CHAR_LEN("ParaHyphenationMaxLeadingChars")},
-/* 0035 PARA_HYPHENATION_MAX_TRAILING_CHARS */  {MAP_CHAR_LEN("ParaHyphenationMaxTrailingChars")},
-/* 0036 PARA_HYPHENATION_MAX_HYPHENS */ {MAP_CHAR_LEN("ParaHyphenationMaxHyphens")},
-/* 0037 LEFT_MARGIN */                  {MAP_CHAR_LEN("LeftMargin")},
-/* 0038 RIGHT_MARGIN */                 {MAP_CHAR_LEN("RightMargin")},
-/* 0039 HEADER_LEFT_MARGIN */           {MAP_CHAR_LEN("HeaderLeftMargin")},
-/* 0040 HEADER_RIGHT_MARGIN */          {MAP_CHAR_LEN("HeaderRightMargin")},
-/* 0041 FOOTER_LEFT_MARGIN */           {MAP_CHAR_LEN("FooterLeftMargin")},
-/* 0042 FOOTER_RIGHT_MARGIN */          {MAP_CHAR_LEN("FooterRightMargin")},
-/* 0043 TEXT_RANGE */                   {MAP_CHAR_LEN("TextRange")},
-/* 0044 NAME */                         {MAP_CHAR_LEN("Name")},
-/* 0045 NUMBERING_ALIGNMENT */          {MAP_CHAR_LEN("NumberingAlignment")},
-/* 0046 BULLET_FONT_NAME */             {MAP_CHAR_LEN("BulletFontName")},
-/* 0047 BULLET_ID */                    {MAP_CHAR_LEN("BulletId")},
-/* 0048 CHAR_STYLE_NAME */              {MAP_CHAR_LEN("CharStyleName")},
-/* 0049 ANCHOR_CHAR_STYLE_NAME */       {MAP_CHAR_LEN("AnchorCharStyleName")},
-/* 0050 SUFFIX */                       {MAP_CHAR_LEN("Suffix")},
-/* 0051 PREFIX */                       {MAP_CHAR_LEN("Prefix")},
-/* 0052 PARENT_NUMBERING */             {MAP_CHAR_LEN("ParentNumbering")},
-/* 0053 START_WITH */                   {MAP_CHAR_LEN("StartWith")},
-/* 0054 CHAR_FONT_NAME */               {MAP_CHAR_LEN("CharFontName")},
-/* 0055 CHAR_FONT_STYLE_NAME */         {MAP_CHAR_LEN("CharFontStyleName")},
-/* 0056 CHAR_FONT_FAMILY */             {MAP_CHAR_LEN("CharFontFamily")},
-/* 0057 CHAR_FONT_CHAR_SET */           {MAP_CHAR_LEN("CharFontCharSet")},
-/* 0058 CHAR_FONT_PITCH */              {MAP_CHAR_LEN("CharFontPitch")},
-/* 0059 CHAR_POSTURE */                 {MAP_CHAR_LEN("CharPosture")},
-/* 0060 CHAR_WEIGHT */                  {MAP_CHAR_LEN("CharWeight")},
-/* 0061 CHAR_HEIGHT */                  {MAP_CHAR_LEN("CharHeight")},
-/* 0062 CHAR_LOCALE */                  {MAP_CHAR_LEN("CharLocale")},
-/* 0063 CHAR_FONT_NAME_ASIAN */         {MAP_CHAR_LEN("CharFontNameAsian")},
-/* 0064 CHAR_FONT_STYLE_NAME_ASIAN */   {MAP_CHAR_LEN("CharFontStyleNameAsian")},
-/* 0065 CHAR_FONT_FAMILY_ASIAN */       {MAP_CHAR_LEN("CharFontFamilyAsian")},
-/* 0066 CHAR_FONT_CHAR_SET_ASIAN */     {MAP_CHAR_LEN("CharFontCharSetAsian")},
-/* 0067 CHAR_FONT_PITCH_ASIAN */        {MAP_CHAR_LEN("CharFontPitchAsian")},
-/* 0068 CHAR_POSTURE_ASIAN */           {MAP_CHAR_LEN("CharPostureAsian")},
-/* 0069 CHAR_WEIGHT_ASIAN */            {MAP_CHAR_LEN("CharWeightAsian")},
-/* 0070 CHAR_HEIGHT_ASIAN */            {MAP_CHAR_LEN("CharHeightAsian")},
-/* 0071 CHAR_LOCALE_ASIAN */            {MAP_CHAR_LEN("CharLocaleAsian")},
-/* 0072 CHAR_FONT_NAME_COMPLEX */       {MAP_CHAR_LEN("CharFontNameComplex")},
-/* 0073 CHAR_FONT_STYLE_NAME_COMPLEX */ {MAP_CHAR_LEN("CharFontStyleNameComplex")},
-/* 0074 CHAR_FONT_FAMILY_COMPLEX */     {MAP_CHAR_LEN("CharFontFamilyComplex")},
-/* 0075 CHAR_FONT_CHAR_SET_COMPLEX */   {MAP_CHAR_LEN("CharFontCharSetComplex")},
-/* 0076 CHAR_FONT_PITCH_COMPLEX */      {MAP_CHAR_LEN("CharFontPitchComplex")},
-/* 0077 CHAR_POSTURE_COMPLEX */         {MAP_CHAR_LEN("CharPostureComplex")},
-/* 0078 CHAR_WEIGHT_COMPLEX */          {MAP_CHAR_LEN("CharWeightComplex")},
-/* 0079 CHAR_HEIGHT_COMPLEX */          {MAP_CHAR_LEN("CharHeightComplex")},
-/* 0080 CHAR_LOCALE_COMPLEX */          {MAP_CHAR_LEN("CharLocaleComplex")},
-/* 0081 CHAR_AUTO_KERNING */            {MAP_CHAR_LEN("CharAutoKerning")},
-/* 0082 CHAR_UNDERLINE */               {MAP_CHAR_LEN("CharUnderline")},
-/* 0083 CHAR_UNDERLINE_COLOR */         {MAP_CHAR_LEN("CharUnderlineColor")},
-/* 0084 CHAR_UNDERLINE_HAS_COLOR */     {MAP_CHAR_LEN("CharUnderlineHasColor")},

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list